summaryrefslogtreecommitdiff
path: root/docs/conventions.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-07-02 01:34:25 -0700
committerSteve Piercy <web@stevepiercy.com>2016-07-02 01:34:25 -0700
commit108121ee8a08837c39379cdd0e2e9c2b5b3712e8 (patch)
tree4c16e36b3d3749f6a9f4f150e64f18eadeabc5c2 /docs/conventions.rst
parentbcba92d1b23745d736bdcbc9b799929de382db7b (diff)
downloadpyramid-108121ee8a08837c39379cdd0e2e9c2b5b3712e8.tar.gz
pyramid-108121ee8a08837c39379cdd0e2e9c2b5b3712e8.tar.bz2
pyramid-108121ee8a08837c39379cdd0e2e9c2b5b3712e8.zip
Update Windows installation instructions and related bits.
- Use proper Windows commands, drives, and paths - Use doscon for Windows console lexer
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