List:Commits« Previous MessageNext Message »
From:paul.dubois Date:October 1 2008 4:03pm
Subject:svn commit - mysqldoc@docsrva: r11933 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2008-10-01 16:03:05 +0200 (Wed, 01 Oct 2008)
New Revision: 11933

Log:
 r34354@frost:  paul | 2008-10-01 09:04:12 -0500
 Tweaks to application-charset section


Modified:
   trunk/refman-4.1/internationalization.xml
   trunk/refman-5.0/internationalization.xml
   trunk/refman-5.1/internationalization.xml
   trunk/refman-6.0/internationalization.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:34345
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33355
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:34354
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33355


Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml	2008-10-01 13:56:32 UTC (rev 11932)
+++ trunk/refman-4.1/internationalization.xml	2008-10-01 14:03:05 UTC (rev 11933)
Changed blocks: 5, Lines Added: 56, Lines Deleted: 36; 7234 bytes

@@ -1556,12 +1556,12 @@
       </indexterm>
 
       <para>
-        For applications that store information using the default MySQL
-        character set (<literal>latin1</literal>) and collation
-        (<literal>latin1_swedish_ci</literal>), no special configuration
-        should be needed. If applications store information using a
-        different character set or collation, you can specify character
-        set information several ways:
+        For applications that store data using the default MySQL
+        character set and collation (<literal>latin1</literal>,
+        <literal>latin1_swedish_ci</literal>), no special configuration
+        should be needed. If applications require data storage using a
+        different character set or collation, you can configure
+        character set information several ways:
       </para>
 
       <itemizedlist>

@@ -1596,18 +1596,27 @@
 
       <para>
         When different applications require different character
-        settings, the per-database technique may provide the best
+        settings, the per-database technique provides a good deal of
         flexibility. If most or all applications use the same character
         set, specifying character settings at server startup or
-        configuration time may be most useful.
+        configuration time may be most convenient.
       </para>
 
       <para>
-        The following examples assume use of the <literal>utf8</literal>
-        character set and <literal>utf8_general_ci</literal> collation.
+        For the per-database or server-startup techniques, the settings
+        control the character set for data storage. Applications must
+        also tell the server which character set to use for
+        client/server communications, as described in the following
+        instructions.
       </para>
 
       <para>
+        The examples shown here assume use of the
+        <literal>utf8</literal> character set and
+        <literal>utf8_general_ci</literal> collation.
+      </para>
+
+      <para>
         <emphasis role="bold">Specify character settings per
         database.</emphasis> To create a database such that its tables
         will use a given default character set and collation for data

@@ -1641,8 +1650,8 @@
         use the desired character set some other way. For example, for
         connections made using <command>mysql</command>, you can specify
         the <option>--default-character-set=utf8</option> command-line
-        option to achieve the same effect as <literal>SET
-        NAMES</literal>.
+        option to achieve the same effect as <literal>SET NAMES
+        'utf8'</literal>.
       </para>
 
       <para>

@@ -1666,13 +1675,24 @@
 
       <para>
         These settings apply server-wide and apply as the defaults for
-        databases created by any client. It is still necessary for
-        clients to configure their connection using <literal>SET
-        NAMES</literal> or equivalent after they connect, as described
-        previously.
+        databases created by any application, and for tables
+        subsequently created in those databases.
       </para>
 
       <para>
+        It is still necessary for applications to configure their
+        connection using <literal>SET NAMES</literal> or equivalent
+        after they connect, as described previously. You might be
+        tempted to start the server with the <option>--init_connect="SET
+        NAMES 'utf8'"</option> option to cause <literal>SET
+        NAMES</literal> to be executed automatically for each client
+        that connects. However, this will yield inconsistent results
+        because the <literal>init_connect</literal> value is not
+        executed for users who have the <literal>SUPER</literal>
+        privilege.
+      </para>
+
+      <para>
         <emphasis role="bold">Specify character settings at MySQL
         configuration time.</emphasis> To select a character set and
         collation when you configure and build MySQL from source, use

@@ -1687,30 +1707,30 @@
       <para>
         The resulting server uses <literal>utf8</literal> and
         <literal>utf8_general_ci</literal> as the default for databases
-        and tables and for client connections. This means that it is not
-        necessary to use <option>--character-set-server</option> and
+        and tables and for client connections. It is unnecessary to use
+        <option>--character-set-server</option> and
         <option>--collation-server</option> at server startup. It is
-        also unnecessary for clients to configure their connection using
-        <literal>SET NAMES</literal> or equivalent after they connect to
-        the server.
+        also unnecessary for applications to configure their connection
+        using <literal>SET NAMES</literal> or equivalent after they
+        connect to the server.
       </para>
 
       <para>
-        Regardless of how you configure the MySQL character set, you
-        must also consider the environment within which your MySQL
-        applications execute. If you will send statements using UTF-8
-        text taken from a file that you create in an editor, you should
-        edit the file with the locale of your environment set to UTF-8
-        so that the file's encoding is correct and so that the operating
-        system handles it correctly. If you use the
-        <command>mysql</command> client within a terminal window, the
-        window must be configured to display UTF-8. For a script that
-        executes in a Web environment, the script must handle the
-        character encoding properly for its interaction with the MySQL
-        server, and it must generate pages that correctly indicate the
-        encoding so that browsers know how to display the content of the
-        pages. For example, you can include this
-        <literal>&lt;meta&gt;</literal> tag within your
+        Regardless of how you configure the MySQL character set for
+        application use, you must also consider the environment within
+        which those applications execute. If you will send statements
+        using UTF-8 text taken from a file that you create in an editor,
+        you should edit the file with the locale of your environment set
+        to UTF-8 so that the file's encoding is correct and so that the
+        operating system handles it correctly. If you use the
+        <command>mysql</command> client from within a terminal window,
+        the window must be configured to use UTF-8 or characters may not
+        display properly. For a script that executes in a Web
+        environment, the script must handle character encoding properly
+        for its interaction with the MySQL server, and it must generate
+        pages that correctly indicate the encoding so that browsers know
+        how to display the content of the pages. For example, you can
+        include this <literal>&lt;meta&gt;</literal> tag within your
         <literal>&lt;head&gt;</literal> element:
       </para>
 


Modified: trunk/refman-5.0/internationalization.xml
===================================================================
--- trunk/refman-5.0/internationalization.xml	2008-10-01 13:56:32 UTC (rev 11932)
+++ trunk/refman-5.0/internationalization.xml	2008-10-01 14:03:05 UTC (rev 11933)
Changed blocks: 5, Lines Added: 56, Lines Deleted: 36; 7234 bytes

@@ -1574,12 +1574,12 @@
       </indexterm>
 
       <para>
-        For applications that store information using the default MySQL
-        character set (<literal>latin1</literal>) and collation
-        (<literal>latin1_swedish_ci</literal>), no special configuration
-        should be needed. If applications store information using a
-        different character set or collation, you can specify character
-        set information several ways:
+        For applications that store data using the default MySQL
+        character set and collation (<literal>latin1</literal>,
+        <literal>latin1_swedish_ci</literal>), no special configuration
+        should be needed. If applications require data storage using a
+        different character set or collation, you can configure
+        character set information several ways:
       </para>
 
       <itemizedlist>

@@ -1614,18 +1614,27 @@
 
       <para>
         When different applications require different character
-        settings, the per-database technique may provide the best
+        settings, the per-database technique provides a good deal of
         flexibility. If most or all applications use the same character
         set, specifying character settings at server startup or
-        configuration time may be most useful.
+        configuration time may be most convenient.
       </para>
 
       <para>
-        The following examples assume use of the <literal>utf8</literal>
-        character set and <literal>utf8_general_ci</literal> collation.
+        For the per-database or server-startup techniques, the settings
+        control the character set for data storage. Applications must
+        also tell the server which character set to use for
+        client/server communications, as described in the following
+        instructions.
       </para>
 
       <para>
+        The examples shown here assume use of the
+        <literal>utf8</literal> character set and
+        <literal>utf8_general_ci</literal> collation.
+      </para>
+
+      <para>
         <emphasis role="bold">Specify character settings per
         database.</emphasis> To create a database such that its tables
         will use a given default character set and collation for data

@@ -1659,8 +1668,8 @@
         use the desired character set some other way. For example, for
         connections made using <command>mysql</command>, you can specify
         the <option>--default-character-set=utf8</option> command-line
-        option to achieve the same effect as <literal>SET
-        NAMES</literal>.
+        option to achieve the same effect as <literal>SET NAMES
+        'utf8'</literal>.
       </para>
 
       <para>

@@ -1684,13 +1693,24 @@
 
       <para>
         These settings apply server-wide and apply as the defaults for
-        databases created by any client. It is still necessary for
-        clients to configure their connection using <literal>SET
-        NAMES</literal> or equivalent after they connect, as described
-        previously.
+        databases created by any application, and for tables
+        subsequently created in those databases.
       </para>
 
       <para>
+        It is still necessary for applications to configure their
+        connection using <literal>SET NAMES</literal> or equivalent
+        after they connect, as described previously. You might be
+        tempted to start the server with the <option>--init_connect="SET
+        NAMES 'utf8'"</option> option to cause <literal>SET
+        NAMES</literal> to be executed automatically for each client
+        that connects. However, this will yield inconsistent results
+        because the <literal>init_connect</literal> value is not
+        executed for users who have the <literal>SUPER</literal>
+        privilege.
+      </para>
+
+      <para>
         <emphasis role="bold">Specify character settings at MySQL
         configuration time.</emphasis> To select a character set and
         collation when you configure and build MySQL from source, use

@@ -1705,30 +1725,30 @@
       <para>
         The resulting server uses <literal>utf8</literal> and
         <literal>utf8_general_ci</literal> as the default for databases
-        and tables and for client connections. This means that it is not
-        necessary to use <option>--character-set-server</option> and
+        and tables and for client connections. It is unnecessary to use
+        <option>--character-set-server</option> and
         <option>--collation-server</option> at server startup. It is
-        also unnecessary for clients to configure their connection using
-        <literal>SET NAMES</literal> or equivalent after they connect to
-        the server.
+        also unnecessary for applications to configure their connection
+        using <literal>SET NAMES</literal> or equivalent after they
+        connect to the server.
       </para>
 
       <para>
-        Regardless of how you configure the MySQL character set, you
-        must also consider the environment within which your MySQL
-        applications execute. If you will send statements using UTF-8
-        text taken from a file that you create in an editor, you should
-        edit the file with the locale of your environment set to UTF-8
-        so that the file's encoding is correct and so that the operating
-        system handles it correctly. If you use the
-        <command>mysql</command> client within a terminal window, the
-        window must be configured to display UTF-8. For a script that
-        executes in a Web environment, the script must handle the
-        character encoding properly for its interaction with the MySQL
-        server, and it must generate pages that correctly indicate the
-        encoding so that browsers know how to display the content of the
-        pages. For example, you can include this
-        <literal>&lt;meta&gt;</literal> tag within your
+        Regardless of how you configure the MySQL character set for
+        application use, you must also consider the environment within
+        which those applications execute. If you will send statements
+        using UTF-8 text taken from a file that you create in an editor,
+        you should edit the file with the locale of your environment set
+        to UTF-8 so that the file's encoding is correct and so that the
+        operating system handles it correctly. If you use the
+        <command>mysql</command> client from within a terminal window,
+        the window must be configured to use UTF-8 or characters may not
+        display properly. For a script that executes in a Web
+        environment, the script must handle character encoding properly
+        for its interaction with the MySQL server, and it must generate
+        pages that correctly indicate the encoding so that browsers know
+        how to display the content of the pages. For example, you can
+        include this <literal>&lt;meta&gt;</literal> tag within your
         <literal>&lt;head&gt;</literal> element:
       </para>
 


Modified: trunk/refman-5.1/internationalization.xml
===================================================================
--- trunk/refman-5.1/internationalization.xml	2008-10-01 13:56:32 UTC (rev 11932)
+++ trunk/refman-5.1/internationalization.xml	2008-10-01 14:03:05 UTC (rev 11933)
Changed blocks: 5, Lines Added: 56, Lines Deleted: 36; 7234 bytes

@@ -1574,12 +1574,12 @@
       </indexterm>
 
       <para>
-        For applications that store information using the default MySQL
-        character set (<literal>latin1</literal>) and collation
-        (<literal>latin1_swedish_ci</literal>), no special configuration
-        should be needed. If applications store information using a
-        different character set or collation, you can specify character
-        set information several ways:
+        For applications that store data using the default MySQL
+        character set and collation (<literal>latin1</literal>,
+        <literal>latin1_swedish_ci</literal>), no special configuration
+        should be needed. If applications require data storage using a
+        different character set or collation, you can configure
+        character set information several ways:
       </para>
 
       <itemizedlist>

@@ -1614,18 +1614,27 @@
 
       <para>
         When different applications require different character
-        settings, the per-database technique may provide the best
+        settings, the per-database technique provides a good deal of
         flexibility. If most or all applications use the same character
         set, specifying character settings at server startup or
-        configuration time may be most useful.
+        configuration time may be most convenient.
       </para>
 
       <para>
-        The following examples assume use of the <literal>utf8</literal>
-        character set and <literal>utf8_general_ci</literal> collation.
+        For the per-database or server-startup techniques, the settings
+        control the character set for data storage. Applications must
+        also tell the server which character set to use for
+        client/server communications, as described in the following
+        instructions.
       </para>
 
       <para>
+        The examples shown here assume use of the
+        <literal>utf8</literal> character set and
+        <literal>utf8_general_ci</literal> collation.
+      </para>
+
+      <para>
         <emphasis role="bold">Specify character settings per
         database.</emphasis> To create a database such that its tables
         will use a given default character set and collation for data

@@ -1659,8 +1668,8 @@
         use the desired character set some other way. For example, for
         connections made using <command>mysql</command>, you can specify
         the <option>--default-character-set=utf8</option> command-line
-        option to achieve the same effect as <literal>SET
-        NAMES</literal>.
+        option to achieve the same effect as <literal>SET NAMES
+        'utf8'</literal>.
       </para>
 
       <para>

@@ -1684,13 +1693,24 @@
 
       <para>
         These settings apply server-wide and apply as the defaults for
-        databases created by any client. It is still necessary for
-        clients to configure their connection using <literal>SET
-        NAMES</literal> or equivalent after they connect, as described
-        previously.
+        databases created by any application, and for tables
+        subsequently created in those databases.
       </para>
 
       <para>
+        It is still necessary for applications to configure their
+        connection using <literal>SET NAMES</literal> or equivalent
+        after they connect, as described previously. You might be
+        tempted to start the server with the <option>--init_connect="SET
+        NAMES 'utf8'"</option> option to cause <literal>SET
+        NAMES</literal> to be executed automatically for each client
+        that connects. However, this will yield inconsistent results
+        because the <literal>init_connect</literal> value is not
+        executed for users who have the <literal>SUPER</literal>
+        privilege.
+      </para>
+
+      <para>
         <emphasis role="bold">Specify character settings at MySQL
         configuration time.</emphasis> To select a character set and
         collation when you configure and build MySQL from source, use

@@ -1705,30 +1725,30 @@
       <para>
         The resulting server uses <literal>utf8</literal> and
         <literal>utf8_general_ci</literal> as the default for databases
-        and tables and for client connections. This means that it is not
-        necessary to use <option>--character-set-server</option> and
+        and tables and for client connections. It is unnecessary to use
+        <option>--character-set-server</option> and
         <option>--collation-server</option> at server startup. It is
-        also unnecessary for clients to configure their connection using
-        <literal>SET NAMES</literal> or equivalent after they connect to
-        the server.
+        also unnecessary for applications to configure their connection
+        using <literal>SET NAMES</literal> or equivalent after they
+        connect to the server.
       </para>
 
       <para>
-        Regardless of how you configure the MySQL character set, you
-        must also consider the environment within which your MySQL
-        applications execute. If you will send statements using UTF-8
-        text taken from a file that you create in an editor, you should
-        edit the file with the locale of your environment set to UTF-8
-        so that the file's encoding is correct and so that the operating
-        system handles it correctly. If you use the
-        <command>mysql</command> client within a terminal window, the
-        window must be configured to display UTF-8. For a script that
-        executes in a Web environment, the script must handle the
-        character encoding properly for its interaction with the MySQL
-        server, and it must generate pages that correctly indicate the
-        encoding so that browsers know how to display the content of the
-        pages. For example, you can include this
-        <literal>&lt;meta&gt;</literal> tag within your
+        Regardless of how you configure the MySQL character set for
+        application use, you must also consider the environment within
+        which those applications execute. If you will send statements
+        using UTF-8 text taken from a file that you create in an editor,
+        you should edit the file with the locale of your environment set
+        to UTF-8 so that the file's encoding is correct and so that the
+        operating system handles it correctly. If you use the
+        <command>mysql</command> client from within a terminal window,
+        the window must be configured to use UTF-8 or characters may not
+        display properly. For a script that executes in a Web
+        environment, the script must handle character encoding properly
+        for its interaction with the MySQL server, and it must generate
+        pages that correctly indicate the encoding so that browsers know
+        how to display the content of the pages. For example, you can
+        include this <literal>&lt;meta&gt;</literal> tag within your
         <literal>&lt;head&gt;</literal> element:
       </para>
 


Modified: trunk/refman-6.0/internationalization.xml
===================================================================
--- trunk/refman-6.0/internationalization.xml	2008-10-01 13:56:32 UTC (rev 11932)
+++ trunk/refman-6.0/internationalization.xml	2008-10-01 14:03:05 UTC (rev 11933)
Changed blocks: 5, Lines Added: 56, Lines Deleted: 36; 7234 bytes

@@ -1575,12 +1575,12 @@
       </indexterm>
 
       <para>
-        For applications that store information using the default MySQL
-        character set (<literal>latin1</literal>) and collation
-        (<literal>latin1_swedish_ci</literal>), no special configuration
-        should be needed. If applications store information using a
-        different character set or collation, you can specify character
-        set information several ways:
+        For applications that store data using the default MySQL
+        character set and collation (<literal>latin1</literal>,
+        <literal>latin1_swedish_ci</literal>), no special configuration
+        should be needed. If applications require data storage using a
+        different character set or collation, you can configure
+        character set information several ways:
       </para>
 
       <itemizedlist>

@@ -1615,18 +1615,27 @@
 
       <para>
         When different applications require different character
-        settings, the per-database technique may provide the best
+        settings, the per-database technique provides a good deal of
         flexibility. If most or all applications use the same character
         set, specifying character settings at server startup or
-        configuration time may be most useful.
+        configuration time may be most convenient.
       </para>
 
       <para>
-        The following examples assume use of the <literal>utf8</literal>
-        character set and <literal>utf8_general_ci</literal> collation.
+        For the per-database or server-startup techniques, the settings
+        control the character set for data storage. Applications must
+        also tell the server which character set to use for
+        client/server communications, as described in the following
+        instructions.
       </para>
 
       <para>
+        The examples shown here assume use of the
+        <literal>utf8</literal> character set and
+        <literal>utf8_general_ci</literal> collation.
+      </para>
+
+      <para>
         <emphasis role="bold">Specify character settings per
         database.</emphasis> To create a database such that its tables
         will use a given default character set and collation for data

@@ -1660,8 +1669,8 @@
         use the desired character set some other way. For example, for
         connections made using <command>mysql</command>, you can specify
         the <option>--default-character-set=utf8</option> command-line
-        option to achieve the same effect as <literal>SET
-        NAMES</literal>.
+        option to achieve the same effect as <literal>SET NAMES
+        'utf8'</literal>.
       </para>
 
       <para>

@@ -1685,13 +1694,24 @@
 
       <para>
         These settings apply server-wide and apply as the defaults for
-        databases created by any client. It is still necessary for
-        clients to configure their connection using <literal>SET
-        NAMES</literal> or equivalent after they connect, as described
-        previously.
+        databases created by any application, and for tables
+        subsequently created in those databases.
       </para>
 
       <para>
+        It is still necessary for applications to configure their
+        connection using <literal>SET NAMES</literal> or equivalent
+        after they connect, as described previously. You might be
+        tempted to start the server with the <option>--init_connect="SET
+        NAMES 'utf8'"</option> option to cause <literal>SET
+        NAMES</literal> to be executed automatically for each client
+        that connects. However, this will yield inconsistent results
+        because the <literal>init_connect</literal> value is not
+        executed for users who have the <literal>SUPER</literal>
+        privilege.
+      </para>
+
+      <para>
         <emphasis role="bold">Specify character settings at MySQL
         configuration time.</emphasis> To select a character set and
         collation when you configure and build MySQL from source, use

@@ -1706,30 +1726,30 @@
       <para>
         The resulting server uses <literal>utf8</literal> and
         <literal>utf8_general_ci</literal> as the default for databases
-        and tables and for client connections. This means that it is not
-        necessary to use <option>--character-set-server</option> and
+        and tables and for client connections. It is unnecessary to use
+        <option>--character-set-server</option> and
         <option>--collation-server</option> at server startup. It is
-        also unnecessary for clients to configure their connection using
-        <literal>SET NAMES</literal> or equivalent after they connect to
-        the server.
+        also unnecessary for applications to configure their connection
+        using <literal>SET NAMES</literal> or equivalent after they
+        connect to the server.
       </para>
 
       <para>
-        Regardless of how you configure the MySQL character set, you
-        must also consider the environment within which your MySQL
-        applications execute. If you will send statements using UTF-8
-        text taken from a file that you create in an editor, you should
-        edit the file with the locale of your environment set to UTF-8
-        so that the file's encoding is correct and so that the operating
-        system handles it correctly. If you use the
-        <command>mysql</command> client within a terminal window, the
-        window must be configured to display UTF-8. For a script that
-        executes in a Web environment, the script must handle the
-        character encoding properly for its interaction with the MySQL
-        server, and it must generate pages that correctly indicate the
-        encoding so that browsers know how to display the content of the
-        pages. For example, you can include this
-        <literal>&lt;meta&gt;</literal> tag within your
+        Regardless of how you configure the MySQL character set for
+        application use, you must also consider the environment within
+        which those applications execute. If you will send statements
+        using UTF-8 text taken from a file that you create in an editor,
+        you should edit the file with the locale of your environment set
+        to UTF-8 so that the file's encoding is correct and so that the
+        operating system handles it correctly. If you use the
+        <command>mysql</command> client from within a terminal window,
+        the window must be configured to use UTF-8 or characters may not
+        display properly. For a script that executes in a Web
+        environment, the script must handle character encoding properly
+        for its interaction with the MySQL server, and it must generate
+        pages that correctly indicate the encoding so that browsers know
+        how to display the content of the pages. For example, you can
+        include this <literal>&lt;meta&gt;</literal> tag within your
         <literal>&lt;head&gt;</literal> element:
       </para>
 


Thread
svn commit - mysqldoc@docsrva: r11933 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0paul.dubois1 Oct