svn commit - mysqldoc@docsrva: r10977 - in trunk: . dynamic-docs/opsfunctions

[paul]

Author: paul
Date: 2008-06-19 03:31:59 +0200 (Thu, 19 Jun 2008)
New Revision: 10977

Log:
 r32113@frost:  paul | 2008-06-18 20:32:06 -0500
 Fix FROM_UNIXTIME() description.
 (Bug#37511)


Modified:
   trunk/dynamic-docs/opsfunctions/opfunctions.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:32102
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31727
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32113
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31727


Modified: trunk/dynamic-docs/opsfunctions/opfunctions.xml
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.xml	2008-06-18 18:17:28 UTC (rev 10976)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.xml	2008-06-19 01:31:59 UTC (rev 10977)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 728 bytes

@@ -976,7 +976,7 @@
   
   <opfunction type="function" id="from-unixtime" class="datetime">
     <display>FROM_UNIXTIME()</display>
-    <description lang="en">Format date as a UNIX timestamp</description>
+    <description lang="en">Format UNIX timestamp as a date</description>
     <arguments>
      
<format><![CDATA[<replaceable>unix_timestamp</replaceable>]]></format>
       <argument seq="1" name="expr" type="numeric"></argument>