List:Internals« Previous MessageNext Message »
From:stefan Date:July 11 2005 10:31pm
Subject:bk commit - mysqldoc@docsrva tree (stefan:1.2986)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of stefan. When stefan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2986 05/07/12 00:31:09 stefan@stripped +5 -0
  titles.ent, news.xml:
    Sync with refman
  titles.ent:
    Changed SCO ... Notes titles as suggested by Boyd
  news.xml:
    Typos (Bug #11829)

  refman-5.0/titles.ent
    1.18 05/07/12 00:31:01 stefan@stripped +3 -3
    Sync with refman

  refman-4.1/titles.ent
    1.15 05/07/12 00:30:59 stefan@stripped +3 -3
    Sync with refman

  refman/titles.ent
    1.21 05/07/12 00:30:32 stefan@stripped +3 -3
    Changed SCO ... Notes titles as suggested by Boyd

  refman-5.0/news.xml
    1.47 05/07/11 16:05:40 stefan@stripped +2 -2
    Sync with refman

  refman/news.xml
    1.52 05/07/11 16:05:14 stefan@stripped +2 -2
    Typos (Bug #11829)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stefan
# Host:	apollon.site
# Root:	/home/stefan/bk/mysqldoc

--- 1.14/refman-4.1/titles.ent	2005-07-11 14:27:58 +02:00
+++ 1.15/refman-4.1/titles.ent	2005-07-12 00:30:59 +02:00
@@ -614,7 +614,7 @@
 <!ENTITY title-mysql-server "The <command>mysql.server</command> Server Startup Script"><!-- "The <command>mysql.server</command> Server Startup Script" -->
 <!ENTITY title-innodb-news-3-23-38 "MySQL/InnoDB-3.23.38, May 12, 2001"><!-- "MySQL/InnoDB-3.23.38, May 12, 2001" -->
 <!ENTITY title-reproduceable-test-case "Making a Test Case If You Experience Table Corruption"><!-- "Making a Test Case If You Experience Table Corruption" -->
-<!ENTITY title-sco "SCO Notes"><!-- "SCO Notes" -->
+<!ENTITY title-sco "SCO UNIX and OpenServer 5.0.x Notes"><!-- "SCO UNIX and OpenServer 5.0.x Notes" -->
 <!ENTITY title-news-3-22-20 "Changes in release 3.22.20 (18 Mar 1999)"><!-- "Changes in release 3.22.20 (18 Mar 1999)" -->
 <!ENTITY title-mysql-stat "<literal>mysql_stat()</literal>"><!-- "<literal>mysql_stat()</literal>" -->
 <!ENTITY title-mysql-cluster-shm-definition "MySQL Cluster Shared-Memory Connections"><!-- "MySQL Cluster Shared-Memory Connections" -->
@@ -1081,7 +1081,7 @@
 <!ENTITY title-msql2mysql "<command>msql2mysql</command>, Convert mSQL Programs for Use with MySQL"><!-- "<command>msql2mysql</command>, Convert mSQL Programs for Use with MySQL" -->
 <!ENTITY title-news-3-21-33 "Changes in release 3.21.33 (08 Jul 1998)"><!-- "Changes in release 3.21.33 (08 Jul 1998)" -->
 <!ENTITY title-show-create-procedure "<literal>SHOW CREATE PROCEDURE</literal> and <literal>SHOW CREATE FUNCTION</literal>"><!-- "<literal>SHOW CREATE PROCEDURE</literal> and <literal>SHOW CREATE FUNCTION</literal>" -->
-<!ENTITY title-sco-unixware "SCO UnixWare Version 7.1.x Notes"><!-- "SCO UnixWare Version 7.1.x Notes" -->
+<!ENTITY title-sco-unixware "SCO UnixWare 7.1.x and OpenUNIX 8.0.0 Notes"><!-- "SCO UnixWare 7.1.x and OpenUNIX 8.0.0 Notes" -->
 <!ENTITY title-ansi-diff-transactions "Transactions and Atomic Operations"><!-- "Transactions and Atomic Operations" -->
 <!ENTITY title-table-privileges-table "The <literal>INFORMATION_SCHEMA TABLE_PRIVILEGES</literal> Table"><!-- "The <literal>INFORMATION_SCHEMA TABLE_PRIVILEGES</literal> Table" -->
 <!ENTITY title-news-5-0-8 "Changes in release 5.0.8 (not released)"><!-- "Changes in release 5.0.8 (not released)" -->
@@ -1235,7 +1235,7 @@
 <!ENTITY title-news-3-19-4 "Changes in release 3.19.4"><!-- "Changes in release 3.19.4" -->
 <!ENTITY title-news-3-21-4 "Changes in release 3.21.4"><!-- "Changes in release 3.21.4" -->
 <!ENTITY title-openbsd "OpenBSD 2.5 Notes"><!-- "OpenBSD 2.5 Notes" -->
-<!ENTITY title-sco-openserver "SCO OpenServer Notes"><!-- "SCO OpenServer Notes" -->
+<!ENTITY title-sco-openserver "SCO OpenServer 6.0.x Notes"><!-- "SCO OpenServer 6.0.x Notes" -->
 <!ENTITY title-drop-view "<literal>DROP VIEW</literal> Syntax"><!-- "<literal>DROP VIEW</literal> Syntax" -->
 <!ENTITY title-mathematical-functions "Mathematical Functions"><!-- "Mathematical Functions" -->
 <!ENTITY title-innodb-news-3-23-53 "MySQL/InnoDB-3.23.53, October 9, 2002"><!-- "MySQL/InnoDB-3.23.53, October 9, 2002" -->

--- 1.46/refman-5.0/news.xml	2005-07-10 19:40:42 +02:00
+++ 1.47/refman-5.0/news.xml	2005-07-11 16:05:40 +02:00
@@ -536,12 +536,12 @@
 
 <programlisting>
 SELECT usergroupid AS id, COUNT(userid) AS number_of_users
-FROM groups
+FROM users
 GROUP BY id;
 </programlisting>
 
     <para>
-     However, the SQL standard requires the the column name be used, as
+     However, the SQL standard requires that the column name be used, as
      shown here:
     </para>
 

--- 1.17/refman-5.0/titles.ent	2005-07-11 14:28:00 +02:00
+++ 1.18/refman-5.0/titles.ent	2005-07-12 00:31:01 +02:00
@@ -616,7 +616,7 @@
 <!ENTITY title-mysql-server "The <command>mysql.server</command> Server Startup Script"><!-- "The <command>mysql.server</command> Server Startup Script" -->
 <!ENTITY title-innodb-news-3-23-38 "MySQL/InnoDB-3.23.38, May 12, 2001"><!-- "MySQL/InnoDB-3.23.38, May 12, 2001" -->
 <!ENTITY title-reproduceable-test-case "Making a Test Case If You Experience Table Corruption"><!-- "Making a Test Case If You Experience Table Corruption" -->
-<!ENTITY title-sco "SCO Notes"><!-- "SCO Notes" -->
+<!ENTITY title-sco "SCO UNIX and OpenServer 5.0.x Notes"><!-- "SCO UNIX and OpenServer 5.0.x Notes" -->
 <!ENTITY title-news-3-22-20 "Changes in release 3.22.20 (18 Mar 1999)"><!-- "Changes in release 3.22.20 (18 Mar 1999)" -->
 <!ENTITY title-mysql-stat "<literal>mysql_stat()</literal>"><!-- "<literal>mysql_stat()</literal>" -->
 <!ENTITY title-mysql-cluster-shm-definition "MySQL Cluster Shared-Memory Connections"><!-- "MySQL Cluster Shared-Memory Connections" -->
@@ -1083,7 +1083,7 @@
 <!ENTITY title-msql2mysql "<command>msql2mysql</command>, Convert mSQL Programs for Use with MySQL"><!-- "<command>msql2mysql</command>, Convert mSQL Programs for Use with MySQL" -->
 <!ENTITY title-news-3-21-33 "Changes in release 3.21.33 (08 Jul 1998)"><!-- "Changes in release 3.21.33 (08 Jul 1998)" -->
 <!ENTITY title-show-create-procedure "<literal>SHOW CREATE PROCEDURE</literal> and <literal>SHOW CREATE FUNCTION</literal>"><!-- "<literal>SHOW CREATE PROCEDURE</literal> and <literal>SHOW CREATE FUNCTION</literal>" -->
-<!ENTITY title-sco-unixware "SCO UnixWare Version 7.1.x Notes"><!-- "SCO UnixWare Version 7.1.x Notes" -->
+<!ENTITY title-sco-unixware "SCO UnixWare 7.1.x and OpenUNIX 8.0.0 Notes"><!-- "SCO UnixWare 7.1.x and OpenUNIX 8.0.0 Notes" -->
 <!ENTITY title-ansi-diff-transactions "Transactions and Atomic Operations"><!-- "Transactions and Atomic Operations" -->
 <!ENTITY title-table-privileges-table "The <literal>INFORMATION_SCHEMA TABLE_PRIVILEGES</literal> Table"><!-- "The <literal>INFORMATION_SCHEMA TABLE_PRIVILEGES</literal> Table" -->
 <!ENTITY title-news-5-0-8 "Changes in release 5.0.8 (not released)"><!-- "Changes in release 5.0.8 (not released)" -->
@@ -1237,7 +1237,7 @@
 <!ENTITY title-news-3-19-4 "Changes in release 3.19.4"><!-- "Changes in release 3.19.4" -->
 <!ENTITY title-news-3-21-4 "Changes in release 3.21.4"><!-- "Changes in release 3.21.4" -->
 <!ENTITY title-openbsd "OpenBSD 2.5 Notes"><!-- "OpenBSD 2.5 Notes" -->
-<!ENTITY title-sco-openserver "SCO OpenServer Notes"><!-- "SCO OpenServer Notes" -->
+<!ENTITY title-sco-openserver "SCO OpenServer 6.0.x Notes"><!-- "SCO OpenServer 6.0.x Notes" -->
 <!ENTITY title-drop-view "<literal>DROP VIEW</literal> Syntax"><!-- "<literal>DROP VIEW</literal> Syntax" -->
 <!ENTITY title-mathematical-functions "Mathematical Functions"><!-- "Mathematical Functions" -->
 <!ENTITY title-innodb-news-3-23-53 "MySQL/InnoDB-3.23.53, October 9, 2002"><!-- "MySQL/InnoDB-3.23.53, October 9, 2002" -->

--- 1.51/refman/news.xml	2005-07-10 19:40:42 +02:00
+++ 1.52/refman/news.xml	2005-07-11 16:05:14 +02:00
@@ -526,12 +526,12 @@
 
 <programlisting>
 SELECT usergroupid AS id, COUNT(userid) AS number_of_users
-FROM groups
+FROM users
 GROUP BY id;
 </programlisting>
 
     <para>
-     However, the SQL standard requires the the column name be used, as
+     However, the SQL standard requires that the column name be used, as
      shown here:
     </para>
 

--- 1.20/refman/titles.ent	2005-07-11 14:27:39 +02:00
+++ 1.21/refman/titles.ent	2005-07-12 00:30:32 +02:00
@@ -615,7 +615,7 @@
 <!ENTITY title-mysql-server "The <command>mysql.server</command> Server Startup Script"><!-- "The <command>mysql.server</command> Server Startup Script" -->
 <!ENTITY title-innodb-news-3-23-38 "MySQL/InnoDB-3.23.38, May 12, 2001"><!-- "MySQL/InnoDB-3.23.38, May 12, 2001" -->
 <!ENTITY title-reproduceable-test-case "Making a Test Case If You Experience Table Corruption"><!-- "Making a Test Case If You Experience Table Corruption" -->
-<!ENTITY title-sco "SCO Notes"><!-- "SCO Notes" -->
+<!ENTITY title-sco "SCO UNIX and OpenServer 5.0.x Notes"><!-- "SCO UNIX and OpenServer 5.0.x Notes" -->
 <!ENTITY title-news-3-22-20 "Changes in release 3.22.20 (18 Mar 1999)"><!-- "Changes in release 3.22.20 (18 Mar 1999)" -->
 <!ENTITY title-mysql-stat "<literal>mysql_stat()</literal>"><!-- "<literal>mysql_stat()</literal>" -->
 <!ENTITY title-mysql-cluster-shm-definition "MySQL Cluster Shared-Memory Connections"><!-- "MySQL Cluster Shared-Memory Connections" -->
@@ -1082,7 +1082,7 @@
 <!ENTITY title-msql2mysql "<command>msql2mysql</command>, Convert mSQL Programs for Use with MySQL"><!-- "<command>msql2mysql</command>, Convert mSQL Programs for Use with MySQL" -->
 <!ENTITY title-news-3-21-33 "Changes in release 3.21.33 (08 Jul 1998)"><!-- "Changes in release 3.21.33 (08 Jul 1998)" -->
 <!ENTITY title-show-create-procedure "<literal>SHOW CREATE PROCEDURE</literal> and <literal>SHOW CREATE FUNCTION</literal>"><!-- "<literal>SHOW CREATE PROCEDURE</literal> and <literal>SHOW CREATE FUNCTION</literal>" -->
-<!ENTITY title-sco-unixware "SCO UnixWare Version 7.1.x Notes"><!-- "SCO UnixWare Version 7.1.x Notes" -->
+<!ENTITY title-sco-unixware "SCO UnixWare 7.1.x and OpenUNIX 8.0.0 Notes"><!-- "SCO UnixWare 7.1.x and OpenUNIX 8.0.0 Notes" -->
 <!ENTITY title-ansi-diff-transactions "Transactions and Atomic Operations"><!-- "Transactions and Atomic Operations" -->
 <!ENTITY title-table-privileges-table "The <literal>INFORMATION_SCHEMA TABLE_PRIVILEGES</literal> Table"><!-- "The <literal>INFORMATION_SCHEMA TABLE_PRIVILEGES</literal> Table" -->
 <!ENTITY title-news-5-0-8 "Changes in release 5.0.8 (not released)"><!-- "Changes in release 5.0.8 (not released)" -->
@@ -1236,7 +1236,7 @@
 <!ENTITY title-news-3-19-4 "Changes in release 3.19.4"><!-- "Changes in release 3.19.4" -->
 <!ENTITY title-news-3-21-4 "Changes in release 3.21.4"><!-- "Changes in release 3.21.4" -->
 <!ENTITY title-openbsd "OpenBSD 2.5 Notes"><!-- "OpenBSD 2.5 Notes" -->
-<!ENTITY title-sco-openserver "SCO OpenServer Notes"><!-- "SCO OpenServer Notes" -->
+<!ENTITY title-sco-openserver "SCO OpenServer 6.0.x Notes"><!-- "SCO OpenServer 6.0.x Notes" -->
 <!ENTITY title-drop-view "<literal>DROP VIEW</literal> Syntax"><!-- "<literal>DROP VIEW</literal> Syntax" -->
 <!ENTITY title-mathematical-functions "Mathematical Functions"><!-- "Mathematical Functions" -->
 <!ENTITY title-innodb-news-3-23-53 "MySQL/InnoDB-3.23.53, October 9, 2002"><!-- "MySQL/InnoDB-3.23.53, October 9, 2002" -->
Thread
bk commit - mysqldoc@docsrva tree (stefan:1.2986)stefan12 Jul