svn commit - mysqldoc@docsrva: r11328 - in trunk: . dynamic-docs/build-configure

[paul.dubois]

Author: paul
Date: 2008-07-23 18:02:22 +0200 (Wed, 23 Jul 2008)
New Revision: 11328

Log:
 r32880@frost:  paul | 2008-07-23 10:48:10 -0500
 Update build options (mysqld.xml)
 Remove obsolete file (buildoptions.xml)


Removed:
   trunk/dynamic-docs/build-configure/buildoptions.xml
Modified:
   trunk/dynamic-docs/build-configure/mysqld.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32879
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32403
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32880
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32403


Modified: trunk/dynamic-docs/build-configure/mysqld.xml
===================================================================
--- trunk/dynamic-docs/build-configure/mysqld.xml	2008-07-23 16:02:15 UTC (rev 11327)
+++ trunk/dynamic-docs/build-configure/mysqld.xml	2008-07-23 16:02:22 UTC (rev 11328)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 10; 1163 bytes

@@ -1596,22 +1596,15 @@
   </buildoption>
   <buildoption id="with-zlib-dir">
 
-    <formatbase format="--with-zlib-dir=DIR">
+    <formatbase format="--with-zlib-dir=no|bundled|DIR">
 
       <description>Provide MySQL with a custom location of compression
library</description>
 
     </formatbase>
-    <formatbase format="--with-zlib-dir">
-
-      <description>Provide MySQL with a custom location of compression
library</description>
-
-    </formatbase>
     <versions>
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="6.0"/>
-      <introduced version="5.1.11"/>
-      <removed version="5.1.9"/>
     </versions>
 
   </buildoption>

@@ -1998,8 +1991,6 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="6.0"/>
-      <introduced version="5.1.11"/>
-      <removed version="5.1.9"/>
     </versions>
 
   </buildoption>