diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2008-09-02 16:42:13 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2008-09-02 16:42:13 +0000 |
| commit | 23f012dbfad47849ef6c8d9bf3181eb29cacb3e9 (patch) | |
| tree | bb1f9f2b0ad0f10e12fa125dfb9362ae0048fbff /django | |
| parent | 1156db790a27975108cb78cd49f0ee549a7da739 (diff) | |
Cleaned up a bunch of minor doc stuff:
* Removed flatpages/redirects README; no other contrib apps have those.
* Cleaned up top-level README to be more readable.
* Removed outdated references to old docs (Fixes #8701)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/conf/global_settings.py | 10 | ||||
| -rw-r--r-- | django/contrib/flatpages/README.TXT | 8 | ||||
| -rw-r--r-- | django/contrib/redirects/README.TXT | 8 |
3 files changed, 5 insertions, 21 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 33d8e5f7a3..9085120450 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -257,25 +257,25 @@ FILE_UPLOAD_TEMP_DIR = None FILE_UPLOAD_PERMISSIONS = None # Default formatting for date objects. See all available format strings here: -# http://www.djangoproject.com/documentation/templates/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now DATE_FORMAT = 'N j, Y' # Default formatting for datetime objects. See all available format strings here: -# http://www.djangoproject.com/documentation/templates/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now DATETIME_FORMAT = 'N j, Y, P' # Default formatting for time objects. See all available format strings here: -# http://www.djangoproject.com/documentation/templates/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now TIME_FORMAT = 'P' # Default formatting for date objects when only the year and month are relevant. # See all available format strings here: -# http://www.djangoproject.com/documentation/templates/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now YEAR_MONTH_FORMAT = 'F Y' # Default formatting for date objects when only the month and day are relevant. # See all available format strings here: -# http://www.djangoproject.com/documentation/templates/#now +# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now MONTH_DAY_FORMAT = 'F j' # Do you want to manage transactions manually? diff --git a/django/contrib/flatpages/README.TXT b/django/contrib/flatpages/README.TXT deleted file mode 100644 index d3071377f5..0000000000 --- a/django/contrib/flatpages/README.TXT +++ /dev/null @@ -1,8 +0,0 @@ -This is an optional add-on app, flatpages. - -For full documentation, see either of these: - - * The file docs/flatpages.txt in the Django distribution - * http://www.djangoproject.com/documentation/flatpages/ on the Web - -Both have identical content. diff --git a/django/contrib/redirects/README.TXT b/django/contrib/redirects/README.TXT deleted file mode 100644 index 3544904a40..0000000000 --- a/django/contrib/redirects/README.TXT +++ /dev/null @@ -1,8 +0,0 @@ -This is an optional add-on app, redirects. - -For full documentation, see either of these: - - * The file django/docs/redirects.txt in the Django distribution - * http://www.djangoproject.com/documentation/redirects/ on the Web - -Both have identical content.
\ No newline at end of file |