add colspan support

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

diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index e84f6f947c780d8d4157e83db523648e0e99aff8..c245c1af2d529d0d743683b573360e5b0b185abd 100644 (file)
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -12,6 +12,7 @@ It needs the perl module [[cpan Text::CSV]] for the CSV data.
        Customer|Amount
        Fulanito|134,34
        Menganito|234,56
+       Menganito|234,56
        """]]
     
        \[[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"
 
+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.