Removed several deprecated features for 1.0 (refs #7830):

 * "simple" cache backend
 * `ObjectPaginator`
 * `edit_inline_type` argument for `ForeignKey` fields
 * `QOperator`, `QNot`, `QAnd` and `QOr`
 * `maxlength` argument 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8191 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 4 insertions, 30 deletions

diff --git a/docs/cache.txt b/docs/cache.txt
index 392fef8f5b..d22dd91994 100644
--- a/docs/cache.txt
+++ b/docs/cache.txt
@@ -159,19 +159,6 @@ cache is multi-process and thread-safe. To use it, set ``CACHE_BACKEND`` to
 
     CACHE_BACKEND = 'locmem:///'
 
-Simple caching (for development)
---------------------------------
-
-A simple, single-process memory cache is available as ``"simple:///"``. This
-merely saves cached data in-process, which means it should only be used in
-development or testing environments. For example::
-
-    CACHE_BACKEND = 'simple:///'
-
-**New in Django development version:** This cache backend is deprecated and
-will be removed in a future release. New code should use the ``locmem`` backend
-instead.
-
 Dummy caching (for development)
 -------------------------------
 
diff --git a/docs/model-api.txt b/docs/model-api.txt
index 9b3132e082..f624e68844 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -144,10 +144,6 @@ The admin represents this as an ``<input type="text">`` (a single-line input).
 (in characters) of the field. The max_length is enforced at the database level
 and in Django's validation.
 
-Django veterans: Note that the argument is now called ``max_length`` to
-provide consistency throughout Django. There is full legacy support for
-the old ``maxlength`` argument, but ``max_length`` is preferred.
-
 ``CommaSeparatedIntegerField``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/pagination.txt b/docs/pagination.txt
index 28b381ac12..094c86301f 100644
--- a/docs/pagination.txt
+++ b/docs/pagination.txt
@@ -137,12 +137,3 @@ Attributes
 ``number`` -- The 1-based page number for this page.
 
 ``paginator`` -- The associated ``Paginator`` object.
-
-The legacy ``ObjectPaginator`` class
-====================================
-
-The ``Paginator`` and ``Page`` classes are new in the Django development
-version, as of revision 7306. In previous versions, Django provided an
-``ObjectPaginator`` class that offered similar functionality but wasn't as
-convenient. This class still exists, for backwards compatibility, but Django
-now issues a ``DeprecationWarning`` if you try to use it.
diff --git a/docs/sessions.txt b/docs/sessions.txt
index 648832b85d..b5c9ba8394 100644
--- a/docs/sessions.txt
+++ b/docs/sessions.txt
@@ -65,10 +65,10 @@ you've configured your cache; see the `cache documentation`_ for details.
 .. note::
 
     You should probably only use cache-based sessions if you're using the
-    memcached cache backend. The local memory and simple cache backends
-    don't retain data long enough to be good choices, and it'll be faster
-    to use file or database sessions directly instead of sending everything
-    through the file or database cache backends.
+    Memcached cache backend. The local-memory cache backend doesn't retain data
+    long enough to be a good choice, and it'll be faster to use file or
+    database sessions directly instead of sending everything through the file
+    or database cache backends.
 
 Using sessions in views
 =======================