Converted some tabs to four spaces in two docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
3d6785fb8e
commit
4c958b15b2
|
@ -393,11 +393,11 @@ Guidelines for ReST files
|
||||||
|
|
||||||
These guidelines regulate the format of our ReST documentation:
|
These guidelines regulate the format of our ReST documentation:
|
||||||
|
|
||||||
* In section titles, capitalize only initial words and proper nouns.
|
* In section titles, capitalize only initial words and proper nouns.
|
||||||
|
|
||||||
* Wrap the documentation at 80 characters wide, unless a code example
|
* Wrap the documentation at 80 characters wide, unless a code example
|
||||||
is significantly less readable when split over two lines, or for another
|
is significantly less readable when split over two lines, or for another
|
||||||
good reason.
|
good reason.
|
||||||
|
|
||||||
Commonly used terms
|
Commonly used terms
|
||||||
-------------------
|
-------------------
|
||||||
|
@ -405,41 +405,41 @@ Commonly used terms
|
||||||
Here are some style guidelines on commonly used terms throughout the
|
Here are some style guidelines on commonly used terms throughout the
|
||||||
documentation:
|
documentation:
|
||||||
|
|
||||||
* **Django** -- when referring to the framework, capitalize Django. It is
|
* **Django** -- when referring to the framework, capitalize Django. It is
|
||||||
lowercase only in Python code and in the djangoproject.com logo.
|
lowercase only in Python code and in the djangoproject.com logo.
|
||||||
|
|
||||||
* **e-mail** -- it has a hyphen.
|
* **e-mail** -- it has a hyphen.
|
||||||
|
|
||||||
* **MySQL**
|
* **MySQL**
|
||||||
|
|
||||||
* **PostgreSQL**
|
* **PostgreSQL**
|
||||||
|
|
||||||
* **Python** -- when referring to the language, capitalize Python.
|
* **Python** -- when referring to the language, capitalize Python.
|
||||||
|
|
||||||
* **realize**, **customize**, **initialize**, etc. -- use the American
|
* **realize**, **customize**, **initialize**, etc. -- use the American
|
||||||
"ize" suffix, not "ise."
|
"ize" suffix, not "ise."
|
||||||
|
|
||||||
* **SQLite**
|
* **SQLite**
|
||||||
|
|
||||||
* **subclass** -- it's a single word without a hyphen, both as a verb
|
* **subclass** -- it's a single word without a hyphen, both as a verb
|
||||||
("subclass that model") and as a noun ("create a subclass").
|
("subclass that model") and as a noun ("create a subclass").
|
||||||
|
|
||||||
* **Web**, **World Wide Web**, **the Web** -- note Web is always
|
* **Web**, **World Wide Web**, **the Web** -- note Web is always
|
||||||
capitalized when referring to the World Wide Web.
|
capitalized when referring to the World Wide Web.
|
||||||
|
|
||||||
* **Web site** -- use two words, with Web capitalized.
|
* **Web site** -- use two words, with Web capitalized.
|
||||||
|
|
||||||
Django-specific terminology
|
Django-specific terminology
|
||||||
---------------------------
|
---------------------------
|
||||||
|
|
||||||
* **model** -- it's not capitalized.
|
* **model** -- it's not capitalized.
|
||||||
|
|
||||||
* **template** -- it's not capitalized.
|
* **template** -- it's not capitalized.
|
||||||
|
|
||||||
* **URLconf** -- use three capitalized letters, with no space before
|
* **URLconf** -- use three capitalized letters, with no space before
|
||||||
"conf."
|
"conf."
|
||||||
|
|
||||||
* **view** -- it's not capitalized.
|
* **view** -- it's not capitalized.
|
||||||
|
|
||||||
Committing code
|
Committing code
|
||||||
===============
|
===============
|
||||||
|
|
|
@ -678,7 +678,7 @@ an object to it's string value before being passed to your function::
|
||||||
|
|
||||||
@template.stringfilter
|
@template.stringfilter
|
||||||
def lower(value):
|
def lower(value):
|
||||||
return value.lower()
|
return value.lower()
|
||||||
|
|
||||||
Writing custom template tags
|
Writing custom template tags
|
||||||
----------------------------
|
----------------------------
|
||||||
|
|
Loading…
Reference in New Issue