List:Commits« Previous MessageNext Message »
From:stefan Date:August 23 2006 12:40pm
Subject:svn commit - mysqldoc@docsrva: r3087 - in trunk: refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: shinz
Date: 2006-08-23 14:40:47 +0200 (Wed, 23 Aug 2006)
New Revision: 3087

Log:
Add entity file for PHRASES, change refman Makefiles to be PHRASES-aware, replace literal instance of deprecated feature warning with phrase entity for a test

Modified:
   trunk/refman-4.1/Makefile
   trunk/refman-5.0/Makefile
   trunk/refman-5.1/Makefile
   trunk/refman-5.1/sql-syntax.xml


Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile	2006-08-22 17:35:03 UTC (rev 3086)
+++ trunk/refman-4.1/Makefile	2006-08-23 12:40:47 UTC (rev 3087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 3351 bytes

@@ -26,7 +26,7 @@
 
 depend:: manual.depend
 
-MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent ../refman-common/phrases.ent
 
 MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-3.23.xml ../refman-common/news-4.0.xml ../refman-common/news-4.1.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-innodb.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml data-types.xml database-ad!
 ministration.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png ima!
 ges/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx!
 -odbcadm
in-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml porting.xml preface.xml problems.xml replication.xml reservedwords.xml restrictions.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml tutorial.xml using-mysql-programs.xml 
 


Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2006-08-22 17:35:03 UTC (rev 3086)
+++ trunk/refman-5.0/Makefile	2006-08-23 12:40:47 UTC (rev 3087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 3464 bytes

@@ -26,7 +26,7 @@
 
 depend:: manual.depend
 
-MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent ..refman-common/phrases.ent
 
 MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/cjk-faq.en.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-5.0.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml data-types.xml database-administration.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functi!
 ons.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-w!
 in-install-step1.png images/myodbc-win-install-step2.png image!
 s/myodbc
-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png information-schema.xml innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml porting.xml precision-math.xml preface.xml problems.xml replication.xml reservedwords.xml restrictions.xml se-archive.xml se-bdb.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml 
 


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2006-08-22 17:35:03 UTC (rev 3086)
+++ trunk/refman-5.1/Makefile	2006-08-23 12:40:47 UTC (rev 3087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 3647 bytes

@@ -26,7 +26,7 @@
 
 depend:: manual.depend
 
-MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent ../refman-common/phrases.ent
 
 MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/cjk-faq.en.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-5.1.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-5.1.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml custom-engine.xml data-types.xml database-administration.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml events.xml extending-mysql.xml functions.x!
 ml images/blackhole-1.png images/cluster-components-1.png images/cluster-replication-binlog-injector.png images/cluster-replication-overview.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/custom-engine-overview.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcad!
 min-main.png images/myodbc-macosx-odbcadmin-sampledsn.png imag!
 es/myodb
c-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/pluggable-storage-overview.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png information-schema.xml innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml partitioning.xml pluggable-storage.xml porting.xml precision-math.xml preface.xml problems.xml replication.xml reservedwords.xml restrictions.xml se-archive.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensi!
 ons.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml 
 


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-08-22 17:35:03 UTC (rev 3086)
+++ trunk/refman-5.1/sql-syntax.xml	2006-08-23 12:40:47 UTC (rev 3087)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 12; 1619 bytes

@@ -4,8 +4,10 @@
 [
   <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
+  <!ENTITY % urls.entities        SYSTEM "../refman-common/urls.ent">
   %urls.entities;
+  <!ENTITY % phrases.entities     SYSTEM "../refman-common/phrases.ent">
+  %phrases.entities;
   <!ENTITY % versions.entities    SYSTEM "versions.ent">
   %versions.entities;
 ]>

@@ -21880,13 +21882,9 @@
 </programlisting>
 
         <remark role="help-description-begin"/>
-        
-        <para role="deprecated">
-          <emphasis role="bold">This feature is deprecated.</emphasis>
-          We recommend not to use it any more. It will be removed in a
-          future version.
-        </para>
 
+        &deprecated-feature-warning;        
+
         <para>
           This statement takes a snapshot of the master and copies it to
           the slave. It updates the values of

@@ -22004,11 +22002,7 @@
 
         <remark role="help-description-begin"/>
 
-        <para role="deprecated">
-          <emphasis role="bold">This feature is deprecated.</emphasis>
-          We recommend not to use it any more. It will be removed in a
-          future version.
-        </para>
+        &deprecated-feature-warning;
         
         <para>
           Transfers a copy of the table from the master to the slave.


Thread
svn commit - mysqldoc@docsrva: r3087 - in trunk: refman-4.1 refman-5.0 refman-5.1stefan23 Aug