diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-01-24 01:13:23 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-01-24 01:13:23 -0800 |
| commit | bd7c3a4f0365b564879eb21bec0b36ab373a8dad (patch) | |
| tree | 95b71e504ea996fddef0410de5ca8b80d8040c71 /docs/narr | |
| parent | 2796def9af4a2a9814f3df08ef85b2eacae73135 (diff) | |
| parent | 22f221099e785cb763e9659da029933ca9fc11e6 (diff) | |
| download | pyramid-bd7c3a4f0365b564879eb21bec0b36ab373a8dad.tar.gz pyramid-bd7c3a4f0365b564879eb21bec0b36ab373a8dad.tar.bz2 pyramid-bd7c3a4f0365b564879eb21bec0b36ab373a8dad.zip | |
Merge pull request #2277 from stevepiercy/master
Bump sphinx to 1.3.5; revert comment syntax. Closes #2251.
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/project.rst | 4 | ||||
| -rw-r--r-- | docs/narr/webob.rst | 2 |
2 files changed, 3 insertions, 3 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): |