summaryrefslogtreecommitdiff
path: root/docs/faq
diff options
context:
space:
mode:
authorAgnieszka Lasyk <agnieszkalasyk@agalasyk.local>2015-11-15 13:05:15 +0100
committerTim Graham <timograham@gmail.com>2015-11-16 06:44:46 -0500
commitb3389956c9cbc31e82137e787cfd339a3d1dab6f (patch)
treed97aacc386fd76cb72bf90f15d07be4960c844df /docs/faq
parent5234c9937c26b420f470f555fbe62f4969cea645 (diff)
[1.9.x] Fixed #25755 -- Unified spelling of "website".
Backport of 1f8dad69158a96d0649d321ce08ecc9c0465f962 from master
Diffstat (limited to 'docs/faq')
-rw-r--r--docs/faq/general.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index 73366b628c..d8f9e1fedc 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -13,7 +13,7 @@ At the same time, the World Online Web developers have consistently been
perfectionists when it comes to following best practices of Web development.
In fall 2003, the World Online developers (Adrian Holovaty and Simon Willison)
-ditched PHP and began using Python to develop its Web sites. As they built
+ditched PHP and began using Python to develop its websites. As they built
intensive, richly interactive sites such as Lawrence.com, they began to extract
a generic Web development framework that let them build Web applications more
and more quickly. They tweaked this framework constantly, adding improvements
@@ -148,7 +148,7 @@ Is Django a content-management-system (CMS)?
--------------------------------------------
No, Django is not a CMS, or any sort of "turnkey product" in and of itself.
-It's a Web framework; it's a programming tool that lets you build Web sites.
+It's a Web framework; it's a programming tool that lets you build websites.
For example, it doesn't make much sense to compare Django to something like
Drupal_, because Django is something you use to *create* things like Drupal.