--- jspwiki.properties.orig	2013-09-21 12:08:38.158433160 +0000
+++ jspwiki.properties	2013-10-02 19:14:03.910613260 +0000
@@ -33,7 +33,7 @@
 #  the actual web name (http://my.com/mywiki) of the application, but usually
 #  it is the same.
 #
-jspwiki.applicationName = JSPWiki
+jspwiki.applicationName = doc
 
 #
 #  Describe where your wiki lives (the real URL through which it is available
@@ -46,7 +46,7 @@
 #  Example:
 #  jspwiki.baseURL = http://www.jspwiki.org/
 #
-jspwiki.baseURL=http://localhost:8080/JSPWiki/
+jspwiki.baseURL=https://jspwiki-doc.apache.org/doc/
 
 #
 #  Which page provider class to use.  Possibilities are:
@@ -58,7 +58,7 @@
 #  Note that if you're upgrading from JSPWiki 1.x, then you need to remove the
 #  "org.apache.wiki." part from the beginning of the path.
 #
-jspwiki.pageProvider = FileSystemProvider
+jspwiki.pageProvider = VersioningFileProvider
 
 #
 # How to order pages in various lists and plugins.  By default, they are
@@ -107,7 +107,7 @@
 #  If you're using Windows, then you must duplicate the backslashes.
 #  For example, use:
 #
-#  jspwiki.fileSystemProvider.pageDir = C:\\Data\\jspwiki
+jspwiki.fileSystemProvider.pageDir = /var/jspwiki/doc/pages
 #  
 #  
 
@@ -143,7 +143,7 @@
 #
 #  jspwiki.basicAttachmentProvider.storageDir = C:\\Data\\jspwiki
 #
-jspwiki.basicAttachmentProvider.storageDir = @pagedir@
+jspwiki.basicAttachmentProvider.storageDir = /var/jspwiki/doc/pages
 
 #
 #  You can tell the BasicAttachmentProvider to add a flag
@@ -627,7 +627,7 @@
 #
 # This is the JSPWiki home.  In future, JSPWiki will probably rely on this
 # for error messages, so I don't recommend that you change it.
-jspwiki.interWikiRef.JSPWiki = http://www.jspwiki.org/wiki/%s
+# jspwiki.interWikiRef.JSPWiki = http://www.jspwiki.org/wiki/%s
 
 # Here's how you can have directly links to the JSPWiki editor.
 # Now you can put a hyperlink for editing "MainPage" by making
@@ -635,22 +635,22 @@
 jspwiki.interWikiRef.Edit = Edit.jsp?page=%s
 
 #  This is the original WikiWikiWeb
-jspwiki.interWikiRef.WikiWikiWeb = http://c2.com/cgi/wiki?%s
+# jspwiki.interWikiRef.WikiWikiWeb = http://c2.com/cgi/wiki?%s
 
 #  TWiki, a very nice WikiClone.
-jspwiki.interWikiRef.TWiki = http://twiki.org/cgi-bin/view/TWiki/%s
+# jspwiki.interWikiRef.TWiki = http://twiki.org/cgi-bin/view/TWiki/%s
 
 #  MeatballWiki, which seems to be quite popular.
-jspwiki.interWikiRef.MeatballWiki = http://usemod.com/cgi-bin/mb.pl?%s
+# jspwiki.interWikiRef.MeatballWiki = http://usemod.com/cgi-bin/mb.pl?%s
 
 #  Wikipedia, a Wiki encyclopedia!
-jspwiki.interWikiRef.Wikipedia = http://www.wikipedia.com/wiki/%s
+# jspwiki.interWikiRef.Wikipedia = http://www.wikipedia.com/wiki/%s
 
 #  Google, the ubiquitous search engine.
 jspwiki.interWikiRef.Google = http://www.google.com/search?q=%s
 
 #  JSPWiki documentation (for this release)
-jspwiki.interWikiRef.Doc = http://doc.jspwiki.org/2.8/wiki/%s
+# jspwiki.interWikiRef.Doc = http://doc.jspwiki.org/2.8/wiki/%s
 
 ############################################################################
 #
@@ -665,8 +665,8 @@
 # For example:
 #   Inline all JPG files, PNG files and all files from images.com:
 #
-#      jspwiki.translatorReader.inlinePattern.1 = *.jpg
-#      jspwiki.translatorReader.inlinePattern.2 = *.png
+jspwiki.translatorReader.inlinePattern.1 = *.jpg
+jspwiki.translatorReader.inlinePattern.2 = *.png
 #      jspwiki.translatorReader.inlinePattern.3 = http://images.com/*
 
 
@@ -828,7 +828,7 @@
 log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
 log4j.appender.FileLog.MaxFileSize    = 10MB
 log4j.appender.FileLog.MaxBackupIndex = 14
-log4j.appender.FileLog.File = /tmp/jspwiki.log
+log4j.appender.FileLog.File = /var/jspwiki/doc/logs/jspwiki.log
 log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
 log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
 
@@ -851,25 +851,25 @@
 #  INFO:  login, logout
 #  DEBUG: add/remove group, add/remove group member, clear groups/group members, access allowed
 #
-#log4j.logger.SecurityLog=INFO, SecurityAppender
-#log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
-#log4j.appender.SecurityAppender.MaxFileSize    = 10MB
-#log4j.appender.SecurityAppender.MaxBackupIndex = 14
-#log4j.appender.SecurityAppender.File = /tmp/security.log
-#log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
-#log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
+log4j.logger.SecurityLog=INFO, SecurityAppender
+log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
+log4j.appender.SecurityAppender.MaxFileSize    = 10MB
+log4j.appender.SecurityAppender.MaxBackupIndex = 14
+log4j.appender.SecurityAppender.File = /var/jspwiki/doc/logs/security.log
+log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
+log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
 
 #
 #  Uncomment these lines if you wish to receive detailed spam
 #  filter logging.
 #
-#log4j.logger.SpamLog=INFO,SpamAppender
-#log4j.appender.SpamAppender = org.apache.log4j.RollingFileAppender
-#log4j.appender.SpamAppender.MaxFileSize = 10MB
-#log4j.appender.SpamAppender.MaxBackupIndex = 14
-#log4j.appender.SpamAppender.File = /tmp/spamlog.log
-#log4j.appender.SpamAppender.layout = org.apache.log4j.PatternLayout
-#log4j.appender.SpamAppender.layout.ConversionPattern=%d{ISO8601} %m%n
+log4j.logger.SpamLog=INFO,SpamAppender
+log4j.appender.SpamAppender = org.apache.log4j.RollingFileAppender
+log4j.appender.SpamAppender.MaxFileSize = 10MB
+log4j.appender.SpamAppender.MaxBackupIndex = 14
+log4j.appender.SpamAppender.File = /var/jspwiki/doc/logs/spamlog.log
+log4j.appender.SpamAppender.layout = org.apache.log4j.PatternLayout
+log4j.appender.SpamAppender.layout.ConversionPattern=%d{ISO8601} %m%n
 
 ###########################################################################
 #