From 17918575fdc88641f6cae627a55eddee1f8a0186 Mon Sep 17 00:00:00 2001
From: Kristina Chodorow <kristina@php.net>
Date: Thu, 18 Mar 2010 22:57:50 +0000
Subject: [PATCH] added vc6 build links

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@296365 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mongo/configure.xml | 52 ++++++++++++++++++++++-------------
 reference/mongo/ini.xml       |  2 +-
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/reference/mongo/configure.xml b/reference/mongo/configure.xml
index a5242bd217..00c7a1e610 100644
--- a/reference/mongo/configure.xml
+++ b/reference/mongo/configure.xml
@@ -222,26 +222,12 @@ extension=mongo.so
   <title>Installing on Windows</title>
 
   <para>
-   Precompiled binaries are available for a variety of combinations of versions,
-   thread safety, and VC libraries. Unzip the archive and put php_mongo.dll in 
-   your PHP extension directory ("ext" by default).
+   Precompiled binaries for each release are available from 
+   <link xlink:href="&url.mongodb.github.downloads;">Github</link> for a variety
+   of combinations of versions, thread safety, and VC libraries. Unzip the 
+   archive and put php_mongo.dll in your PHP extension directory ("ext" by 
+   default).
   </para>
-  <itemizedlist>
-   <listitem>
-    <para>
-     <link xlink:href="&url.mongodb.github.downloads;">
-      PHP 5.3 VC8 and VC9 Mongo extension
-     </link>
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <link xlink:href="&url.mongodb.vc6;">
-      PHP 5.2 and 5.3 VC6 Mongo extension
-     </link> (you have to search the page for "mongo")
-    </para>
-   </listitem>
-  </itemizedlist>
 
   <para>
    The latest (non-release) code is compiled into Windows binaries on every 
@@ -255,6 +241,34 @@ extension=mongo.so
    corresponding to the PHP you have installed:
   </para>
   <itemizedlist>
+   <listitem>
+    <para>
+     <link xlink:href="&url.mongodb.vc652;">
+      PHP 5.2 VC6 Non-Thread-Safe Mongo extension
+     </link>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <link xlink:href="&url.mongodb.vc6ts52;">
+      PHP 5.2 VC6 Thread-Safe Mongo extension
+     </link>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <link xlink:href="&url.mongodb.vc6;">
+      PHP 5.3 VC6 Non-Thread-Safe Mongo extension
+     </link>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <link xlink:href="&url.mongodb.vc6ts;">
+      PHP 5.3 VC6 Thread-Safe Mongo extension
+     </link>
+    </para>
+   </listitem>
    <listitem>
     <para>
      <link xlink:href="&url.mongodb.vc8;">
diff --git a/reference/mongo/ini.xml b/reference/mongo/ini.xml
index 4abf63234a..7acefb3dde 100644
--- a/reference/mongo/ini.xml
+++ b/reference/mongo/ini.xml
@@ -150,7 +150,7 @@
       applications that insert non-UTF8 strings, you can turn this option off to
       emulate the old, non-exception-throwning behavior.  This option will be
       eliminated and exceptions always thrown for non-UTF8 strings starting with
-      version 1.0.6.
+      version 1.1.0.
      </para>
     </listitem>
    </varlistentry>