Author: paul
Date: 2008-06-15 01:45:58 +0200 (Sun, 15 Jun 2008)
New Revision: 10954
Log:
r32018@frost: paul | 2008-06-14 18:44:19 -0500
Review DES_ENCRYPT() description to get a better help-table entry.
(Bug#37412)
Modified:
trunk/it/refman-5.1/functions-core.xml
trunk/pt/refman-5.1/functions-core.xml
trunk/refman-4.1/functions-core.xml
trunk/refman-5.0/functions-core.xml
trunk/refman-5.1/functions-core.xml
trunk/refman-6.0/functions-core.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:31988
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31698
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32018
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31698
Modified: trunk/it/refman-5.1/functions-core.xml
===================================================================
--- trunk/it/refman-5.1/functions-core.xml 2008-06-13 19:40:57 UTC (rev 10953)
+++ trunk/it/refman-5.1/functions-core.xml 2008-06-14 23:45:58 UTC (rev 10954)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 30; 2787 bytes
@@ -15240,39 +15240,17 @@
SSL support. See <xref linkend="secure-connections"/>.
</para>
- <remark role="help-description-end"/>
-
<para>
The encryption key to use is chosen based on the second
argument to <function role="sql">DES_ENCRYPT()</function>,
- if one was given:
+ if one was given. With no argument, the first key from the
+ DES key file is used. With a
+ <replaceable>key_num</replaceable> argument, the given key
+ number (0-9) from the DES key file is used. With a
+ <replaceable>key_str</replaceable> argument, the given key
+ string is used to encrypt <replaceable>str</replaceable>.
</para>
- <informaltable>
- <tgroup cols="2">
- <colspec colwidth="25*"/>
- <colspec colwidth="65*"/>
- <tbody>
- <row>
- <entry><emphasis role="bold">Argument</emphasis></entry>
- <entry><emphasis role="bold">Description</emphasis></entry>
- </row>
- <row>
- <entry>No argument</entry>
- <entry>The first key from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_num</replaceable></entry>
- <entry>The given key number (0-9) from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_str</replaceable></entry>
- <entry>The given key string is used to encrypt <replaceable>str</replaceable>.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
<para>
The key file can be specified with the
<option>--des-key-file</option> server option.
@@ -15304,8 +15282,6 @@
Each line in the DES key file has the following format:
</para>
- <remark role="help-example"/>
-
<programlisting>
<replaceable>key_num</replaceable> <replaceable>des_key_str</replaceable>
</programlisting>
@@ -15334,6 +15310,10 @@
decrypt those values.
</para>
+ <remark role="help-description-end"/>
+
+ <remark role="help-example"/>
+
<programlisting>
mysql> <userinput>SELECT customer_address FROM customer_table </userinput>
> <userinput>WHERE crypted_credit_card = DES_ENCRYPT('credit_card_number');</userinput>
Modified: trunk/pt/refman-5.1/functions-core.xml
===================================================================
--- trunk/pt/refman-5.1/functions-core.xml 2008-06-13 19:40:57 UTC (rev 10953)
+++ trunk/pt/refman-5.1/functions-core.xml 2008-06-14 23:45:58 UTC (rev 10954)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 30; 2787 bytes
@@ -15240,39 +15240,17 @@
SSL support. See <xref linkend="secure-connections"/>.
</para>
- <remark role="help-description-end"/>
-
<para>
The encryption key to use is chosen based on the second
argument to <function role="sql">DES_ENCRYPT()</function>,
- if one was given:
+ if one was given. With no argument, the first key from the
+ DES key file is used. With a
+ <replaceable>key_num</replaceable> argument, the given key
+ number (0-9) from the DES key file is used. With a
+ <replaceable>key_str</replaceable> argument, the given key
+ string is used to encrypt <replaceable>str</replaceable>.
</para>
- <informaltable>
- <tgroup cols="2">
- <colspec colwidth="25*"/>
- <colspec colwidth="65*"/>
- <tbody>
- <row>
- <entry><emphasis role="bold">Argument</emphasis></entry>
- <entry><emphasis role="bold">Description</emphasis></entry>
- </row>
- <row>
- <entry>No argument</entry>
- <entry>The first key from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_num</replaceable></entry>
- <entry>The given key number (0-9) from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_str</replaceable></entry>
- <entry>The given key string is used to encrypt <replaceable>str</replaceable>.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
<para>
The key file can be specified with the
<option>--des-key-file</option> server option.
@@ -15304,8 +15282,6 @@
Each line in the DES key file has the following format:
</para>
- <remark role="help-example"/>
-
<programlisting>
<replaceable>key_num</replaceable> <replaceable>des_key_str</replaceable>
</programlisting>
@@ -15334,6 +15310,10 @@
decrypt those values.
</para>
+ <remark role="help-description-end"/>
+
+ <remark role="help-example"/>
+
<programlisting>
mysql> <userinput>SELECT customer_address FROM customer_table </userinput>
> <userinput>WHERE crypted_credit_card = DES_ENCRYPT('credit_card_number');</userinput>
Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml 2008-06-13 19:40:57 UTC (rev 10953)
+++ trunk/refman-4.1/functions-core.xml 2008-06-14 23:45:58 UTC (rev 10954)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 30; 2778 bytes
@@ -13780,39 +13780,17 @@
SSL support. See <xref linkend="secure-connections"/>.
</para>
- <remark role="help-description-end"/>
-
<para>
The encryption key to use is chosen based on the second
argument to <function role="sql">DES_ENCRYPT()</function>,
- if one was given:
+ if one was given. With no argument, the first key from the
+ DES key file is used. With a
+ <replaceable>key_num</replaceable> argument, the given key
+ number (0-9) from the DES key file is used. With a
+ <replaceable>key_str</replaceable> argument, the given key
+ string is used to encrypt <replaceable>str</replaceable>.
</para>
- <informaltable>
- <tgroup cols="2">
- <colspec colwidth="25*"/>
- <colspec colwidth="65*"/>
- <tbody>
- <row>
- <entry><emphasis role="bold">Argument</emphasis></entry>
- <entry><emphasis role="bold">Description</emphasis></entry>
- </row>
- <row>
- <entry>No argument</entry>
- <entry>The first key from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_num</replaceable></entry>
- <entry>The given key number (0-9) from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_str</replaceable></entry>
- <entry>The given key string is used to encrypt <replaceable>str</replaceable>.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
<para>
The key file can be specified with the
<option>--des-key-file</option> server option.
@@ -13844,8 +13822,6 @@
Each line in the DES key file has the following format:
</para>
- <remark role="help-example"/>
-
<programlisting>
<replaceable>key_num</replaceable> <replaceable>des_key_str</replaceable>
</programlisting>
@@ -13874,6 +13850,10 @@
decrypt those values.
</para>
+ <remark role="help-description-end"/>
+
+ <remark role="help-example"/>
+
<programlisting>
mysql> <userinput>SELECT customer_address FROM customer_table </userinput>
> <userinput>WHERE crypted_credit_card = DES_ENCRYPT('credit_card_number');</userinput>
Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml 2008-06-13 19:40:57 UTC (rev 10953)
+++ trunk/refman-5.0/functions-core.xml 2008-06-14 23:45:58 UTC (rev 10954)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 30; 2778 bytes
@@ -13969,39 +13969,17 @@
SSL support. See <xref linkend="secure-connections"/>.
</para>
- <remark role="help-description-end"/>
-
<para>
The encryption key to use is chosen based on the second
argument to <function role="sql">DES_ENCRYPT()</function>,
- if one was given:
+ if one was given. With no argument, the first key from the
+ DES key file is used. With a
+ <replaceable>key_num</replaceable> argument, the given key
+ number (0-9) from the DES key file is used. With a
+ <replaceable>key_str</replaceable> argument, the given key
+ string is used to encrypt <replaceable>str</replaceable>.
</para>
- <informaltable>
- <tgroup cols="2">
- <colspec colwidth="25*"/>
- <colspec colwidth="65*"/>
- <tbody>
- <row>
- <entry><emphasis role="bold">Argument</emphasis></entry>
- <entry><emphasis role="bold">Description</emphasis></entry>
- </row>
- <row>
- <entry>No argument</entry>
- <entry>The first key from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_num</replaceable></entry>
- <entry>The given key number (0-9) from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_str</replaceable></entry>
- <entry>The given key string is used to encrypt <replaceable>str</replaceable>.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
<para>
The key file can be specified with the
<option>--des-key-file</option> server option.
@@ -14033,8 +14011,6 @@
Each line in the DES key file has the following format:
</para>
- <remark role="help-example"/>
-
<programlisting>
<replaceable>key_num</replaceable> <replaceable>des_key_str</replaceable>
</programlisting>
@@ -14063,6 +14039,10 @@
decrypt those values.
</para>
+ <remark role="help-description-end"/>
+
+ <remark role="help-example"/>
+
<programlisting>
mysql> <userinput>SELECT customer_address FROM customer_table </userinput>
> <userinput>WHERE crypted_credit_card = DES_ENCRYPT('credit_card_number');</userinput>
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2008-06-13 19:40:57 UTC (rev 10953)
+++ trunk/refman-5.1/functions-core.xml 2008-06-14 23:45:58 UTC (rev 10954)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 30; 2778 bytes
@@ -15240,39 +15240,17 @@
SSL support. See <xref linkend="secure-connections"/>.
</para>
- <remark role="help-description-end"/>
-
<para>
The encryption key to use is chosen based on the second
argument to <function role="sql">DES_ENCRYPT()</function>,
- if one was given:
+ if one was given. With no argument, the first key from the
+ DES key file is used. With a
+ <replaceable>key_num</replaceable> argument, the given key
+ number (0-9) from the DES key file is used. With a
+ <replaceable>key_str</replaceable> argument, the given key
+ string is used to encrypt <replaceable>str</replaceable>.
</para>
- <informaltable>
- <tgroup cols="2">
- <colspec colwidth="25*"/>
- <colspec colwidth="65*"/>
- <tbody>
- <row>
- <entry><emphasis role="bold">Argument</emphasis></entry>
- <entry><emphasis role="bold">Description</emphasis></entry>
- </row>
- <row>
- <entry>No argument</entry>
- <entry>The first key from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_num</replaceable></entry>
- <entry>The given key number (0-9) from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_str</replaceable></entry>
- <entry>The given key string is used to encrypt <replaceable>str</replaceable>.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
<para>
The key file can be specified with the
<option>--des-key-file</option> server option.
@@ -15304,8 +15282,6 @@
Each line in the DES key file has the following format:
</para>
- <remark role="help-example"/>
-
<programlisting>
<replaceable>key_num</replaceable> <replaceable>des_key_str</replaceable>
</programlisting>
@@ -15334,6 +15310,10 @@
decrypt those values.
</para>
+ <remark role="help-description-end"/>
+
+ <remark role="help-example"/>
+
<programlisting>
mysql> <userinput>SELECT customer_address FROM customer_table </userinput>
> <userinput>WHERE crypted_credit_card = DES_ENCRYPT('credit_card_number');</userinput>
Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml 2008-06-13 19:40:57 UTC (rev 10953)
+++ trunk/refman-6.0/functions-core.xml 2008-06-14 23:45:58 UTC (rev 10954)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 30; 2778 bytes
@@ -15638,39 +15638,17 @@
SSL support. See <xref linkend="secure-connections"/>.
</para>
- <remark role="help-description-end"/>
-
<para>
The encryption key to use is chosen based on the second
argument to <function role="sql">DES_ENCRYPT()</function>,
- if one was given:
+ if one was given. With no argument, the first key from the
+ DES key file is used. With a
+ <replaceable>key_num</replaceable> argument, the given key
+ number (0-9) from the DES key file is used. With a
+ <replaceable>key_str</replaceable> argument, the given key
+ string is used to encrypt <replaceable>str</replaceable>.
</para>
- <informaltable>
- <tgroup cols="2">
- <colspec colwidth="25*"/>
- <colspec colwidth="65*"/>
- <tbody>
- <row>
- <entry><emphasis role="bold">Argument</emphasis></entry>
- <entry><emphasis role="bold">Description</emphasis></entry>
- </row>
- <row>
- <entry>No argument</entry>
- <entry>The first key from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_num</replaceable></entry>
- <entry>The given key number (0-9) from the DES key file is used.</entry>
- </row>
- <row>
- <entry><replaceable>key_str</replaceable></entry>
- <entry>The given key string is used to encrypt <replaceable>str</replaceable>.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
<para>
The key file can be specified with the
<option>--des-key-file</option> server option.
@@ -15702,8 +15680,6 @@
Each line in the DES key file has the following format:
</para>
- <remark role="help-example"/>
-
<programlisting>
<replaceable>key_num</replaceable> <replaceable>des_key_str</replaceable>
</programlisting>
@@ -15732,6 +15708,10 @@
decrypt those values.
</para>
+ <remark role="help-description-end"/>
+
+ <remark role="help-example"/>
+
<programlisting>
mysql> <userinput>SELECT customer_address FROM customer_table </userinput>
> <userinput>WHERE crypted_credit_card = DES_ENCRYPT('credit_card_number');</userinput>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10954 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 15 Jun |
