summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-01-26 01:32:42 -0800
committerGitHub <noreply@github.com>2017-01-26 01:32:42 -0800
commitd504a4e8472b6852c24ddf692b617c550c757da7 (patch)
tree8da489e2620e5a852eb23ec54a831c0c89c215be /docs
parent3b5076b6b3fd7218acf445e917eb039999b61820 (diff)
parent0aa967f02c8ccf133730ae7b7ed8b3a90ab17372 (diff)
downloadpyramid-d504a4e8472b6852c24ddf692b617c550c757da7.tar.gz
pyramid-d504a4e8472b6852c24ddf692b617c550c757da7.tar.bz2
pyramid-d504a4e8472b6852c24ddf692b617c550c757da7.zip
Merge pull request #2921 from stevepiercy/master
grammar fix
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/project.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 3d17a4191..be2e5a389 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -37,7 +37,7 @@ These cookiecutters are rendered using the ``cookiecutter`` command that you may
:app:`Pyramid` cookiecutters
----------------------------
-Pyramid cookiecutters released under the Pylons Project include differ from each other on a number of axes:
+Pyramid cookiecutters released under the Pylons Project differ from each other on a number of axes:
- the persistence mechanism they offer (no persistence mechanism, :term:`SQLAlchemy` with SQLite, or :term:`ZODB`)
@@ -1105,17 +1105,17 @@ Automatically Reloading Your Code
During development, it can be really useful to automatically have the
webserver restart when you make changes. ``pserve`` has a ``--reload`` switch
to enable this. It uses the
-`hupper <http://docs.pylonsproject.org/projects/hupper/en/latest/>` package
+`hupper <http://docs.pylonsproject.org/projects/hupper/en/latest/>`_ package
to enable this behavior. When your code crashes, ``hupper`` will wait for
another change or the ``SIGHUP`` signal before restarting again.
inotify support
~~~~~~~~~~~~~~~
-By default, ``hupper`` will poll the filesystem for changes to all python
+By default ``hupper`` will poll the filesystem for changes to all Python
code. This can be pretty inefficient in larger projects. To be nicer to your
hard drive, you should install the
-`watchdog <http://pythonhosted.org/watchdog/>` package in development.
+`watchdog <http://pythonhosted.org/watchdog/>`_ package in development.
``hupper`` will automatically use ``watchdog`` to more efficiently poll the
filesystem.
@@ -1124,11 +1124,11 @@ Monitoring Custom Files
By default, ``pserve --reload`` will monitor all imported Python code
(everything in ``sys.modules``) as well as the config file passed to
-``pserve`` (e.g. ``development.ini``). You can instruct ``pserve`` to watch
+``pserve`` (e.g., ``development.ini``). You can instruct ``pserve`` to watch
other files for changes as well by defining a ``[pserve]`` section in your
configuration file. For example, let's say your application loads the
``favicon.ico`` file at startup and stores it in memory to efficiently
-serve it many times. When you change it you want ``pserve`` to restart:
+serve it many times. When you change it, you want ``pserve`` to restart:
.. code-block:: ini
@@ -1137,6 +1137,6 @@ serve it many times. When you change it you want ``pserve`` to restart:
myapp/static/favicon.ico
Paths may be absolute or relative to the configuration file. They may also
-be an :term:`asset specification`. These paths are passed to ``hupper`` which
+be an :term:`asset specification`. These paths are passed to ``hupper``, which
has some basic support for globbing. Acceptable glob patterns depend on the
version of Python being used.