Author: metskem
Date: Sun Aug 17 04:26:49 2008
New Revision: 686599
URL: http://svn.apache.org/viewvc?rev=686599&view=rev
Log:
2.7.0-alpha-20 [JSPWIKI-340] updated (english) corepages and README, mostly
editorial changes
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/doc/Compiling.txt
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/wikipages/en/Community.txt
incubator/jspwiki/trunk/src/wikipages/en/InstallationTips.txt
incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt
incubator/jspwiki/trunk/src/wikipages/en/LeftMenuFooter.txt
incubator/jspwiki/trunk/src/wikipages/en/LoginHelp.txt
incubator/jspwiki/trunk/src/wikipages/en/Main.txt
incubator/jspwiki/trunk/src/wikipages/en/PageIndex.txt
incubator/jspwiki/trunk/src/wikipages/en/RejectedMessage.txt
incubator/jspwiki/trunk/src/wikipages/en/WikiEtiquette.txt
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 17 04:26:49 2008
@@ -1,3 +1,14 @@
+2008-08-17 Harry Metske <[EMAIL PROTECTED]>
+
+ * 2.7.0-alpha-20
+
+ * [JSPWIKI-340] updated (english) corepages and README, mostly
editorial changes,
+ a brief summary :
+ - Java 5.0 is now a requirement for compiling (instead 1.4.2)
+ - Servlet API 2.2 is mentioned, is this still enough ? (I haven't
checked)
+ - Removed dead link to
tjworld.net/help/kb/0001_iis6-Tomcat5-JK2.html#conConnector
+ - Removed links to JSPWiki 2.2 , 2.3 and 2.4 documentation
+
2008-08-16 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.7.0-alpha-19
Modified: incubator/jspwiki/trunk/doc/Compiling.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/Compiling.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/doc/Compiling.txt (original)
+++ incubator/jspwiki/trunk/doc/Compiling.txt Sun Aug 17 04:26:49 2008
@@ -1,6 +1,5 @@
-Since you have the source, you'll probably want to know how to compile
-it.
+Since you have the source, you'll probably want to know how to compile it.
Some of JSPWiki is in the form of JSP pages, so you don't need to
compile them: the JSP container will take care of that. However,
@@ -11,10 +10,9 @@
You'll need the following programs:
-- J2SDK 1.4 (I use the one from Sun Microsystems; I haven't tested any
- others.)
+- J2SDK 5.0 (I use the one from Sun Microsystems; I haven't tested any others.)
- Jakarta Ant 1.5 (available from http://jakarta.apache.org/ant)
-- servlet API 2.2 (servlet.jar, available from Sun.)
+- Servlet API 2.2 (servlet.jar, available from Sun Microsystems.)
- JUnit 3.7 (from www.junit.org, required for running tests)
@@ -37,7 +35,7 @@
ant jar : builds the JSPWiki.jar into build/
You can customize your compilation by changing the contents of the
-build.properties -file, or better yet, make your own compilation
+build.properties file, or better yet, make your own compilation
script where you override the build.properties-property. For example,
to use your own build.properties-file called "my.properties", make a
small shell script and call it "my_build.sh":
@@ -68,5 +66,3 @@
however, that to keep the archive size down, I haven't included them
in the source distribution. You may need to copy them by hand from
somewhere, or the binary distribution.
-
-
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Aug 17
04:26:49 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "19";
+ public static final String BUILD = "20";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/wikipages/en/Community.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/Community.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/Community.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/Community.txt Sun Aug 17 04:26:49
2008
@@ -15,7 +15,17 @@
This is the list for JSPWiki developers. Do not join if you fear geek-talk.
The jspwiki-dev list is hosted at Apache, so you join by sending an email to
[EMAIL PROTECTED]|mailto:[EMAIL PROTECTED] The list archives are at
[http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/|http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/]
-The old JSPWiki-dev archives are [also
available|http://www.ecyrd.com/pipermail/jspwiki-dev/], if you want to peruse
some interesting issues.
+!JSPWiki-commits
+
+If you subscribe to this list you will get emailed when (a committer) commits
new or changed files to the SVN repository.
+The jspwiki-commits list is hosted at Apache, join it by sending an email to
[EMAIL PROTECTED]|mailto:[EMAIL PROTECTED]
+The list archives are at
http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-commits/
+
+!Unsubscribing
+
+Unsubscribing is equally easy: you can just send an email to
jspwiki-<user|dev|commits>[EMAIL PROTECTED] from the same email address that
you originally subscribed from.
+
+The old JSPWiki-dev archives (up until Oct. 2007) are [also
available|http://www.ecyrd.com/pipermail/jspwiki-dev/], if you want to peruse
some interesting issues.
!! Other resources
Modified: incubator/jspwiki/trunk/src/wikipages/en/InstallationTips.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/InstallationTips.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/InstallationTips.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/InstallationTips.txt Sun Aug 17
04:26:49 2008
@@ -5,17 +5,13 @@
!Wiki configuration
The least painful approach to defining the location of your Wiki files is to
have them located at the same drive as your Tomcat (or other web server)
installation, and define the location in Unix format. For example, files in
C:\JSPWiki\files are defined in the configuration file as /JSPWiki/files.
-Make also sure to change the setting for {{log4j.appender.~FileLog.File}} in
{{jspwiki.properties}} if you want a log-file to be created. This setting is
hidden quite well near the end of the config-file. The format is the same as
the {{jspwiki.fileSystemProvider.pageDir}}-setting, i.e. backslashes must be
duplicated.
-
-!How To Link Tomcat 5 with IIS 6 on Windows 2003 Server using the JK2 ajp13
connector
-
-Comprehensive illustrated guide at
[http://tjworld.net/help/kb/0001_iis6-Tomcat5-JK2.html#conConnector]
+Also make sure you change the setting for {{log4j.appender.~FileLog.File}} in
{{jspwiki.properties}} if you want a logfile to be created. This setting is
hidden quite well near the end of the config-file. The format is the same as
the {{jspwiki.fileSystemProvider.pageDir}}-setting, i.e. backslashes must be
duplicated.
!! UTF-8 Issues
-If you are having problems with Tomcat 5.x and JSPWiki with UTF-8, please note
the following!
+If you are having problems with Tomcat 5.x (or higher) and JSPWiki with UTF-8,
please note the following!
-You have to edit server.xml of Tomcat (is in the conf-directory of Tomcat).
Please add to
+You have to edit the server.xml of Tomcat (located in the conf-directory of
Tomcat). Please add to
{{{<Connector port="8080"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
@@ -25,7 +21,7 @@
the term '{{{URIEncoding="UTF-8"}}}'.
-It should look like that:
+It should look like this:
{{{
<Connector port="8080"
@@ -36,22 +32,9 @@
URIEncoding="UTF-8"/>
}}}
-Remember that if you use mod_jk, you should define the {{URIEncoding}} for the
AJK Connector, too.
-
-------
-
-WARNING: Our Wikis running on 2.2.33 with jspwiki.properties set to UTF-8 did
not display pages anymore that contained Umlaute after setting this. I had to
disable the URIEncoding again.
-
---[Christoph Sauer|http://www.jspwiki.org/wiki/ChristophSauer] 2-Sep.2006
-------
-Using jk connector and Apache needs extra settings.
-
-This is my successful configuration.
-(Suse10.1 / Tomcat5.0 and 5.5 / JSPWiki v2.4.87)
+Remember that if you use mod_jk, you should define the {{URIEncoding}} for the
JK Connector too :
-/etc/tomcat5/base/server.xml (based on "server-minimal.xml" by SuSE)
{{{
-<Server port=8005 shutdown="SHUTDOWN">
.........
<service name="Catalina">
<connector port="8080" />
@@ -59,9 +42,7 @@
<connector protocol="AJP/1.3" uriencoding="UTF-8" port="8009" />
.........
</service>
-</server>
}}}
---Kei Watanabe 10-jan.2007 / 21 Dec.2007
!! Other tips
@@ -69,7 +50,7 @@
The menu on the left hand side (over there <-----) is just a standard Wiki
page, called [LeftMenu].
-If you (the administrator) don't want anyone else to modify it, you can always
edit [LeftMenu], then make the page read-only on the hard drive itself ;-).
+If you (the administrator) don't want anyone else to modify it, you can always
edit [LeftMenu], and then make the page read-only by putting an ACL on it.
The lower part of the left hand side is similarly called [LeftMenuFooter], and
it is fully editable as well.
Modified: incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/LeftMenu.txt Sun Aug 17 04:26:49
2008
@@ -8,4 +8,4 @@
* [Unused pages|UnusedPages]
* [Undefined pages|UndefinedPages]
* [Page Index]
-
+* [SystemInfo]
Modified: incubator/jspwiki/trunk/src/wikipages/en/LeftMenuFooter.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/LeftMenuFooter.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/LeftMenuFooter.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/LeftMenuFooter.txt Sun Aug 17
04:26:49 2008
@@ -1,2 +1,2 @@
-
+----
Modified: incubator/jspwiki/trunk/src/wikipages/en/LoginHelp.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/LoginHelp.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/LoginHelp.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/LoginHelp.txt Sun Aug 17 04:26:49
2008
@@ -1,5 +1,5 @@
Here's a brief help on how to login to __[{$applicationname}]__. This text is
[here|LoginHelp]. \\
-You can read more about JSPWiki's security features on the [documentation
pages|http://doc.jspwiki.org/2.4/wiki/Security].
+You can read more about JSPWiki's security features on the [documentation
pages|http://doc.jspwiki.org/2.8/wiki/Security].
!! Login
@@ -7,12 +7,12 @@
|| Status || Description || The User greeting Shows..
| Anonymous | User not logged in, and has not supplied a cookie | "G'day
(anonymous guest)"
-| Asserted | User's browser contains a cookie called {{~JSPWikiAssertedName}}
| "G'Day, ''username'' (not logged in)"
-| Authenticated | User logged in with a login id and password | "G'Day,
''username'' (authenticated)"
+| Asserted | User's browser contains a cookie called {{~JSPWikiAssertedName}}
| "G'day, ''username'' (not logged in)"
+| Authenticated | User logged in with a login id and password | "G'day,
''username'' (authenticated)"
Depending on the default security policy and page access controls in place,
users may (or may not) be required to authenticate.
-When a user decides to log in â or is challenged to do so by a page access
control or security policy â he or she sees a standard web form with a
username field and a masked password field. After receiving the submitted web
form, JSPWiki attempts to log the user.
+When a user decides to log in â or is challenged to do so by a page access
control or security policy â he or she sees a standard web form with a
username field and a masked password field. After receiving the submitted web
form, JSPWiki attempts to log the user in.
!! Lost password
@@ -30,8 +30,8 @@
* The user's desired "wiki name" (e.g., JanneJalkanen). You can use this name
in Access Control Lists or Wiki Groups
* E-mail address. This can be used when you need to reset your password. (see
Lost Password)
-If container-managed authentication is in force, the user ID will not be
editable; the container will supply this value.
+If container-managed authentication is used, the user ID will not be editable;
the container will supply this value.
When the user saves the profile, JSPWiki checks to make sure that the new user
id, wiki name and full name aren't already used by someone else. If so, the
user is given the opportunity to choose different values.
-After a user creates a wiki profile, he or she may edit it at a later date via
the ''My Prefs'' link. By default, users must be authenticated to edit their
own profiles.
+After a user creates a wiki profile, he or she may edit it at a later time via
the ''My Prefs'' link. By default, users must be authenticated to edit their
own profiles.
Modified: incubator/jspwiki/trunk/src/wikipages/en/Main.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/Main.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/Main.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/Main.txt Sun Aug 17 04:26:49 2008
@@ -20,9 +20,6 @@
* For all of the Wiki markup features, see [TextFormattingRules].
* Entry point for full
[JSPWikiDocumentation|http://www.jspwiki.org/wiki/JSPWikiDocumentation]
** [JSPWiki 2.6 New Features|http://www.jspwiki.org/wiki/NewIn2.6].
-** [JSPWiki 2.4.x|http://doc.jspwiki.org/2.4].
([Security|http://doc.jspwiki.org/2.4/wiki/Security])
-** [Security2.3Howto|http://www.jspwiki.org/wiki/Security2.3Howto]
-** [JSPWiki 2.2.x|http://doc.jspwiki.org/2.2].
!Miscellaneous
Modified: incubator/jspwiki/trunk/src/wikipages/en/PageIndex.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/PageIndex.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/PageIndex.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/PageIndex.txt Sun Aug 17 04:26:49
2008
@@ -1,4 +1,4 @@
-This is a list of all pages in this Wiki.
+This is an alphabetical list of all pages in this Wiki.
----
Modified: incubator/jspwiki/trunk/src/wikipages/en/RejectedMessage.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/RejectedMessage.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/RejectedMessage.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/RejectedMessage.txt Sun Aug 17
04:26:49 2008
@@ -1,4 +1,4 @@
-Your edit has been rejected due to the following reason:
+Your edit has been rejected for to the following reason:
%%(padding: 4px; margin: 3em; border: 1px inset; background: #eeeeee)
[{$message}]
%%
Modified: incubator/jspwiki/trunk/src/wikipages/en/WikiEtiquette.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/en/WikiEtiquette.txt?rev=686599&r1=686598&r2=686599&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/en/WikiEtiquette.txt (original)
+++ incubator/jspwiki/trunk/src/wikipages/en/WikiEtiquette.txt Sun Aug 17
04:26:49 2008
@@ -13,7 +13,7 @@
* You are free to contribute anonymously, but it is preferred that you sign
your comments with your name (or handle). It is common to prepend the signature
with '--' like this: ''-- [Janne Jalkanen]'' (While you're at it, you are free
to create your own wikipage and tell us about yourself.)
* A good way is also to put your name first, like this: ''[Janne Jalkanen] :
I'd like to say that...''
-* Think before you comment. [WikiWiki] is not a high-speed conversation
board. It's not a news server either. What you say will stay here forever
(yeah, we do take backups) for everyone to see and comment.
+* Think before you comment. [WikiWiki] is not a high-speed conversation
board. It's not a news server either. What you say will stay here forever
(if you delete your comment, it is still in the previous version of the page)
for everyone to see and comment.
!!Creating WikiNames
* A good [WikiName] is short and descriptive. If the name is logical and easy
many more people will link to it.
