From 12f4db23aaabc99e68c13198c8813888da079282 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 29 Oct 2015 16:56:16 -0400
Subject: [PATCH] [1.8.x] Fixed #25489 -- Documented that
 SESSION_SAVE_EVERY_REQUEST doesn't create empty sessions.

Backport of abf5ccc29c45d53ec17541179bb5f0a75b28915d from master
---
 docs/ref/settings.txt    | 3 ++-
 docs/releases/1.4.22.txt | 3 ++-
 docs/releases/1.7.10.txt | 3 ++-
 docs/releases/1.8.4.txt  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 1ccd16ba48..734218df86 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -3166,7 +3166,8 @@ Default: ``False``
 
 Whether to save the session data on every request. If this is ``False``
 (default), then the session data will only be saved if it has been modified --
-that is, if any of its dictionary values have been assigned or deleted.
+that is, if any of its dictionary values have been assigned or deleted. Empty
+sessions won't be created, even if this setting is active.
 
 .. setting:: SESSION_SERIALIZER
 
diff --git a/docs/releases/1.4.22.txt b/docs/releases/1.4.22.txt
index 9f8177440f..bed56d42e7 100644
--- a/docs/releases/1.4.22.txt
+++ b/docs/releases/1.4.22.txt
@@ -21,7 +21,8 @@ by sending repeated requests, potentially filling up the session store or
 causing other users' session records to be evicted.
 
 The :class:`~django.contrib.sessions.middleware.SessionMiddleware` has been
-modified to no longer create empty session records.
+modified to no longer create empty session records, including when
+:setting:`SESSION_SAVE_EVERY_REQUEST` is active.
 
 Additionally, the ``contrib.sessions.backends.base.SessionBase.flush()`` and
 ``cache_db.SessionStore.flush()`` methods have been modified to avoid creating
diff --git a/docs/releases/1.7.10.txt b/docs/releases/1.7.10.txt
index 38af4a42ce..7fb8e85a55 100644
--- a/docs/releases/1.7.10.txt
+++ b/docs/releases/1.7.10.txt
@@ -17,7 +17,8 @@ by sending repeated requests, potentially filling up the session store or
 causing other users' session records to be evicted.
 
 The :class:`~django.contrib.sessions.middleware.SessionMiddleware` has been
-modified to no longer create empty session records.
+modified to no longer create empty session records, including when
+:setting:`SESSION_SAVE_EVERY_REQUEST` is active.
 
 Additionally, the ``contrib.sessions.backends.base.SessionBase.flush()`` and
 ``cache_db.SessionStore.flush()`` methods have been modified to avoid creating
diff --git a/docs/releases/1.8.4.txt b/docs/releases/1.8.4.txt
index e894936bcc..ee36c41fbc 100644
--- a/docs/releases/1.8.4.txt
+++ b/docs/releases/1.8.4.txt
@@ -17,7 +17,8 @@ by sending repeated requests, potentially filling up the session store or
 causing other users' session records to be evicted.
 
 The :class:`~django.contrib.sessions.middleware.SessionMiddleware` has been
-modified to no longer create empty session records.
+modified to no longer create empty session records, including when
+:setting:`SESSION_SAVE_EVERY_REQUEST` is active.
 
 Bugfixes
 ========