summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorcewing <cris@crisewing.com>2016-06-03 16:21:37 -0700
committercewing <cris@crisewing.com>2016-06-09 11:20:55 -0700
commit8c12559d800cde22d28a3cbc2ad5897c49768cb3 (patch)
tree07ac670c641696dc50f2a49908fe4ed15ba9af9c /docs/narr
parentdc7c27bdfbec0b22b650b9daf3e92f3b6000b4db (diff)
downloadpyramid-8c12559d800cde22d28a3cbc2ad5897c49768cb3.tar.gz
pyramid-8c12559d800cde22d28a3cbc2ad5897c49768cb3.tar.bz2
pyramid-8c12559d800cde22d28a3cbc2ad5897c49768cb3.zip
fix static assets section
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/introduction.rst15
1 files changed, 7 insertions, 8 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index f13397edc..6a27cb715 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -130,16 +130,15 @@ configuration without fear of breaking links in your web pages.
Example: :ref:`generating_route_urls`.
-Static file serving
+Serve static assets
~~~~~~~~~~~~~~~~~~~
-Pyramid is perfectly willing to serve static files itself. It won't make you
-use some external web server to do that. You can even serve more than one set
-of static files in a single Pyramid web application (e.g., ``/static`` and
-``/static2``). You can optionally place your files on an external web server
-and ask Pyramid to help you generate URLs to those files. This let's you use
-Pyramid's internal file serving while doing development, and a faster static
-file server in production, without changing any code.
+Web applications often require JavaScript, CSS, images and other so-called
+*static assets*. Pyramid provides flexible tools for serving these kinds of
+files. You can serve them directly from Pyramid, or host them on an external
+server or CDN (content delivery network). Either way, Pyramid can help you to
+generate URLs so you can change where your files come from without changing any
+code.
Example: :ref:`static_assets_section`.