You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ba...@apache.org on 2005/11/14 06:10:57 UTC
svn commit: r344038 - in /incubator/roller/trunk: docs/installguide/
docs/userguide/ docs/userguide/old/ metadata/xdoclet/ web/WEB-INF/classes/
Author: bayard
Date: Sun Nov 13 21:10:52 2005
New Revision: 344038
URL: http://svn.apache.org/viewcvs?rev=344038&view=rev
Log:
adminstrator to administrator in numerous locations
Modified:
incubator/roller/trunk/docs/installguide/installguide.wiki
incubator/roller/trunk/docs/userguide/old/roller-ug-0.9.6.html
incubator/roller/trunk/docs/userguide/old/roller-ug.html
incubator/roller/trunk/docs/userguide/userguide.wiki
incubator/roller/trunk/metadata/xdoclet/web-security.xml
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources_de.properties
Modified: incubator/roller/trunk/docs/installguide/installguide.wiki
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/docs/installguide/installguide.wiki?rev=344038&r1=344037&r2=344038&view=diff
==============================================================================
--- incubator/roller/trunk/docs/installguide/installguide.wiki (original)
+++ incubator/roller/trunk/docs/installguide/installguide.wiki Sun Nov 13 21:10:52 2005
@@ -225,7 +225,7 @@
!!Specify the Administrative user
-Before you start Roller, you need to specify the username of the user (or users) who will be the adminstrator of the Roller site. This adminstrator will be the only one who can access the Admin and Config pages in the Roller Editor UI.
+Before you start Roller, you need to specify the username of the user (or users) who will be the administrator of the Roller site. This administrator will be the only one who can access the Admin and Config pages in the Roller Editor UI.
Do this by editing the file roller/WEB-INF/roller-config.xml, an XML file. Look for the lines shown below and when you have found then, carefully change the string adminUser to the name of the username that you will use as your Roller administrator, or to a comma-sepatared list of users who will be your Roller administrators.
Modified: incubator/roller/trunk/docs/userguide/old/roller-ug-0.9.6.html
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/docs/userguide/old/roller-ug-0.9.6.html?rev=344038&r1=344037&r2=344038&view=diff
==============================================================================
--- incubator/roller/trunk/docs/userguide/old/roller-ug-0.9.6.html (original)
+++ incubator/roller/trunk/docs/userguide/old/roller-ug-0.9.6.html Sun Nov 13 21:10:52 2005
@@ -474,7 +474,7 @@
<h3>Admin</h3>
<h3></h3>
The admin screen is only available to Roller administrators. It allows an
-adminstrator to delete a user account from Roller.<br>
+administrator to delete a user account from Roller.<br>
<br>
<h2><a name="macros_for_page"></a>Macros intended for use on any page template</h2>
<p>Macros tell Roller where to place the dynamic parts of your web pages.
Modified: incubator/roller/trunk/docs/userguide/old/roller-ug.html
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/docs/userguide/old/roller-ug.html?rev=344038&r1=344037&r2=344038&view=diff
==============================================================================
--- incubator/roller/trunk/docs/userguide/old/roller-ug.html (original)
+++ incubator/roller/trunk/docs/userguide/old/roller-ug.html Sun Nov 13 21:10:52 2005
@@ -510,7 +510,7 @@
<h3>Admin</h3>
<h3></h3>
The admin screen is only available to Roller administrators. It allows an
-adminstrator to delete a user account from Roller.<br>
+administrator to delete a user account from Roller.<br>
<br>
<h2><a name="macros_for_page"></a>Macros intended for use on any page template</h2>
<p>Macros tell Roller where to place the dynamic parts of your web pages.
Modified: incubator/roller/trunk/docs/userguide/userguide.wiki
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/docs/userguide/userguide.wiki?rev=344038&r1=344037&r2=344038&view=diff
==============================================================================
--- incubator/roller/trunk/docs/userguide/userguide.wiki (original)
+++ incubator/roller/trunk/docs/userguide/userguide.wiki Sun Nov 13 21:10:52 2005
@@ -695,7 +695,7 @@
\\
!!![#9] Configuration and Administration of Roller
-If your friendly Roller adminstrator has added your username to the list of admin users in roller-config.xml, then you will have access to the Roller adminstration menus __Website:Admin__ and __Website:Config__. Let's discuss what you can do with those menus.
+If your friendly Roller administrator has added your username to the list of admin users in roller-config.xml, then you will have access to the Roller adminstration menus __Website:Admin__ and __Website:Config__. Let's discuss what you can do with those menus.
Modified: incubator/roller/trunk/metadata/xdoclet/web-security.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/web-security.xml?rev=344038&r1=344037&r2=344038&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/web-security.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/web-security.xml Sun Nov 13 21:10:52 2005
@@ -43,7 +43,7 @@
<http-method>GET</http-method>
</web-resource-collection>
<auth-constraint>
- <description>Editors and Adminstrators only</description>
+ <description>Editors and Administrators only</description>
<role-name>admin</role-name>
<role-name>editor</role-name>
</auth-constraint>
Modified: incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties?rev=344038&r1=344037&r2=344038&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties Sun Nov 13 21:10:52 2005
@@ -378,7 +378,7 @@
your username. To resolve this problem, logout and login again with your \
correct username.
error.permissionDenied.reason3=Your blog server's database connection is \
-misconfigured. To resolve this problem, see your system adminstrator.
+misconfigured. To resolve this problem, see your system administrator.
#-------------------------------------------------------------- Struts Validator
@@ -1119,7 +1119,7 @@
userRegister.tip.userName=A short one word username for your user account.\
Please limit it to simple ASCII alphanumeric characters (a-z, A-Z and 0-9) \
and do not use HTML.
-userRegister.tip.email=Please enter valid email address, the site adminstrator \
+userRegister.tip.email=Please enter valid email address, the site administrator \
may disable your account if he/she cannot reach you via email.
userRegister.tip.timeZone=Your prefered timezone.
userRegister.tip.locale=Your prefered locale.
Modified: incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources_de.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources_de.properties?rev=344038&r1=344037&r2=344038&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources_de.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources_de.properties Sun Nov 13 21:10:52 2005
@@ -37,7 +37,7 @@
error.permissionDenied.prompt=Mögliche Gründe:
error.permissionDenied.reason1=You tried to save an object from "stale" web page, left by an earlier login under a different user account.
error.permissionDenied.reason2=You logged in using incorrect capitalization of your username. To resolve this problem, logout and login again with your correct username.
-error.permissionDenied.reason3=Your blog server's database connection is misconfigured. To resolve this problem, see your system adminstrator.
+error.permissionDenied.reason3=Your blog server's database connection is misconfigured. To resolve this problem, see your system administrator.
# ----------------------------------------------------------------- error.jsp