Merge pull request #1803 from stevepiercy/master

grammar, punctuation

3 files changed, 9 insertions, 9 deletions

diff --git a/docs/conventions.rst b/docs/conventions.rst
index 21b506623..0492ab4fd 100644
--- a/docs/conventions.rst
+++ b/docs/conventions.rst
@@ -1,19 +1,19 @@
 Typographical Conventions
 =========================
 
-Literals, filenames and function arguments are presented using the
+Literals, filenames, and function arguments are presented using the
 following style:
 
   ``argument1``
 
-Warnings, which represent limitations and need-to-know information
+Warnings which represent limitations and need-to-know information
 related to a topic or concept are presented in the following style:
 
   .. warning::
 
      This is a warning.
 
-Notes, which represent additional information related to a topic or
+Notes which represent additional information related to a topic or
 concept are presented in the following style:
 
   .. note::
@@ -105,7 +105,7 @@ It may look unusual, but it has advantages:
 
 * It allows one to swap out the higher-level package ``foo`` for something
   else that provides the similar API. An example would be swapping out
-  one Database for another (e.g. graduating from SQLite to PostgreSQL).
+  one Database for another (e.g., graduating from SQLite to PostgreSQL).
 
 * Looks more neat in cases where a large number of objects get imported from
   that package.
diff --git a/docs/copyright.rst b/docs/copyright.rst
index 980335827..3beaee7f7 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -39,7 +39,7 @@ any trademark or service mark.
 
 Every effort has been made to make this book as complete and as
 accurate as possible, but no warranty or fitness is implied.  The
-information provided is on as "as-is" basis.  The author and the
+information provided is on an "as-is" basis.  The author and the
 publisher shall have neither liability nor responsibility to any
 person or entity with respect to any loss or damages arising from the
 information contained in this book.  No patent liability is assumed
@@ -89,14 +89,14 @@ Contacting The Publisher
 Please send documentation licensing inquiries, translation inquiries,
 and other business communications to `Agendaless Consulting
 <mailto:webmaster@agendaless.com>`_.  Please send software and other
-technical queries to the `Pylons-devel maillist
+technical queries to the `Pylons-devel mailing list
 <http://groups.google.com/group/pylons-devel>`_.
 
 HTML Version and Source Code
 ----------------------------
 
 An HTML version of this book is freely available via
-http://docs.pylonsproject.org
+http://docs.pylonsproject.org/projects/pyramid/en/latest/
 
 The source code for the examples used in this book are available
 within the :app:`Pyramid` software distribution, always available
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 1b8c82b0a..a0f530830 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -39,12 +39,12 @@ For Windows:
 
 Of course Pyramid runs fine on Python 2.6+, as do the examples in this
 *Quick Tour*. We're just showing Python 3 a little love (Pyramid had
-production support in October 2011.)
+production support for Python 3 in October 2011).
 
 .. note::
 
     Why ``easy_install`` and not ``pip``? Pyramid encourages use of namespace
-    packages which, until recently, ``pip`` didn't permit. Also, Pyramid has
+    packages which, until recently, ``pip`` didn't permit. Also Pyramid has
     some optional C extensions for performance. With ``easy_install``, Windows
     users can get these extensions without needing a C compiler.