[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 3 commits - helpcontent2/to-wiki

[Libreoffice Gerrit user]

 helpcontent2/to-wiki/wikiconv2.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fd9c83bc7973256b0d67746dc5774a67bede0906
Merge: 6f35bcb... 63b4707...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Nov 5 14:16:29 2012 +0100

    Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6

commit 63b4707e8f51ea0c41495195bbf4af147184505a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 10 14:54:49 2012 +0200

    Branch libreoffice-3-6-3
    
    This is 'libreoffice-3-6-3' - the stable branch for the 3.6.3 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.6.x release,
    please use the 'libreoffice-3-6' branch.
    
    If you want to build something cool, unstable, and risky, use master.
    
    Change-Id: I223392098cfa4dc7bb435133b1e1d851865e10ff
commit ff79af3a761f3034cf4280d5662d5c28854e0613
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 15 12:07:08 2012 +0200

    fdo#51074: Start table cells with "| |"
    
    ...so that a "|" in the cell content is not mistaken as separating parameters
    from content.  But do note that <http://meta.wikimedia.org/w/index.php?
    title=Help:Table&oldid=3670686#Pipe_syntax_tutorial> rather suggests: "To show a
    visible pipe in a cell, use <nowiki>|</nowiki> or |."
    
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/helpcontent2/to-wiki/wikiconv2.py b/helpcontent2/to-wiki/wikiconv2.py
index 837ffeb..502d05b 100755
--- a/helpcontent2/to-wiki/wikiconv2.py
+++ b/helpcontent2/to-wiki/wikiconv2.py
@@ -40,8 +40,8 @@ replace_paragraph_role = \
               'paragraph': '',
               'related': '', # used only in one file, probably in error?
               'relatedtopics': '', # used only in one file, probably in error?
-              'tablecontent': '| ',
-              'tablecontentcode': '| <code>',
+              'tablecontent': '| | ',
+              'tablecontentcode': '| | <code>',
               'tablehead': '! scope="col" | ',
               'tablenextpara': '\n',
               'tablenextparacode': '\n<code>',