From 51d114e7becf486263e3f2104f0a047f61818b54 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Sat, 17 Sep 2005 10:25:08 +0000
Subject: [PATCH] SID inconsistency (spotted by David Vance)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@196242 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/session/functions/session-id.xml | 7 +++----
 reference/session/reference.xml            | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reference/session/functions/session-id.xml b/reference/session/functions/session-id.xml
index 22da964fe8..caea14ca82 100644
--- a/reference/session/functions/session-id.xml
+++ b/reference/session/functions/session-id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/session.xml, last change in rev 1.2 -->
 <refentry id="function.session-id">
  <refnamediv>
@@ -19,9 +19,8 @@
   <para>
    The constant <systemitem>SID</systemitem> can also be used to
    retrieve the current name and session id as a string suitable for
-   adding to URLs. Note that <systemitem>SID</systemitem> is only defined if
-   the client didn't send the right cookie. See also <link
-   linkend="ref.session">Session handling</link>.
+   adding to URLs. See also <link linkend="ref.session">Session
+   handling</link>.
   </para>
  </refsect1>
 
diff --git a/reference/session/reference.xml b/reference/session/reference.xml
index 8f533286c1..dbdae322fb 100644
--- a/reference/session/reference.xml
+++ b/reference/session/reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.51 $ -->
+<!-- $Revision: 1.52 $ -->
 <!-- Purpose: basic.session -->
 <!-- Membership: core -->
 
@@ -352,7 +352,7 @@ if (! isset($_SESSION['count'])) {
     </para>
     <para>
      Alternatively, you can use the constant <literal>SID</literal> which is
-     always defined.  If the client did not send an appropriate session
+     defined if the session started.  If the client did not send an appropriate session
      cookie, it has the form <literal>session_name=session_id</literal>.
      Otherwise, it expands to an empty string. Thus, you can embed it
      unconditionally into URLs.