1.1 --- a/config/example.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/config/example.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -12,9 +12,9 @@
     1.4  config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
     1.5  
     1.6  
     1.7 --- A rocketwiki formatted text the user has to accept while registering
     1.8 +-- A HTML formatted text the user has to accept while registering
     1.9  -- ------------------------------------------------------------------------
    1.10 -config.use_terms = "=== Terms of Use ==="
    1.11 +config.use_terms = "<h1>Terms of Use</h1><p>Insert terms here</p>"
    1.12  
    1.13  
    1.14  -- Checkbox(es) the user has to accept while registering
    1.15 @@ -45,9 +45,29 @@
    1.16  
    1.17  -- Location of the rocketwiki binaries
    1.18  -- ------------------------------------------------------------------------
    1.19 -config.formatting_engine_executeables = {
    1.20 -  rocketwiki= "/opt/rocketwiki-lqfb/rocketwiki-lqfb",
    1.21 -  compat = "/opt/rocketwiki-lqfb/rocketwiki-lqfb-compat"
    1.22 +config.enforce_formatting_engine = "markdown2"
    1.23 +config.formatting_engines = {
    1.24 +  { id = "markdown2",
    1.25 +    name = "python-markdown2",
    1.26 +    executable = "markdown2",
    1.27 +    args = {'-s', 'escape', '-x', 'cuddled-lists,nofollow,wiki-tables'},
    1.28 +    remove_images = true
    1.29 +  },
    1.30 +  { id = "markdown_py",
    1.31 +    name = "Python Markdown",
    1.32 +    executable = "markdown_py",
    1.33 +    args = {'-s', 'escape', '-x', 'extra', '-x', 'nl2br', '-x', 'sane_lists'},
    1.34 +    remove_images = true
    1.35 +  },
    1.36 +  { id = "rocketwiki",
    1.37 +    name = "RocketWiki",
    1.38 +    executable = "/opt/rocketwiki-lqfb/rocketwiki-lqfb"
    1.39 +  },
    1.40 +  { id = "compat",
    1.41 +    name = "Traditional WIKI syntax",
    1.42 +    executable = "/opt/rocketwiki-lqfb/rocketwiki-lqfb-compat"
    1.43 +  },
    1.44 +
    1.45  }
    1.46  
    1.47  
    1.48 @@ -143,9 +163,13 @@
    1.49  --  photo =  function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
    1.50  --}
    1.51  
    1.52 --- Display a public message of the day
    1.53 +-- Display a html formatted public message of the day
    1.54  -- ------------------------------------------------------------------------
    1.55 --- config.motd_public = "===Message of the day===\nThe MOTD is formatted with rocket wiki"
    1.56 +-- config.motd_public = "<h1>Message of the day (public)</h1><p>The MOTD is formatted with HTML</p>"
    1.57 +
    1.58 +-- Display a html formatted internal message of the day
    1.59 +-- ------------------------------------------------------------------------
    1.60 +-- config.motd_intern = "<h1>Message of the day (intern)</h1><p>The MOTD is formatted with HTML</p>"
    1.61  
    1.62  -- Automatic issue related discussion URL
    1.63  -- ------------------------------------------------------------------------