unicode: Merged changes from trunk up to [5579].

git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5580 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 59 insertions, 0 deletions

diff --git a/docs/contributing.txt b/docs/contributing.txt
index 3880a1e13e..fa16f858b6 100644
--- a/docs/contributing.txt
+++ b/docs/contributing.txt
@@ -383,6 +383,65 @@ Model style
               ('F', 'Female'),
           )
 
+Documentation style
+===================
+
+We place a high importance on consistency and readability of documentation.
+(After all, Django was created in a journalism environment!)
+
+Guidelines for ReST files
+-------------------------
+
+These guidelines regulate the format of our ReST documentation:
+
+	* In section titles, capitalize only initial words and proper nouns.
+
+	* Wrap the documentation at 80 characters wide, unless a code example
+	  is significantly less readable when split over two lines, or for another
+	  good reason.
+
+Commonly used terms
+-------------------
+
+Here are some style guidelines on commonly used terms throughout the
+documentation:
+
+	* **Django** -- when referring to the framework, capitalize Django. It is
+	  lowercase only in Python code and in the djangoproject.com logo.
+
+	* **e-mail** -- it has a hyphen.
+
+	* **MySQL**
+
+	* **PostgreSQL**
+
+	* **Python** -- when referring to the language, capitalize Python.
+
+	* **realize**, **customize**, **initialize**, etc. -- use the American
+	  "ize" suffix, not "ise."
+
+	* **SQLite**
+
+	* **subclass** -- it's a single word without a hyphen, both as a verb
+	  ("subclass that model") and as a noun ("create a subclass").
+
+	* **Web**, **World Wide Web**, **the Web** -- note Web is always
+	  capitalized when referring to the World Wide Web.
+
+    * **Web site** -- use two words, with Web capitalized.
+
+Django-specific terminology
+---------------------------
+
+	* **model** -- it's not capitalized.
+
+	* **template** -- it's not capitalized.
+
+	* **URLconf** -- use three capitalized letters, with no space before
+	  "conf."
+
+	* **view** -- it's not capitalized.
+
 Committing code
 ===============