Commits

Sylvain Hellegouarch  committed 0052453

typos

  • Participants
  • Parent commits 164d3c1
  • Branches cp4

Comments (0)

Files changed (2)

File sphinx/source/advanced.rst

 ^^^^^^^^^^^^^^^^^^^^^
 :func:`cherrypy.popargs` is more straightforward as it gives a name to any segment 
 that CherryPy wouldn't be able to interpret otherwise. This makes the 
-matching of segments with page handler signatures easier and help CherryPy 
+matching of segments with page handler signatures easier and helps CherryPy 
 understand the structure of your URL.
 
 .. code-block:: python
 
 Once CherryPy has set the status and headers, it sends them to the HTTP server,
 which then writes them out to the client. From that point on, the CherryPy
-ramework mostly steps out of the way, and the HTTP server essentially requests
+framework mostly steps out of the way, and the HTTP server essentially requests
 content directly from your application code (your page handler method).
 
 Therefore, when streaming, if an error occurs within your page handler,
 Make your CherryPy application a WSGI application
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-A WSGI application can be obtained from your application as follow:
+A WSGI application can be obtained from your application as follows:
 
 .. code-block:: python
 
 or `Jinja2 <jinja.pocoo.org/docs/>`_.
 
 You will find `here <https://bitbucket.org/Lawouach/cherrypy-recipes/src/tip/web/templating/>`_
-a recipe on how integrating them using a mix
+a recipe on how to integrate them using a mix
 :ref:`plugins <busplugins>` and :ref:`tools <tools>`.
 
 Testing your application
 ########################
 
-Web application, like any other kind of code, must be tested. CherryPy provides
+Web applications, like any other kind of code, must be tested. CherryPy provides
 a :class:`helper class <cherrypy.test.helper.CPWebCase>` to ease writing 
 functional tests. 
 
 method to perform a request. Simply use the various specialized 
 assert* methods to validate your workflow and data.
 
-You can then run the test using `py.test <http://pytest.org/latest/>`_ as follow:
+You can then run the test using `py.test <http://pytest.org/latest/>`_ as follows:
 
 .. code-block:: bash
 

File sphinx/source/basics.rst

 The :func:`cherrypy.quickstart` approach is fine for a single application,
 but lacks the capacity to host several applications with the server.
 To achieve this, one must use the :meth:`cherrypy.tree.mount <cherrypy._cptree.Tree.mount>` 
-function as follow:
+function as follows:
 
 .. code-block:: python
 
 Play along with your other loggers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Your application may aobviously already use the :mod:`logging`
+Your application may obviously already use the :mod:`logging`
 module to trace application level messages. CherryPy will not
 interfere with them as long as your loggers are explicitely
 named. This would work nicely:
    cherrypy.config.update({'server.socket_port': 9090})
 
 The :mod:`cherrypy.config <cherrypy._cpconfig>` object is a dictionary and the 
-update method merge the passed dictionary into it.
+update method merges the passed dictionary into it.
 
 You can also pass a file instead (assuming a `server.conf`
 file):
 .. warning::
 
    :meth:`cherrypy.config.update() <cherrypy._cpconfig.Config.update>`  
-   is not mean to be used to configure the application. 
+   is not meant to be used to configure the application. 
    It is a common mistake. It is used to configure the server and engine.
 
 .. _perappconf:
 Per-application configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To configure your application, pass a dictionary or a file 
-when you associate ther application to the server.
+To configure your application, pass in a dictionary or a file 
+when you associate their application to the server.
 
 .. code-block:: python
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 You can add settings that are not specific to a request URL
-and retrieve them from your page handler as follow:
+and retrieve them from your page handler as follows:
 
 .. code-block:: ini
 		
 Using sessions
 ##############
 
-Sessions is one of the most common mechanism used by developers to 
+Sessions are one of the most common mechanism used by developers to 
 identify users and synchronize their activity. By default, CherryPy
 does not activate sessions because it is not a mandatory feature
 to have, to enable it simply add the following settings in your
 all of your current sessions will be lost. You can store them in memcached
 or on the filesystem instead.
 
-Using sessions in your applications is done as follow:
+Using sessions in your applications is done as follows:
 
 .. code-block:: python
 
 
    Refer to the :mod:`cherrypy.lib.sessions` module for more
    details about the session interface and implementation.
-   Notabley you will learn about sessions expiricy.
+   Notably you will learn about sessions expiration.
 
 Filesystem backend
 ^^^^^^^^^^^^^^^^^^
 
-Using a filesystem is a simple not to lose your sessions
+Using a filesystem is a simple to not lose your sessions
 between reboots. Each session is saved in its own file within
 the given directory. 
 
 
    CherryPy uses the :mod:`mimetypes` module to determine the
    best content-type to serve a particular resource. If the choice
-   is not valid, you can simply set more media-types as follow:
+   is not valid, you can simply set more media-types as follows:
 
    .. code-block:: python
  
 Serving a single file
 ^^^^^^^^^^^^^^^^^^^^^
 
-You can serve a single file as follow:
+You can serve a single file as follows:
 
 .. code-block:: ini
 
 .. note::
 
    CherryPy always requires the absolute path to the files or directories
-   it will serve. If you have several static section to configure
+   it will serve. If you have several static sections to configure
    but located in the same root directory, you can use the following 
    shortcut:
 
 you can tell a browser that a resource should be downloaded
 onto the user's machine rather than displayed.
 
-You could for instance write a page handler as follow:
+You could for instance write a page handler as follows:
 
 .. code-block:: python
 
 Dealing with JSON
 #################
 
-CherryPy has a built-in support for JSON encoding and decoding
+CherryPy has built-in support for JSON encoding and decoding
 of the request and/or response.
 
 Decoding request
 Authentication
 ##############
 
-CherryPy provides support for two very simple authentications mechanism,
+CherryPy provides support for two very simple authentication mechanisms,
 both described in :rfc:`2617`: Basic and Digest. They are most commonly
 known to trigger a browser's popup asking users their name
 and password.
 
 CherryPy serves its own sweet red cherrypy as the default 
 `favicon <http://en.wikipedia.org/wiki/Favicon>`_ using the static file
-tool. You can serve your own favicon as follow:
+tool. You can serve your own favicon as follows:
 
 .. code-block:: python