summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-09-02 08:34:55 -0700
committerChris McDonough <chrism@plope.com>2015-09-02 08:34:55 -0700
commitb9b68fed103b18a19a0c0935365abbdd4a720dbc (patch)
treed130a2ea14b2f5d3728ff53c02bba8773799b62d /docs/narr
parent94853b4af2ce3e7d57c9eda4d997a696cdc82da5 (diff)
parentf17b973ea66b7ffb2afb03da2c559e55c22fe3ee (diff)
downloadpyramid-b9b68fed103b18a19a0c0935365abbdd4a720dbc.tar.gz
pyramid-b9b68fed103b18a19a0c0935365abbdd4a720dbc.tar.bz2
pyramid-b9b68fed103b18a19a0c0935365abbdd4a720dbc.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/i18n.rst7
-rw-r--r--docs/narr/scaffolding.rst5
2 files changed, 8 insertions, 4 deletions
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 3c804a158..8d81418d9 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -219,10 +219,9 @@ by creating various kinds of gettext files.
The steps a developer must take to work with :term:`gettext`
:term:`message catalog` files within a :app:`Pyramid`
application are very similar to the steps a :term:`Pylons`
- developer must take to do the same. See the `Pylons
- internationalization documentation
- <http://wiki.pylonshq.com/display/pylonsdocs/Internationalization+and+Localization>`_
- for more information.
+ developer must take to do the same. See the :ref:`Pylons
+ Internationalization and Localization documentation
+ <pylonswebframework:i18n>` for more information.
GNU gettext uses three types of files in the translation framework,
``.pot`` files, ``.po`` files and ``.mo`` files.
diff --git a/docs/narr/scaffolding.rst b/docs/narr/scaffolding.rst
index f924d0d62..4fcdeb537 100644
--- a/docs/narr/scaffolding.rst
+++ b/docs/narr/scaffolding.rst
@@ -57,6 +57,11 @@ As you create files and directories within the template directory, note that:
have that string replaced with the value of the ``var`` variable provided
to the scaffold.
+- Files that start with a dot (e.g., ``.env``) are ignored and will not be
+ copied over to the destination directory. If you want to include a file with
+ a leading dot then you must replace the dot with ``+dot+`` (e.g.,
+ ``+dot+env``).
+
Otherwise, files and directories which live in the template directory will be
copied directly without modification to the ``pcreate`` output location.