summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLawouach <sh@defuze.org>2014-05-24 14:48:35 +0200
committerLawouach <sh@defuze.org>2014-05-24 14:48:35 +0200
commite230dc18b13ebcdace2b07fd48ad69ad3b5488e6 (patch)
treef7159554d1b18a339299aa17e5e7a0c439563430
parentc7fd9953150f37764cc0ee7e1c43f834e9845c57 (diff)
downloadcherrypy-e230dc18b13ebcdace2b07fd48ad69ad3b5488e6.tar.gz
typos
-rw-r--r--sphinx/source/deploy.rst4
-rw-r--r--sphinx/source/extend.rst10
-rw-r--r--sphinx/source/tutorials.rst26
3 files changed, 20 insertions, 20 deletions
diff --git a/sphinx/source/deploy.rst b/sphinx/source/deploy.rst
index 3437487d..b7bab85e 100644
--- a/sphinx/source/deploy.rst
+++ b/sphinx/source/deploy.rst
@@ -387,7 +387,7 @@ follow:
Notice how we attach the bus methods to the Twisted's own lifecycle.
-Save that code into a module named `cptw.py` and run it as follow:
+Save that code into a module named `cptw.py` and run it as follows:
.. code-block:: bash
@@ -417,7 +417,7 @@ follow:
wsgiapp = cherrypy.tree.mount(Root())
Save this into a Python module called `mymod.py` and run
-it as follow:
+it as follows:
.. code-block:: bash
diff --git a/sphinx/source/extend.rst b/sphinx/source/extend.rst
index 42cfe53c..bc7aff30 100644
--- a/sphinx/source/extend.rst
+++ b/sphinx/source/extend.rst
@@ -104,7 +104,7 @@ using a pubsub workflow:
cherrypy.quickstart(ECommerce(), '/')
In this example, we publish a `cart` instance to
-`db-save` channel. One or many subscirbers can then
+`db-save` channel. One or many subscribers can then
react to that message and the application doesn't
have to know about them.
@@ -218,7 +218,7 @@ Plugins
^^^^^^^
Plugins, simply put, are entities that play with the bus, either by
-publishing or subscirbing to channels, usually both at the same time.
+publishing or subscribing to channels, usually both at the same time.
.. important::
@@ -268,7 +268,7 @@ Enable a plugin
~~~~~~~~~~~~~~~
To enable the plugin, it has to be registered to the the
-bus as follow:
+bus as follows:
.. code-block:: python
@@ -280,7 +280,7 @@ database provider.
Disable a plugin
~~~~~~~~~~~~~~~~
-You can also unregister a plugin as follow:
+You can also unregister a plugin as follows:
.. code-block:: python
@@ -418,7 +418,7 @@ hook point, hence after the page handler was called:
cherrypy.tools.logit = cherrypy.Tool('before_finalize', log_it)
-Using that tool is as simple as follow:
+Using that tool is as simple as follows:
.. code-block:: python
diff --git a/sphinx/source/tutorials.rst b/sphinx/source/tutorials.rst
index b4b0b0fa..f919b318 100644
--- a/sphinx/source/tutorials.rst
+++ b/sphinx/source/tutorials.rst
@@ -32,7 +32,7 @@ http://127.0.0.1:8080/
cherrypy.quickstart(HelloWorld())
Store this code snippet into a file named `tut01.py` and
-execute it as follow:
+execute it as follows:
.. code-block:: bash
@@ -102,7 +102,7 @@ string each time it is called:
if __name__ == '__main__':
cherrypy.quickstart(StringGenerator())
-Save this into a file named `tut02.py` and run it as follow:
+Save this into a file named `tut02.py` and run it as follows:
.. code-block:: bash
@@ -118,8 +118,8 @@ This URL contains various parts:
- `http://` which roughly indicates it's a URL using the HTTP protocol (see :rfc:`2616`).
- `localhost:8080` is the server's address. It's made of a hostname and a port.
-- `/generate` which is the path segment of the URL. This is what ultimately uses to
- try and locate an appropriate exposed function or method to respond.
+- `/generate` which is the path segment of the URL. This is what CherryPy uses to
+ locate an :term:`exposed` function or method to respond.
Here CherryPy uses the `index()` method to handle `/` and the
`generate()` method to handle `/generate`
@@ -153,7 +153,7 @@ to indicate the length of that string dynamically.
if __name__ == '__main__':
cherrypy.quickstart(StringGenerator())
-Save this into a file named `tut03.py` and run it as follow:
+Save this into a file named `tut03.py` and run it as follows:
.. code-block:: bash
@@ -217,7 +217,7 @@ example.
if __name__ == '__main__':
cherrypy.quickstart(StringGenerator())
-Save this into a file named `tut04.py` and run it as follow:
+Save this into a file named `tut04.py` and run it as follows:
.. code-block:: bash
@@ -286,7 +286,7 @@ your application.
}
cherrypy.quickstart(StringGenerator(), '/', conf)
-Save this into a file named `tut05.py` and run it as follow:
+Save this into a file named `tut05.py` and run it as follows:
.. code-block:: bash
@@ -373,7 +373,7 @@ using the http://localhost:8080/static/css/style.css URL.
}
cherrypy.quickstart(StringGenerator(), '/', conf)
-Save this into a file named `tut06.py` and run it as follow:
+Save this into a file named `tut06.py` and run it as follows:
.. code-block:: bash
@@ -402,8 +402,8 @@ Tutorial 7: Give us a REST
It's not unusual nowadays that web applications expose some sort
of datamodel or computation functions. Without going into
its details, one strategy is to follow the `REST principles
-edicted by Roy T. Fielding in his thesis
-<https://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm>`_.
+edicted by Roy T. Fielding
+<http://www.ibm.com/developerworks/library/ws-restful/index.html>`_.
Roughly speaking, it assumes that you can identify a resource
and that you can address that resource through that identifier.
@@ -463,7 +463,7 @@ midly following REST principles.
cherrypy.quickstart(StringGeneratorWebService(), '/', conf)
-Save this into a file named `tut07.py` and run it as follow:
+Save this into a file named `tut07.py` and run it as follows:
.. code-block:: bash
@@ -697,7 +697,7 @@ Both are hosted by the same application server.
cherrypy.quickstart(webapp, '/', conf)
-Save this into a file named `tut08.py` and run it as follow:
+Save this into a file named `tut08.py` and run it as follows:
.. code-block:: bash
@@ -828,7 +828,7 @@ So let's simply focus on the application code itself:
cherrypy.quickstart(webapp, '/', conf)
-Save this into a file named `tut09.py` and run it as follow:
+Save this into a file named `tut09.py` and run it as follows:
.. code-block:: bash