diff options
| author | Chris McDonough <chrism@plope.com> | 2015-11-04 12:42:50 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-11-04 12:42:50 -0800 |
| commit | 5cd91621668807f9b66811fe57a04fba96e7458a (patch) | |
| tree | f135aa39e3c3a5910c4eaf06764941470038b36a /docs/conventions.rst | |
| parent | 20d9350e61bc86e019c42b866c0b85cd274438bb (diff) | |
| parent | 5a7e26812a0afd18f6335641e799f6892c970fb5 (diff) | |
| download | pyramid-5cd91621668807f9b66811fe57a04fba96e7458a.tar.gz pyramid-5cd91621668807f9b66811fe57a04fba96e7458a.tar.bz2 pyramid-5cd91621668807f9b66811fe57a04fba96e7458a.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/conventions.rst')
| -rw-r--r-- | docs/conventions.rst | 6 |
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. |