Item109: TWikiGroups -> WikiGroups

git-svn-id: http://svn.foswiki.org/trunk@682 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 15, 2008 · 838c6b5 · 838c6b5
1 parent 26958e0
commit 838c6b5
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 20 deletions.
diff --git a/PatternSkin/data/TWiki/WebLeftBar.txt b/PatternSkin/data/TWiki/WebLeftBar.txt
@@ -3,7 +3,7 @@
 
    * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][ %ICON{"home"}% <nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b>
    * %IF{"istopic '%USERSWEB%.%WIKIUSERSTOPIC%'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntUSERSWEB$percnt.$percntWIKIUSERSTOPIC$percnt][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
-   * [[%USERSWEB%.TWikiGroups][ %ICON{"group"}% %MAKETEXT{"Groups"}%]]
+   * [[%USERSWEB%.WikiGroups][ %ICON{"group"}% %MAKETEXT{"Groups"}%]]
    * [[WebTopicList][ %ICON{"index"}% %MAKETEXT{"Index"}%]]
    * [[%INCLUDINGWEB%.WebSearch][ %ICON{"searchtopic"}% %MAKETEXT{"Search"}%]]
    * [[WebChanges][ %ICON{"changes"}% %MAKETEXT{"Changes"}%]]

diff --git a/TopicUserMappingContrib/data/Main/AdminGroup.txt b/TopicUserMappingContrib/data/Main/AdminGroup.txt
@@ -25,6 +25,6 @@ If you haven't previously set up an administrator, follow these steps:
 <sticky></div></sticky>
 %IF{"(NOT defined GROUP) OR $GROUP = ''" then="" else="-->"}%
 
-__Related topics:__ [[%WIKIUSERSTOPIC%]], [[AdminUser]], [[TWikiGroups]], [[%SYSTEMWEB%.AccessControl][AccessControl]]
+__Related topics:__ [[%WIKIUSERSTOPIC%]], [[AdminUser]], [[WikiGroups]], [[%SYSTEMWEB%.AccessControl][AccessControl]]
 
 
diff --git a/TopicUserMappingContrib/data/Main/NobodyGroup.txt b/TopicUserMappingContrib/data/Main/NobodyGroup.txt
@@ -8,4 +8,4 @@
 
 Used to prevent dangerous actions e.g. renaming [[%SYSTEMWEB%.DefaultPreferences][DefaultPreferences]] - put !NobodyGroup as the only group allowed to rename a topic and it can't be renamed.
 
-__Related topics:__ [[%WIKIUSERSTOPIC%]], [[TWikiGroups]], [[%SYSTEMWEB%.AccessControl][AccessControl]]
+__Related topics:__ [[%WIKIUSERSTOPIC%]], [[WikiGroups]], [[%SYSTEMWEB%.AccessControl][AccessControl]]
diff --git a/TopicUserMappingContrib/data/Main/UserListHeader.txt b/TopicUserMappingContrib/data/Main/UserListHeader.txt
@@ -1,2 +1,2 @@
 %META:TOPICINFO{author="ProjectContributor" date="1127307283" format="1.1" version="$Rev$"}%
-__Related topics:__ %SEARCH{"^(WikiUsers|TWikiGroups|UserList$|UserListBy)" type="regex" web="%MAINWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%
+__Related topics:__ %SEARCH{"^(WikiUsers|WikiGroups|UserList$|UserListBy)" type="regex" web="%MAINWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%
diff --git a/core/data/Main/AdminUser.txt b/core/data/Main/AdminUser.txt
@@ -24,7 +24,7 @@ with =$TWiki::cfg{Password}= and then set it again by saving your settings in =c
    * a configure password (otherwise the Admin login is automatically disabled.)
    * If your TWiki is configured to use !ApacheLoginManager, you will need to log in as a valid user first.
 
-__Related topics:__ [[%WIKIUSERSTOPIC%]], [[AdminGroup]], [[TWikiGroups]], [[%SYSTEMWEB%.AccessControl][AccessControl]]
+__Related topics:__ [[%WIKIUSERSTOPIC%]], [[AdminGroup]], [[WikiGroups]], [[%SYSTEMWEB%.AccessControl][AccessControl]]
 ---
 
 
diff --git a/core/data/Main/WebHome.txt b/core/data/Main/WebHome.txt
@@ -14,7 +14,7 @@ and [[%USERSWEB%.SitePreferences]]). Replace this text with a description of you
    * [[%SYSTEMWEB%.WelcomeGuest][WelcomeGuest]] - for first time visitors
    * [[%SYSTEMWEB%.TWikiRegistration][Registration]] - become a <nop>%WIKITOOLNAME% user
    * [[%WIKIUSERSTOPIC%]] - list of users of this <nop>%WIKITOOLNAME% site
-   * [[TWikiGroups]] - list of groups used for access control
+   * [[WikiGroups]] - list of groups used for access control
    * <input class="twikiInputField" type="text" name="search" size="22" />&nbsp;<input type="submit" class="twikiSubmit" value="Search" /> - [[WebSearchAdvanced][advanced search]]
    * [[WebTopicList]] - all topics in alphabetical order
    * [[WebChanges]] - recent topic changes in this web

diff --git a/core/data/Main/WebPreferences.txt b/core/data/Main/WebPreferences.txt
@@ -11,9 +11,9 @@ The following settings are __web preferences__ of the [[%WEB%.%HOMETOPIC%][%WEB%
 These settings override the defaults for this web only. See [[%SYSTEMWEB%.DefaultPreferences#DefaultWebPreferences][full list of defaults with explanation]].
 
    * Web settings:
-      * Set WEBTOPICLIST = [[%WIKIUSERSTOPIC%][Users]] %SEP% [[TWikiGroups][Groups]] %SEP% [[WebChanges][Changes]] %SEP% [[WebIndex][Index]] %SEP% [[WebSearch][Search]] %SEP% Go <input type="text" name="topic" size="16" />
+      * Set WEBTOPICLIST = [[%WIKIUSERSTOPIC%][Users]] %SEP% [[WikiGroups][Groups]] %SEP% [[WebChanges][Changes]] %SEP% [[WebIndex][Index]] %SEP% [[WebSearch][Search]] %SEP% Go <input type="text" name="topic" size="16" />
       * Set WEBBGCOLOR = #FFEFA6
-      * Set SITEMAPWHAT = Welcome to <nop>%WIKITOOLNAME%... [[%WEB%.%WIKIUSERSTOPIC%][Users]], [[%WEB%.TWikiGroups][Groups]]
+      * Set SITEMAPWHAT = Welcome to <nop>%WIKITOOLNAME%... [[%WEB%.%WIKIUSERSTOPIC%][Users]], [[%WEB%.WikiGroups][Groups]]
       * Set SITEMAPUSETO = ...see who is registered on this TWiki
       * Set SITEMAPLIST = on
 

diff --git a/core/data/Main/TWikiGroups.txt → core/data/Main/WikiGroups.txt b/core/data/Main/TWikiGroups.txt → core/data/Main/WikiGroups.txt
@@ -1,5 +1,5 @@
 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 15171 $"}%
----+ TWiki Groups
+---+ Wiki Groups
 
 These groups can be used to define fine grained [[%SYSTEMWEB%.AccessControl][AccessControl]] in <nop>%WIKITOOLNAME%:
 

diff --git a/core/data/TWiki/AccessControl.txt b/core/data/TWiki/AccessControl.txt
@@ -51,7 +51,7 @@ The default visitor name is %USERSWEB%.WikiGuest. This is the non-authenticated
 
 The following describes the standard TWiki support for groups. Your local TWiki may have an alternate group mapping manager installed. Check with your Wiki administrator if you are in doubt.
 
-Groups are defined by group topics located in the ==%USERSWEB%== web. To create a new group, visit  %USERSWEB%.TWikiGroups and enter the name of the new group ending in ==Group== into the "new group" form field. This will create a new group topic with two important settings:
+Groups are defined by group topics located in the ==%USERSWEB%== web. To create a new group, visit  %USERSWEB%.WikiGroups and enter the name of the new group ending in ==Group== into the "new group" form field. This will create a new group topic with two important settings:
    * ==Set <nop>GROUP = &lt; list of Users and/or Groups &gt;==
    * ==Set <nop>ALLOWTOPICCHANGE = &lt; list of Users and/or Groups &gt;==
 

diff --git a/core/data/TWiki/EditingShorthand.txt b/core/data/TWiki/EditingShorthand.txt
@@ -375,7 +375,7 @@ escaped:
 
 [[wiki syntax]]
 
-[[%USERSWEB%.TWiki groups]]
+[[%USERSWEB%.Wiki groups]]
 
 escaped:
 ![[wiki syntax]]

diff --git a/core/data/TWiki/TwentyMinuteTutorial.txt b/core/data/TWiki/TwentyMinuteTutorial.txt
@@ -24,7 +24,7 @@ To edit topics, you need to have a TWiki account.
 
 ---++ 4. Check out TWiki users, groups.
    * Go to the %USERSWEB%.%WIKIUSERSTOPIC% topic; it has a list of all users of TWiki. Your WikiName will be in this list after you register.
-   * Go to the %USERSWEB%.TWikiGroups topic in the %USERSWEB% web; it has a list of groups which can be used to define fine grained AccessControl in TWiki.
+   * Go to the %USERSWEB%.WikiGroups topic in the %USERSWEB% web; it has a list of groups which can be used to define fine grained AccessControl in TWiki.
 
 ---++ 5. Test the page controls...
 The color-coded control strips at the top and/or bottom of the page has a collection of action links. Different skins show different links, but most will have some or all of::

diff --git a/core/data/TWiki/VarGROUPS.txt b/core/data/TWiki/VarGROUPS.txt
@@ -4,7 +4,7 @@
 ---+++ GROUPS -- a formatted list of groups
    * Expands to a formatted list of user groups in your %WIKITOOLNAME%.
    * Syntax: =%<nop>GROUPS%=
-   * The variable is intended to be used in %USERSWEB%.TWikiGroups, to allow a
+   * The variable is intended to be used in %USERSWEB%.WikiGroups, to allow a
      group listing for various user mapping managers.
    * Related: [[%IF{"'%INCLUDINGTOPIC%'='TWikiVariables'" then="#"}%VarREMOTEUSER][REMOTE_USER]], [[%IF{"'%INCLUDINGTOPIC%'='TWikiVariables'" then="#"}%VarUSERINFO][USERINFO]], [[%IF{"'%INCLUDINGTOPIC%'='TWikiVariables'" then="#"}%VarUSERNAME][USERNAME]], [[%IF{"'%INCLUDINGTOPIC%'='TWikiVariables'" then="#"}%VarWIKIUSERNAME][WIKIUSERNAME]], [[%IF{"'%INCLUDINGTOPIC%'='TWikiVariables'" then="#"}%VarWIKIUSERSTOPIC][WIKIUSERSTOPIC]]
 
diff --git a/core/data/TWiki/VarUSERSWEB.txt b/core/data/TWiki/VarUSERSWEB.txt
@@ -2,7 +2,7 @@
 %META:TOPICPARENT{name="TWikiVariables"}%
 #VarUSERSWEB
 ---+++ USERSWEB -- name of users web
-   * The web containing individual user topics, %USERSWEB%.TWikiGroups, and customised site-wide preferences.
+   * The web containing individual user topics, %USERSWEB%.WikiGroups, and customised site-wide preferences.
    * Syntax: =%<nop>USERSWEB%=
    * Expands to: =%USERSWEB%=
    * Related: [[%IF{"'%INCLUDINGTOPIC%'='TWikiVariables'" then="#"}%VarSYSTEMWEB][SYSTEMWEB]]
diff --git a/core/lib/TWiki.spec b/core/lib/TWiki.spec
@@ -325,7 +325,7 @@ $TWiki::cfg{AdminUserWikiName} = 'AdminUser';
 # **STRING 20 EXPERT**
 # Group of users that can use special action=repRev and action=delRev
 # on =save= and ALWAYS have edit powers. See %SYSTEMWEB%.CompleteDocumentation
-# for an explanation of twiki groups. This user will also run all the
+# for an explanation of wiki groups. This user will also run all the
 # standard cron jobs, such as statistics and mail notification.
 # The default value "AdminGroup" is used everywhere in TWiki to
 # protect important settings so you would need a really special reason to

diff --git a/core/lib/TWiki/Contrib/core/MANIFEST b/core/lib/TWiki/Contrib/core/MANIFEST
@@ -59,7 +59,7 @@ bin/viewfile 0555
 data/Main/ProjectContributor.txt 0644
 data/Main/SitePreferences.txt 0644
 data/Main/AdminUser.txt 0644
-data/Main/TWikiGroups.txt 0644
+data/Main/WikiGroups.txt 0644
 data/Main/WikiGuest.txt 0644
 data/Main/UnknownUser.txt 0644
 data/Main/WebAtom.txt 0644

diff --git a/core/lib/TWiki/LoginManager/TemplateLogin.pm b/core/lib/TWiki/LoginManager/TemplateLogin.pm
@@ -124,7 +124,7 @@ login cookie being preserved across browser sessions.
 The password handler is expected to return a perl true value if the password
 is valid. This return value is stored in a session variable called
 VALIDATION. This is so that password handlers can return extra information
-about the user, such as a list of TWiki groups stored in a separate
+about the user, such as a list of Wiki groups stored in a separate
 database, that can then be displayed by referring to
 %<nop>SESSION_VARIABLE{"VALIDATION"}%
 

diff --git a/core/templates/messages.tmpl b/core/templates/messages.tmpl
@@ -462,14 +462,14 @@ __%MAKETEXT{"Note:"}%__
 
 %MAKETEXT{"Contact [_1] if you have any questions." args="<a href=\"mailto:%WIKIWEBMASTER%?subject=%ENCODE{"%PARAM1% access denied for '%WEB%.%TOPIC%'"}%\">%WIKIWEBMASTER%</a>"}%
 
-__%MAKETEXT{"Related topics:"}%__ %USERSWEB%.TWikiGroups, %SYSTEMWEB%.AccessControl %TMPL:END%
+__%MAKETEXT{"Related topics:"}%__ %USERSWEB%.WikiGroups, %SYSTEMWEB%.AccessControl %TMPL:END%
 %TMPL:DEF{"only_group"}%
 %MAKETEXT{"Only members of the [_1] are allowed to perform this action." args="%PARAM1%"}%
 
 %MAKETEXT{"Contact [_1] if you have any questions." args="<a href=\"mailto:%WIKIWEBMASTER%?subject=%ENCODE{"Access Denied for '%WEB%.%TOPIC%', needs '%PARAM1%'"}%\">%WIKIWEBMASTER%</a>"}%
 
 
-__%MAKETEXT{"Related topics:"}%__ %USERSWEB%.TWikiGroups, %SYSTEMWEB%.AccessControl
+__%MAKETEXT{"Related topics:"}%__ %USERSWEB%.WikiGroups, %SYSTEMWEB%.AccessControl
 %TMPL:END%
 %TMPL:DEF{"no_such_web"}%
 ---++ %MAKETEXT{"The [_1] web does not exist" args="\"%WEB%\""}%

diff --git a/core/tools/TWikiKernel/MANIFEST b/core/tools/TWikiKernel/MANIFEST
@@ -37,7 +37,7 @@ data/Main/ProjectContributor.txt 0660
 data/Main/SitePreferences.txt 0660
 data/Main/AdminGroup.txt 0660
 data/Main/GroupTemplate.txt 0660
-data/Main/TWikiGroups.txt 0660
+data/Main/WikiGroups.txt 0660
 data/Main/WikiGuest.txt 0660
 data/Main/RegistrationAgent.txt 0660
 data/Main/WikiUsers.txt 0660