MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jon.stephens Date:April 8 2010 12:14pm
Subject:svn commit - mysqldoc@docsrva: r19905 - in trunk: refman-5.0 refman-5.1 refman-5.4 refman-5.5 refman-6.0
View as plain text  
Author: jstephens
Date: 2010-04-08 14:14:18 +0200 (Thu, 08 Apr 2010)
New Revision: 19905

Log:

Fixes Docs BUG#44198 (SSL/RPL)



Modified:
   trunk/refman-5.0/replication-solutions.xml
   trunk/refman-5.1/replication-solutions.xml
   trunk/refman-5.4/replication-solutions.xml
   trunk/refman-5.5/replication-solutions.xml
   trunk/refman-6.0/replication-solutions.xml


Modified: trunk/refman-5.0/replication-solutions.xml
===================================================================
--- trunk/refman-5.0/replication-solutions.xml	2010-04-08 11:20:38 UTC (rev 19904)
+++ trunk/refman-5.0/replication-solutions.xml	2010-04-08 12:14:18 UTC (rev 19905)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 4; 1635 bytes

@@ -1077,9 +1077,15 @@
 [mysqld]
 ssl-ca=<replaceable>cacert.pem</replaceable>
 ssl-cert=<replaceable>server-cert.pem</replaceable>
-ssl-key=<replaceable>server-key.pem</replaceable></programlisting>
+ssl-key=<replaceable>server-key.pem</replaceable>
+</programlisting>
 
     <para>
+      The paths to the certificates may be relative or absolute; we
+      recommend that you always use complete paths for this purpose.
+    </para>
+
+    <para>
       The options are as follows:
     </para>
 

@@ -1121,7 +1127,7 @@
 
       <listitem>
         <para>
-          To addthe slave certificates using an option file, add the
+          To add the slave certificates using an option file, add the
           following lines to the <literal>[client]</literal> section of
           the slave's <filename>my.cnf</filename> file:
         </para>

@@ -1133,8 +1139,8 @@
 
         <para>
           Restart the slave server, using the
-          <option role="mysqld">--skip-slave-start</option> to prevent
-          the slave from connecting to the master. Use
+          <option role="mysqld">--skip-slave-start</option> option to
+          prevent the slave from connecting to the master. Use
           <literal role="stmt">CHANGE MASTER TO</literal> to specify the
           master configuration, using the <literal>MASTER_SSL</literal>
           option to enable SSL connectivity:


Modified: trunk/refman-5.1/replication-solutions.xml
===================================================================
--- trunk/refman-5.1/replication-solutions.xml	2010-04-08 11:20:38 UTC (rev 19904)
+++ trunk/refman-5.1/replication-solutions.xml	2010-04-08 12:14:18 UTC (rev 19905)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 4; 1635 bytes

@@ -1343,9 +1343,15 @@
 [mysqld]
 ssl-ca=<replaceable>cacert.pem</replaceable>
 ssl-cert=<replaceable>server-cert.pem</replaceable>
-ssl-key=<replaceable>server-key.pem</replaceable></programlisting>
+ssl-key=<replaceable>server-key.pem</replaceable>
+</programlisting>
 
     <para>
+      The paths to the certificates may be relative or absolute; we
+      recommend that you always use complete paths for this purpose.
+    </para>
+
+    <para>
       The options are as follows:
     </para>
 

@@ -1387,7 +1393,7 @@
 
       <listitem>
         <para>
-          To addthe slave certificates using an option file, add the
+          To add the slave certificates using an option file, add the
           following lines to the <literal>[client]</literal> section of
           the slave's <filename>my.cnf</filename> file:
         </para>

@@ -1399,8 +1405,8 @@
 
         <para>
           Restart the slave server, using the
-          <option role="mysqld">--skip-slave-start</option> to prevent
-          the slave from connecting to the master. Use
+          <option role="mysqld">--skip-slave-start</option> option to
+          prevent the slave from connecting to the master. Use
           <literal role="stmt">CHANGE MASTER TO</literal> to specify the
           master configuration, using the <literal>MASTER_SSL</literal>
           option to enable SSL connectivity:


Modified: trunk/refman-5.4/replication-solutions.xml
===================================================================
--- trunk/refman-5.4/replication-solutions.xml	2010-04-08 11:20:38 UTC (rev 19904)
+++ trunk/refman-5.4/replication-solutions.xml	2010-04-08 12:14:18 UTC (rev 19905)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 4; 1635 bytes

@@ -1334,9 +1334,15 @@
 [mysqld]
 ssl-ca=<replaceable>cacert.pem</replaceable>
 ssl-cert=<replaceable>server-cert.pem</replaceable>
-ssl-key=<replaceable>server-key.pem</replaceable></programlisting>
+ssl-key=<replaceable>server-key.pem</replaceable>
+</programlisting>
 
     <para>
+      The paths to the certificates may be relative or absolute; we
+      recommend that you always use complete paths for this purpose.
+    </para>
+
+    <para>
       The options are as follows:
     </para>
 

@@ -1378,7 +1384,7 @@
 
       <listitem>
         <para>
-          To addthe slave certificates using an option file, add the
+          To add the slave certificates using an option file, add the
           following lines to the <literal>[client]</literal> section of
           the slave's <filename>my.cnf</filename> file:
         </para>

@@ -1390,8 +1396,8 @@
 
         <para>
           Restart the slave server, using the
-          <option role="mysqld">--skip-slave-start</option> to prevent
-          the slave from connecting to the master. Use
+          <option role="mysqld">--skip-slave-start</option> option to
+          prevent the slave from connecting to the master. Use
           <literal role="stmt">CHANGE MASTER TO</literal> to specify the
           master configuration, using the <literal>MASTER_SSL</literal>
           option to enable SSL connectivity:


Modified: trunk/refman-5.5/replication-solutions.xml
===================================================================
--- trunk/refman-5.5/replication-solutions.xml	2010-04-08 11:20:38 UTC (rev 19904)
+++ trunk/refman-5.5/replication-solutions.xml	2010-04-08 12:14:18 UTC (rev 19905)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 4; 1635 bytes

@@ -1332,9 +1332,15 @@
 [mysqld]
 ssl-ca=<replaceable>cacert.pem</replaceable>
 ssl-cert=<replaceable>server-cert.pem</replaceable>
-ssl-key=<replaceable>server-key.pem</replaceable></programlisting>
+ssl-key=<replaceable>server-key.pem</replaceable>
+</programlisting>
 
     <para>
+      The paths to the certificates may be relative or absolute; we
+      recommend that you always use complete paths for this purpose.
+    </para>
+
+    <para>
       The options are as follows:
     </para>
 

@@ -1376,7 +1382,7 @@
 
       <listitem>
         <para>
-          To addthe slave certificates using an option file, add the
+          To add the slave certificates using an option file, add the
           following lines to the <literal>[client]</literal> section of
           the slave's <filename>my.cnf</filename> file:
         </para>

@@ -1388,8 +1394,8 @@
 
         <para>
           Restart the slave server, using the
-          <option role="mysqld">--skip-slave-start</option> to prevent
-          the slave from connecting to the master. Use
+          <option role="mysqld">--skip-slave-start</option> option to
+          prevent the slave from connecting to the master. Use
           <literal role="stmt">CHANGE MASTER TO</literal> to specify the
           master configuration, using the <literal>MASTER_SSL</literal>
           option to enable SSL connectivity:


Modified: trunk/refman-6.0/replication-solutions.xml
===================================================================
--- trunk/refman-6.0/replication-solutions.xml	2010-04-08 11:20:38 UTC (rev 19904)
+++ trunk/refman-6.0/replication-solutions.xml	2010-04-08 12:14:18 UTC (rev 19905)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 3; 1298 bytes

@@ -2104,9 +2104,15 @@
 [mysqld]
 ssl-ca=<replaceable>cacert.pem</replaceable>
 ssl-cert=<replaceable>server-cert.pem</replaceable>
-ssl-key=<replaceable>server-key.pem</replaceable></programlisting>
+ssl-key=<replaceable>server-key.pem</replaceable>
+</programlisting>
 
     <para>
+      The paths to the certificates may be relative or absolute; we
+      recommend that you always use complete paths for this purpose.
+    </para>
+
+    <para>
       The options are as follows:
     </para>
 

@@ -2160,8 +2166,8 @@
 
         <para>
           Restart the slave server, using the
-          <option role="mysqld">--skip-slave-start</option> to prevent
-          the slave from connecting to the master. Use
+          <option role="mysqld">--skip-slave-start</option> option to
+          prevent the slave from connecting to the master. Use
           <literal role="stmt">CHANGE MASTER TO</literal> to specify the
           master configuration, using the <literal>MASTER_SSL</literal>
           option to enable SSL connectivity:


Thread
svn commit - mysqldoc@docsrva: r19905 - in trunk: refman-5.0 refman-5.1 refman-5.4 refman-5.5 refman-6.0jon.stephens8 Apr