summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-10-04 00:59:19 -0700
committerSteve Piercy <web@stevepiercy.com>2015-10-04 00:59:19 -0700
commit3eada22d7f2baff2c13acc3ca6b2388f6b9dbd80 (patch)
tree5f50bb8ecdfc0bc4bdaf871ac0d366c4f7206a40 /docs
parent7bdace149978504d6e26ea8d095927e15bbf7ab6 (diff)
downloadpyramid-3eada22d7f2baff2c13acc3ca6b2388f6b9dbd80.tar.gz
pyramid-3eada22d7f2baff2c13acc3ca6b2388f6b9dbd80.tar.bz2
pyramid-3eada22d7f2baff2c13acc3ca6b2388f6b9dbd80.zip
grammar
Diffstat (limited to 'docs')
-rw-r--r--docs/conventions.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/conventions.rst b/docs/conventions.rst
index 0492ab4fd..a9d2550bf 100644
--- a/docs/conventions.rst
+++ b/docs/conventions.rst
@@ -24,7 +24,7 @@ We present Python method names using the following style:
:meth:`pyramid.config.Configurator.add_view`
-We present Python class names, module names, attributes and global
+We present Python class names, module names, attributes, and global
variables using the following style:
:class:`pyramid.config.Configurator.registry`
@@ -105,10 +105,10 @@ It may look unusual, but it has advantages:
* It allows one to swap out the higher-level package ``foo`` for something
else that provides the similar API. An example would be swapping out
- one Database for another (e.g., graduating from SQLite to PostgreSQL).
+ one database for another (e.g., graduating from SQLite to PostgreSQL).
* Looks more neat in cases where a large number of objects get imported from
that package.
-* Adding/removing imported objects from the package is quicker and results
+* Adding or removing imported objects from the package is quicker and results
in simpler diffs.