Changeset 672


Ignore:
Timestamp:
11/15/08 06:19:36 (4 years ago)
Author:
SvenDowideit
Message:

Item109: phase1 of WikiAdminGroup->AdminGroup

Files:
195 edited

Legend:

Unmodified
Added
Removed
  • branches/Release04x02/data/Main/ProjectContributor.txt

    r670 r672  
    66__Related topics:__ %WIKIUSERSTOPIC%, %SYSTEMWEB%.TWikiRegistration 
    77 
    8 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="WikiAdminGroup"}% 
     8%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}% 
    99 
  • branches/Release04x02/data/Main/SitePreferences.txt

    r670 r672  
    1313 
    1414<!-- Keep this as a security measure: 
    15    * Set ALLOWTOPICCHANGE = WikiAdminGroup 
    16    * Set ALLOWTOPICRENAME = WikiAdminGroup 
     15   * Set ALLOWTOPICCHANGE = AdminGroup 
     16   * Set ALLOWTOPICRENAME = AdminGroup 
    1717--> 
    1818 
  • branches/Release04x02/data/Main/TWikiGroups.txt

    r670 r672  
    2525   * There is enough peer pressure to post only appropriate content. 
    2626   * Content does not get lost because topics are under revision control. 
    27    * A topic revision can be undone by a member of the %USERSWEB%.WikiAdminGroup if necesssary. 
     27   * A topic revision can be undone by a member of the %USERSWEB%.AdminGroup if necesssary. 
    2828 
    2929__Related topics:__ %SYSTEMWEB%.AccessControl, %WEBPREFSTOPIC%, %WIKIUSERSTOPIC%, %SYSTEMWEB%.WikiCulture 
  • branches/Release04x02/data/Main/UnknownUser.txt

    r670 r672  
    66__Related topics:__ %WIKIUSERSTOPIC%, %SYSTEMWEB%.TWikiRegistration 
    77 
    8 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="WikiAdminGroup"}% 
     8%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}% 
    99 
  • branches/Release04x02/data/Main/WebPreferences.txt

    r670 r672  
    3333      * Set ALLOWWEBRENAME =  
    3434 
    35    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.WikiAdminGroup) 
    36       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    37       * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     35   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.AdminGroup) 
     36      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     37      * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    3838 
    3939   * Web preferences that are *not* allowed to be overridden by sub-web, user or topic preferences: 
  • branches/Release04x02/data/Main/WikiAdminUser.txt

    r671 r672  
    55or to temporarily login as %TOPIC% using the password set in configure, and then log back out to the same User and Group as before. 
    66 
    7 This means it is no longer necessary to add yourself to the WikiAdminGroup, and you will be able to quicky 
     7This means it is no longer necessary to add yourself to the AdminGroup, and you will be able to quicky 
    88change to Admin User (and back to your user) only when you need to. 
    99 
     
    2525   * If your TWiki is configured to use !ApacheLoginManager, you will need to log in as a valid user first. 
    2626    
    27 __Related topics:__ %WIKIUSERSTOPIC%, WikiAdminGroup, TWikiGroups, %SYSTEMWEB%.AccessControl 
     27__Related topics:__ %WIKIUSERSTOPIC%, AdminGroup, TWikiGroups, %SYSTEMWEB%.AccessControl 
    2828--- 
    2929 
  • branches/Release04x02/data/Main/WikiGuest.txt

    r671 r672  
    66__Related topics:__ %WIKIUSERSTOPIC%, %SYSTEMWEB%.TWikiRegistration 
    77 
    8 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="WikiAdminGroup"}% 
     8%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}% 
  • branches/Release04x02/data/Sandbox/WebHome.txt

    r670 r672  
    3737 
    3838 
    39    * Set ALLOWTOPICCHANGE = Main.WikiAdminGroup 
     39   * Set ALLOWTOPICCHANGE = Main.AdminGroup 
  • branches/Release04x02/data/Sandbox/WebPreferences.txt

    r670 r672  
    3131      * Set ALLOWWEBRENAME =  
    3232 
    33    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.WikiAdminGroup) 
    34       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    35       * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     33   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.AdminGroup) 
     34      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     35      * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    3636 
    3737   * Web preferences that are *not* allowed to be overridden by sub-web, user or topic preferences: 
  • branches/Release04x02/data/TWiki/AccessControl.txt

    r671 r672  
    1616   * *Peer editing* - the ability for anyone to rearrange all content on a page - keeps topics focused. 
    1717   * In TWiki, content is transparently preserved under *revision control*: 
    18       * Edits can be undone by the administrator (per default a member of %USERSWEB%.WikiAdminGroup; see [[#ManagingGroups]]). 
     18      * Edits can be undone by the administrator (per default a member of %USERSWEB%.AdminGroup; see [[#ManagingGroups]]). 
    1919      * Users are encouraged to edit and refactor (condense a long topic), since there's a safety net. 
    2020As a *collaboration guideline*: 
     
    6767---+++ The Super Admin Group 
    6868 
    69 A number of TWiki functions (for example, renaming webs) are only available to administrators. Administrators are simply users who belong to the *SuperAdminGroup*. This is a standard user group, the name of which is defined by {SuperAdminGroup} setting in [[%SCRIPTURLPATH{"configure"}%][configure]]. The default name of this group is the =WikiAdminGroup=. The system administrator may have chosen a different name for this group if your local TWiki uses an alternate group mapping manager but for simplicity we will use the default name !WikiAdminGroup in the rest of this topic. 
    70  
    71 You can create new administrators simply by adding them to the %USERSWEB%.WikiAdminGroup topic. For example, 
     69A number of TWiki functions (for example, renaming webs) are only available to administrators. Administrators are simply users who belong to the *SuperAdminGroup*. This is a standard user group, the name of which is defined by {SuperAdminGroup} setting in [[%SCRIPTURLPATH{"configure"}%][configure]]. The default name of this group is the =AdminGroup=. The system administrator may have chosen a different name for this group if your local TWiki uses an alternate group mapping manager but for simplicity we will use the default name !AdminGroup in the rest of this topic. 
     70 
     71You can create new administrators simply by adding them to the %USERSWEB%.AdminGroup topic. For example, 
    7272   * ==Set <nop>GROUP = <nop>%USERSWEB%.ElizabethWindsor, <nop>%USERSWEB%.TonyBlair== 
    7373A member of the Super Admin Group has unrestricted access throughout the TWiki, so only trusted staff should be added to this group. 
  • branches/Release04x02/data/TWiki/DefaultPreferences.txt

    r671 r672  
    139139 
    140140   * Users or groups allowed to [[%SYSTEMWEB%.ManagingWebs][create new top-level webs]]: (ex: %USERSWEB%.WebCreatorsGroup). If set to nothing, only administrators will be able to do this. 
    141       * Set ALLOWROOTCHANGE = %USERSWEB%.WikiAdminGroup 
     141      * Set ALLOWROOTCHANGE = %USERSWEB%.AdminGroup 
    142142 
    143143---+++ Search Settings 
     
    330330 
    331331   * No-one (except admins) should change this topic 
    332       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    333       * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     332      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     333      * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    334334 
    335335---++ Creating New Preference Variables 
  • branches/Release04x02/data/TWiki/IfStatements.txt

    r670 r672  
    838310. Group membership 
    8484<verbatim> 
    85 You %IF{"'%USERNAME%' ingroup 'WikiAdminGroup'" then="are an admin" else="are a normal user"}%  
     85You %IF{"'%USERNAME%' ingroup 'AdminGroup'" then="are an admin" else="are a normal user"}%  
    8686</verbatim> 
    8787expands to: %BR% 
    88 You %IF{"'%USERNAME%' ingroup 'WikiAdminGroup'" then="are an admin" else="are a normal user"}%  
     88You %IF{"'%USERNAME%' ingroup 'AdminGroup'" then="are an admin" else="are a normal user"}%  
    8989 
    9090*Configuration items* are defined in [[%SCRIPTURLPATH{"configure"}%][configure]]. You cannot see the value of a configuration item, you can only see if the item is set or not. 
  • branches/Release04x02/data/TWiki/InstallationGuide.txt

    r671 r672  
    116116---++ Define the Administrator User(s) 
    117117 
    118 Administrators have read and write access to any topic, irrespectively of TWiki access controls. When you install TWiki one of the first things you will want to do is define yourself as an administrator. You become an administrator simply by adding yourself to the =WikiAdminGroup=. It is the WikiName and not the login name you add to the group. Editing the =%USERSWEB%.AdminGroup= topic requires that you are an administrator. So to add the first administrator you need to login using the internal Wiki admin user login and the password you defined in configure. 
     118Administrators have read and write access to any topic, irrespectively of TWiki access controls. When you install TWiki one of the first things you will want to do is define yourself as an administrator. You become an administrator simply by adding yourself to the =AdminGroup=. It is the WikiName and not the login name you add to the group. Editing the =%USERSWEB%.AdminGroup= topic requires that you are an administrator. So to add the first administrator you need to login using the internal Wiki admin user login and the password you defined in configure. 
    119119 
    120120   * Navigate to the =%USERSWEB%.AdminGroup= topic 
    121    * Follow carefully the steps =%USERSWEB%.WikiAdminGroup= of how to become an admin 
     121   * Follow carefully the steps =%USERSWEB%.AdminGroup= of how to become an admin 
    122122   * Note that if you use _ApacheLogin_ you have to be registered and logged in before you use the _internal admin login_ 
    123123 
  • branches/Release04x02/data/TWiki/RegistrationApprovals.txt

    r670 r672  
    44Attachments are made when people first register, held pending until the registration is confirmed and approved, and are removed when registration is completed. 
    55 
    6    * Set ALLOWTOPICVIEW = %USERSWEB%.WikiAdminGroup 
    7    * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    8    * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     6   * Set ALLOWTOPICVIEW = %USERSWEB%.AdminGroup 
     7   * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     8   * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    99 
    1010__Related Topics:__ AdminToolsCategory 
  • branches/Release04x02/data/TWiki/ReleaseHistory.txt

    r671 r672  
    537537      * Forms to change/reset/install passwords, see ChangePassword &amp; ResetPassword 
    538538   * *01 May 2001* - TWiki:Main.AndreaSterbini 
    539       * The %MAINWEB%.WikiAdminGroup (or other group) can be enabled as a [[TWikiAccessControl#SuperAdminGroup][SuperAdminGroup]]. Members have browser edit access to _all_ locked topics.  
     539      * The %MAINWEB%.AdminGroup (or other group) can be enabled as a [[TWikiAccessControl#SuperAdminGroup][SuperAdminGroup]]. Members have browser edit access to _all_ locked topics.  
    540540   * *01 May 2001* - TWiki:Main.JohnTalintyre 
    541541      * Meta information format, see TWikiMetaData 
  • branches/Release04x02/data/TWiki/ReleaseNotes01x00.txt

    r670 r672  
    171171 
    172172TWiki 4.2 introduces a new _Internal Admin Login_ feature which uses "admin" (configurable) as username and the password from configure to become temporary administrator.  
    173 When you do a new installation you need to use this feature as !Main.WikiAdminGroup is now access restricted by default to avoid security attacks during the hours an installation may take.  
    174 From configure there is a link to the !WikiAdminGroup topic and on !WikiAdminGroup the step by step instructions are written in a yellow box.  
     173When you do a new installation you need to use this feature as !Main.AdminGroup is now access restricted by default to avoid security attacks during the hours an installation may take.  
     174From configure there is a link to the !AdminGroup topic and on !AdminGroup the step by step instructions are written in a yellow box.  
    175175 
    176176---+++ Rearchitected User Mapping system (a transperant change for end users) 
     
    506506| [[%BUGS%/Item2244][Item2244]] | Documented METASEARCH parameter defaults are not the actual defaults | 
    507507| [[%BUGS%/Item2221][Item2221]] | .changes is hardcoded to 500 entries, affecting WebStatistics and MailerContrib | 
    508 | [[%BUGS%/Item2108][Item2108]] | Better installation doc for !WikiAdminGroup | 
     508| [[%BUGS%/Item2108][Item2108]] | Better installation doc for !AdminGroup | 
    509509| [[%BUGS%/Item2032][Item2032]] | Some UTF8 characters in form values broken (CGI.pm interaction) | 
    510510| [[%BUGS%/Item2005][Item2005]] | Cannot change configure password without making other changes | 
  • branches/Release04x02/data/TWiki/TWikiUpgradeGuide.txt

    r670 r672  
    246246---+++ New Internal Admin Login 
    247247 
    248 TWiki 4.2 introduces a new _Internal Admin Login_ feature which uses "admin" (configurable) as username and the password used for configure to become temporary administrator. When you do a new installation you need to use this feature as !Main.WikiAdminGroup is now access restricted by default to avoid security attacks during the hours an installation may take. From configure there is a link to the !WikiAdminGroup topic and on !WikiAdminGroup the step by step instructions are written in a yellow box. Our advice is not to remove this help text in case you need it later. 
     248TWiki 4.2 introduces a new _Internal Admin Login_ feature which uses "admin" (configurable) as username and the password used for configure to become temporary administrator. When you do a new installation you need to use this feature as !Main.AdminGroup is now access restricted by default to avoid security attacks during the hours an installation may take. From configure there is a link to the !AdminGroup topic and on !AdminGroup the step by step instructions are written in a yellow box. Our advice is not to remove this help text in case you need it later. 
    249249 
    250250%STOPINCLUDE% 
  • branches/Release04x02/data/TWiki/UserAuthentication.txt

    r670 r672  
    7878    <br /> %H% Check that the password manager recognises the new user. If you are using =.htpasswd= files, check that a new line with the username and encrypted password is added to the =.htpasswd= file. If not, you probably got a path wrong, or the permissions may not allow the webserver user to write to that file. 
    7979   1 Create a new topic to check if authentication works. 
    80    1 *Edit the %USERSWEB%.WikiAdminGroup topic in the %USERSWEB% web to include users with system administrator status.* 
     80   1 *Edit the %USERSWEB%.AdminGroup topic in the %USERSWEB% web to include users with system administrator status.* 
    8181    <br /> %X% *This is a very important step*, as users in this group can access _all_ topics, independent of %WIKITOOLNAME% access controls. 
    8282 
     
    115115    <br /> %H% Check that a new line with the username and encrypted password is added to the =.htpasswd= file. If not, you may have got a path wrong, or the permissions may not allow the webserver user to write to that file. 
    116116   1 Create a new topic to check if authentication works. 
    117    1 *Edit the %USERSWEB%.WikiAdminGroup topic in the %USERSWEB% web to include users with system administrator status.* 
     117   1 *Edit the %USERSWEB%.AdminGroup topic in the %USERSWEB% web to include users with system administrator status.* 
    118118    <br /> %X% *This is a very important step*, as users in this group can access _all_ topics, independent of %WIKITOOLNAME% access controls. 
    119119AccessControl has more information on setting up access controls. 
  • branches/Release04x02/data/TWiki/WebPreferences.txt

    r670 r672  
    3434 
    3535   * Users or groups who __are not__ / __are__ allowed to __view__ / __change__ / __rename__ topics in the <nop>%WEB% web: (See %SYSTEMWEB%.AccessControl). 
    36       * Set ALLOWWEBCHANGE = %USERSWEB%.WikiAdminGroup 
    37       * Set ALLOWWEBRENAME = %USERSWEB%.WikiAdminGroup 
     36      * Set ALLOWWEBCHANGE = %USERSWEB%.AdminGroup 
     37      * Set ALLOWWEBRENAME = %USERSWEB%.AdminGroup 
    3838 
    3939   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.WebAdministratorsGroup) 
    40       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
     40      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
    4141 
    4242   * Web preferences that are *not* allowed to be overridden by sub-web, user or topic preferences: 
  • branches/Release04x02/data/TestCases/TestCaseAmISane.txt

    r670 r672  
    1717| =save= | =action= = =checkpoint= (should come back to edit) | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=checkpoint&text=Checkpoint-save%20PASSED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here</a> | 
    1818| =save= | =action= = =quietsave= (should redirect to view) | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&text=Quietsave%20test%20PASSED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
    19 | =repRev= | =action= = =quietsave=, =cmd= = =repRev= if you are in Main.WikiAdminGroup should redirect to view, and you should see "repRev test PASSED", otherwise you will be denied. | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&cmd=repRev&text=RepRev%20test%20PASSED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
    20 | =delRev= | =action= = =save=, =cmd= = =delRev= - should delete the top revision, if you are in Main.WikiAdminGroup, otherwise you will be denied. | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&cmd=delRev&text=delRev%20test%20FAILED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
     19| =repRev= | =action= = =quietsave=, =cmd= = =repRev= if you are in Main.AdminGroup should redirect to view, and you should see "repRev test PASSED", otherwise you will be denied. | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&cmd=repRev&text=RepRev%20test%20PASSED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
     20| =delRev= | =action= = =save=, =cmd= = =delRev= - should delete the top revision, if you are in Main.AdminGroup, otherwise you will be denied. | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&cmd=delRev&text=delRev%20test%20FAILED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
    2121| =search= | Search for the word "sanity" |<a href="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/TestCases/WasteOfSpace?search=sanity">click here</a> | 
    2222| =statistics= | Should redirect to refreshed statistics |<a href="%SCRIPTURLPATH%/statistics%SCRIPTSUFFIX%/TestCases">click here</a> | 
  • branches/Release04x02/data/TestCases/WebPreferences.txt

    r670 r672  
    4040                * #Set ALLOWWEBRENAME =  
    4141 
    42         * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.WikiAdminGroup) 
     42        * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.AdminGroup) 
    4343                * #Set ALLOWTOPICCHANGE =  
    4444                * #Set ALLOWTOPICRENAME =  
  • branches/Release04x02/data/Trash/WebHome.txt

    r670 r672  
    55%MAKETEXT{"Security Note:"}% 
    66%ENDCOLOR% 
    7 %MAKETEXT{"By default, viewing the Trash web is restricted to [_1]. If you would like to allow all users to view the Trash web, remove the =ALLOWWEBVIEW= restriction in WebPreferences." args="%USERSWEB%.WikiAdminGroup"}% 
     7%MAKETEXT{"By default, viewing the Trash web is restricted to [_1]. If you would like to allow all users to view the Trash web, remove the =ALLOWWEBVIEW= restriction in WebPreferences." args="%USERSWEB%.AdminGroup"}% 
    88 
    99%SEARCH{".*" web="%INCLUDINGWEB%" type="regex" nototal="on" nosearch="on" order="modified" limit="15"}% 
  • branches/Release04x02/data/Trash/WebPreferences.txt

    r670 r672  
    1717 
    1818   * Restricted to adminsso that deleted topics can't be viewed by spies. 
    19       * Set ALLOWWEBVIEW = %USERSWEB%.WikiAdminGroup 
    20       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    21       * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     19      * Set ALLOWWEBVIEW = %USERSWEB%.AdminGroup 
     20      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     21      * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    2222 
    2323   * Web preferences that are *not* allowed to be overridden by sub-web, user or topic preferences: 
  • branches/Release04x02/data/_default/WebPreferences.txt

    r670 r672  
    5757      * Set ALLOWWEBRENAME =  
    5858 
    59    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.WikiAdminGroup) 
     59   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.AdminGroup) 
    6060      * Set ALLOWTOPICCHANGE =  
    6161      * Set ALLOWTOPICRENAME =  
  • branches/Release04x02/lib/TWiki/Func.pm

    r670 r672  
    10121012    while ($it->hasNext()) { 
    10131013        my $group = $it->next(); 
    1014         # $group is a group name e.g. WikiAdminGroup 
     1014        # $group is a group name e.g. AdminGroup 
    10151015    } 
    10161016</verbatim> 
  • branches/Release04x02/locale/fr.po

    r671 r672  
    820820msgstr "" 
    821821"Par défaut, la consultation du web Trash est réservée aux administrateurs et " 
    822 "administratrices de ce TWiki, qui sont membres du %MAINWEB%.WikiAdminGroup. " 
     822"administratrices de ce TWiki, qui sont membres du %MAINWEB%.AdminGroup. " 
    823823"Si vous souhaitez désactiver cette restriction, enlevez la ligne " 
    824824"=ALLOWWEBVIEW= de la page WebPreferences." 
  • branches/Release04x02/tools/TWikiKernel/MANIFEST

    r670 r672  
    3636data/Main/ProjectContributor.txt 0660 
    3737data/Main/SitePreferences.txt 0660 
    38 data/Main/WikiAdminGroup.txt 0660 
     38data/Main/AdminGroup.txt 0660 
    3939data/Main/TWikiGroupTemplate.txt 0660 
    4040data/Main/TWikiGroups.txt 0660 
  • branches/Release04x02/tools/pkg/debian/po/br.po

    r670 r672  
    115115#: ../templates:4001 
    116116msgid "" 
    117 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     117"After you have created yourself a user, edit the Main.AdminGroup to " 
    118118"restrict Admin privileges to that user." 
    119119msgstr "" 
  • branches/Release04x02/tools/pkg/debian/po/cs.po

    r670 r672  
    9797#: ../templates:4001 
    9898msgid "" 
    99 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     99"After you have created yourself a user, edit the Main.AdminGroup to " 
    100100"restrict Admin privileges to that user." 
    101101msgstr "" 
    102 "AÅŸ si pro sebe vytvoříte uÅŸivatele, upravte Main.WikiAdminGroup a omezte " 
     102"AÅŸ si pro sebe vytvoříte uÅŸivatele, upravte Main.AdminGroup a omezte " 
    103103"správcovská oprávnění na vytvořeného uÅŸivatele." 
    104104 
     
    110110#~ "to rename the TWikiRegistration to TWikiRegistrationPub, and " 
    111111#~ "TWikiRegistrationDefault to TWikiRegistration. IMPORTANT: After you have " 
    112 #~ "created yourself a user, edit the Main.WikiAdminGroup to restrict Admin " 
     112#~ "created yourself a user, edit the Main.AdminGroup to restrict Admin " 
    113113#~ "privileges" 
    114114#~ msgstr "" 
     
    120120#~ "TWikiRegistrationPub a poté TWikiRegistrationDefault na " 
    121121#~ "TWikiRegistration. DÅ®LEÅœITÉ: AÅŸ si pro sebe vytvoříte uÅŸivatele, omezte " 
    122 #~ "administrátorská oprávnění úpravou Main.WikiAdminGroup." 
     122#~ "administrátorská oprávnění úpravou Main.AdminGroup." 
  • branches/Release04x02/tools/pkg/debian/po/de.po

    r670 r672  
    9494#: ../templates:4001 
    9595msgid "" 
    96 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     96"After you have created yourself a user, edit the Main.AdminGroup to " 
    9797"restrict Admin privileges to that user." 
    9898msgstr "" 
    9999"Nachdem Sie sich selbst einen Benutzer angelegt haben, editieren Sie Main." 
    100 "WikiAdminGroup, um die Admin-Privilegien auf diesen Benutzer zu beschrÀnken." 
     100"AdminGroup, um die Admin-Privilegien auf diesen Benutzer zu beschrÀnken." 
  • branches/Release04x02/tools/pkg/debian/po/eu.po

    r670 r672  
    8989#: ../templates:4001 
    9090msgid "" 
    91 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     91"After you have created yourself a user, edit the Main.AdminGroup to " 
    9292"restrict Admin privileges to that user." 
    9393msgstr "" 
    94 "Zure erabiltzailea sortu ondoren, Main.WikiAdminGroup  editatu kudeaketa " 
     94"Zure erabiltzailea sortu ondoren, Main.AdminGroup  editatu kudeaketa " 
    9595"baimenak erabiltzaile horri mugatzeko." 
  • branches/Release04x02/tools/pkg/debian/po/fr.po

    r670 r672  
    100100#: ../templates:4001 
    101101msgid "" 
    102 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     102"After you have created yourself a user, edit the Main.AdminGroup to " 
    103103"restrict Admin privileges to that user." 
    104104msgstr "" 
    105 "Après avoir créé un utilisateur, veuillez éditer Main.WikiAdminGroup pour " 
     105"Après avoir créé un utilisateur, veuillez éditer Main.AdminGroup pour " 
    106106"restreindre les privilèges de l'administrateur à cet utilisateur." 
  • branches/Release04x02/tools/pkg/debian/po/gl.po

    r670 r672  
    8888#: ../templates:4001 
    8989msgid "" 
    90 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     90"After you have created yourself a user, edit the Main.AdminGroup to " 
    9191"restrict Admin privileges to that user." 
    9292msgstr "" 
    93 "Despois de ter creado un usuario, edite Main.WikiAdminGroup para restrinxir " 
     93"Despois de ter creado un usuario, edite Main.AdminGroup para restrinxir " 
    9494"os privilexios de administración a ese usuario." 
  • branches/Release04x02/tools/pkg/debian/po/nb.po

    r670 r672  
    9090#: ../templates:4001 
    9191msgid "" 
    92 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     92"After you have created yourself a user, edit the Main.AdminGroup to " 
    9393"restrict Admin privileges to that user." 
    9494msgstr "" 
    95 "NÃ¥r du har opprettet en bruker for deg selv, sÃ¥ rediger Main.WikiAdminGroup " 
     95"NÃ¥r du har opprettet en bruker for deg selv, sÃ¥ rediger Main.AdminGroup " 
    9696"for Ã¥ gi administrasjonsrettigheter bare til den brukeren." 
  • branches/Release04x02/tools/pkg/debian/po/pt.po

    r670 r672  
    8989#: ../templates:4001 
    9090msgid "" 
    91 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     91"After you have created yourself a user, edit the Main.AdminGroup to " 
    9292"restrict Admin privileges to that user." 
    9393msgstr "" 
    94 "Após ter criado você mesmo um utilizador, edite a Main.WikiAdminGroup para " 
     94"Após ter criado você mesmo um utilizador, edite a Main.AdminGroup para " 
    9595"restringir os privilégios de Administrador a esse utilizador." 
  • branches/Release04x02/tools/pkg/debian/po/pt_BR.po

    r670 r672  
    9797#: ../templates:4001 
    9898msgid "" 
    99 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     99"After you have created yourself a user, edit the Main.AdminGroup to " 
    100100"restrict Admin privileges to that user." 
    101101msgstr "" 
    102 "Depois de criar um usuário para você, edite o Main.WikiAdminGroup para " 
     102"Depois de criar um usuário para você, edite o Main.AdminGroup para " 
    103103"restringir os privilégios de administrador para esse usuário." 
  • branches/Release04x02/tools/pkg/debian/po/ro.po

    r670 r672  
    9898#: ../templates:4001 
    9999msgid "" 
    100 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     100"After you have created yourself a user, edit the Main.AdminGroup to " 
    101101"restrict Admin privileges to that user." 
    102102msgstr "" 
    103103"După ce aÅ£i creat un utilizator pentru dumneavoastră, editaÅ£i Main." 
    104 "WikiAdminGroup pentru a permite privilegii de administrare doar acelui " 
     104"AdminGroup pentru a permite privilegii de administrare doar acelui " 
    105105"utilizator." 
  • branches/Release04x02/tools/pkg/debian/po/ru.po

    r670 r672  
    103103#: ../templates:4001 
    104104msgid "" 
    105 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     105"After you have created yourself a user, edit the Main.AdminGroup to " 
    106106"restrict Admin privileges to that user." 
    107107msgstr "" 
    108108"ППсле тПгП как сПзЎаЎОте себя как пПльзПвателя, ПтреЎактОруйте Main." 
    109 "WikiAdminGroup, чтПбы ПграМОчОть аЎЌОМОстратОвМые прОвОлегОО этПгП " 
     109"AdminGroup, чтПбы ПграМОчОть аЎЌОМОстратОвМые прОвОлегОО этПгП " 
    110110"пПльзПвателя." 
  • branches/Release04x02/tools/pkg/debian/po/sv.po

    r670 r672  
    9797#: ../templates:4001 
    9898msgid "" 
    99 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     99"After you have created yourself a user, edit the Main.AdminGroup to " 
    100100"restrict Admin privileges to that user." 
    101101msgstr "" 
    102102"Efter att du har skapat en anvÀndare Ã¥t dig sjÀlv, redigera Main." 
    103 "WikiAdminGroup för att begrÀnsa Admin-behörigheten till den anvÀndaren." 
     103"AdminGroup för att begrÀnsa Admin-behörigheten till den anvÀndaren." 
    104104 
    105105#~ msgid "http://localhost/" 
     
    116116#~ "to rename the TWikiRegistration to TWikiRegistrationPub, and " 
    117117#~ "TWikiRegistrationDefault to TWikiRegistration. IMPORTANT: After you have " 
    118 #~ "created yourself a user, edit the Main.WikiAdminGroup to restrict Admin " 
     118#~ "created yourself a user, edit the Main.AdminGroup to restrict Admin " 
    119119#~ "privileges" 
    120120#~ msgstr "" 
     
    126126#~ "TWikiRegistration till TWikiRegistrationPub och TWikiRegistrationDefault " 
    127127#~ "till TWikiRegistration. VIKTIGT: Efter att du har skapat din egna " 
    128 #~ "anvÀndare, redigera Main.WikiAdminGroup för att begrÀnsa " 
     128#~ "anvÀndare, redigera Main.AdminGroup för att begrÀnsa " 
    129129#~ "administrationsrÀttigheterna." 
  • branches/Release04x02/tools/pkg/debian/po/ta.po

    r670 r672  
    9797#: ../templates:4001 
    9898msgid "" 
    99 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     99"After you have created yourself a user, edit the Main.AdminGroup to " 
    100100"restrict Admin privileges to that user." 
    101101msgstr "" 
     
    103103ச்஀ பயனருக்கு சிர்வடகி à® 
    104104னும஀ிகளை கட்டுப் படு஀்஀ Main." 
    105 "WikiAdminGroup ஐ ஀ிரு஀்஀வும்." 
     105"AdminGroup ஐ ஀ிரு஀்஀வும்." 
  • branches/Release04x02/tools/pkg/debian/po/templates.pot

    r670 r672  
    7676#: ../templates:4001 
    7777msgid "" 
    78 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     78"After you have created yourself a user, edit the Main.AdminGroup to " 
    7979"restrict Admin privileges to that user." 
    8080msgstr "" 
  • branches/Release04x02/tools/pkg/debian/po/vi.po

    r670 r672  
    9797#: ../templates:4001 
    9898msgid "" 
    99 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     99"After you have created yourself a user, edit the Main.AdminGroup to " 
    100100"restrict Admin privileges to that user." 
    101101msgstr "" 
     
    114114#~ "to rename the TWikiRegistration to TWikiRegistrationPub, and " 
    115115#~ "TWikiRegistrationDefault to TWikiRegistration. IMPORTANT: After you have " 
    116 #~ "created yourself a user, edit the Main.WikiAdminGroup to restrict Admin " 
     116#~ "created yourself a user, edit the Main.AdminGroup to restrict Admin " 
    117117#~ "privileges" 
    118118#~ msgstr "" 
     
    125125#~ "TWikiRegistrationDefault (đang kÜ TWiki mặc định) thành TWikiRegistration " 
    126126#~ "(đang kÜ TWiki). QUAN TRỌNG: sau khi bạn đã tạo người dùng cho chính bạn, " 
    127 #~ "hãy hiệu chỉnh Main.WikiAdminGroup (chính: nhóm quản lÜ TWiki) để giới " 
     127#~ "hãy hiệu chỉnh Main.AdminGroup (chính: nhóm quản lÜ TWiki) để giới " 
    128128#~ "hạn quyền truy cập quản lÜ." 
  • branches/Release04x02/tools/pkg/debian/templates

    r670 r672  
    3232Type: note 
    3333_Description: Admin User Registration configuration required 
    34  After you have created yourself a user, edit the Main.WikiAdminGroup 
     34 After you have created yourself a user, edit the Main.AdminGroup 
    3535 to restrict Admin privileges to that user. 
  • branches/Release04x02/twikiplugins/BuildContrib/data/TWiki/BuildContrib.txt

    r670 r672  
    427427|  8584 | TWikibug:Item1527   BuildContrib: Oops, some (very few) plugins are not ActionTrackerPlugin :-) | 
    428428|  8583 | TWikibug:Item1527   Generated install scripts now really attaches files in pub to topics (means less of these couldn't update history error messages) | 
    429 |  8581 | TWikibug:Item1527   BuildContrib: Execute topic saves in the TWiki web as WikiAdminGroup by default | 
     429|  8581 | TWikibug:Item1527   BuildContrib: Execute topic saves in the TWiki web as AdminGroup by default | 
    430430|  8365 | TWikibug:Item1347   made build.pl tidy up it's mess; and switched buildcontrib over to using push and pop on dirs instead of cd, so we don;t get lost so easily. Oh, and corrected the permissions on the generated viewauth and rdiffauth files | 
    431431|  8359 | TWikibug:Item1393   For release topic name, removed upper case change of suffix. E.g. 'TWiki-4.0.0-beta6' becomes 'TWikiRelease04x00x00beta06' | 
  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/Main/NobodyGroup.txt

    r670 r672  
    55      * Set GROUP =  
    66   * Persons/group who can change the list: 
    7       * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     7      * Set ALLOWTOPICCHANGE = AdminGroup 
    88 
    99Used 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. 
  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/Main/RegistrationAgent.txt

    r670 r672  
    66__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]] 
    77 
    8 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="WikiAdminGroup"}% 
     8%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}% 
  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/Main/TWikiAdminGroup.txt

    r671 r672  
    66      * Set GROUP =  
    77   * Persons/group who can change the list: 
    8       * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     8      * Set ALLOWTOPICCHANGE = AdminGroup 
    99 
    1010%INCLUDE{"%MAINWEB%.WikiAdminUser" section="sudo_login"}% 
     
    2222   1 Verify that new members show up properly in the group listing at %MAINWEB%.TWikiGroups 
    2323   1 Make sure always to keep this topic write protected by keeping the already defined ALLOWTOPICCHANGE setting 
    24    1 The ALLOWTOPICHANGE and ALLOWTOPICRENAME settings in [[%SYSTEMWEB%.DefaultPreferences]] and [[%USERSWEB%.SitePreferences]] have already been set to this group (<nop>WikiAdminGroup), restricting edit of site-wide preferences to the Wiki Administrator Group 
     24   1 The ALLOWTOPICHANGE and ALLOWTOPICRENAME settings in [[%SYSTEMWEB%.DefaultPreferences]] and [[%USERSWEB%.SitePreferences]] have already been set to this group (<nop>AdminGroup), restricting edit of site-wide preferences to the Wiki Administrator Group 
    2525<sticky></div></sticky> 
    2626%IF{"(NOT defined GROUP) OR $GROUP = ''" then="" else="-->"}% 
  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/BulkResetPassword.txt

    r670 r672  
    5353__Related Topics:__ AdminToolsCategory 
    5454 
    55       * Set ALLOWTOPICVIEW = %MAINWEB%.WikiAdminGroup 
    56       * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     55      * Set ALLOWTOPICVIEW = %MAINWEB%.AdminGroup 
     56      * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt

    r671 r672  
    149149%FORMDATA% 
    150150 
    151 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="Main.WikiAdminGroup"}% 
     151%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="Main.AdminGroup"}% 
    152152</verbatim> 
    153153   * __remember to secure the topic appropriately to prevent attackers from getting emailed sensitive passwords.__ 
  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt

    r670 r672  
    3232   * default groups and user 
    3333      * Main.NobodyGroup 
    34       * Main.WikiAdminGroup 
     34      * Main.AdminGroup 
    3535      * Main.RegistrationAgent     
    3636   * User lists 
  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/UsersTemplate.txt

    r670 r672  
    1 %META:TOPICINFO{author="WikiAdminGroup" date="1178574333" format="1.1" reprev="1.2" version="1.2"}% 
     1%META:TOPICINFO{author="AdminGroup" date="1178574333" format="1.1" reprev="1.2" version="1.2"}% 
    22---+ List of <nop>%WIKITOOLNAME% users 
    33 
     
    5050 
    5151__Access Control:__ 
    52    * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     52   * Set ALLOWTOPICCHANGE = AdminGroup 
  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST

    r670 r672  
    1212data/Main/UserList.txt 0644 
    1313data/Main/UserListByDateJoined.txt 0644 
    14 data/Main/WikiAdminGroup.txt 0644 TWiki compatible admin group 
     14data/Main/AdminGroup.txt 0644 TWiki compatible admin group 
    1515data/Main/AdminGroup.txt 0644 
    1616data/Main/UserHomepageHeader.txt 0644 
  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/ClientTests.pm

    r670 r672  
    2727        $this->{twiki}->{user}, $this->{test_web}, 
    2828        $this->{test_topic},    <<CONSTRAINT); 
    29    * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     29   * Set ALLOWTOPICCHANGE = AdminGroup 
    3030CONSTRAINT 
    3131} 
  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm

    r670 r672  
    238238    my @list; 
    239239 
    240     $TWiki::cfg{SuperAdminGroup} = 'WikiAdminGroup'; 
     240    $TWiki::cfg{SuperAdminGroup} = 'AdminGroup'; 
    241241 
    242242    # Force a re-read 
     
    254254    my @correctList; 
    255255    if ( $TWiki::cfg{UserMappingManager} eq 'TWiki::Users::BaseUserMapping' ) { 
    256         @correctList = qw/WikiAdminGroup TWikiBaseGroup/; 
     256        @correctList = qw/AdminGroup TWikiBaseGroup/; 
    257257    } 
    258258    else { 
    259259        @correctList = 
    260           qw/AdminGroup AandBGroup AandCGroup BandCGroup ScumGroup WikiAdminGroup TWikiBaseGroup/; 
     260          qw/AdminGroup AandBGroup AandCGroup BandCGroup ScumGroup AdminGroup TWikiBaseGroup/; 
    261261    } 
    262262    my $correct = join( ',', sort @correctList ); 
  • trunk/ActionTrackerPlugin/data/TWiki/ActionTrackerPlugin.txt

    r670 r672  
    166166You can assign an action to a group defined using a TWiki group topic (see %SYSTEMWEB%.CompleteDocumentation). Alternatively you can give a list of people as the value of the attribute. For example, 
    167167<pre> 
    168 %ACTION<nop>{who=WikiAdminGroup ...}% 
     168%ACTION<nop>{who=AdminGroup ...}% 
    169169%ACTION<nop>{who="KnutHaraldsen,MagnusMagnusson" ...}% 
    170170</pre> 
  • trunk/AdvertsPlugin/data/TWiki/AdvertsPlugin.txt

    r670 r672  
    4747 
    4848        * Anyone who can change this can change what ads you show! 
    49                 * Set ALLOWTOPICCHANGE = Main.WikiAdminGroup 
     49                * Set ALLOWTOPICCHANGE = Main.AdminGroup 
    5050 
    5151---++ Plugin Installation Instructions 
  • trunk/AntiWikiSpamPlugin/data/TWiki/AntiWikiSpamPlugin.txt

    r671 r672  
    3939  
    4040   * to ensure that only <nop>WikiAdmins can make changes here 
    41       * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     41      * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    4242 
    4343 
  • trunk/BenchmarkContrib/data/Benchmarks/WebPreferences.txt

    r670 r672  
    5353      * #Set ALLOWWEBVIEW =  
    5454      * #Set DENYWEBCHANGE =  
    55       * #Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
     55      * #Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
    5656      * #Set DENYWEBRENAME =  
    57       * #Set ALLOWWEBRENAME = %MAINWEB%.WikiAdminGroup 
     57      * #Set ALLOWWEBRENAME = %MAINWEB%.AdminGroup 
    5858 
    59    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.WikiAdminGroup) 
    60       * #Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    61       * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     59   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.AdminGroup) 
     60      * #Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     61      * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    6262 
    6363   * Web preferences that are *not* allowed to be overridden by user or topic preferences: 
  • trunk/BenchmarkContrib/data/TWiki/BenchmarkContribUserGuide.txt

    r671 r672  
    7070| Script%BR%(method) | What script from TWiki's =bin= directory is to be measured.%BR%Currently, only =view= is implemented. | =view= | 
    7171| Skin%BR%(pskin) | Which skin to use on the topic to measure.  Using =plain= or =text= skin will allow easier isolation of topic related performance issues.  Comparing your skin against other skins may give some insights. | Installation default skin (%SKIN%) | 
    72 | View as%BR%(viewer) | TWiki user name (usually !WikiName) to disguise as for measurement.  Only available if you are a member of %USERWEB%.WikiAdminGroup.  Use, for example, to view as !WikiGuest or a member of a particularly huge group | visitor of [[Benchmarks.WebHome]] | 
     72| View as%BR%(viewer) | TWiki user name (usually !WikiName) to disguise as for measurement.  Only available if you are a member of %USERWEB%.AdminGroup.  Use, for example, to view as !WikiGuest or a member of a particularly huge group | visitor of [[Benchmarks.WebHome]] | 
    7373 
    7474 
  • trunk/BlackListPlugin/data/TWiki/BlackListPlugin.txt

    r670 r672  
    3838 
    3939        * Access restriction: 
    40                 * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    41                 * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     40                * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     41                * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    4242 
    4343---+++ WHITELIST, BLACKLIST and BANLIST settings 
     
    128128        * Add the hidden form field to the registration form as described in the "Registration protection settings" section (this is already in TWiki 4.0) 
    129129        * From TWiki 4.0 release on: Run the configure utility in your browser to enable the Plugin 
    130         * Make sure that non-administrators cannot edit this plugin topic. By default, this topic is write protected with an =ALLOWTOPICCHANGE = !WikiAdminGroup= setting. 
     130        * Make sure that non-administrators cannot edit this plugin topic. By default, this topic is write protected with an =ALLOWTOPICCHANGE = !AdminGroup= setting. 
    131131        * Test if the installation was successful: 
    132132                1 Using above form, add the IP address of one of your workstations to the BANLIST 
  • trunk/BlogPlugin/data/Main/BlogAdminGroup.txt

    r670 r672  
    33---+!! <nop>BlogAdminGroup 
    44 
    5    * Set GROUP = WikiAdminGroup 
     5   * Set GROUP = AdminGroup 
    66   * Set ALLOWTOPICCHANGE = BlogAdminGroup 
    77 
  • trunk/BlogPlugin/data/TWiki/BlogUp.txt

    r670 r672  
    5252---++ Getting started 
    5353To create a blog use the BlogFactory. Note, however, that only members of  
    54 the %MAINWEB%.WikiAdminGroup are allowed to create a new blog. After entering 
     54the %MAINWEB%.AdminGroup are allowed to create a new blog. After entering 
    5555the mandatory information you will get a new web that is a copy of the _BlogPlugin 
    5656template web. 
  • trunk/BlogPlugin/data/_BlogPlugin/SubjectCategory.txt

    r670 r672  
    2525 
    2626<!-- 
    27    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    28    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     27   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     28   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    2929   * Set SIDEBAR = Admin 
    3030   * Set SIDEBARARG = TopicType 
  • trunk/BlogPlugin/data/_BlogPlugin/TopicType.txt

    r670 r672  
    1212 
    1313<!-- 
    14    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    15    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     14   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     15   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    1616   * Set SIDEBAR = Admin 
    1717   * Set SIDEBARARG = TopicType 
  • trunk/BlogPlugin/data/_BlogPlugin/WebPreferences.txt

    r670 r672  
    125125   * Set DENYWEBRENAME = %MAINWEB%.WikiGuest 
    126126   * Set ALLOWWEBRENAME = %MAINWEB%.BlogAuthorGroup 
    127    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    128    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     127   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     128   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    129129 
    130130---+++ Misc 
  • trunk/BugsContrib/data/Bugs/WebPreferences.txt

    r670 r672  
    4949                * Set ALLOWWEBRENAME =  
    5050 
    51         * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (I.e. %MAINWEB%.WikiAdminGroup) 
     51        * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (I.e. %MAINWEB%.AdminGroup) 
    5252                * #Set ALLOWTOPICCHANGE =  
    53                 * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     53                * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    5454 
    5555        * Web preferences that are *not* allowed to be overridden by user preferences: 
  • trunk/BuildContrib/data/TWiki/BuildContrib.txt

    r670 r672  
    419419|  8584 | TWikibug:Item1527   BuildContrib: Oops, some (very few) plugins are not ActionTrackerPlugin :-) | 
    420420|  8583 | TWikibug:Item1527   Generated install scripts now really attaches files in pub to topics (means less of these couldn't update history error messages) | 
    421 |  8581 | TWikibug:Item1527   BuildContrib: Execute topic saves in the TWiki web as WikiAdminGroup by default | 
     421|  8581 | TWikibug:Item1527   BuildContrib: Execute topic saves in the TWiki web as AdminGroup by default | 
    422422|  8365 | TWikibug:Item1347   made build.pl tidy up it's mess; and switched buildcontrib over to using push and pop on dirs instead of cd, so we don;t get lost so easily. Oh, and corrected the permissions on the generated viewauth and rdiffauth files | 
    423423|  8359 | TWikibug:Item1393   For release topic name, removed upper case change of suffix. E.g. 'TWiki-4.0.0-beta6' becomes 'TWikiRelease04x00x00beta06' | 
  • trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderCategory.txt

    r670 r672  
    8383~~~   title="Create a new topic in %CATINFO{cat="%BASEWEB%.%BASETOPIC%" format="<nop>$title"}%" 
    8484~~~ }%   
    85 %IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.WikiAdminGroup" type="change"}%" as="1"}% 
     85%IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.AdminGroup" type="change"}%" as="1"}% 
    8686%BUTTON{"Manage" href="%SCRIPTURLPATH{view}%/%BASEWEB%/Category" title="Manage categories"}%   
    8787%BUTTON{"Browse" href="%SCRIPTURLPATH{view}%/%BASEWEB%/CategoryBrowser" title="Browse the hierarchy"}%   
  • trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebPreferences.txt

    r670 r672  
    2323   * Set #ALLOWWEBVIEW =  
    2424   * Set DENYWEBCHANGE = %MAINWEB%.WikiGuest 
    25    * Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
    26    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     25   * Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
     26   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    2727 
    2828---+++ Application Pointer 
  • trunk/ClassificationPlugin/data/_ClassificationTemplate/WebPreferences.txt

    r670 r672  
    3030*Web*: 
    3131   * #Set DENYWEBVIEW =  
    32    * Set ALLOWWEBVIEW = %MAINWEB%.WikiAdminGroup 
     32   * Set ALLOWWEBVIEW = %MAINWEB%.AdminGroup 
    3333   * #Set DENYWEBCHANGE =  
    34    * Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
     34   * Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
    3535   * #Set DENYWEBRENAME =  
    36    * Set ALLOWWEBRENAME = %MAINWEB%.WikiAdminGroup 
     36   * Set ALLOWWEBRENAME = %MAINWEB%.AdminGroup 
    3737 
    3838*Topic* 
    39    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    40    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     39   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     40   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    4141 
    4242---++ Finalization 
  • trunk/DirectedGraphWebMapPlugin/data/TWiki/DirectedGraphWebMapPlugin.txt

    r670 r672  
    1010This is a sample of a web drawn by <nop>%TOPIC% - the "Main" web in a default installation of TWiki. 
    1111 
    12 <map id="SampleMainWebMap" name="SampleMainWebMap"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/NobodyGroup" title="NobodyGroup" alt="" coords="633,7,714,34"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiAdminGroup" title="WikiAdminGroup" alt="" coords="623,61,724,88"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiGroups" title="TWikiGroups" alt="" coords="1189,115,1266,142"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiUsers" title="WikiUsers" alt="" coords="772,329,842,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/SteffenPoulsen" title="SteffenPoulsen" alt="" coords="705,383,787,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/ProjectContributor" title="ProjectContributor" alt="" coords="596,383,691,410"><area shape="rect" href="%SCRIPTURL%/view/%USERSWEB%/SitePreferences" title="SitePreferences" alt="" coords="626,115,721,142"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiGroupTemplate" title="TWikiGroupTemplate" alt="" coords="1238,168,1350,195"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiGuest" title="WikiGuest" alt="" coords="511,383,583,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/RegistrationAgent" title="RegistrationAgent" alt="" coords="922,383,1044,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UnknownUser" title="UnknownUser" alt="" coords="828,383,909,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserList" title="UserList" alt="" coords="1377,383,1433,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/PatternSkinUserViewTemplate" title="PatternSkinUserViewTemplate" alt="" coords="180,276,329,302"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserViewTemplate" title="UserViewTemplate" alt="" coords="299,329,401,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserForm" title="UserForm" alt="" coords="397,222,460,249"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiGuestLeftBar" title="WikiGuestLeftBar" alt="" coords="7,329,110,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByDateJoined" title="UserListByDateJoined" alt="" coords="1397,544,1511,571"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByLocation" title="UserListByLocation" alt="" coords="1401,490,1507,517"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByPhotograph" title="UserListByPhotograph" alt="" coords="1476,436,1593,463"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListHeader" title="UserListHeader" alt="" coords="1348,436,1435,463"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserHomepageHeader" title="UserHomepageHeader" alt="" coords="371,276,486,302"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WebAtom" title="WebAtom" alt="" coords="828,276,892,302"> 
     12<map id="SampleMainWebMap" name="SampleMainWebMap"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/NobodyGroup" title="NobodyGroup" alt="" coords="633,7,714,34"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/AdminGroup" title="AdminGroup" alt="" coords="623,61,724,88"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiGroups" title="TWikiGroups" alt="" coords="1189,115,1266,142"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiUsers" title="WikiUsers" alt="" coords="772,329,842,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/SteffenPoulsen" title="SteffenPoulsen" alt="" coords="705,383,787,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/ProjectContributor" title="ProjectContributor" alt="" coords="596,383,691,410"><area shape="rect" href="%SCRIPTURL%/view/%USERSWEB%/SitePreferences" title="SitePreferences" alt="" coords="626,115,721,142"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiGroupTemplate" title="TWikiGroupTemplate" alt="" coords="1238,168,1350,195"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiGuest" title="WikiGuest" alt="" coords="511,383,583,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/RegistrationAgent" title="RegistrationAgent" alt="" coords="922,383,1044,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UnknownUser" title="UnknownUser" alt="" coords="828,383,909,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserList" title="UserList" alt="" coords="1377,383,1433,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/PatternSkinUserViewTemplate" title="PatternSkinUserViewTemplate" alt="" coords="180,276,329,302"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserViewTemplate" title="UserViewTemplate" alt="" coords="299,329,401,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserForm" title="UserForm" alt="" coords="397,222,460,249"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiGuestLeftBar" title="WikiGuestLeftBar" alt="" coords="7,329,110,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByDateJoined" title="UserListByDateJoined" alt="" coords="1397,544,1511,571"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByLocation" title="UserListByLocation" alt="" coords="1401,490,1507,517"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByPhotograph" title="UserListByPhotograph" alt="" coords="1476,436,1593,463"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListHeader" title="UserListHeader" alt="" coords="1348,436,1435,463"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserHomepageHeader" title="UserHomepageHeader" alt="" coords="371,276,486,302"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WebAtom" title="WebAtom" alt="" coords="828,276,892,302"> 
    1313</map> 
    1414<img usemap="#SampleMainWebMap" src="%ATTACHURLPATH%/SampleMainWebMap.png"> 
  • trunk/EditSyntaxPlugin/data/TWiki/CreoleEditSyntaxRegex.txt

    r670 r672  
    9999 
    100100__Access control:__ 
    101    * #DISABLE Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     101   * #DISABLE Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    102102 
    103103-- TWiki:Main.PeterThoeny - 09 Jul 2006 
  • trunk/EditSyntaxPlugin/data/TWiki/EditSyntaxPlugin.txt

    r670 r672  
    9494      * Edit =twiki/templates/edit.pattern.tmpl= and change ="%<nop>SYSTEMWEB%.WikiSyntaxSummary"= to ="%<nop>SYSTEMWEB%.%EDITSYNTAX%WikiSyntaxSummary"= 
    9595      * Change other =twiki/templates/edit.*.tmpl= template files as needed 
    96    * Secure the =*EditSyntaxRegex= converter topics so that only %MAINWEB%.WikiAdminGroup members can edit the topics. 
     96   * Secure the =*EditSyntaxRegex= converter topics so that only %MAINWEB%.AdminGroup members can edit the topics. 
    9797 
    9898 
    9999---++ Limitations 
    100100 
    101    * *Security risk:* The current implementation does no sanity check on the regular expressions of the Edit Syntax Converter topics. It is potentially possible to execute arbitrary Perl code by editing one of the converter topics. Secure the =*EditSyntaxRegex= converter topics so that only %MAINWEB%.WikiAdminGroup members can edit the topics. It is not recommended to use this Plugin version on a public website. 
     101   * *Security risk:* The current implementation does no sanity check on the regular expressions of the Edit Syntax Converter topics. It is potentially possible to execute arbitrary Perl code by editing one of the converter topics. Secure the =*EditSyntaxRegex= converter topics so that only %MAINWEB%.AdminGroup members can edit the topics. It is not recommended to use this Plugin version on a public website. 
    102102   * The MediawikiEditSyntaxRegex does not yet convert tables. 
    103103 
  • trunk/EditSyntaxPlugin/data/TWiki/MediawikiEditSyntaxRegex.txt

    r670 r672  
    101101 
    102102__Access control:__ 
    103    * #DISABLE Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     103   * #DISABLE Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    104104 
    105105-- TWiki:Main.PeterThoeny - 09 Jul 2006 
  • trunk/FamilyTreePlugin/data/FamilyTreePlugin/WebPreferences.txt

    r670 r672  
    5353      * #Set ALLOWWEBVIEW =  
    5454      * #Set DENYWEBCHANGE =  
    55       * #Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
     55      * #Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
    5656      * #Set DENYWEBRENAME =  
    57       * #Set ALLOWWEBRENAME = %MAINWEB%.WikiAdminGroup 
     57      * #Set ALLOWWEBRENAME = %MAINWEB%.AdminGroup 
    5858 
    59    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.WikiAdminGroup) 
    60       * #Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    61       * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     59   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.AdminGroup) 
     60      * #Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     61      * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    6262 
    6363   * Web preferences that are *not* allowed to be overridden by user or topic preferences: 
  • trunk/FindElsewherePlugin/data/TWiki/FindElsewherePlugin.txt

    r671 r672  
    2929| Found elsewhere (LOOKELSEWHEREFORLOCAL enabled)    | =<nop>%SYSTEMWEB%.WikiUsers= | %SYSTEMWEB%.WikiUsers | [[Main.WikiUsers][WikiUsers]] | 
    3030| Found elsewhere (LOOKELSEWHEREFORLOCAL disabled)    | =<nop>%SYSTEMWEB%.WikiUsers= | %SYSTEMWEB%.WikiUsers | [[TWiki.WikiUsers][WikiUsers]] (non-existing) | 
    31 | Found elsewhere     | =[<nop>[WikiAdminGroup][wiki admins]]= | [[WikiAdminGroup][wiki admins]] | [[Main.WikiAdminGroup][wiki admins]] | 
    32 | Don't touch direct links     | =[<nop>[%MAINWEB%.WikiAdminGroup][wiki admins]]= | [[%MAINWEB%.WikiAdminGroup][wiki admins]] | [[Main.WikiAdminGroup][wiki admins]] | 
     31| Found elsewhere     | =[<nop>[AdminGroup][wiki admins]]= | [[AdminGroup][wiki admins]] | [[Main.AdminGroup][wiki admins]] | 
     32| Don't touch direct links     | =[<nop>[%MAINWEB%.AdminGroup][wiki admins]]= | [[%MAINWEB%.AdminGroup][wiki admins]] | [[Main.AdminGroup][wiki admins]] | 
    3333| Found singular  elsewhere     | =<nop>WebSearches= | WebSearches | [[%SYSTEMWEB%.WebSearch][WebSearches]] |  
    3434| Found elsewhere, spaced wiki word | =[<nop/>[Web search]]= | [[Web search]] | [[%SYSTEMWEB%.WebSearch][Web search]] | 
  • trunk/FuncUsersContrib/test/unit/FuncUsersContrib/FuncUsersContribSuite.pm

    r670 r672  
    111111        # Create an admin group/user 
    112112        $twiki->{store}->saveTopic( 
    113             $twiki->{user}, $testUsersWeb, 'WikiAdminGroup', 
    114             '   * Set GROUP = '.$twikiUserObject->wikiName().", WikiAdminGroup\n"); 
     113            $twiki->{user}, $testUsersWeb, 'AdminGroup', 
     114            '   * Set GROUP = '.$twikiUserObject->wikiName().", AdminGroup\n"); 
    115115 
    116116        $twiki->{store}->createWeb($twikiUserObject, $testSysWeb, $original); 
     
    169169    my $list = TWiki::Func::getListOfGroups(); 
    170170    my $ulist = join(',', map{$_->stringify()}@$list); 
    171     $this->assert_str_equals('TemporaryFuncUsersTestsUsersWeb.AandBGroup/TemporaryFuncUsersTestsUsersWeb.AandBGroup,TemporaryFuncUsersTestsUsersWeb.AandCGroup/TemporaryFuncUsersTestsUsersWeb.AandCGroup,TemporaryFuncUsersTestsUsersWeb.BandCGroup/TemporaryFuncUsersTestsUsersWeb.BandCGroup,WikiAdminGroup/TemporaryFuncUsersTestsUsersWeb.WikiAdminGroup', $ulist); 
     171    $this->assert_str_equals('TemporaryFuncUsersTestsUsersWeb.AandBGroup/TemporaryFuncUsersTestsUsersWeb.AandBGroup,TemporaryFuncUsersTestsUsersWeb.AandCGroup/TemporaryFuncUsersTestsUsersWeb.AandCGroup,TemporaryFuncUsersTestsUsersWeb.BandCGroup/TemporaryFuncUsersTestsUsersWeb.BandCGroup,AdminGroup/TemporaryFuncUsersTestsUsersWeb.AdminGroup', $ulist); 
    172172} 
    173173 
  • trunk/FundraisingPlugin/data/TWiki/FundraisingPlugin.txt

    r670 r672  
    8787     | ==lib/TWiki/Plugins/%TOPIC%.pm== | Plugin Perl module | 
    8888   * Edit <nop>FundraisingPlugin to suit your needs. 
    89    * Write-protect %TOPIC% against modifications (with bullet =* Set ALLOWTOPICCHANGE = <nop>%USERSWEB%.WikiAdminGroup=). 
    90       * #Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     89   * Write-protect %TOPIC% against modifications (with bullet =* Set ALLOWTOPICCHANGE = <nop>%USERSWEB%.AdminGroup=). 
     90      * #Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    9191   * To enable it on all pages, set %<nop>BROADCASTMESSAGE% to %<nop>FUNDRAISINGMESSAGE% in [[%USERSWEB%.SitePreferences]] topic. 
    9292 
  • trunk/GlobalReplacePlugin/data/TWiki/GlobalReplacePlugin.txt

    r670 r672  
    4949        * This Plugin ignores locked topics, it writes over locked topics 
    5050        * This Plugin is potentially dangerous. Security measures: 
    51                 1 The operations of this Plugin is restricted to the group which can edit the %SYSTEMWEB%.%WIKIPREFSTOPIC% (usually %MAINWEB%.WikiAdminGroup) 
     51                1 The operations of this Plugin is restricted to the group which can edit the %SYSTEMWEB%.%WIKIPREFSTOPIC% (usually %MAINWEB%.AdminGroup) 
    5252                1 For public sites, it is recommended to enable this Plugin only for the short time when needed (it is installed if the following variable shows "installed": %GLOBALREPLACE{func="check"}%) 
    5353        * This Plugin has been tested. However, it does not have ANY WARRANTY, does not even have the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE 
  • trunk/GlobalReplacePlugin/data/TWiki/GlobalSearchAndReplace.txt

    r670 r672  
    33---++ Global Search and Replace 
    44 
    5 Welcome %WIKIUSERNAME% <font size=\"-1\">([[%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%WEB%/%TOPIC%][not me?]])</font>. You must %CALC{"$IF($EXACT(%USERNAME%,guest),[[%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%WEB%/%TOPIC%][login]] and)"}% be a member of the %MAINWEB%.WikiAdminGroup to be able to save your search and replace. 
     5Welcome %WIKIUSERNAME% <font size=\"-1\">([[%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%WEB%/%TOPIC%][not me?]])</font>. You must %CALC{"$IF($EXACT(%USERNAME%,guest),[[%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%WEB%/%TOPIC%][login]] and)"}% be a member of the %MAINWEB%.AdminGroup to be able to save your search and replace. 
    66 
    77<form name="search" action="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%" method="post"> 
     
    4949</script> 
    5050 
    51         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     51        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    5252 
    5353__Related Topics:__ [[GlobalReplacePlugin]], [[%TOPIC%Help]], GlobalSearchAndReplaceTopics 
  • trunk/GlobalReplacePlugin/data/TWiki/GlobalSearchAndReplaceHelp.txt

    r670 r672  
    6565Once the checkboxes are as required, click =Replace All Check Marked Hits= to commit your changes. 
    6666 
    67 Only members of the Main.WikiAdminGroup will be allowed to commit changes.  
     67Only members of the Main.AdminGroup will be allowed to commit changes.  
    6868 
    6969 
  • trunk/GlobalReplacePlugin/data/TWiki/GlobalSearchAndReplaceTopics.txt

    r670 r672  
    99-- TWiki:Main.PaulineCheung - 12 Jan 2004 
    1010 
    11         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup  
     11        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup  
    1212 
  • trunk/HideInEditModePlugin/data/Sandbox/PluginTestHideInEditModePlugin.txt

    r670 r672  
    44 
    55<!-- 
    6    * Set ALLOWTOPICHIDDEN = %MAINWEB%.WikiAdminGroup 
     6   * Set ALLOWTOPICHIDDEN = %MAINWEB%.AdminGroup 
    77--> 
    88 
  • trunk/InlineEditPlugin/data/JSTests/WebPreferences.txt

    r670 r672  
    5353      * #Set ALLOWWEBVIEW =  
    5454      * #Set DENYWEBCHANGE =  
    55       * #Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
     55      * #Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
    5656      * #Set DENYWEBRENAME =  
    57       * #Set ALLOWWEBRENAME = %MAINWEB%.WikiAdminGroup 
     57      * #Set ALLOWWEBRENAME = %MAINWEB%.AdminGroup 
    5858 
    59    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.WikiAdminGroup) 
    60       * #Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    61       * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     59   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.AdminGroup) 
     60      * #Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     61      * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    6262 
    6363   * Web preferences that are *not* allowed to be overridden by user or topic preferences: 
  • trunk/LdapContrib/data/TWiki/LdapContrib.txt

    r671 r672  
    381381 
    382382Prevent certain names from being looked up in LDAP: 
    383 <verbatim>$TWiki::cfg{Ldap}{Exclude} = 'WikiGuest, ProjectContributor, RegistrationAgent, WikiAdminGroup, NobodyGroup'; </verbatim> 
     383<verbatim>$TWiki::cfg{Ldap}{Exclude} = 'WikiGuest, ProjectContributor, RegistrationAgent, AdminGroup, NobodyGroup'; </verbatim> 
    384384 
    385385---++ Updating the LDAP cache using a cronjob 
  • trunk/LdapContrib/lib/TWiki/Contrib/LdapContrib.pm

    r670 r672  
    176176 
    177177    exclude=>$TWiki::cfg{Ldap}{Exclude} ||  
    178       'WikiGuest, TWikiContributor, ProjectContributor, RegistrationAgent, WikiAdminGroup, NobodyGroup', 
     178      'WikiGuest, TWikiContributor, ProjectContributor, RegistrationAgent, AdminGroup, NobodyGroup', 
    179179 
    180180    pageSize=>$TWiki::cfg{Ldap}{PageSize} || 200, 
  • trunk/LdapContrib/lib/TWiki/Contrib/LdapContrib/Config.spec

    r670 r672  
    173173# **STRING 50** 
    174174# Prevent certain names from being looked up in LDAP 
    175 $TWiki::cfg{Ldap}{Exclude} = 'WikiGuest, TWikiContributor, ProjectContributor, RegistrationAgent, WikiAdminGroup, NobodyGroup'; 
     175$TWiki::cfg{Ldap}{Exclude} = 'WikiGuest, TWikiContributor, ProjectContributor, RegistrationAgent, AdminGroup, NobodyGroup'; 
  • trunk/LdapContrib/lib/ldap.cfg

    r670 r672  
    7070 
    7171# prevent certain names from being looked up in ldap 
    72 #$TWiki::cfg{Ldap}{Exclude} = 'WikiGuest, TWikiContributor, ProjectContributor, RegistrationAgent, WikiAdminGroup, NobodyGroup'; 
     72#$TWiki::cfg{Ldap}{Exclude} = 'WikiGuest, TWikiContributor, ProjectContributor, RegistrationAgent, AdminGroup, NobodyGroup'; 
    7373 
    7474# number of user objects to fetch in one paged result when building the username mappings; 
  • trunk/LoginNameAliasesPlugin/data/TWiki/LoginNameAliasesPlugin.txt

    r670 r672  
    77 
    88 
    9 *IMPORTANT: For security reasons, this page should only be editable by people in the %MAINWEB%.WikiAdminGroup.* 
     9*IMPORTANT: For security reasons, this page should only be editable by people in the %MAINWEB%.AdminGroup.* 
    1010 
    1111Because of security considerations, the plugin is not active unless a variable is set in TWiki.cfg.   
     
    3838 
    3939 
    40         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     40        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    4141 
  • trunk/LoginNameAliasesPlugin/data/TWiki/LoginNameAliasesPluginDoc.txt

    r670 r672  
    5959        in TWiki.cfg. 
    6060        * The plugin configuration topic, [[TWiki.LoginNameAliasesPlugin][TWiki.LoginNameAliasesPlugin]], should have 
    61         access permissions set such that only people in the %MAINWEB%.WikiAdminGroup    (or other people who can be trusted) can change it.  By default, the topic is distributed with this access restriction. 
     61        access permissions set such that only people in the %MAINWEB%.AdminGroup        (or other people who can be trusted) can change it.  By default, the topic is distributed with this access restriction. 
    6262 
    6363---++ Caution 
  • trunk/MailInContrib/data/TWiki/MailInContribTemplate.txt

    r670 r672  
    1 %META:TOPICINFO{author="WikiAdminGroup" date="1142879833" format="1.1" version="1.2"}% 
     1%META:TOPICINFO{author="AdminGroup" date="1142879833" format="1.1" version="1.2"}% 
    22---+ Templates for the MailInContrib 
    33 
  • trunk/MakeCtrlTopicsListAddOn/data/TWiki/MakeCtrlTopicsListAddOn.txt

    r670 r672  
    2929<!-- 
    3030###MakeCtrlTopicsList:topicmustbechecked 
    31         * Set ALLOWTOPICHIDDEN = ApproveControlledPagesGroup, WikiAdminGroup 
     31        * Set ALLOWTOPICHIDDEN = ApproveControlledPagesGroup, AdminGroup 
    3232--> 
    3333|%ORANGE% *The QM department has not yet checked this topic for QM relevance.* %ENDCOLOR%| 
  • trunk/NatSkin/data/Main/TWikiGuestSideBar.txt

    r670 r672  
    33%STOPINCLUDE% 
    44 
    5    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     5   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    66   * Set ALLOWTOPICVIEW = %MAINWEB%.WikiGuest 
  • trunk/NatSkin/data/Main/WebLinks.txt

    r670 r672  
    1414 
    1515<!-- 
    16    * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     16   * Set ALLOWTOPICCHANGE = AdminGroup 
    1717--> 
  • trunk/NatSkin/data/TWiki/TWikiWebSideBar.txt

    r670 r672  
    1717</div> 
    1818%TMPL:P{context="natskin_sidebar_pos2" then="searchbox_pos2"}%<!-- --> 
    19 %IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.WikiAdminGroup" type="change"}%" as="1"}% 
     19%IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.AdminGroup" type="change"}%" as="1"}% 
    2020<div class="natSidebarSection" natSideBarAdminLinks"> 
    2121<h2 >Admin</h2> 
  • trunk/NatSkin/templates/plucsearch.nat.tmpl

    r670 r672  
    3333</table>%REPEAT% %SPLIT% 
    3434%DBCALL{"Applications.RenderPageNavigation" SKIP="%URLPARAM{"skip" default="0"}%" LIMIT="%URLPARAM{"limit" default="100"}%" MAX="%NTOPICS%" HREF="%SCRIPTURLPATH{"plucsearch"}%/%BASEWEB%/%BASETOPIC%" PARAMS="search=%URLPARAM{"search"}%;web=%URLPARAM{"web"}%;attachments=%URLPARAM{"attachments"}%"}% 
    35 %IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.WikiAdminGroup" type="change"}%" as="1" glue="off"}% 
     35%IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.AdminGroup" type="change"}%" as="1" glue="off"}% 
    3636---++ Index toos 
    3737%INCLUDE{"%SYSTEMWEB%.SearchEnginePluceneAddOn" section="updateindex"}% 
  • trunk/PingBackPlugin/data/TWiki/PingBackClient.txt

    r670 r672  
    3737 
    3838<!-- 
    39    * Set ALLOWTOPICVIEW = %MAINWEB%.WikiAdminGroup 
     39   * Set ALLOWTOPICVIEW = %MAINWEB%.AdminGroup 
    4040   * Set ENABLEPINGBACK = on 
    4141--> 
  • trunk/PingBackPlugin/data/TWiki/PingBackManager.txt

    r670 r672  
    1818 
    1919<!-- 
    20    * Set ALLOWTOPICVIEW = %MAINWEB%.WikiAdminGroup 
     20   * Set ALLOWTOPICVIEW = %MAINWEB%.AdminGroup 
    2121--> 
  • trunk/PollPlugin/data/Sandbox/PollExample.txt

    r670 r672  
    7575---- 
    7676 
    77         * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
    78         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     77        * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
     78        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    7979        * Set DENYTOPICVOTE = %MAINWEB%.WikiGuest 
    8080 
  • trunk/PublishContrib/data/TWiki/PublishWeb.txt

    r670 r672  
    1 %META:TOPICINFO{author="WikiAdminGroup" date="1170262421" format="1.1" version="1.2"}% 
     1%META:TOPICINFO{author="AdminGroup" date="1170262421" format="1.1" version="1.2"}% 
    22This is a template topic for use with PublishContrib. It illustrates how 
    33to set up a topic in a web to simplify publishing. 
  • trunk/QuickMenuSkin/data/TWiki/QuickMenuBarUtilities.txt

    r670 r672  
    22<pre>%STARTINCLUDE%<noautolink> 
    33utilMenu = new QuickMenu.Menu(menuBar,"%MAKETEXT{"Utilities"}%","","","%MAKETEXT{"Utilities available for this Web"}%"); 
    4 if ("%USERINFO{format="$groups"}%".match(/WikiAdminGroup/)) { 
     4if ("%USERINFO{format="$groups"}%".match(/AdminGroup/)) { 
    55  utilMenu.Add("%MAKETEXT{"Users"}%","%SCRIPTURLPATH{"view"}%/%MAINWEB%/WikiUsers","%ICONURLPATH{"person"}%"); 
    66  utilMenu.Add("%MAKETEXT{"Groups"}%","%SCRIPTURLPATH{"view"}%/%MAINWEB%/TWikiGroups","%ICONURLPATH{"group"}%"); 
  • trunk/RedDotPlugin/data/TWiki/RedDotPlugin.txt

    r670 r672  
    4848---++ Examples 
    4949        * %TOPIC%%REDDOT%  will get a red dot only if you are in the  
    50           %MAINWEB%.WikiAdminGroup. 
     50          %MAINWEB%.AdminGroup. 
    5151        * %WIKIUSERNAME%%REDDOT{"%WIKIUSERNAME%"}% points to your homepage. 
    5252 
  • trunk/SignaturePlugin/data/TWiki/SignaturePlugin.txt

    r670 r672  
    4444        * If installed correctly you should see a button with the label indicated by the setting below. 
    4545 
    46 %SIGNATURE{name="WikiAdminGroup"}% 
     46%SIGNATURE{name="AdminGroup"}% 
    4747 
    4848---++ Plugin Info 
  • trunk/SpanishTWikiContrib/data/TWiki_ES/WebPreferences.txt

    r670 r672  
    4444 
    4545   * Usuarios o grupos quienes __no tienen__ / __tienen__ permiso de __ver__ / __modificar__ / __renombrar__ temas en la web <nop>%WEB%: (Ver %SYSTEMWEB%.AccessControl). 
    46       * Set ALLOWWEBCHANGE = %USERSWEB%.WikiAdminGroup 
    47       * Set ALLOWWEBRENAME = %USERSWEB%.WikiAdminGroup 
     46      * Set ALLOWWEBCHANGE = %USERSWEB%.AdminGroup 
     47      * Set ALLOWWEBRENAME = %USERSWEB%.AdminGroup 
    4848 
    4949   * Usuarios o grupos quienes tienen permiso de modificar o renombrar este tema <nop>%TOPIC%: (e.g., %USERSWEB%.WebAdministratorsGroup) 
    50       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
     50      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
    5151 
    5252   * Preferencias de web que *no* pueden ser sobrescritos por preferencias de usuarios o temas: 
  • trunk/SpanishTWikiContrib/data/TWiki_ES/WebStatistics.txt

    r670 r672  
    1 %META:TOPICINFO{author="WikiAdminGroup" date="1211952604" format="1.1" version="1.34"}% 
     1%META:TOPICINFO{author="AdminGroup" date="1211952604" format="1.1" version="1.34"}% 
    22%META:TOPICPARENT{name="WebHome"}% 
    33---++ Statistics for <nop>%WEB% Web 
  • trunk/StylePlugin/data/TWiki/StylePlugin.txt

    r670 r672  
    1414a plugin setting write ==%<nop>&lt;plugin&gt;_&lt;setting&gt;%==, i.e. ==%<nop>STYLEPLUGIN_SHORTDESCRIPTION%== 
    1515        * Security 
    16                 * Set ALLOWTOPICCHANGE = Main.WikiAdminGroup 
    17                 * Set ALLOWTOPICRENAME = Main.WikiAdminGroup 
     16                * Set ALLOWTOPICCHANGE = Main.AdminGroup 
     17                * Set ALLOWTOPICRENAME = Main.AdminGroup 
    1818 
    1919        * One line description, is shown in the %SYSTEMWEB%.TextFormattingRules topic: 
  • trunk/TWikiDotNetForumAppAddOn/data/Forum/DiscussionForumAdministration.txt

    r670 r672  
    3838---++ Access Control 
    3939 
    40    * Set ALLOWTOPICVIEW = %MAINWEB%.WikiAdminGroup 
     40   * Set ALLOWTOPICVIEW = %MAINWEB%.AdminGroup 
    4141 
    4242__Note:__ This Discussion Forum TWiki Application is &copy; 2007 [[http://www.twiki.net][TWIKI.NET]] 
  • trunk/TWikiDotNetForumAppAddOn/data/Forum/DiscussionForumTemplate.txt

    r670 r672  
    33%INCLUDE{DiscussionForumBody}% 
    44<!-- 
    5    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     5   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    66--> 
    77 
  • trunk/TWikiDotNetForumAppAddOn/data/Forum/ForumSandbox.txt

    r670 r672  
    22%INCLUDE{DiscussionForumBody}% 
    33<!-- 
    4    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     4   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    55--> 
    66 
  • trunk/TWikiDotNetForumAppAddOn/data/Forum/WebPreferences.txt

    r670 r672  
    5151      * Set ALLOWWEBRENAME =  
    5252 
    53    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.WikiAdminGroup) 
    54       * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    55       * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     53   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.AdminGroup) 
     54      * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     55      * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    5656 
    5757   * Web preferences that are *not* allowed to be overridden by user or topic preferences: 
  • trunk/TWikiDotNetForumAppAddOn/data/Forum/WebStatistics.txt

    r670 r672  
    1 %META:TOPICINFO{author="WikiAdminGroup" date="1207896901" format="1.1" version="1.236"}% 
     1%META:TOPICINFO{author="AdminGroup" date="1207896901" format="1.1" version="1.236"}% 
    22%META:TOPICPARENT{name="WebHome"}% 
    33---++ Statistics for <nop>%WEB% Web 
  • trunk/TWikiDotNetForumAppAddOn/data/TWiki/TWikiDotNetForumAppAddOn.txt

    r670 r672  
    55 
    66   * The discussion forum application is hosted in a dedicated Forum.WebHome web 
    7    * Members of the %MAINWEB%.WikiAdminGroup can create new forums 
     7   * Members of the %MAINWEB%.AdminGroup can create new forums 
    88   * Anyone can create a new discussion topic in a forum 
    99   * Anyone can add a new comment to an existing discussion topic 
  • trunk/TWikiInstallerContrib/lib/TWiki/Contrib/TWikiInstallerContrib/plugins.NOTES

    r670 r672  
    332332   * %SYSTEMWEB%.AccessControl has ^ in table header (that's only without the TablePlugin enabled) 
    333333 
    334    * TWikiGroups doesn't seem to be working (eg, showing values from WikiAdminGroup, but not from BlogAdminGroup and BlogAuthorsGroup) 
     334   * TWikiGroups doesn't seem to be working (eg, showing values from AdminGroup, but not from BlogAdminGroup and BlogAuthorsGroup) 
    335335      * ok, it shows all of the groups now, but doesn't show any of the group members from any of the groups 
    336336 
  • trunk/TWikiInstallerContrib/lib/TWiki/Contrib/TWikiInstallerContrib/remote-install

    r671 r672  
    5353# 
    5454# administrator ($WikiAdmin) 
    55 #       (and update Main.WikiAdminGroup) 
     55#       (and update Main.AdminGroup) 
    5656# wikiwebmaster (for email about this wiki site) -  
    5757#       (and update TWiki.MainPreferences) - $wikiWebMaster 
     
    599599 
    600600<b>WikiAdmin</b> <input type="text" name="WikiAdmin" id="WikiAdmin" size="35" value="$WikiAdmin" /><br /> 
    601 <div class=help id=WikiAdmin_help>This TWiki account will be created and added to the <a target="_new" href="http://twiki.org/cgi-bin/view/TWiki/AccessControl#The_Super_Admin_Group">WikiAdminGroup</a>.  
     601<div class=help id=WikiAdmin_help>This TWiki account will be created and added to the <a target="_new" href="http://twiki.org/cgi-bin/view/TWiki/AccessControl#The_Super_Admin_Group">AdminGroup</a>.  
    602602A password will be automatically generated and sent to the email specified by WebMasterEmail below<br/></div> 
    603603 
  • trunk/TWikiWorkbenchAddOn/data/Applications/WebPreferences.txt

    r670 r672  
    3939   * Set #ALLOWWEBVIEW =  
    4040   * Set DENYWEBCHANGE = %MAINWEB%.WikiGuest 
    41    * Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
    42    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     41   * Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
     42   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    4343 
    4444---+++ Application Pointer 
  • trunk/TWikiWorkbenchAddOn/data/_TWikiApplicationTemplate/WebPreferences.txt

    r670 r672  
    3636   * Set #ALLOWWEBVIEW =  
    3737   * Set DENYWEBCHANGE = %MAINWEB%.WikiGuest 
    38    * Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
    39    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     38   * Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
     39   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
    4040 
    4141---+++ Application Pointer 
  • trunk/TagMePlugin/data/TWiki/TagMePlugin.txt

    r670 r672  
    343343        Users that are not allowed to change post their change requests to TagMeChangeRequests. %BR% 
    344344        If not set anyone can change tags. 
    345                 * Set ALLOW_TAG_CHANGE = Main.WikiAdminGroup 
     345                * Set ALLOW_TAG_CHANGE = Main.AdminGroup 
    346346 
    347347        * Bundles are groups of tags that are presented as menus for 
  • trunk/TopicClassificationAddOn/data/TCAO/CreateNewTopic.txt

    r670 r672  
    44 
    55<!-- Topic Permissions 
    6         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    7         * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     6        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     7        * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    88--> 
    99 
    1010 
    11 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25MAINWEB%25.WikiAdminGroup"}% 
    12 %META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25MAINWEB%25.WikiAdminGroup"}% 
     11%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25MAINWEB%25.AdminGroup"}% 
     12%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25MAINWEB%25.AdminGroup"}% 
  • trunk/TopicClassificationAddOn/data/TCAO/HelpTopic.txt

    r670 r672  
    1010</div> 
    1111<!-- Topic Permissions 
    12         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    13         * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     12        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     13        * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    1414--> 
    1515 
  • trunk/TopicClassificationAddOn/data/TCAO/Installs/ContentOrganization.txt

    r670 r672  
    1515 
    1616<!-- Topic Permissions 
    17    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    18    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     17   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     18   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    1919--> 
    2020 
  • trunk/TopicClassificationAddOn/data/TCAO/Installs/CreateNewTopic.txt

    r670 r672  
    44 
    55<!-- Topic Permissions 
    6         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    7         * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     6        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     7        * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    88--> 
    99 
    1010 
    11 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25MAINWEB%25.WikiAdminGroup"}% 
    12 %META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25MAINWEB%25.WikiAdminGroup"}% 
     11%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25MAINWEB%25.AdminGroup"}% 
     12%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25MAINWEB%25.AdminGroup"}% 
  • trunk/TopicClassificationAddOn/data/TCAO/Installs/Summary.txt

    r670 r672  
    33 
    44<!-- Topic Permissions 
    5    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    6    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     5   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     6   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    77--> 
    88 
    99%META:TOPICMOVED{by="LynnwoodBrown" date="1160083618" from="TCAO2/Installs.TopicHeadline" to="TCAO2/Installs.Summary"}% 
    10 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%2525MAINWEB%2525.WikiAdminGroup"}% 
    11 %META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%2525MAINWEB%2525.WikiAdminGroup"}% 
     10%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%2525MAINWEB%2525.AdminGroup"}% 
     11%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%2525MAINWEB%2525.AdminGroup"}% 
  • trunk/TopicClassificationAddOn/data/TCAO/Installs/TopicClassForm.txt

    r670 r672  
    1010 
    1111<!-- Topic Permissions 
    12    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    13    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     12   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     13   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    1414--> 
    1515 
  • trunk/TopicClassificationAddOn/data/TCAO/Installs/TopicClassification.txt

    r670 r672  
    1212 
    1313<!-- Topic Settings 
    14    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    15    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     14   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     15   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    1616   * Set HELPTOPIC = %TCAOWEB%.PostTCAOInstallHelp 
    1717--> 
  • trunk/TopicClassificationAddOn/data/TCAO/Installs/TopicForm.txt

    r670 r672  
    1010 
    1111<!-- Topic Permissions 
    12    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    13    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     12   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     13   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    1414--> 
    1515 
  • trunk/TopicClassificationAddOn/data/TCAO/Installs/TopicTree.txt

    r670 r672  
    66 
    77<!-- Topic Permissions 
    8         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    9         * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     8        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     9        * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    1010--> 
    1111 
  • trunk/TopicClassificationAddOn/data/TCAO/Installs/WebPreferences.txt

    r670 r672  
    4141                *# Set ALLOWWEBRENAME =  
    4242 
    43         * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.WikiAdminGroup) 
     43        * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.AdminGroup) 
    4444                * #Set ALLOWTOPICCHANGE =  
    45                 * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     45                * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    4646 
    4747        * Web preferences that are *not* allowed to be overridden by user preferences: 
  • trunk/TopicClassificationAddOn/data/TCAO/MasterTopic.txt

    r670 r672  
    1616 
    1717<!-- Topic Permissions 
    18    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    19    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     18   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     19   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    2020--> 
    2121 
  • trunk/TopicClassificationAddOn/data/TCAO/TcaoAdmin.txt

    r670 r672  
    44 
    55<!-- Topic Permissions 
    6    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    7    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     6   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     7   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    88--> 
    99 
     
    1313%META:FIELD{name="Summary" attributes="" title="Summary" value="Topics related to administrating the TCAO application."}% 
    1414%META:FIELD{name="Facets" attributes="" title="Facets" value="TopicType"}% 
    15 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%2525MAINWEB%2525.WikiAdminGroup"}% 
    16 %META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%2525MAINWEB%2525.WikiAdminGroup"}% 
     15%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%2525MAINWEB%2525.AdminGroup"}% 
     16%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%2525MAINWEB%2525.AdminGroup"}% 
  • trunk/TopicClassificationAddOn/data/TCAO/TcaoUse.txt

    r670 r672  
    44 
    55<!-- Topic Permissions 
    6    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    7    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     6   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     7   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    88--> 
    99 
     
    1313%META:FIELD{name="Summary" attributes="" title="Summary" value="Basic information about using TCAO"}% 
    1414%META:FIELD{name="Facets" attributes="" title="Facets" value="TopicType"}% 
    15 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%2525MAINWEB%2525.WikiAdminGroup"}% 
    16 %META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%2525MAINWEB%2525.WikiAdminGroup"}% 
     15%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%2525MAINWEB%2525.AdminGroup"}% 
     16%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%2525MAINWEB%2525.AdminGroup"}% 
  • trunk/TopicClassificationAddOn/data/TCAO/TopicClassification.txt

    r670 r672  
    2020%META:FIELD{name="Summary" attributes="" title="Summary" value="The basic overview of how TCAO organizes content within a web."}% 
    2121%META:REVCOMMENT{ncomments="0"}% 
    22 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25MAINWEB%25.WikiAdminGroup"}% 
    23 %META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25MAINWEB%25.WikiAdminGroup"}% 
     22%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25MAINWEB%25.AdminGroup"}% 
     23%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25MAINWEB%25.AdminGroup"}% 
  • trunk/TopicClassificationAddOn/data/TCAO/TopicClassificationAddOn.txt

    r670 r672  
    8989 
    9090---+++ Setting up Topic Classification within a web 
    91 Once %TOPIC% is enabled within a web, you're ready to start defining *TopicTypes* and *SubjectAreas* to be used in that web. To do this, go to those respective topics (e.g. go to !TopicType to add new !TopicTypes) and use form at bottom that is only visible to members of !ModeratorGroup (or %MAINWEB%.WikiAdminGroup, of course). 
     91Once %TOPIC% is enabled within a web, you're ready to start defining *TopicTypes* and *SubjectAreas* to be used in that web. To do this, go to those respective topics (e.g. go to !TopicType to add new !TopicTypes) and use form at bottom that is only visible to members of !ModeratorGroup (or %MAINWEB%.AdminGroup, of course). 
    9292 
    9393---++ Add-On Info 
  • trunk/TopicClassificationAddOn/data/TCAO/TopicForm.txt

    r670 r672  
    3131 
    3232<!-- Topic Permissions 
    33    * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    34    * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     33   * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     34   * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    3535--> 
    3636 
  • trunk/TopicClassificationAddOn/data/TCAO/TopicType.txt

    r670 r672  
    66 
    77<!-- Topic Permissions 
    8         * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    9         * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     8        * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     9        * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    1010--> 
    1111 
     
    1414%META:FIELD{name="Summary" attributes="" title="Summary" value="Organize content by function or topic structure."}% 
    1515%META:FIELD{name="Facets" attributes="" title="Facets" value=""}% 
    16 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25MAINWEB%25.WikiAdminGroup"}% 
    17 %META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25MAINWEB%25.WikiAdminGroup"}% 
     16%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25MAINWEB%25.AdminGroup"}% 
     17%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25MAINWEB%25.AdminGroup"}% 
  • trunk/TopicClassificationAddOn/data/TCAO/WebLogHeading.txt

    r670 r672  
    1313%META:FIELD{name="Summary" attributes="" title="Summary" value="Provides formatting for heading of !WebLog topics."}% 
    1414%META:REVCOMMENT{comment_1=" " minor_1="1" ncomments="1" rev_1="3" t_1="1167174229"}% 
    15 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%2525MAINWEB%2525.WikiAdminGroup"}% 
    16 %META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%2525MAINWEB%2525.WikiAdminGroup"}% 
     15%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%2525MAINWEB%2525.AdminGroup"}% 
     16%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%2525MAINWEB%2525.AdminGroup"}% 
  • trunk/TopicClassificationAddOn/data/TCAO/WebPreferences.txt

    r670 r672  
    4141                *# Set ALLOWWEBVIEW =  
    4242                *# Set DENYWEBCHANGE =  
    43                 * Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
     43                * Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
    4444                *# Set DENYWEBRENAME =  
    4545                *# Set ALLOWWEBRENAME =  
    4646 
    47         * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.WikiAdminGroup) 
    48                 * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    49                 * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     47        * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.AdminGroup) 
     48                * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     49                * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    5050 
    5151        * Web preferences that are *not* allowed to be overridden by user preferences: 
  • trunk/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt

    r670 r672  
    4444 
    4545---+++ Setting up Topic Classification within a web 
    46 Once %TOPIC% is enabled within a web, you're ready to start defining *TopicTypes* and *SubjectAreas* to be used in that web. To do this, go to those respective topics (e.g. go to !TopicType to add new !TopicTypes) and use form at bottom that is only visible to members of !ModeratorGroup (or %MAINWEB%.WikiAdminGroup, of course). 
     46Once %TOPIC% is enabled within a web, you're ready to start defining *TopicTypes* and *SubjectAreas* to be used in that web. To do this, go to those respective topics (e.g. go to !TopicType to add new !TopicTypes) and use form at bottom that is only visible to members of !ModeratorGroup (or %MAINWEB%.AdminGroup, of course). 
    4747 
    4848---++ Add-On Info 
  • trunk/TopicUserMappingContrib/data/Main/NobodyGroup.txt

    r670 r672  
    55      * Set GROUP =  
    66   * Persons/group who can change the list: 
    7       * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     7      * Set ALLOWTOPICCHANGE = AdminGroup 
    88 
    99Used 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. 
  • trunk/TopicUserMappingContrib/data/Main/RegistrationAgent.txt

    r670 r672  
    66__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]] 
    77 
    8 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="WikiAdminGroup"}% 
     8%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}% 
  • trunk/TopicUserMappingContrib/data/Main/TWikiAdminGroup.txt

    r671 r672  
    66      * Set GROUP =  
    77   * Persons/group who can change the list: 
    8       * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     8      * Set ALLOWTOPICCHANGE = AdminGroup 
    99 
    1010%INCLUDE{"%MAINWEB%.WikiAdminUser" section="sudo_login"}% 
     
    2222   1 Verify that new members show up properly in the group listing at %MAINWEB%.TWikiGroups 
    2323   1 Make sure always to keep this topic write protected by keeping the already defined ALLOWTOPICCHANGE setting 
    24    1 The ALLOWTOPICHANGE and ALLOWTOPICRENAME settings in [[%SYSTEMWEB%.DefaultPreferences]] and [[%USERSWEB%.SitePreferences]] have already been set to this group (<nop>WikiAdminGroup), restricting edit of site-wide preferences to the Wiki Administrator Group 
     24   1 The ALLOWTOPICHANGE and ALLOWTOPICRENAME settings in [[%SYSTEMWEB%.DefaultPreferences]] and [[%USERSWEB%.SitePreferences]] have already been set to this group (<nop>AdminGroup), restricting edit of site-wide preferences to the Wiki Administrator Group 
    2525<sticky></div></sticky> 
    2626%IF{"(NOT defined GROUP) OR $GROUP = ''" then="" else="-->"}% 
  • trunk/TopicUserMappingContrib/data/TWiki/BulkResetPassword.txt

    r670 r672  
    5353__Related Topics:__ AdminToolsCategory 
    5454 
    55       * Set ALLOWTOPICVIEW = %MAINWEB%.WikiAdminGroup 
    56       * Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
     55      * Set ALLOWTOPICVIEW = %MAINWEB%.AdminGroup 
     56      * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
  • trunk/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt

    r671 r672  
    149149%FORMDATA% 
    150150 
    151 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="Main.WikiAdminGroup"}% 
     151%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="Main.AdminGroup"}% 
    152152</verbatim> 
    153153   * __remember to secure the topic appropriately to prevent attackers from getting emailed sensitive passwords.__ 
  • trunk/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt

    r670 r672  
    3232   * default groups and user 
    3333      * Main.NobodyGroup 
    34       * Main.WikiAdminGroup 
     34      * Main.AdminGroup 
    3535      * Main.RegistrationAgent     
    3636   * User lists 
  • trunk/TopicUserMappingContrib/data/TWiki/UsersTemplate.txt

    r670 r672  
    1 %META:TOPICINFO{author="WikiAdminGroup" date="1178574333" format="1.1" reprev="1.2" version="1.2"}% 
     1%META:TOPICINFO{author="AdminGroup" date="1178574333" format="1.1" reprev="1.2" version="1.2"}% 
    22---+ List of <nop>%WIKITOOLNAME% users 
    33 
     
    5050 
    5151__Access Control:__ 
    52    * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     52   * Set ALLOWTOPICCHANGE = AdminGroup 
  • trunk/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST

    r670 r672  
    1212data/Main/UserList.txt 0644 
    1313data/Main/UserListByDateJoined.txt 0644 
    14 data/Main/WikiAdminGroup.txt 0644 TWiki compatible admin group 
     14data/Main/AdminGroup.txt 0644 TWiki compatible admin group 
    1515data/Main/AdminGroup.txt 0644 
    1616data/Main/UserHomepageHeader.txt 0644 
  • trunk/UnitTestContrib/test/unit/ClientTests.pm

    r670 r672  
    2727        $this->{twiki}->{user}, $this->{test_web}, 
    2828        $this->{test_topic}, <<CONSTRAINT); 
    29    * Set ALLOWTOPICCHANGE = WikiAdminGroup 
     29   * Set ALLOWTOPICCHANGE = AdminGroup 
    3030CONSTRAINT 
    3131} 
  • trunk/UnitTestContrib/test/unit/FuncUsersTests.pm

    r670 r672  
    214214    my @list; 
    215215 
    216     $TWiki::cfg{SuperAdminGroup} = 'WikiAdminGroup'; 
     216    $TWiki::cfg{SuperAdminGroup} = 'AdminGroup'; 
    217217    # Force a re-read 
    218218    $this->{twiki}->finish(); 
     
    229229    my @correctList; 
    230230    if ($TWiki::cfg{UserMappingManager} eq 'TWiki::Users::BaseUserMapping') { 
    231          @correctList = qw/WikiAdminGroup TWikiBaseGroup/; 
     231         @correctList = qw/AdminGroup TWikiBaseGroup/; 
    232232    } else { 
    233          @correctList = qw/AdminGroup AandBGroup AandCGroup BandCGroup ScumGroup WikiAdminGroup TWikiBaseGroup/; 
     233         @correctList = qw/AdminGroup AandBGroup AandCGroup BandCGroup ScumGroup AdminGroup TWikiBaseGroup/; 
    234234    } 
    235235    my $correct = join(',', sort @correctList); 
  • trunk/UserInfoPlugin/data/TWiki/UserInfoPlugin.txt

    r670 r672  
    100100                   use IGNORE_USERS in LASTVISITORS | 
    101101|  27 May 2006: | fixed error computing the number of last visitors (TWiki:Main.DavidBright); \ 
    102                   exclude the <no>WikiAdminGroup "user" from the statistics; \ 
     102                  exclude the <no>AdminGroup "user" from the statistics; \ 
    103103                  check back if the user found in the logs already approved his account;\ 
    104104                  fixed use of non-numerical value in comparison | 
  • trunk/UserInfoPlugin/lib/TWiki/Plugins/UserInfoPlugin/Core.pm

    r670 r672  
    7171  $this->{ignoreUsers} .=  
    7272    $this->{WikiGuest} . 
    73     '|'.'WikiAdminGroup' . 
     73    '|'.'AdminGroup' . 
    7474    '|'.'UnknownUser' . 
    7575    '|'.$TWiki::cfg{Register}{RegistrationAgentWikiName} . 
  • trunk/WebPermissionsPlugin/data/TWiki/WebPermissionsPlugin.txt

    r670 r672  
    7070                                <select size="5" name="topiceditors" multiple="multiple" style="width: 100%;"> 
    7171                                         <optgroup label="Groups"> 
    72                     <option>WikiAdminGroup</option>                       
     72                    <option>AdminGroup</option>                   
    7373                                         </optgroup><optgroup label="Users"> 
    7474                    <option>AnnieLennox</option> 
  • trunk/YetAnotherXpTrackerPlugin/data/_default_XpTracker/WebPreferences.txt

    r670 r672  
    7070      * #Set ALLOWWEBVIEW =  
    7171      * #Set DENYWEBCHANGE =  
    72       * #Set ALLOWWEBCHANGE = %MAINWEB%.WikiAdminGroup 
     72      * #Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup 
    7373      * #Set DENYWEBRENAME =  
    74       * #Set ALLOWWEBRENAME = %MAINWEB%.WikiAdminGroup 
     74      * #Set ALLOWWEBRENAME = %MAINWEB%.AdminGroup 
    7575 
    76    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.WikiAdminGroup) 
    77       * #Set ALLOWTOPICCHANGE = %MAINWEB%.WikiAdminGroup 
    78       * Set ALLOWTOPICRENAME = %MAINWEB%.WikiAdminGroup 
     76   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %MAINWEB%.AdminGroup) 
     77      * #Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup 
     78      * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup 
    7979 
    8080   * Web preferences that are *not* allowed to be overridden by user or topic preferences: 
  • trunk/core/data/Main/ProjectContributor.txt

    r670 r672  
    66__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]] 
    77 
    8 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="WikiAdminGroup"}% 
     8%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}% 
    99 
  • trunk/core/data/Main/SitePreferences.txt

    r670 r672  
    1313 
    1414<!-- Keep this as a security measure: 
    15    * Set ALLOWTOPICCHANGE = WikiAdminGroup 
    16    * Set ALLOWTOPICRENAME = WikiAdminGroup 
     15   * Set ALLOWTOPICCHANGE = AdminGroup 
     16   * Set ALLOWTOPICRENAME = AdminGroup 
    1717--> 
    1818 
  • trunk/core/data/Main/TWikiGroups.txt

    r670 r672  
    2525   * There is enough peer pressure to post only appropriate content. 
    2626   * Content does not get lost because topics are under revision control. 
    27    * A topic revision can be undone by a member of the [[%USERSWEB%.WikiAdminGroup][WikiAdminGroup]] if necesssary. 
     27   * A topic revision can be undone by a member of the [[%USERSWEB%.AdminGroup][AdminGroup]] if necesssary. 
    2828 
    2929__Related topics:__ [[%SYSTEMWEB%.AccessControl][AccessControl]], [[%WEBPREFSTOPIC%]], [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.WikiCulture][WikiCulture]] 
  • trunk/core/data/Main/UnknownUser.txt

    r670 r672  
    66__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]] 
    77 
    8 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="WikiAdminGroup"}% 
     8%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}% 
    99 
  • trunk/core/data/Main/WebPreferences.txt

    r670 r672  
    3333      * Set ALLOWWEBRENAME =  
    3434 
    35    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., [[%USERSWEB%.WikiAdminGroup][WikiAdminGroup]]) 
    36       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    37       * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     35   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., [[%USERSWEB%.AdminGroup][AdminGroup]]) 
     36      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     37      * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    3838 
    3939   * Web preferences that are *not* allowed to be overridden by sub-web, user or topic preferences: 
  • trunk/core/data/Main/WikiAdminUser.txt

    r671 r672  
    55or to temporarily login as %TOPIC% using the password set in configure, and then log back out to the same User and Group as before. 
    66 
    7 This means it is no longer necessary to add yourself to the WikiAdminGroup, and you will be able to quicky 
     7This means it is no longer necessary to add yourself to the AdminGroup, and you will be able to quicky 
    88change to Admin User (and back to your user) only when you need to. 
    99 
     
    2525   * If your TWiki is configured to use !ApacheLoginManager, you will need to log in as a valid user first. 
    2626    
    27 __Related topics:__ [[%WIKIUSERSTOPIC%]], [[WikiAdminGroup]], [[TWikiGroups]], [[%SYSTEMWEB%.AccessControl][AccessControl]] 
     27__Related topics:__ [[%WIKIUSERSTOPIC%]], [[AdminGroup]], [[TWikiGroups]], [[%SYSTEMWEB%.AccessControl][AccessControl]] 
    2828--- 
    2929 
  • trunk/core/data/Main/WikiGuest.txt

    r671 r672  
    66__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]] 
    77 
    8 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="WikiAdminGroup"}% 
     8%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}% 
  • trunk/core/data/Sandbox/WebHome.txt

    r670 r672  
    3737 
    3838 
    39    * Set ALLOWTOPICCHANGE = Main.WikiAdminGroup 
     39   * Set ALLOWTOPICCHANGE = Main.AdminGroup 
  • trunk/core/data/Sandbox/WebPreferences.txt

    r670 r672  
    3131      * Set ALLOWWEBRENAME =  
    3232 
    33    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., [[%USERSWEB%.WikiAdminGroup][WikiAdminGroup]]) 
    34       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    35       * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     33   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., [[%USERSWEB%.AdminGroup][AdminGroup]]) 
     34      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     35      * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    3636 
    3737   * Web preferences that are *not* allowed to be overridden by sub-web, user or topic preferences: 
  • trunk/core/data/TWiki/AccessControl.txt

    r671 r672  
    1616   * *Peer editing* - the ability for anyone to rearrange all content on a page - keeps topics focused. 
    1717   * In TWiki, content is transparently preserved under *revision control*: 
    18       * Edits can be undone by the administrator (per default a member of %USERSWEB%.WikiAdminGroup; see [[#ManagingGroups]]). 
     18      * Edits can be undone by the administrator (per default a member of %USERSWEB%.AdminGroup; see [[#ManagingGroups]]). 
    1919      * Users are encouraged to edit and refactor (condense a long topic), since there's a safety net. 
    2020As a *collaboration guideline*: 
     
    6767---+++ The Super Admin Group 
    6868 
    69 A number of TWiki functions (for example, renaming webs) are only available to administrators. Administrators are simply users who belong to the *SuperAdminGroup*. This is a standard user group, the name of which is defined by {SuperAdminGroup} setting in [[%SCRIPTURLPATH{"configure"}%][configure]]. The default name of this group is the =WikiAdminGroup=. The system administrator may have chosen a different name for this group if your local TWiki uses an alternate group mapping manager but for simplicity we will use the default name !WikiAdminGroup in the rest of this topic. 
    70  
    71 You can create new administrators simply by adding them to the %USERSWEB%.WikiAdminGroup topic. For example, 
     69A number of TWiki functions (for example, renaming webs) are only available to administrators. Administrators are simply users who belong to the *SuperAdminGroup*. This is a standard user group, the name of which is defined by {SuperAdminGroup} setting in [[%SCRIPTURLPATH{"configure"}%][configure]]. The default name of this group is the =AdminGroup=. The system administrator may have chosen a different name for this group if your local TWiki uses an alternate group mapping manager but for simplicity we will use the default name !AdminGroup in the rest of this topic. 
     70 
     71You can create new administrators simply by adding them to the %USERSWEB%.AdminGroup topic. For example, 
    7272   * ==Set <nop>GROUP = <nop>%USERSWEB%.ElizabethWindsor, <nop>%USERSWEB%.TonyBlair== 
    7373A member of the Super Admin Group has unrestricted access throughout the TWiki, so only trusted staff should be added to this group. 
  • trunk/core/data/TWiki/DefaultPreferences.txt

    r671 r672  
    139139 
    140140   * Users or groups allowed to [[%SYSTEMWEB%.ManagingWebs][create new top-level webs]]: (ex: %USERSWEB%.WebCreatorsGroup). If set to nothing, only administrators will be able to do this. 
    141       * Set ALLOWROOTCHANGE = %USERSWEB%.WikiAdminGroup 
     141      * Set ALLOWROOTCHANGE = %USERSWEB%.AdminGroup 
    142142 
    143143---+++ Search Settings 
     
    330330 
    331331   * No-one (except admins) should change this topic 
    332       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    333       * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     332      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     333      * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    334334 
    335335---++ Creating New Preference Variables 
  • trunk/core/data/TWiki/IfStatements.txt

    r670 r672  
    848410. Group membership 
    8585<verbatim> 
    86 You %IF{"'%USERNAME%' ingroup 'WikiAdminGroup'" then="are an admin" else="are a normal user"}%  
     86You %IF{"'%USERNAME%' ingroup 'AdminGroup'" then="are an admin" else="are a normal user"}%  
    8787</verbatim> 
    8888expands to: %BR% 
    89 You %IF{"'%USERNAME%' ingroup 'WikiAdminGroup'" then="are an admin" else="are a normal user"}%  
     89You %IF{"'%USERNAME%' ingroup 'AdminGroup'" then="are an admin" else="are a normal user"}%  
    9090 
    9191*Configuration items* are defined in [[%SCRIPTURLPATH{"configure"}%][configure]]. You cannot see the value of a configuration item, you can only see if the item is set or not. 
  • trunk/core/data/TWiki/InstallationGuide.txt

    r671 r672  
    116116---++ Define the Administrator User(s) 
    117117 
    118 Administrators have read and write access to any topic, irrespectively of TWiki access controls. When you install TWiki one of the first things you will want to do is define yourself as an administrator. You become an administrator simply by adding yourself to the =WikiAdminGroup=. It is the WikiName and not the login name you add to the group. Editing the =%USERSWEB%.AdminGroup= topic requires that you are an administrator. So to add the first administrator you need to login using the internal Wiki admin user login and the password you defined in configure. 
     118Administrators have read and write access to any topic, irrespectively of TWiki access controls. When you install TWiki one of the first things you will want to do is define yourself as an administrator. You become an administrator simply by adding yourself to the =AdminGroup=. It is the WikiName and not the login name you add to the group. Editing the =%USERSWEB%.AdminGroup= topic requires that you are an administrator. So to add the first administrator you need to login using the internal Wiki admin user login and the password you defined in configure. 
    119119 
    120120   * Navigate to the =%USERSWEB%.AdminGroup= topic 
    121    * Follow carefully the steps =%USERSWEB%.WikiAdminGroup= of how to become an admin 
     121   * Follow carefully the steps =%USERSWEB%.AdminGroup= of how to become an admin 
    122122   * Note that if you use _ApacheLogin_ you have to be registered and logged in before you use the _internal admin login_ 
    123123 
  • trunk/core/data/TWiki/RegistrationApprovals.txt

    r670 r672  
    44Attachments are made when people first register, held pending until the registration is confirmed and approved, and are removed when registration is completed. 
    55 
    6    * Set ALLOWTOPICVIEW = %USERSWEB%.WikiAdminGroup 
    7    * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    8    * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     6   * Set ALLOWTOPICVIEW = %USERSWEB%.AdminGroup 
     7   * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     8   * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    99 
    1010__Related Topics:__ AdminToolsCategory 
  • trunk/core/data/TWiki/ReleaseHistory.txt

    r671 r672  
    538538      * Forms to change/reset/install passwords, see ChangePassword &amp; ResetPassword 
    539539   * *01 May 2001* - TWiki:Main.AndreaSterbini 
    540       * The %MAINWEB%.WikiAdminGroup (or other group) can be enabled as a [[AccessControl#SuperAdminGroup][SuperAdminGroup]]. Members have browser edit access to _all_ locked topics.  
     540      * The %MAINWEB%.AdminGroup (or other group) can be enabled as a [[AccessControl#SuperAdminGroup][SuperAdminGroup]]. Members have browser edit access to _all_ locked topics.  
    541541   * *01 May 2001* - TWiki:Main.JohnTalintyre 
    542542      * Meta information format, see TWikiMetaData 
  • trunk/core/data/TWiki/ReleaseNotes01x00.txt

    r670 r672  
    162162 
    163163TWiki 4.2 introduces a new _Internal Admin Login_ feature which uses "admin" (configurable) as username and the password from configure to become temporary administrator.  
    164 When you do a new installation you need to use this feature as !Main.WikiAdminGroup is now access restricted by default to avoid security attacks during the hours an installation may take.  
    165 From configure there is a link to the !WikiAdminGroup topic and on !WikiAdminGroup the step by step instructions are written in a yellow box.  
     164When you do a new installation you need to use this feature as !Main.AdminGroup is now access restricted by default to avoid security attacks during the hours an installation may take.  
     165From configure there is a link to the !AdminGroup topic and on !AdminGroup the step by step instructions are written in a yellow box.  
    166166 
    167167---+++ Rearchitected User Mapping system (a transperant change for end users) 
     
    497497| [[%BUGS%/Item2244][Item2244]] | Documented METASEARCH parameter defaults are not the actual defaults | 
    498498| [[%BUGS%/Item2221][Item2221]] | .changes is hardcoded to 500 entries, affecting WebStatistics and MailerContrib | 
    499 | [[%BUGS%/Item2108][Item2108]] | Better installation doc for !WikiAdminGroup | 
     499| [[%BUGS%/Item2108][Item2108]] | Better installation doc for !AdminGroup | 
    500500| [[%BUGS%/Item2032][Item2032]] | Some UTF8 characters in form values broken (CGI.pm interaction) | 
    501501| [[%BUGS%/Item2005][Item2005]] | Cannot change configure password without making other changes | 
  • trunk/core/data/TWiki/TWikiUpgradeGuide.txt

    r670 r672  
    246246---+++ New Internal Admin Login 
    247247 
    248 TWiki 4.2 introduces a new _Internal Admin Login_ feature which uses "admin" (configurable) as username and the password used for configure to become temporary administrator. When you do a new installation you need to use this feature as !Main.WikiAdminGroup is now access restricted by default to avoid security attacks during the hours an installation may take. From configure there is a link to the !WikiAdminGroup topic and on !WikiAdminGroup the step by step instructions are written in a yellow box. Our advice is not to remove this help text in case you need it later. 
     248TWiki 4.2 introduces a new _Internal Admin Login_ feature which uses "admin" (configurable) as username and the password used for configure to become temporary administrator. When you do a new installation you need to use this feature as !Main.AdminGroup is now access restricted by default to avoid security attacks during the hours an installation may take. From configure there is a link to the !AdminGroup topic and on !AdminGroup the step by step instructions are written in a yellow box. Our advice is not to remove this help text in case you need it later. 
    249249 
    250250%STOPINCLUDE% 
  • trunk/core/data/TWiki/UserAuthentication.txt

    r670 r672  
    7878    <br /> %H% Check that the password manager recognises the new user. If you are using =.htpasswd= files, check that a new line with the username and encrypted password is added to the =.htpasswd= file. If not, you probably got a path wrong, or the permissions may not allow the webserver user to write to that file. 
    7979   1 Create a new topic to check if authentication works. 
    80    1 *Edit the %USERSWEB%.WikiAdminGroup topic in the %USERSWEB% web to include users with system administrator status.* 
     80   1 *Edit the %USERSWEB%.AdminGroup topic in the %USERSWEB% web to include users with system administrator status.* 
    8181    <br /> %X% *This is a very important step*, as users in this group can access _all_ topics, independent of %WIKITOOLNAME% access controls. 
    8282 
     
    115115    <br /> %H% Check that a new line with the username and encrypted password is added to the =.htpasswd= file. If not, you may have got a path wrong, or the permissions may not allow the webserver user to write to that file. 
    116116   1 Create a new topic to check if authentication works. 
    117    1 *Edit the %USERSWEB%.WikiAdminGroup topic in the %USERSWEB% web to include users with system administrator status.* 
     117   1 *Edit the %USERSWEB%.AdminGroup topic in the %USERSWEB% web to include users with system administrator status.* 
    118118    <br /> %X% *This is a very important step*, as users in this group can access _all_ topics, independent of %WIKITOOLNAME% access controls. 
    119119AccessControl has more information on setting up access controls. 
  • trunk/core/data/TWiki/WebPreferences.txt

    r670 r672  
    3636 
    3737   * Users or groups who __are not__ / __are__ allowed to __view__ / __change__ / __rename__ topics in the <nop>%WEB% web: (See %SYSTEMWEB%.AccessControl). 
    38       * Set ALLOWWEBCHANGE = %USERSWEB%.WikiAdminGroup 
    39       * Set ALLOWWEBRENAME = %USERSWEB%.WikiAdminGroup 
     38      * Set ALLOWWEBCHANGE = %USERSWEB%.AdminGroup 
     39      * Set ALLOWWEBRENAME = %USERSWEB%.AdminGroup 
    4040 
    4141   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.WebAdministratorsGroup) 
    42       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
     42      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
    4343 
    4444   * Web preferences that are *not* allowed to be overridden by sub-web, user or topic preferences: 
  • trunk/core/data/TestCases/TestCaseAmISane.txt

    r670 r672  
    1717| =save= | =action= = =checkpoint= (should come back to edit) | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=checkpoint&text=Checkpoint-save%20PASSED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here</a> | 
    1818| =save= | =action= = =quietsave= (should redirect to view) | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&text=Quietsave%20test%20PASSED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
    19 | =repRev= | =action= = =quietsave=, =cmd= = =repRev= if you are in Main.WikiAdminGroup should redirect to view, and you should see "repRev test PASSED", otherwise you will be denied. | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&cmd=repRev&text=RepRev%20test%20PASSED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
    20 | =delRev= | =action= = =save=, =cmd= = =delRev= - should delete the top revision, if you are in Main.WikiAdminGroup, otherwise you will be denied. | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&cmd=delRev&text=delRev%20test%20FAILED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
     19| =repRev= | =action= = =quietsave=, =cmd= = =repRev= if you are in Main.AdminGroup should redirect to view, and you should see "repRev test PASSED", otherwise you will be denied. | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&cmd=repRev&text=RepRev%20test%20PASSED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
     20| =delRev= | =action= = =save=, =cmd= = =delRev= - should delete the top revision, if you are in Main.AdminGroup, otherwise you will be denied. | <a href="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/TestCases/WasteOfSpace?action=quietsave&cmd=delRev&text=delRev%20test%20FAILED&topicparent=TestCaseQuickScriptsChecks&forcerev=1">click here </a> | 
    2121| =search= | Search for the word "sanity" |<a href="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/TestCases/WasteOfSpace?search=sanity">click here</a> | 
    2222| =statistics= | Should redirect to refreshed statistics |<a href="%SCRIPTURLPATH%/statistics%SCRIPTSUFFIX%/TestCases">click here</a> | 
  • trunk/core/data/TestCases/WebPreferences.txt

    r670 r672  
    4040                * #Set ALLOWWEBRENAME =  
    4141 
    42         * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.WikiAdminGroup) 
     42        * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., %USERSWEB%.AdminGroup) 
    4343                * #Set ALLOWTOPICCHANGE =  
    4444                * #Set ALLOWTOPICRENAME =  
  • trunk/core/data/Trash/WebHome.txt

    r670 r672  
    55%MAKETEXT{"Security Note:"}% 
    66%ENDCOLOR% 
    7 %MAKETEXT{"By default, viewing the Trash web is restricted to [_1]. If you would like to allow all users to view the Trash web, remove the =ALLOWWEBVIEW= restriction in WebPreferences." args="%USERSWEB%.WikiAdminGroup"}% 
     7%MAKETEXT{"By default, viewing the Trash web is restricted to [_1]. If you would like to allow all users to view the Trash web, remove the =ALLOWWEBVIEW= restriction in WebPreferences." args="%USERSWEB%.AdminGroup"}% 
    88 
    99%SEARCH{".*" web="%INCLUDINGWEB%" type="regex" nototal="on" nosearch="on" order="modified" limit="15"}% 
  • trunk/core/data/Trash/WebPreferences.txt

    r670 r672  
    1717 
    1818   * Restricted to adminsso that deleted topics can't be viewed by spies. 
    19       * Set ALLOWWEBVIEW = %USERSWEB%.WikiAdminGroup 
    20       * Set ALLOWTOPICCHANGE = %USERSWEB%.WikiAdminGroup 
    21       * Set ALLOWTOPICRENAME = %USERSWEB%.WikiAdminGroup 
     19      * Set ALLOWWEBVIEW = %USERSWEB%.AdminGroup 
     20      * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup 
     21      * Set ALLOWTOPICRENAME = %USERSWEB%.AdminGroup 
    2222 
    2323   * Web preferences that are *not* allowed to be overridden by sub-web, user or topic preferences: 
  • trunk/core/data/_default/WebPreferences.txt

    r670 r672  
    5757      * Set ALLOWWEBRENAME =  
    5858 
    59    * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., [[%USERSWEB%.WikiAdminGroup][WikiAdminGroup]]) 
     59   * Users or groups allowed to change or rename this <nop>%TOPIC% topic: (e.g., [[%USERSWEB%.AdminGroup][AdminGroup]]) 
    6060      * Set ALLOWTOPICCHANGE =  
    6161      * Set ALLOWTOPICRENAME =  
  • trunk/core/lib/TWiki/Func.pm

    r670 r672  
    10121012    while ($it->hasNext()) { 
    10131013        my $group = $it->next(); 
    1014         # $group is a group name e.g. WikiAdminGroup 
     1014        # $group is a group name e.g. AdminGroup 
    10151015    } 
    10161016</verbatim> 
  • trunk/core/locale/fr.po

    r671 r672  
    820820msgstr "" 
    821821"Par défaut, la consultation du web Trash est réservée aux administrateurs et " 
    822 "administratrices de ce TWiki, qui sont membres du %MAINWEB%.WikiAdminGroup. " 
     822"administratrices de ce TWiki, qui sont membres du %MAINWEB%.AdminGroup. " 
    823823"Si vous souhaitez désactiver cette restriction, enlevez la ligne " 
    824824"=ALLOWWEBVIEW= de la page WebPreferences." 
  • trunk/core/tools/TWikiKernel/MANIFEST

    r670 r672  
    3636data/Main/ProjectContributor.txt 0660 
    3737data/Main/SitePreferences.txt 0660 
    38 data/Main/WikiAdminGroup.txt 0660 
     38data/Main/AdminGroup.txt 0660 
    3939data/Main/TWikiGroupTemplate.txt 0660 
    4040data/Main/TWikiGroups.txt 0660 
  • trunk/core/tools/pkg/debian/README.Debian

    r670 r672  
    3737Note that you should create yourself (inside TWiki, with it's user 
    3838registration mechanism) a TWiki user account, and add it 
    39 Main.WikiAdminGroup to restrict Admin privileges to that user. 
     39Main.AdminGroup to restrict Admin privileges to that user. 
    4040 
    4141The procedure for doing so is described in the TWiki documentation. 
  • trunk/core/tools/pkg/debian/po/cs.po

    r670 r672  
    107107#: ../templates:4001 
    108108msgid "" 
    109 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     109"After you have created yourself a user, edit the Main.AdminGroup to " 
    110110"restrict Admin privileges to that user." 
    111111msgstr "" 
    112 "AÅŸ si pro sebe vytvoříte uÅŸivatele, upravte Main.WikiAdminGroup a omezte " 
     112"AÅŸ si pro sebe vytvoříte uÅŸivatele, upravte Main.AdminGroup a omezte " 
    113113"správcovská oprávnění na vytvořeného uÅŸivatele." 
    114114 
     
    223223#~ "to rename the TWikiRegistration to TWikiRegistrationPub, and " 
    224224#~ "TWikiRegistrationDefault to TWikiRegistration. IMPORTANT: After you have " 
    225 #~ "created yourself a user, edit the Main.WikiAdminGroup to restrict Admin " 
     225#~ "created yourself a user, edit the Main.AdminGroup to restrict Admin " 
    226226#~ "privileges" 
    227227#~ msgstr "" 
     
    233233#~ "TWikiRegistrationPub a poté TWikiRegistrationDefault na " 
    234234#~ "TWikiRegistration. DÅ®LEÅœITÉ: AÅŸ si pro sebe vytvoříte uÅŸivatele, omezte " 
    235 #~ "administrátorská oprávnění úpravou Main.WikiAdminGroup." 
     235#~ "administrátorská oprávnění úpravou Main.AdminGroup." 
  • trunk/core/tools/pkg/debian/po/de.po

    r670 r672  
    104104#: ../templates:4001 
    105105msgid "" 
    106 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     106"After you have created yourself a user, edit the Main.AdminGroup to " 
    107107"restrict Admin privileges to that user." 
    108108msgstr "" 
    109109"Nachdem Sie sich selbst einen Benutzer angelegt haben, editieren Sie Main." 
    110 "WikiAdminGroup, um die Admin-Privilegien auf diesen Benutzer zu beschrÀnken." 
     110"AdminGroup, um die Admin-Privilegien auf diesen Benutzer zu beschrÀnken." 
    111111 
    112112#. Type: string 
  • trunk/core/tools/pkg/debian/po/eu.po

    r670 r672  
    100100#: ../templates:4001 
    101101msgid "" 
    102 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     102"After you have created yourself a user, edit the Main.AdminGroup to " 
    103103"restrict Admin privileges to that user." 
    104104msgstr "" 
    105 "Zure erabiltzailea sortu ondoren, Main.WikiAdminGroup editatu kudeaketa " 
     105"Zure erabiltzailea sortu ondoren, Main.AdminGroup editatu kudeaketa " 
    106106"baimenak erabiltzaile horri mugatzeko." 
    107107 
  • trunk/core/tools/pkg/debian/po/fr.po

    r670 r672  
    104104#: ../templates:4001 
    105105msgid "" 
    106 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     106"After you have created yourself a user, edit the Main.AdminGroup to " 
    107107"restrict Admin privileges to that user." 
    108108msgstr "" 
    109 "Après avoir créé un utilisateur, veuillez éditer Main.WikiAdminGroup pour " 
     109"Après avoir créé un utilisateur, veuillez éditer Main.AdminGroup pour " 
    110110"restreindre les privilèges de l'administrateur à cet utilisateur." 
    111111 
  • trunk/core/tools/pkg/debian/po/gl.po

    r670 r672  
    100100#: ../templates:4001 
    101101msgid "" 
    102 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     102"After you have created yourself a user, edit the Main.AdminGroup to " 
    103103"restrict Admin privileges to that user." 
    104104msgstr "" 
    105 "Despois de ter creado un usuario, edite Main.WikiAdminGroup para restrinxir " 
     105"Despois de ter creado un usuario, edite Main.AdminGroup para restrinxir " 
    106106"os privilexios de administración a ese usuario." 
    107107 
  • trunk/core/tools/pkg/debian/po/nb.po

    r670 r672  
    101101#: ../templates:4001 
    102102msgid "" 
    103 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     103"After you have created yourself a user, edit the Main.AdminGroup to " 
    104104"restrict Admin privileges to that user." 
    105105msgstr "" 
    106 "NÃ¥r du har opprettet en bruker for deg selv, sÃ¥ rediger Main.WikiAdminGroup " 
     106"NÃ¥r du har opprettet en bruker for deg selv, sÃ¥ rediger Main.AdminGroup " 
    107107"for Ã¥ gi administrasjonsrettigheter bare til den brukeren." 
    108108 
  • trunk/core/tools/pkg/debian/po/nl.po

    r670 r672  
    119119#: ../templates:4001 
    120120msgid "" 
    121 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     121"After you have created yourself a user, edit the Main.AdminGroup to " 
    122122"restrict Admin privileges to that user." 
    123123msgstr "" 
    124 "Eens u een gebruiker heeft aangemaakt dient u de Main.WikiAdminGroup aan te " 
     124"Eens u een gebruiker heeft aangemaakt dient u de Main.AdminGroup aan te " 
    125125"passen om Beheerdersrechten te beperken tot die gebruiker." 
    126126 
  • trunk/core/tools/pkg/debian/po/pt.po

    r670 r672  
    101101#: ../templates:4001 
    102102msgid "" 
    103 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     103"After you have created yourself a user, edit the Main.AdminGroup to " 
    104104"restrict Admin privileges to that user." 
    105105msgstr "" 
    106 "Após ter criado você mesmo um utilizador, edite Main.WikiAdminGroup para " 
     106"Após ter criado você mesmo um utilizador, edite Main.AdminGroup para " 
    107107"restringir os privilégios de Administrador a esse utilizador." 
    108108 
  • trunk/core/tools/pkg/debian/po/pt_BR.po

    r670 r672  
    123123#: ../templates:4001 
    124124msgid "" 
    125 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     125"After you have created yourself a user, edit the Main.AdminGroup to " 
    126126"restrict Admin privileges to that user." 
    127127msgstr "" 
    128 "Depois de criar um usuário para você, edite o Main.WikiAdminGroup para " 
     128"Depois de criar um usuário para você, edite o Main.AdminGroup para " 
    129129"restringir os privilégios de administrador para esse usuário." 
    130130 
  • trunk/core/tools/pkg/debian/po/ro.po

    r670 r672  
    107107#: ../templates:4001 
    108108msgid "" 
    109 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     109"After you have created yourself a user, edit the Main.AdminGroup to " 
    110110"restrict Admin privileges to that user." 
    111111msgstr "" 
    112112"După ce ați creat un utilizator pentru dumneavoastră, editați Main." 
    113 "WikiAdminGroup pentru a acorda privilegii de administrare doar acelui " 
     113"AdminGroup pentru a acorda privilegii de administrare doar acelui " 
    114114"utilizator." 
    115115 
  • trunk/core/tools/pkg/debian/po/ru.po

    r670 r672  
    108108#: ../templates:4001 
    109109msgid "" 
    110 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     110"After you have created yourself a user, edit the Main.AdminGroup to " 
    111111"restrict Admin privileges to that user." 
    112112msgstr "" 
    113113"ППсле тПгП как сПзЎаЎОте себя как пПльзПвателя, ПтреЎактОруйте Main." 
    114 "WikiAdminGroup, чтПбы ПграМОчОть аЎЌОМОстратОвМые прОвОлегОО этПгП " 
     114"AdminGroup, чтПбы ПграМОчОть аЎЌОМОстратОвМые прОвОлегОО этПгП " 
    115115"пПльзПвателя." 
    116116 
  • trunk/core/tools/pkg/debian/po/sv.po

    r670 r672  
    123123#: ../templates:4001 
    124124msgid "" 
    125 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     125"After you have created yourself a user, edit the Main.AdminGroup to " 
    126126"restrict Admin privileges to that user." 
    127127msgstr "" 
    128128"Efter att du har skapat en anvÀndare Ã¥t dig sjÀlv, redigera Main." 
    129 "WikiAdminGroup för att begrÀnsa Admin-behörigheten till den anvÀndaren." 
     129"AdminGroup för att begrÀnsa Admin-behörigheten till den anvÀndaren." 
    130130 
    131131#. Type: string 
     
    241241#~ "to rename the TWikiRegistration to TWikiRegistrationPub, and " 
    242242#~ "TWikiRegistrationDefault to TWikiRegistration. IMPORTANT: After you have " 
    243 #~ "created yourself a user, edit the Main.WikiAdminGroup to restrict Admin " 
     243#~ "created yourself a user, edit the Main.AdminGroup to restrict Admin " 
    244244#~ "privileges" 
    245245#~ msgstr "" 
     
    251251#~ "TWikiRegistration till TWikiRegistrationPub och TWikiRegistrationDefault " 
    252252#~ "till TWikiRegistration. VIKTIGT: Efter att du har skapat din egna " 
    253 #~ "anvÀndare, redigera Main.WikiAdminGroup för att begrÀnsa " 
     253#~ "anvÀndare, redigera Main.AdminGroup för att begrÀnsa " 
    254254#~ "administrationsrÀttigheterna." 
  • trunk/core/tools/pkg/debian/po/ta.po

    r670 r672  
    122122#: ../templates:4001 
    123123msgid "" 
    124 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     124"After you have created yourself a user, edit the Main.AdminGroup to " 
    125125"restrict Admin privileges to that user." 
    126126msgstr "" 
     
    128128ச்஀ பயனருக்கு சிர்வடகி à® 
    129129னும஀ிகளை கட்டுப் படு஀்஀ Main." 
    130 "WikiAdminGroup ஐ ஀ிரு஀்஀வும்." 
     130"AdminGroup ஐ ஀ிரு஀்஀வும்." 
    131131 
    132132#. Type: string 
  • trunk/core/tools/pkg/debian/po/templates.pot

    r670 r672  
    8888#: ../templates:4001 
    8989msgid "" 
    90 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     90"After you have created yourself a user, edit the Main.AdminGroup to " 
    9191"restrict Admin privileges to that user." 
    9292msgstr "" 
  • trunk/core/tools/pkg/debian/po/vi.po

    r670 r672  
    7777#: ../templates:4001 
    7878msgid "" 
    79 "After you have created yourself a user, edit the Main.WikiAdminGroup to " 
     79"After you have created yourself a user, edit the Main.AdminGroup to " 
    8080"restrict Admin privileges to that user." 
    81 msgstr "Sau khi bạn tạo người dùng mình, sá»­a Main.WikiAdminGroup để giới hạn quyền hạn quản trị chỉ cho người dùng đó." 
     81msgstr "Sau khi bạn tạo người dùng mình, sá»­a Main.AdminGroup để giới hạn quyền hạn quản trị chỉ cho người dùng đó." 
    8282 
    8383#~ msgid "http://localhost/" 
     
    9494#~ "to rename the TWikiRegistration to TWikiRegistrationPub, and " 
    9595#~ "TWikiRegistrationDefault to TWikiRegistration. IMPORTANT: After you have " 
    96 #~ "created yourself a user, edit the Main.WikiAdminGroup to restrict Admin " 
     96#~ "created yourself a user, edit the Main.AdminGroup to restrict Admin " 
    9797#~ "privileges" 
    9898#~ msgstr "Bản cài đặt TWiki Debian mặc định được cấu hình để tá»± động tạo người dùng " 
     
    104104#~ "TWikiRegistrationDefault (đang kÜ TWiki mặc định) thành TWikiRegistration " 
    105105#~ "(đang kÜ TWiki). QUAN TRỌNG: sau khi bạn đã tạo người dùng cho chính bạn, " 
    106 #~ "hãy hiệu chỉnh Main.WikiAdminGroup (chính: nhóm quản lÜ TWiki) để giới " 
     106#~ "hãy hiệu chỉnh Main.AdminGroup (chính: nhóm quản lÜ TWiki) để giới " 
    107107#~ "hạn quyền truy cập quản lÜ." 
  • trunk/core/tools/pkg/debian/templates

    r670 r672  
    3434Type: note 
    3535_Description: Admin User Registration configuration required 
    36  After you have created yourself a user, edit the Main.WikiAdminGroup 
     36 After you have created yourself a user, edit the Main.AdminGroup 
    3737 to restrict Admin privileges to that user. 
    3838 
Note: See TracChangeset for help on using the changeset viewer.