summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-28 00:42:23 -0500
committerChris McDonough <chrism@plope.com>2010-11-28 00:42:23 -0500
commit12205feb19ff908a7e7d72368b8e4d113bf2ed4e (patch)
tree71f668360e578b16f724e6eead0211ce12ade62d /docs
parent13dc44d1746afb98fc9d1d4c807df87e2ffed942 (diff)
downloadpyramid-12205feb19ff908a7e7d72368b8e4d113bf2ed4e.tar.gz
pyramid-12205feb19ff908a7e7d72368b8e4d113bf2ed4e.tar.bz2
pyramid-12205feb19ff908a7e7d72368b8e4d113bf2ed4e.zip
collapse python and xml code block example
Diffstat (limited to 'docs')
-rw-r--r--docs/conventions.rst11
1 files changed, 1 insertions, 10 deletions
diff --git a/docs/conventions.rst b/docs/conventions.rst
index d72660921..a17af7230 100644
--- a/docs/conventions.rst
+++ b/docs/conventions.rst
@@ -42,7 +42,7 @@ style:
:ref:`traversal_chapter`
-Python code blocks are presented in the following style:
+Code and configuration file blocks are presented in the following style:
.. code-block:: python
:linenos:
@@ -50,15 +50,6 @@ Python code blocks are presented in the following style:
def foo(abc):
pass
-Blocks of XML markup are presented in the following style:
-
- .. code-block:: xml
- :linenos:
-
- <root>
- <!-- ... more XML .. -->
- </root>
-
When a command that should be typed on one line is too long to fit on
a page, the backslash ``\`` is used to indicate that the following
printed line should actually be part of the command: