diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-28 18:26:14 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-28 18:26:14 -0500 |
| commit | de487c1729a41d236b107b3ad728edd7df71ec1e (patch) | |
| tree | b0575885a46631b3bab83c1d3b90cf1fe17ecb63 /docs/narr/assets.rst | |
| parent | afbc5d57ddd848b7f2e8c8190afc2109c7563496 (diff) | |
| parent | 1e209fc65d62a86d15bf54fa2a91a6728d0ade9e (diff) | |
| download | pyramid-de487c1729a41d236b107b3ad728edd7df71ec1e.tar.gz pyramid-de487c1729a41d236b107b3ad728edd7df71ec1e.tar.bz2 pyramid-de487c1729a41d236b107b3ad728edd7df71ec1e.zip | |
Merge branch 'mgedmin-master'
Diffstat (limited to 'docs/narr/assets.rst')
| -rw-r--r-- | docs/narr/assets.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst index f147426ce..f73ff231a 100644 --- a/docs/narr/assets.rst +++ b/docs/narr/assets.rst @@ -98,7 +98,7 @@ directory on a filesystem to an application user's browser. Use the mechanism makes a directory of static files available at a name relative to the application root URL, e.g. ``/static`` or as an external URL. -.. note:: `~pyramid.config.Configurator.add_static_view` cannot serve a +.. note:: :meth:`~pyramid.config.Configurator.add_static_view` cannot serve a single file, nor can it serve a directory of static files directly relative to the root URL of a :app:`Pyramid` application. For these features, see :ref:`advanced_static`. @@ -282,7 +282,7 @@ create such a circumstance, we suggest using the in the application ``.ini`` file named ``media_location``. Then set the value of ``media_location`` to either a prefix or a URL depending on whether the application is being run in development or in production (use a different -`.ini`` file for production than you do for development). This is just a +``.ini`` file for production than you do for development). This is just a suggestion for a pattern; any setting name other than ``media_location`` could be used. |