diff options
| author | Michael Merickel <michael@merickel.org> | 2016-04-12 21:09:23 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-04-12 21:09:23 -0500 |
| commit | 231a531fe62b82cd354dd64f5a1ffbab6df14a77 (patch) | |
| tree | d7fd2961735f8a5293885d9623abb42c5fcd7f80 /docs/conventions.rst | |
| parent | 769da1215a0287f4161e58f36d8d4b7650154202 (diff) | |
| parent | b1527e793bc101327050370c17e1be698f7192ff (diff) | |
| download | pyramid-231a531fe62b82cd354dd64f5a1ffbab6df14a77.tar.gz pyramid-231a531fe62b82cd354dd64f5a1ffbab6df14a77.tar.bz2 pyramid-231a531fe62b82cd354dd64f5a1ffbab6df14a77.zip | |
Merge branch 'master' into feature/require-csrf
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.: |