summaryrefslogtreecommitdiff
path: root/docs/conventions.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-09-14 16:09:42 -0400
committerChris McDonough <chrism@plope.com>2016-09-14 16:09:42 -0400
commit85bd2b8187c39e44285983261a74aa815f2b19ed (patch)
tree4bc2269119fbe03d1fa54171148ff0cc5d88fd93 /docs/conventions.rst
parentd350714a917b1a06dd4be6092e7b3da64771a4af (diff)
parent4acd85dc98fb2a43eae54d2116cc4bf383157269 (diff)
downloadpyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.tar.gz
pyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.tar.bz2
pyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/conventions.rst')
-rw-r--r--docs/conventions.rst15
1 files changed, 4 insertions, 11 deletions
diff --git a/docs/conventions.rst b/docs/conventions.rst
index 43853882c..de041da04 100644
--- a/docs/conventions.rst
+++ b/docs/conventions.rst
@@ -57,23 +57,16 @@ character, e.g.:
$ $VENV/bin/py.test -q
-(See :term:`venv` for the meaning of ``$VENV``)
+See :term:`venv` for the meaning of ``$VENV``.
-Example blocks representing Windows ``cmd.exe`` commands are prefixed with a
-drive letter and/or a directory name, e.g.:
+Example blocks representing Windows commands are prefixed with a drive letter
+with an optional directory name, e.g.:
.. code-block:: doscon
c:\examples> %VENV%\Scripts\py.test -q
-(See :term:`venv` for the meaning of ``%VENV%``)
-
-Sometimes, when it's unknown which directory is current, Windows ``cmd.exe``
-example block commands are prefixed only with a ``>`` character, e.g.:
-
- .. code-block:: doscon
-
- > %VENV%\Scripts\py.test -q
+See :term:`venv` for the meaning of ``%VENV%``.
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