web commit by http://dalefarnsworth.myopenid.com/

[git.ikiwiki.info.git] / doc / plugins / table.mdwn

diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index 569e5698250130576b5318e6346a66a4b6314191..6920c8f8080e53175afc9ccb5ab3c70519564a72 100644 (file)
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -9,9 +9,10 @@ It needs the perl module [[cpan Text::CSV]] for the CSV data.
 ## examples
 
        \[[table data="""
 ## examples
 
        \[[table data="""

-       Customer|Amount|
-       Fulanito|134,34|
-       Menganito|234,56|
+       Customer|Amount
+       Fulanito|134,34
+       Menganito|234,56
+       Menganito|234,56

        """]]
     
        \[[table class="book_record" format=csv file="data/books/record1"]]
        """]]
     
        \[[table class="book_record" format=csv file="data/books/record1"]]


@@ -22,6 +23,15 @@ In this second example the `record1` page should be similar to:
        "Author","Damian Conway"
        "Publisher","O’Reilly"
 
        "Author","Damian Conway"
        "Publisher","O’Reilly"
 

+To make a cell span multiple columns, follow it with one or more empty
+cells. For example:
+
+       \[[table data="""
+       left||right|
+       a|b|c|d
+       this cell spans 4 columns|||
+       """]]
+

 ## usage
 
 * `data` - Values for the table.
 ## usage
 
 * `data` - Values for the table.


@@ -31,5 +41,5 @@ In this second example the `record1` page should be similar to:
 * `delimiter` - The character used to separate fields. By default,
    DSV format uses a pipe (`|`), and CSV uses a comma (`,`).
 * `class` - A CSS class for the table html element.
 * `delimiter` - The character used to separate fields. By default,
    DSV format uses a pipe (`|`), and CSV uses a comma (`,`).
 * `class` - A CSS class for the table html element.

-* `header` - Set to 0 to make a table without a header. By default,
+* `header` - Set to "no" to make a table without a header. By default,

   the first data line is used as the table header.
   the first data line is used as the table header.