svn commit - mysqldoc@docsrva: r7748 - in trunk: . refman-5.0 refman-5.1 refman-5.2

[paul]

Author: paul
Date: 2007-09-07 08:59:35 +0200 (Fri, 07 Sep 2007)
New Revision: 7748

Log:
 r24673@frost:  paul | 2007-09-07 01:58:55 -0500
 Fix some more invalid remappings.


Modified:
   trunk/refman-5.0/renamed-nodes.txt
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-5.2/renamed-nodes.txt

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


Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt	2007-09-07 05:26:17 UTC (rev 7747)
+++ trunk/refman-5.0/renamed-nodes.txt	2007-09-07 06:59:35 UTC (rev 7748)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 2; 1065 bytes

@@ -322,7 +322,7 @@
 mysql-cluster-limitations-resolved-in-5-0 mysql-cluster-limitations-resolved
 mysql-cluster-startup-phases mysql-cluster-start-phases
 mysql-cluster-upgrade-downgrade-rolling mysql-cluster-rolling-restart
-mysql-config-wizard-file-location mysql-config-wizard-starting-windows
+mysql-config-wizard-file-location mysql-config-wizard
 mysql-connectors connectors
 mysql-database-administration database-administration
 mysql-floss-license-exception
http://www.mysql.com/company/legal/licensing/opensource-license.html

@@ -547,7 +547,6 @@
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
 odbc myodbc-introduction
-odbc myodbc-connector
 odbc-and-last-insert-id myodbc-usagenotes-functionality
 odbc-connector myodbc-connector
 odbc-net-op-c-sharp-cp myodbc-examples-programming


Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2007-09-07 05:26:17 UTC (rev 7747)
+++ trunk/refman-5.1/renamed-nodes.txt	2007-09-07 06:59:35 UTC (rev 7748)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 537 bytes

@@ -292,7 +292,6 @@
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
 odbc myodbc-introduction
-odbc myodbc-connector
 odbc-and-last-insert-id myodbc-usagenotes-functionality
 odbc-connector myodbc-connector
 odbc-net-op-c-sharp-cp myodbc-examples-programming


Modified: trunk/refman-5.2/renamed-nodes.txt
===================================================================
--- trunk/refman-5.2/renamed-nodes.txt	2007-09-07 05:26:17 UTC (rev 7747)
+++ trunk/refman-5.2/renamed-nodes.txt	2007-09-07 06:59:35 UTC (rev 7748)
Changed blocks: 18, Lines Added: 36, Lines Deleted: 38; 9816 bytes

@@ -23,18 +23,18 @@
 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
+access-long-tables myodbc-usagenotes-apptips
+access97-export myodbc-usagenotes-apptips
+ado myodbc-usagenotes-apptips
+ado--rs-addnew myodbc-examples-programming
 ansi-diff-subqueries subqueries
 answering-questions mailing-list-use
 asking-questions bug-reports
-asp myodbc-usagenotes-apptips-microsoft-asp
+asp myodbc-usagenotes-apptips
 backing-up innodb-backup
 basic-myodbc-application-steps myodbc-examples-overview
 binary-notes-hp-ux quick-standard-installation
-blob-article myodbc-usagenotes-apptips-microsoft-vb-asp
+blob-article myodbc-usagenotes-apptips
 case-sensitivity-operators cast-functions
 charset-cast charset-convert
 charset-config-file adding-character-set

@@ -44,7 +44,7 @@
 charset-show-collation charset-show
 charset-show-columns charset-show
 charset-show-create-db charset-show
-chunk myodbc-usagenotes-apptips-microsoft-vb-asp
+chunk myodbc-usagenotes-apptips
 cj-basic-jdbc connector-j-usagenotes-basic
 cj-changelog cj-news
 cj-character-sets connector-j-reference-charsets

@@ -64,7 +64,7 @@
 cj-replication-connection connector-j-reference-replication-connection
 cj-reporting-bugs connector-j-support-bug-report
 cj-retrieve-autoinc connector-j-usagenotes-basic
-cj-supported-java-versions connector-j-verions-java
+cj-supported-java-versions connector-j-versions-java
 cj-supported-mysql-versions connector-j-versions
 cj-system-requirements connector-j-versions
 cj-tomcat-config connector-j-usagenotes-j2ee

@@ -73,7 +73,6 @@
 cj-understanding-transactions connector-j-usagenotes-j2ee
 cj-upgrading connector-j-installing-upgrading
 cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading
-cj-usage-advisor connector-j-reference-usage-advisor
 cj-using-callable-statements connector-j-usagenotes-basic
 cj-using-ssl connector-j-reference-using-ssl
 cjk-faq faqs-cjk

@@ -98,7 +97,7 @@
 cjk-faq-supplementary-chars-rejected faqs-cjk
 client-side-overview client-utility-overview
 client-side-scripts client-utility-programs
-clients mysql-apis
+clients apis
 column-types data-types
 concept-index ix01
 configuring-mysql mysqld

@@ -109,15 +108,15 @@
 connector-odbc myodbc-versions
 constraint-not-null constraint-invalid-data
 contrib http://solutions.mysql.com/solutions/partners/
-count-error myodbc-usagenotes-apptips-microsoft-vb-asp
+count-error myodbc-usagenotes-apptips
 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
-dao--rs-addnew myodbc-examples-programming-vb-dao
+dao--rs-addnew myodbc-examples-programming
 data-source-name myodbc-configuration-dsn
 dbi-info perl
 dbi-with-dbd perl
-deleted-problem myodbc-usagenotes-apptips-microsoft-access
-development-source myodbc-installation-source
+deleted-problem myodbc-usagenotes-apptips
+development-source myodbc-installation
 distinct-optimisation distinct-optimization
 doctoexcel myodbc-examples-tools-with-wordexcel
 driver-manager myodbc-general-information

@@ -174,11 +173,11 @@
 maintenance-regimen maintenance-schedule
 merge merge-storage-engine
 mgm-client-commands mysql-cluster-mgm-client-commands
-modified-error myodbc-usagenotes-apptips-microsoft-access
+modified-error myodbc-usagenotes-apptips
 msaccess myodbc-examples-tools-with-access
 msaccess-setup myodbc-examples-tools-with-access
-msdts myodbc-usagenotes-apptips-microsoft
-msvba myodbc-usagenotes-apptips-microsoft-vb-asp
+msdts myodbc-usagenotes-apptips
+msvba myodbc-usagenotes-apptips
 multi-computer mysql-cluster-multi-computer
 multi-config mysql-cluster-multi-config
 multi-hardware-software-network mysql-cluster-multi-hardware-software-network

@@ -219,10 +218,10 @@
 myodbc-installation-source myodbc-installation
 myodbc-mac-os-x myodbc-installation-source-unix
 myodbc-mailing-list myodbc-support-community
-myodbc-net myodbc-examples-programming-net
+myodbc-net myodbc-examples-programming
 myodbc-patch-submission myodbc-support-patch-submission
-myodbc-supported-platforms myodbc-support-platforms
-myodbc-tested-applications myodbc-examples-tools-tested
+myodbc-supported-platforms myodbc-installation
+myodbc-tested-applications myodbc-examples-tools
 myodbc-trace myodbc-configuration-trace
 myodbc-unix-binary-installation myodbc-installation-binary-unix
 myodbc-unix-building myodbc-installation-source-unix

@@ -241,8 +240,8 @@
 myodbc-windows-binary-installation myodbc-installation-binary-windows
 myodbc-windows-source-installation myodbc-installation-source-windows
 myodbc-windows-source-requirements myodbc-installation-source-windows
-myodbc-with-net myodbc-examples-programming-net
-myodbc-with-vb myodbc-examples-programming-vb
+myodbc-with-net myodbc-examples-programming
+myodbc-with-vb myodbc-examples-programming
 mysql-5-1-cluster-changes mysql-cluster-5-1-changes
 mysql-5-2-nutshell mysql-nutshell
 mysql-apis apis

@@ -260,12 +259,12 @@
 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
+mysql-tools-with-access myodbc-usagenotes-apptips
 mysqlcc client-utility-programs
 mysqld-max mysqld
 mysqld-process mysql-cluster-mysqld-process
-mysqlmanagerc ../../4.1/en/mysqlmanagerc
 mysqlmanager-pwgen ../../4.1/en/mysqlmanager-pwgen
+mysqlmanagerc ../../4.1/en/mysqlmanagerc
 name-case-sensitivity identifier-case-sensitivity
 ndb-mgm-command-options mysql-cluster-ndb-mgm-command-options
 ndb-mgm-process mysql-cluster-ndb-mgm-process

@@ -280,12 +279,11 @@
 nutshell-ready-for-immediate-use roadmap
 nutshell-stepwise-rollout roadmap
 odbc myodbc-introduction
-odbc odbc-connector
 odbc-and-last-insert-id myodbc-usagenotes-functionality
 odbc-connector myodbc-connector
-odbc-net-op-c-sharp-cp myodbc-examples-programming-net-csharp
-odbc-net-op-vb-cp  myodbc-examples-programming-net-vb
-odbc-problems myodbc-bug-report
+odbc-net-op-c-sharp-cp myodbc-examples-programming
+odbc-net-op-vb-cp  myodbc-examples-programming
+odbc-problems myodbc-support-bug-report
 open-tables table-cache
 optimisation table-optimization
 optimise-overview optimize-overview

@@ -294,7 +292,7 @@
 optimising-spatial-analysis optimizing-spatial-analysis
 optimising-subqueries optimizing-subqueries
 optimising-the-server optimizing-the-server
-optimize-access myodbc-usagenotes-apptips-microsoft-access
+optimize-access myodbc-usagenotes-apptips
 or-optimizations index-merge-optimization
 order-by-optimisation order-by-optimization
 other-vendor-column-types other-vendor-data-types

@@ -307,7 +305,7 @@
 purge-logs purge-master-logs
 query-timeout myodbc-usagenotes-functionality
 questions information-sources
-rdo--rs-addnew-and-rs-update myodbc-examples-programming-vb-rdo
+rdo--rs-addnew-and-rs-update myodbc-examples-programming
 reference language-structure
 remote-connection myodbc-examples-walkthrough
 replication-row-based replication-formats

@@ -315,7 +313,7 @@
 reporting-mysqltest-bugs mysql-test-suite
 reproduceable-test-case reproducible-test-case
 running-mysqltest mysql-test-suite
-sample--vb myodbc-examples-programming-vb
+sample--vb myodbc-examples-programming
 sci-sockets mysql-cluster-sci-sockets
 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

@@ -334,7 +332,7 @@
 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-requirements secure-connections
 secure-using-openssl secure-using-ssl
 secure-using-yassl secure-using-ssl
 server-side-scripts server-side-overview

@@ -344,7 +342,7 @@
 show-plugin show-plugins
 spatial-extensions-in-mysql spatial-extensions
 stability features
-stored-procedure-replication-faq faqs-stored-routines-triggers-replication
+stored-procedure-replication-faq faqs-stored-procs
 system system-optimization
 system-variables server-system-variables
 table-and-index innodb-table-and-index

@@ -353,18 +351,18 @@
 timestamp-4-1 timestamp
 tips miscellaneous-optimization-tips
 tools myodbc-examples-tools
-total-number-of-rows myodbc-usagenotes-apptips-microsoft-vb-asp
+total-number-of-rows myodbc-usagenotes-apptips
 transaction myodbc-errors
-trapping-odbc-errors myodbc-usagenotes-apptips-microsoft-access
+trapping-odbc-errors myodbc-usagenotes-apptips
 types-of-mysql-odbc-drivers myodbc-versions
 upgrading-grant-tables mysql-fix-privilege-tables
 using-mysqlcheck mysqlcheck
 varaible-table variables-table
 variable-table variables-table
 variables user-variables
-vb-types myodbc-usagenotes-apptips-microsoft-vb-asp
+vb-types myodbc-usagenotes-apptips
 where-optimisations where-optimizations
-where-to-get-myodbc myodbc-installation-obtaining
+where-to-get-myodbc myodbc-installation
 win95-start windows-start-command-line
 windows-binary-installation windows-installation
 windows-bitkeeper-build windows-source-build

@@ -373,5 +371,5 @@
 windows-system-requirements windows-installation
 windows-vc-plus-plus-build windows-source-build
 without-dsn myodbc-configuration-connection-without-dsn
-write-conflict myodbc-usagenotes-apptips-microsoft-access
+write-conflict myodbc-usagenotes-apptips
 year-2000-compliance y2k-issues