jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r643727 - /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/
Date Wed, 02 Apr 2008 04:10:34 GMT
Author: ajaquith
Date: Tue Apr  1 21:10:32 2008
New Revision: 643727

URL: http://svn.apache.org/viewvc?rev=643727&view=rev
Log:
Merged with trunk 2.7.0-svn-2.

Added:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/Community.txt
      - copied unchanged from r643632, incubator/jspwiki/trunk/src/wikipages/Community.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/CopyrightNotice.txt
      - copied unchanged from r643632, incubator/jspwiki/trunk/src/wikipages/CopyrightNotice.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/InstallationTips.txt
      - copied unchanged from r643632, incubator/jspwiki/trunk/src/wikipages/InstallationTips.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/PageAlias.txt
      - copied unchanged from r643632, incubator/jspwiki/trunk/src/wikipages/PageAlias.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/TitleBox.txt
      - copied unchanged from r643632, incubator/jspwiki/trunk/src/wikipages/TitleBox.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/WikiName.txt   (props
changed)
      - copied unchanged from r643632, incubator/jspwiki/trunk/src/wikipages/WikiName.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/WikiWiki.txt   (props
changed)
      - copied unchanged from r643632, incubator/jspwiki/trunk/src/wikipages/WikiWiki.txt
Modified:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/About.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForPageChanges.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForUserProfiles.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/LeftMenu.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/LoginPageHelp.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/Main.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/SearchPageHelp.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/TextFormattingRules.txt

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/About.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/About.txt?rev=643727&r1=643726&r2=643727&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForPageChanges.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForPageChanges.txt?rev=643727&r1=643726&r2=643727&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForPageChanges.txt
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForPageChanges.txt
Tue Apr  1 21:10:32 2008
@@ -1,3 +1,3 @@
-Page edits require approval before they become active. Your request has been submitted and
will approved or rejected.
-
+Page edits require approval before they become active. Your request has been submitted and
will approved or rejected.
+
 You can check on the status of your request by logging in (if you aren't already) and clicking
on the "Workflow" link.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForUserProfiles.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForUserProfiles.txt?rev=643727&r1=643726&r2=643727&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForUserProfiles.txt
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/ApprovalRequiredForUserProfiles.txt
Tue Apr  1 21:10:32 2008
@@ -1,3 +1,3 @@
-New user profiles require approval before they become active. Your request has been submitted
and will approved or rejected. 
-
+New user profiles require approval before they become active. Your request has been submitted
and will approved or rejected. 
+
 If you supplied an e-mail address, one of the wiki administrators will let you know when
your account has been approved. Alternatively, you might want to come back later and see if
you can log in.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/LeftMenu.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/LeftMenu.txt?rev=643727&r1=643726&r2=643727&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/LoginPageHelp.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/LoginPageHelp.txt?rev=643727&r1=643726&r2=643727&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/LoginPageHelp.txt
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/LoginPageHelp.txt
Tue Apr  1 21:10:32 2008
@@ -1,4 +1,4 @@
-Here's a brief help on how to login to __[{$applicationname}]__. This text is [here|LoginHelp].
\\
+Here's a brief help on how to login to __[{$applicationname}]__. This text is [here|LoginPageHelp].
\\
 You can read more about JSPWiki's security features on the [documentation pages|http://doc.jspwiki.org/2.4/wiki/Security].
 
 !!  Login

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/Main.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/Main.txt?rev=643727&r1=643726&r2=643727&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/SearchPageHelp.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/SearchPageHelp.txt?rev=643727&r1=643726&r2=643727&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/TextFormattingRules.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/TextFormattingRules.txt?rev=643727&r1=643726&r2=643727&view=diff
==============================================================================
Binary files - no diff available.

Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/WikiName.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/WikiWiki.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message