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

7 files changed, 14 insertions, 16 deletions

diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index 995e30fdc8..63e39966df 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -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/
diff --git a/docs/man/daily_cleanup.1 b/docs/man/daily_cleanup.1
index 9186dd67d6..444d4d0e6e 100644
--- a/docs/man/daily_cleanup.1
+++ b/docs/man/daily_cleanup.1
@@ -22,7 +22,7 @@ It should be in Python-import form, e.g. "myproject.settings".
 .SH "SEE ALSO"
 The sessions documentation:
 .sp
-.I http://www.djangoproject.com/documentation/sessions/
+.I http://docs.djangoproject.com/en/dev/topics/http/sessions/
 
 .SH "AUTHORS/CREDITS"
 Originally developed at World Online in Lawrence, Kansas, USA. Refer to the
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 7f65fd0644..6407ee5e1d 100644
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
@@ -168,7 +168,7 @@ It should be in Python-import form, e.g. "myproject.settings".
 Full descriptions of all these options, with examples, as well as documentation
 for the rest of the Django framework, can be found on the Django site:
 .sp
-.I http://www.djangoproject.com/documentation/
+.I http://docs.djangoproject.com/en/dev/
 .sp
 or in the distributed documentation.
 .SH "AUTHORS/CREDITS"
diff --git a/docs/releases/1.0-alpha-1.txt b/docs/releases/1.0-alpha-1.txt
index 1b13b7c58a..caee575cb2 100644
--- a/docs/releases/1.0-alpha-1.txt
+++ b/docs/releases/1.0-alpha-1.txt
@@ -33,8 +33,8 @@ Refactored admin application (newforms-admin)
     and redesigned with extensibility and customization in mind. Full
     documentation for the admin application is available online in the
     official Django documentation:
-    
-         http://www.djangoproject.com/documentation/admin/
+
+        :ref:`admin reference <ref-contrib-admin>`
 
 Improved Unicode handling
     Django's internals have been refactored to use Unicode throughout;
@@ -44,8 +44,8 @@ Improved Unicode handling
     third-party libraries and systems which may or may not handle
     Unicode gracefully. Details are available in Django's
     Unicode-handling documentation:
-    
-         http://www.djangoproject.com/documentation/unicode/
+
+         :ref:`unicode reference <ref-unicode>`
 
 An improved Django ORM
     Django's object-relational mapper -- the component which provides
@@ -68,9 +68,7 @@ Automatic escaping of template variables
     and allows both variables and larger template constructs to be
     marked as safe (requiring no escaping) or unsafe (requiring
     escaping). A full guide to this feature is in the documentation
-    for the Django template system:
-    
-        http://www.djangoproject.com/documentation/templates/#automatic-html-escaping
+    for the :ttag:`autoescape` tag.
 
 There are many more new features, many bugfixes and many enhancements
 to existing features from previous releases. The ``newforms`` library,
@@ -87,7 +85,7 @@ complete guide to these changes will be available as part of the final
 Django 1.0 release, and a comprehensive list of backwards-incompatible
 changes is also available on the Django wiki for those who want to
 begin developing and testing their upgrade process:
-    
+
     http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
 
 
@@ -158,7 +156,7 @@ to join the discussions there.
 Django's online documentation also includes pointers on how to
 contribute to Django:
 
-    http://www.djangoproject.com/documentation/contributing/
+    :ref:`contributing to Django <internals-contributing>`
 
 Contributions on any level -- developing code, writing
 documentation or simply triaging tickets and helping to test proposed
diff --git a/docs/releases/1.0-alpha-2.txt b/docs/releases/1.0-alpha-2.txt
index 8916678ad5..5cbd777204 100644
--- a/docs/releases/1.0-alpha-2.txt
+++ b/docs/releases/1.0-alpha-2.txt
@@ -131,7 +131,7 @@ to join the discussions there.
 Django's online documentation also includes pointers on how to
 contribute to Django:
 
-    http://www.djangoproject.com/documentation/contributing/
+    :ref:`contributing to Django <internals-contributing>`
 
 Contributions on any level -- developing code, writing
 documentation or simply triaging tickets and helping to test proposed
diff --git a/docs/releases/1.0-beta-2.txt b/docs/releases/1.0-beta-2.txt
index 0cf22f2a64..89b9233576 100644
--- a/docs/releases/1.0-beta-2.txt
+++ b/docs/releases/1.0-beta-2.txt
@@ -114,7 +114,7 @@ to join the discussions there.
 Django's online documentation also includes pointers on how to
 contribute to Django:
 
-    http://www.djangoproject.com/documentation/contributing/
+    :ref:`contributing to Django <internals-contributing>`
 
 Contributions on any level -- developing code, writing
 documentation or simply triaging tickets and helping to test proposed
diff --git a/docs/releases/1.0-beta.txt b/docs/releases/1.0-beta.txt
index 69f15e7f2d..c1957a75a4 100644
--- a/docs/releases/1.0-beta.txt
+++ b/docs/releases/1.0-beta.txt
@@ -148,7 +148,7 @@ to join the discussions there.
 Django's online documentation also includes pointers on how to
 contribute to Django:
 
-    http://www.djangoproject.com/documentation/contributing/
+    :ref:`contributing to Django <internals-contributing>`
 
 Contributions on any level -- developing code, writing
 documentation or simply triaging tickets and helping to test proposed