List:Commits« Previous MessageNext Message »
From:paul.dubois Date:June 8 2011 5:56pm
Subject:svn commit - mysqldoc@oter02: r26457 - in trunk: . workbench
View as plain text  
Author: pd221994
Date: 2011-06-08 19:56:36 +0200 (Wed, 08 Jun 2011)
New Revision: 26457

Log:
 r48754@dhcp-adc-twvpn-1-vpnpool-10-154-0-210:  paul | 2011-06-08 12:46:08 -0500
 Workbench revisions


Modified:
   svk:merge
   trunk/workbench/server-administration.xml

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes


Modified: trunk/workbench/server-administration.xml
===================================================================
--- trunk/workbench/server-administration.xml	2011-06-08 17:56:28 UTC (rev 26456)
+++ trunk/workbench/server-administration.xml	2011-06-08 17:56:36 UTC (rev 26457)
Changed blocks: 9, Lines Added: 34, Lines Deleted: 44; 6494 bytes

@@ -169,11 +169,7 @@
     <para>
       This action item takes you quickly to the page that enables you to
       manage user accounts. It launches an Admin page and locates you on
-      the Accounts tab.
-    </para>
-
-    <para>
-      For further details, see
+      the Accounts tab. For further details, see
       <xref linkend="wb-manage-server-accounts-tab"/>.
     </para>
 

@@ -185,12 +181,9 @@
 
     <para>
       Clicking this action item launches the Manage Server Instances
-      dialog. Within this dialog you can change the configuration of
-      existing server instances, or create a new server instance.
-    </para>
-
-    <para>
-      For more information on this topic, see
+      dialog. Within this dialog, you can change the configuration of
+      existing server instances or create a new server instance. For
+      further details, see
       <xref linkend="wb-managing-server-instances"/>.
     </para>
 

@@ -202,38 +195,35 @@
 
     <para>
       Server instances can be created and managed from the
-      <guilabel>Home</guilabel> page. As mentioned in the previous
-      section, there are several ways new server instances can be
-      created:
+      <guilabel>Home</guilabel> page. To create new server instances,
+      use one of these methods:
     </para>
 
     <itemizedlist>
 
       <listitem>
         <para>
-          By clicking the New Server Instance action item from the
-          Server Administration section of the Home window. This
-          launches the <guilabel>Create a new server instance</guilabel>
-          wizard.
+          Click the New Server Instance action item from the Server
+          Administration section of the Home window. This launches the
+          <guilabel>Create a new server instance</guilabel> wizard. For
+          further details, see
+          <xref linkend="wb-new-server-instance-wizard"/>.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          By clicking the Manage Server Instances action item from the
-          Server Administration section of the Home window. This
-          launches the <guilabel>Manage Server Instances</guilabel>
-          dialog, from within which a new server instance can be
-          created.
+          Click the Manage Server Instances action item from the Server
+          Administration section of the Home window. This launches the
+          <guilabel>Manage Server Instances</guilabel> dialog, from
+          within which a new server instance can be created. For further
+          details, see
+          <xref linkend="wb-manage-server-instance-dialog"/>.
         </para>
       </listitem>
 
     </itemizedlist>
 
-    <para>
-      Each of these two options is now described in turn.
-    </para>
-
     <section id="wb-new-server-instance-wizard">
 
       <title>New Server Instance Wizard</title>

@@ -242,10 +232,10 @@
         Clicking the New Server Instance action item launches the
         <guilabel>Create a new server instance</guilabel> wizard. The
         wizard provides a step-by-step approach to creating a new server
-        instance. This is most suitable for beginners. Once some
-        familiarity is achieved with the various settings and parameters
-        required, a new instance can also be quickly created from the
-        Manage Server Instances dialog discussed later.
+        instance. This is most suitable for beginners. Users who are
+        familiar with the various settings and parameters can also
+        quickly create a new instance from the Manage Server Instances
+        dialog discussed later.
       </para>
 
       <para>

@@ -322,10 +312,10 @@
 
       <para>
         On this page you can select <guilabel>Localhost</guilabel> if
-        you intend to manage a server on your local machine. Or you can
-        select <guilabel>Remote Host</guilabel>. In this latter case,
-        you must provide the IP address or the network name of the
-        remote server. Click <guibutton>Next</guibutton> to continue.
+        you intend to manage a server on your local machine. If you
+        select <guilabel>Remote Host</guilabel>, you must provide the IP
+        address or the network name of the remote server. Click
+        <guibutton>Next</guibutton> to continue.
       </para>
 
       <para>

@@ -333,9 +323,9 @@
       </para>
 
       <para>
-        On this page, you select the operating system that applies to
-        your server. You should also ensure that the option you select
-        from the list also reflects your MySQL Server version and
+        On this page, select the operating system that applies to your
+        server. You should also ensure that the option you select from
+        the list also reflects your MySQL Server version and
         installation type; for example, Windows (MySQL 5.1 Installer
         Package).
       </para>

@@ -346,8 +336,8 @@
 
       <para>
         If you specified a Remote Host on the Specify Host Machine page,
-        you will be presented with the Host SSH Connection page. This
-        page enables you to enable SSH for the login to the server
+        you will be presented with the Host SSH Connection page, that
+        enables you to use SSH for the connection to the server
         instance. This facility enables you to create a secure
         connection to remotely administer and configure the server
         instance. You must enter the user name and password of the

@@ -356,7 +346,7 @@
         a password, you will be prompted for the password when the
         connection is established by &workbench;. You can optionally
         specify the path to your SSH key for use with the server, rather
-        than enter a user name and password.
+        than entering a user name and password.
       </para>
 
       <note>

@@ -370,10 +360,10 @@
 
       <note>
         <para>
-          If managing a remote server, you must use an SSH connection
-          type if you wish to start or stop the server or edit its
+          You must use an SSH connection type when managing a remove
+          server if you wish to start or stop the server or edit its
           configuration file. Other administrative functions do not
-          require an SSH connection type.
+          require an SSH connection.
         </para>
       </note>
 


Thread
svn commit - mysqldoc@oter02: r26457 - in trunk: . workbenchpaul.dubois9 Jun