diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-04-12 18:03:57 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-04-12 18:03:57 -0600 |
| commit | f3420699895969e825913da51dedfa5b880bc7d5 (patch) | |
| tree | 40bace55d7c03e53c490b465df2b5b27e024b1a6 /docs/conventions.rst | |
| parent | c8a9a4a279b7568657c5dc3e8f2ad8da31be5890 (diff) | |
| parent | efaf7300c9c3ef2a795aae7f724bf5b02e96cd75 (diff) | |
| download | pyramid-f3420699895969e825913da51dedfa5b880bc7d5.tar.gz pyramid-f3420699895969e825913da51dedfa5b880bc7d5.tar.bz2 pyramid-f3420699895969e825913da51dedfa5b880bc7d5.zip | |
Merge branch 'master' into feature/BeforeTraversal
Diffstat (limited to 'docs/conventions.rst')
| -rw-r--r-- | docs/conventions.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conventions.rst b/docs/conventions.rst index a9d2550bf..0346f1107 100644 --- a/docs/conventions.rst +++ b/docs/conventions.rst @@ -57,7 +57,7 @@ character, e.g.: $ $VENV/bin/nosetests -(See :term:`virtualenv` 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.: @@ -66,7 +66,7 @@ drive letter and/or a directory name, e.g.: c:\examples> %VENV%\Scripts\nosetests -(See :term:`virtualenv` for the meaning of ``%VENV%``) +(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.: |