summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-26 17:11:57 -0500
committerChris McDonough <chrism@plope.com>2010-12-26 17:11:57 -0500
commitb33ae924870d29f1c1a4c57fde694050a535aba2 (patch)
tree11384708feae37ab79150f589c8259ec5c947895 /docs
parenta10437f0de8636b56bc8fc85220b01494d99888b (diff)
downloadpyramid-b33ae924870d29f1c1a4c57fde694050a535aba2.tar.gz
pyramid-b33ae924870d29f1c1a4c57fde694050a535aba2.tar.bz2
pyramid-b33ae924870d29f1c1a4c57fde694050a535aba2.zip
wording
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst3
-rw-r--r--docs/narr/assets.rst16
2 files changed, 12 insertions, 7 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index ed96b8afe..49d273197 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -54,7 +54,8 @@ Glossary
For example, the asset specification
``my.package:static/baz.css`` identifies the file named
``baz.css`` in the ``static`` subdirectory of the ``my.package``
- Python :term:`package`.
+ Python :term:`package`. See :ref:`asset_specifications` for more
+ info.
package
A directory on disk which contains an ``__init__.py`` file, making
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst
index 27fbfe613..84fe42186 100644
--- a/docs/narr/assets.rst
+++ b/docs/narr/assets.rst
@@ -11,17 +11,21 @@ An :term:`asset` is any file contained within a Python :term:`package` which
is *not* a Python source code file. For example, each of the following is an
asset:
-- a :term:`Chameleon` template file contained within a Python package.
+- a GIF image file contained within a Python package or contained within any
+ subdirectory of a Python package.
-- a GIF image file contained within a Python package.
+- a CSS file contained within a Python package or contained within any
+ subdirectory of a Python package.
-- a CSS file contained within a Python package.
-
-- a JavaScript source file contained within a Python package.
+- a JavaScript source file contained within a Python package or contained
+ within any subdirectory of a Python package.
- A directory within a package that does not have an ``__init__.py``
in it (if it possessed an ``__init__.py`` it would *be* a package).
+- a :term:`Chameleon` or :term:`Mako` template file contained within a Python
+ package.
+
The use of assets is quite common in most web development projects. For
example, when you create a :app:`Pyramid` application using one of the
available "paster" templates, as described in :ref:`creating_a_project`, the
@@ -31,7 +35,7 @@ static assets. For example, there's a ``static`` directory which contains
``.css``, ``.js``, and ``.gif`` files. These asset files are delivered when
a user visits an application URL.
-.. _understanding_assets:
+.. _asset_specifications:
Understanding Asset Specifications
----------------------------------