diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-07-02 02:00:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 02:00:18 -0700 |
| commit | 2203944a466a7a8a2a57bbfe7a89f06c41d73fa7 (patch) | |
| tree | dc30e24dff01a46fac7bcce84d7524bb8a8028fa /docs/conventions.rst | |
| parent | bcba92d1b23745d736bdcbc9b799929de382db7b (diff) | |
| parent | fa257dd74588c9cc80cc3a6b4158ff2c627eacd5 (diff) | |
| download | pyramid-2203944a466a7a8a2a57bbfe7a89f06c41d73fa7.tar.gz pyramid-2203944a466a7a8a2a57bbfe7a89f06c41d73fa7.tar.bz2 pyramid-2203944a466a7a8a2a57bbfe7a89f06c41d73fa7.zip | |
Merge pull request #2664 from stevepiercy/master
Update Windows installation instructions and related bits.
Diffstat (limited to 'docs/conventions.rst')
| -rw-r--r-- | docs/conventions.rst | 15 |
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 |