From 4e2f580a5618f9d7169d23e71ff1470916fef39e Mon Sep 17 00:00:00 2001
From: Kristina Chodorow <kristina@php.net>
Date: Thu, 25 Feb 2010 16:22:04 +0000
Subject: [PATCH] logout and install notes

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@295504 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongo/configure.xml            | 42 ++++++++++++++++++++----
 reference/mongo/mongodb/authenticate.xml | 13 ++++++++
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/reference/mongo/configure.xml b/reference/mongo/configure.xml
index 6e36abfaf4..ffaed9b453 100644
--- a/reference/mongo/configure.xml
+++ b/reference/mongo/configure.xml
@@ -20,7 +20,7 @@
 $ sudo pecl install mongo
 
 ]]>
-    </programlisting>
+   </programlisting>
   </para>
 
   <para>
@@ -29,7 +29,11 @@ $ sudo pecl install mongo
 <![CDATA[
 extension=mongo.so
 ]]>
-    </programlisting>
+   </programlisting>
+  </para>
+
+  <para>
+   If pecl runs out of memory, make sure memory_limit in php.ini is set to at least 32M.
   </para>
  </section>
 
@@ -101,12 +105,22 @@ $ sudo make install
    </para>
    
    <para>
-    Precompiled binaries are available from 
+    If you are using XAMPP, you may be able to compile the driver with the 
+    following command:
+    <programlisting>
+<![CDATA[
+sudo /Applications/XAMPP/xamppfiles/bin/pecl install mongo
+]]>
+    </programlisting>
+   </para>
+
+   <para>
+    If you are using MAMP (or XAMPP and the above command does not work), 
+    precompiled binaries are available from 
     <link xlink:href="&url.mongodb.github.downloads;">Github</link>
     (download the latest one with "osx" in the name that matches your version of 
-    PHP).  These for use with MAMP and XAMPP, which come without the headers 
-    necessary to compile the extension from scratch.  Extract mongo.so from the 
-    archive and add it to MAMP or XAMPP's extension directory.  Add 
+    PHP).  Extract mongo.so from the archive and add it to MAMP or XAMPP's 
+    extension directory.  Add 
     <programlisting>
 <![CDATA[
       extension=mongo.so
@@ -130,6 +144,22 @@ $ phpize && aclocal && autoconf && ./configure && make && make install
     (Thanks to <link xlink:href="&url.mongodb.tweet.gentoo;">@riklaunim</link>)
    </para>
   </section>
+  <section>
+   <title>Fedora</title>
+   <para>
+    If you don't want to modify php.ini directly, you can create a separate 
+    mongo.ini file. Within the /etc/php.d directory, create a subdirectory named
+    mongo (or something else you like). In the mongo directory, create a 
+    mongo.ini file.  Put the following in your mongo.ini file:
+    <programlisting>
+<![CDATA[
+extension=mongo.so
+
+; any other mongo options you'd like (see the Runtime Configuration section) 
+]]>
+    </programlisting>
+   </para>
+  </section>
  </section>
 
  <section>
diff --git a/reference/mongo/mongodb/authenticate.xml b/reference/mongo/mongodb/authenticate.xml
index 0cc669c4e9..e37f58eab6 100644
--- a/reference/mongo/mongodb/authenticate.xml
+++ b/reference/mongo/mongodb/authenticate.xml
@@ -36,6 +36,19 @@ $result = $db->command(array("authenticate" => 1,
     "nonce" => $nonce["nonce"],
     "key" => $saltedHash);
 
+?>
+]]>
+   </programlisting>
+  </para>
+  <para>
+   Once a connection has been authenticated, it can only be un-authenticated by 
+   using the "logout" database command:
+   <programlisting role="php">
+<![CDATA[
+<?php
+
+$db->command(array("logout" => 1));
+
 ?>
 ]]>
    </programlisting>