newforms-admin: Merged to [4961]

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4962 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 19 insertions, 28 deletions

diff --git a/docs/documentation.txt b/docs/documentation.txt
index bacfb176b1..e72dd47ba1 100644
--- a/docs/documentation.txt
+++ b/docs/documentation.txt
@@ -42,25 +42,25 @@ On the Web
 
 The most recent version of the Django documentation lives at
 http://www.djangoproject.com/documentation/ . These HTML pages are generated
-automatically from the text files in source control every 15 minutes. 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,
+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 available to users of the Django development version. (See
 "Differences between versions" below.)
 
-A key advantage of the Web-based documentation is the comment section at the
-bottom of each document. This is an area for anybody to submit changes,
-corrections and suggestions about the given document. The Django developers
-frequently monitor the comments there and use them to improve the documentation
-for everybody.
+We encourage you to help improve the docs by submitting changes, corrections
+and suggestions in the `ticket system`_. The Django developers actively monitor
+the ticket system and use your feedback to improve the documentation for
+everybody.
 
-We encourage you to help improve the docs: it's easy! Note, however, that
-comments should explicitly relate to the documentation, rather than asking
-broad tech-support questions. If you need help with your particular Django
-setup, try the `django-users mailing list`_ instead of posting a comment to the
-documentation.
+Note, however, that tickets should explicitly relate to the documentation,
+rather than asking broad tech-support questions. If you need help with your
+particular Django setup, try the `django-users mailing list`_ or the
+`#django IRC channel`_ instead.
 
+.. _ticket system: http://code.djangoproject.com/simpleticket?component=Documentation
 .. _django-users mailing list: http://groups.google.com/group/django-users
+.. _#django IRC channel: irc://irc.freenode.net/django
 
 In plain text
 -------------
@@ -134,14 +134,6 @@ We follow this policy:
       frozen document that says "These docs are frozen for Django version XXX"
       and links to the current version of that document.
 
-    * Once a document is frozen for a Django release, we remove comments from
-      that page, in favor of having comments on the latest version of that
-      document. This is for the sake of maintainability and usability, so that
-      users have one, and only one, place to leave comments on a particular
-      document. We realize that some people may be stuck on a previous version
-      of Django, but we believe the usability problems with multiple versions
-      of a document the outweigh the benefits.
-
     * The `main documentation Web page`_ includes links to documentation for
       all previous versions.
 
diff --git a/docs/modpython.txt b/docs/modpython.txt
index 31ec1efe49..37909a09fd 100644
--- a/docs/modpython.txt
+++ b/docs/modpython.txt
@@ -57,17 +57,16 @@ on it, you'll need to tell mod_python::
 
 .. caution::
 
-    Is you are using Windows, remember that the path will contain backslashes.
+    If you're using Windows, remember that the path will contain backslashes.
     This string is passed through Python's string parser twice, so you need to
     escape each backslash **twice**::
 
         PythonPath "['c:\\\\path\\\\to\\\\project'] + sys.path"
 
-    or use raw strings::
+    Or, use raw strings::
 
         PythonPath "[r'c:\\path\\to\\project'] + sys.path"
 
-
 You can also add directives such as ``PythonAutoReload Off`` for performance.
 See the `mod_python documentation`_ for a full list of options.
 
@@ -161,7 +160,7 @@ If, however, you have no option but to serve media files on the same Apache
 ``VirtualHost`` as Django, here's how you can turn off mod_python for a
 particular part of the site::
 
-    <Location "/media/">
+    <Location "/media">
         SetHandler None
     </Location>
 
@@ -178,7 +177,7 @@ the ``media`` subdirectory and any URL that ends with ``.jpg``, ``.gif`` or
         SetEnv DJANGO_SETTINGS_MODULE mysite.settings
     </Location>
 
-    <Location "media">
+    <Location "/media">
         SetHandler None
     </Location>
 
diff --git a/docs/request_response.txt b/docs/request_response.txt
index 40f06c859f..c0272461ca 100644
--- a/docs/request_response.txt
+++ b/docs/request_response.txt
@@ -483,8 +483,8 @@ In order to use the ``Http404`` exception to its fullest, you should create a
 template that is displayed when a 404 error is raised. This template should be
 called ``404.html`` and located in the top level of your template tree.
 
-Customing error views
----------------------
+Customizing error views
+-----------------------
 
 The 404 (page not found) view
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~