summaryrefslogtreecommitdiff
path: root/docs/intro/tutorial06.txt
diff options
context:
space:
mode:
authorTobias Kunze <r@rixx.de>2019-06-17 16:54:55 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-09-06 13:27:46 +0200
commit4a954cfd11a5d034491f87fcbc920eb97a302bb3 (patch)
tree1c92caae5d8a9b33c51ddd74b4b2061248f3915f /docs/intro/tutorial06.txt
parentaddabc492bdc0191ac95d59ec34b56b34086ebb9 (diff)
Fixed #30573 -- Rephrased documentation to avoid words that minimise the involved difficulty.
This patch does not remove all occurrences of the words in question. Rather, I went through all of the occurrences of the words listed below, and judged if they a) suggested the reader had some kind of knowledge/experience, and b) if they added anything of value (including tone of voice, etc). I left most of the words alone. I looked at the following words: - simply/simple - easy/easier/easiest - obvious - just - merely - straightforward - ridiculous Thanks to Carlton Gibson for guidance on how to approach this issue, and to Tim Bell for providing the idea. But the enormous lion's share of thanks go to Adam Johnson for his patient and helpful review.
Diffstat (limited to 'docs/intro/tutorial06.txt')
-rw-r--r--docs/intro/tutorial06.txt17
1 files changed, 8 insertions, 9 deletions
diff --git a/docs/intro/tutorial06.txt b/docs/intro/tutorial06.txt
index e8b1d02764..91a0a10f24 100644
--- a/docs/intro/tutorial06.txt
+++ b/docs/intro/tutorial06.txt
@@ -11,11 +11,10 @@ to serve additional files — such as images, JavaScript, or CSS — necessary t
render the complete web page. In Django, we refer to these files as "static
files".
-For small projects, this isn't a big deal, because you can just keep the
-static files somewhere your web server can find it. However, in bigger
-projects -- especially those comprised of multiple apps -- dealing with the
-multiple sets of static files provided by each application starts to get
-tricky.
+For small projects, this isn't a big deal, because you can keep the static
+files somewhere your web server can find it. However, in bigger projects --
+especially those comprised of multiple apps -- dealing with the multiple sets
+of static files provided by each application starts to get tricky.
That's what ``django.contrib.staticfiles`` is for: it collects static files
from each of your applications (and any other places you specify) into a
@@ -39,8 +38,8 @@ Within the ``static`` directory you have just created, create another directory
called ``polls`` and within that create a file called ``style.css``. In other
words, your stylesheet should be at ``polls/static/polls/style.css``. Because
of how the ``AppDirectoriesFinder`` staticfile finder works, you can refer to
-this static file in Django simply as ``polls/style.css``, similar to how you
-reference the path for templates.
+this static file in Django as ``polls/style.css``, similar to how you reference
+the path for templates.
.. admonition:: Static file namespacing
@@ -50,8 +49,8 @@ reference the path for templates.
first static file it finds whose name matches, and if you had a static file
with the same name in a *different* application, Django would be unable to
distinguish between them. We need to be able to point Django at the right
- one, and the easiest way to ensure this is by *namespacing* them. That is,
- by putting those static files inside *another* directory named for the
+ one, and the best way to ensure this is by *namespacing* them. That is, by
+ putting those static files inside *another* directory named for the
application itself.
Put the following code in that stylesheet (``polls/static/polls/style.css``):