You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2022/03/22 11:09:38 UTC

[jspwiki] 09/15: Explicit wiki syntax / rendering properties + fix some typos

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 4a523726811c138ce033023ac51ec8eddf2e7bd4
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Tue Mar 22 11:55:34 2022 +0100

    Explicit wiki syntax / rendering properties + fix some typos
---
 .../src/main/resources/ini/jspwiki.properties      | 27 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/jspwiki-main/src/main/resources/ini/jspwiki.properties b/jspwiki-main/src/main/resources/ini/jspwiki.properties
index 2c4bcff..c0876bf 100644
--- a/jspwiki-main/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-main/src/main/resources/ini/jspwiki.properties
@@ -448,18 +448,33 @@ jspwiki.plugin.externalJars =
 
 #############################################################################
 #
-# Rendering
-#
-# At this time, entries here are strictly for development and testing.
+# Rendering & wiki syntax
 #
 
 # Markup parser class name; it must be a subclass of org.apache.wiki.parser.MarkupParser
 jspwiki.renderingManager.markupParser=org.apache.wiki.parser.JSPWikiMarkupParser
 
+# Wiki renderer that outputs XHTML; it must be a subclass of org.apache.wiki.render.WikiRenderer
+jspwiki.renderingManager.renderer=org.apache.wiki.render.XHTMLRenderer
+
+# Wiki renderer that outputs XHTML in a format that is suitable for use by a WYSIWYG XHTML editor; it must be a subclass of org.apache.wiki.render.WikiRenderer
+jspwiki.renderingManager.renderer.wysiwyg=org.apache.wiki.render.WysiwygEditingRenderer
+
+# HTML to specific wiki syntax decorator
+jspwiki.syntax.decorator=org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator
+
+# Location inside .jar of code snippets for plain editor, specific to a given wiki syntax
+jspwiki.syntax.plain=plain/wiki-snips-jspwiki.js
+
+# As a shorcut to enable Markdown syntax, the following property
+# jspwiki.syntax=markdown
+# can be enabled, which will overwrite last 5 previous keys to their appropiate values in order to enable Markdown syntax
+# See https://jspwiki-wiki.apache.org/Wiki.jsp?page=Markdown%20Support for details
+
 # Response encoding
 #
 # Whether WikiJSPFilter should use encoding for the response.
-# Most servers don't need this settings, but if your non-Latin chars are not displayed
+# Most servers don't need this setting, but if your non-Latin chars are not displayed
 # properly, try setting this to true.
 # jspwiki.nofilterencoding = false
 
@@ -651,7 +666,7 @@ jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager
 # multiple times to get multiple references).  Page references should
 # appear in format : [wiki:wikipage].
 #
-# This is the JSPWiki home.  In future, JSPWiki will probably rely on this
+# This is the JSPWiki home.  In the future, JSPWiki will probably rely on this
 # for error messages, so I don't recommend that you change it.
 jspwiki.interWikiRef.JSPWiki = http://jspwiki-wiki.apache.org/Wiki.jsp?page=%s
 
@@ -1006,7 +1021,7 @@ jspwiki.defaultprefs.template.orientation =fav-left
 jspwiki.defaultprefs.template.sidebar =active
 
 # Set layout of the template
-# Possible values: fluid (use full screen-estate) or fixed (fixed max-width)
+# Possible values: fluid (use full screen estate) or fixed (fixed max-width)
 jspwiki.defaultprefs.template.layout =fluid
 
 # Set editor type : plain, WikiWizard, FCK