diff options
| author | Michael Merickel <michael@merickel.org> | 2017-04-30 02:02:26 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2017-04-30 02:02:26 -0500 |
| commit | 9c15a8eac2848cc7a81f174ecf7a6c63be323f51 (patch) | |
| tree | abf20accdb77f6127a5480bf023231c7b0b6706b /docs/narr | |
| parent | 3f14d63c009ae7f101b7aeb4525bab2dfe66fa11 (diff) | |
| parent | 87af11c5e33b8c03d57a8b571f0b152efe866af1 (diff) | |
| download | pyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.tar.gz pyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.tar.bz2 pyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.zip | |
Merge branch 'master' into pr/2854
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/logging.rst | 2 | ||||
| -rw-r--r-- | docs/narr/myproject/README.txt | 2 | ||||
| -rw-r--r-- | docs/narr/project.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/logging.rst b/docs/narr/logging.rst index 87682158b..9cc5b4ed8 100644 --- a/docs/narr/logging.rst +++ b/docs/narr/logging.rst @@ -16,7 +16,7 @@ to send log messages to loggers that you've configured. cookiecutter which does not create these files, the configuration information in this chapter may not be applicable. -.. index: +.. index:: pair: settings; logging pair: .ini; logging pair: logging; configuration diff --git a/docs/narr/myproject/README.txt b/docs/narr/myproject/README.txt index 41ef0ff91..2ffc0acba 100644 --- a/docs/narr/myproject/README.txt +++ b/docs/narr/myproject/README.txt @@ -1,5 +1,5 @@ MyProject -=============================== +========= Getting Started --------------- diff --git a/docs/narr/project.rst b/docs/narr/project.rst index ce7e90793..9c44d4f16 100644 --- a/docs/narr/project.rst +++ b/docs/narr/project.rst @@ -94,7 +94,7 @@ If prompted for the first item, accept the default ``yes`` by hitting return. You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before. Is it okay to delete and re-clone it? [yes]: yes project_name [Pyramid Scaffold]: myproject - repo_name [scaffold]: myproject + repo_name [myproject]: myproject Select template_language: 1 - jinja2 2 - chameleon |