Author: jalkanen
Date: Sat Jun 14 05:27:08 2008
New Revision: 667781
URL: http://svn.apache.org/viewvc?rev=667781&view=rev
Log:
Moved baseURL near the top, as it's now a mandatory thing.
Modified:
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
Modified: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl?rev=667781&r1=667780&r2=667781&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl Sat Jun 14 05:27:08 2008
@@ -15,6 +15,19 @@
jspwiki.applicationName = @appname@
#
+# Describe where your wiki lives (the real URL through which it is available
+# through the internet/intranet). This is a mandatory attribute.
+#
+# Be careful if you use a localhost address (http://localhost/ or
http://127.0.0.1/),
+# as this will cause some unwanted side effects if your wiki is accessed from
+# any other computer than where the wiki is running.
+#
+# Example:
+# jspwiki.baseURL = http://www.jspwiki.org/
+#
+jspwiki.baseURL=
+
+#
# Which page provider class to use. Possibilities are:
#
# RCSFileProvider - for simple RCS-based file storage
@@ -143,24 +156,6 @@
#
jspwiki.diffProvider = TraditionalDiffProvider
-#
-# BaseURL can be used to rewrite all of JSPWiki's internal references.
-# Sometimes, especially if you're behind a address-rewriting firewall,
-# relative URLs don't work since the servlet container has no idea
-# where it's actually located.
-#
-# Leave undefined if you want to rely on what your servlet container
-# thinks of where your application lives.
-#
-# You MUST, however, define this one if you want to enable RSS (see below).
In
-# general, this is a good idea to define it anyway. Do not forget the
-# trailing slash.
-#
-# Example:
-# jspwiki.baseURL = http://www.jspwiki.org/
-#
-#jspwiki.baseURL=
-
# Determines if you need to have relative urls or not. If the baseURL
# is not set, then this has no effect, but if you set the baseURL (which
# is highly recommended), you can use this to set relative urls.