Google Git
Sign in
apache/jspwiki/refs/heads/develop^!/.
commit
41bb9760f77248cd192a489a6c1feed7d212e24c
[log]
author
Harry Metske <harry.metske@gmail.com>
Fri Dec 16 17:08:33 2016 +0100
committer
Harry Metske <harry.metske@gmail.com>
Fri Dec 16 17:08:33 2016 +0100
tree
0dc543c3899bc47c5bc0175a5e2fdd15bc67755e
parent
6d85300638a43fc077d5e25bef73f927f79301cf [diff]
JSPWIKI-1035 - more updates from Harry

diff --git a/README b/README
index 21509cc..de834c9 100644
--- a/README
+++ b/README

@@ -96,7 +96,7 @@
 placed in jspwiki-custom.properties file JSPWiki will rely on the default file.
 Review the default file to look for values you may wish to override in the custom
 file.  Some common values to override in your custom file include 
-jspwiki.baseURL, jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
+jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
 jspwiki.fileSystemProvider.pageDir, jspwiki.basicAttachmentProvider.storageDir, 
 and log4j.appender.FileLog.File.  The comments in the default file will suggest 
 appropriate values to override them with. 

diff --git a/README.md b/README.md
index 9e603c4..b8a88ca 100644
--- a/README.md
+++ b/README.md

@@ -90,7 +90,7 @@
 placed in jspwiki-custom.properties file JSPWiki will rely on the default file.
 Review the default file to look for values you may wish to override in the custom
 file.  Some common values to override in your custom file include 
-jspwiki.baseURL, jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
+jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
 jspwiki.fileSystemProvider.pageDir, jspwiki.basicAttachmentProvider.storageDir, 
 and log4j.appender.FileLog.File.  The comments in the default file will suggest 
 appropriate values to override them with. 

diff --git a/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties b/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
index 09c71cf..57e097c 100644
--- a/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
+++ b/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties

@@ -21,7 +21,6 @@
 jspwiki.referenceStyle          = ${it-jspwiki.referenceStyle}
 jspwiki.userdatabase            = ${it-jspwiki.userdatabase}
 
-jspwiki.baseURL                            = http://localhost:8080/${project.artifactId}/
 jspwiki.fileSystemProvider.pageDir         = ./${project.artifactId}/target/test-classes/test-repo
 jspwiki.basicAttachmentProvider.storageDir = ./${project.artifactId}/target/test-classes/test-repo/attachments
 jspwiki.workDir                            = ./${project.artifactId}/target/test-classes/workdir-${project.artifactId}

diff --git a/jspwiki-portable/src/main/resources/jspwiki-custom.properties b/jspwiki-portable/src/main/resources/jspwiki-custom.properties
index 12bd191..e9374ab 100644
--- a/jspwiki-portable/src/main/resources/jspwiki-custom.properties
+++ b/jspwiki-portable/src/main/resources/jspwiki-custom.properties

@@ -28,7 +28,6 @@
 jspwiki.applicationName=JSPWiki
 jspwiki.security=jaas
 jspwiki.workDir=./temp/JSPWiki
-jspwiki.baseURL=http://localhost:9627/JSPWiki/
 jspwiki.attachment.maxsize=4000000
 jspwiki.attachment.forbid=.html .htm .php .asp .exe .sh .dll
 jspwiki.breakTitleWithSpaces=true

diff --git a/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties b/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
index d79343f..0245216 100644
--- a/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
+++ b/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties

@@ -20,7 +20,6 @@
 #
 
 jspwiki.applicationName=department
-jspwiki.baseURL=http://localhost:9627/department/
 jspwiki.basicAttachmentProvider.storageDir=./data/department
 jspwiki.fileSystemProvider.pageDir=./data/department
 jspwiki.pageProvider=VersioningFileProvider

diff --git a/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties b/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
index 1727c08..0f7993b 100644
--- a/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
+++ b/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties

@@ -20,7 +20,6 @@
 #
 
 jspwiki.applicationName=personal
-jspwiki.baseURL=http://localhost:9627/personal/
 jspwiki.basicAttachmentProvider.storageDir=./data/personal
 jspwiki.fileSystemProvider.pageDir=./data/personal
 jspwiki.workDir=./temp/personal

diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
index afb34f5..6f663b7 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java

@@ -145,9 +145,6 @@
     Double negative, cause for most servers you don't need the property */
     public static final String PROP_NO_FILTER_ENCODING     = "jspwiki.nofilterencoding";    
 
-    /** The name for the base URL to use in all references. */
-    public static final String PROP_BASEURL      = "jspwiki.baseURL";
-
     /** The name for the property which allows you to set the current reference
      *  style.  The value is {@value}.
      */

diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java b/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
index 3b289b4..5f3942b 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java

@@ -155,25 +155,15 @@
     private static final int MAX_CHARACTERS             = Integer.MAX_VALUE-1;
 
     /**
-     *  Initialize the RSS generator for a given WikiEngine.  Currently the only 
-     *  required property is <tt>{@value org.apache.wiki.WikiEngine#PROP_BASEURL}</tt>.
+     *  Initialize the RSS generator for a given WikiEngine.
      *  
      *  @param engine The WikiEngine.
      *  @param properties The properties.
-     *  @throws NoRequiredPropertyException If something is missing from the given property set.
      */
     public RSSGenerator( WikiEngine engine, Properties properties )
-        throws NoRequiredPropertyException
     {
         m_engine = engine;
 
-        // FIXME: This assumes a bit too much.
-        if( engine.getBaseURL() == null || engine.getBaseURL().length() == 0 )
-        {
-            throw new NoRequiredPropertyException( "RSS requires jspwiki.baseURL to be set!",
-                                                   WikiEngine.PROP_BASEURL );
-        }
-
         m_channelDescription = properties.getProperty( PROP_CHANNEL_DESCRIPTION,
                                                        m_channelDescription );
         m_channelLanguage    = properties.getProperty( PROP_CHANNEL_LANGUAGE,

diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
index 315a23d..f236feb 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java

@@ -60,7 +60,6 @@
     public static final String INSTALL_ERROR = "Installer.Error";
     public static final String INSTALL_WARNING = "Installer.Warning";
     public static final String APP_NAME = WikiEngine.PROP_APPNAME;
-    public static final String BASE_URL = WikiEngine.PROP_BASEURL;
     public static final String STORAGE_DIR = BasicAttachmentProvider.PROP_STORAGEDIR;
     public static final String LOG_FILE = "log4j.appender.FileLog.File";
     public static final String PAGE_DIR = FileSystemProvider.PROP_PAGEDIR;
@@ -205,13 +204,7 @@
         // Get application name
         String nullValue = m_props.getProperty( APP_NAME, rb.getString( "install.installer.default.appname" ) );
         parseProperty( APP_NAME, nullValue );
-        
-        // Get/sanitize base URL
-        nullValue = m_request.getRequestURL().toString();
-        nullValue = nullValue.substring( 0, nullValue.lastIndexOf('/') )+"/";
-        parseProperty( BASE_URL, nullValue );
-        sanitizeURL( BASE_URL );
-        
+
         // Get/sanitize page directory
         nullValue = m_props.getProperty( PAGE_DIR, rb.getString( "install.installer.default.pagedir" ) );
         parseProperty( PAGE_DIR, nullValue );
@@ -265,7 +258,6 @@
         ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE, m_session.getLocale() );
         m_session.clearMessages( INSTALL_ERROR );
         parseProperties();
-        validateNotNull( BASE_URL, rb.getString( "install.installer.validate.baseurl" ) );
         validateNotNull( PAGE_DIR, rb.getString( "install.installer.validate.pagedir" ) );
         validateNotNull( APP_NAME, rb.getString( "install.installer.validate.appname" ) );
         validateNotNull( WORK_DIR, rb.getString( "install.installer.validate.workdir" ) );

diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
index 80d9b49..59f915e 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java

@@ -142,7 +142,6 @@
             out.print( "<body>" );
             out.print( "<h1>JSPWiki installation</h1>" );
             out.print( "<p>Hello!  It appears that this is your first jspwiki installation." );
-            out.print( "(Or, you have removed jspwiki.baseURL from your property file.) " );
             out.print( "Therefore, you will need to start the installation process. " );
             out.print( "Please <a href='Install.jsp'>continue to the installer</a>." );
             out.print( "</p>");

diff --git a/jspwiki-war/src/main/resources/CoreResources.properties b/jspwiki-war/src/main/resources/CoreResources.properties
index e2be67f..cfb461b 100644
--- a/jspwiki-war/src/main/resources/CoreResources.properties
+++ b/jspwiki-war/src/main/resources/CoreResources.properties

@@ -202,7 +202,6 @@
 install.installer.default.pagedir=Please provide a directory for the pages!
 install.installer.props.saved=Your new properties have been saved to {0}. Copy this file to a directory that is on the classpath of your container (tomcat lib directory for example), then restart your container. Scroll down a bit to see your new jspwiki-custom.properties.
 install.installer.props.notsaved=Unable to write properties\: {0}. Please copy the file below as your jspwiki-custom.properties\:\n{1}
-install.installer.validate.baseurl=You must define the baseURL for this wiki.
 install.installer.validate.pagedir=You must define the location where the pages are stored.
 install.installer.validate.appname=You must define the application name.
 install.installer.validate.workdir=You must define a work directory.

diff --git a/jspwiki-war/src/main/resources/CoreResources_nl.properties b/jspwiki-war/src/main/resources/CoreResources_nl.properties
index 7498eac..abfdd8b 100644
--- a/jspwiki-war/src/main/resources/CoreResources_nl.properties
+++ b/jspwiki-war/src/main/resources/CoreResources_nl.properties

@@ -60,7 +60,7 @@
 security.error.cannot.rename=Kan niet hernoemen: de Login naam ''{0}'' is al in gebruik.
 security.error.fullname.taken=De volledige naam ''{0}'' is al in gebruik.
 security.error.login.taken=De Login naam ''{0}'' is al in gebruik.
-security.error.email.taken=Het email adres ''{0}'' is al in gebruik, je kunt een email adres maar voor één profile gebruiken.
+security.error.email.taken=Het email adres ''{0}'' is al in gebruik, je kunt een email adres maar voor ��n profile gebruiken.
 
 # These should roughly match whatever is used in default.properties for UserProfile.jsp
 security.user.loginname=Login naam
@@ -103,7 +103,7 @@
 diff.traditional.added=Op lijn {0} werden {1} toegevoegd
 diff.traditional.changed=Op lijn {0} werden {1} gewijzigd
 diff.traditional.removed=Op lijn {0} werden {1} verwijderd
-diff.traditional.oneline=één lijn
+diff.traditional.oneline=��n lijn
 diff.traditional.lines={2} lijnen
 
 # InputValidator
@@ -207,7 +207,6 @@
                                classpath van je container staat (tomcat lib directory b.v.), daarna je container herstarten.\
                                Scroll naar beneden om je nieuwe jspwiki.properties te zien.
 install.installer.props.notsaved=Kan de properties niet wegschrijven: {0}. Sla onderstaande file op als jspwiki-custom.properties:\n{1}
-install.installer.validate.baseurl=Je moet de baseURL voor deze wiki definieren.
 install.installer.validate.pagedir=Je moet de plek configureren waar de pagina's moeten worden opgeslagen.
 install.installer.validate.appname=Je moet de applicatie naam opgeven
 install.installer.validate.workdir=Je moet de work directory opgeven.

diff --git a/jspwiki-war/src/main/webapp/rss.jsp b/jspwiki-war/src/main/webapp/rss.jsp
index 082ca0f..534d041 100644
--- a/jspwiki-war/src/main/webapp/rss.jsp
+++ b/jspwiki-war/src/main/webapp/rss.jsp

@@ -56,7 +56,7 @@
     // Redirect if baseURL not set or RSS generation not on
     if( wiki.getBaseURL().length() == 0 )
     {
-        response.sendError( 500, "The jspwiki.baseURL property has not been defined for this wiki - cannot generate RSS" );
+        response.sendError( 500, "The baseURL could not be determined for this wiki - cannot generate RSS" );
         return;
     }
     

diff --git a/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
index f56a28c..c4607bc 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java

@@ -55,7 +55,6 @@
 
     protected void setUp() throws Exception
     {
-        props.setProperty( WikiEngine.PROP_BASEURL, "http://localhost/" );
         props.setProperty( RSSGenerator.PROP_GENERATE_RSS, "true" );
         CacheManager.getInstance().removeAllCaches();
         m_testEngine = new TestEngine(props);

diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
index fc3df0b..ee3b41f 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java

@@ -42,7 +42,6 @@
     private URLConstructor getConstructor( String baseURL, String prefix )
         throws WikiException
     {
-        props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
         if( prefix != null ) props.setProperty( ShortViewURLConstructor.PROP_PREFIX, prefix );
         
         testEngine = new TestEngine(props);

diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
index 5cc7024..1b6b4d2 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java

@@ -42,7 +42,6 @@
     private URLConstructor getConstructor( String baseURL, String prefix )
         throws WikiException
     {
-        props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
         if( prefix != null ) props.setProperty( ShortURLConstructor.PROP_PREFIX, prefix );
         
         testEngine = new TestEngine(props);

diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
index 2a1e1bc..59291c5 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java

@@ -42,7 +42,6 @@
     private URLConstructor getConstructor( String baseURL, String prefix )
         throws WikiException
     {
-        props.setProperty( WikiEngine.PROP_BASEURL, baseURL );
         if( prefix != null ) props.setProperty( ShortViewURLConstructor.PROP_PREFIX, prefix );
         
         testEngine = new TestEngine(props);

diff --git a/jspwiki-war/src/test/resources/jspwiki-custom.properties b/jspwiki-war/src/test/resources/jspwiki-custom.properties
index 1e1abab..f02e61f 100644
--- a/jspwiki-war/src/test/resources/jspwiki-custom.properties
+++ b/jspwiki-war/src/test/resources/jspwiki-custom.properties

@@ -28,7 +28,6 @@
 jspwiki.basicAttachmentProvider.storageDir = target/test-classes/testrepository
 jspwiki.encoding = ISO-8859-1
 jspwiki.filterConfig = /filters.xml
-jspwiki.baseURL = http://localhost/
 jspwiki.referenceStyle = relative
 jspwiki.authorizer=org.apache.wiki.TestAuthorizer
 

diff --git a/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
index cc0f02e..02a6501 100644
--- a/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/en/src/main/resources/InstallationTips.txt

@@ -57,7 +57,7 @@
 

 !Enabling the [RSS|http://blogspace.com/rss/] feed

 

-In your jspwiki.properties -file, you'll need to set the "jspwiki.rss.generate" to "true", and also set the "jspwiki.baseURL" to point at your Wiki.  Otherwise the RSS generator can't figure out how its links should go... :-)

+In your jspwiki.properties -file, you'll need to set the "jspwiki.rss.generate" to "true".

 

 !I don't like ~ThingsSquashedTogether in the page titles.  What can I do?

 


diff --git a/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
index 714a11f..6bf4f86 100644
--- a/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/es/src/main/resources/InstallationTips.txt

@@ -57,7 +57,7 @@
 

 !Activando el feed [RSS|http://blogspace.com/rss/]

 

-En tu archivo jspwiki.properties, tienes que establecer el parámetro "jspwiki.rss.generate" a "true", y también establecer el parámetro "jspwiki.baseURL" para que apunte a tu Wiki. De otro modo el generador de RSS no sabrá a dónde deben ir los enlaces... :-)

+En tu archivo jspwiki.properties, tienes que establecer el parámetro "jspwiki.rss.generate" a "true".

 

 !No me gusta que ~LasPalabrasSeAmontonenEnLosTitulos en los títulos de las páginas. ¿Puedo hacer algo al respecto?

 


diff --git a/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
index b67ea2a..331ef39 100644
--- a/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/fr/src/main/resources/InstallationTips.txt

@@ -73,9 +73,7 @@
 !Activer [RSS|http://blogspace.com/rss/]
 
 Dans votre fichier {{jspwiki.properties}}, vous devrez modifier le paramètre
-{{jspwiki.rss.generate}} à la valeur {{true}}. Vous devrez aussi y changer le paramètre
-{{jspwiki.baseURL}} qui donne l'URL complète de votre Wiki. Sinon, le générateur RSS ne
-saura pas vers où ses liens doivent pointer... :-)
+{{jspwiki.rss.generate}} à la valeur {{true}}.
 
 !Je n'aime pas les ~TitresTousCollesCommeCa. Qu'est-ce que je peux faire ?
 

diff --git a/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
index 9b029b4..ee5c78b 100644
--- a/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/it/src/main/resources/InstallationTips.txt

@@ -57,7 +57,7 @@
 

 !Abilitare il feed [RSS|http://blogspace.com/rss/]

 

-Nel file jspwiki.properties, dovete modificare la proprietà "jspwiki.rss.generate" a "true", e anche far si che la proprietà "jspwiki.baseURL" corrisponda al vostro Wiki.  Altrimenti il generatore RSS non avrà idea del come costruire i link ... :-)

+Nel file jspwiki.properties, dovete modificare la proprietà "jspwiki.rss.generate" a "true".

 

 !Non mi piace avere cose del tipo ~ThingsSquashedTogether nei titoli delle pagine. E' possibile cambiare questo comportamento?

 


diff --git a/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
index 2023db2..0dc21cd 100644
--- a/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/nl/src/main/resources/InstallationTips.txt

@@ -57,7 +57,7 @@
 

 ![RSS|http://blogspace.com/rss/] feed aanzetten

 

-In je  jspwiki.properties -file, moet je de "jspwiki.rss.generate" op "true" zetten, en ook de "jspwiki.baseURL" moet een valide waarde hebben. Anders kan RSS niet weten hoe de links er uit moeten zien....:-)

+In je  jspwiki.properties -file, moet je de "jspwiki.rss.generate" op "true" zetten.

 

 !Ik hou niet van ~DingenAanElkaarGeplakt in de pagina titels.  Wat nu?

 


diff --git a/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
index 6cb7265..de5a719 100644
--- a/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/pt_BR/src/main/resources/InstallationTips.txt

@@ -56,7 +56,7 @@
 

 !Habilitanto o [RSS|http://blogspace.com/rss/] feed

 

-No seu arquivo jspwiki.properties, você precisará de alterar o atributo "jspwiki.rss.generate" para "true" (verdadeiro), e também precisará alterar o atributo "jspwiki.baseURL" para apontar para a sua Wiki.  Se não fizer isso o gerador de RSS não conseguirá saber para onde os links devem ir... :-)

+No seu arquivo jspwiki.properties, você precisará de alterar o atributo "jspwiki.rss.generate" para "true" (verdadeiro).

 

 !Eu não gosto que as ~CoisasFiquemJuntas nos títulos das páginas.  O que eu posso fazer?

 


diff --git a/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
index 9177250..07b9b27 100644
--- a/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/ru/src/main/resources/InstallationTips.txt

@@ -63,8 +63,7 @@
 
 ! Разрешение канала [RSS|http://blogspace.com/rss/]
 
-В Вашем файле jspwiki.properties, Вы должны будете установить "jspwiki.rss.generate" в "true",
-и также установить "jspwiki.baseURL", чтобы указать на Вашу Wiki.
+В Вашем файле jspwiki.properties, Вы должны будете установить "jspwiki.rss.generate" в "true".
 Иначе генератор RSS не может выяснить, как его ссылки должны пойти... :-)
 
 ! Мне не нравится ~ThingsSquashedTogether в названиях страницы. Что я могу сделать?

diff --git a/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt b/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
index d40ddc1..ab973af 100644
--- a/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
+++ b/jspwiki-wikipages/zh_CN/src/main/resources/InstallationTips.txt
Binary files differ