Author: paul
Date: 2006-01-09 01:09:20 +0100 (Mon, 09 Jan 2006)
New Revision: 723
Log:
r5960@frost: paul | 2006-01-08 17:02:03 -0600
website, Website -> Web site
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/innodb.xml
trunk/refman-4.1/ndbcluster.xml
trunk/refman-4.1/spatial-extensions.xml
trunk/refman-5.0/apis.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/innodb.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/ndbcluster.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5959
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1994
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5960
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1994
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-4.1/apis.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -12969,7 +12969,7 @@
configure the MySQL server to use the
<command>--old-passwords</command> option (see
<xref linkend="old-client"/>). This extension is documented on
- the PHP Website at <ulink url="http://php.net/mysql"/>.
+ the PHP Web site at <ulink url="http://php.net/mysql"/>.
</para>
</listitem>
@@ -12994,7 +12994,7 @@
<para>
The PHP distribution and documentation are available from the
- <ulink url="http://www.php.net/">PHP Website</ulink>.
+ <ulink url="http://www.php.net/">PHP Web site</ulink>.
</para>
<section id="php-problems">
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-4.1/innodb.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -6408,7 +6408,7 @@
The following table provides a list of some common Windows
system error codes. For a complete list see the
<ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/debug/base/system_error_codes.asp">Microsoft
- website</ulink>.
+ Web site</ulink>.
</para>
<itemizedlist>
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-4.1/ndbcluster.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -489,7 +489,7 @@
<para>
For our sample data, we will use the <literal>world</literal>
database which is available for download from the MySQL AB
- website. As this database takes up a relatively small amount
+ Web site. As this database takes up a relatively small amount
of space, we assume that each machine has 256 MB RAM, which
should be sufficient for running the operating system, host
NDB process, and (for the data nodes) for storing the
Modified: trunk/refman-4.1/spatial-extensions.xml
===================================================================
--- trunk/refman-4.1/spatial-extensions.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-4.1/spatial-extensions.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -68,7 +68,7 @@
If you have questions or concerns about the use of the spatial
extensions to MySQL, you can discuss these in the
<ulink url="http://forums.mysql.com/list.php?23">GIS forums</ulink>
- on our website.
+ on our Web site.
</para>
<section id="gis-introduction">
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.0/apis.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -12932,7 +12932,7 @@
you will likely want to configure the MySQL server to use the
<command>--old-passwords</command> option (see
<xref linkend="old-client"/>). This extension is documented on
- the PHP Website at <ulink url="http://php.net/mysql"/>.
+ the PHP Web site at <ulink url="http://php.net/mysql"/>.
</para>
</listitem>
@@ -12956,7 +12956,7 @@
<para>
The PHP distribution and documentation are available from the
- <ulink url="http://www.php.net/">PHP Website</ulink>.
+ <ulink url="http://www.php.net/">PHP Web site</ulink>.
</para>
<section id="php-problems">
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.0/innodb.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -6357,7 +6357,7 @@
The following table provides a list of some common Windows
system error codes. For a complete list see the
<ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/debug/base/system_error_codes.asp">Microsoft
- website</ulink>.
+ Web site</ulink>.
</para>
<itemizedlist>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.0/installing.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -1987,7 +1987,7 @@
<para>
The RPM distributions for MySQL ¤t-series; releases
- which we make available through our website are generated by
+ which we make available through our Web site are generated by
MySQL AB.
</para>
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.0/ndbcluster.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -495,7 +495,7 @@
<para>
For our sample data, we will use the <literal>world</literal>
database which is available for download from the MySQL AB
- website. As this database takes up a relatively small amount
+ Web site. As this database takes up a relatively small amount
of space, we assume that each machine has 256 MB RAM, which
should be sufficient for running the operating system, host
NDB process, and (for the data nodes) for storing the
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.1/apis.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -12935,7 +12935,7 @@
you will likely want to configure the MySQL server to use the
<command>--old-passwords</command> option (see
<xref linkend="old-client"/>). This extension is documented on
- the PHP Website at <ulink url="http://php.net/mysql"/>.
+ the PHP Web site at <ulink url="http://php.net/mysql"/>.
</para>
</listitem>
@@ -12959,7 +12959,7 @@
<para>
The PHP distribution and documentation are available from the
- <ulink url="http://www.php.net/">PHP Website</ulink>.
+ <ulink url="http://www.php.net/">PHP Web site</ulink>.
</para>
<section id="php-problems">
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.1/innodb.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -6316,7 +6316,7 @@
The following table provides a list of some common Windows
system error codes. For a complete list see the
<ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/debug/base/system_error_codes.asp">Microsoft
- website</ulink>.
+ Web site</ulink>.
</para>
<itemizedlist>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.1/installing.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -1987,7 +1987,7 @@
<para>
The RPM distributions for MySQL ¤t-series; releases
- which we make available through our website are generated by
+ which we make available through our Web site are generated by
MySQL AB.
</para>
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.1/ndbcluster.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -495,7 +495,7 @@
<para>
For our sample data, we will use the <literal>world</literal>
database which is available for download from the MySQL AB
- website. As this database takes up a relatively small amount
+ Web site. As this database takes up a relatively small amount
of space, we assume that each machine has 256 MB RAM, which
should be sufficient for running the operating system, host
NDB process, and (for the data nodes) for storing the
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-09 00:09:00 UTC (rev 722)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-09 00:09:20 UTC (rev 723)
@@ -3541,7 +3541,7 @@
and remove these directories manually before upgrading to
MySQL 5.0 or later. See the section on upgrading from
earlier releases to MySQL 5.0 in the
- &title-refman-previous;, available from the MySQL website.)
+ &title-refman-previous;, available from the MySQL Web site.)
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r723 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 9 Jan |
