Author: paul
Date: 2006-01-21 21:33:41 +0100 (Sat, 21 Jan 2006)
New Revision: 977
Log:
r6535@frost: paul | 2006-01-21 14:31:19 -0600
Eliminate redundancies in <ulink> elements.
(<ulink url="X">X</ulink> -> <ulink url="X"/>)
Modified:
trunk/
trunk/refman-4.1/connector-j.xml
trunk/refman-4.1/connector-mxj.xml
trunk/refman-5.0/connector-j.xml
trunk/refman-5.0/connector-mxj.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.1/connector-j.xml
trunk/refman-5.1/connector-mxj.xml
trunk/refman-5.1/database-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6534
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6535
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml 2006-01-21 20:33:22 UTC (rev 976)
+++ trunk/refman-4.1/connector-j.xml 2006-01-21 20:33:41 UTC (rev 977)
@@ -59,7 +59,7 @@
<para>
<ulink
url="http://java.sun.com/docs/books/tutorial/jdbc/basics/index.html">JDBC
- Basics </ulink> — A tutorial from Sun covering beginner
+ Basics</ulink> — A tutorial from Sun covering beginner
topics in JDBC
</para>
</listitem>
@@ -3475,7 +3475,7 @@
JDK that you can add JSSE to, like JDK-1.2.x or JDK-1.3.x
due to the following JSSE bug:
<ulink
- url="http://developer.java.sun.com/developer/bugParade/bugs/4273544.html">http://developer.java.sun.com/developer/bugParade/bugs/4273544.html</ulink>
+ url="http://developer.java.sun.com/developer/bugParade/bugs/4273544.html"/>
</para>
</listitem>
@@ -3483,8 +3483,7 @@
<para>
A MySQL server that supports SSL and has been compiled and
configured to do so, which is MySQL-4.0.4 or later, see:
- <ulink
- url="http://www.mysql.com/doc/en/Secure_connections.html">http://www.mysql.com/doc/en/Secure_connections.html</ulink>
+ <ulink url="http://www.mysql.com/doc/en/secure-connections.html"/>
</para>
</listitem>
@@ -4051,8 +4050,7 @@
<para>
The following instructions are based on the instructions for
Tomcat-5.x, available at
- <ulink
- url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html">http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html</ulink>
+ <ulink url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html"/>
which is current at the time this document was written.
</para>
@@ -4733,8 +4731,7 @@
<para>
The normal place to report bugs is
- <ulink
- url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>,
+ <ulink url="http://bugs.mysql.com/"/>,
which is the address for our bugs database. This database is
public, and can be browsed and searched by anyone. If you log in
to the system, you will also be able to enter new reports.
@@ -4762,8 +4759,7 @@
<para>
If you have a repeatable bug report, please report it to the
- bugs database at
- <ulink url="???">http://bugs.mysql.com/</ulink>.
+ bugs database at <ulink url="http://bugs.mysql.com/"/>.
</para>
<para>
@@ -4918,9 +4914,7 @@
<para>
Once you have finished your testcase, and have verified that it
demonstrates the bug you are reporting, upload it with your bug
- report to
- <ulink
- url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>.
+ report to <ulink url="http://bugs.mysql.com/"/>.
</para>
</section>
Modified: trunk/refman-4.1/connector-mxj.xml
===================================================================
--- trunk/refman-4.1/connector-mxj.xml 2006-01-21 20:33:22 UTC (rev 976)
+++ trunk/refman-4.1/connector-mxj.xml 2006-01-21 20:33:41 UTC (rev 977)
@@ -58,8 +58,7 @@
<para>
You can download sources and binaries from:
- <ulink url="&base-url-downloads;connector/mxj/">
- &base-url-downloads;connector/mxj/ </ulink>
+ <ulink url="&base-url-downloads;connector/mxj/"/>
</para>
<para>
@@ -152,9 +151,8 @@
<listitem>
<para>
MySQL Connector/J version 3.1 or newer (from
- <ulink url="&base-url-downloads;connector/j/">
- &base-url-downloads;connector/j/ </ulink>) installed and
- available via your CLASSPATH.
+ <ulink url="&base-url-downloads;connector/j/"/>)
+ installed and available via your CLASSPATH.
</para>
</listitem>
@@ -181,9 +179,8 @@
<listitem>
<para>
- Sun's JMX reference implementation version 1.2.1
- <ulink url="http://java.sun.com/products/JavaManagement/">
- http://java.sun.com/products/JavaManagement/</ulink>
+ Sun's JMX reference implementation version 1.2.1 (from
+ <ulink url="http://java.sun.com/products/JavaManagement/"/>)
</para>
</listitem>
@@ -192,8 +189,7 @@
<listitem>
<para>
- Junit 3.8.1 (from
- <ulink url="http://www.junit.org/">http://www.junit.org/</ulink>)
+ Junit 3.8.1 (from <ulink url="http://www.junit.org/"/>)
</para>
</listitem>
@@ -208,7 +204,7 @@
<listitem>
<para>
Ant version 1.5 or newer (download from
- <ulink url="http://ant.apache.org/">http://ant.apache.org/</ulink>)
+ <ulink url="http://ant.apache.org/"/>)
</para>
</listitem>
Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml 2006-01-21 20:33:22 UTC (rev 976)
+++ trunk/refman-5.0/connector-j.xml 2006-01-21 20:33:41 UTC (rev 977)
@@ -59,7 +59,7 @@
<para>
<ulink
url="http://java.sun.com/docs/books/tutorial/jdbc/basics/index.html">JDBC
- Basics </ulink> — A tutorial from Sun covering beginner
+ Basics</ulink> — A tutorial from Sun covering beginner
topics in JDBC
</para>
</listitem>
@@ -3475,7 +3475,7 @@
JDK that you can add JSSE to, like JDK-1.2.x or JDK-1.3.x
due to the following JSSE bug:
<ulink
- url="http://developer.java.sun.com/developer/bugParade/bugs/4273544.html">http://developer.java.sun.com/developer/bugParade/bugs/4273544.html</ulink>
+ url="http://developer.java.sun.com/developer/bugParade/bugs/4273544.html"/>
</para>
</listitem>
@@ -3483,8 +3483,7 @@
<para>
A MySQL server that supports SSL and has been compiled and
configured to do so, which is MySQL-4.0.4 or later, see:
- <ulink
- url="http://www.mysql.com/doc/en/Secure_connections.html">http://www.mysql.com/doc/en/Secure_connections.html</ulink>
+ <ulink url="http://www.mysql.com/doc/en/secure-connections.html"/>
</para>
</listitem>
@@ -4051,8 +4050,7 @@
<para>
The following instructions are based on the instructions for
Tomcat-5.x, available at
- <ulink
- url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html">http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html</ulink>
+ <ulink url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html"/>
which is current at the time this document was written.
</para>
@@ -4733,8 +4731,7 @@
<para>
The normal place to report bugs is
- <ulink
- url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>,
+ <ulink url="http://bugs.mysql.com/"/>,
which is the address for our bugs database. This database is
public, and can be browsed and searched by anyone. If you log in
to the system, you will also be able to enter new reports.
@@ -4762,8 +4759,7 @@
<para>
If you have a repeatable bug report, please report it to the
- bugs database at
- <ulink url="???">http://bugs.mysql.com/</ulink>.
+ bugs database at <ulink url="http://bugs.mysql.com/"/>.
</para>
<para>
@@ -4918,9 +4914,7 @@
<para>
Once you have finished your testcase, and have verified that it
demonstrates the bug you are reporting, upload it with your bug
- report to
- <ulink
- url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>.
+ report to <ulink url="http://bugs.mysql.com/"/>.
</para>
</section>
Modified: trunk/refman-5.0/connector-mxj.xml
===================================================================
--- trunk/refman-5.0/connector-mxj.xml 2006-01-21 20:33:22 UTC (rev 976)
+++ trunk/refman-5.0/connector-mxj.xml 2006-01-21 20:33:41 UTC (rev 977)
@@ -58,8 +58,7 @@
<para>
You can download sources and binaries from:
- <ulink url="&base-url-downloads;connector/mxj/">
- &base-url-downloads;connector/mxj/ </ulink>
+ <ulink url="&base-url-downloads;connector/mxj/"/>
</para>
<para>
@@ -152,9 +151,8 @@
<listitem>
<para>
MySQL Connector/J version 3.1 or newer (from
- <ulink url="&base-url-downloads;connector/j/">
- &base-url-downloads;connector/j/ </ulink>) installed and
- available via your CLASSPATH.
+ <ulink url="&base-url-downloads;connector/j/"/>)
+ installed and available via your CLASSPATH.
</para>
</listitem>
@@ -181,9 +179,8 @@
<listitem>
<para>
- Sun's JMX reference implementation version 1.2.1
- <ulink url="http://java.sun.com/products/JavaManagement/">
- http://java.sun.com/products/JavaManagement/</ulink>
+ Sun's JMX reference implementation version 1.2.1 (from
+ <ulink url="http://java.sun.com/products/JavaManagement/"/>)
</para>
</listitem>
@@ -192,8 +189,7 @@
<listitem>
<para>
- Junit 3.8.1 (from
- <ulink url="http://www.junit.org/">http://www.junit.org/</ulink>)
+ Junit 3.8.1 (from <ulink url="http://www.junit.org/"/>)
</para>
</listitem>
@@ -208,7 +204,7 @@
<listitem>
<para>
Ant version 1.5 or newer (download from
- <ulink url="http://ant.apache.org/">http://ant.apache.org/</ulink>)
+ <ulink url="http://ant.apache.org/"/>)
</para>
</listitem>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-21 20:33:22 UTC (rev 976)
+++ trunk/refman-5.0/database-administration.xml 2006-01-21 20:33:41 UTC (rev 977)
@@ -12008,9 +12008,9 @@
more secure, you should use SSH to get an encrypted TCP/IP
connection between a MySQL server and a MySQL client. You can
find an Open Source SSH client at
- <ulink url="http://www.openssh.org/">http://www.openssh.org/</ulink>,
+ <ulink url="http://www.openssh.org/"/>,
and a commercial SSH client at
- <ulink url="http://www.ssh.com/">http://www.ssh.com/</ulink>.
+ <ulink url="http://www.ssh.com/"/>.
</para>
<para>
@@ -16378,7 +16378,7 @@
<para>
PHP programmers migrating their MySQL databases from version
4.0 or lower to version 4.1 or higher should see
- <ulink url="Old Client">Old Client</ulink>.
+ <xref linkend="old-client"/>.
</para>
</section>
Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml 2006-01-21 20:33:22 UTC (rev 976)
+++ trunk/refman-5.1/connector-j.xml 2006-01-21 20:33:41 UTC (rev 977)
@@ -59,7 +59,7 @@
<para>
<ulink
url="http://java.sun.com/docs/books/tutorial/jdbc/basics/index.html">JDBC
- Basics </ulink> — A tutorial from Sun covering beginner
+ Basics</ulink> — A tutorial from Sun covering beginner
topics in JDBC
</para>
</listitem>
@@ -3475,7 +3475,7 @@
JDK that you can add JSSE to, like JDK-1.2.x or JDK-1.3.x
due to the following JSSE bug:
<ulink
- url="http://developer.java.sun.com/developer/bugParade/bugs/4273544.html">http://developer.java.sun.com/developer/bugParade/bugs/4273544.html</ulink>
+ url="http://developer.java.sun.com/developer/bugParade/bugs/4273544.html"/>
</para>
</listitem>
@@ -3483,8 +3483,7 @@
<para>
A MySQL server that supports SSL and has been compiled and
configured to do so, which is MySQL-4.0.4 or later, see:
- <ulink
- url="http://www.mysql.com/doc/en/Secure_connections.html">http://www.mysql.com/doc/en/Secure_connections.html</ulink>
+ <ulink url="http://www.mysql.com/doc/en/secure-connections.html"/>
</para>
</listitem>
@@ -4051,8 +4050,7 @@
<para>
The following instructions are based on the instructions for
Tomcat-5.x, available at
- <ulink
- url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html">http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html</ulink>
+ <ulink url="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html"/>
which is current at the time this document was written.
</para>
@@ -4733,8 +4731,7 @@
<para>
The normal place to report bugs is
- <ulink
- url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>,
+ <ulink url="http://bugs.mysql.com/"/>,
which is the address for our bugs database. This database is
public, and can be browsed and searched by anyone. If you log in
to the system, you will also be able to enter new reports.
@@ -4762,8 +4759,7 @@
<para>
If you have a repeatable bug report, please report it to the
- bugs database at
- <ulink url="???">http://bugs.mysql.com/</ulink>.
+ bugs database at <ulink url="http://bugs.mysql.com/"/>.
</para>
<para>
@@ -4918,9 +4914,7 @@
<para>
Once you have finished your testcase, and have verified that it
demonstrates the bug you are reporting, upload it with your bug
- report to
- <ulink
- url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>.
+ report to <ulink url="http://bugs.mysql.com/"/>.
</para>
</section>
Modified: trunk/refman-5.1/connector-mxj.xml
===================================================================
--- trunk/refman-5.1/connector-mxj.xml 2006-01-21 20:33:22 UTC (rev 976)
+++ trunk/refman-5.1/connector-mxj.xml 2006-01-21 20:33:41 UTC (rev 977)
@@ -58,8 +58,7 @@
<para>
You can download sources and binaries from:
- <ulink url="&base-url-downloads;connector/mxj/">
- &base-url-downloads;connector/mxj/ </ulink>
+ <ulink url="&base-url-downloads;connector/mxj/"/>
</para>
<para>
@@ -152,9 +151,8 @@
<listitem>
<para>
MySQL Connector/J version 3.1 or newer (from
- <ulink url="&base-url-downloads;connector/j/">
- &base-url-downloads;connector/j/ </ulink>) installed and
- available via your CLASSPATH.
+ <ulink url="&base-url-downloads;connector/j/"/>)
+ installed and available via your CLASSPATH.
</para>
</listitem>
@@ -181,9 +179,8 @@
<listitem>
<para>
- Sun's JMX reference implementation version 1.2.1
- <ulink url="http://java.sun.com/products/JavaManagement/">
- http://java.sun.com/products/JavaManagement/</ulink>
+ Sun's JMX reference implementation version 1.2.1 (from
+ <ulink url="http://java.sun.com/products/JavaManagement/"/>)
</para>
</listitem>
@@ -192,8 +189,7 @@
<listitem>
<para>
- Junit 3.8.1 (from
- <ulink url="http://www.junit.org/">http://www.junit.org/</ulink>)
+ Junit 3.8.1 (from <ulink url="http://www.junit.org/"/>)
</para>
</listitem>
@@ -208,7 +204,7 @@
<listitem>
<para>
Ant version 1.5 or newer (download from
- <ulink url="http://ant.apache.org/">http://ant.apache.org/</ulink>)
+ <ulink url="http://ant.apache.org/"/>)
</para>
</listitem>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-21 20:33:22 UTC (rev 976)
+++ trunk/refman-5.1/database-administration.xml 2006-01-21 20:33:41 UTC (rev 977)
@@ -12037,9 +12037,9 @@
more secure, you should use SSH to get an encrypted TCP/IP
connection between a MySQL server and a MySQL client. You can
find an Open Source SSH client at
- <ulink url="http://www.openssh.org/">http://www.openssh.org/</ulink>,
+ <ulink url="http://www.openssh.org/"/>,
and a commercial SSH client at
- <ulink url="http://www.ssh.com/">http://www.ssh.com/</ulink>.
+ <ulink url="http://www.ssh.com/"/>.
</para>
<para>
@@ -16385,7 +16385,7 @@
<para>
PHP programmers migrating their MySQL databases from version
4.0 or lower to version 4.1 or higher should see
- <ulink url="Old Client">Old Client</ulink>.
+ <xref linkend="old-client"/>.
</para>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r977 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 21 Jan |
