summaryrefslogtreecommitdiff
path: root/docs/style-guide.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-11-28 23:25:24 -0800
committerGitHub <noreply@github.com>2016-11-28 23:25:24 -0800
commit351a741385f35e3fa3c7d251c9fb402997de957a (patch)
tree8ef98e4618c75b5c809ca37243249926a3803b68 /docs/style-guide.rst
parent08a026807782b05ba9b171803d2cd6876338e0fc (diff)
parentfa842555b41f807c8f4a8528113d7742eb7633e8 (diff)
downloadpyramid-351a741385f35e3fa3c7d251c9fb402997de957a.tar.gz
pyramid-351a741385f35e3fa3c7d251c9fb402997de957a.tar.bz2
pyramid-351a741385f35e3fa3c7d251c9fb402997de957a.zip
Merge pull request #2843 from stevepiercy/style-guide
restore Typographical Conventions, an edited and condensed version of…
Diffstat (limited to 'docs/style-guide.rst')
-rw-r--r--docs/style-guide.rst34
1 files changed, 12 insertions, 22 deletions
diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 70f899651..bdca45a06 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -293,31 +293,21 @@ As individual files do not have so-called "parts" or "chapters", the headings wo
.. code-block:: rst
- Heading Level 1
- ===============
+ ==================================
+ The main heading or web page title
+ ==================================
- Heading Level 2
+ Heading Level 1
---------------
- Heading Level 3
+ Heading Level 2
^^^^^^^^^^^^^^^
- Heading Level 4
+ Heading Level 3
"""""""""""""""
-The above code renders as follows.
-
-Heading Level 1
-===============
-
-Heading Level 2
----------------
+Note, we do not render heading levels here because doing so causes a loss in page structure.
-Heading Level 3
-^^^^^^^^^^^^^^^
-
-Heading Level 4
-"""""""""""""""
.. _style-guide-paragraphs:
@@ -375,7 +365,7 @@ The above code renders as follows.
Displaying code
^^^^^^^^^^^^^^^
-Code may be displayed in blocks or inline. You can include blocks of code from other source files. Blocks of code should use syntax highlighting.
+Code may be displayed in blocks or inline. You can include blocks of code from other source files. Blocks of code should use syntax highlighting, and may use line numbering or emphasis.
.. seealso:: See also the Sphinx documentation for :ref:`code-examples`.
@@ -427,10 +417,10 @@ cfg:
.. code-block:: cfg
- [some-part]
- # A random part in the buildout
- recipe = collective.recipe.foo
- option = value
+ [some-part]
+ # A random part in the buildout
+ recipe = collective.recipe.foo
+ option = value
ini: