List:Commits« Previous MessageNext Message »
From:mcbrown Date:July 13 2007 9:21am
Subject:svn commit - mysqldoc@docsrva: r7111 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2 refman-common
View as plain text  
Author: mcbrown
Date: 2007-07-13 11:21:47 +0200 (Fri, 13 Jul 2007)
New Revision: 7111

Log:
Some layout changes to the installation section to make it a little easier to read and follow for the different platforms



Modified:
   trunk/refman-4.1/renamed-nodes.txt
   trunk/refman-5.0/renamed-nodes.txt
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-5.2/renamed-nodes.txt
   trunk/refman-common/connector-odbc.xml


Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt	2007-07-13 01:39:27 UTC (rev 7110)
+++ trunk/refman-4.1/renamed-nodes.txt	2007-07-13 09:21:47 UTC (rev 7111)
Changed blocks: 14, Lines Added: 26, Lines Deleted: 23; 8009 bytes

@@ -18,9 +18,13 @@
 # Lines beginning with # in column one are interpreted as
 # comments and ignored.
 #
-access97-export myodbc-usagenotes-apptips-microsoft-access
+Forcing_recovery forcing-recovery
+Installing_source_tree installing-source-tree
+Using_Stack_Trace using-stack-trace
+Windows_installation windows-installation
 access-denied-error myodbc-errors
 access-long-tables myodbc-usagenotes-apptips-microsoft-access
+access97-export myodbc-usagenotes-apptips-microsoft-access
 ado myodbc-usagenotes-apptips-microsoft-ado
 ado--rs-addnew myodbc-examples-programming-vb-ado
 answering-questions mailing-list-use

@@ -47,8 +51,8 @@
 cj-character-sets connector-j-reference-charsets
 cj-classpath connector-j-installing-classpath
 cj-configuration-properties connector-j-reference-configuration-properties
+cj-connect-with-drivermanager connector-j-usagenotes-connect-drivermanager
 cj-connection-pooling connector-j-usagenotes-j2ee-concepts-connection-pooling
-cj-connect-with-drivermanager connector-j-usagenotes-connect-drivermanager
 cj-faq connector-j-usagenotes-troubleshooting
 cj-general-j2ee-concepts connector-j-usagenotes-j2ee-concepts
 cj-implementation-notes connector-j-reference-implementation-notes

@@ -68,8 +72,8 @@
 cj-troubleshooting connector-j-usagenotes-troubleshooting
 cj-type-conversions connector-j-reference-type-conversions
 cj-understanding-transactions connector-j-usagenotes-j2ee-concepts-transactions
+cj-upgrading connector-j-installing-upgrading
 cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
-cj-upgrading connector-j-installing-upgrading
 cj-usage-advisor connector-j-reference-usage-advisor
 cj-using-callable-statements connector-j-usagenotes-statements-callable
 cj-using-ssl connector-j-reference-using-ssl

@@ -88,8 +92,8 @@
 contrib http://solutions.mysql.com/software/
 count-error myodbc-usagenotes-apptips-microsoft-vb-asp
 dao--rs-addnew myodbc-examples-programming-vb-dao
+data-source-name myodbc-configuration-dsn
 database-administration database-administration-statements
-data-source-name myodbc-configuration-dsn
 dbi-info perl
 dbi-with-dbd perl
 deleted-problem myodbc-usagenotes-apptips-microsoft-access

@@ -108,10 +112,9 @@
 fetching-spatial-data-in-internal-format fetching-spatial-data
 fetching-spatial-data-in-wkb-format fetching-spatial-data
 fetching-spatial-data-in-wkt-format fetching-spatial-data
-Forcing_recovery forcing-recovery
 fulltext-todo fulltext-search
+function-index ix01
 functionality myodbc-usagenotes-functionality
-function-index ix01
 gis-features-that-are-not-yet-implemented mysql-gis-conformance-and-compatibility
 gpl-license http://www.mysql.com/company/legal/licensing/opensource-license.html
 heap memory-storage-engine

@@ -121,13 +124,12 @@
 innodb-implicit-command-or-rollback innodb-implicit-commit
 innodb-start innodb-parameters
 installing-myodbc myodbc-installation
-Installing_source_tree installing-source-tree
 introduction-to-odbc myodbc-general-information
+is-null-optimisation is-null-optimization
 isam isam-storage-engine
-is-null-optimisation is-null-optimization
+java connector-j
 java-connector connector-j
 java-connector connector-j
-java connector-j
 left-join-optimisation left-join-optimization
 legal-names identifiers
 licenses http://www.mysql.com/company/legal/licensing/opensource-license.html

@@ -160,10 +162,10 @@
 mxj-jmx-agent connector-mxj-usagenotes-jmx-agent
 mxj-standard-environment connector-mxj-usagenotes-standard-environment
 mxj-supported connector-mxj-install-platforms
+mxj-test-requirements connector-mxj-installation-test-requirements
 mxj-testing- connector-mxj-installation-test-running
-mxj-test-requirements connector-mxj-installation-test-requirements
+myisam myisam-storage-engine
 myisamchk-syntax myisamchk
-myisam myisam-storage-engine
 myodbc-2-50 myodbc-versions
 myodbc-2-50-windows-building myodbc-installation-source-windows-2-50-building
 myodbc-3-51 myodbc-versions

@@ -179,6 +181,9 @@
 myodbc-examples-tools-tested myodbc-examples-tools
 myodbc-forum myodbc-support-community
 myodbc-hp-ux myodbc-installation-source-unix-hpux
+myodbc-installation-binary myodbc-installation
+myodbc-installation-obtaining myodbc-installation
+myodbc-installation-source myodbc-installation
 myodbc-introduction myodbc-introduction
 myodbc-mac-os-x myodbc-installation-source-unix-macosx
 myodbc-mailing-list myodbc-support-community

@@ -207,7 +212,6 @@
 myodbc-with-net myodbc-examples-programming-net
 myodbc-with-vb myodbc-examples-programming-vb
 mysql-apis apis
-mysqlcc client-utility-programs
 mysql-cluster-backup-using-management-server mysql-cluster-backup-using-management-client
 mysql-cluster-db-definition mysql-cluster-ndbd-definition
 mysql-cluster-limitations-in-4-1 mysql-cluster-limitations

@@ -215,19 +219,20 @@
 mysql-cluster-upgrade-downgrade-rolling mysql-cluster-rolling-restart
 mysql-connectors connectors
 mysql-database-administration database-administration
-mysqld-process mysql-cluster-mysqld-process
 mysql-floss-license-exception http://www.mysql.com/company/legal/licensing/opensource-license.html
 mysql-information-sources information-sources
 mysql-optimisation optimization
 mysql-tools-with-access myodbc-usagenotes-apptips-microsoft-access
+mysqlcc client-utility-programs
+mysqld-process mysql-cluster-mysqld-process
 name-case-sensitivity identifier-case-sensitivity
+ndb-mgm-command-options mysql-cluster-ndb-mgm-command-options
+ndb-mgm-process mysql-cluster-ndb-mgm-process
+ndb-mgmd-command-options mysql-cluster-ndb-mgmd-command-options
+ndb-mgmd-process mysql-cluster-ndb-mgmd-process
 ndbcluster mysql-cluster
 ndbd-command-options mysql-cluster-ndbd-command-options
 ndbd-process mysql-cluster-ndbd-process
-ndb-mgm-command-options mysql-cluster-ndb-mgm-command-options
-ndb-mgmd-command-options mysql-cluster-ndb-mgmd-command-options
-ndb-mgmd-process mysql-cluster-ndb-mgmd-process
-ndb-mgm-process mysql-cluster-ndb-mgm-process
 new-mysqld-command-options mysql-cluster-mysqld-command-options
 nocursor myodbc-errors
 nt-start windows-start-service

@@ -236,12 +241,12 @@
 nutshell-embedded-mysql mysql-4-0-nutshell
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
+odbc myodbc-introduction
+odbc odbc-connector
 odbc-and-last-insert-id myodbc-usagenotes-functionality-last-insert-id
 odbc-connector myodbc-connector
-odbc myodbc-introduction
 odbc-net-op-c-sharp-cp myodbc-examples-programming-net-csharp
 odbc-net-op-vb-cp  myodbc-examples-programming-net-vb
-odbc odbc-connector
 odbc-problems myodbc-bug-report
 open-tables table-cache
 optimisation table-optimization

@@ -252,12 +257,12 @@
 optimising-subqueries optimizing-subqueries
 optimising-the-server optimizing-the-server
 optimize-access myodbc-usagenotes-apptips-microsoft-access
+or-optimizations index-merge-optimization
 order-by-optimisation order-by-optimization
-or-optimizations index-merge-optimization
 other-vendor-column-types other-vendor-data-types
 parentheses operator-precedence
+performance myodbc-usagenotes-functionality-performance
 performance-figures mysql-cluster-performance-figures
-performance myodbc-usagenotes-functionality-performance
 perl-dbi-class perl
 programs-known-to-work-with-myodbc myodbc-usagenotes-apptips
 purge-logs purge-master-logs

@@ -294,7 +299,6 @@
 types-of-mysql-odbc-drivers myodbc-versions
 upgrading-grant-tables mysql-fix-privilege-tables
 using-mysqlcheck mysqlcheck
-Using_Stack_Trace using-stack-trace
 using-stack-trace resolve-stack-dump
 variables user-variables
 vb-types myodbc-usagenotes-apptips-microsoft-vb-asp

@@ -302,7 +306,6 @@
 where-to-get-myodbc myodbc-installation-obtaining
 win95-start windows-start-command-line
 windows-binary-installation windows-installation
-Windows_installation windows-installation
 windows-prepare-environment windows-create-option-file
 windows-running windows-testing
 windows-system-requirements windows-installation


Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt	2007-07-13 01:39:27 UTC (rev 7110)
+++ trunk/refman-5.0/renamed-nodes.txt	2007-07-13 09:21:47 UTC (rev 7111)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 1; 1242 bytes

@@ -284,6 +284,9 @@
 myodbc-examples-tools-tested myodbc-examples-tools
 myodbc-forum myodbc-support-community
 myodbc-hp-ux myodbc-installation-source-unix-hpux
+myodbc-installation-binary myodbc-installation
+myodbc-installation-obtaining myodbc-installation
+myodbc-installation-source myodbc-installation
 myodbc-introduction myodbc-introduction
 myodbc-mac-os-x myodbc-installation-source-unix-macosx
 myodbc-mailing-list myodbc-support-community

@@ -331,8 +334,8 @@
 mysql-cluster-news-4-1-7 ../../4.1/en/mysql-cluster-news-4-1-7
 mysql-cluster-news-4-1-8 ../../4.1/en/mysql-cluster-news-4-1-8
 mysql-cluster-news-4-1-9 ../../4.1/en/mysql-cluster-news-4-1-9
+mysql-cluster-startup-phases mysql-cluster-start-phases
 mysql-cluster-upgrade-downgrade-rolling mysql-cluster-rolling-restart
-mysql-cluster-startup-phases mysql-cluster-start-phases
 mysql-config-wizard-file-location mysql-config-wizard-starting-windows
 mysql-connectors connectors
 mysql-database-administration database-administration


Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2007-07-13 01:39:27 UTC (rev 7110)
+++ trunk/refman-5.1/renamed-nodes.txt	2007-07-13 09:21:47 UTC (rev 7111)
Changed blocks: 16, Lines Added: 52, Lines Deleted: 49; 13403 bytes

@@ -18,9 +18,13 @@
 # Lines beginning with # in column one are interpreted as
 # comments and ignored.
 #
-access97-export myodbc-usagenotes-apptips-microsoft-access
+Forcing_recovery forcing-recovery
+Installing_source_tree installing-source-tree
+Using_Stack_Trace using-stack-trace
+Windows_installation windows-installation
 access-denied-error myodbc-errors
 access-long-tables myodbc-usagenotes-apptips-microsoft-access
+access97-export myodbc-usagenotes-apptips-microsoft-access
 ado myodbc-usagenotes-apptips-microsoft-ado
 ado--rs-addnew myodbc-examples-programming-vb-ado
 answering-questions mailing-list-use

@@ -54,8 +58,8 @@
 cj-character-sets connector-j-reference-charsets
 cj-classpath connector-j-installing-classpath
 cj-configuration-properties connector-j-reference-configuration-properties
+cj-connect-with-drivermanager connector-j-usagenotes-connect-drivermanager
 cj-connection-pooling connector-j-usagenotes-j2ee-concepts-connection-pooling
-cj-connect-with-drivermanager connector-j-usagenotes-connect-drivermanager
 cj-faq connector-j-usagenotes-troubleshooting
 cj-general-j2ee-concepts connector-j-usagenotes-j2ee-concepts
 cj-implementation-notes connector-j-reference-implementation-notes

@@ -65,6 +69,22 @@
 cj-jboss-config connector-j-usagenotes-j2ee.html#connector-j-usagenotes-jboss
 cj-jdbc-reference connector-j-reference
 cj-jdbc-upgrading-issues connector-j-installing-upgrading-issues
+cj-replication-connection connector-j-reference-replication-connection
+cj-reporting-bugs connector-j-support-bug-report
+cj-retrieve-autoinc connector-j-usagenotes-last-insert-id
+cj-supported-java-versions connector-j-verions-java
+cj-supported-mysql-versions connector-j-versions
+cj-system-requirements connector-j-versions
+cj-tomcat-config connector-j-usagenotes-j2ee.html#connector-j-usagenotes-tomcat
+cj-troubleshooting connector-j-usagenotes-troubleshooting
+cj-type-conversions connector-j-reference-type-conversions
+cj-understanding-transactions connector-j-usagenotes-j2ee-concepts-transactions
+cj-upgrading connector-j-installing-upgrading
+cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
+cj-usage-advisor connector-j-reference-usage-advisor
+cj-using-callable-statements connector-j-usagenotes-statements-callable
+cj-using-ssl connector-j-reference-using-ssl
+cjk-faq faqs-cjk
 cjk-faq-access-perl-php-troubles faqs-cjk
 cjk-faq-available-cjk-charsets faqs-cjk
 cjk-faq-big5-charset-problems faqs-cjk

@@ -74,7 +94,6 @@
 cjk-faq-contact faqs-cjk
 cjk-faq-data-truncated faqs-cjk
 cjk-faq-euckr-charset-problems faqs-cjk
-cjk-faq faqs-cjk
 cjk-faq-fixing-cjk-problems faqs-cjk
 cjk-faq-fulltext-searches faqs-cjk
 cjk-faq-gb-charset-problems faqs-cjk

@@ -85,21 +104,6 @@
 cjk-faq-sorting-problems-unicode-1 faqs-cjk
 cjk-faq-sorting-problems-unicode-2 faqs-cjk
 cjk-faq-supplementary-chars-rejected faqs-cjk
-cj-replication-connection connector-j-reference-replication-connection
-cj-reporting-bugs connector-j-support-bug-report
-cj-retrieve-autoinc connector-j-usagenotes-last-insert-id
-cj-supported-java-versions connector-j-verions-java
-cj-supported-mysql-versions connector-j-versions
-cj-system-requirements connector-j-versions
-cj-tomcat-config connector-j-usagenotes-j2ee.html#connector-j-usagenotes-tomcat
-cj-troubleshooting connector-j-usagenotes-troubleshooting
-cj-type-conversions connector-j-reference-type-conversions
-cj-understanding-transactions connector-j-usagenotes-j2ee-concepts-transactions
-cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
-cj-upgrading connector-j-installing-upgrading
-cj-usage-advisor connector-j-reference-usage-advisor
-cj-using-callable-statements connector-j-usagenotes-statements-callable
-cj-using-ssl connector-j-reference-using-ssl
 client-side-overview client-utility-overview
 client-side-scripts client-utility-programs
 clients mysql-apis

@@ -115,11 +119,11 @@
 constraint-not-null constraint-invalid-data
 contrib http://solutions.mysql.com/software/
 count-error myodbc-usagenotes-apptips-microsoft-vb-asp
+custom-engine http://forge.mysql.com/wiki/MySQL_Internals_Custom_Engine
 custom-engine-api-reference-rnd_init http://forge.mysql.com/wiki/MySQL_Internals_Custom_Engine
-custom-engine http://forge.mysql.com/wiki/MySQL_Internals_Custom_Engine
 dao--rs-addnew myodbc-examples-programming-vb-dao
+data-source-name myodbc-configuration-dsn
 database-administration database-administration-statements
-data-source-name myodbc-configuration-dsn
 dbi-info perl
 dbi-with-dbd perl
 debugging-client        http://dev.mysql.com/doc/internals/en/debugging-client

@@ -139,8 +143,8 @@
 events-create create-event
 events-drop drop-event
 events-information-schema events-table
+events-show show-events
 events-show-create show-create-event
-events-show show-events
 export-of-data myodbc-examples-tools-with-access-export
 extending-mysqltest mysql-test-suite
 faq-security faqs-security

@@ -150,10 +154,9 @@
 fetching-spatial-data-in-internal-format fetching-spatial-data
 fetching-spatial-data-in-wkb-format fetching-spatial-data
 fetching-spatial-data-in-wkt-format fetching-spatial-data
-Forcing_recovery forcing-recovery
 fulltext-todo fulltext-search
+function-index ix01
 functionality myodbc-usagenotes-functionality
-function-index ix01
 gis-features-that-are-not-yet-implemented mysql-gis-conformance-and-compatibility
 gpl-license http://www.mysql.com/company/legal/licensing/opensource-license.html
 heap memory-storage-engine

@@ -164,14 +167,13 @@
 innodb-implicit-command-or-rollback innodb-implicit-commit
 innodb-start innodb-parameters
 installing-myodbc myodbc-installation
-Installing_source_tree installing-source-tree
 instance-manager-command-line-options instance-manager-command-options
 introduction-to-odbc myodbc-general-information
+is-null-optimisation is-null-optimization
 isam myisam-storage-engine
-is-null-optimisation is-null-optimization
+java connector-j
 java-connector connector-j
 java-connector connector-j
-java connector-j
 left-join-optimisation left-join-optimization
 legal-names identifiers
 licenses http://www.mysql.com/company/legal/licensing/opensource-license.html

@@ -205,10 +207,10 @@
 mxj-jmx-agent connector-mxj-usagenotes-jmx-agent
 mxj-standard-environment connector-mxj-usagenotes-standard-environment
 mxj-supported connector-mxj-install-platforms
+mxj-test-requirements connector-mxj-installation-test-requirements
 mxj-testing- connector-mxj-installation-test-running
-mxj-test-requirements connector-mxj-installation-test-requirements
+myisam myisam-storage-engine
 myisamchk-syntax myisamchk
-myisam myisam-storage-engine
 myodbc-2-50 myodbc-versions
 myodbc-2-50-windows-building myodbc-installation-source-windows-2-50-building
 myodbc-3-51 myodbc-versions

@@ -224,6 +226,9 @@
 myodbc-examples-tools-tested myodbc-examples-tools
 myodbc-forum myodbc-support-community
 myodbc-hp-ux myodbc-installation-source-unix-hpux
+myodbc-installation-binary myodbc-installation
+myodbc-installation-obtaining myodbc-installation
+myodbc-installation-source myodbc-installation
 myodbc-introduction myodbc-introduction
 myodbc-mac-os-x myodbc-installation-source-unix-macosx
 myodbc-mailing-list myodbc-support-community

@@ -253,7 +258,6 @@
 myodbc-with-vb myodbc-examples-programming-vb
 mysql-5-1-cluster-changes mysql-cluster-5-1-changes
 mysql-apis apis
-mysqlcc client-utility-programs
 mysql-cluster-5-0-changes mysql-cluster-5-1-changes
 mysql-cluster-5-1-roadmap mysql-cluster-5-1-changes
 mysql-cluster-backup-using-management-server mysql-cluster-backup-using-management-client

@@ -265,32 +269,33 @@
 mysql-cluster-upgrade-downgrade-rolling mysql-cluster-rolling-restart
 mysql-connectors connectors
 mysql-database-administration database-administration
-mysqld-max mysqld
-mysqld-process mysql-cluster-mysqld-process
 mysql-floss-license-exception http://www.mysql.com/company/legal/licensing/opensource-license.html
 mysql-information-sources information-sources
 mysql-optimisation optimization
 mysql-tools-with-access myodbc-usagenotes-apptips-microsoft-access
+mysqlcc client-utility-programs
+mysqld-max mysqld
+mysqld-process mysql-cluster-mysqld-process
 name-case-sensitivity identifier-case-sensitivity
+ndb-mgm-command-options mysql-cluster-ndb-mgm-command-options
+ndb-mgm-process mysql-cluster-ndb-mgm-process
+ndb-mgmd-command-options mysql-cluster-ndb-mgmd-command-options
+ndb-mgmd-process mysql-cluster-ndb-mgmd-process
 ndbcluster mysql-cluster
 ndbd-command-options mysql-cluster-ndbd-command-options
 ndbd-process mysql-cluster-ndbd-process
-ndb-mgm-command-options mysql-cluster-ndb-mgm-command-options
-ndb-mgmd-command-options mysql-cluster-ndb-mgmd-command-options
-ndb-mgmd-process mysql-cluster-ndb-mgmd-process
-ndb-mgm-process mysql-cluster-ndb-mgm-process
 new-mysqld-command-options mysql-cluster-mysqld-command-options
 news-5-1-16-ndb-6-2-1  news-5-1-18-ndb-6-2-1
 nocursor myodbc-errors
 nt-start windows-start-service
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
+odbc myodbc-introduction
+odbc odbc-connector
 odbc-and-last-insert-id myodbc-usagenotes-functionality-last-insert-id
 odbc-connector myodbc-connector
-odbc myodbc-introduction
 odbc-net-op-c-sharp-cp myodbc-examples-programming-net-csharp
 odbc-net-op-vb-cp  myodbc-examples-programming-net-vb
-odbc odbc-connector
 odbc-problems myodbc-bug-report
 open-tables table-cache
 optimisation table-optimization

@@ -301,13 +306,13 @@
 optimising-subqueries optimizing-subqueries
 optimising-the-server optimizing-the-server
 optimize-access myodbc-usagenotes-apptips-microsoft-access
+or-optimizations index-merge-optimization
 order-by-optimisation order-by-optimization
-or-optimizations index-merge-optimization
 other-vendor-column-types other-vendor-data-types
 parentheses operator-precedence
 partitioning-limitations-disallowed-functions partitioning-limitations-functions-disallowed
+performance myodbc-usagenotes-functionality-performance
 performance-figures mysql-cluster-performance-figures
-performance myodbc-usagenotes-functionality-performance
 perl-dbi-class perl
 porting http://dev.mysql.com/doc/internals/en/porting.html
 programs-known-to-work-with-myodbc myodbc-usagenotes-apptips

@@ -326,26 +331,26 @@
 running-mysqltest mysql-test-suite
 sample--vb myodbc-examples-programming-vb
 sci-sockets mysql-cluster-sci-sockets
-secure-grant grant
-secure-requirements secure-using-openssl
-secure-using-openssl secure-using-ssl
-secure-using-yassl secure-using-ssl
+se-falcon http://dev.mysql.com/doc/falcon/en/index.html
 se-falcon-configuration http://dev.mysql.com/doc/falcon/en/se-falcon-configuration.html
 se-falcon-createdb      http://dev.mysql.com/doc/falcon/en/se-falcon-createdb.html
 se-falcon-createtable   http://dev.mysql.com/doc/falcon/en/se-falcon-createtable.html
 se-falcon-features      http://dev.mysql.com/doc/falcon/en/se-falcon-features.html
-se-falcon http://dev.mysql.com/doc/falcon/en/index.html
 se-falcon-limits        http://dev.mysql.com/doc/falcon/en/se-falcon-limits.html
+se-falcon-principles    http://dev.mysql.com/doc/falcon/en/se-falcon-principles.html
 se-falcon-principles-caches     http://dev.mysql.com/doc/falcon/en/se-falcon-principles-caches.html
 se-falcon-principles-compression        http://dev.mysql.com/doc/falcon/en/se-falcon-principles-compression.html
-se-falcon-principles    http://dev.mysql.com/doc/falcon/en/se-falcon-principles.html
+se-falcon-principles-logging    http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging.html
 se-falcon-principles-logging-groupcommit        http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging-groupcommit.html
-se-falcon-principles-logging    http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging.html
 se-falcon-principles-logging-rollback   http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging-rollback.html
 se-falcon-principles-recordslot http://dev.mysql.com/doc/falcon/en/se-falcon-principles-recordslot.html
 se-falcon-principles-recovery   http://dev.mysql.com/doc/falcon/en/se-falcon-principles-recovery.html
 se-falcon-principles-tablespace http://dev.mysql.com/doc/falcon/en/se-falcon-principles-tablespace.html
 se-falcon-principles-threads    http://dev.mysql.com/doc/falcon/en/se-falcon-principles-threads.html
+secure-grant grant
+secure-requirements secure-using-openssl
+secure-using-openssl secure-using-ssl
+secure-using-yassl secure-using-ssl
 server-side-scripts server-side-overview
 setup-error myodbc-errors
 show-database-info show-databases

@@ -372,18 +377,16 @@
 using-gdb-on-mysqld     http://dev.mysql.com/doc/internals/en/using-gdb-on-mysqld
 using-log-files         http://dev.mysql.com/doc/internals/en/using-log-files
 using-mysqlcheck mysqlcheck
-Using_Stack_Trace using-stack-trace
 using-stack-trace resolve-stack-dump
 varaible-table variable-table
+variable-table variables-table
 variables user-variables
-variable-table variables-table
 vb-types myodbc-usagenotes-apptips-microsoft-vb-asp
 where-optimisations where-optimizations
 where-to-get-myodbc myodbc-installation-obtaining
 win95-start windows-start-command-line
 windows-binary-installation windows-installation
 windows-bitkeeper-build windows-source-build
-Windows_installation windows-installation
 windows-prepare-environment windows-create-option-file
 windows-running windows-testing
 windows-system-requirements windows-installation


Modified: trunk/refman-5.2/renamed-nodes.txt
===================================================================
--- trunk/refman-5.2/renamed-nodes.txt	2007-07-13 01:39:27 UTC (rev 7110)
+++ trunk/refman-5.2/renamed-nodes.txt	2007-07-13 09:21:47 UTC (rev 7111)
Changed blocks: 16, Lines Added: 52, Lines Deleted: 49; 13403 bytes

@@ -18,9 +18,13 @@
 # Lines beginning with # in column one are interpreted as
 # comments and ignored.
 #
-access97-export myodbc-usagenotes-apptips-microsoft-access
+Forcing_recovery forcing-recovery
+Installing_source_tree installing-source-tree
+Using_Stack_Trace using-stack-trace
+Windows_installation windows-installation
 access-denied-error myodbc-errors
 access-long-tables myodbc-usagenotes-apptips-microsoft-access
+access97-export myodbc-usagenotes-apptips-microsoft-access
 ado myodbc-usagenotes-apptips-microsoft-ado
 ado--rs-addnew myodbc-examples-programming-vb-ado
 answering-questions mailing-list-use

@@ -54,8 +58,8 @@
 cj-character-sets connector-j-reference-charsets
 cj-classpath connector-j-installing-classpath
 cj-configuration-properties connector-j-reference-configuration-properties
+cj-connect-with-drivermanager connector-j-usagenotes-connect-drivermanager
 cj-connection-pooling connector-j-usagenotes-j2ee-concepts-connection-pooling
-cj-connect-with-drivermanager connector-j-usagenotes-connect-drivermanager
 cj-faq connector-j-usagenotes-troubleshooting
 cj-general-j2ee-concepts connector-j-usagenotes-j2ee-concepts
 cj-implementation-notes connector-j-reference-implementation-notes

@@ -65,6 +69,22 @@
 cj-jboss-config connector-j-usagenotes-j2ee.html#connector-j-usagenotes-jboss
 cj-jdbc-reference connector-j-reference
 cj-jdbc-upgrading-issues connector-j-installing-upgrading-issues
+cj-replication-connection connector-j-reference-replication-connection
+cj-reporting-bugs connector-j-support-bug-report
+cj-retrieve-autoinc connector-j-usagenotes-last-insert-id
+cj-supported-java-versions connector-j-verions-java
+cj-supported-mysql-versions connector-j-versions
+cj-system-requirements connector-j-versions
+cj-tomcat-config connector-j-usagenotes-j2ee.html#connector-j-usagenotes-tomcat
+cj-troubleshooting connector-j-usagenotes-troubleshooting
+cj-type-conversions connector-j-reference-type-conversions
+cj-understanding-transactions connector-j-usagenotes-j2ee-concepts-transactions
+cj-upgrading connector-j-installing-upgrading
+cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
+cj-usage-advisor connector-j-reference-usage-advisor
+cj-using-callable-statements connector-j-usagenotes-statements-callable
+cj-using-ssl connector-j-reference-using-ssl
+cjk-faq faqs-cjk
 cjk-faq-access-perl-php-troubles faqs-cjk
 cjk-faq-available-cjk-charsets faqs-cjk
 cjk-faq-big5-charset-problems faqs-cjk

@@ -74,7 +94,6 @@
 cjk-faq-contact faqs-cjk
 cjk-faq-data-truncated faqs-cjk
 cjk-faq-euckr-charset-problems faqs-cjk
-cjk-faq faqs-cjk
 cjk-faq-fixing-cjk-problems faqs-cjk
 cjk-faq-fulltext-searches faqs-cjk
 cjk-faq-gb-charset-problems faqs-cjk

@@ -85,21 +104,6 @@
 cjk-faq-sorting-problems-unicode-1 faqs-cjk
 cjk-faq-sorting-problems-unicode-2 faqs-cjk
 cjk-faq-supplementary-chars-rejected faqs-cjk
-cj-replication-connection connector-j-reference-replication-connection
-cj-reporting-bugs connector-j-support-bug-report
-cj-retrieve-autoinc connector-j-usagenotes-last-insert-id
-cj-supported-java-versions connector-j-verions-java
-cj-supported-mysql-versions connector-j-versions
-cj-system-requirements connector-j-versions
-cj-tomcat-config connector-j-usagenotes-j2ee.html#connector-j-usagenotes-tomcat
-cj-troubleshooting connector-j-usagenotes-troubleshooting
-cj-type-conversions connector-j-reference-type-conversions
-cj-understanding-transactions connector-j-usagenotes-j2ee-concepts-transactions
-cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
-cj-upgrading connector-j-installing-upgrading
-cj-usage-advisor connector-j-reference-usage-advisor
-cj-using-callable-statements connector-j-usagenotes-statements-callable
-cj-using-ssl connector-j-reference-using-ssl
 client-side-overview client-utility-overview
 client-side-scripts client-utility-programs
 clients mysql-apis

@@ -115,11 +119,11 @@
 constraint-not-null constraint-invalid-data
 contrib http://solutions.mysql.com/software/
 count-error myodbc-usagenotes-apptips-microsoft-vb-asp
+custom-engine http://forge.mysql.com/wiki/MySQL_Internals_Custom_Engine
 custom-engine-api-reference-rnd_init http://forge.mysql.com/wiki/MySQL_Internals_Custom_Engine
-custom-engine http://forge.mysql.com/wiki/MySQL_Internals_Custom_Engine
 dao--rs-addnew myodbc-examples-programming-vb-dao
+data-source-name myodbc-configuration-dsn
 database-administration database-administration-statements
-data-source-name myodbc-configuration-dsn
 dbi-info perl
 dbi-with-dbd perl
 debugging-client        http://dev.mysql.com/doc/internals/en/debugging-client

@@ -139,8 +143,8 @@
 events-create create-event
 events-drop drop-event
 events-information-schema events-table
+events-show show-events
 events-show-create show-create-event
-events-show show-events
 export-of-data myodbc-examples-tools-with-access-export
 extending-mysqltest mysql-test-suite
 faq-security faqs-security

@@ -150,10 +154,9 @@
 fetching-spatial-data-in-internal-format fetching-spatial-data
 fetching-spatial-data-in-wkb-format fetching-spatial-data
 fetching-spatial-data-in-wkt-format fetching-spatial-data
-Forcing_recovery forcing-recovery
 fulltext-todo fulltext-search
+function-index ix01
 functionality myodbc-usagenotes-functionality
-function-index ix01
 gis-features-that-are-not-yet-implemented mysql-gis-conformance-and-compatibility
 gpl-license http://www.mysql.com/company/legal/licensing/opensource-license.html
 heap memory-storage-engine

@@ -164,14 +167,13 @@
 innodb-implicit-command-or-rollback innodb-implicit-commit
 innodb-start innodb-parameters
 installing-myodbc myodbc-installation
-Installing_source_tree installing-source-tree
 instance-manager-command-line-options instance-manager-command-options
 introduction-to-odbc myodbc-general-information
+is-null-optimisation is-null-optimization
 isam myisam-storage-engine
-is-null-optimisation is-null-optimization
+java connector-j
 java-connector connector-j
 java-connector connector-j
-java connector-j
 left-join-optimisation left-join-optimization
 legal-names identifiers
 licenses http://www.mysql.com/company/legal/licensing/opensource-license.html

@@ -205,10 +207,10 @@
 mxj-jmx-agent connector-mxj-usagenotes-jmx-agent
 mxj-standard-environment connector-mxj-usagenotes-standard-environment
 mxj-supported connector-mxj-install-platforms
+mxj-test-requirements connector-mxj-installation-test-requirements
 mxj-testing- connector-mxj-installation-test-running
-mxj-test-requirements connector-mxj-installation-test-requirements
+myisam myisam-storage-engine
 myisamchk-syntax myisamchk
-myisam myisam-storage-engine
 myodbc-2-50 myodbc-versions
 myodbc-2-50-windows-building myodbc-installation-source-windows-2-50-building
 myodbc-3-51 myodbc-versions

@@ -224,6 +226,9 @@
 myodbc-examples-tools-tested myodbc-examples-tools
 myodbc-forum myodbc-support-community
 myodbc-hp-ux myodbc-installation-source-unix-hpux
+myodbc-installation-binary myodbc-installation
+myodbc-installation-obtaining myodbc-installation
+myodbc-installation-source myodbc-installation
 myodbc-introduction myodbc-introduction
 myodbc-mac-os-x myodbc-installation-source-unix-macosx
 myodbc-mailing-list myodbc-support-community

@@ -253,7 +258,6 @@
 myodbc-with-vb myodbc-examples-programming-vb
 mysql-5-1-cluster-changes mysql-cluster-5-1-changes
 mysql-apis apis
-mysqlcc client-utility-programs
 mysql-cluster-5-0-changes mysql-cluster-5-1-changes
 mysql-cluster-5-1-roadmap mysql-cluster-5-1-changes
 mysql-cluster-backup-using-management-server mysql-cluster-backup-using-management-client

@@ -265,32 +269,33 @@
 mysql-cluster-upgrade-downgrade-rolling mysql-cluster-rolling-restart
 mysql-connectors connectors
 mysql-database-administration database-administration
-mysqld-max mysqld
-mysqld-process mysql-cluster-mysqld-process
 mysql-floss-license-exception http://www.mysql.com/company/legal/licensing/opensource-license.html
 mysql-information-sources information-sources
 mysql-optimisation optimization
 mysql-tools-with-access myodbc-usagenotes-apptips-microsoft-access
+mysqlcc client-utility-programs
+mysqld-max mysqld
+mysqld-process mysql-cluster-mysqld-process
 name-case-sensitivity identifier-case-sensitivity
+ndb-mgm-command-options mysql-cluster-ndb-mgm-command-options
+ndb-mgm-process mysql-cluster-ndb-mgm-process
+ndb-mgmd-command-options mysql-cluster-ndb-mgmd-command-options
+ndb-mgmd-process mysql-cluster-ndb-mgmd-process
 ndbcluster mysql-cluster
 ndbd-command-options mysql-cluster-ndbd-command-options
 ndbd-process mysql-cluster-ndbd-process
-ndb-mgm-command-options mysql-cluster-ndb-mgm-command-options
-ndb-mgmd-command-options mysql-cluster-ndb-mgmd-command-options
-ndb-mgmd-process mysql-cluster-ndb-mgmd-process
-ndb-mgm-process mysql-cluster-ndb-mgm-process
 new-mysqld-command-options mysql-cluster-mysqld-command-options
 news-5-1-16-ndb-6-2-1  news-5-1-18-ndb-6-2-1
 nocursor myodbc-errors
 nt-start windows-start-service
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
+odbc myodbc-introduction
+odbc odbc-connector
 odbc-and-last-insert-id myodbc-usagenotes-functionality-last-insert-id
 odbc-connector myodbc-connector
-odbc myodbc-introduction
 odbc-net-op-c-sharp-cp myodbc-examples-programming-net-csharp
 odbc-net-op-vb-cp  myodbc-examples-programming-net-vb
-odbc odbc-connector
 odbc-problems myodbc-bug-report
 open-tables table-cache
 optimisation table-optimization

@@ -301,13 +306,13 @@
 optimising-subqueries optimizing-subqueries
 optimising-the-server optimizing-the-server
 optimize-access myodbc-usagenotes-apptips-microsoft-access
+or-optimizations index-merge-optimization
 order-by-optimisation order-by-optimization
-or-optimizations index-merge-optimization
 other-vendor-column-types other-vendor-data-types
 parentheses operator-precedence
 partitioning-limitations-disallowed-functions partitioning-limitations-functions-disallowed
+performance myodbc-usagenotes-functionality-performance
 performance-figures mysql-cluster-performance-figures
-performance myodbc-usagenotes-functionality-performance
 perl-dbi-class perl
 porting http://dev.mysql.com/doc/internals/en/porting.html
 programs-known-to-work-with-myodbc myodbc-usagenotes-apptips

@@ -326,26 +331,26 @@
 running-mysqltest mysql-test-suite
 sample--vb myodbc-examples-programming-vb
 sci-sockets mysql-cluster-sci-sockets
-secure-grant grant
-secure-requirements secure-using-openssl
-secure-using-openssl secure-using-ssl
-secure-using-yassl secure-using-ssl
+se-falcon http://dev.mysql.com/doc/falcon/en/index.html
 se-falcon-configuration http://dev.mysql.com/doc/falcon/en/se-falcon-configuration.html
 se-falcon-createdb      http://dev.mysql.com/doc/falcon/en/se-falcon-createdb.html
 se-falcon-createtable   http://dev.mysql.com/doc/falcon/en/se-falcon-createtable.html
 se-falcon-features      http://dev.mysql.com/doc/falcon/en/se-falcon-features.html
-se-falcon http://dev.mysql.com/doc/falcon/en/index.html
 se-falcon-limits        http://dev.mysql.com/doc/falcon/en/se-falcon-limits.html
+se-falcon-principles    http://dev.mysql.com/doc/falcon/en/se-falcon-principles.html
 se-falcon-principles-caches     http://dev.mysql.com/doc/falcon/en/se-falcon-principles-caches.html
 se-falcon-principles-compression        http://dev.mysql.com/doc/falcon/en/se-falcon-principles-compression.html
-se-falcon-principles    http://dev.mysql.com/doc/falcon/en/se-falcon-principles.html
+se-falcon-principles-logging    http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging.html
 se-falcon-principles-logging-groupcommit        http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging-groupcommit.html
-se-falcon-principles-logging    http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging.html
 se-falcon-principles-logging-rollback   http://dev.mysql.com/doc/falcon/en/se-falcon-principles-logging-rollback.html
 se-falcon-principles-recordslot http://dev.mysql.com/doc/falcon/en/se-falcon-principles-recordslot.html
 se-falcon-principles-recovery   http://dev.mysql.com/doc/falcon/en/se-falcon-principles-recovery.html
 se-falcon-principles-tablespace http://dev.mysql.com/doc/falcon/en/se-falcon-principles-tablespace.html
 se-falcon-principles-threads    http://dev.mysql.com/doc/falcon/en/se-falcon-principles-threads.html
+secure-grant grant
+secure-requirements secure-using-openssl
+secure-using-openssl secure-using-ssl
+secure-using-yassl secure-using-ssl
 server-side-scripts server-side-overview
 setup-error myodbc-errors
 show-database-info show-databases

@@ -372,18 +377,16 @@
 using-gdb-on-mysqld     http://dev.mysql.com/doc/internals/en/using-gdb-on-mysqld
 using-log-files         http://dev.mysql.com/doc/internals/en/using-log-files
 using-mysqlcheck mysqlcheck
-Using_Stack_Trace using-stack-trace
 using-stack-trace resolve-stack-dump
 varaible-table variable-table
+variable-table variables-table
 variables user-variables
-variable-table variables-table
 vb-types myodbc-usagenotes-apptips-microsoft-vb-asp
 where-optimisations where-optimizations
 where-to-get-myodbc myodbc-installation-obtaining
 win95-start windows-start-command-line
 windows-binary-installation windows-installation
 windows-bitkeeper-build windows-source-build
-Windows_installation windows-installation
 windows-prepare-environment windows-create-option-file
 windows-running windows-testing
 windows-system-requirements windows-installation


Modified: trunk/refman-common/connector-odbc.xml
===================================================================
--- trunk/refman-common/connector-odbc.xml	2007-07-13 01:39:27 UTC (rev 7110)
+++ trunk/refman-common/connector-odbc.xml	2007-07-13 09:21:47 UTC (rev 7111)
Changed blocks: 13, Lines Added: 1322, Lines Deleted: 1340; 117543 bytes

@@ -562,1327 +562,1312 @@
       installation.
     </para>
 
-    <section id="myodbc-installation-obtaining">
+    <para>
+      <emphasis role="bold">Where to Get Connector/ODBC</emphasis>
+    </para>
 
-      <title>Where to Get Connector/ODBC</title>
-
-      <para>
-        MySQL AB distributes all its products under the General Public
-        License (GPL). You can get a copy of the latest version of
-        Connector/ODBC binaries and sources from the MySQL AB Web site
-        <ulink
+    <para>
+      MySQL AB distributes all its products under the General Public
+      License (GPL). You can get a copy of the latest version of
+      Connector/ODBC binaries and sources from the MySQL AB Web site
+      <ulink
           url="&base-url-downloads;"/>.
-      </para>
+    </para>
 
-      <para>
-        For more information about Connector/ODBC, visit
-        <ulink
+    <para>
+      For more information about Connector/ODBC, visit
+      <ulink
           url="http://www.mysql.com/products/myodbc/"/>.
-      </para>
+    </para>
 
-      <para>
-        For more information about licensing, visit
-        <ulink
+    <para>
+      For more information about licensing, visit
+      <ulink
           url="http://www.mysql.com/company/legal/licensing/"/>.
-      </para>
+    </para>
 
-    </section>
+    <para>
+      <emphasis role="bold">Supported Platforms</emphasis>
+    </para>
 
-    <section id="myodbc-supported-platforms">
+    <para>
+      Connector/ODBC can be used on all major platforms supported by
+      MySQL. You can install it on:
+    </para>
 
-      <title>Supported Platforms</title>
+    <itemizedlist>
 
+      <listitem>
+        <para>
+          Windows 95, 98, Me, NT, 2000, XP, and 2003
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          All Unix-like Operating Systems, including: AIX, Amiga, BSDI,
+          DEC, FreeBSD, HP-UX 10/11, Linux, NetBSD, OpenBSD, OS/2, SGI
+          Irix, Solaris, SunOS, SCO OpenServer, SCO UnixWare, Tru64 Unix
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Mac OS X and Mac OS X Server
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>
+      Using a binary distribution offers the most straightforward method
+      for installing Connector/ODBC. If you want more control over the
+      driver, the installation location and or to customize elements of
+      the driver you will need to build and install from the source.
+    </para>
+
+    <para>
+      If a binary distribution is not available for a particular
+      platform build the driver from the original source code. You can
+      contribute the binaries you create to MySQL by sending a mail
+      message to <email>myodbc@stripped</email>, so that it
+      becomes available for other users.
+    </para>
+
+    <para>
+      For further instructions:
+    </para>
+
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <thead>
+          <row>
+            <entry>Platform</entry>
+            <entry>Binary</entry>
+            <entry>Source</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>Windows</entry>
+            <entry><link
+      linkend="myodbc-installation-binary-windows">Installation
+              Instructions</link></entry>
+            <entry><link linkend="myodbc-installation-source-windows">Build
+              Instructions</link></entry>
+          </row>
+          <row>
+            <entry>Unix/Linux</entry>
+            <entry><link
+        linkend="myodbc-installation-binary-unix">Installation
+              Instructions</link></entry>
+            <entry><link linkend="myodbc-installation-source-unix">Build
+              Instructions</link></entry>
+          </row>
+          <row>
+            <entry>Mac OS X</entry>
+            <entry><link
+        linkend="myodbc-installation-binary-macosx">Installation
+              Instructions</link></entry>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+
+    <section id="myodbc-installation-binary-windows">
+
+      <title>Installing Connector/ODBC from a Binary Distribution on Windows</title>
+
       <para>
-        Connector/ODBC can be used on all major platforms supported by
-        MySQL. You can install it on:
+        Before installing the Connector/ODBC drivers on Windows you
+        should ensure that your Microsoft Data Access Components (MDAC)
+        are up to date. You can obtain the latest version from the
+        <ulink
+            url="http://www.microsoft.com/data/">Microsoft
+        Data Access and Storage</ulink> Web site.
       </para>
 
+      <para>
+        There are three available distribution types to use when
+        installing for Windows. The contents in each case are identical,
+        it is only the installation method which is different.
+      </para>
+
       <itemizedlist>
 
         <listitem>
           <para>
-            Windows 95, 98, Me, NT, 2000, XP, and 2003
+            Zipped installer consists of a Zipped package containing a
+            standalone installation application. To install from this
+            package, you must unzip the installer, and then run the
+            installation application. See
+            <xref
+                linkend="myodbc-installation-binary-windows-installer"/>
+            to complete the installation.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            All Unix-like Operating Systems, including: AIX, Amiga,
-            BSDI, DEC, FreeBSD, HP-UX 10/11, Linux, NetBSD, OpenBSD,
-            OS/2, SGI Irix, Solaris, SunOS, SCO OpenServer, SCO
-            UnixWare, Tru64 Unix
+            MSI installer, an installation file that can be used with
+            the installer included in Windows 2000, Windows XP and
+            Windows Server 2003. See
+            <xref
+                linkend="myodbc-installation-binary-windows-installer"/>
+            to complete the installation.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Mac OS X and Mac OS X Server
+            Zipped DLL package, containing the DLL files that need must
+            be manually installed. See
+            <xref
+                linkend="myodbc-installation-binary-windows-dll"/>
+            to complete the installation.
           </para>
         </listitem>
 
       </itemizedlist>
 
-      <para>
-        If a binary distribution is not available for a particular
-        platform, see <xref linkend="myodbc-installation-source"/>, to
-        build the driver from the original source code. You can
-        contribute the binaries you create to MySQL by sending a mail
-        message to <email>myodbc@stripped</email>, so that it
-        becomes available for other users.
-      </para>
+      <section id="myodbc-installation-binary-windows-installer">
 
-    </section>
+        <title>Installing the Windows Connector/ODBC Driver using an installer</title>
 
-    <section id="myodbc-installation-binary">
-
-      <title>Installing Connector/ODBC from a binary distribution</title>
-
-      <para>
-        Using a binary distribution offers the most straightforward
-        method for installing Connector/ODBC. If you want more control
-        over the driver, the installation location and or to customize
-        elements of the driver you will need to build and install from
-        the source. See the
-        <xref
-          linkend="myodbc-installation-source"/>.
-      </para>
-
-      <section id="myodbc-installation-binary-windows">
-
-        <title>Installing Connector/ODBC from a Binary Distribution on Windows</title>
-
         <para>
-          Before installing the Connector/ODBC drivers on Windows you
-          should ensure that your Microsoft Data Access Components
-          (MDAC) are up to date. You can obtain the latest version from
-          the
-          <ulink
-            url="http://www.microsoft.com/data/">Microsoft
-          Data Access and Storage</ulink> Web site.
+          The installer packages offer a very simple method for
+          installing the Connector/ODBC drivers. If you have downloaded
+          the zipped installer then you must extract the installer
+          application. The basic installation process is identical for
+          both installers.
         </para>
 
         <para>
-          There are three available distribution types to use when
-          installing for Windows. The contents in each case are
-          identical, it is only the installation method which is
-          different.
+          You should follow these steps to complete the installation:
         </para>
 
-        <itemizedlist>
+        <orderedlist>
 
           <listitem>
             <para>
-              Zipped installer consists of a Zipped package containing a
-              standalone installation application. To install from this
-              package, you must unzip the installer, and then run the
-              installation application. See
-              <xref
-                linkend="myodbc-installation-binary-windows-installer"/>
-              to complete the installation.
+              Double click on the standalone installer that you
+              extracted, or the MSI file you downloaded.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              MSI installer, an installation file that can be used with
-              the installer included in Windows 2000, Windows XP and
-              Windows Server 2003. See
-              <xref
-                linkend="myodbc-installation-binary-windows-installer"/>
-              to complete the installation.
+              The MySQL Connector/ODBC 3.51 - Setup Wizard will start.
+              Click the <guibutton>Next</guibutton> button to begin the
+              installation process.
             </para>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="images/myodbc-win-install-step1.png"
+                    format="PNG"/>
+              </imageobject>
+              <textobject>
+                <phrase lang="en">Connector/ODBC Windows Installer -
+                Welcome</phrase>
+              </textobject>
+            </mediaobject>
           </listitem>
 
           <listitem>
             <para>
-              Zipped DLL package, containing the DLL files that need
-              must be manually installed. See
-              <xref
-                linkend="myodbc-installation-binary-windows-dll"/>
-              to complete the installation.
+              You will need to choose the installation type. The Typical
+              installation provides the standard files you will need to
+              connect to a MySQL database using ODBC. The Complete
+              option installs all the available files, including debug
+              and utility components. It is recommended you choose one
+              of these two options to complete the installation. If
+              choose one of these methods, click
+              <guibutton>Next</guibutton> and then proceed to step 5.
             </para>
-          </listitem>
 
-        </itemizedlist>
+            <para>
+              You may also choose a Custom installation, which enables
+              you to select the individual components that you want to
+              install. You have chosen this method, click
+              <guibutton>Next</guibutton> and then proceed to step 4.
+            </para>
 
-        <section id="myodbc-installation-binary-windows-installer">
-
-          <title>Installing the Windows Connector/ODBC Driver using an installer</title>
-
-          <para>
-            The installer packages offer a very simple method for
-            installing the Connector/ODBC drivers. If you have
-            downloaded the zipped installer then you must extract the
-            installer application. The basic installation process is
-            identical for both installers.
-          </para>
-
-          <para>
-            You should follow these steps to complete the installation:
-          </para>
-
-          <orderedlist>
-
-            <listitem>
-              <para>
-                Double click on the standalone installer that you
-                extracted, or the MSI file you downloaded.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                The MySQL Connector/ODBC 3.51 - Setup Wizard will start.
-                Click the <guibutton>Next</guibutton> button to begin
-                the installation process.
-              </para>
-
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-win-install-step1.png"
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="images/myodbc-win-install-step2.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Windows Installer -
-                  Welcome</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+              </imageobject>
+              <textobject>
+                <phrase lang="en">Connector/ODBC Windows Installer -
+                Choosing a Setup type welcome</phrase>
+              </textobject>
+            </mediaobject>
+          </listitem>
 
-            <listitem>
-              <para>
-                You will need to choose the installation type. The
-                Typical installation provides the standard files you
-                will need to connect to a MySQL database using ODBC. The
-                Complete option installs all the available files,
-                including debug and utility components. It is
-                recommended you choose one of these two options to
-                complete the installation. If choose one of these
-                methods, click <guibutton>Next</guibutton> and then
-                proceed to step 5.
-              </para>
+          <listitem>
+            <para>
+              If you have chosen a custom installation, use the popups
+              to select which components to install and then click
+              <guibutton>Next</guibutton> to install the necessary
+              files.
+            </para>
 
-              <para>
-                You may also choose a Custom installation, which enables
-                you to select the individual components that you want to
-                install. You have chosen this method, click
-                <guibutton>Next</guibutton> and then proceed to step 4.
-              </para>
-
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-win-install-step2.png"
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="images/myodbc-win-install-step3.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Windows Installer -
-                  Choosing a Setup type welcome</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+              </imageobject>
+              <textobject>
+                <phrase lang="en">Connector/ODBC Windows Installer -
+                Custom Installation welcome</phrase>
+              </textobject>
+            </mediaobject>
+          </listitem>
 
-            <listitem>
-              <para>
-                If you have chosen a custom installation, use the popups
-                to select which components to install and then click
-                <guibutton>Next</guibutton> to install the necessary
-                files.
-              </para>
+          <listitem>
+            <para>
+              Once the files have copied to your machine, the
+              installation is complete. Click
+              <guibutton>Finish</guibutton> to exit the installer.
+            </para>
 
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-win-install-step3.png"
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="images/myodbc-win-install-step4.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Windows Installer -
-                  Custom Installation welcome</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+              </imageobject>
+              <textobject>
+                <phrase lang="en">Connector/ODBC Windows Installer -
+                Completion welcome</phrase>
+              </textobject>
+            </mediaobject>
+          </listitem>
 
-            <listitem>
-              <para>
-                Once the files have copied to your machine, the
-                installation is complete. Click
-                <guibutton>Finish</guibutton> to exit the installer.
-              </para>
+        </orderedlist>
 
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-win-install-step4.png"
-                    format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Windows Installer -
-                  Completion welcome</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+        <para>
+          Now the installation is complete, you can continue to
+          configure your ODBC connections using
+          <xref linkend="myodbc-configuration"/>.
+        </para>
 
-          </orderedlist>
+      </section>
 
-          <para>
-            Now the installation is complete, you can continue to
-            configure your ODBC connections using
-            <xref linkend="myodbc-configuration"/>.
-          </para>
+      <section id="myodbc-installation-binary-windows-dll">
 
-        </section>
+        <title>Installing the Windows Connector/ODBC Driver using the Zipped DLL
+          package</title>
 
-        <section id="myodbc-installation-binary-windows-dll">
+        <para>
+          If you have downloaded the Zipped DLL package then you must
+          install the individual files required for Connector/ODBC
+          operation manually. Once you have unzipped the installation
+          files, you can either perform this operation by hand,
+          executing each statement individually, or you can use the
+          included Batch file to perform an installation to the default
+          locations.
+        </para>
 
-          <title>Installing the Windows Connector/ODBC Driver using the Zipped DLL
-            package</title>
+        <para>
+          To install using the Batch file:
+        </para>
 
-          <para>
-            If you have downloaded the Zipped DLL package then you must
-            install the individual files required for Connector/ODBC
-            operation manually. Once you have unzipped the installation
-            files, you can either perform this operation by hand,
-            executing each statement individually, or you can use the
-            included Batch file to perform an installation to the
-            default locations.
-          </para>
+        <orderedlist>
 
-          <para>
-            To install using the Batch file:
-          </para>
+          <listitem>
+            <para>
+              Unzip the Connector/ODBC Zipped DLL package.
+            </para>
+          </listitem>
 
-          <orderedlist>
+          <listitem>
+            <para>
+              Open a Command Prompt.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Unzip the Connector/ODBC Zipped DLL package.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              Change to the directory created when you unzipped the
+              Connector/ODBC Zipped DLL package.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Open a Command Prompt.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              Run <literal>Install.bat:</literal>
+            </para>
 
-            <listitem>
-              <para>
-                Change to the directory created when you unzipped the
-                Connector/ODBC Zipped DLL package.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Run <literal>Install.bat:</literal>
-              </para>
-
 <programlisting>C:\&gt; <userinput>Install.bat</userinput></programlisting>
 
-              <para>
-                This will copy the necessary files into the default
-                location, and then register the Connector/ODBC driver
-                with the Windows ODBC manager.
-              </para>
-            </listitem>
+            <para>
+              This will copy the necessary files into the default
+              location, and then register the Connector/ODBC driver with
+              the Windows ODBC manager.
+            </para>
+          </listitem>
 
-          </orderedlist>
+        </orderedlist>
 
-          <para>
-            If you want to copy the files to an alternative location -
-            for example, to run or test different versions of the
-            Connector/ODBC driver on the same machine, then you must
-            copy the files by hand. It is however not recommended to
-            install these files in a non-standard location. To copy the
-            files by hand to the default installation location use the
-            following steps:
-          </para>
+        <para>
+          If you want to copy the files to an alternative location - for
+          example, to run or test different versions of the
+          Connector/ODBC driver on the same machine, then you must copy
+          the files by hand. It is however not recommended to install
+          these files in a non-standard location. To copy the files by
+          hand to the default installation location use the following
+          steps:
+        </para>
 
-          <orderedlist>
+        <orderedlist>
 
-            <listitem>
-              <para>
-                Unzip the Connector/ODBC Zipped DLL package.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              Unzip the Connector/ODBC Zipped DLL package.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Open a Command Prompt.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              Open a Command Prompt.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Change to the directory created when you unzipped the
-                Connector/ODBC Zipped DLL package.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              Change to the directory created when you unzipped the
+              Connector/ODBC Zipped DLL package.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Copy the library files to a suitable directory. The
-                default is to copy them into the default Windows system
-                directory <literal>\Windows\System32</literal>:
-              </para>
+          <listitem>
+            <para>
+              Copy the library files to a suitable directory. The
+              default is to copy them into the default Windows system
+              directory <literal>\Windows\System32</literal>:
+            </para>
 
 <programlisting>C:\&gt; <userinput>copy lib\myodbc3S.dll \Windows\System32</userinput>
 C:\&gt; <userinput>copy lib\myodbc3S.lib \Windows\System32</userinput>
 C:\&gt; <userinput>copy lib\myodbc3.dll \Windows\System32</userinput>
 C:\&gt; <userinput>copy lib\myodbc3.lib \Windows\System32</userinput></programlisting>
-            </listitem>
+          </listitem>
 
-            <listitem>
-              <para>
-                Copy the Connector/ODBC tools. These must be placed into
-                a directory that is in the system
-                <literal>PATH</literal>. The default is to install these
-                into the Windows system directory
-                <literal>\Windows\System32</literal>:
-              </para>
+          <listitem>
+            <para>
+              Copy the Connector/ODBC tools. These must be placed into a
+              directory that is in the system <literal>PATH</literal>.
+              The default is to install these into the Windows system
+              directory <literal>\Windows\System32</literal>:
+            </para>
 
 <programlisting>C:\&gt; <userinput>copy bin\myodbc3i.exe \Windows\System32</userinput>
 C:\&gt; <userinput>copy bin\myodbc3m.exe \Windows\System32</userinput>
 C:\&gt; <userinput>copy bin\myodbc3c.exe \Windows\System32</userinput></programlisting>
-            </listitem>
+          </listitem>
 
-            <listitem>
-              <para>
-                Optionally copy the help files. For these files to be
-                accessible through the help system, they must be
-                installed in the Windows system directory:
-              </para>
+          <listitem>
+            <para>
+              Optionally copy the help files. For these files to be
+              accessible through the help system, they must be installed
+              in the Windows system directory:
+            </para>
 
 <programlisting>C:\&gt; <userinput>copy doc\*.hlp \Windows\System32</userinput></programlisting>
-            </listitem>
+          </listitem>
 
-            <listitem>
-              <para>
-                Finally, you must register the Connector/ODBC driver
-                with the ODBC manager:
-              </para>
+          <listitem>
+            <para>
+              Finally, you must register the Connector/ODBC driver with
+              the ODBC manager:
+            </para>
 
 <programlisting>C:\&gt; <userinput>myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;\
   DRIVER=myodbc3.dll;SETUP=myodbc3S.dll"</userinput></programlisting>
 
-              <para>
-                You must change the references to the DLL files and
-                command location in the above statement if you have not
-                installed these files into the default location.
-              </para>
-            </listitem>
+            <para>
+              You must change the references to the DLL files and
+              command location in the above statement if you have not
+              installed these files into the default location.
+            </para>
+          </listitem>
 
-          </orderedlist>
+        </orderedlist>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-binary-windows-errors">
+      <section id="myodbc-installation-binary-windows-errors">
 
-          <title>Handling Installation Errors</title>
+        <title>Handling Installation Errors</title>
 
-          <para>
-            On Windows, you may get the following error when trying to
-            install the older MyODBC 2.50 driver:
-          </para>
+        <para>
+          On Windows, you may get the following error when trying to
+          install the older MyODBC 2.50 driver:
+        </para>
 
 <programlisting>An error occurred while copying C:\WINDOWS\SYSTEM\MFC30.DLL. 
 Restart Windows and try installing again (before running any
 applications which use ODBC)</programlisting>
 
-          <para>
-            The reason for the error is that another application is
-            currently using the ODBC system. Windows may not allow you
-            to complete the installation. In most cases, you can
-            continue by pressing <literal>Ignore</literal> to copy the
-            rest of the Connector/ODBC files and the final installation
-            should still work. If it doesn't, the solution is to re-boot
-            your computer in <quote>safe mode.</quote> Choose safe mode
-            by pressing F8 just before your machine starts Windows
-            during re-booting, install the Connector/ODBC drivers, and
-            re-boot to normal mode.
-          </para>
+        <para>
+          The reason for the error is that another application is
+          currently using the ODBC system. Windows may not allow you to
+          complete the installation. In most cases, you can continue by
+          pressing <literal>Ignore</literal> to copy the rest of the
+          Connector/ODBC files and the final installation should still
+          work. If it doesn't, the solution is to re-boot your computer
+          in <quote>safe mode.</quote> Choose safe mode by pressing F8
+          just before your machine starts Windows during re-booting,
+          install the Connector/ODBC drivers, and re-boot to normal
+          mode.
+        </para>
 
-        </section>
-
       </section>
 
-      <section id="myodbc-installation-binary-unix">
+    </section>
 
-        <title>Installing Connector/ODBC from a Binary Distribution on Unix</title>
+    <section id="myodbc-installation-binary-unix">
 
-        <para>
-          There are two methods available for installing Connector/ODBC
-          on Unix from a binary distribution. For most Unix environments
-          you will need to use the tarball distribution. For Linux
-          systems, there is also an RPM distribution available.
-        </para>
+      <title>Installing Connector/ODBC from a Binary Distribution on Unix</title>
 
-        <section id="myodbc-installation-binary-unix-tarball">
+      <para>
+        There are two methods available for installing Connector/ODBC on
+        Unix from a binary distribution. For most Unix environments you
+        will need to use the tarball distribution. For Linux systems,
+        there is also an RPM distribution available.
+      </para>
 
-          <title>Installing Connector/ODBC from a Binary Tarball Distribution</title>
+      <section id="myodbc-installation-binary-unix-tarball">
 
-          <para>
-            To install the driver from a tarball distribution
-            (<filename>.tar.gz</filename> file), download the latest
-            version of the driver for your operating system and follow
-            these steps that demonstrate the process using the Linux
-            version of the tarball:
-          </para>
+        <title>Installing Connector/ODBC from a Binary Tarball Distribution</title>
 
+        <para>
+          To install the driver from a tarball distribution
+          (<filename>.tar.gz</filename> file), download the latest
+          version of the driver for your operating system and follow
+          these steps that demonstrate the process using the Linux
+          version of the tarball:
+        </para>
+
 <programlisting>shell&gt; <userinput>su root</userinput>
 shell&gt; <userinput>gunzip mysql-connector-odbc-3.51.11-i686-pc-linux.tar.gz</userinput>
 shell&gt; <userinput>tar xvf mysql-connector-odbc-3.51.11-i686-pc-linux.tar</userinput>
 shell&gt; <userinput>cd mysql-connector-odbc-3.51.11-i686-pc-linux</userinput></programlisting>
 
-          <para>
-            Read the installation instructions in the
-            <filename>INSTALL-BINARY</filename> file and execute these
-            commands.
-          </para>
+        <para>
+          Read the installation instructions in the
+          <filename>INSTALL-BINARY</filename> file and execute these
+          commands.
+        </para>
 
 <programlisting>shell&gt; <userinput>cp libmyodbc* /usr/local/lib</userinput>
 shell&gt; <userinput>cp odbc.ini /usr/local/etc</userinput>
 shell&gt; <userinput>export ODBCINI=/usr/local/etc/odbc.ini</userinput></programlisting>
 
-          <para>
-            Then proceed on to
-            <xref
+        <para>
+          Then proceed on to
+          <xref
               linkend="myodbc-configuration-dsn-unix"/>,
-            to configure the DSN for Connector/ODBC. For more
-            information, refer to the
-            <filename>INSTALL-BINARY</filename> file that comes with
-            your distribution.
-          </para>
+          to configure the DSN for Connector/ODBC. For more information,
+          refer to the <filename>INSTALL-BINARY</filename> file that
+          comes with your distribution.
+        </para>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-binary-unix-rpm">
+      <section id="myodbc-installation-binary-unix-rpm">
 
-          <title>Installing Connector/ODBC from an RPM Distribution</title>
+        <title>Installing Connector/ODBC from an RPM Distribution</title>
 
-          <para>
-            To install or upgrade Connector/ODBC from an RPM
-            distribution on Linux, simply download the RPM distribution
-            of the latest version of Connector/ODBC and follow the
-            instructions below. Use <command>su root</command> to become
-            <literal>root</literal>, then install the RPM file.
-          </para>
+        <para>
+          To install or upgrade Connector/ODBC from an RPM distribution
+          on Linux, simply download the RPM distribution of the latest
+          version of Connector/ODBC and follow the instructions below.
+          Use <command>su root</command> to become
+          <literal>root</literal>, then install the RPM file.
+        </para>
 
-          <para>
-            If you are installing for the first time:
-          </para>
+        <para>
+          If you are installing for the first time:
+        </para>
 
 <programlisting>shell&gt; <userinput>su root</userinput>
  shell&gt; <userinput>rpm -ivh mysql-connector-odbc-3.51.12.i386.rpm</userinput></programlisting>
 
-          <para>
-            If the driver exists, upgrade it like this:
-          </para>
+        <para>
+          If the driver exists, upgrade it like this:
+        </para>
 
 <programlisting>shell&gt; <userinput>su root</userinput>
 shell&gt; <userinput>rpm -Uvh mysql-connector-odbc-3.51.12.i386.rpm</userinput></programlisting>
 
-          <para>
-            If there is any dependency error for MySQL client library,
-            <literal>libmysqlclient</literal>, simply ignore it by
-            supplying the <option>--nodeps</option> option, and then
-            make sure the MySQL client shared library is in the path or
-            set through <literal>LD_LIBRARY_PATH</literal>.
-          </para>
+        <para>
+          If there is any dependency error for MySQL client library,
+          <literal>libmysqlclient</literal>, simply ignore it by
+          supplying the <option>--nodeps</option> option, and then make
+          sure the MySQL client shared library is in the path or set
+          through <literal>LD_LIBRARY_PATH</literal>.
+        </para>
 
-          <para>
-            This installs the driver libraries and related documents to
-            <filename>/usr/local/lib</filename> and
-            <filename>/usr/share/doc/MyODBC</filename>, respectively.
-            Proceed onto
-            <xref linkend="myodbc-configuration-dsn-unix"/>.
-          </para>
+        <para>
+          This installs the driver libraries and related documents to
+          <filename>/usr/local/lib</filename> and
+          <filename>/usr/share/doc/MyODBC</filename>, respectively.
+          Proceed onto <xref linkend="myodbc-configuration-dsn-unix"/>.
+        </para>
 
-          <para>
-            To <emphasis role="bold">uninstall</emphasis> the driver,
-            become <literal>root</literal> and execute an
-            <command>rpm</command> command:
-          </para>
+        <para>
+          To <emphasis role="bold">uninstall</emphasis> the driver,
+          become <literal>root</literal> and execute an
+          <command>rpm</command> command:
+        </para>
 
 <programlisting>shell&gt; <userinput>su root</userinput>
 shell&gt; <userinput>rpm -e mysql-connector-odbc</userinput></programlisting>
 
-        </section>
-
       </section>
 
-      <section id="myodbc-installation-binary-macosx">
+    </section>
 
-        <title>Installing Connector/ODBC on Mac OS X</title>
+    <section id="myodbc-installation-binary-macosx">
 
-        <para>
-          Mac OS X is based on the FreeBSD operating system, and you can
-          normally use the MySQL network port for connecting to MySQL
-          servers on other hosts. Installing the Connector/ODBC driver
-          enables you to connect to MySQL databases on any platform
-          through the ODBC interface. You should only need to install
-          the Connector/ODBC driver when your application requires an
-          ODBC interface. Applications that require or can use ODBC (and
-          therefore the Connector/ODBC driver) include ColdFusion,
-          Filemaker Pro, 4th Dimension and many other applications.
-        </para>
+      <title>Installing Connector/ODBC from a Binary Distribution on Mac OS X</title>
 
-        <para>
-          Mac OS X includes its own ODBC manager, based on the
-          <literal>iODBC</literal> manager. Mac OS X includes an
-          administration tool that provides easier administration of
-          ODBC drivers and configuration, updating the underlying
-          <literal>iODBC</literal> configuration files.
-        </para>
+      <para>
+        Mac OS X is based on the FreeBSD operating system, and you can
+        normally use the MySQL network port for connecting to MySQL
+        servers on other hosts. Installing the Connector/ODBC driver
+        enables you to connect to MySQL databases on any platform
+        through the ODBC interface. You should only need to install the
+        Connector/ODBC driver when your application requires an ODBC
+        interface. Applications that require or can use ODBC (and
+        therefore the Connector/ODBC driver) include ColdFusion,
+        Filemaker Pro, 4th Dimension and many other applications.
+      </para>
 
-        <section id="myodbc-installation-binary-macosx-driver">
+      <para>
+        Mac OS X includes its own ODBC manager, based on the
+        <literal>iODBC</literal> manager. Mac OS X includes an
+        administration tool that provides easier administration of ODBC
+        drivers and configuration, updating the underlying
+        <literal>iODBC</literal> configuration files.
+      </para>
 
-          <title>Installing the Connector/ODBC Driver</title>
+      <para>
+        The method for installing Connector/ODBC on Mac OS X depends on
+        the version on Connector/ODBC you are using. For Connector/ODBC
+        3.51.14 and later, the package is provided as a compress tar
+        archive that you must manually install. For Connector/ODBC
+        3.51.13 and earlier the software was provided on a compressed
+        disk image (<filename>.dmg</filename>) file and included an
+        installer.
+      </para>
 
-          <para>
-            How Connector/ODBC on Mac OS X is installed depends on the
-            version on Connector/ODBC you are using. For Connector/ODBC
-            3.51.14 and later, the package is provided as a compress tar
-            archive that you must manually install. For Connector/ODBC
-            3.51.13 and earlier the software was provided on a
-            compressed disk image (<filename>.dmg</filename>) file and
-            included an installer.
-          </para>
+      <para>
+        In either case, the driver is designed to work with the iODBC
+        driver manager included with Mac OS X.
+      </para>
 
+      <para>
+        To install Connector/ODBC 3.51.14 and later:
+      </para>
+
+      <orderedlist>
+
+        <listitem>
           <para>
-            In either case, the driver is designed to work with the
-            iODBC driver manager included with Mac OS X.
+            Download the installation file. Note that versions are
+            available for both PowerPC and Intel platforms.
           </para>
+        </listitem>
 
+        <listitem>
           <para>
-            To install Connector/ODBC 3.51.14 and later:
+            Extract the archive:
           </para>
 
-          <orderedlist>
-
-            <listitem>
-              <para>
-                Download the installation file. Note that versions are
-                available for both PowerPC and Intel platforms.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Extract the archive:
-              </para>
-
 <programlisting>$ tar zxf mysql-connector-odbc-<replaceable>3.51.16</replaceable>-osx10.4-x86-32bit.tar.gz</programlisting>
-            </listitem>
+        </listitem>
 
-            <listitem>
-              <para>
-                The directory created will contain two subdirectories,
-                <filename>lib</filename> and <filename>bin</filename>.
-                You need to copy these to a suitable location such as
-                <filename>/usr/local</filename>:
-              </para>
+        <listitem>
+          <para>
+            The directory created will contain two subdirectories,
+            <filename>lib</filename> and <filename>bin</filename>. You
+            need to copy these to a suitable location such as
+            <filename>/usr/local</filename>:
+          </para>
 
 <programlisting>$ cp bin/* /usr/local/bin
 $ cp lib/* /usr/local/lib</programlisting>
-            </listitem>
+        </listitem>
 
-            <listitem>
-              <para>
-                Finally, you must register the driver with iODBC using
-                the <command>myodbc3i</command> tool you just installed:
-              </para>
+        <listitem>
+          <para>
+            Finally, you must register the driver with iODBC using the
+            <command>myodbc3i</command> tool you just installed:
+          </para>
 
 <programlisting>$ myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;Driver=/usr/local/lib/libmyodbc3.so;Setup=/usr/local/lib/libmyodbc3S.so"</programlisting>
-            </listitem>
+        </listitem>
 
-          </orderedlist>
+      </orderedlist>
 
-          <para>
-            You can verify the installed drivers either by using the
-            ODBC Administrator application or the
-            <command>myodbc3i</command> utility:
-          </para>
+      <para>
+        You can verify the installed drivers either by using the ODBC
+        Administrator application or the <command>myodbc3i</command>
+        utility:
+      </para>
 
 <programlisting>$ myodbc3i -q -d</programlisting>
 
+      <para>
+        To install Connector/ODBC 3.51.13 and ealier, follow these
+        steps:
+      </para>
+
+      <orderedlist>
+
+        <listitem>
           <para>
-            To install Connector/ODBC 3.51.13 and ealier, follow these
-            steps:
+            Download the file to your computer and double-click on the
+            downloaded image file.
           </para>
+        </listitem>
 
-          <orderedlist>
+        <listitem>
+          <para>
+            Within the disk image you will find an installer package
+            (with the <filename>.pkg</filename> extension). Double click
+            on this file to start the Mac OS X installer.
+          </para>
+        </listitem>
 
-            <listitem>
-              <para>
-                Download the file to your computer and double-click on
-                the downloaded image file.
-              </para>
-            </listitem>
+        <listitem>
+          <para>
+            You will be presented with the installer welcome message.
+            Click the <guibutton>Continue</guibutton> button to begin
+            the installation process.
+          </para>
 
-            <listitem>
-              <para>
-                Within the disk image you will find an installer package
-                (with the <filename>.pkg</filename> extension). Double
-                click on this file to start the Mac OS X installer.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                You will be presented with the installer welcome
-                message. Click the <guibutton>Continue</guibutton>
-                button to begin the installation process.
-              </para>
-
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-macosx-install-step1.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/myodbc-macosx-install-step1.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Mac OS X Installer -
-                  Installer welcome</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+            </imageobject>
+            <textobject>
+              <phrase lang="en">Connector/ODBC Mac OS X Installer -
+              Installer welcome</phrase>
+            </textobject>
+          </mediaobject>
+        </listitem>
 
-            <listitem>
-              <para>
-                Please take the time to read the Important Information
-                as it contains guidance on how to complete the
-                installation process. Once you have read the notice and
-                collected the necessary information, click
-                <guibutton>Continue</guibutton>.
-              </para>
+        <listitem>
+          <para>
+            Please take the time to read the Important Information as it
+            contains guidance on how to complete the installation
+            process. Once you have read the notice and collected the
+            necessary information, click
+            <guibutton>Continue</guibutton>.
+          </para>
 
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-macosx-install-step2.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/myodbc-macosx-install-step2.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Mac OS X Installer -
-                  Important Information</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+            </imageobject>
+            <textobject>
+              <phrase lang="en">Connector/ODBC Mac OS X Installer -
+              Important Information</phrase>
+            </textobject>
+          </mediaobject>
+        </listitem>
 
-            <listitem>
-              <para>
-                Connector/ODBC drivers are made available under the GNU
-                General Public License. Please read the license if you
-                are not familiar with it before continuing installation.
-                Click <guibutton>Continue</guibutton> to approve the
-                license (you will be asked to confirm that decision) and
-                continue the installation.
-              </para>
+        <listitem>
+          <para>
+            Connector/ODBC drivers are made available under the GNU
+            General Public License. Please read the license if you are
+            not familiar with it before continuing installation. Click
+            <guibutton>Continue</guibutton> to approve the license (you
+            will be asked to confirm that decision) and continue the
+            installation.
+          </para>
 
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-macosx-install-step3.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/myodbc-macosx-install-step3.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Mac OS X Installer -
-                  License</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+            </imageobject>
+            <textobject>
+              <phrase lang="en">Connector/ODBC Mac OS X Installer -
+              License</phrase>
+            </textobject>
+          </mediaobject>
+        </listitem>
 
-            <listitem>
-              <para>
-                Choose a location to install the Connector/ODBC drivers
-                and the ODBC Administrator application. You must install
-                the files onto a drive with an operating system and you
-                may be limited in the choices available. Select the
-                drive you want to use, and then click
-                <guibutton>Continue</guibutton>.
-              </para>
+        <listitem>
+          <para>
+            Choose a location to install the Connector/ODBC drivers and
+            the ODBC Administrator application. You must install the
+            files onto a drive with an operating system and you may be
+            limited in the choices available. Select the drive you want
+            to use, and then click <guibutton>Continue</guibutton>.
+          </para>
 
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-macosx-install-step4.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/myodbc-macosx-install-step4.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Mac OS X Installer -
-                  Choosing a destination</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+            </imageobject>
+            <textobject>
+              <phrase lang="en">Connector/ODBC Mac OS X Installer -
+              Choosing a destination</phrase>
+            </textobject>
+          </mediaobject>
+        </listitem>
 
-            <listitem>
-              <para>
-                The installer will automatically select the files that
-                need to be installed on your machine. Click
-                <guibutton>Install</guibutton> to continue. The
-                installer will copy the necessary files to your machine.
-                A progress bar will be shown indicating the installation
-                progress.
-              </para>
+        <listitem>
+          <para>
+            The installer will automatically select the files that need
+            to be installed on your machine. Click
+            <guibutton>Install</guibutton> to continue. The installer
+            will copy the necessary files to your machine. A progress
+            bar will be shown indicating the installation progress.
+          </para>
 
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-macosx-install-step5.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/myodbc-macosx-install-step5.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Mac OS X Installer -
-                  Installation type</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+            </imageobject>
+            <textobject>
+              <phrase lang="en">Connector/ODBC Mac OS X Installer -
+              Installation type</phrase>
+            </textobject>
+          </mediaobject>
+        </listitem>
 
-            <listitem>
-              <para>
-                When installation has been completed you will get a
-                window like the one shown below. Click
-                <guibutton>Close</guibutton> to close and quit the
-                installer.
-              </para>
+        <listitem>
+          <para>
+            When installation has been completed you will get a window
+            like the one shown below. Click <guibutton>Close</guibutton>
+            to close and quit the installer.
+          </para>
 
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="images/myodbc-macosx-install-step6.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/myodbc-macosx-install-step6.png"
                     format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase lang="en">Connector/ODBC Mac OS X Installer -
-                  Installation complete</phrase>
-                </textobject>
-              </mediaobject>
-            </listitem>
+            </imageobject>
+            <textobject>
+              <phrase lang="en">Connector/ODBC Mac OS X Installer -
+              Installation complete</phrase>
+            </textobject>
+          </mediaobject>
+        </listitem>
 
-          </orderedlist>
+      </orderedlist>
 
-        </section>
-
-      </section>
-
     </section>
 
-    <section id="myodbc-installation-source">
+    <section id="myodbc-installation-source-windows">
 
-      <title>Installing Connector/ODBC from a source distribution</title>
+      <title>Installing Connector/ODBC from a Source Distribution on Windows</title>
 
       <para>
-        Installing Connector/ODBC from a source distribution gives you
-        greater flexibility in the contents and installation location of
-        the Connector/ODBC components. It also enables you to build and
-        install Connector/ODBC on platforms where a pre-compiled binary
-        is not available.
+        You should only need to install Connector/ODBC from source on
+        Windows if you want to change or modify the source or
+        installation. If you are unsure whether to install from source,
+        please use the binary installation detailed in
+        <xref
+          linkend="myodbc-installation-binary-windows"/>.
       </para>
 
       <para>
-        Connector/ODBC sources are available either as a downloadable
-        package, or through the revision control system used by the
-        Connector/ODBC developers.
+        Installing Connector/ODBC from source on Windows requires a
+        number of different tools and packages:
       </para>
 
-      <section id="myodbc-installation-source-windows">
+      <itemizedlist>
 
-        <title>Installing Connector/ODBC from a Source Distribution on Windows</title>
+        <listitem>
+          <para>
+            MDAC, Microsoft Data Access SDK from
+            <ulink
+              url="http://www.microsoft.com/data/"/>.
+          </para>
+        </listitem>
 
+        <listitem>
+          <para>
+            Suitable C compiler, such as Microsoft Visual C++ or the C
+            compiler included with Microsoft Visual Studio.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Compatible <literal>make</literal> tool. Microsoft's
+            <literal>nmake</literal> is used in the examples in this
+            section.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            MySQL client libraries and include files from MySQL 4.0.0 or
+            higher. (Preferably MySQL 4.0.16 or higher). This is
+            required because Connector/ODBC uses new calls and
+            structures that exist only starting from this version of the
+            library. To get the client libraries and include files,
+            visit <ulink
+              url="&base-url-downloads;"/>.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <section id="myodbc-installation-source-windows-3-51-building">
+
+        <title>Building Connector/ODBC 3.51</title>
+
         <para>
-          You should only need to install Connector/ODBC from source on
-          Windows if you want to change or modify the source or
-          installation. If you are unsure whether to install from
-          source, please use the binary installation detailed in
-          <xref
-            linkend="myodbc-installation-binary-windows"/>.
+          Connector/ODBC source distributions include
+          <filename>Makefiles</filename> that require the
+          <command>nmake</command> or other <literal>make</literal>
+          utility. In the distribution, you can find
+          <filename>Makefile</filename> for building the release version
+          and <filename>Makefile_debug</filename> for building debugging
+          versions of the driver libraries and DLLs.
         </para>
 
         <para>
-          Installing Connector/ODBC from source on Windows requires a
-          number of different tools and packages:
+          To build the driver, use this procedure:
         </para>
 
-        <itemizedlist>
+        <orderedlist>
 
           <listitem>
             <para>
-              MDAC, Microsoft Data Access SDK from
-              <ulink
-                url="http://www.microsoft.com/data/"/>.
+              Download and extract the sources to a folder, then change
+              directory into that folder. The following command assumes
+              the folder is named <filename>myodbc3-src</filename>:
             </para>
+
+<programlisting>
+C:\&gt; <userinput>cd myodbc3-src</userinput>
+</programlisting>
           </listitem>
 
           <listitem>
             <para>
-              Suitable C compiler, such as Microsoft Visual C++ or the C
-              compiler included with Microsoft Visual Studio.
+              Edit <filename>Makefile</filename> to specify the correct
+              path for the MySQL client libraries and header files. Then
+              use the following commands to build and install the
+              release version:
             </para>
+
+<programlisting>
+C:\&gt; <userinput>nmake -f Makefile</userinput>
+C:\&gt; <userinput>nmake -f Makefile install</userinput>
+</programlisting>
+
+            <para>
+              <command>nmake -f Makefile</command> builds the release
+              version of the driver and places the binaries in
+              subdirectory called <filename>Release</filename>.
+            </para>
+
+            <para>
+              <command>nmake -f Makefile install</command> installs
+              (copies) the driver DLLs and libraries
+              (<filename>myodbc3.dll</filename>,
+              <filename>myodbc3.lib</filename>) to your system
+              directory.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              Compatible <literal>make</literal> tool. Microsoft's
-              <literal>nmake</literal> is used in the examples in this
-              section.
+              To build the debug version, use
+              <filename>Makefile_Debug</filename> rather than
+              <filename>Makefile</filename>, as shown below:
             </para>
+
+<programlisting>
+C:\&gt; <userinput>nmake -f Makefile_debug</userinput>
+C:\&gt; <userinput>nmake -f Makefile_debug install</userinput>
+</programlisting>
           </listitem>
 
           <listitem>
             <para>
-              MySQL client libraries and include files from MySQL 4.0.0
-              or higher. (Preferably MySQL 4.0.16 or higher). This is
-              required because Connector/ODBC uses new calls and
-              structures that exist only starting from this version of
-              the library. To get the client libraries and include
-              files, visit
-              <ulink
-                url="&base-url-downloads;"/>.
+              You can clean and rebuild the driver by using:
             </para>
+
+<programlisting>
+C:\&gt; <userinput>nmake -f Makefile clean</userinput>
+C:\&gt; <userinput>nmake -f Makefile install</userinput>
+</programlisting>
           </listitem>
 
-        </itemizedlist>
+        </orderedlist>
 
-        <section id="myodbc-installation-source-windows-3-51-building">
+        <para>
+          <emphasis role="bold">Note</emphasis>:
+        </para>
 
-          <title>Building Connector/ODBC 3.51</title>
+        <itemizedlist>
 
-          <para>
-            Connector/ODBC source distributions include
-            <filename>Makefiles</filename> that require the
-            <command>nmake</command> or other <literal>make</literal>
-            utility. In the distribution, you can find
-            <filename>Makefile</filename> for building the release
-            version and <filename>Makefile_debug</filename> for building
-            debugging versions of the driver libraries and DLLs.
-          </para>
+          <listitem>
+            <para>
+              Make sure to specify the correct MySQL client libraries
+              and header files path in the Makefiles (set the
+              <literal>MYSQL_LIB_PATH</literal> and
+              <literal>MYSQL_INCLUDE_PATH</literal> variables). The
+              default header file path is assumed to be
+              <filename>C:\mysql\include</filename>. The default library
+              path is assumed to be
+              <filename>C:\mysql\lib\opt</filename> for release DLLs and
+              <filename>C:\mysql\lib\debug</filename> for debug
+              versions.
+            </para>
+          </listitem>
 
-          <para>
-            To build the driver, use this procedure:
-          </para>
+          <listitem>
+            <para>
+              For the complete usage of <command>nmake</command>, visit
+              <ulink
+                url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dv_vcce4/html/evgrfRunningNMAKE.asp"
+              />.
+            </para>
+          </listitem>
 
-          <orderedlist>
+          <listitem>
+            <para>
+              If you are using the Subversion tree for compiling, all
+              Windows-specific <filename>Makefiles</filename> are named
+              as <filename>Win_Makefile*</filename>.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Download and extract the sources to a folder, then
-                change directory into that folder. The following command
-                assumes the folder is named
-                <filename>myodbc3-src</filename>:
-              </para>
+        </itemizedlist>
 
-<programlisting>
-C:\&gt; <userinput>cd myodbc3-src</userinput>
-</programlisting>
-            </listitem>
+      </section>
 
-            <listitem>
-              <para>
-                Edit <filename>Makefile</filename> to specify the
-                correct path for the MySQL client libraries and header
-                files. Then use the following commands to build and
-                install the release version:
-              </para>
+      <section id="myodbc-installation-source-windows-3-51-testing">
 
-<programlisting>
-C:\&gt; <userinput>nmake -f Makefile</userinput>
-C:\&gt; <userinput>nmake -f Makefile install</userinput>
-</programlisting>
+        <title>Testing</title>
 
-              <para>
-                <command>nmake -f Makefile</command> builds the release
-                version of the driver and places the binaries in
-                subdirectory called <filename>Release</filename>.
-              </para>
+        <para>
+          After the driver libraries are copied/installed to the system
+          directory, you can test whether the libraries are properly
+          built by using the samples provided in the
+          <filename>samples</filename> subdirectory:
+        </para>
 
-              <para>
-                <command>nmake -f Makefile install</command> installs
-                (copies) the driver DLLs and libraries
-                (<filename>myodbc3.dll</filename>,
-                <filename>myodbc3.lib</filename>) to your system
-                directory.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                To build the debug version, use
-                <filename>Makefile_Debug</filename> rather than
-                <filename>Makefile</filename>, as shown below:
-              </para>
-
 <programlisting>
-C:\&gt; <userinput>nmake -f Makefile_debug</userinput>
-C:\&gt; <userinput>nmake -f Makefile_debug install</userinput>
+C:\&gt; <userinput>cd samples</userinput>
+C:\&gt; <userinput>nmake -f Makefile all</userinput>
 </programlisting>
-            </listitem>
 
-            <listitem>
-              <para>
-                You can clean and rebuild the driver by using:
-              </para>
+      </section>
 
-<programlisting>
-C:\&gt; <userinput>nmake -f Makefile clean</userinput>
-C:\&gt; <userinput>nmake -f Makefile install</userinput>
-</programlisting>
-            </listitem>
+      <section id="myodbc-installation-source-windows-2-50-building">
 
-          </orderedlist>
+        <title>Building MyODBC 2.50</title>
 
-          <para>
-            <emphasis role="bold">Note</emphasis>:
-          </para>
+        <para>
+          The MyODBC 2.50 source distribution includes VC workspace
+          files. You can build the driver using these files
+          (<filename>.dsp</filename> and <filename>.dsw</filename>)
+          directly by loading them from Microsoft Visual Studio 6.0 or
+          higher.
+        </para>
 
-          <itemizedlist>
+      </section>
 
-            <listitem>
-              <para>
-                Make sure to specify the correct MySQL client libraries
-                and header files path in the Makefiles (set the
-                <literal>MYSQL_LIB_PATH</literal> and
-                <literal>MYSQL_INCLUDE_PATH</literal> variables). The
-                default header file path is assumed to be
-                <filename>C:\mysql\include</filename>. The default
-                library path is assumed to be
-                <filename>C:\mysql\lib\opt</filename> for release DLLs
-                and <filename>C:\mysql\lib\debug</filename> for debug
-                versions.
-              </para>
-            </listitem>
+    </section>
 
-            <listitem>
-              <para>
-                For the complete usage of <command>nmake</command>,
-                visit
-                <ulink
-                  url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dv_vcce4/html/evgrfRunningNMAKE.asp"
-                />.
-              </para>
-            </listitem>
+    <section id="myodbc-installation-source-unix">
 
-            <listitem>
-              <para>
-                If you are using the Subversion tree for compiling, all
-                Windows-specific <filename>Makefiles</filename> are
-                named as <filename>Win_Makefile*</filename>.
-              </para>
-            </listitem>
+      <title>Installing Connector/ODBC from a Source Distribution on Unix</title>
 
-          </itemizedlist>
+      <para>
+        You need the following tools to build MySQL from source on Unix:
+      </para>
 
-        </section>
+      <itemizedlist>
 
-        <section id="myodbc-installation-source-windows-3-51-testing">
+        <listitem>
+          <para>
+            A working ANSI C++ compiler. <command>gcc</command> 2.95.2
+            or later, <command>egcs</command> 1.0.2 or later or
+            <command>egcs 2.91.66</command>, SGI C++, and SunPro C++ are
+            some of the compilers that are known to work.
+          </para>
+        </listitem>
 
-          <title>Testing</title>
+        <listitem>
+          <para>
+            A good <command>make</command> program. GNU
+            <command>make</command> is always recommended and is
+            sometimes required.
+          </para>
+        </listitem>
 
+        <listitem>
           <para>
-            After the driver libraries are copied/installed to the
-            system directory, you can test whether the libraries are
-            properly built by using the samples provided in the
-            <filename>samples</filename> subdirectory:
+            MySQL client libraries and include files from MySQL 4.0.0 or
+            higher. (Preferably MySQL 4.0.16 or higher). This is
+            required because Connector/ODBC uses new calls and
+            structures that exist only starting from this version of the
+            library. To get the client libraries and include files,
+            visit <ulink
+                url="&base-url-downloads;"/>.
           </para>
 
-<programlisting>
-C:\&gt; <userinput>cd samples</userinput>
-C:\&gt; <userinput>nmake -f Makefile all</userinput>
-</programlisting>
+          <para>
+            If you have built your own MySQL server and/or client
+            libraries from source then you must have used the
+            <option>--enable-thread-safe-client</option> option to
+            <literal>configure</literal> when the libraries were built.
+          </para>
 
-        </section>
+          <para>
+            You should also ensure that the
+            <literal>libmysqlclient</literal> library were built and
+            installed as a shared library.
+          </para>
+        </listitem>
 
-        <section id="myodbc-installation-source-windows-2-50-building">
+        <listitem>
+          <para>
+            A compatible ODBC manager must be installed. Connector/ODBC
+            is known to work with the <literal>iODBC</literal> and
+            <literal>unixODBC</literal> managers. See
+            <xref
+                linkend="myodbc-driver-manager"/>, for
+            more information.
+          </para>
+        </listitem>
 
-          <title>Building MyODBC 2.50</title>
-
+        <listitem>
           <para>
-            The MyODBC 2.50 source distribution includes VC workspace
-            files. You can build the driver using these files
-            (<filename>.dsp</filename> and <filename>.dsw</filename>)
-            directly by loading them from Microsoft Visual Studio 6.0 or
-            higher.
+            If you are using a character set that isn't compiled into
+            the MySQL client library then you need to install the MySQL
+            character definitions from the <filename>charsets</filename>
+            directory into <replaceable>SHAREDIR</replaceable> (by
+            default,
+            <filename>/usr/local/mysql/share/mysql/charsets</filename>).
+            These should be in place if you have installed the MySQL
+            server on the same machine. See <xref linkend="charset"/>,
+            for more information on character set support.
           </para>
+        </listitem>
 
-        </section>
+      </itemizedlist>
 
-      </section>
+      <para>
+        Once you have all the required files, unpack the source files to
+        a separate directory, you then have to run
+        <command>configure</command> and build the library using
+        <command>make</command>.
+      </para>
 
-      <section id="myodbc-installation-source-unix">
+      <section id="myodbc-installation-source-unix-configure-options">
 
-        <title>Installing Connector/ODBC from a Source Distribution on Unix</title>
+        <title>Typical <command>configure</command> Options</title>
 
         <para>
-          You need the following tools to build MySQL from source on
-          Unix:
+          The <command>configure</command> script gives you a great deal
+          of control over how you configure your Connector/ODBC build.
+          Typically you do this using options on the
+          <command>configure</command> command line. You can also affect
+          <command>configure</command> using certain environment
+          variables. For a list of options and environment variables
+          supported by <command>configure</command>, run this command:
         </para>
 
-        <itemizedlist>
+<programlisting>
+shell&gt; <userinput>./configure --help</userinput>
+</programlisting>
 
+        <para>
+          Some of the more commonly used <command>configure</command>
+          options are described here:
+        </para>
+
+        <orderedlist>
+
           <listitem>
             <para>
-              A working ANSI C++ compiler. <command>gcc</command> 2.95.2
-              or later, <command>egcs</command> 1.0.2 or later or
-              <command>egcs 2.91.66</command>, SGI C++, and SunPro C++
-              are some of the compilers that are known to work.
+              To compile Connector/ODBC, you need to supply the MySQL
+              client include and library files path using the
+              <option>--with-mysql-path=<replaceable>DIR</replaceable></option>
+              option, where <replaceable>DIR</replaceable> is the
+              directory where MySQL is installed.
             </para>
-          </listitem>
 
-          <listitem>
             <para>
-              A good <command>make</command> program. GNU
-              <command>make</command> is always recommended and is
-              sometimes required.
+              MySQL compile options can be determined by running
+              <literal><replaceable>DIR</replaceable>/bin/mysql_config</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              MySQL client libraries and include files from MySQL 4.0.0
-              or higher. (Preferably MySQL 4.0.16 or higher). This is
-              required because Connector/ODBC uses new calls and
-              structures that exist only starting from this version of
-              the library. To get the client libraries and include
-              files, visit
-              <ulink
-                url="&base-url-downloads;"/>.
+              Supply the standard header and library files path for your
+              ODBC Driver Manager (<literal>iODBC</literal> or
+              <literal>unixODBC</literal>).
             </para>
 
-            <para>
-              If you have built your own MySQL server and/or client
-              libraries from source then you must have used the
-              <option>--enable-thread-safe-client</option> option to
-              <literal>configure</literal> when the libraries were
-              built.
-            </para>
+            <itemizedlist>
 
-            <para>
-              You should also ensure that the
-              <literal>libmysqlclient</literal> library were built and
-              installed as a shared library.
-            </para>
-          </listitem>
+              <listitem>
+                <para>
+                  If you are using <literal>iODBC</literal> and
+                  <literal>iODBC</literal> is not installed in its
+                  default location (<filename>/usr/local</filename>),
+                  you might have to use the
+                  <option>--with-iodbc=<replaceable>DIR</replaceable></option>
+                  option, where <replaceable>DIR</replaceable> is the
+                  directory where <literal>iODBC</literal> is installed.
+                </para>
 
-          <listitem>
-            <para>
-              A compatible ODBC manager must be installed.
-              Connector/ODBC is known to work with the
-              <literal>iODBC</literal> and <literal>unixODBC</literal>
-              managers. See
-              <xref
-                linkend="myodbc-driver-manager"/>,
-              for more information.
-            </para>
+                <para>
+                  If the <literal>iODBC</literal> headers do not reside
+                  in
+                  <filename><replaceable>DIR</replaceable>/include</filename>,
+                  you can use the
+                  <option>--with-iodbc-includes=<replaceable>INCDIR</replaceable></option>
+                  option to specify their location.
+                </para>
+
+                <para>
+                  The applies to libraries. If they are not in
+                  <filename><replaceable>DIR</replaceable>/lib</filename>,
+                  you can use the
+                  <option>--with-iodbc-libs=<replaceable>LIBDIR</replaceable></option>
+                  option.
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  If you are using <literal>unixODBC</literal>, use the
+                  <option>--with-unixODBC=<replaceable>DIR</replaceable></option>
+                  option (case sensitive) to make
+                  <command>configure</command> look for
+                  <literal>unixODBC</literal> instead of
+                  <literal>iODBC</literal> by default,
+                  <replaceable>DIR</replaceable> is the directory where
+                  <literal>unixODBC</literal> is installed.
+                </para>
+
+                <para>
+                  If the <literal>unixODBC</literal> headers and
+                  libraries aren't located in
+                  <filename><replaceable>DIR</replaceable>/include</filename>
+                  and
+                  <filename><replaceable>DIR</replaceable>/lib</filename>,
+                  use the
+                  <option>--with-unixODBC-includes=<replaceable>INCDIR</replaceable></option>
+                  and
+                  <option>--with-unixODBC-libs=<replaceable>LIBDIR</replaceable></option>
+                  options.
+                </para>
+              </listitem>
+
+            </itemizedlist>
           </listitem>
 
           <listitem>
             <para>
-              If you are using a character set that isn't compiled into
-              the MySQL client library then you need to install the
-              MySQL character definitions from the
-              <filename>charsets</filename> directory into
-              <replaceable>SHAREDIR</replaceable> (by default,
-              <filename>/usr/local/mysql/share/mysql/charsets</filename>).
-              These should be in place if you have installed the MySQL
-              server on the same machine. See <xref linkend="charset"/>,
-              for more information on character set support.
+              You might want to specify an installation prefix other
+              than <filename>/usr/local</filename>. For example, to
+              install the Connector/ODBC drivers in
+              <filename>/usr/local/odbc/lib</filename>, use the
+              <option>--prefix=/usr/local/odbc</option> option.
             </para>
           </listitem>
 
-        </itemizedlist>
+        </orderedlist>
 
         <para>
-          Once you have all the required files, unpack the source files
-          to a separate directory, you then have to run
-          <command>configure</command> and build the library using
-          <command>make</command>.
+          The final configuration command looks something like this:
         </para>
 
-        <section id="myodbc-installation-source-unix-configure-options">
-
-          <title>Typical <command>configure</command> Options</title>
-
-          <para>
-            The <command>configure</command> script gives you a great
-            deal of control over how you configure your Connector/ODBC
-            build. Typically you do this using options on the
-            <command>configure</command> command line. You can also
-            affect <command>configure</command> using certain
-            environment variables. For a list of options and environment
-            variables supported by <command>configure</command>, run
-            this command:
-          </para>
-
 <programlisting>
-shell&gt; <userinput>./configure --help</userinput>
-</programlisting>
-
-          <para>
-            Some of the more commonly used <command>configure</command>
-            options are described here:
-          </para>
-
-          <orderedlist>
-
-            <listitem>
-              <para>
-                To compile Connector/ODBC, you need to supply the MySQL
-                client include and library files path using the
-                <option>--with-mysql-path=<replaceable>DIR</replaceable></option>
-                option, where <replaceable>DIR</replaceable> is the
-                directory where MySQL is installed.
-              </para>
-
-              <para>
-                MySQL compile options can be determined by running
-                <literal><replaceable>DIR</replaceable>/bin/mysql_config</literal>.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Supply the standard header and library files path for
-                your ODBC Driver Manager (<literal>iODBC</literal> or
-                <literal>unixODBC</literal>).
-              </para>
-
-              <itemizedlist>
-
-                <listitem>
-                  <para>
-                    If you are using <literal>iODBC</literal> and
-                    <literal>iODBC</literal> is not installed in its
-                    default location (<filename>/usr/local</filename>),
-                    you might have to use the
-                    <option>--with-iodbc=<replaceable>DIR</replaceable></option>
-                    option, where <replaceable>DIR</replaceable> is the
-                    directory where <literal>iODBC</literal> is
-                    installed.
-                  </para>
-
-                  <para>
-                    If the <literal>iODBC</literal> headers do not
-                    reside in
-                    <filename><replaceable>DIR</replaceable>/include</filename>,
-                    you can use the
-                    <option>--with-iodbc-includes=<replaceable>INCDIR</replaceable></option>
-                    option to specify their location.
-                  </para>
-
-                  <para>
-                    The applies to libraries. If they are not in
-                    <filename><replaceable>DIR</replaceable>/lib</filename>,
-                    you can use the
-                    <option>--with-iodbc-libs=<replaceable>LIBDIR</replaceable></option>
-                    option.
-                  </para>
-                </listitem>
-
-                <listitem>
-                  <para>
-                    If you are using <literal>unixODBC</literal>, use
-                    the
-                    <option>--with-unixODBC=<replaceable>DIR</replaceable></option>
-                    option (case sensitive) to make
-                    <command>configure</command> look for
-                    <literal>unixODBC</literal> instead of
-                    <literal>iODBC</literal> by default,
-                    <replaceable>DIR</replaceable> is the directory
-                    where <literal>unixODBC</literal> is installed.
-                  </para>
-
-                  <para>
-                    If the <literal>unixODBC</literal> headers and
-                    libraries aren't located in
-                    <filename><replaceable>DIR</replaceable>/include</filename>
-                    and
-                    <filename><replaceable>DIR</replaceable>/lib</filename>,
-                    use the
-                    <option>--with-unixODBC-includes=<replaceable>INCDIR</replaceable></option>
-                    and
-                    <option>--with-unixODBC-libs=<replaceable>LIBDIR</replaceable></option>
-                    options.
-                  </para>
-                </listitem>
-
-              </itemizedlist>
-            </listitem>
-
-            <listitem>
-              <para>
-                You might want to specify an installation prefix other
-                than <filename>/usr/local</filename>. For example, to
-                install the Connector/ODBC drivers in
-                <filename>/usr/local/odbc/lib</filename>, use the
-                <option>--prefix=/usr/local/odbc</option> option.
-              </para>
-            </listitem>
-
-          </orderedlist>
-
-          <para>
-            The final configuration command looks something like this:
-          </para>
-
-<programlisting>
 shell&gt; <userinput>./configure --prefix=/usr/local \</userinput>
          <userinput>--with-iodbc=/usr/local \</userinput>
          <userinput>--with-mysql-path=/usr/local/mysql</userinput>
 </programlisting>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-source-unix-otheroptions">
+      <section id="myodbc-installation-source-unix-otheroptions">
 
-          <title>Additional configure Options</title>
+        <title>Additional configure Options</title>
 
-          <para>
-            There are a number of other options that you need, or want,
-            to set when configuring the Connector/ODBC driver before it
-            is built.
-          </para>
+        <para>
+          There are a number of other options that you need, or want, to
+          set when configuring the Connector/ODBC driver before it is
+          built.
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                To link the driver with MySQL thread safe client
-                libraries <filename>libmysqlclient_r.so</filename> or
-                <filename>libmysqlclient_r.a</filename>, you must
-                specify the following <command>configure</command>
-                option:
-              </para>
+          <listitem>
+            <para>
+              To link the driver with MySQL thread safe client libraries
+              <filename>libmysqlclient_r.so</filename> or
+              <filename>libmysqlclient_r.a</filename>, you must specify
+              the following <command>configure</command> option:
+            </para>
 
 <programlisting>
 --enable-thread-safe
 </programlisting>
 
-              <para>
-                and can be disabled (default) using
-              </para>
+            <para>
+              and can be disabled (default) using
+            </para>
 
 <programlisting>
 --disable-thread-safe
 </programlisting>
 
-              <para>
-                This option enables the building of the driver
-                thread-safe library <filename>libmyodbc3_r.so</filename>
-                from by linking with MySQL thread-safe client library
-                <filename>libmysqlclient_r.so</filename> (The extensions
-                are OS dependent).
-              </para>
+            <para>
+              This option enables the building of the driver thread-safe
+              library <filename>libmyodbc3_r.so</filename> from by
+              linking with MySQL thread-safe client library
+              <filename>libmysqlclient_r.so</filename> (The extensions
+              are OS dependent).
+            </para>
 
-              <para>
-                If the compilation with the thread-safe option fails, it
-                may be because the correct thread-libraries on the
-                system could not be located. You should set the value of
-                <literal>LIBS</literal> to point to the correct thread
-                library for your system.
-              </para>
+            <para>
+              If the compilation with the thread-safe option fails, it
+              may be because the correct thread-libraries on the system
+              could not be located. You should set the value of
+              <literal>LIBS</literal> to point to the correct thread
+              library for your system.
+            </para>
 
 <programlisting>
 LIBS="-lpthread" ./configure ..
 </programlisting>
-            </listitem>
+          </listitem>
 
-            <listitem>
-              <para>
-                You can enable or disable the shared and static versions
-                of Connector/ODBC using these options:
-              </para>
+          <listitem>
+            <para>
+              You can enable or disable the shared and static versions
+              of Connector/ODBC using these options:
+            </para>
 
 <programlisting>
 --enable-shared[=yes/no]

@@ -1890,102 +1875,101 @@
 --enable-static[=yes/no]
 --disable-static
 </programlisting>
-            </listitem>
+          </listitem>
 
-            <listitem>
-              <para>
-                By default, all the binary distributions are built as
-                non-debugging versions (configured with
-                <option>--without-debug</option>).
-              </para>
+          <listitem>
+            <para>
+              By default, all the binary distributions are built as
+              non-debugging versions (configured with
+              <option>--without-debug</option>).
+            </para>
 
-              <para>
-                To enable debugging information, build the driver from
-                source distribution and use the
-                <option>--with-debug</option> option when you run
-                <command>configure</command>.
-              </para>
-            </listitem>
+            <para>
+              To enable debugging information, build the driver from
+              source distribution and use the
+              <option>--with-debug</option> option when you run
+              <command>configure</command>.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                This option is available only for source trees that have
-                been obtained from the Subversion repository. This
-                option does not apply to the packaged source
-                distributions.
-              </para>
+          <listitem>
+            <para>
+              This option is available only for source trees that have
+              been obtained from the Subversion repository. This option
+              does not apply to the packaged source distributions.
+            </para>
 
-              <para>
-                By default, the driver is built with the
-                <option>--without-docs</option> option. If you would
-                like the documentation to be built, then execute
-                <command>configure</command> with:
-              </para>
+            <para>
+              By default, the driver is built with the
+              <option>--without-docs</option> option. If you would like
+              the documentation to be built, then execute
+              <command>configure</command> with:
+            </para>
 
 <programlisting>
 --with-docs
 </programlisting>
-            </listitem>
+          </listitem>
 
-          </itemizedlist>
+        </itemizedlist>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-source-unix-building">
+      <section id="myodbc-installation-source-unix-building">
 
-          <title>Building and Compilation</title>
+        <title>Building and Compilation</title>
 
-          <para>
-            To build the driver libraries, you have to just execute
-            <command>make</command>.
-          </para>
+        <para>
+          To build the driver libraries, you have to just execute
+          <command>make</command>.
+        </para>
 
 <programlisting>
 shell&gt; <userinput>make</userinput>
 </programlisting>
 
-          <para>
-            If any errors occur, correct them and continue the build
-            process. If you aren't able to build, then send a detailed
-            email to <email>myodbc@stripped</email> for further
-            assistance.
-          </para>
+        <para>
+          If any errors occur, correct them and continue the build
+          process. If you aren't able to build, then send a detailed
+          email to <email>myodbc@stripped</email> for further
+          assistance.
+        </para>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-source-unix-shared-libraries">
+      <section id="myodbc-installation-source-unix-shared-libraries">
 
-          <title>Building Shared Libraries</title>
+        <title>Building Shared Libraries</title>
 
-          <para>
-            On most platforms, MySQL does not build or support
-            <filename>.so</filename> (shared) client libraries by
-            default. This is based on our experience of problems when
-            building shared libraries.
-          </para>
+        <para>
+          On most platforms, MySQL does not build or support
+          <filename>.so</filename> (shared) client libraries by default.
+          This is based on our experience of problems when building
+          shared libraries.
+        </para>
 
-          <para>
-            In cases like this, you have to download the MySQL
-            distribution and configure it with these options:
-          </para>
+        <para>
+          In cases like this, you have to download the MySQL
+          distribution and configure it with these options:
+        </para>
 
 <programlisting>
 --without-server --enable-shared
 </programlisting>
 
-          <para>
-            To build shared driver libraries, you must specify the
-            <option>--enable-shared</option> option for
-            <command>configure</command>. By default,
-            <command>configure</command> does not enable this option.
-          </para>
+        <para>
+          To build shared driver libraries, you must specify the
+          <option>--enable-shared</option> option for
+          <command>configure</command>. By default,
+          <command>configure</command> does not enable this option.
+        </para>
 
-          <para>
-            If you have configured with the
-            <option>--disable-shared</option> option, you can build the
-            <filename>.so</filename> file from the static libraries
-            using the following commands:
-          </para>
+        <para>
+          If you have configured with the
+          <option>--disable-shared</option> option, you can build the
+          <filename>.so</filename> file from the static libraries using
+          the following commands:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>cd mysql-connector-odbc-3.51.01</userinput>

@@ -2002,24 +1986,24 @@
           <userinput>-lz -lc -lmysqlclient -liodbcinst</userinput>
 </programlisting>
 
-          <para>
-            Make sure to change <option>-liodbcinst</option> to
-            <option>-lodbcinst</option> if you are using
-            <literal>unixODBC</literal> instead of
-            <literal>iODBC</literal>, and configure the library paths
-            accordingly.
-          </para>
+        <para>
+          Make sure to change <option>-liodbcinst</option> to
+          <option>-lodbcinst</option> if you are using
+          <literal>unixODBC</literal> instead of
+          <literal>iODBC</literal>, and configure the library paths
+          accordingly.
+        </para>
 
-          <para>
-            This builds and places the
-            <filename>libmyodbc3-3.51.01.so</filename> file in the
-            <filename>.libs</filename> directory. Copy this file to the
-            Connector/ODBC library installation directory
-            (<filename>/usr/local/lib</filename> (or the
-            <filename>lib</filename> directory under the installation
-            directory that you supplied with the
-            <option>--prefix</option>).
-          </para>
+        <para>
+          This builds and places the
+          <filename>libmyodbc3-3.51.01.so</filename> file in the
+          <filename>.libs</filename> directory. Copy this file to the
+          Connector/ODBC library installation directory
+          (<filename>/usr/local/lib</filename> (or the
+          <filename>lib</filename> directory under the installation
+          directory that you supplied with the
+          <option>--prefix</option>).
+        </para>
 
 <programlisting>
 shell&gt; <userinput>cd .libs</userinput>

@@ -2028,9 +2012,9 @@
 shell&gt; <userinput>ln -s libmyodbc3-3.51.01.so libmyodbc3.so</userinput>
 </programlisting>
 
-          <para>
-            To build the thread-safe driver library:
-          </para>
+        <para>
+          To build the thread-safe driver library:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>CC=/usr/bin/gcc \</userinput>

@@ -2044,156 +2028,155 @@
           <userinput>-lz -lc -lmysqlclient_r -liodbcinst</userinput>
 </programlisting>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-source-unix-installing">
+      <section id="myodbc-installation-source-unix-installing">
 
-          <title>Installing Driver Libraries</title>
+        <title>Installing Driver Libraries</title>
 
-          <para>
-            To install the driver libraries, execute the following
-            command:
-          </para>
+        <para>
+          To install the driver libraries, execute the following
+          command:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>make install</userinput>
 </programlisting>
 
-          <para>
-            That command installs one of the following sets of
-            libraries:
-          </para>
+        <para>
+          That command installs one of the following sets of libraries:
+        </para>
 
-          <para>
-            For Connector/ODBC 3.51:
-          </para>
+        <para>
+          For Connector/ODBC 3.51:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc3.so</filename>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc3.so</filename>
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc3-3.51.01.so</filename>, where
-                3.51.01 is the version of the driver
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc3-3.51.01.so</filename>, where 3.51.01
+              is the version of the driver
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc3.a</filename>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc3.a</filename>
+            </para>
+          </listitem>
 
-          </itemizedlist>
+        </itemizedlist>
 
-          <para>
-            For thread-safe Connector/ODBC 3.51:
-          </para>
+        <para>
+          For thread-safe Connector/ODBC 3.51:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc3_r.so</filename>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc3_r.so</filename>
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc3-3_r.51.01.so</filename>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc3-3_r.51.01.so</filename>
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc3_r.a</filename>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc3_r.a</filename>
+            </para>
+          </listitem>
 
-          </itemizedlist>
+        </itemizedlist>
 
-          <para>
-            For MyODBC 2.5.0:
-          </para>
+        <para>
+          For MyODBC 2.5.0:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc.so</filename>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc.so</filename>
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc-2.50.39.so</filename>, where 2.50.39
-                is the version of the driver
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc-2.50.39.so</filename>, where 2.50.39
+              is the version of the driver
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <filename>libmyodbc.a</filename>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <filename>libmyodbc.a</filename>
+            </para>
+          </listitem>
 
-          </itemizedlist>
+        </itemizedlist>
 
-          <para>
-            For more information on build process, refer to the
-            <filename>INSTALL</filename> file that comes with the source
-            distribution. Note that if you are trying to use the
-            <command>make</command> from Sun, you may end up with
-            errors. On the other hand, GNU <command>gmake</command>
-            should work fine on all platforms.
-          </para>
+        <para>
+          For more information on build process, refer to the
+          <filename>INSTALL</filename> file that comes with the source
+          distribution. Note that if you are trying to use the
+          <command>make</command> from Sun, you may end up with errors.
+          On the other hand, GNU <command>gmake</command> should work
+          fine on all platforms.
+        </para>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-source-unix-testing">
+      <section id="myodbc-installation-source-unix-testing">
 
-          <title>Testing Connector/ODBC on Unix</title>
+        <title>Testing Connector/ODBC on Unix</title>
 
-          <para>
-            To run the basic samples provided in the distribution with
-            the libraries that you built, use the following command:
-          </para>
+        <para>
+          To run the basic samples provided in the distribution with the
+          libraries that you built, use the following command:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>make test</userinput>
 </programlisting>
 
-          <para>
-            Before running the tests, create the DSN 'myodbc3' in
-            <filename>odbc.ini</filename> and set the environment
-            variable <literal>ODBCINI</literal> to the correct
-            <filename>odbc.ini</filename> file; and MySQL server is
-            running. You can find a sample <filename>odbc.ini</filename>
-            with the driver distribution.
-          </para>
+        <para>
+          Before running the tests, create the DSN 'myodbc3' in
+          <filename>odbc.ini</filename> and set the environment variable
+          <literal>ODBCINI</literal> to the correct
+          <filename>odbc.ini</filename> file; and MySQL server is
+          running. You can find a sample <filename>odbc.ini</filename>
+          with the driver distribution.
+        </para>
 
-          <para>
-            You can even modify the
-            <filename>samples/run-samples</filename> script to pass the
-            desired DSN, UID, and PASSWORD values as the command-line
-            arguments to each sample.
-          </para>
+        <para>
+          You can even modify the
+          <filename>samples/run-samples</filename> script to pass the
+          desired DSN, UID, and PASSWORD values as the command-line
+          arguments to each sample.
+        </para>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-source-unix-macosx">
+      <section id="myodbc-installation-source-unix-macosx">
 
-          <title>Building Connector/ODBC from Source on Mac OS X</title>
+        <title>Building Connector/ODBC from Source on Mac OS X</title>
 
-          <para>
-            To build the driver on Mac OS X (Darwin), make use of the
-            following <command>configure</command> example:
-          </para>
+        <para>
+          To build the driver on Mac OS X (Darwin), make use of the
+          following <command>configure</command> example:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>./configure --prefix=/usr/local</userinput>

@@ -2204,17 +2187,17 @@
           <userinput>--host=powerpc-apple</userinput>
 </programlisting>
 
-          <para>
-            The command assumes that the <literal>unixODBC</literal> and
-            MySQL are installed in the default locations. If not,
-            configure accordingly.
-          </para>
+        <para>
+          The command assumes that the <literal>unixODBC</literal> and
+          MySQL are installed in the default locations. If not,
+          configure accordingly.
+        </para>
 
-          <para>
-            On Mac OS X, <option>--enable-shared</option> builds
-            <filename>.dylib</filename> files by default. You can build
-            <filename>.so</filename> files like this:
-          </para>
+        <para>
+          On Mac OS X, <option>--enable-shared</option> builds
+          <filename>.dylib</filename> files by default. You can build
+          <filename>.so</filename> files like this:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>make</userinput>

@@ -2227,9 +2210,9 @@
           <userinput>-liodbcinst -lmysqlclient -lz -lc</userinput>
 </programlisting>
 
-          <para>
-            To build the thread-safe driver library:
-          </para>
+        <para>
+          To build the thread-safe driver library:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>CC=/usr/bin/gcc \</userinput>

@@ -2240,48 +2223,48 @@
           <userinput>-liodbcinst -lmysqlclienti_r -lz -lc -lpthread</userinput>
 </programlisting>
 
-          <para>
-            Make sure to change the <option>-liodbcinst</option> to
-            <option>-lodbcinst</option> in case of using
-            <literal>unixODBC</literal> instead of
-            <literal>iODBC</literal> and configure the libraries path
-            accordingly.
-          </para>
+        <para>
+          Make sure to change the <option>-liodbcinst</option> to
+          <option>-lodbcinst</option> in case of using
+          <literal>unixODBC</literal> instead of
+          <literal>iODBC</literal> and configure the libraries path
+          accordingly.
+        </para>
 
-          <para>
-            In Apple's version of GCC, both <command>cc</command> and
-            <command>gcc</command> are actually symbolic links to
-            <command>gcc3</command>.
-          </para>
+        <para>
+          In Apple's version of GCC, both <command>cc</command> and
+          <command>gcc</command> are actually symbolic links to
+          <command>gcc3</command>.
+        </para>
 
-          <para>
-            Copy this library to the <filename>$prefix/lib</filename>
-            directory and symlink to <filename>libmyodbc3.so</filename>.
-          </para>
+        <para>
+          Copy this library to the <filename>$prefix/lib</filename>
+          directory and symlink to <filename>libmyodbc3.so</filename>.
+        </para>
 
-          <para>
-            You can cross-check the output shared-library properties
-            using this command:
-          </para>
+        <para>
+          You can cross-check the output shared-library properties using
+          this command:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>otool -LD .libs/libmyodbc3-3.51.01.so</userinput>
 </programlisting>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-source-unix-hpux">
+      <section id="myodbc-installation-source-unix-hpux">
 
-          <title>Building Connector/ODBC from Source on HP-UX</title>
+        <title>Building Connector/ODBC from Source on HP-UX</title>
 
-          <para>
-            To build the driver on HP-UX 10.x or 11.x, make use of the
-            following <command>configure</command> example:
-          </para>
+        <para>
+          To build the driver on HP-UX 10.x or 11.x, make use of the
+          following <command>configure</command> example:
+        </para>
 
-          <para>
-            If using <command>cc</command>:
-          </para>
+        <para>
+          If using <command>cc</command>:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>CC="cc" \</userinput>

@@ -2294,9 +2277,9 @@
           <userinput>--enable-thread-safe</userinput>
 </programlisting>
 
-          <para>
-            If using <command>gcc</command>:
-          </para>
+        <para>
+          If using <command>gcc</command>:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>CC="gcc" \</userinput>

@@ -2308,26 +2291,26 @@
           <userinput>--enable-thread-safe</userinput>
 </programlisting>
 
-          <para>
-            Once the driver is built, cross-check its attributes using
-            <command>chatr .libs/libmyodbc3.sl</command> to determine
-            whether you need to have set the MySQL client library path
-            using the <literal>SHLIB_PATH</literal> environment
-            variable. For static versions, ignore all shared-library
-            options and run <command>configure</command> with the
-            <option>--disable-shared</option> option.
-          </para>
+        <para>
+          Once the driver is built, cross-check its attributes using
+          <command>chatr .libs/libmyodbc3.sl</command> to determine
+          whether you need to have set the MySQL client library path
+          using the <literal>SHLIB_PATH</literal> environment variable.
+          For static versions, ignore all shared-library options and run
+          <command>configure</command> with the
+          <option>--disable-shared</option> option.
+        </para>
 
-        </section>
+      </section>
 
-        <section id="myodbc-installation-source-unix-aix">
+      <section id="myodbc-installation-source-unix-aix">
 
-          <title>Building Connector/ODBC from Source on AIX</title>
+        <title>Building Connector/ODBC from Source on AIX</title>
 
-          <para>
-            To build the driver on AIX, make use of the following
-            <command>configure</command> example:
-          </para>
+        <para>
+          To build the driver on AIX, make use of the following
+          <command>configure</command> example:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>./configure --prefix=/usr/local</userinput>

@@ -2337,92 +2320,91 @@
           <userinput>--enable-thread-safe</userinput>
 </programlisting>
 
-          <para>
-            <emphasis role="bold">NOTE</emphasis>: For more information
-            about how to build and set up the static and shared
-            libraries across the different platforms refer to '
-            <ulink
+        <para>
+          <emphasis role="bold">NOTE</emphasis>: For more information
+          about how to build and set up the static and shared libraries
+          across the different platforms refer to '
+          <ulink
               url="http://www.fortran-2000.com/ArnaudRecipes/sharedlib.html"
               >Using
-            static and shared libraries across platforms</ulink>'.
-          </para>
+          static and shared libraries across platforms</ulink>'.
+        </para>
 
-        </section>
-
       </section>
 
-      <section id="myodbc-installation-source-development">
+    </section>
 
-        <title>Installing Connector/ODBC from the Development Source Tree</title>
+    <section id="myodbc-installation-source-development">
 
-        <para>
-          <emphasis role="bold">Caution</emphasis>: You should read this
-          section only if you are interested in helping us test our new
-          code. If you just want to get MySQL Connector/ODBC up and
-          running on your system, you should use a standard release
-          distribution.
-        </para>
+      <title>Installing Connector/ODBC from the Development Source Tree</title>
 
-        <para>
-          To be able to access the Connector/ODBC source tree, you must
-          have Subversion installed. Subversion is freely available from
-          <ulink
+      <para>
+        <emphasis role="bold">Caution</emphasis>: You should read this
+        section only if you are interested in helping us test our new
+        code. If you just want to get MySQL Connector/ODBC up and
+        running on your system, you should use a standard release
+        distribution.
+      </para>
+
+      <para>
+        To be able to access the Connector/ODBC source tree, you must
+        have Subversion installed. Subversion is freely available from
+        <ulink
             url="http://subversion.tigris.org/"/>.
-        </para>
+      </para>
 
-        <para>
-          To build from the source trees, you need the following tools:
-        </para>
+      <para>
+        To build from the source trees, you need the following tools:
+      </para>
 
-        <itemizedlist>
+      <itemizedlist>
 
-          <listitem>
-            <para>
-              autoconf 2.52 (or newer)
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            autoconf 2.52 (or newer)
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              automake 1.4 (or newer)
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            automake 1.4 (or newer)
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              libtool 1.4 (or newer)
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            libtool 1.4 (or newer)
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              m4
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            m4
+          </para>
+        </listitem>
 
-        </itemizedlist>
+      </itemizedlist>
 
-        <para>
-          The most recent development source tree is available from our
-          public Subversion trees at
-          <ulink
+      <para>
+        The most recent development source tree is available from our
+        public Subversion trees at
+        <ulink
             url="http://dev.mysql.com/tech-resources/sources.html"/>.
-        </para>
+      </para>
 
-        <para>
-          To checkout out the Connector/ODBC sources, change to the
-          directory where you want the copy of the Connector/ODBC tree
-          to be stored, then use the following command:
-        </para>
+      <para>
+        To checkout out the Connector/ODBC sources, change to the
+        directory where you want the copy of the Connector/ODBC tree to
+        be stored, then use the following command:
+      </para>
 
 <programlisting>shell&gt; svn co http://svn.mysql.com/svnpublic/connector-odbc3</programlisting>
 
-        <para>
-          You should now have a copy of the entire Connector/ODBC source
-          tree in the directory <filename>connector-odbc3</filename>. To
-          build from this source tree on Unix or Linux follow these
-          steps:
-        </para>
+      <para>
+        You should now have a copy of the entire Connector/ODBC source
+        tree in the directory <filename>connector-odbc3</filename>. To
+        build from this source tree on Unix or Linux follow these steps:
+      </para>
 
 <programlisting>shell&gt; <userinput>cd connector-odbc3</userinput>
 shell&gt; <userinput>aclocal</userinput>

@@ -2433,43 +2415,41 @@
 shell&gt; <userinput>make</userinput>
 </programlisting>
 
-        <para>
-          For more information on how to build, refer to the
-          <filename>INSTALL</filename> file located in the same
-          directory. For more information on options to
-          <command>configure</command>, see
-          <xref
+      <para>
+        For more information on how to build, refer to the
+        <filename>INSTALL</filename> file located in the same directory.
+        For more information on options to <command>configure</command>,
+        see
+        <xref
             linkend="myodbc-installation-source-unix-configure-options"/>
-        </para>
+      </para>
 
-        <para>
-          When the build is done, run <command>make install</command> to
-          install the Connector/ODBC 3.51 driver on your system.
-        </para>
+      <para>
+        When the build is done, run <command>make install</command> to
+        install the Connector/ODBC 3.51 driver on your system.
+      </para>
 
-        <para>
-          If you have gotten to the <command>make</command> stage and
-          the distribution does not compile, please report it to
-          <email>myodbc@stripped</email>.
-        </para>
+      <para>
+        If you have gotten to the <command>make</command> stage and the
+        distribution does not compile, please report it to
+        <email>myodbc@stripped</email>.
+      </para>
 
-        <para>
-          On Windows, make use of Windows Makefiles
-          <filename>WIN-Makefile</filename> and
-          <filename>WIN-Makefile_debug</filename> in building the
-          driver. For more information, see
-          <xref
+      <para>
+        On Windows, make use of Windows Makefiles
+        <filename>WIN-Makefile</filename> and
+        <filename>WIN-Makefile_debug</filename> in building the driver.
+        For more information, see
+        <xref
             linkend="myodbc-installation-source-windows"/>.
-        </para>
+      </para>
 
-        <para>
-          After the initial checkout operation to get the source tree,
-          you should run <command>svn update</command> periodically
-          update your source according to the latest version.
-        </para>
+      <para>
+        After the initial checkout operation to get the source tree, you
+        should run <command>svn update</command> periodically update
+        your source according to the latest version.
+      </para>
 
-      </section>
-
     </section>
 
   </section>

@@ -3323,12 +3303,14 @@
           <colspec colwidth="15*"/>
           <colspec colwidth="20*"/>
           <colspec colwidth="65*"/>
-          <tbody>
+          <thead>
             <row>
-              <entry><emphasis role="bold">Parameter</emphasis></entry>
-              <entry><emphasis role="bold">Default Value</emphasis></entry>
-              <entry><emphasis role="bold">Comment</emphasis></entry>
+              <entry>Parameter</entry>
+              <entry>Default Value</entry>
+              <entry>Comment</entry>
             </row>
+          </thead>
+          <tbody>
             <row>
               <entry><literal>user</literal></entry>
               <entry>ODBC (on Windows)</entry>


Thread
svn commit - mysqldoc@docsrva: r7111 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2 refman-commonmcbrown13 Jul