diff options
| -rw-r--r-- | HACKING.txt | 2 | ||||
| -rw-r--r-- | docs/narr/firstapp.rst | 6 | ||||
| -rw-r--r-- | docs/narr/install.rst | 8 | ||||
| -rw-r--r-- | pyramid/interfaces.py | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/HACKING.txt b/HACKING.txt index 64c8f461a..32381cc6c 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -88,7 +88,7 @@ Coding Style mandatory. - Please do not remove trailing whitespace. Configure your editor to reduce - diff noise. + diff noise. See https://github.com/Pylons/pyramid/issues/788 for more. Running Tests -------------- diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst index 0b85d68d3..c49dc1142 100644 --- a/docs/narr/firstapp.rst +++ b/docs/narr/firstapp.rst @@ -194,13 +194,13 @@ WSGI Application Creation After configuring views and ending configuration, the script creates a WSGI *application* via the :meth:`pyramid.config.Configurator.make_wsgi_app` method. A call to ``make_wsgi_app`` implies that all configuration is -finished (meaning all method calls to the configurator which set up views, -and various other configuration settings have been performed). The +finished (meaning all method calls to the configurator, which sets up views +and various other configuration settings, have been performed). The ``make_wsgi_app`` method returns a :term:`WSGI` application object that can be used by any WSGI server to present an application to a requestor. :term:`WSGI` is a protocol that allows servers to talk to Python applications. We don't discuss :term:`WSGI` in any depth within this book, -however, you can learn more about it by visiting `wsgi.org +but you can learn more about it by visiting `wsgi.org <http://wsgi.org>`_. The :app:`Pyramid` application object, in particular, is an instance of a diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 19c144156..224a62db7 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -40,13 +40,11 @@ UNIX system that has development tools. Package Manager Method ++++++++++++++++++++++ -You can use your system's "package manager" to install Python. Every -system's package manager is slightly different, but the "flavor" of +You can use your system's "package manager" to install Python. +Each package manager is slightly different, but the "flavor" of them is usually the same. -For example, on an Ubuntu Linux system, to use the system package -manager to install a Python 2.7 interpreter, use the following -command: +For example, on a Debian or Ubuntu system, use the following command: .. code-block:: text diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py index b176d49fb..54bce6fd2 100644 --- a/pyramid/interfaces.py +++ b/pyramid/interfaces.py @@ -460,7 +460,7 @@ class IAuthorizationPolicy(Interface): class IMultiDict(IDict): # docs-only interface """ An ordered dictionary that can have multiple values for each key. A - multidict adds the methods ``getall``, ``getone``, ``mixed``, ``extend`` + multidict adds the methods ``getall``, ``getone``, ``mixed``, ``extend``, ``add``, and ``dict_of_lists`` to the normal dictionary interface. A multidict data structure is used as ``request.POST``, ``request.GET``, and ``request.params`` within an :app:`Pyramid` application. |