diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-01 19:33:06 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-01 19:33:06 -0500 |
| commit | f1ffaeeff438aa2ea768c508fe38e3dd108b9369 (patch) | |
| tree | 6ff2b0d0063be11ef0b3fa65232a37f629331165 /docs/conventions.rst | |
| parent | d195074f2c6ef704926cf56de4e26e36e11ee758 (diff) | |
| parent | 1220f3b8f869e4caf298d9acb5e5fffe0a86129e (diff) | |
| download | pyramid-f1ffaeeff438aa2ea768c508fe38e3dd108b9369.tar.gz pyramid-f1ffaeeff438aa2ea768c508fe38e3dd108b9369.tar.bz2 pyramid-f1ffaeeff438aa2ea768c508fe38e3dd108b9369.zip | |
Merge branch 'master' into twophase
Diffstat (limited to 'docs/conventions.rst')
| -rw-r--r-- | docs/conventions.rst | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/docs/conventions.rst b/docs/conventions.rst index a764a372a..a17af7230 100644 --- a/docs/conventions.rst +++ b/docs/conventions.rst @@ -22,12 +22,12 @@ concept are presented in the following style: We present Python method names using the following style: - :meth:`Python.method_name` + :meth:`pyramid.configuration.Configurator.add_view` We present Python class names, module names, attributes and global variables using the following style: - :class:`Python.class_module_or_attribute.name` + :class:`pyramid.configuration.Configurator.registry` References to glossary terms are presented using the following style: @@ -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: |