Author: plavin
Date: 2007-06-26 00:13:04 +0200 (Tue, 26 Jun 2007)
New Revision: 6911
Log:
Update Query browser dialogue box as well. Reformat Administrator.
Modified:
trunk/administrator/connection-dialog.xml
trunk/query-browser/connection-dialog.xml
Modified: trunk/administrator/connection-dialog.xml
===================================================================
--- trunk/administrator/connection-dialog.xml 2007-06-25 21:52:59 UTC (rev 6910)
+++ trunk/administrator/connection-dialog.xml 2007-06-25 22:13:04 UTC (rev 6911)
Changed blocks: 9, Lines Added: 73, Lines Deleted: 73; 9943 bytes
@@ -30,7 +30,6 @@
<xref linkend="mysql-administrator-starting-configure-service"/>.
</para>
-
<figure>
<title>Connection dialog</title>
<mediaobject>
@@ -56,7 +55,7 @@
<xref linkend="mysql-gui-appendix-store-connections"/>. However,
for security reasons the password is not stored along with the
other options unless you explicitly specify otherwise. For
- instructions on storing the password see
+ instructions on storing the password see
<xref linkend="mysql-gui-options-general-options"/>.
</para>
@@ -78,47 +77,46 @@
<literal>Options</literal> dialog (see
<xref linkend="mysql-gui-options-connections"/>).
</para>
-
+
<para>
- The nature of the connection to the MySQL server varies
- depending upon the value specified in the
- <guilabel>Server Host:</guilabel> text box.
+ The nature of the connection to the MySQL server varies depending
+ upon the value specified in the <guilabel>Server Host:</guilabel>
+ text box.
</para>
-
+
<para>
- Under Linux and Mac OS X the connection to the MySQL server will be
- a socket connection if <quote>localhost</quote> is used
- in the <guilabel>Server Host:</guilabel> text box. Specifying
- <literal>127.0.0.1</literal>, the actual IP address
- that hosts the MySQL server, or the host name results
- in a TCP connection.
+ Under Linux and Mac OS X the connection to the MySQL server will
+ be a socket connection if <quote>localhost</quote> is used in the
+ <guilabel>Server Host:</guilabel> text box. Specifying
+ <literal>127.0.0.1</literal>, the actual IP address that hosts the
+ MySQL server, or the host name results in a TCP connection.
</para>
-
+
<para>
- Under Windows, the connection is always a TCP connection
- unless you connect using named pipes. This is discussed in the following section.
+ Under Windows, the connection is always a TCP connection unless
+ you connect using named pipes. This is discussed in the following
+ section.
</para>
-
-
+
<section id="administrator-advanced-connection-options">
-
+
<title>Advanced Options</title>
-
+
<para>
To set advanced connection options, click the
<guibutton>Details</guibutton> button and check the desired
options:
</para>
-
+
<itemizedlist>
-
+
<listitem>
<para>
- <literal>Use compression protocol</literal> - Use compression
- when communicating with the MySQL server.
+ <literal>Use compression protocol</literal> - Use
+ compression when communicating with the MySQL server.
</para>
</listitem>
-
+
<listitem>
<para>
<literal>Use ANSI quotes to quote identifiers</literal> -
@@ -126,39 +124,39 @@
back-ticks.
</para>
</listitem>
-
+
<listitem>
<para>
<emphasis role="bold">Windows Only:</emphasis> <literal>Use
- named pipe (localhost only)</literal> is equivalent to
+ named pipe (localhost only)</literal> is equivalent to
starting the client from the command line specifying the
<option>--protocol</option>=<replaceable>pipe</replaceable>
option.
</para>
</listitem>
-
+
<listitem>
<para>
<emphasis role="bold">Unix Only:</emphasis> <literal>Connect
- using a socket file</literal> is equivalent to starting the
+ using a socket file</literal> is equivalent to starting the
client from the command line specifying the
<option>--protocol</option>=<replaceable>socket</replaceable>
option.
</para>
</listitem>
-
+
</itemizedlist>
-
+
<para>
If you have difficulties connecting, please see the
<link linkend="mysql-gui-appendix-troubleshooting-connection-errors">Troubleshooting
- Connection Errors</link> section in the
+ Connection Errors</link> section in the
<link linkend="mysql-gui-appendix-troubleshooting">Troubleshooting
- Application Errors</link> appendix.
- </para>
-
-
+ Application Errors</link> appendix.
+ </para>
+
</section>
+
</section>
<!-- Connection Dialog -->
@@ -187,32 +185,35 @@
When you want to start a MySQL server from within MySQL
Administrator. Obviously, you cannot connect to a server that
is not running, so you will have to use the configure-service
- mode to start that server. Note that you can
- only start servers on the same machine where &administrator;
- is running (that is on the local host).
+ mode to start that server. Note that you can only start
+ servers on the same machine where &administrator; is running
+ (that is on the local host).
</para>
</listitem>
<listitem>
-
<para>
- <emphasis role="bold">Note</emphasis>: The following applies
- only to &administrator; when running on Windows.
+ When you have multiple servers running on your machine. When
+ running in normal mode on Windows, MySQL Administrator only
+ allows you to configure the Windows service that is listed
+ first in the Microsoft Management Console window. This means
+ that if you have more than one Windows service, you can only
+ configure the first one of those, no matter which server you
+ connect to. If you want to configure a service other than the
+ first service, you will have to run &administrator; in
+ configure-service mode.
+
+ <remark>
+ [PL] Asked Alfredo if this is still true.
+ </remark>
+
+ For more information on this topic see
+ <xref linkend="multiple-servers"/>.
</para>
-
+
<para>
- When you have multiple servers running
- on your machine. When running in normal
- mode on Windows, MySQL Administrator only allows you to
- configure the Windows service that is listed first in the
- Microsoft Management Console window. This means that if you have more
- than one Windows service, you can only configure the first one
- of those, no matter which server you connect to. If you want
- to configure a service other than the first service, you will
- have to run &administrator; in configure-service mode.
- <remark>[PL] Asked Alfredo if this is still true.</remark>
- For more information on this
- topic see <xref linkend="multiple-servers"/>.
+ <emphasis role="bold">Note</emphasis>: The preceding applies
+ only to &administrator; when running on Windows.
</para>
</listitem>
@@ -221,10 +222,10 @@
<para>
To start &administrator; in configure-service mode, hold down the
<keycap>CTRL</keycap> key in the
- <link linkend="mysql-administrator-starting-connection">Connection</link
- >
+ <link linkend="mysql-administrator-starting-connection">Connection</link>
dialog. The <guibutton>Cancel</guibutton> button will toggle to
- <guibutton>Skip</guibutton> when the <keycap>CTRL</keycap> key is pressed.
+ <guibutton>Skip</guibutton> when the <keycap>CTRL</keycap> key is
+ pressed.
</para>
<figure>
@@ -241,8 +242,8 @@
<para>
Clicking on the <guibutton>Skip</guibutton> button will skip
- normal mode and start &administrator; in configure-service
- mode.
+ normal mode and start &administrator; in configure-service mode.
+ You should see something similar to the following.
</para>
<figure>
@@ -258,20 +259,18 @@
</figure>
<para>
- <emphasis role="bold">Note</emphasis>:
- The following option is only available under
- Windows.
Under <guilabel>Installed Services</guilabel> in the
<link linkend="mysql-administrator-sidebar">sidebar</link>, you
can select the service that you wish to configure, or the server
- that you want to stop or start. Only servers that have been installed
- using the Windows installer will appear under
- <guilabel>Installed Services</guilabel>.
+ that you want to stop or start. Only servers that have been
+ installed using the Windows installer will appear here.
+ <emphasis role="bold">Note</emphasis>: <guilabel>Installed
+ Services</guilabel> is only displayed under Windows.
</para>
-
- <para>
- In configure-service mode, only the following
- sidebar options are available:
+
+ <para>
+ In configure-service mode, only the following sidebar options are
+ available:
</para>
<itemizedlist>
@@ -282,9 +281,10 @@
<link linkend="mysql-administrator-service-control">Service
Control</link> section allows you to start and stop a MySQL
server, and to configure the Windows service managing that
- server. Servers are stopped using the <command>mysqladmin</command>
- utility. This program is part of the default MySQL installation
- but if you have removed it you will not be able to stop a server.
+ server. Servers are stopped using the
+ <command>mysqladmin</command> utility. This program is part of
+ the default MySQL installation but if you have removed it you
+ will not be able to stop a server.
</para>
</listitem>
Modified: trunk/query-browser/connection-dialog.xml
===================================================================
--- trunk/query-browser/connection-dialog.xml 2007-06-25 21:52:59 UTC (rev 6910)
+++ trunk/query-browser/connection-dialog.xml 2007-06-25 22:13:04 UTC (rev 6911)
Changed blocks: 1, Lines Added: 21, Lines Deleted: 0; 1220 bytes
@@ -55,6 +55,27 @@
Options</link> section of the
<link linkend="mysql-gui-options">Options dialog</link>.
</para>
+
+ <para>
+ The nature of the connection to the MySQL server varies
+ depending upon the value specified in the
+ <guilabel>Server Host:</guilabel> text box.
+ </para>
+
+ <para>
+ Under Linux and Mac OS X the connection to the MySQL server will be
+ a socket connection if <quote>localhost</quote> is used
+ in the <guilabel>Server Host:</guilabel> text box. Specifying
+ <literal>127.0.0.1</literal>, the actual IP address
+ that hosts the MySQL server, or the host name results
+ in a TCP connection.
+ </para>
+
+ <para>
+ Under Windows, the connection is always a TCP connection
+ unless you connect using named pipes. This is discussed in
+ what follows.
+ </para>
<para>
To set advanced connection options, click the
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r6911 - in trunk: administrator query-browser | plavin | 25 Jun |
