Merge pull request #2277 from stevepiercy/master

Bump sphinx to 1.3.5; revert comment syntax. Closes #2251.

4 files changed, 5 insertions, 5 deletions

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 5103bb6b8..923fde436 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -447,7 +447,7 @@ commenting out a line.  For example, instead of:
    :linenos:
 
    [app:main]
-   ...
+   # ... elided configuration
    pyramid.includes =
        pyramid_debugtoolbar
 
@@ -457,7 +457,7 @@ Put a hash mark at the beginning of the ``pyramid_debugtoolbar`` line:
    :linenos:
 
    [app:main]
-   ...
+   # ... elided configuration
    pyramid.includes =
    #    pyramid_debugtoolbar
 
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index f18cf1dfb..cfcf532bc 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -269,7 +269,7 @@ to a :app:`Pyramid` application:
 When such a request reaches a view in your application, the
 ``request.json_body`` attribute will be available in the view callable body.
 
-.. code-block:: javascript
+.. code-block:: python
 
     @view_config(renderer='string')
     def aview(request):
diff --git a/docs/quick_tour/requests/app.py b/docs/quick_tour/requests/app.py
index 621b0693e..f55264cff 100644
--- a/docs/quick_tour/requests/app.py
+++ b/docs/quick_tour/requests/app.py
@@ -4,7 +4,7 @@ from pyramid.response import Response
 
 
 def hello_world(request):
-    """ Some parameters from a request such as /?name=lisa """
+    # Some parameters from a request such as /?name=lisa
     url = request.url
     name = request.params.get('name', 'No Name Provided')
 
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index 6d5a965cd..f855dcb55 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -109,7 +109,7 @@ For Linux, the commands to do so are as follows:
 
 For Windows:
 
-.. code-block:: posh
+.. code-block:: ps1con
 
     # Windows
     c:\> cd \