summaryrefslogtreecommitdiff
path: root/HACKING.txt
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-13 13:58:56 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-13 13:58:56 -0400
commita66e00e9bd51fdffd85fef14e83f12502f2d864e (patch)
tree43eb06f24df2818e2db5a947e9866c8076257e91 /HACKING.txt
parentbf84d90b4dccb9fc52c8fe385e52f7a63e9a5535 (diff)
parent5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff)
downloadpyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.gz
pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.bz2
pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.zip
Merge remote-tracking branch 'origin/master' into docs.gettingstarted
Conflicts: docs/index.rst docs/latexindex.rst setup.py
Diffstat (limited to 'HACKING.txt')
-rw-r--r--HACKING.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/HACKING.txt b/HACKING.txt
index 26e85ee80..5b5dcc458 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -126,7 +126,7 @@ documentation in this package which references that API or behavior must
change to reflect the bug fix, ideally in the same commit that fixes the bug
or adds the feature.
-To build and review docs (where ``$yourvenv`` refers to the virtualenv you're
+To build and review docs (where ``$VENV`` refers to the virtualenv you're
using to develop Pyramid):
1. Run ``$VENV/bin/python setup.py dev docs``. This will cause Sphinx