Edited stuff from [17543] to [17629]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 25 insertions, 25 deletions

diff --git a/docs/howto/deployment/wsgi/uwsgi.txt b/docs/howto/deployment/wsgi/uwsgi.txt
index aa56ea089a..4af8e8a60f 100644
--- a/docs/howto/deployment/wsgi/uwsgi.txt
+++ b/docs/howto/deployment/wsgi/uwsgi.txt
@@ -12,14 +12,14 @@ container server coded in pure C.
 Prerequisite: uWSGI
 ===================
 
-The wiki describes several `installation procedures`_. Using pip, the python
-package manager, installing any uWSGI version can be done with one command
-line. For example::
+The uWSGI wiki describes several `installation procedures`_. Using pip, the
+Python package manager, you can install any uWSGI version with a single
+command. For example::
 
-    # install current stable version
+    # Install current stable version.
     pip install uwsgi
 
-    # or install LTS (long term support)
+    # Or install LTS (long term support).
     pip install http://projects.unbit.it/downloads/uwsgi-lts.tar.gz
 
 .. _installation procedures: http://projects.unbit.it/uwsgi/wiki/Install
@@ -27,7 +27,7 @@ line. For example::
 uWSGI model
 -----------
 
-uWSGI operates on a client-server model. Your Web server (ie. nginx, Apache)
+uWSGI operates on a client-server model. Your Web server (e.g., nginx, Apache)
 communicates with a django-uwsgi "worker" process to serve dynamic content.
 See uWSGI's `background documentation`_ for more detail.
 
@@ -36,13 +36,13 @@ See uWSGI's `background documentation`_ for more detail.
 Configuring and starting the uWSGI server for Django
 ----------------------------------------------------
 
-uWSGI supports multiple ways to configure the process, see uWSGI's
+uWSGI supports multiple ways to configure the process. See uWSGI's
 `configuration documentation`_ and `examples`_
 
 .. _configuration documentation: http://projects.unbit.it/uwsgi/wiki/Doc
 .. _examples: http://projects.unbit.it/uwsgi/wiki/Example
 
-An example command to start a uWSGI server::
+Here's an example command to start a uWSGI server::
 
     uwsgi --chdir=/path/to/your/project
         --module='mysite.wsgi:application' \
@@ -52,27 +52,28 @@ An example command to start a uWSGI server::
         --processes=5 \                 # number of worker processes
         --uid=1000 --gid=2000 \         # if root, uwsgi can drop privileges
         --harakiri=20 \                 # respawn processes taking more than 20 seconds
-        --limit-as=128 \                # limit the project to 128 Megabytes
+        --limit-as=128 \                # limit the project to 128 MB
         --max-requests=5000 \           # respawn processes after serving 5000 requests
         --vacuum \                      # clear environment on exit
-        --home=/path/to/virtual/env \   # optionnal path to a virtualenv
+        --home=/path/to/virtual/env \   # optional path to a virtualenv
         --daemonize=/var/log/uwsgi/yourproject.log      # background the process
 
-This assumes that you have a top-level project package named ``mysite``, and
+This assumes you have a top-level project package named ``mysite``, and
 within it a module :file:`mysite/wsgi.py` that contains a WSGI ``application``
-object. This is the layout you will have if you ran ``django-admin.py
+object. This is the layout you'll have if you ran ``django-admin.py
 startproject mysite`` (using your own project name in place of ``mysite``) with
-a recent version of Django. If this file does not exist, you'll need to create
+a recent version of Django. If this file doesn't exist, you'll need to create
 it. See the :doc:`/howto/deployment/wsgi/index` documentation for the default
-contents you should put in this file, and what else you can add to it.
+contents you should put in this file and what else you can add to it.
 
 The Django-specific options here are:
 
-* ``chdir``: the path to the directory that needs to be on Python's import path; i.e. the directory containing the ``mysite`` package.
-* ``module``: The WSGI module to use, probably the ``mysite.wsgi`` module which
-  :djadmin:`startproject` creates.
-* ``env``: should probably contain at least ``DJANGO_SETTINGS_MODULE``
-* ``home``: optional path to your project virtualenv
+* ``chdir``: The path to the directory that needs to be on Python's import
+  path -- i.e., the directory containing the ``mysite`` package.
+* ``module``: The WSGI module to use -- probably the ``mysite.wsgi`` module
+  that :djadmin:`startproject` creates.
+* ``env``: Should probably contain at least ``DJANGO_SETTINGS_MODULE``.
+* ``home``: Optional path to your project virtualenv.
 
 Example ini configuration file::
 
@@ -89,8 +90,7 @@ Example ini configuration file usage::
 
     uwsgi --ini uwsgi.ini
 
-
 See the uWSGI docs on `managing the uWSGI process`_ for information on
-starting, stoping, and reloading the uWSGI workers.
+starting, stoping and reloading the uWSGI workers.
 
 .. _managing the uWSGI process: http://projects.unbit.it/uwsgi/wiki/Management
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index ce8d75d124..36306d476e 100644
--- a/docs/howto/initial-data.txt
+++ b/docs/howto/initial-data.txt
@@ -69,10 +69,10 @@ You'll store this data in a ``fixtures`` directory inside your app.
 
 Loading data is easy: just call :djadmin:`manage.py loaddata <fixturename>
 <loaddata>`, where ``<fixturename>`` is the name of the fixture file you've
-created. Every time you run :djadmin:`loaddata` the data will be read from the
-fixture and re-loaded into the database. Note that this means that if you
-change one of the rows created by a fixture and then run :djadmin:`loaddata`
-again you'll wipe out any changes you've made.
+created. Each time you run :djadmin:`loaddata`, the data will be read from the
+fixture and re-loaded into the database. Note this means that if you change one
+of the rows created by a fixture and then run :djadmin:`loaddata` again, you'll
+wipe out any changes you've made.
 
 Automatically loading initial data fixtures
 -------------------------------------------