List:Commits« Previous MessageNext Message »
From:paul.dubois Date:May 19 2011 3:26pm
Subject:svn commit - mysqldoc@oter02: r26279 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: pd221994
Date: 2011-05-19 17:26:47 +0200 (Thu, 19 May 2011)
New Revision: 26279

Log:
 r48163@dhcp-adc-twvpn-1-vpnpool-10-154-14-107:  paul | 2011-05-19 10:26:36 -0500
 Remove confusing remarks about address size


Modified:
   svk:merge
   trunk/refman-5.0/functions-core.xml
   trunk/refman-5.1/functions-core.xml
   trunk/refman-5.5/functions-core.xml
   trunk/refman-5.6/functions-core.xml
   trunk/refman-6.0/functions-core.xml

Property changes on: trunk
___________________________________________________________________

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


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


Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml	2011-05-19 15:22:00 UTC (rev 26278)
+++ trunk/refman-5.0/functions-core.xml	2011-05-19 15:26:47 UTC (rev 26279)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 10; 2178 bytes

@@ -16772,7 +16772,9 @@
           Given the dotted-quad representation of an IPv4 network
           address as a string, returns an integer that represents the
           numeric value of the address in network byte order (big
-          endian). Addresses may be 4- or 8-byte addresses.
+          endian). <literal role="func">INET_ATON()</literal> returns
+          <literal>NULL</literal> if it does not understand its
+          argument.
         </para>
 
         <remark role="help-description-end"/>

@@ -16785,16 +16787,13 @@
 </programlisting>
 
         <para>
-          For this example, the number is calculated as
+          For this example, the return value is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> returns
-          <literal>NULL</literal> if it does not understand its
-          argument. For example,
           <literal role="func">INET_ATON()</literal> may or may not
           return a non-<literal>NULL</literal> result for short-form IP
           addresses (such as <literal>'127.1'</literal> as a

@@ -16835,11 +16834,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric IPv4 network address in network byte order (4
-          or 8 byte), returns the dotted-quad representation of the
-          address as a binary string.
-          <literal role="func">INET_NTOA()</literal> returns
-          <literal>NULL</literal> if it does not understand its
+          Given a numeric IPv4 network address in network byte order,
+          returns the dotted-quad representation of the address as a
+          binary string. <literal role="func">INET_NTOA()</literal>
+          returns <literal>NULL</literal> if it does not understand its
           argument.
         </para>
 


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2011-05-19 15:22:00 UTC (rev 26278)
+++ trunk/refman-5.1/functions-core.xml	2011-05-19 15:26:47 UTC (rev 26279)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 10; 2178 bytes

@@ -18185,7 +18185,9 @@
           Given the dotted-quad representation of an IPv4 network
           address as a string, returns an integer that represents the
           numeric value of the address in network byte order (big
-          endian). Addresses may be 4- or 8-byte addresses.
+          endian). <literal role="func">INET_ATON()</literal> returns
+          <literal>NULL</literal> if it does not understand its
+          argument.
         </para>
 
         <remark role="help-description-end"/>

@@ -18198,16 +18200,13 @@
 </programlisting>
 
         <para>
-          For this example, the number is calculated as
+          For this example, the return value is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> returns
-          <literal>NULL</literal> if it does not understand its
-          argument. For example,
           <literal role="func">INET_ATON()</literal> may or may not
           return a non-<literal>NULL</literal> result for short-form IP
           addresses (such as <literal>'127.1'</literal> as a

@@ -18248,11 +18247,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric IPv4 network address in network byte order (4
-          or 8 byte), returns the dotted-quad representation of the
-          address as a binary string.
-          <literal role="func">INET_NTOA()</literal> returns
-          <literal>NULL</literal> if it does not understand its
+          Given a numeric IPv4 network address in network byte order,
+          returns the dotted-quad representation of the address as a
+          binary string. <literal role="func">INET_NTOA()</literal>
+          returns <literal>NULL</literal> if it does not understand its
           argument.
         </para>
 


Modified: trunk/refman-5.5/functions-core.xml
===================================================================
--- trunk/refman-5.5/functions-core.xml	2011-05-19 15:22:00 UTC (rev 26278)
+++ trunk/refman-5.5/functions-core.xml	2011-05-19 15:26:47 UTC (rev 26279)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 9; 2098 bytes

@@ -18494,7 +18494,9 @@
           Given the dotted-quad representation of an IPv4 network
           address as a string, returns an integer that represents the
           numeric value of the address in network byte order (big
-          endian). Addresses may be 4- or 8-byte addresses.
+          endian). <literal role="func">INET_ATON()</literal> returns
+          <literal>NULL</literal> if it does not understand its
+          argument.
         </para>
 
         <remark role="help-description-end"/>

@@ -18507,16 +18509,13 @@
 </programlisting>
 
         <para>
-          For this example, the number is calculated as
+          For this example, the return value is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> returns
-          <literal>NULL</literal> if it does not understand its
-          argument. For example,
           <literal role="func">INET_ATON()</literal> may or may not
           return a non-<literal>NULL</literal> result for short-form IP
           addresses (such as <literal>'127.1'</literal> as a

@@ -18557,10 +18556,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric IPv4 network address in network byte order (4
-          or 8 byte), returns the dotted-quad representation of the
-          address as a string.
-          <literal role="func">INET_NTOA()</literal> returns
+          Given a numeric IPv4 network address in network byte order,
+          returns the dotted-quad representation of the address as a
+          string. <literal role="func">INET_NTOA()</literal> returns
           <literal>NULL</literal> if it does not understand its
           argument.
         </para>


Modified: trunk/refman-5.6/functions-core.xml
===================================================================
--- trunk/refman-5.6/functions-core.xml	2011-05-19 15:22:00 UTC (rev 26278)
+++ trunk/refman-5.6/functions-core.xml	2011-05-19 15:26:47 UTC (rev 26279)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 9; 2207 bytes

@@ -18854,7 +18854,9 @@
           Given the dotted-quad representation of an IPv4 network
           address as a string, returns an integer that represents the
           numeric value of the address in network byte order (big
-          endian). Addresses may be 4- or 8-byte addresses.
+          endian). <literal role="func">INET_ATON()</literal> returns
+          <literal>NULL</literal> if it does not understand its
+          argument.
         </para>
 
         <remark role="help-description-end"/>

@@ -18867,16 +18869,13 @@
 </programlisting>
 
         <para>
-          For this example, the number is calculated as
+          For this example, the return value is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> returns
-          <literal>NULL</literal> if it does not understand its
-          argument. For example,
           <literal role="func">INET_ATON()</literal> may or may not
           return a non-<literal>NULL</literal> result for short-form IP
           addresses (such as <literal>'127.1'</literal> as a

@@ -18917,10 +18916,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric IPv4 network address in network byte order (4
-          or 8 byte), returns the dotted-quad string representation of
-          the address as a nonbinary string in the connection character
-          set. <literal role="func">INET_NTOA()</literal> returns
+          Given a numeric IPv4 network address in network byte order,
+          returns the dotted-quad string representation of the address
+          as a nonbinary string in the connection character set.
+          <literal role="func">INET_NTOA()</literal> returns
           <literal>NULL</literal> if it does not understand its
           argument.
         </para>


Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml	2011-05-19 15:22:00 UTC (rev 26278)
+++ trunk/refman-6.0/functions-core.xml	2011-05-19 15:26:47 UTC (rev 26279)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 9; 2098 bytes

@@ -18785,7 +18785,9 @@
           Given the dotted-quad representation of an IPv4 network
           address as a string, returns an integer that represents the
           numeric value of the address in network byte order (big
-          endian). Addresses may be 4- or 8-byte addresses.
+          endian). <literal role="func">INET_ATON()</literal> returns
+          <literal>NULL</literal> if it does not understand its
+          argument.
         </para>
 
         <remark role="help-description-end"/>

@@ -18798,16 +18800,13 @@
 </programlisting>
 
         <para>
-          For this example, the number is calculated as
+          For this example, the return value is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> returns
-          <literal>NULL</literal> if it does not understand its
-          argument. For example,
           <literal role="func">INET_ATON()</literal> may or may not
           return a non-<literal>NULL</literal> result for short-form IP
           addresses (such as <literal>'127.1'</literal> as a

@@ -18848,10 +18847,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric IPv4 network address in network byte order (4
-          or 8 byte), returns the dotted-quad representation of the
-          address as a string.
-          <literal role="func">INET_NTOA()</literal> returns
+          Given a numeric IPv4 network address in network byte order,
+          returns the dotted-quad representation of the address as a
+          string. <literal role="func">INET_NTOA()</literal> returns
           <literal>NULL</literal> if it does not understand its
           argument.
         </para>


Thread
svn commit - mysqldoc@oter02: r26279 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois19 May