From: Eric Covener <covener@apache.org>
Date: Sun, 6 Jul 2014 21:58:08 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.2.28~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2b7c4079b206d7e52e58e1be069616d52d7a5e1;p=thirdparty%2Fapache%2Fhttpd.git

xforms


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1608305 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en
index 33c503db493..d31ade779cf 100644
--- a/docs/manual/rewrite/flags.html.en
+++ b/docs/manual/rewrite/flags.html.en
@@ -148,12 +148,11 @@ security model.</dd>
 <dl>
 <dt>Lifetime</dt>
 <dd>The time for which the cookie will persist, in minutes.</dd>
-<dd>By default, the cookie will persist only for the
-current browser session. If you need to specify any later
-parameter (Path, Secure, httponly), it is not currently
-possible to explicitly configure session lifetime. Note:
-Previous versions of this documentation erroneouly stated
-otherwise.</dd>
+<dd>A value of 0 indicates that the cookie will persist only for the
+current browser session. This is the default value if none is
+specified.  Prior to 2.2.28, a value of 0 indicates immediate expiration
+and it was not possible to specify session lifetime if any later 
+parameters (Path, Secure, httponly) were specified</dd>
 
 <dt>Path</dt>
 <dd>The path, on the current website, for which the cookie is valid,
diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr
index 54ab2125325..11a410462bb 100644
--- a/docs/manual/rewrite/flags.xml.fr
+++ b/docs/manual/rewrite/flags.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1588759 -->
+<!-- English Revision: 1588759:1608304 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta
index 912229af035..e4f3ee6f495 100644
--- a/docs/manual/rewrite/flags.xml.meta
+++ b/docs/manual/rewrite/flags.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>