diff options
| author | Chris McDonough <chrism@plope.com> | 2014-06-04 16:54:02 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-06-04 16:54:02 -0400 |
| commit | 352e9102157d72f9ac8a2483339181c08920a294 (patch) | |
| tree | f96a0f98ab883876418b85e4d2890d0287c93b52 | |
| parent | d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3 (diff) | |
| parent | e2ec94f197f7e2a040091d661cc56496e6136eba (diff) | |
| download | pyramid-352e9102157d72f9ac8a2483339181c08920a294.tar.gz pyramid-352e9102157d72f9ac8a2483339181c08920a294.tar.bz2 pyramid-352e9102157d72f9ac8a2483339181c08920a294.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/quick_tutorial/databases.rst | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst index 20b3cd46d..7c019dbfc 100644 --- a/docs/quick_tutorial/databases.rst +++ b/docs/quick_tutorial/databases.rst @@ -115,7 +115,7 @@ Steps .. code-block:: bash - $ $VENV/bin/nosetests . + $ $VENV/bin/nosetests tutorial .. ----------------------------------------------------------------- Ran 2 tests in 1.141s @@ -30,7 +30,7 @@ else: here = os.path.abspath(os.path.dirname(__file__)) try: - with open(os.path.join(here, 'README.txt')) as f: + with open(os.path.join(here, 'README.rst')) as f: README = f.read() with open(os.path.join(here, 'CHANGES.txt')) as f: CHANGES = f.read() |