Merge up to 5.0.2

diff --git a/CHANGES.html b/CHANGES.html
index 48ec68a27c1668eed8cdcee7263c72092623fbe0..ccbbd95f673b373b6836fad10e2f447ddef95bed 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -42,6 +42,26 @@ href="README.upgrades.html">README.upgrades</a> before upgrading.</p>
 
   </div>
 
+<h2>Changes up to version 5.0.2</h2>
+
+<div class=section>
+
+<p>The login form now indicates that a cookie will be set.</p>
+
+</div>
+
+<h2>Changes up to version 5.0.1</h2>
+
+<div class=section>
+
+<h3>Disobedience</h3>
+
+<div class=section>
+
+<p>The sense of the Control &#x2192; Playing menu item was fixed.</p>
+
+</div>
+
 </div>
 
 <h2>Changes up to version 5.0</h2>

diff --git a/templates/login.tmpl b/templates/login.tmpl
index 47bc334c5a22837bcc39c26dfa661974df98ef70..972ed93c534e0fcbff7e7509c19411ebae5e77b2 100644 (file)
--- a/templates/login.tmpl
+++ b/templates/login.tmpl
@@ -74,6 +74,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    your email address, and if a reminder has been sent too recently
    then it won't be possible to send one.</p>
 
+   <p>Logging in will set a cookie.  This cookie is only used for
+   authentication purposes.  Do not log in if you do not consent to this cookie
+   being set.  The cookie should be deleted when you log out, and will
+   eventually expire in any case.</p>
+
    <form class=reminder action="@url" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=login>