List:Commits« Previous MessageNext Message »
From:paul.dubois Date:October 21 2010 11:51pm
Subject:svn commit - mysqldoc@docsrva: r23291 - in trunk: . sample-data/sakila
View as plain text  
Author: paul
Date: 2010-10-22 01:51:03 +0200 (Fri, 22 Oct 2010)
New Revision: 23291

Log:
 r64526@frost:  paul | 2010-10-21 18:29:40 -0500
 Reformat


Modified:
   trunk/sample-data/sakila/legalnotice.en.xml
   trunk/sample-data/sakila/sakila.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43425
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64522
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43425
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64526
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/sample-data/sakila/legalnotice.en.xml
===================================================================
--- trunk/sample-data/sakila/legalnotice.en.xml	2010-10-21 23:12:28 UTC (rev 23290)
+++ trunk/sample-data/sakila/legalnotice.en.xml	2010-10-21 23:51:03 UTC (rev 23291)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 784 bytes

@@ -14,7 +14,8 @@
 -->
 
   <para>
-    Copyright &copy; 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+    Copyright &copy; 2007, 2010, Oracle and/or its affiliates. All
+    rights reserved.
   </para>
 
   <para>

@@ -37,7 +38,8 @@
   </para>
 
   <para role="legalnotice-gpl">
-    Copyright &copy; 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+    Copyright &copy; 2007, 2010, Oracle and/or its affiliates. All
+    rights reserved.
   </para>
 
   <para role="legalnotice-gpl">


Modified: trunk/sample-data/sakila/sakila.xml
===================================================================
--- trunk/sample-data/sakila/sakila.xml	2010-10-21 23:12:28 UTC (rev 23290)
+++ trunk/sample-data/sakila/sakila.xml	2010-10-21 23:51:03 UTC (rev 23291)
Changed blocks: 40, Lines Added: 120, Lines Deleted: 41; 9415 bytes

@@ -318,7 +318,9 @@
           table.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -371,7 +373,9 @@
           tables.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -452,7 +456,9 @@
           table.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -497,7 +503,9 @@
           table using a foreign key.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -548,7 +556,9 @@
           table.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -597,7 +607,9 @@
           tables using foreign keys.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -696,7 +708,9 @@
           tables.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -826,7 +840,9 @@
           tables using foreign keys.
         </para>
 
-        <bridgehead>Columns:</bridgehead>
+        <bridgehead>
+          Columns:
+        </bridgehead>
 
         <itemizedlist>
 

@@ -875,7 +891,9 @@
           tables using foreign keys.
         </para>
 
-        <bridgehead>Columns:</bridgehead>
+        <bridgehead>
+          Columns:
+        </bridgehead>
 
         <itemizedlist>
 

@@ -930,7 +948,9 @@
           <xref linkend="sakila-structure-triggers"/>).
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -983,7 +1003,9 @@
           table.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1035,7 +1057,9 @@
           table.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1082,7 +1106,9 @@
           tables.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1164,7 +1190,9 @@
           table.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1243,7 +1271,9 @@
           tables.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1356,7 +1386,9 @@
           tables.
         </para>
 
-        <bridgehead>Columns</bridgehead>
+        <bridgehead>
+          Columns
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1583,7 +1615,9 @@
 
         <title>The film_in_stock Stored Procedure</title>
 
-        <bridgehead>Description</bridgehead>
+        <bridgehead>
+          Description
+        </bridgehead>
 
         <para>
           The <literal>film_in_stock</literal> stored procedure is used

@@ -1591,7 +1625,9 @@
           at a given store.
         </para>
 
-        <bridgehead>Parameters</bridgehead>
+        <bridgehead>
+          Parameters
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1621,7 +1657,9 @@
 
         </itemizedlist>
 
-        <bridgehead>Return Values</bridgehead>
+        <bridgehead>
+          Return Values
+        </bridgehead>
 
         <para>
           This procedure produces a table of inventory ID numbers for

@@ -1630,7 +1668,9 @@
           indicates the number of rows in that table.
         </para>
 
-        <bridgehead>Sample Usage</bridgehead>
+        <bridgehead>
+          Sample Usage
+        </bridgehead>
 
 <programlisting>
 mysql> <userinput>CALL film_in_stock(1,1,@count);</userinput>

@@ -1661,7 +1701,9 @@
 
         <title>The film_not_in_stock Stored Procedure</title>
 
-        <bridgehead>Description</bridgehead>
+        <bridgehead>
+          Description
+        </bridgehead>
 
         <para>
           The <literal>film_not_in_stock</literal> stored procedure is

@@ -1669,7 +1711,9 @@
           not in stock (rented out) at a given store.
         </para>
 
-        <bridgehead>Parameters</bridgehead>
+        <bridgehead>
+          Parameters
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1699,7 +1743,9 @@
 
         </itemizedlist>
 
-        <bridgehead>Return Values</bridgehead>
+        <bridgehead>
+          Return Values
+        </bridgehead>
 
         <para>
           This procedure produces a table of inventory ID numbers for

@@ -1708,7 +1754,9 @@
           indicates the number of rows in that table.
         </para>
 
-        <bridgehead>Sample Usage</bridgehead>
+        <bridgehead>
+          Sample Usage
+        </bridgehead>
 
 <programlisting>
 mysql> <userinput>CALL film_not_in_stock(2,2,@count);</userinput>

@@ -1736,7 +1784,9 @@
 
         <title>The rewards_report Stored Procedure</title>
 
-        <bridgehead>Description</bridgehead>
+        <bridgehead>
+          Description
+        </bridgehead>
 
         <para>
           The <literal>rewards_report</literal> stored procedure

@@ -1744,7 +1794,9 @@
           previous month.
         </para>
 
-        <bridgehead>Parameters</bridgehead>
+        <bridgehead>
+          Parameters
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1774,7 +1826,9 @@
 
         </itemizedlist>
 
-        <bridgehead>Return Values</bridgehead>
+        <bridgehead>
+          Return Values
+        </bridgehead>
 
         <para>
           This function returns a table of customers who met the

@@ -1786,7 +1840,9 @@
           indicates the number of rows in that table.
         </para>
 
-        <bridgehead>Sample Usage</bridgehead>
+        <bridgehead>
+          Sample Usage
+        </bridgehead>
 
 <programlisting>
 mysql> <userinput>CALL rewards_report(7,20.00,@count);</userinput>

@@ -1831,7 +1887,9 @@
           the current amount owing on a specified customer's account.
         </para>
 
-        <bridgehead>Parameters</bridgehead>
+        <bridgehead>
+          Parameters
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1853,14 +1911,18 @@
 
         </itemizedlist>
 
-        <bridgehead>Return Values</bridgehead>
+        <bridgehead>
+          Return Values
+        </bridgehead>
 
         <para>
           This function returns the amount owing on the customer's
           account.
         </para>
 
-        <bridgehead>Sample Usage</bridgehead>
+        <bridgehead>
+          Sample Usage
+        </bridgehead>
 
 <programlisting>
 mysql> <userinput>SELECT get_customer_balance(298,NOW());</userinput>

@@ -1884,7 +1946,9 @@
           has rented out the specified inventory item.
         </para>
 
-        <bridgehead>Parameters</bridgehead>
+        <bridgehead>
+          Parameters
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1897,7 +1961,9 @@
 
         </itemizedlist>
 
-        <bridgehead>Return Values</bridgehead>
+        <bridgehead>
+          Return Values
+        </bridgehead>
 
         <para>
           This function returns the <literal>customer_id</literal> of

@@ -1905,7 +1971,9 @@
           <literal>NULL</literal> if the item is in stock.
         </para>
 
-        <bridgehead>Sample Usage</bridgehead>
+        <bridgehead>
+          Sample Usage
+        </bridgehead>
 
 <programlisting>
 mysql> <userinput>SELECT inventory_held_by_customer(8);</userinput>

@@ -1937,7 +2005,9 @@
           is in stock.
         </para>
 
-        <bridgehead>Parameters</bridgehead>
+        <bridgehead>
+          Parameters
+        </bridgehead>
 
         <itemizedlist>
 

@@ -1950,7 +2020,9 @@
 
         </itemizedlist>
 
-        <bridgehead>Return Values</bridgehead>
+        <bridgehead>
+          Return Values
+        </bridgehead>
 
         <para>
           This function returns <literal>TRUE</literal> or

@@ -1958,7 +2030,9 @@
           specified is in stock.
         </para>
 
-        <bridgehead>Sample Usage</bridgehead>
+        <bridgehead>
+          Sample Usage
+        </bridgehead>
 
 <programlisting>
 mysql> <userinput>SELECT inventory_in_stock(9);</userinput>

@@ -2084,7 +2158,9 @@
       implementation is intentionally left as an exercise to the user.
     </para>
 
-    <bridgehead>Rent a DVD</bridgehead>
+    <bridgehead>
+      Rent a DVD
+    </bridgehead>
 
     <para>
       To rent a DVD, first confirm that the given inventory item is in

@@ -2121,7 +2197,9 @@
 Query OK, 1 row affected (0.00 sec)
 </programlisting>
 
-    <bridgehead>Return a DVD</bridgehead>
+    <bridgehead>
+      Return a DVD
+    </bridgehead>
 
     <para>
       To return a DVD, update the <literal>rental</literal> table and

@@ -2161,7 +2239,9 @@
 1 row in set (0.09 sec)
 </programlisting>
 
-    <bridgehead>Find Overdue DVDs</bridgehead>
+    <bridgehead>
+      Find Overdue DVDs
+    </bridgehead>
 
     <para>
       Many DVD stores produce a daily list of overdue rentals so that

@@ -2329,4 +2409,3 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changelog.xml"/>
 
 </article>
-


Thread
svn commit - mysqldoc@docsrva: r23291 - in trunk: . sample-data/sakilapaul.dubois22 Oct