Merge branch 'master' of github.com:Pylons/pyramid

5 files changed, 8 insertions, 8 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index de4714bf2..337754162 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,5 +27,5 @@ Features
   HEAD is a variant of GET that omits the body, and WebOb has special support
   to return an empty body when a HEAD is used.
 
-- ``config.set_request_properties`` now causes less code to be executed at
+- ``config.set_request_property`` now causes less code to be executed at
   request construction time.
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 60920a73a..88598354a 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -290,7 +290,7 @@ Glossary
      :term:`principal` (or principals) associated with a request.
 
    WSGI
-     `Web Server Gateway Interface <http://wsgi.org/>`_.  This is a
+     `Web Server Gateway Interface <http://www.wsgi.org/>`_.  This is a
      Python standard for connecting web applications to web servers,
      similar to the concept of Java Servlets.  :app:`Pyramid` requires
      that your application be served as a WSGI application.
@@ -299,7 +299,7 @@ Glossary
      *Middleware* is a :term:`WSGI` concept.  It is a WSGI component
      that acts both as a server and an application.  Interesting uses
      for middleware exist, such as caching, content-transport
-     encoding, and other functions.  See `WSGI.org <http://wsgi.org>`_
+     encoding, and other functions.  See `WSGI.org <http://www.wsgi.org>`_
      or `PyPI <http://python.org/pypi>`_ to find middleware for your
      application.
 
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index b6e3dd163..a2143b3c5 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -145,7 +145,7 @@ the view which generates it can be overridden as necessary.
 
 The :term:`forbidden view` callable is a view callable like any other.  The
 :term:`view configuration` which causes it to be a "forbidden" view consists
-of using the meth:`pyramid.config.Configurator.add_forbidden_view` API or the
+of using the :meth:`pyramid.config.Configurator.add_forbidden_view` API or the
 :class:`pyramid.view.forbidden_view_config` decorator.
 
 For example, you can add a forbidden view by using the
@@ -171,7 +171,7 @@ as a forbidden view:
 
    from pyramid.view import forbidden_view_config
 
-   forbidden_view_config()
+   @forbidden_view_config()
    def forbidden(request):
        return Response('forbidden')
 
@@ -625,7 +625,7 @@ converts the arbitrary return value into something that implements
 :class:`~pyramid.interfaces.IResponse`.
 
 For example, if you'd like to allow view callables to return bare string
-objects (without requiring a a :term:`renderer` to convert a string to a
+objects (without requiring a :term:`renderer` to convert a string to a
 response object), you can register an adapter which converts the string to a
 Response:
 
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 57073900f..d18d93605 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -447,7 +447,7 @@ first column instead, for example like this:
    pyramid.includes =
        #pyramid_debugtoolbar
 
-When you attempt to restart the application with a section like the abvoe
+When you attempt to restart the application with a section like the above
 you'll receive an error that ends something like this, and the application
 will not start:
 
diff --git a/setup.py b/setup.py
index f8c8c41e9..e325b8a29 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ setup(name='pyramid',
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
-        "Framework :: Pylons",
+        "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI",
         "License :: Repoze Public License",