Commit 23f012db authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

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
parent 1156db79
Loading
Loading
Loading
Loading
+12 −10
Original line number Diff line number Diff line
@@ -2,19 +2,21 @@ Django is a high-level Python Web framework that encourages rapid development
and clean, pragmatic design.

All documentation is in the "docs" directory and online at
http://www.djangoproject.com/documentation/.  If you're just getting started,
here's how we recommend you read the docs:
http://docs.djangoproject.com/en/dev/. If you're just getting started, here's
how we recommend you read the docs:

    * First, read docs/install.txt for instructions on installing Django.
    * First, read docs/intro/install.txt for instructions on installing Django.

    * Next, work through the tutorials in order (docs/tutorial01.txt,
      docs/tutorial02.txt, etc.).
    * Next, work through the tutorials in order (docs/intro/tutorial01.txt,
      docs/intro/tutorial02.txt, etc.).

    * If you want to set up an actual deployment server, read docs/modpython.txt
      for instructions on running Django under mod_python.
    * If you want to set up an actual deployment server, read
      docs/howto/deployment/modpython.txt for instructions on running Django
      under mod_python.

    * The rest of the documentation is of the reference-manual variety.
      Read it -- and the FAQ -- as you run into problems.
    * You'll probably want to read through the topical guides (in docs/topics)
      next; from there you can jump to the HOWTOs (in docs/howto) for specific
      problems, and check out the reference (docs/ref) for gory details.

Docs are updated rigorously. If you find any problems in the docs, or think they
should be clarified in any way, please take 30 seconds to fill out a ticket
@@ -25,7 +27,7 @@ http://code.djangoproject.com/newticket
To get more help:

    * Join the #django channel on irc.freenode.net. Lots of helpful people
      hang out there. Read the archives at http://simon.bofh.ms/logger/django/ .
      hang out there. Read the archives at http://oebfare.com/logger/django/.

    * Join the django-users mailing list, or read the archives, at
      http://groups.google.com/group/django-users.
+5 −5
Original line number Diff line number Diff line
@@ -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?
+0 −8
Original line number Diff line number Diff line
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.
+0 −8
Original line number Diff line number Diff line
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
+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ On the Web
----------

The most recent version of the Django documentation lives at
http://www.djangoproject.com/documentation/ . These HTML pages are generated
http://docs.djangoproject.com/en/dev/. These HTML pages are generated
automatically from the text files in source control. That means they reflect the
"latest and greatest" in Django -- they include the very latest corrections and
additions, and they discuss the latest Django features, which may only be
@@ -231,4 +231,4 @@ We follow this policy:
    * The `main documentation Web page`_ includes links to documentation for
      all previous versions.

.. _main documentation Web page: http://www.djangoproject.com/documentation/
.. _main documentation Web page: http://docs.djangoproject.com/en/dev/
Loading