Changeset 666

Timestamp:

11/15/08 04:56:37 (4 years ago)

Author:

SvenDowideit

Message:

Item109: TWikiGuest -> WikiGuest

Files:

• branches/Release04x02/data/TWiki/DefaultPreferences.txt (modified) (1 diff)
• branches/Release04x02/data/TWiki/GlossaryOfTerms.txt (modified) (1 diff)
• branches/Release04x02/data/TWiki/ReleaseHistory.txt (modified) (4 diffs)
• branches/Release04x02/data/TWiki/ReleaseNotes01x00.txt (modified) (6 diffs)
• branches/Release04x02/data/TWiki/SearchPatternCookbook.txt (modified) (1 diff)
• branches/Release04x02/data/TWiki/TWikiUpgradeGuide.txt (modified) (3 diffs)
• branches/Release04x02/data/TWiki/UserAuthentication.txt (modified) (1 diff)
• branches/Release04x02/data/TestCases/TestCaseAutoFormatting.txt (modified) (4 diffs)
• branches/Release04x02/data/TestCases/TestCaseAutoInternalTags.txt (modified) (1 diff)
• branches/Release04x02/data/TestCases/TestCaseInternetRegistration.txt (modified) (1 diff)
• branches/Release04x02/data/TestCases/TestCaseIntranetRegistration.txt (modified) (1 diff)
• branches/Release04x02/lib/TWiki.spec (modified) (1 diff)
• branches/Release04x02/lib/TWiki/Users/ApacheHtpasswdUser.pm (modified) (1 diff)
• branches/Release04x02/lib/TWiki/Users/BaseUserMapping.pm (modified) (1 diff)
• branches/Release04x02/lib/TWiki/Users/HtPasswdUser.pm (modified) (1 diff)
• branches/Release04x02/lib/TWiki/Users/Password.pm (modified) (1 diff)
• branches/Release04x02/templates/messages.tmpl (modified) (1 diff)
• branches/Release04x02/tools/TWikiKernel/MANIFEST (modified) (1 diff)
• branches/Release04x02/tools/create_large_groups.pl (modified) (2 diffs)
• branches/Release04x02/tools/extender.pl (modified) (1 diff)
• branches/Release04x02/twikiplugins/PatternSkin/data/TWiki/WebLeftBar.txt (modified) (1 diff)
• branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/Main/UserListHeader.txt (modified) (1 diff)
• branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/LoginName.txt (modified) (1 diff)
• branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt (modified) (4 diffs)
• branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/TWikiUserSetting.txt (modified) (1 diff)
• branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt (modified) (2 diffs)
• branches/Release04x02/twikiplugins/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST (modified) (1 diff)
• branches/Release04x02/twikiplugins/TopicUserMappingContrib/lib/TWiki/Users/TopicUserMapping.pm (modified) (5 diffs)
• branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/Fn_REVINFO.pm (modified) (2 diffs)
• branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/RegisterTests.pm (modified) (4 diffs)
• branches/Release04x02/twikiplugins/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm (modified) (3 diffs)
• trunk/BlogPlugin/data/_BlogPlugin/BlogAbout.txt (modified) (1 diff)
• trunk/DirectedGraphWebMapPlugin/data/TWiki/DirectedGraphWebMapPlugin.txt (modified) (1 diff)
• trunk/FindElsewherePlugin/data/TWiki/FindElsewherePlugin.txt (modified) (1 diff)
• trunk/HTTPDUserAdminContrib/data/TWiki/HTTPDUserAdminContrib.txt (modified) (1 diff)
• trunk/HTTPDUserAdminContrib/lib/TWiki/Users/HTTPDUserAdminUser.pm (modified) (1 diff)
• trunk/HTTPDUserAdminContrib/lib/TWiki/Users/HTTPDUserAdminUserMapping.pm (modified) (3 diffs)
• trunk/HistoryPlugin/data/TWiki/HistoryPlugin.txt (modified) (1 diff)
• trunk/LdapContrib/lib/TWiki/Users/LdapUserMapping.pm (modified) (1 diff)
• trunk/MailToTWikiAddOn/bin/mailtotwiki (modified) (1 diff)
• trunk/NatSkin/data/TWiki/NatSearch.txt (modified) (1 diff)
• trunk/NatSkin/templates/messages.nat.tmpl (modified) (1 diff)
• trunk/NatSkin/templates/oopsnotwikiuser.nat.tmpl (modified) (1 diff)
• trunk/NatSkin/templates/viewtopicactions.nat.tmpl (modified) (1 diff)
• trunk/PatternSkin/data/TWiki/WebLeftBar.txt (modified) (1 diff)
• trunk/PersonalInfoAddOn/data/Main/PersonalInfoDemoUser.txt (modified) (1 diff)
• trunk/PersonalInfoAddOn/data/_PersonalInfoAddOn04x01/PersonalInfoUserFormExample.txt (modified) (2 diffs)
• trunk/PersonalInfoAddOn/data/_PersonalInfoAddOn04x02/PersonalInfoUserFormExample.txt (modified) (2 diffs)
• trunk/PluginBenchmarkAddOn/bin/pluginbenchmark (modified) (1 diff)
• trunk/PluginBenchmarkAddOn/data/TWiki/PluginBenchmarkAddOn.txt (modified) (1 diff)
• trunk/QuickMenuSkin/data/TWiki/QuickMenuBarUtilities.txt (modified) (1 diff)
• trunk/SpanishTWikiContrib/data/TWiki/SpanishTWikiContrib.txt (modified) (1 diff)
• trunk/SpanishTWikiContrib/data/TWiki/TranslationNote.txt (modified) (1 diff)
• trunk/SpanishTWikiContrib/data/TWiki_ES/GlosarioTWiki.txt (modified) (1 diff)
• trunk/SpanishTWikiContrib/data/TWiki_ES/GuiaDeUsuarioTWiki.txt (modified) (1 diff)
• trunk/SpanishTWikiContrib/data/TWiki_ES/TaquigrafiaTWiki.txt (modified) (2 diffs)
• trunk/SpanishTWikiContrib/data/TWiki_ES/WebLeftBar.txt (modified) (1 diff)
• trunk/SpanishTWikiContrib/lib/TWiki/Contrib/SpanishTWikiContrib/MANIFEST (modified) (1 diff)
• trunk/TWikiDeploymentSpiderAddOn/twiki-deployment-spider.pl (modified) (3 diffs)
• trunk/TigerSkinPlugin/data/TWiki/WebMenu.txt (modified) (1 diff)
• trunk/ToolTipPlugin/data/TWiki/ToolTipPlugin.txt (modified) (1 diff)
• trunk/TopicUserMappingContrib/data/Main/UserListHeader.txt (modified) (1 diff)
• trunk/TopicUserMappingContrib/data/TWiki/LoginName.txt (modified) (1 diff)
• trunk/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt (modified) (4 diffs)
• trunk/TopicUserMappingContrib/data/TWiki/TWikiUserSetting.txt (modified) (1 diff)
• trunk/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt (modified) (2 diffs)
• trunk/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST (modified) (1 diff)
• trunk/TopicUserMappingContrib/lib/TWiki/Users/TopicUserMapping.pm (modified) (5 diffs)
• trunk/UnitTestContrib/test/unit/Fn_REVINFO.pm (modified) (2 diffs)
• trunk/UnitTestContrib/test/unit/RegisterTests.pm (modified) (4 diffs)
• trunk/UserInfoPlugin/lib/TWiki/Plugins/UserInfoPlugin/Core.pm (modified) (2 diffs)
• trunk/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm (modified) (2 diffs)
• trunk/core/data/TWiki/DefaultPreferences.txt (modified) (1 diff)
• trunk/core/data/TWiki/GlossaryOfTerms.txt (modified) (1 diff)
• trunk/core/data/TWiki/ReleaseHistory.txt (modified) (4 diffs)
• trunk/core/data/TWiki/ReleaseNotes01x00.txt (modified) (6 diffs)
• trunk/core/data/TWiki/SearchPatternCookbook.txt (modified) (1 diff)
• trunk/core/data/TWiki/TWikiUpgradeGuide.txt (modified) (3 diffs)
• trunk/core/data/TWiki/UserAuthentication.txt (modified) (1 diff)
• trunk/core/data/TestCases/TestCaseAutoFormatting.txt (modified) (4 diffs)
• trunk/core/data/TestCases/TestCaseAutoInternalTags.txt (modified) (1 diff)
• trunk/core/data/TestCases/TestCaseInternetRegistration.txt (modified) (1 diff)
• trunk/core/data/TestCases/TestCaseIntranetRegistration.txt (modified) (1 diff)
• trunk/core/lib/TWiki.spec (modified) (1 diff)
• trunk/core/lib/TWiki/Users/ApacheHtpasswdUser.pm (modified) (1 diff)
• trunk/core/lib/TWiki/Users/BaseUserMapping.pm (modified) (1 diff)
• trunk/core/lib/TWiki/Users/HtPasswdUser.pm (modified) (1 diff)
• trunk/core/lib/TWiki/Users/Password.pm (modified) (1 diff)
• trunk/core/templates/messages.tmpl (modified) (1 diff)
• trunk/core/tools/TWikiKernel/MANIFEST (modified) (1 diff)
• trunk/core/tools/create_large_groups.pl (modified) (2 diffs)
• trunk/core/tools/extender.pl (modified) (1 diff)

branches/Release04x02/data/TWiki/DefaultPreferences.txt

@@ -76 +76 @@
 ---++ Default User Settings
 
-%X% *NOTE:* They are typically redefined in topics of individual %USERSWEB%.TWikiUsers
+%X% *NOTE:* They are typically redefined in topics of individual %USERSWEB%.WikiUsers
 
    * Show tool-tip topic info on mouse-over of WikiWord links. Setting can be on, off, or customized. An empty setting or off setting disables the tool-tips (for better performance). The setting can contain $summary to show the topic summary, $date for the last change date, $rev for the revision, $username for the login name of the last editor, $wikiname for the <nop>WikiName, $wikiusername for <nop>%USERSWEB%.WikiName, $topic for the topic name, and $web for the web name

branches/Release04x02/data/TWiki/GlossaryOfTerms.txt

@@ -10 +10 @@
 | Plugin: | Prepackaged server-side extension that adds all sorts of additional functions, seamlessly integrated into TWiki. [[Plugins][Details...]] |
 | Plugin API: | The standard interface for creating TWiki _Plugins_ and add-on programs that ensure a perfect integration. [[TWikiFuncDotPm][Details...]] |
-| Preferences: | The site-wide, single _web_ and single user-level preferences settings. The settings are stored in DefaultPreferences, WebPreferences and %USERSWEB%.TWikiUsers home pages. [[TWikiVariables#PreferencesVariables][Details...]] |
+| Preferences: | The site-wide, single _web_ and single user-level preferences settings. The settings are stored in DefaultPreferences, WebPreferences and %USERSWEB%.%WIKIUSERSTOPIC% home pages. [[TWikiVariables#PreferencesVariables][Details...]] |
 | Site: | A TWiki installation consisting of one or more _webs_. [[TWikiSite][Details...]] |
 | Skin: | Skins overlay regular _templates_ with alternate header/footer layout of _pages_; topic text is not affected. Skins are typically enabled site-wide or per _web_. [[TWikiSkins][Details...]] |

branches/Release04x02/data/TWiki/ReleaseHistory.txt

@@ -14 +14 @@
    * *Easier Installation and Upgrade*
       * New Internal Admin Login feature
-      * The !Main.TWikiUsers topic is no longer distributed as a default topic in Main web
+      * The !Main.WikiUsers topic is no longer distributed as a default topic in Main web
       * A new directory =working= which per default is located in the TWiki root which contains registration_approvals, tmp, and work_areas
       * Configure can now authenticate when connecting to local plugins repository.
@@ -36 +36 @@
       * Table of Content (TOC) feature enhanced
       * re-architected Pluggable user mapping (between login name and !WikiName) to integrate with alternative authentication and Management schemes
-      * Topic based User management has been extracted into a separately update-able package (!TWikiUsersContrib)
+      * Topic based User management has been extracted into a separately update-able package (!WikiUsersContrib)
 
    * *Enhancements of Pre-installed Plugins*
@@ -647 +647 @@
       * New preference variables =%<nop>EDITBOXWIDTH%= and =%<nop>EDITBOXHEIGHT%= to specify the edit box size. 
    * *25 Feb 2000* - TWiki:Main.PeterThoeny
-      * Edit preferences topics to set TWiki variables. There are three level of preferences Site-level (TWikiPreferences), web-level (WebPreferences in each web) and user-level preferences (for each of the Main.TWikiUsers). With this, discontinue use of server side include of =wikiwebs.inc= , =wikiwebtable.inc= , =weblist.inc= , =webcopyright.inc= and =webcolors.inc= files.  
+      * Edit preferences topics to set TWiki variables. There are three level of preferences Site-level (TWikiPreferences), web-level (WebPreferences in each web) and user-level preferences (for each of the Main.WikiUsers). With this, discontinue use of server side include of =wikiwebs.inc= , =wikiwebtable.inc= , =weblist.inc= , =webcopyright.inc= and =webcolors.inc= files.  
    * *11 Feb 2000* - TWiki:Main.PeterThoeny
       * New variable =%<nop>SCRIPTSUFFIX%= / $scriptSuffix containing an optional file extension of the TWiki Perl script. Templates have been changed to use this variable. This allows you to rename the Perl script files to have a file extension like for example ".cgi". 
@@ -750 +750 @@
       * Added TWiki variables, enclosed in % signs =%<nop>TOPIC%= (Topic name), =%<nop>WEB%= (web name), =%<nop>SCRIPTURL%= (script URL), =%<nop>DATE%= (current date), =%<nop>WIKIWEBMASTER%= (Wiki webmaster address), =%<nop>WIKIVERSION%= (Wiki version), =%<nop>USERNAME%= (user name), =%<nop>WIKIUSERNAME%= (Wiki user name). 
    * *28 Jul 1998* - TWiki:Main.PeterThoeny
-      * Topic WebChanges shows Wiki username instead of Intranet username, e.g. =PeterThoeny= instead of =thoeny= in case the Wiki username exists. Implementation Automatic lookup of Wiki username in topic Main.TWikiUsers. 
+      * Topic WebChanges shows Wiki username instead of Intranet username, e.g. =PeterThoeny= instead of =thoeny= in case the Wiki username exists. Implementation Automatic lookup of Wiki username in topic Main.WikiUsers. 
    * *28 Jul 1998* - TWiki:Main.PeterThoeny
       * Topic index. (Technically speaking a simple '.*' search on topic names.)  

branches/Release04x02/data/TWiki/ReleaseNotes01x00.txt

@@ -30 +30 @@
    * *Easier Installation and Upgrade*
       * New Internal Admin Login feature. See below.
-      * The !Main.TWikiUsers topic is no longer distributed as a default topic in Main. See below. 
+      * The !Main.WikiUsers topic is no longer distributed as a default topic in Main. See below. 
       * A new directory =working= which per default is located in the twiki root which contains registration_approvals, tmp, and work_areas. See below
       * !ResetPassword, !ChangePassword, !ChangeEmailAddress, and !TWikiRegistration no longer contains yellow text that you have to remove.
@@ -55 +55 @@
       * Many new functions in the API for plugin developers.
       * Table of Content (TOC) feature enhanced 
-      * User Mapping (mapping between login name and !WikiName) code has been extended to allow pluggable modules to integrate with all sorts of alternative authentication and Management schemes. For normal cases you use the default !TopicUserMapping which is using the !Main.TWikiUsers topic to map between login and !WikiName. A new !BaseUserMapping is provided for TWikis where you only have guests and an administrator. In this case you use the login and password given in configure to login as an admin.
+      * User Mapping (mapping between login name and !WikiName) code has been extended to allow pluggable modules to integrate with all sorts of alternative authentication and Management schemes. For normal cases you use the default !TopicUserMapping which is using the !Main.WikiUsers topic to map between login and !WikiName. A new !BaseUserMapping is provided for TWikis where you only have guests and an administrator. In this case you use the login and password given in configure to login as an admin.
 
 ---++ Important Changes since 4.2.3
@@ -149 +149 @@
 From 4.2.0 the =UserForm= and =NewUserTemplate= are distributed in the TWiki web. If you create the two in the Main web the Main web version will be used instead. So if you tailor the user topic format or the form then you should always copy the two files to the Main web and modify the ones in the Main web. When you later upgrade TWiki your tailored template and form will not be overwritten.
 
----+++ !TWikiUsers no longer distributed
-
-The =Main.TWikiUsers= topic contains all the registered users. It is a topic you do not want to overwrite when you upgrade TWiki.
-
-From 4.2.0 this file is no longer included in the TWiki distribution. When you register the first time TWiki creates the =Main.TWikiUsers= topic in the Main web if it does not exist already. This means that you can now upgrade TWiki without risk of overwriting the important =TWikiUsers= topic.
+---+++ !WikiUsers no longer distributed
+
+The =Main.WikiUsers= topic contains all the registered users. It is a topic you do not want to overwrite when you upgrade TWiki.
+
+From 4.2.0 this file is no longer included in the TWiki distribution. When you register the first time TWiki creates the =Main.WikiUsers= topic in the Main web if it does not exist already. This means that you can now upgrade TWiki without risk of overwriting the important =WikiUsers= topic.
 
    * For new installers this makes no difference at all
-   * For upgraders this is one less problem to worry about as your important !Main.TWikiUsers topic now no longer gets overwritten when upgrading.
+   * For upgraders this is one less problem to worry about as your important !Main.WikiUsers topic now no longer gets overwritten when upgrading.
    
 ---+++ New =working= directory
@@ -289 +289 @@
 | [[%BUGS%/Item4659][Item4659]] | Change the strategy of protecting again html attach spam to not harm Wysiwyg editor |
 | [[%BUGS%/Item4658][Item4658]] | remove use of undefined variable un utf8 code |
-| [[%BUGS%/Item4605][Item4605]] | User shown as Unknown User (Login ID) when author is not in TWikiUsers. Bad feature |
+| [[%BUGS%/Item4605][Item4605]] | User shown as Unknown User (Login ID) when author is not in WikiUsers. Bad feature |
 | [[%BUGS%/Item4590][Item4590]] | Rename "Checkpoint" to "Save and Continue" |
 | [[%BUGS%/Item4585][Item4585]] | configure generates apache errors |
@@ -555 +555 @@
 | [[%BUGS%/Item4140][Item4140]] | Support standard escapes in IF statements |
 | [[%BUGS%/Item4139][Item4139]] | Configurable date format to enable 2007-05-25 format. |
-| [[%BUGS%/Item4120][Item4120]] | !Main.TWikiUsers no longer in distribution but gets created from template if non existing |
+| [[%BUGS%/Item4120][Item4120]] | !Main.WikiUsers no longer in distribution but gets created from template if non existing |
 | [[%BUGS%/Item4087][Item4087]] | PatternSkin: visual update to form elements |
 | [[%BUGS%/Item4075][Item4075]] | Enhance MailerContrib To Allow Exclusion Of Webs |
@@ -701 +701 @@
 | [[%BUGS%/Item5443][Item5443]] | Searches order="editby" are sorted by login ID (cUID) instead of WikiName making result look random |
 | [[%BUGS%/Item5432][Item5432]] | Image links inserted with Manage Attachment only work with lower case file extension |
-| [[%BUGS%/Item5431][Item5431]] | Register.pm redirects to TWikiUsers topic on error, even though that topic may not exist |
+| [[%BUGS%/Item5431][Item5431]] | Register.pm redirects to WikiUsers topic on error, even though that topic may not exist |
 | [[%BUGS%/Item5430][Item5430]] | reset password message has some errors |
 | [[%BUGS%/Item5428][Item5428]] | Topic save error with form does not remove nop |

branches/Release04x02/data/TWiki/SearchPatternCookbook.txt

@@ -125 +125 @@
 </form>
 
-This searches all topics in the %USERSWEB% web that contain "Name", "Email" and "Country" bullets. Alternatively, do a %SYSTEMWEB%.FormattedSearch with =multiple="on"= on the [[%USERSWEB%.TWikiUsers]] topic.
+This searches all topics in the %USERSWEB% web that contain "Name", "Email" and "Country" bullets. Alternatively, do a %SYSTEMWEB%.FormattedSearch with =multiple="on"= on the [[%USERSWEB%.WikiUsers]] topic.
 
 ---+++ Solution 2: As Solution 1, but with possibility for multi-selecting usernames

branches/Release04x02/data/TWiki/TWikiUpgradeGuide.txt

@@ -85 +85 @@
 
    * Copy all the topics from the Main web and corresponding pub/Main directories from the old TWiki to the new TWiki but do not overwrite any of the new topics already inside the new Main directory!
-   * Manually merge all the users from the old =Main.TWikiUsers= topic to the new TWiki. If you upgrade from Cairo you can simply use the old file and add the missing new system users to the list of users. If you upgrade from TWiki-4.0.X simply use the old topic. Starting from 4.2.0 TWiki no longer ships with a =Main.TWikiUsers= topic. When you register the first user TWiki now checks for an existing =Main.TWikiUsers= and if it does not exist it gets created.
+   * Manually merge all the users from the old =Main.WikiUsers= topic to the new TWiki. If you upgrade from Cairo you can simply use the old file and add the missing new system users to the list of users. If you upgrade from TWiki-4.0.X simply use the old topic. Starting from 4.2.0 TWiki no longer ships with a =Main.WikiUsers= topic. When you register the first user TWiki now checks for an existing =Main.WikiUsers= and if it does not exist it gets created.
    * If you use =data/.htpasswd= for authentication copy this file from the old TWiki to the new.
       * If you upgrade from Cairo and you are using the Htpasswd login manager, then note that email addresses for users have moved out of user topics and into the password file. There is a script that performs this extra upgrade step for you - see =tools/upgrade_emails.pl=.
@@ -135 +135 @@
 </verbatim>
 
----+++ !TWikiUsers topic in Main web
-
-Your Cairo [[Main.TWikiUsers][Main.TWikiUsers]] topic will work in TWiki4 but you will need to ensure that these 4 users from the default TWiki4 version of !TWikiUsers are copied to the existing !TWikiUsers topic. !WikiGuest is probably already there but the others are new
+---+++ !WikiUsers topic in Main web
+
+Your Cairo [[Main.WikiUsers][Main.WikiUsers]] topic will work in TWiki4 but you will need to ensure that these 4 users from the default TWiki4 version of !WikiUsers are copied to the existing !WikiUsers topic. !WikiGuest is probably already there but the others are new
    * *ProjectContributor* - placeholder for a TWiki developer, and is used in TWiki documentation
    * *WikiGuest* - guest user, used as a fallback if the user can't be identified
@@ -221 +221 @@
 From 4.2.0 the =UserForm= and =NewUserTemplate= are distributed in the TWiki web. If you create the two in the Main web the Main web version will be used instead. So if you tailor the user topic format or the form then you should always copy the two files to the Main web and modify the ones in the Main web. When you later upgrade TWiki your tailored template and form will not be overwritten.
 
----+++ !TWikiUsers no longer distributed
-
-The =Main.TWikiUsers= topic contains all the registered users. It is a topic you do not want to overwrite when you upgrade TWiki.
-
-From 4.2.0 this file is no longer included in the TWiki distribution. When you register the first time TWiki creates the =Main.TWikiUsers= topic in the Main web if it does not exist already. This means that you can now upgrade TWiki without risk of overwriting the important =TWikiUsers= topic.
+---+++ !WikiUsers no longer distributed
+
+The =Main.WikiUsers= topic contains all the registered users. It is a topic you do not want to overwrite when you upgrade TWiki.
+
+From 4.2.0 this file is no longer included in the TWiki distribution. When you register the first time TWiki creates the =Main.WikiUsers= topic in the Main web if it does not exist already. This means that you can now upgrade TWiki without risk of overwriting the important =WikiUsers= topic.
 
    * For new installers this makes no difference at all
-   * For upgraders this is one less problem to worry about as your important !Main.TWikiUsers topic now no longer gets overwritten when upgrading.
+   * For upgraders this is one less problem to worry about as your important !Main.WikiUsers topic now no longer gets overwritten when upgrading.
    
 ---+++ New =working= directory

branches/Release04x02/data/TWiki/UserAuthentication.txt

@@ -98 +98 @@
 The disadvantage is that because the user identity is cached in the browser, you can log in, but you can't log out again unless you restart the browser.
 
-%WIKITOOLNAME% maps the =REMOTE_USER= that was used to log in to the webserver to a WikiName using the table in %USERSWEB%.TWikiUsers. This table is updated whenever a user registers, so users can choose not to register (in which case their webserver login name is used for their signature) or register (in which case that login name is mapped to their WikiName).
+%WIKITOOLNAME% maps the =REMOTE_USER= that was used to log in to the webserver to a WikiName using the table in %USERSWEB%.WikiUsers. This table is updated whenever a user registers, so users can choose not to register (in which case their webserver login name is used for their signature) or register (in which case that login name is mapped to their WikiName).
 
 The same private =.htpasswd= file used in %WIKITOOLNAME% Template Login can be used to authenticate Apache users, using the Apache Basic Authentication support.

branches/Release04x02/data/TestCases/TestCaseAutoFormatting.txt

@@ -354 +354 @@
 <a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/WebPreferences">WebPreferences</a>
 <p />
-<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%USERSWEB%/TWikiUsers">TWikiUsers</a>
+<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%USERSWEB%/%WIKIUSERSTOPIC%">%WIKIUSERSTOPIC%</a>
 <p />
 <span class="twikiNewLink">CompleteAndUtterNothing<a href="%SCRIPTURLPATH{"edit"}%/TestCases/CompleteAndUtterNothing?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow" title="Create this topic">?</a></span>
@@ -369 +369 @@
 WebPreferences
 
-%USERSWEB%.TWikiUsers
+%USERSWEB%.%WIKIUSERSTOPIC%
 
 CompleteAndUtterNothing
@@ -386 +386 @@
 <span class="twikiNewLink">wiki syntax<a href="%SCRIPTURLPATH{"edit"}%/TestCases/WikiSyntax?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"  title="Create this topic">?</a></span>
 <p />
-<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%USERSWEB%/TWikiUsers">%USERSWEB%.TWiki users</a>
+<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%USERSWEB%/%WIKIUSERSTOPIC%">%USERSWEB%.Wiki users</a>
 <p />
 escaped:
@@ -399 +399 @@
 [[wiki syntax]]
 
-[[%USERSWEB%.TWiki users]]
+[[%USERSWEB%.Wiki users]]
 
 escaped:

branches/Release04x02/data/TestCases/TestCaseAutoInternalTags.txt

@@ -71 +71 @@
  <tr>
   <td>WIKIUSERSTOPIC</td>
-  <td><!-- expected viftene -->WIKIUSERSTOPIC TWikiUsers<!-- /expected --></td>
+  <td><!-- expected viftene -->WIKIUSERSTOPIC WikiUsers<!-- /expected --></td>
   <td><!-- actual -->WIKIUSERSTOPIC <nop>%WIKIUSERSTOPIC%<!-- /actual --></td>
  </tr>

branches/Release04x02/data/TestCases/TestCaseInternetRegistration.txt

@@ -31 +31 @@
 
         1 Topic named as %<nop>WIKINAME% written to %USERSWEB%
-        2 Entry written to [[%USERSWEB%.TWikiUsers]]
+        2 Entry written to [[%USERSWEB%.%WIKIUSERSTOPIC%]]
         3 There *is* .htpasswd entry for the user
         4 Email is sent to administrator

branches/Release04x02/data/TestCases/TestCaseIntranetRegistration.txt

@@ -13 +13 @@
 ---++ Expected result
         1 Topic named as %<nop>WIKINAME% written to %USERSWEB%
-        2 Entry written to [[%USERSWEB%.TWikiUsers]]
+        2 Entry written to [[%USERSWEB%.%WIKIUSERSTOPIC%]]
         3 There is no .htpasswd entry for RemoteUser 
         4 Email is sent to administrator

branches/Release04x02/lib/TWiki.spec

@@ -338 +338 @@
 # registration scripts. <b>If you change this setting you will have to
 # use TWiki to manually rename the existing topic</b>
-$TWiki::cfg{UsersTopicName} = 'TWikiUsers';
+$TWiki::cfg{UsersTopicName} = 'WikiUsers';
 
 # **STRING 100 EXPERT**

branches/Release04x02/lib/TWiki/Users/ApacheHtpasswdUser.pm

@@ -32 +32 @@
 Password manager that uses Apache::HtPasswd to manage users and passwords.
 
-Subclass of [[TWikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
+Subclass of [[WikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
 See documentation of that class for descriptions of the methods of this class.
 
 Duplicates functionality of
-[[TWikiUsersHtPasswdUserDotPm][ =TWiki::Users::HtPasswdUser=]];
+[[WikiUsersHtPasswdUserDotPm][ =TWiki::Users::HtPasswdUser=]];
 provided mainly as an example of how to write a new password manager.
 

branches/Release04x02/lib/TWiki/Users/BaseUserMapping.pm

@@ -365 +365 @@
     else {
 
-        # Add additional mappings defined in TWikiUsers
+        # Add additional mappings defined in WikiUsers
         if ( $this->{W2U}->{$wn} ) {
             push( @users, $this->{W2U}->{$wn} );

branches/Release04x02/lib/TWiki/Users/HtPasswdUser.pm

@@ -24 +24 @@
 Support for htpasswd and htdigest format password files.
 
-Subclass of [[TWikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
+Subclass of [[WikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
 See documentation of that class for descriptions of the methods of this class.
 

branches/Release04x02/lib/TWiki/Users/Password.pm

@@ -267 +267 @@
 
 returns a TWikiIterator of loginnames from the password source. If AllowLoginNames is false
-this is used to remove the need for a TWikiUsers topic.
+this is used to remove the need for a WikiUsers topic.
 
 =cut

branches/Release04x02/templates/messages.tmpl

@@ -45 +45 @@
 %MAKETEXT{"Please make sure you spelled the [_1] correctly and try again. If you get stuck, please mail [_2]." args="%SYSTEMWEB%.LoginName, %WIKIWEBMASTER%"}%
 
-%MAKETEXT{"See [_1] for a list of existing users or register as new user in [_2]." args="%USERSWEB%.TWikiUsers, %SYSTEMWEB%.TWikiRegistration"}% %TMPL:END%
+%MAKETEXT{"See [_1] for a list of existing users or register as new user in [_2]." args="%USERSWEB%.%WIKIUSERSTOPIC%, %SYSTEMWEB%.TWikiRegistration"}% %TMPL:END%
 %TMPL:DEF{"in_a_group"}%
 ---+++ %MAKETEXT{"[_1] is in at least one group and cannot be removed" args="%PARAM1%"}%

branches/Release04x02/tools/TWikiKernel/MANIFEST

@@ -41 +41 @@
 data/Main/WikiGuest.txt 0660
 data/Main/RegistrationAgent.txt 0660
-data/Main/TWikiUsers.txt 0660
+data/Main/WikiUsers.txt 0660
 data/Main/UnknownUser.txt 0660
 data/Main/UserForm.txt 0660

branches/Release04x02/tools/create_large_groups.pl

@@ -3 +3 @@
 # (group size 10000/5000/2500/..)
 
-#warning: does not add users to Main.TWikiUsers topic     *FIXED*
+#warning: does not add users to Main.WikiUsers topic     *FIXED*
 #warning: does not add users and user info to htpasswd file     *FIXED*
 #warning: uses out dated email storage method     *FIXED*
@@ -11 +11 @@
 undef $/;
 open( PWD, ">>data/BIGGROUPS_htpasswd" ) || die $!;
-open( TWUSER, ">>data/Main/TWikiUsers.txt" ) || die $!;
+open( TWUSER, ">>data/Main/WikiUsers.txt" ) || die $!;
 for my $user ( 1 .. 10000 ) {
     my $username = "TestUser$user";

branches/Release04x02/tools/extender.pl

@@ -138 +138 @@
     }
     if (defined $cfg{UsersTopicName}) {
-        $file =~ s#(Main)/TWikiUsers\.txt(.*)$#$1/$cfg{UsersTopicName}.txt$2#;
+        $file =~ s#(Main)/WikiUsers\.txt(.*)$#$1/$cfg{UsersTopicName}.txt$2#;
     }
     foreach my $w qw( SystemWebName TrashWebName UsersWebName ) {

branches/Release04x02/twikiplugins/PatternSkin/data/TWiki/WebLeftBar.txt

@@ -3 +3 @@
 
    * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][ %ICON{"home"}% <nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b>
-   * %IF{"istopic '%USERSWEB%.TWikiUsers'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntUSERSWEB$percnt.TWikiUsers][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
+   * %IF{"istopic '%USERSWEB%.%WIKIUSERSTOPIC%'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntUSERSWEB$percnt.$percntWIKIUSERSTOPIC$percnt][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
    * [[%USERSWEB%.TWikiGroups][ %ICON{"group"}% %MAKETEXT{"Groups"}%]]
    * [[WebTopicList][ %ICON{"index"}% %MAKETEXT{"Index"}%]]

branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/Main/UserListHeader.txt

@@ -1 +1 @@
 %META:TOPICINFO{author="ProjectContributor" date="1127307283" format="1.1" version="$Rev$"}%
-__Related topics:__ %SEARCH{"^(TWikiUsers|TWikiGroups|UserList$|UserListBy)" type="regex" web="%MAINWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%
+__Related topics:__ %SEARCH{"^(%WIKIUSERSTOPIC%|TWikiGroups|UserList$|UserListBy)" type="regex" web="%MAINWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%

branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/LoginName.txt

@@ -9 +9 @@
 ---++ How to Find Yours
 
-Look in %MAINWEB%.TWikiUsers - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.
+Look in %MAINWEB%.%WIKIUSERSTOPIC% - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.
 
 e.g.

branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt

@@ -48 +48 @@
       * Fix backlinks in the %MAINWEB% web only
       * Make sure the group topics are updated (if any.)
-   * Edit the [[%MAINWEB%.TWikiUsers]] topic and move the user's entry so
+   * Edit the [[%MAINWEB%.%WIKIUSERSTOPIC%]] topic and move the user's entry so
      that the list is in proper alphabetical order.
    * Recreate the old topic with a pointer to the new topic, so that links
@@ -57 +57 @@
    * The login name needs to be changed in the authentication server (e.g.
      Active Directory)
-   * In TWiki's [[%MAINWEB%.TWikiUsers]] topic, fix the mapping from
+   * In TWiki's [[%MAINWEB%.%WIKIUSERSTOPIC%]] topic, fix the mapping from
      login name to WikiName:%BR%
      =   * !JaneSmith - jsmith - 13 Sep 2006= %BR%
@@ -72 +72 @@
         =.htpasswd= files generated by TWiki! =htpasswd= wipes out email
         addresses that TWiki plants in the info fields of this file.
-   2 Remove the =FredQuimby - fred= line from the <nop>%MAINWEB%.TWikiUsers
+   2 Remove the =FredQuimby - fred= line from the <nop>%MAINWEB%.%WIKIUSERSTOPIC%
      topic
    3 Remove =FredQuimby= from all groups and from all the
@@ -108 +108 @@
 From this point on, your myskin templates will be used for the registration emails.
 
-To make it possible for TWikiUsers to modify the email contents, you could use a parameterized =%<nop>INCLUDE%=
+To make it possible for %WIKIUSERSTOPIC% to modify the email contents, you could use a parameterized =%<nop>INCLUDE%=
 statement in your customized version. eg:
 

branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/TWikiUserSetting.txt

@@ -12 +12 @@
 *The following variables are classified as user settings:*
 
-%SEARCH{"TWikiUserSetting" type="regex" topic="Var*" format="   * $topic" nonoise="on"}%
+%SEARCH{"WikiUsersetting" type="regex" topic="Var*" format="   * $topic" nonoise="on"}%
 
 *See also:*

branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt

@@ -11 +11 @@
 an internal TWiki canonical user ID, and the displayed name used to identify the user in TWiki. 
 This is the default <nop>TopicUserMapping in which user information is stored in TWiki topics - one per user, and then any mapping needed is done using the
-<nop>TWikiUsers topic in the %MAINWEB%.
+<nop>%WIKIUSERSTOPIC% topic in the %MAINWEB%.
 
 see [[http://twiki.org/cgi-bin/view/Codev/SimplifiedUserMappingCodeInterface][SimplifiedUserMappingCodeInterface]] on TWiki.org for a more detailed discussion
@@ -45 +45 @@
       * TWiki.UsersTemplate
       * Main.UserHomepageHeader        
-      * TWiki.TWikiUserSetting
+      * TWiki.WikiUsersetting
       * Main.TWikiGroupTemplate        
 

branches/Release04x02/twikiplugins/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST

@@ -19 +19 @@
 
 data/TWiki/TWikiRegistration.txt 0644
-data/TWiki/UsersTemplate.txt 0644 Default template for a new TWikiUsers topic
+data/TWiki/UsersTemplate.txt 0644 Default template for a new WikiUsers topic
 data/TWiki/ChangeEmailAddress.txt 0644
 data/TWiki/BulkResetPassword.txt 0644
-data/TWiki/TWikiUserSetting.txt 0644
+data/TWiki/WikiUsersetting.txt 0644
 data/TWiki/UserForm.txt 0644 Default form attached to a user topic
 data/TWiki/NewUserTemplate.txt 0644 Default new user topic template

branches/Release04x02/twikiplugins/TopicUserMappingContrib/lib/TWiki/Users/TopicUserMapping.pm

@@ -27 +27 @@
 By default TWiki maintains user topics and group topics in the %MAINWEB% that
 define users and group. These topics are
-   * !TWikiUsers - stores a mapping from usernames to TWiki names
+   * !WikiUsers - stores a mapping from usernames to TWiki names
    * !WikiName - for each user, stores info about the user
    * !GroupNameGroup - for each group, a topic ending with "Group" stores a list of users who are part of that group.
@@ -230 +230 @@
 }
 
-# test if the login is in the TWikiUsers topic, or in the password file
+# test if the login is in the WikiUsers topic, or in the password file
 # depending on the AllowLoginNames setting
 sub _userReallyExists {
@@ -237 +237 @@
     if ( $TWiki::cfg{Register}{AllowLoginName} ) {
 
-        # need to use the TWikiUsers file
+        # need to use the WikiUsers file
         _loadMapping($this);
         return 1 if ( defined( $this->{L2U}->{$login} ) );
@@ -271 +271 @@
 Add a user to the persistant mapping that maps from usernames to wikinames
 and vice-versa. The default implementation uses a special topic called
-"TWikiUsers" in the users web. Subclasses will provide other implementations
+"WikiUsers" in the users web. Subclasses will provide other implementations
 (usually stubs if they have other ways of mapping usernames to wikinames).
 Names must be acceptable to $TWiki::cfg{NameFilter}
@@ -932 +932 @@
     elsif ( $TWiki::cfg{Register}{AllowLoginName} ) {
 
-        # Add additional mappings defined in TWikiUsers
+        # Add additional mappings defined in WikiUsers
         _loadMapping($this);
         if ( $this->{W2U}->{$wn} ) {

branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/Fn_REVINFO.pm

@@ -159 +159 @@
 
     # Create a topic with raw meta to force a wikiname into the author field.
-    # The wikiname must be for a user who is in TWikiUsers.
+    # The wikiname must be for a user who is in WikiUsers.
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.
@@ -188 +188 @@
 
     # Create a topic with raw meta to force a login into the author field.
-    # The login must be for a user who is in TWikiUsers.
+    # The login must be for a user who is in WikiUsers.
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.

branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/RegisterTests.pm

@@ -1486 +1486 @@
     );
 
-    # Make TWikiUsers read-only
-    chmod( 0444, "$TWiki::cfg{DataDir}/$this->{users_web}/TWikiUsers.txt" );
+    # Make WikiUsers read-only
+    chmod( 0444, "$TWiki::cfg{DataDir}/$this->{users_web}/$TWiki::cfg{UsersTopicName}.txt" );
 
     $query->path_info("/$this->{users_web}/TWikiRegistration");
@@ -1535 +1535 @@
     }
     finally {
-        chmod( 0777, "$TWiki::cfg{DataDir}/$this->{users_web}/TWikiUsers.txt" );
+        chmod( 0777, "$TWiki::cfg{DataDir}/$this->{users_web}/$TWiki::cfg{UsersTopicName}.txt" );
     };
 }
@@ -1605 +1605 @@
 
 #test for http://develop.twiki.org/~twiki4/cgi-bin/view/Bugs/Item3400
-sub verify_resetPassword_NoTWikiUsersEntry {
+sub verify_resetPassword_NoWikiUsersEntry {
     my $this = shift;
 
@@ -1613 +1613 @@
     $this->registerAccount();
 
-    #Remove the TWikiUsers entry - by deleting it :)
+    #Remove the WikiUsers entry - by deleting it :)
     $this->{twiki}->{store}->moveTopic(
         $TWiki::cfg{UsersWebName},

branches/Release04x02/twikiplugins/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -461 +461 @@
         name => 'variousWikiWords',
         html =>
-"<p>${linkon}WebPreferences${linkoff}</p><p>$protecton<br />%MAINWEB%$protectoff.TWikiUsers</p><p>${linkon}CompleteAndUtterNothing${linkoff}</p><p>${linkon}LinkBox$linkoff${linkon}LinkBoxs${linkoff}${linkon}LinkBoxies${linkoff}${linkon}LinkBoxess${linkoff}${linkon}LinkBoxesses${linkoff}${linkon}LinkBoxes${linkoff}</p>",
+"<p>${linkon}WebPreferences${linkoff}</p><p>$protecton<br />%MAINWEB%$protectoff.WikiUsers</p><p>${linkon}CompleteAndUtterNothing${linkoff}</p><p>${linkon}LinkBox$linkoff${linkon}LinkBoxs${linkoff}${linkon}LinkBoxies${linkoff}${linkon}LinkBoxess${linkoff}${linkon}LinkBoxesses${linkoff}${linkon}LinkBoxes${linkoff}</p>",
         tml => <<'YYY',
 WebPreferences
 
-%MAINWEB%.TWikiUsers
+%MAINWEB%.WikiUsers
 
 CompleteAndUtterNothing
@@ -476 +476 @@
         name => 'variousWikiWordsNopped',
         html =>
-"${nop}${linkon}WebPreferences${linkoff} %${nop}MAINWEB%.TWikiUsers ${nop}CompleteAndUtterNothing",
+"${nop}${linkon}WebPreferences${linkoff} %${nop}MAINWEB%.WikiUsers ${nop}CompleteAndUtterNothing",
         tml =>
-'<nop>WebPreferences %<nop>MAINWEB%.TWikiUsers <nop>CompleteAndUtterNothing',
+'<nop>WebPreferences %<nop>MAINWEB%.WikiUsers <nop>CompleteAndUtterNothing',
     },
     {
@@ -484 +484 @@
         name => 'squabsWithVars',
         html => <<HERE,
-${linkon}[[wiki syntax]]$linkoff$linkon\[[%MAINWEB%.TWiki users]]${linkoff}
+${linkon}[[wiki syntax]]$linkoff$linkon\[[%MAINWEB%.Wiki users]]${linkoff}
 escaped:
 [<nop>[wiki syntax]]
 HERE
         tml => <<'THERE',
-[[wiki syntax]][[%MAINWEB%.TWiki users]]
+[[wiki syntax]][[%MAINWEB%.Wiki users]]
 escaped:
 ![[wiki syntax]]
 THERE
         finaltml => <<'EVERYWHERE',
-[[wiki syntax]][[%MAINWEB%.TWiki users]] escaped: ![[wiki syntax]]
+[[wiki syntax]][[%MAINWEB%.Wiki users]] escaped: ![[wiki syntax]]
 EVERYWHERE
     },

trunk/BlogPlugin/data/_BlogPlugin/BlogAbout.txt

@@ -20 +20 @@
 %REDDOT{"WebNotify" text="here" style="margin:0;padding:0;font-size:100%;"}% 
 and add your e-mail address or your <nop>%WIKITOOLNAME% username if you are a 
-[[%MAINWEB%.TWikiUsers][registered user]].
+[[%MAINWEB%.%WIKIUSERSTOPIC%][registered user]].
 
 ---++ Contact

trunk/DirectedGraphWebMapPlugin/data/TWiki/DirectedGraphWebMapPlugin.txt

@@ -10 +10 @@
 This is a sample of a web drawn by <nop>%TOPIC% - the "Main" web in a default installation of TWiki.
 
-<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%/TWikiAdminGroup" title="TWikiAdminGroup" 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%/TWikiUsers" title="TWikiUsers" 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">
+<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%/TWikiAdminGroup" title="TWikiAdminGroup" 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">
 </map>
 <img usemap="#SampleMainWebMap" src="%ATTACHURLPATH%/SampleMainWebMap.png">

trunk/FindElsewherePlugin/data/TWiki/FindElsewherePlugin.txt

@@ -27 +27 @@
 | Found singular here | =<nop>WebHomes=       | WebHomes       | [[%SYSTEMWEB%.WebHome][WebHomes]] |
 | Found elsewhere     | =<nop>WebSearch= | WebSearch | [[%SYSTEMWEB%.WebSearch][WebSearch]] |
-| Found elsewhere (LOOKELSEWHEREFORLOCAL enabled)    | =<nop>%SYSTEMWEB%.TWikiUsers= | %SYSTEMWEB%.TWikiUsers | [[Main.TWikiUsers][TWikiUsers]] |
-| Found elsewhere (LOOKELSEWHEREFORLOCAL disabled)    | =<nop>%SYSTEMWEB%.TWikiUsers= | %SYSTEMWEB%.TWikiUsers | [[TWiki.TWikiUsers][TWikiUsers]] (non-existing) |
+| Found elsewhere (LOOKELSEWHEREFORLOCAL enabled)    | =<nop>%SYSTEMWEB%.WikiUsers= | %SYSTEMWEB%.WikiUsers | [[Main.WikiUsers][WikiUsers]] |
+| Found elsewhere (LOOKELSEWHEREFORLOCAL disabled)    | =<nop>%SYSTEMWEB%.WikiUsers= | %SYSTEMWEB%.WikiUsers | [[TWiki.WikiUsers][WikiUsers]] (non-existing) |
 | Found elsewhere     | =[<nop>[TWikiAdminGroup][twiki admins]]= | [[TWikiAdminGroup][twiki admins]] | [[Main.TWikiAdminGroup][twiki admins]] |
 | Don't touch direct links     | =[<nop>[%MAINWEB%.TWikiAdminGroup][twiki admins]]= | [[%MAINWEB%.TWikiAdminGroup][twiki admins]] | [[Main.TWikiAdminGroup][twiki admins]] |

trunk/HTTPDUserAdminContrib/data/TWiki/HTTPDUserAdminContrib.txt

@@ -13 +13 @@
 It has been developed and tested for the TWiki-4.2, though _may_ be useable for previous releases.
 
-You receive maximal performance benefit by using the =SQL= mode, and ensuring ={Register}{AllowLoginName}= is off (so that the %MAINWEB%.TWikiUsers topic is not needed to convert login names to Wiki Names.
+You receive maximal performance benefit by using the =SQL= mode, and ensuring ={Register}{AllowLoginName}= is off (so that the %MAINWEB%.WikiUsers topic is not needed to convert login names to Wiki Names.
 
 See the Extensions | HTTPDUserAdminContrib section of =configure= to set up the specific options.

trunk/HTTPDUserAdminContrib/lib/TWiki/Users/HTTPDUserAdminUser.pm

@@ -34 +34 @@
 Password manager that uses HTTPD::UserAdmin to manage users and passwords.
 
-Subclass of [[TWikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
+Subclass of [[WikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
 See documentation of that class for descriptions of the methods of this class.
 
 Duplicates functionality of
-[[TWikiUsersHtPasswdUserDotPm][ =TWiki::Users::HtPasswdUser=]];
+[[WikiUsersHtPasswdUserDotPm][ =TWiki::Users::HtPasswdUser=]];
 and Adds the possiblilty of using DBM files, and databases to store the user information.
 

trunk/HTTPDUserAdminContrib/lib/TWiki/Users/HTTPDUserAdminUserMapping.pm

@@ -214 +214 @@
 ---++ ObjectMethod _userReallyExists ($login) -> boolean
 
-test if the login is in the TWikiUsers topic, or in the password file
+test if the login is in the WikiUsers topic, or in the password file
 depending on the AllowLoginNames setting
 
@@ -435 +435 @@
         push( @users, $wn);
     } elsif( $TWiki::cfg{Register}{AllowLoginName} ) {
-        # Add additional mappings defined in TWikiUsers
+        # Add additional mappings defined in WikiUsers
         
         my @usernames = $this->{passwords}->listMatchingUsers($TWiki::cfg{HTTPDUserAdminContrib}{WikiNameField}, $wn);
@@ -516 +516 @@
 
 #######################################################################
-# don't create or use the MAIN.TWikiUsers topic 
+# don't create or use the MAIN.WikiUsers topic 
 # this is a copy of the functionality in TopicUserMapping, with the TWikiUser topic part removed
 #TODO: shame that its the UI::Registration code that creates the User topic - tahts close to pointless too

trunk/HistoryPlugin/data/TWiki/HistoryPlugin.txt

@@ -66 +66 @@
       * Here should appear the history of this document inline: 
         %HISTORY{"      r1.$rev - $date - $wikiusername%BR%"}%
-      * Show the history of Main.TWikiUsers :%BR%
-        %SCRIPTURL{oops}%/Main/TWikiUsers?template=oopshistory
+      * Show the history of Main.WikiUsers :%BR%
+        %SCRIPTURL{oops}%/Main/WikiUsers?template=oopshistory
 
 ---++ Plugin Info

trunk/LdapContrib/lib/TWiki/Users/LdapUserMapping.pm

@@ -131 +131 @@
 =pod 
 
----++++ groupMembers($group) -> @listOfTWikiUsers
+---++++ groupMembers($group) -> @listOfWikiUsers
 
 Returns a list of all members of a given group. Members are 

trunk/MailToTWikiAddOn/bin/mailtotwiki

@@ -246 +246 @@
         # Fetch the %MAINWEB%.TWikiUser topic
         my $mainweb = TWiki::Func::getMainWebname();
-        my $topic1 = TWiki::Func::readTopicText($mainweb, 'TWikiUsers');
+        my $topic1 = TWiki::Func::readTopicText($mainweb, 'WikiUsers');
 
         # For each likely-looking user, open the topic, get the email address.

trunk/NatSkin/data/TWiki/NatSearch.txt

@@ -39 +39 @@
 ---++ Examples
 | *Search* | *Description* |
-| <nop>TWikiUsers | if the current web is the %MAINWEB% go to the <nop>TWikiUsers  |
+| <nop>WikiUsers | if the current web is the %MAINWEB% go to the <nop>WikiUsers  |
 |                 | if the current web is the %SYSTEMWEB% go to the <nop>UsersGuide |
-| g:twikiusers | list all topics in all webs whose name match "twikiusers" |
+| g:WikiUsers | list all topics in all webs whose name match "WikiUsers" |
 | g:copyright -webpref | list all topics that contain the word "copyright" but not "webpref" |
 | g:"Good morning" -natskin | list all topics that contain the term "Good morning" but not "natskin" |

trunk/NatSkin/templates/messages.nat.tmpl

@@ -25 +25 @@
 
 %MAKETEXT{"See [_1] for a list of existing users or register as new user in [_2]."
-args="%USERSWEB%.TWikiUsers,%TWIKIREGISTRATION%"}%
+args="%USERSWEB%.%WIKIUSERSTOPIC%,%TWIKIREGISTRATION%"}%
 %TMPL:END%
 %TMPL:DEF{"topic_exists"}%<!-- uses goback def -->

trunk/NatSkin/templates/oopsnotwikiuser.nat.tmpl

@@ -7 +7 @@
 Remember, a [_1] is case sensitive.
 See [_2] for a list of existing users or register as new user in [_3]."
- args="%SYSTEMWEB%.WikiName,%MAINWEB%.TWikiUsers,%TWIKIREGISTRATION%"}%
+ args="%SYSTEMWEB%.WikiName,%USERSWEB%.%WIKIUSERSTOPIC%,%TWIKIREGISTRATION%"}%
 
 <!-- //message -->%TMPL:P{"goback"}% %TMPL:END%

trunk/NatSkin/templates/viewtopicactions.nat.tmpl

@@ -1 +1 @@
 <!-- template: viewtopicaction.nat.tmpl -->
-%TMPL:DEF{"usersurl"}%<a class='natUserAction' href='%SCRIPTURLPATH{"view"}%/%MAINWEB%/TWikiUsers' title='%TMPL:P{"USERS_HELP"}%'>%TMPL:P{"USERS"}%</a>
+%TMPL:DEF{"usersurl"}%<a class='natUserAction' href='%SCRIPTURLPATH{"view"}%/%USERSWEB%/%WIKIUSERSTOPIC%' title='%TMPL:P{"USERS_HELP"}%'>%TMPL:P{"USERS"}%</a>
 %TMPL:DEF{"topicactions_top"}%<!-- topicactions_top -->
 %USERACTIONS{

trunk/PatternSkin/data/TWiki/WebLeftBar.txt

@@ -3 +3 @@
 
    * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][ %ICON{"home"}% <nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b>
-   * %IF{"istopic '%USERSWEB%.TWikiUsers'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntUSERSWEB$percnt.TWikiUsers][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
+   * %IF{"istopic '%USERSWEB%.%WIKIUSERSTOPIC%'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntUSERSWEB$percnt.$percntWIKIUSERSTOPIC$percnt][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
    * [[%USERSWEB%.TWikiGroups][ %ICON{"group"}% %MAKETEXT{"Groups"}%]]
    * [[WebTopicList][ %ICON{"index"}% %MAKETEXT{"Index"}%]]

trunk/PersonalInfoAddOn/data/Main/PersonalInfoDemoUser.txt

@@ -1 +1 @@
 %META:TOPICINFO{author="ProjectContributor" date="1173049125" format="1.1" reprev="1.1" version="1.1"}%
-%META:TOPICPARENT{name="TWikiUsers"}%
+%META:TOPICPARENT{name="WikiUsers"}%
 
 Demo user for %SYSTEMWEB%.PersonalInfoAddOn for illustration purposes only. This topic can be safely deleted after review. %BR%

trunk/PersonalInfoAddOn/data/_PersonalInfoAddOn04x01/PersonalInfoUserFormExample.txt

@@ -2 +2 @@
 ---+ User Form
 
-This form defines the form of the home pages of registered TWiki users listed in [[%MAINWEB%.TWikiUsers][TWikiUsers]].
+This form defines the form of the home pages of registered TWiki users listed in [[%MAINWEB%.WikiUsers][WikiUsers]].
 
 | *Name* | *Type* | *Size* | *Values* | *Tooltip message* | *Attribute* |
@@ -27 +27 @@
 | <nop>WorkLocation | text | 40 |  |  | H |
 
-__Related topics:__ [[TWikiUsers]], [[%SYSTEMWEB%.DataForms][DataForms]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]]
+__Related topics:__ [[WikiUsers]], [[%SYSTEMWEB%.DataForms][DataForms]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]]
 

trunk/PersonalInfoAddOn/data/_PersonalInfoAddOn04x02/PersonalInfoUserFormExample.txt

@@ -2 +2 @@
 ---+ User Form
 
-This form defines the form of the home pages of registered TWiki users listed in [[%MAINWEB%.TWikiUsers][TWikiUsers]].
+This form defines the form of the home pages of registered TWiki users listed in [[%MAINWEB%.WikiUsers][WikiUsers]].
 
 | *Name* | *Type* | *Size* | *Values* | *Tooltip message* | *Attribute* |
@@ -27 +27 @@
 | <nop>WorkLocation | text | 40 |  |  | H |
 
-__Related topics:__ [[TWikiUsers]], [[%SYSTEMWEB%.DataForms][DataForms]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]]
+__Related topics:__ [[WikiUsers]], [[%SYSTEMWEB%.DataForms][DataForms]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]]
 

trunk/PluginBenchmarkAddOn/bin/pluginbenchmark

@@ -101 +101 @@
 "           name, followed by topic names. The TWiki web is assumed unless specified.\n\n";
     print
-"Example:   \% ./pluginbenchmark FooBarPlugin GoodStyle FormattedSearch Main.TWikiUsers\n\n";
+"Example:   \% ./pluginbenchmark FooBarPlugin GoodStyle FormattedSearch Main.WikiUsers\n\n";
     print
 "Notes:     - Before running the benchmarks, disable mod_perl or SpeedyCGI in case used.\n";

trunk/PluginBenchmarkAddOn/data/TWiki/PluginBenchmarkAddOn.txt

@@ -17 +17 @@
         * Choose a topic that renders your plugin variables. That may be the plugin topic, or an example topic.
         * Go to your =bin= directory and call (for instance):
-        * =% ./pluginbenchmark <nop>TablePlugin <nop>GoodStyle <nop>FormattedSearch <nop>Main.TWikiUsers=
+        * =% ./pluginbenchmark <nop>TablePlugin <nop>GoodStyle <nop>FormattedSearch <nop>Main.WikiUsers=
         
 ---++ Example output

trunk/QuickMenuSkin/data/TWiki/QuickMenuBarUtilities.txt

@@ -3 +3 @@
 utilMenu = new QuickMenu.Menu(menuBar,"%MAKETEXT{"Utilities"}%","","","%MAKETEXT{"Utilities available for this Web"}%");
 if ("%USERINFO{format="$groups"}%".match(/TWikiAdminGroup/)) {
-  utilMenu.Add("%MAKETEXT{"Users"}%","%SCRIPTURLPATH{"view"}%/%MAINWEB%/TWikiUsers","%ICONURLPATH{"person"}%");
+  utilMenu.Add("%MAKETEXT{"Users"}%","%SCRIPTURLPATH{"view"}%/%MAINWEB%/WikiUsers","%ICONURLPATH{"person"}%");
   utilMenu.Add("%MAKETEXT{"Groups"}%","%SCRIPTURLPATH{"view"}%/%MAINWEB%/TWikiGroups","%ICONURLPATH{"group"}%");
   utilMenu.Add();

trunk/SpanishTWikiContrib/data/TWiki/SpanishTWikiContrib.txt

@@ -23 +23 @@
 | TWiki_ES.FormulariosTWiki | TWiki:TWiki04x02.TWikiForms | 24 |  |
 | TWiki_ES.GlosarioTWiki | TWiki:TWiki04x02.TWikiGlossary | 5 |  |
-| TWiki_ES.GuiaDeUsuarioTWiki | TWiki:TWiki04x02.TWikiUsersGuide | 2 |  |
+| TWiki_ES.GuiaDeUsuarioTWiki | TWiki:TWiki04x02.WikiUsersGuide | 2 |  |
 | TWiki_ES.IntroduccionVariablesTWiki | TWiki:TWiki04x02.TWikiVariablesQuickStart | 3 |  |
 | TWiki_ES.MailerContrib | TWiki:TWiki04x02.MailerContrib | 5 |  |

trunk/SpanishTWikiContrib/data/TWiki/TranslationNote.txt

@@ -33 +33 @@
 ---+++ Explanation
 Each translated topic shall include data related to the original document (generally from the english source documentation) that is stored in the TranslationForm attached to the translated topic. This TranslationForm includes three core elements (fields), based on a the concept developed on TWiki:Codev.TranslationSupport:
-   * Origin: The original, not translated topic, including the web-reference, e.g. =TWiki.TWikiUsersGuide=
+   * Origin: The original, not translated topic, including the web-reference, e.g. =TWiki.WikiUsersGuide=
    * Revision: The revision number of the original topic at the moment of translation
    * Language: Two-character ISO language code representing the language of the translated topic, e.g. =es= for spanish or =en= for english

trunk/SpanishTWikiContrib/data/TWiki_ES/GlosarioTWiki.txt

@@ -17 +17 @@
 | Plugin: | Una extensión preconfigurada del lado de un servidor que agrega cualquier tipo de funciones adicionales perfectamente integradas al TWiki. [[TWiki.Plugins][Detalles...]] %FLAGGB% |
 | Plugin API: | El interfaz estándar para crear TWiki _Plugins_ y programas adicionales que asegura una integración perfecta. [[TWiki.TWikiFuncDotPm][Detalles...]] %FLAGGB% |
-| Preferencias: | La configuración de preferencias de todo el sitio, una _web_ específica e individual de cada usuario. Las configuraciones se guardan en las páginas %SYSTEMWEB%.DefaultPreferences %FLAGGB%, WebPreferences %FLAGGB% y %USERSWEB%.TWikiUsers %FLAGGB%. [[TWiki.TWikiVariables#PreferencesVariables][Detalles...]] %FLAGGB% |
+| Preferencias: | La configuración de preferencias de todo el sitio, una _web_ específica e individual de cada usuario. Las configuraciones se guardan en las páginas %SYSTEMWEB%.DefaultPreferences %FLAGGB%, WebPreferences %FLAGGB% y %USERSWEB%.WikiUsers %FLAGGB%. [[TWiki.TWikiVariables#PreferencesVariables][Detalles...]] %FLAGGB% |
 | Sitio: | Una instalación de TWiki que consiste de una o más _webs_. [[SitioTWiki][Detalles...]] |
 | TWiki: | Una plataforma de colaboración basada en el internet dirigida al mundo corporativo. Contracción de "TakeFive Wiki". Casualmente, sucede que también es el nombre de un robot de inteligencia artificial de la película de 1979 y una serie de televisión de Buck Rogers. Características incluyen la edición a través del navegador, generación automática de enlaces en texto (basada en ideas de la <nop>WikiWikiWeb original), control de revisión, _archivos adjuntos_, uso de _formularios_, configuración de _preferencias_, control de acceso y más. [[http://TWiki.org/][Detalles...]] %FLAGGB% |

trunk/SpanishTWikiContrib/data/TWiki_ES/GuiaDeUsuarioTWiki.txt

@@ -39 +39 @@
 
 %META:FORM{name="TWiki.TranslationForm"}%
-%META:FIELD{name="Origin" attributes="" title="Origin" value="TWiki.TWikiUsersGuide"}%
+%META:FIELD{name="Origin" attributes="" title="Origin" value="TWiki.WikiUsersGuide"}%
 %META:FIELD{name="Revision" attributes="" title="Revision" value="2"}%
 %META:FIELD{name="Language" attributes="" title="Language" value="es"}%

trunk/SpanishTWikiContrib/data/TWiki_ES/TaquigrafiaTWiki.txt

@@ -358 +358 @@
 [[sintaxis wiki]]
 
-[[Main.TWiki users]]
+[[Main.Wiki users]]
 
 para evitar enlace:
@@ -367 +367 @@
 [[sintaxis wiki]]
 
-[[%MAINWEB%.TWiki users]]
+[[%MAINWEB%.Wiki users]]
 
 para evitar enlace:

trunk/SpanishTWikiContrib/data/TWiki_ES/WebLeftBar.txt

@@ -3 +3 @@
 
    * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][ %ICON{"home"}% <nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b>
-   * %IF{"istopic '%MAINWEB%.TWikiUsers'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntMAINWEB$percnt.TWikiUsers][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
+   * %IF{"istopic '%MAINWEB%.%WIKIUSERSTOPIC%'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntMAINWEB$percnt.$percntWIKIUSERSTOPIC$percnt][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
    * [[%MAINWEB%.TWikiGroups][ %ICON{"group"}% %MAKETEXT{"Groups"}%]]
    * [[WebTopicList][ %ICON{"index"}% %MAKETEXT{"Index"}%]]

trunk/SpanishTWikiContrib/lib/TWiki/Contrib/SpanishTWikiContrib/MANIFEST

@@ -12 +12 @@
 data/TWiki_ES/FormulariosTWiki.txt 0644 Translation - TWiki.DataForms
 data/TWiki_ES/GlosarioTWiki.txt 0644 Translation - TWiki.TWikiGlossary
-data/TWiki_ES/GuiaDeUsuarioTWiki.txt 0644 Translation - TWiki.TWikiUsersGuide
+data/TWiki_ES/GuiaDeUsuarioTWiki.txt 0644 Translation - TWiki.WikiUsersGuide
 data/TWiki_ES/IntroduccionVariablesTWiki.txt 0644 Translation - TWiki.TWikiVariablesQuickStart
 data/TWiki_ES/MailerContrib.txt 0644 Translation - TWiki.MailerContrib

trunk/TWikiDeploymentSpiderAddOn/twiki-deployment-spider.pl

@@ -120 +120 @@
 | Number webs | $self->web_count() |
 | Number of users | $self->user_count() |
-| Users | http://sitename/..../Main/TWikiUsers
+| Users | http://sitename/..../Main/WikiUsers
 | Webs names |
 | TWiki prefs | http://sitename/..../TWiki/DefaultPreferences
@@ -171 +171 @@
  # Search interface
 
- $search->query(qw(twikiusers add yourself -Changed));
+ $search->query(qw(WikiUsers add yourself -Changed));
  $search->lr(qw(en fr));
  $search->ie("utf8");
@@ -217 +217 @@
 
   my $baseurl = $usersurl;
-  $baseurl =~ s!Main/TWikiUsers!!; 
+  $baseurl =~ s!Main/WikiUsers!!; 
 
 

trunk/TigerSkinPlugin/data/TWiki/WebMenu.txt

@@ -28 +28 @@
 %WEB{name="People" home="Main"}%
 
-%ITEM{name="Everyone" topic="TWikiUsers"}%
+%ITEM{name="Everyone" topic="%WIKIUSERSTOPIC%"}%
 
 %DEFAULTITEMS%

trunk/ToolTipPlugin/data/TWiki/ToolTipPlugin.txt

@@ -23 +23 @@
 <!-- WYSIWYG chokes on the embedded html table tags in the following - Enclose in sticky tags to escape WYSIWYG -->
 <sticky>
-   * %TOOLTIP{TEXT="<table width=100% border=0 cellspacing=1 bgcolor=#cccccc cellpadding=1>  <tr bgcolor=#003366>    <td> <font color=#fafafa> Web </font></td>    <td><font color=#fafafa> Why (<i>pourquoi</i>) ? </font></td>    <td width=1% align=right><a href=javascript:void()><font color=#ffffff><b>X</b></font></a></td>  </tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#FFEFA6><td><a class=twikiLink href=/cgi-bin/view/Main/WebHome><font color=black><b>Main</b></font></a></font></td><td colspan=2><font color=#000000> Welcome to TWiki... <a class=twikiLink href=/cgi-bin/view/Main/TWikiUsers>Users</a>, <a class=twikiLink href=/cgi-bin/view/Main/TWikiGroups>Groups</a>, <a class=twikiLink href=/cgi-bin/view/Main/OfficeLocations>Offices</a> - tour this expandable virtual workspace. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#FFD8AA><td><a class=twikiLink href=/cgi-bin/view/TWiki/WebHome><font color=black><b>TWiki</b></font></a></font></td><td colspan=2><font color=#000000> <a class=twikiLink href=/cgi-bin/view/TWiki/WelcomeGuest>Welcome</a>, <a class=twikiLink href=/cgi-bin/view/TWiki/TWikiRegistration>Registration</a>, and other <a class=twikiLink href=/cgi-bin/view/TWiki/StartingPoints>StartingPoints</a>; TWiki history &amp; Wiki style; All the docs... </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#E0E3E7><td><a class=twikiLink href=/cgi-bin/view/Sandbox/WebHome><font color=black><b>Sandbox</b></font></a></font></td><td colspan=2><font color=#000000> Sandbox test area.  </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#F9D1C9><td><a class=twikiLink href=/cgi-bin/view/Codev/WebHome><font color=black><b>Codev</b></font></a></font></td><td colspan=2><font color=#000000> TWiki development: the core collaboration zone for the TWiki Project. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#E3E9A5><td><a class=twikiLink href=/cgi-bin/view/Plugins/WebHome><font color=black><b>Plugins</b></font></a></font></td><td colspan=2><font color=#000000> Repository for TWiki Plugins, Skins and Add-Ons. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#E0E3E7><td><a class=twikiLink href=/cgi-bin/view/Salgina/WebHome><font color=black><b>Salgina</b></font></a></font></td><td colspan=2><font color=#000000> Civil engineering exchange for the Salginatobel Bridge. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#B9DAFF><td><a class=twikiLink href=/cgi-bin/view/Support/WebHome><font color=black><b>Support</b></font></a></font></td><td colspan=2><font color=#000000> Tech support for the TWiki collaboration platform. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#FFFED5><td><a class=twikiLink href=/cgi-bin/view/Wikilearn/WebHome><font color=black><b>Wikilearn</b></font></a></font></td><td colspan=2><font color=#000000> Learn or teach anything related to free or open source software. </font></td></tr></table>" STICKY="true" BORDERCOLOR="#333366" PADDING="0" BORDERWIDTH="1" FONTSIZE="12px" FONTCOLOR="black" ABOVE="false" OFFSETY="-50" WIDTH="550" FOLLOWSCROLL="True"}% <font color=black>Tidy'ed <nop>SiteMap as <nop>ToolTip</font> %TOOLTIP{END}%
+   * %TOOLTIP{TEXT="<table width=100% border=0 cellspacing=1 bgcolor=#cccccc cellpadding=1>  <tr bgcolor=#003366>    <td> <font color=#fafafa> Web </font></td>    <td><font color=#fafafa> Why (<i>pourquoi</i>) ? </font></td>    <td width=1% align=right><a href=javascript:void()><font color=#ffffff><b>X</b></font></a></td>  </tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#FFEFA6><td><a class=twikiLink href=/cgi-bin/view/Main/WebHome><font color=black><b>Main</b></font></a></font></td><td colspan=2><font color=#000000> Welcome to TWiki... <a class=twikiLink href=/cgi-bin/view/Main/WikiUsers>Users</a>, <a class=twikiLink href=/cgi-bin/view/Main/TWikiGroups>Groups</a>, <a class=twikiLink href=/cgi-bin/view/Main/OfficeLocations>Offices</a> - tour this expandable virtual workspace. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#FFD8AA><td><a class=twikiLink href=/cgi-bin/view/TWiki/WebHome><font color=black><b>TWiki</b></font></a></font></td><td colspan=2><font color=#000000> <a class=twikiLink href=/cgi-bin/view/TWiki/WelcomeGuest>Welcome</a>, <a class=twikiLink href=/cgi-bin/view/TWiki/TWikiRegistration>Registration</a>, and other <a class=twikiLink href=/cgi-bin/view/TWiki/StartingPoints>StartingPoints</a>; TWiki history &amp; Wiki style; All the docs... </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#E0E3E7><td><a class=twikiLink href=/cgi-bin/view/Sandbox/WebHome><font color=black><b>Sandbox</b></font></a></font></td><td colspan=2><font color=#000000> Sandbox test area.  </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#F9D1C9><td><a class=twikiLink href=/cgi-bin/view/Codev/WebHome><font color=black><b>Codev</b></font></a></font></td><td colspan=2><font color=#000000> TWiki development: the core collaboration zone for the TWiki Project. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#E3E9A5><td><a class=twikiLink href=/cgi-bin/view/Plugins/WebHome><font color=black><b>Plugins</b></font></a></font></td><td colspan=2><font color=#000000> Repository for TWiki Plugins, Skins and Add-Ons. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#E0E3E7><td><a class=twikiLink href=/cgi-bin/view/Salgina/WebHome><font color=black><b>Salgina</b></font></a></font></td><td colspan=2><font color=#000000> Civil engineering exchange for the Salginatobel Bridge. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#B9DAFF><td><a class=twikiLink href=/cgi-bin/view/Support/WebHome><font color=black><b>Support</b></font></a></font></td><td colspan=2><font color=#000000> Tech support for the TWiki collaboration platform. </font></td></tr> <tr height=10 style=font-size:8pt; color=#000000; bgcolor=#FFFED5><td><a class=twikiLink href=/cgi-bin/view/Wikilearn/WebHome><font color=black><b>Wikilearn</b></font></a></font></td><td colspan=2><font color=#000000> Learn or teach anything related to free or open source software. </font></td></tr></table>" STICKY="true" BORDERCOLOR="#333366" PADDING="0" BORDERWIDTH="1" FONTSIZE="12px" FONTCOLOR="black" ABOVE="false" OFFSETY="-50" WIDTH="550" FOLLOWSCROLL="True"}% <font color=black>Tidy'ed <nop>SiteMap as <nop>ToolTip</font> %TOOLTIP{END}%
 </sticky>
 

trunk/TopicUserMappingContrib/data/Main/UserListHeader.txt

@@ -1 +1 @@
 %META:TOPICINFO{author="ProjectContributor" date="1127307283" format="1.1" version="$Rev$"}%
-__Related topics:__ %SEARCH{"^(TWikiUsers|TWikiGroups|UserList$|UserListBy)" type="regex" web="%MAINWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%
+__Related topics:__ %SEARCH{"^(WikiUsers|TWikiGroups|UserList$|UserListBy)" type="regex" web="%MAINWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%

trunk/TopicUserMappingContrib/data/TWiki/LoginName.txt

@@ -9 +9 @@
 ---++ How to Find Yours
 
-Look in %MAINWEB%.TWikiUsers - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.
+Look in %MAINWEB%.WikiUsers - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.
 
 e.g.

trunk/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt

@@ -48 +48 @@
       * Fix backlinks in the %MAINWEB% web only
       * Make sure the group topics are updated (if any.)
-   * Edit the [[%MAINWEB%.TWikiUsers]] topic and move the user's entry so
+   * Edit the [[%MAINWEB%.WikiUsers]] topic and move the user's entry so
      that the list is in proper alphabetical order.
    * Recreate the old topic with a pointer to the new topic, so that links
@@ -57 +57 @@
    * The login name needs to be changed in the authentication server (e.g.
      Active Directory)
-   * In TWiki's [[%MAINWEB%.TWikiUsers]] topic, fix the mapping from
+   * In TWiki's [[%MAINWEB%.WikiUsers]] topic, fix the mapping from
      login name to WikiName:%BR%
      =   * !JaneSmith - jsmith - 13 Sep 2006= %BR%
@@ -72 +72 @@
         =.htpasswd= files generated by TWiki! =htpasswd= wipes out email
         addresses that TWiki plants in the info fields of this file.
-   2 Remove the =FredQuimby - fred= line from the <nop>%MAINWEB%.TWikiUsers
+   2 Remove the =FredQuimby - fred= line from the <nop>%MAINWEB%.WikiUsers
      topic
    3 Remove =FredQuimby= from all groups and from all the
@@ -108 +108 @@
 From this point on, your myskin templates will be used for the registration emails.
 
-To make it possible for TWikiUsers to modify the email contents, you could use a parameterized =%<nop>INCLUDE%=
+To make it possible for WikiUsers to modify the email contents, you could use a parameterized =%<nop>INCLUDE%=
 statement in your customized version. eg:
 

trunk/TopicUserMappingContrib/data/TWiki/TWikiUserSetting.txt

@@ -12 +12 @@
 *The following variables are classified as user settings:*
 
-%SEARCH{"TWikiUserSetting" type="regex" topic="Var*" format="   * $topic" nonoise="on"}%
+%SEARCH{"WikiUsersetting" type="regex" topic="Var*" format="   * $topic" nonoise="on"}%
 
 *See also:*

trunk/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt

@@ -11 +11 @@
 an internal TWiki canonical user ID, and the displayed name used to identify the user in TWiki. 
 This is the default <nop>TopicUserMapping in which user information is stored in TWiki topics - one per user, and then any mapping needed is done using the
-<nop>TWikiUsers topic in the %MAINWEB%.
+<nop>WikiUsers topic in the %MAINWEB%.
 
 see [[http://twiki.org/cgi-bin/view/Codev/SimplifiedUserMappingCodeInterface][SimplifiedUserMappingCodeInterface]] on TWiki.org for a more detailed discussion
@@ -45 +45 @@
       * TWiki.UsersTemplate
       * Main.UserHomepageHeader        
-      * TWiki.TWikiUserSetting
+      * TWiki.WikiUsersetting
       * Main.TWikiGroupTemplate        
 

trunk/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST

@@ -19 +19 @@
 
 data/TWiki/TWikiRegistration.txt 0644
-data/TWiki/UsersTemplate.txt 0644 Default template for a new TWikiUsers topic
+data/TWiki/UsersTemplate.txt 0644 Default template for a new WikiUsers topic
 data/TWiki/ChangeEmailAddress.txt 0644
 data/TWiki/BulkResetPassword.txt 0644
-data/TWiki/TWikiUserSetting.txt 0644
+data/TWiki/WikiUsersetting.txt 0644
 data/TWiki/UserForm.txt 0644 Default form attached to a user topic
 data/TWiki/NewUserTemplate.txt 0644 Default new user topic template

trunk/TopicUserMappingContrib/lib/TWiki/Users/TopicUserMapping.pm

@@ -27 +27 @@
 By default TWiki maintains user topics and group topics in the %MAINWEB% that
 define users and group. These topics are
-   * !TWikiUsers - stores a mapping from usernames to TWiki names
+   * !WikiUsers - stores a mapping from usernames to TWiki names
    * !WikiName - for each user, stores info about the user
    * !GroupNameGroup - for each group, a topic ending with "Group" stores a list of users who are part of that group.
@@ -230 +230 @@
 }
 
-# test if the login is in the TWikiUsers topic, or in the password file
+# test if the login is in the WikiUsers topic, or in the password file
 # depending on the AllowLoginNames setting
 sub _userReallyExists {
@@ -237 +237 @@
     if ( $TWiki::cfg{Register}{AllowLoginName} ) {
 
-        # need to use the TWikiUsers file
+        # need to use the WikiUsers file
         _loadMapping($this);
         return 1 if ( defined( $this->{L2U}->{$login} ) );
@@ -271 +271 @@
 Add a user to the persistant mapping that maps from usernames to wikinames
 and vice-versa. The default implementation uses a special topic called
-"TWikiUsers" in the users web. Subclasses will provide other implementations
+"WikiUsers" in the users web. Subclasses will provide other implementations
 (usually stubs if they have other ways of mapping usernames to wikinames).
 Names must be acceptable to $TWiki::cfg{NameFilter}
@@ -932 +932 @@
     elsif ( $TWiki::cfg{Register}{AllowLoginName} ) {
 
-        # Add additional mappings defined in TWikiUsers
+        # Add additional mappings defined in WikiUsers
         _loadMapping($this);
         if ( $this->{W2U}->{$wn} ) {

trunk/UnitTestContrib/test/unit/Fn_REVINFO.pm

@@ -123 +123 @@
     my $this = shift;
     # Create a topic with raw meta to force a wikiname into the author field.
-    # The wikiname must be for a user who is in TWikiUsers.
+    # The wikiname must be for a user who is in WikiUsers.
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.
@@ -146 +146 @@
     my $this = shift;
     # Create a topic with raw meta to force a login into the author field.
-    # The login must be for a user who is in TWikiUsers.
+    # The login must be for a user who is in WikiUsers.
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.

trunk/UnitTestContrib/test/unit/RegisterTests.pm

@@ -1416 +1416 @@
                          });
 
-    # Make TWikiUsers read-only
-    chmod(0444, "$TWiki::cfg{DataDir}/$this->{users_web}/TWikiUsers.txt");
+    # Make WikiUsers read-only
+    chmod(0444, "$TWiki::cfg{DataDir}/$this->{users_web}/$TWiki::cfg{UsersTopicName}.txt");
 
     $query->path_info( "/$this->{users_web}/TWikiRegistration" );
@@ -1455 +1455 @@
         $this->assert(0, "expected an oops redirect");
     } finally {
-        chmod(0777, "$TWiki::cfg{DataDir}/$this->{users_web}/TWikiUsers.txt");
+        chmod(0777, "$TWiki::cfg{DataDir}/$this->{users_web}/$TWiki::cfg{UsersTopicName}.txt");
     };
 }
@@ -1524 +1524 @@
 
 #test for http://develop.twiki.org/~twiki4/cgi-bin/view/Bugs/Item3400
-sub verify_resetPassword_NoTWikiUsersEntry {
+sub verify_resetPassword_NoWikiUsersEntry {
     my $this = shift;
 
@@ -1532 +1532 @@
     $this->registerAccount();
     
-    #Remove the TWikiUsers entry - by deleting it :)
+    #Remove the WikiUsers entry - by deleting it :)
     $this->{twiki}->{store}->moveTopic(
         $TWiki::cfg{UsersWebName}, $TWiki::cfg{UsersTopicName}, 

trunk/UserInfoPlugin/lib/TWiki/Plugins/UserInfoPlugin/Core.pm

@@ -196 +196 @@
 ###############################################################################
 # render list of 10 most recently registered users.
-# this information is extracted from %MAINWEB%.TWikiUsers
+# this information is extracted from %MAINWEB%.WikiUsers
 sub handleNewUsers {
   my ($this, $attributes) = @_;
@@ -339 +339 @@
 
 ###############################################################################
-# extracts all users from Main.TWikiUsers
+# extracts all users from Main.WikiUsers
 sub getUsers {
   my $this = shift;

trunk/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -460 +460 @@
           exec => $TML2HTML|$ROUNDTRIP,
           name => 'variousWikiWords',
-          html => "<p>${linkon}WebPreferences${linkoff}</p><p>$protecton<br />%MAINWEB%$protectoff.TWikiUsers</p><p>${linkon}CompleteAndUtterNothing${linkoff}</p><p>${linkon}LinkBox$linkoff${linkon}LinkBoxs${linkoff}${linkon}LinkBoxies${linkoff}${linkon}LinkBoxess${linkoff}${linkon}LinkBoxesses${linkoff}${linkon}LinkBoxes${linkoff}</p>",
+          html => "<p>${linkon}WebPreferences${linkoff}</p><p>$protecton<br />%MAINWEB%$protectoff.WikiUsers</p><p>${linkon}CompleteAndUtterNothing${linkoff}</p><p>${linkon}LinkBox$linkoff${linkon}LinkBoxs${linkoff}${linkon}LinkBoxies${linkoff}${linkon}LinkBoxess${linkoff}${linkon}LinkBoxesses${linkoff}${linkon}LinkBoxes${linkoff}</p>",
           tml => <<'YYY',
 WebPreferences
 
-%MAINWEB%.TWikiUsers
+%MAINWEB%.WikiUsers
 
 CompleteAndUtterNothing
@@ -474 +474 @@
           exec => $HTML2TML | $ROUNDTRIP,
           name => 'variousWikiWordsNopped',
-          html => "${nop}${linkon}WebPreferences${linkoff} %${nop}MAINWEB%.TWikiUsers ${nop}CompleteAndUtterNothing",
-          tml => '<nop>WebPreferences %<nop>MAINWEB%.TWikiUsers <nop>CompleteAndUtterNothing',
+          html => "${nop}${linkon}WebPreferences${linkoff} %${nop}MAINWEB%.WikiUsers ${nop}CompleteAndUtterNothing",
+          tml => '<nop>WebPreferences %<nop>MAINWEB%.WikiUsers <nop>CompleteAndUtterNothing',
       },
       {

trunk/core/data/TWiki/DefaultPreferences.txt

@@ -76 +76 @@
 ---++ Default User Settings
 
-%X% *NOTE:* They are typically redefined in topics of individual %USERSWEB%.TWikiUsers
+%X% *NOTE:* They are typically redefined in topics of individual %USERSWEB%.WikiUsers
 
    * Show tool-tip topic info on mouse-over of WikiWord links. Setting can be on, off, or customized. An empty setting or off setting disables the tool-tips (for better performance). The setting can contain $summary to show the topic summary, $date for the last change date, $rev for the revision, $username for the login name of the last editor, $wikiname for the <nop>WikiName, $wikiusername for <nop>%USERSWEB%.WikiName, $topic for the topic name, and $web for the web name

trunk/core/data/TWiki/GlossaryOfTerms.txt

@@ -10 +10 @@
 | Plugin: | Prepackaged server-side extension that adds all sorts of additional functions, seamlessly integrated into TWiki. [[Plugins][Details...]] |
 | Plugin API: | The standard interface for creating TWiki _Plugins_ and add-on programs that ensure a perfect integration. [[TWikiFuncDotPm][Details...]] |
-| Preferences: | The site-wide, single _web_ and single user-level preferences settings. The settings are stored in DefaultPreferences, WebPreferences and %USERSWEB%.TWikiUsers home pages. [[TWikiVariables#PreferencesVariables][Details...]] |
+| Preferences: | The site-wide, single _web_ and single user-level preferences settings. The settings are stored in DefaultPreferences, WebPreferences and %USERSWEB%.WikiUsers home pages. [[TWikiVariables#PreferencesVariables][Details...]] |
 | Site: | A TWiki installation consisting of one or more _webs_. [[TWikiSite][Details...]] |
 | Skin: | Skins overlay regular _templates_ with alternate header/footer layout of _pages_; topic text is not affected. Skins are typically enabled site-wide or per _web_. [[Skins][Details...]] |

trunk/core/data/TWiki/ReleaseHistory.txt

@@ -14 +14 @@
    * *Easier Installation and Upgrade*
       * New Internal Admin Login feature
-      * The !Main.TWikiUsers topic is no longer distributed as a default topic in Main web
+      * The !Main.WikiUsers topic is no longer distributed as a default topic in Main web
       * A new directory =working= which per default is located in the TWiki root which contains registration_approvals, tmp, and work_areas
       * Configure can now authenticate when connecting to local plugins repository.
@@ -36 +36 @@
       * Table of Content (TOC) feature enhanced
       * re-architected Pluggable user mapping (between login name and !WikiName) to integrate with alternative authentication and Management schemes
-      * Topic based User management has been extracted into a separately update-able package (!TWikiUsersContrib)
+      * Topic based User management has been extracted into a separately update-able package (!WikiUsersContrib)
 
    * *Enhancements of Pre-installed Plugins*
@@ -648 +648 @@
       * New preference variables =%<nop>EDITBOXWIDTH%= and =%<nop>EDITBOXHEIGHT%= to specify the edit box size. 
    * *25 Feb 2000* - TWiki:Main.PeterThoeny
-      * Edit preferences topics to set TWiki variables. There are three level of preferences Site-level (!TWikiPreferences), web-level (WebPreferences in each web) and user-level preferences (for each of the Main.TWikiUsers). With this, discontinue use of server side include of =wikiwebs.inc= , =wikiwebtable.inc= , =weblist.inc= , =webcopyright.inc= and =webcolors.inc= files.  
+      * Edit preferences topics to set TWiki variables. There are three level of preferences Site-level (!TWikiPreferences), web-level (WebPreferences in each web) and user-level preferences (for each of the Main.WikiUsers). With this, discontinue use of server side include of =wikiwebs.inc= , =wikiwebtable.inc= , =weblist.inc= , =webcopyright.inc= and =webcolors.inc= files.  
    * *11 Feb 2000* - TWiki:Main.PeterThoeny
       * New variable =%<nop>SCRIPTSUFFIX%= / $scriptSuffix containing an optional file extension of the TWiki Perl script. Templates have been changed to use this variable. This allows you to rename the Perl script files to have a file extension like for example ".cgi". 
@@ -751 +751 @@
       * Added TWiki variables, enclosed in % signs =%<nop>TOPIC%= (Topic name), =%<nop>WEB%= (web name), =%<nop>SCRIPTURL%= (script URL), =%<nop>DATE%= (current date), =%<nop>WIKIWEBMASTER%= (Wiki webmaster address), =%<nop>WIKIVERSION%= (Wiki version), =%<nop>USERNAME%= (user name), =%<nop>WIKIUSERNAME%= (Wiki user name). 
    * *28 Jul 1998* - TWiki:Main.PeterThoeny
-      * Topic WebChanges shows Wiki username instead of Intranet username, e.g. =PeterThoeny= instead of =thoeny= in case the Wiki username exists. Implementation Automatic lookup of Wiki username in topic Main.TWikiUsers. 
+      * Topic WebChanges shows Wiki username instead of Intranet username, e.g. =PeterThoeny= instead of =thoeny= in case the Wiki username exists. Implementation Automatic lookup of Wiki username in topic Main.WikiUsers. 
    * *28 Jul 1998* - TWiki:Main.PeterThoeny
       * Topic index. (Technically speaking a simple '.*' search on topic names.)  

trunk/core/data/TWiki/ReleaseNotes01x00.txt

@@ -27 +27 @@
    * *Easier Installation and Upgrade*
       * New Internal Admin Login feature. See below.
-      * The !Main.TWikiUsers topic is no longer distributed as a default topic in Main. See below. 
+      * The !Main.WikiUsers topic is no longer distributed as a default topic in Main. See below. 
       * A new directory =working= which per default is located in the twiki root which contains registration_approvals, tmp, and work_areas. See below
       * !ResetPassword, !ChangePassword, !ChangeEmailAddress, and !TWikiRegistration no longer contains yellow text that you have to remove.
@@ -52 +52 @@
       * Many new functions in the API for plugin developers.
       * Table of Content (TOC) feature enhanced 
-      * User Mapping (mapping between login name and !WikiName) code has been extended to allow pluggable modules to integrate with all sorts of alternative authentication and Management schemes. For normal cases you use the default !TopicUserMapping which is using the !Main.TWikiUsers topic to map between login and !WikiName. A new !BaseUserMapping is provided for TWikis where you only have guests and an administrator. In this case you use the login and password given in configure to login as an admin.
+      * User Mapping (mapping between login name and !WikiName) code has been extended to allow pluggable modules to integrate with all sorts of alternative authentication and Management schemes. For normal cases you use the default !TopicUserMapping which is using the !Main.WikiUsers topic to map between login and !WikiName. A new !BaseUserMapping is provided for TWikis where you only have guests and an administrator. In this case you use the login and password given in configure to login as an admin.
 
 ---++ Important Changes since 4.2.1
@@ -140 +140 @@
 From 4.2.0 the =UserForm= and =NewUserTemplate= are distributed in the TWiki web. If you create the two in the Main web the Main web version will be used instead. So if you tailor the user topic format or the form then you should always copy the two files to the Main web and modify the ones in the Main web. When you later upgrade TWiki your tailored template and form will not be overwritten.
 
----+++ !TWikiUsers no longer distributed
-
-The =Main.TWikiUsers= topic contains all the registered users. It is a topic you do not want to overwrite when you upgrade TWiki.
-
-From 4.2.0 this file is no longer included in the TWiki distribution. When you register the first time TWiki creates the =Main.TWikiUsers= topic in the Main web if it does not exist already. This means that you can now upgrade TWiki without risk of overwriting the important =TWikiUsers= topic.
+---+++ !WikiUsers no longer distributed
+
+The =Main.WikiUsers= topic contains all the registered users. It is a topic you do not want to overwrite when you upgrade TWiki.
+
+From 4.2.0 this file is no longer included in the TWiki distribution. When you register the first time TWiki creates the =Main.WikiUsers= topic in the Main web if it does not exist already. This means that you can now upgrade TWiki without risk of overwriting the important =WikiUsers= topic.
 
    * For new installers this makes no difference at all
-   * For upgraders this is one less problem to worry about as your important !Main.TWikiUsers topic now no longer gets overwritten when upgrading.
+   * For upgraders this is one less problem to worry about as your important !Main.WikiUsers topic now no longer gets overwritten when upgrading.
    
 ---+++ New =working= directory
@@ -280 +280 @@
 | [[%BUGS%/Item4659][Item4659]] | Change the strategy of protecting again html attach spam to not harm Wysiwyg editor |
 | [[%BUGS%/Item4658][Item4658]] | remove use of undefined variable un utf8 code |
-| [[%BUGS%/Item4605][Item4605]] | User shown as Unknown User (Login ID) when author is not in TWikiUsers. Bad feature |
+| [[%BUGS%/Item4605][Item4605]] | User shown as Unknown User (Login ID) when author is not in WikiUsers. Bad feature |
 | [[%BUGS%/Item4590][Item4590]] | Rename "Checkpoint" to "Save and Continue" |
 | [[%BUGS%/Item4585][Item4585]] | configure generates apache errors |
@@ -546 +546 @@
 | [[%BUGS%/Item4140][Item4140]] | Support standard escapes in IF statements |
 | [[%BUGS%/Item4139][Item4139]] | Configurable date format to enable 2007-05-25 format. |
-| [[%BUGS%/Item4120][Item4120]] | !Main.TWikiUsers no longer in distribution but gets created from template if non existing |
+| [[%BUGS%/Item4120][Item4120]] | !Main.WikiUsers no longer in distribution but gets created from template if non existing |
 | [[%BUGS%/Item4087][Item4087]] | PatternSkin: visual update to form elements |
 | [[%BUGS%/Item4075][Item4075]] | Enhance MailerContrib To Allow Exclusion Of Webs |
@@ -692 +692 @@
 | [[%BUGS%/Item5443][Item5443]] | Searches order="editby" are sorted by login ID (cUID) instead of WikiName making result look random |
 | [[%BUGS%/Item5432][Item5432]] | Image links inserted with Manage Attachment only work with lower case file extension |
-| [[%BUGS%/Item5431][Item5431]] | Register.pm redirects to TWikiUsers topic on error, even though that topic may not exist |
+| [[%BUGS%/Item5431][Item5431]] | Register.pm redirects to WikiUsers topic on error, even though that topic may not exist |
 | [[%BUGS%/Item5430][Item5430]] | reset password message has some errors |
 | [[%BUGS%/Item5428][Item5428]] | Topic save error with form does not remove nop |

trunk/core/data/TWiki/SearchPatternCookbook.txt

@@ -125 +125 @@
 </form>
 
-This searches all topics in the %USERSWEB% web that contain "Name", "Email" and "Country" bullets. Alternatively, do a %SYSTEMWEB%.FormattedSearch with =multiple="on"= on the [[%USERSWEB%.TWikiUsers]] topic.
+This searches all topics in the %USERSWEB% web that contain "Name", "Email" and "Country" bullets. Alternatively, do a %SYSTEMWEB%.FormattedSearch with =multiple="on"= on the [[%USERSWEB%.WikiUsers]] topic.
 
 ---+++ Solution 2: As Solution 1, but with possibility for multi-selecting usernames

trunk/core/data/TWiki/TWikiUpgradeGuide.txt

@@ -85 +85 @@
 
    * Copy all the topics from the Main web and corresponding pub/Main directories from the old TWiki to the new TWiki but do not overwrite any of the new topics already inside the new Main directory!
-   * Manually merge all the users from the old =Main.TWikiUsers= topic to the new TWiki. If you upgrade from Cairo you can simply use the old file and add the missing new system users to the list of users. If you upgrade from TWiki-4.0.X simply use the old topic. Starting from 4.2.0 TWiki no longer ships with a =Main.TWikiUsers= topic. When you register the first user TWiki now checks for an existing =Main.TWikiUsers= and if it does not exist it gets created.
+   * Manually merge all the users from the old =Main.WikiUsers= topic to the new TWiki. If you upgrade from Cairo you can simply use the old file and add the missing new system users to the list of users. If you upgrade from TWiki-4.0.X simply use the old topic. Starting from 4.2.0 TWiki no longer ships with a =Main.WikiUsers= topic. When you register the first user TWiki now checks for an existing =Main.WikiUsers= and if it does not exist it gets created.
    * If you use =data/.htpasswd= for authentication copy this file from the old TWiki to the new.
       * If you upgrade from Cairo and you are using the Htpasswd login manager, then note that email addresses for users have moved out of user topics and into the password file. There is a script that performs this extra upgrade step for you - see =tools/upgrade_emails.pl=.
@@ -135 +135 @@
 </verbatim>
 
----+++ !TWikiUsers topic in Main web
-
-Your Cairo [[Main.TWikiUsers][Main.TWikiUsers]] topic will work in TWiki4 but you will need to ensure that these 4 users from the default TWiki4 version of !TWikiUsers are copied to the existing !TWikiUsers topic. !WikiGuest is probably already there but the others are new
+---+++ !WikiUsers topic in Main web
+
+Your Cairo [[Main.WikiUsers][Main.WikiUsers]] topic will work in TWiki4 but you will need to ensure that these 4 users from the default TWiki4 version of !WikiUsers are copied to the existing !WikiUsers topic. !WikiGuest is probably already there but the others are new
    * *ProjectContributor* - placeholder for a TWiki developer, and is used in TWiki documentation
    * *WikiGuest* - guest user, used as a fallback if the user can't be identified
@@ -221 +221 @@
 From 4.2.0 the =UserForm= and =NewUserTemplate= are distributed in the TWiki web. If you create the two in the Main web the Main web version will be used instead. So if you tailor the user topic format or the form then you should always copy the two files to the Main web and modify the ones in the Main web. When you later upgrade TWiki your tailored template and form will not be overwritten.
 
----+++ !TWikiUsers no longer distributed
-
-The =Main.TWikiUsers= topic contains all the registered users. It is a topic you do not want to overwrite when you upgrade TWiki.
-
-From 4.2.0 this file is no longer included in the TWiki distribution. When you register the first time TWiki creates the =Main.TWikiUsers= topic in the Main web if it does not exist already. This means that you can now upgrade TWiki without risk of overwriting the important =TWikiUsers= topic.
+---+++ !WikiUsers no longer distributed
+
+The =Main.WikiUsers= topic contains all the registered users. It is a topic you do not want to overwrite when you upgrade TWiki.
+
+From 4.2.0 this file is no longer included in the TWiki distribution. When you register the first time TWiki creates the =Main.WikiUsers= topic in the Main web if it does not exist already. This means that you can now upgrade TWiki without risk of overwriting the important =WikiUsers= topic.
 
    * For new installers this makes no difference at all
-   * For upgraders this is one less problem to worry about as your important !Main.TWikiUsers topic now no longer gets overwritten when upgrading.
+   * For upgraders this is one less problem to worry about as your important !Main.WikiUsers topic now no longer gets overwritten when upgrading.
    
 ---+++ New =working= directory

trunk/core/data/TWiki/UserAuthentication.txt

@@ -98 +98 @@
 The disadvantage is that because the user identity is cached in the browser, you can log in, but you can't log out again unless you restart the browser.
 
-%WIKITOOLNAME% maps the =REMOTE_USER= that was used to log in to the webserver to a WikiName using the table in %USERSWEB%.TWikiUsers. This table is updated whenever a user registers, so users can choose not to register (in which case their webserver login name is used for their signature) or register (in which case that login name is mapped to their WikiName).
+%WIKITOOLNAME% maps the =REMOTE_USER= that was used to log in to the webserver to a WikiName using the table in %USERSWEB%.WikiUsers. This table is updated whenever a user registers, so users can choose not to register (in which case their webserver login name is used for their signature) or register (in which case that login name is mapped to their WikiName).
 
 The same private =.htpasswd= file used in %WIKITOOLNAME% Template Login can be used to authenticate Apache users, using the Apache Basic Authentication support.

trunk/core/data/TestCases/TestCaseAutoFormatting.txt

@@ -354 +354 @@
 <a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/TestCases/WebPreferences">WebPreferences</a>
 <p />
-<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%USERSWEB%/TWikiUsers">TWikiUsers</a>
+<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%USERSWEB%/%WIKIUSERSTOPIC%">%WIKIUSERSTOPIC%</a>
 <p />
 <span class="twikiNewLink">CompleteAndUtterNothing<a href="%SCRIPTURLPATH{"edit"}%/TestCases/CompleteAndUtterNothing?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow" title="Create this topic">?</a></span>
@@ -369 +369 @@
 WebPreferences
 
-%USERSWEB%.TWikiUsers
+%USERSWEB%.%WIKIUSERSTOPIC%
 
 CompleteAndUtterNothing
@@ -386 +386 @@
 <span class="twikiNewLink">wiki syntax<a href="%SCRIPTURLPATH{"edit"}%/TestCases/WikiSyntax?topicparent=TestCases.TestCaseAutoFormatting" rel="nofollow"  title="Create this topic">?</a></span>
 <p />
-<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%USERSWEB%/TWikiUsers">%USERSWEB%.TWiki users</a>
+<a class="twikiLink" href="%SCRIPTURLPATH{"view"}%/%USERSWEB%/%WIKIUSERSTOPIC%">%USERSWEB%.Wiki users</a>
 <p />
 escaped:
@@ -399 +399 @@
 [[wiki syntax]]
 
-[[%USERSWEB%.TWiki users]]
+[[%USERSWEB%.Wiki users]]
 
 escaped:

trunk/core/data/TestCases/TestCaseAutoInternalTags.txt

@@ -71 +71 @@
  <tr>
   <td>WIKIUSERSTOPIC</td>
-  <td><!-- expected viftene -->WIKIUSERSTOPIC TWikiUsers<!-- /expected --></td>
+  <td><!-- expected viftene -->WIKIUSERSTOPIC WikiUsers<!-- /expected --></td>
   <td><!-- actual -->WIKIUSERSTOPIC <nop>%WIKIUSERSTOPIC%<!-- /actual --></td>
  </tr>

trunk/core/data/TestCases/TestCaseInternetRegistration.txt

@@ -31 +31 @@
 
         1 Topic named as %<nop>WIKINAME% written to %USERSWEB%
-        2 Entry written to [[%USERSWEB%.TWikiUsers]]
+        2 Entry written to [[%USERSWEB%.WikiUsers]]
         3 There *is* .htpasswd entry for the user
         4 Email is sent to administrator

trunk/core/data/TestCases/TestCaseIntranetRegistration.txt

@@ -13 +13 @@
 ---++ Expected result
         1 Topic named as %<nop>WIKINAME% written to %USERSWEB%
-        2 Entry written to [[%USERSWEB%.TWikiUsers]]
+        2 Entry written to [[%USERSWEB%.WikiUsers]]
         3 There is no .htpasswd entry for RemoteUser 
         4 Email is sent to administrator

trunk/core/lib/TWiki.spec

@@ -338 +338 @@
 # registration scripts. <b>If you change this setting you will have to
 # use TWiki to manually rename the existing topic</b>
-$TWiki::cfg{UsersTopicName} = 'TWikiUsers';
+$TWiki::cfg{UsersTopicName} = 'WikiUsers';
 
 # **STRING 100 EXPERT**

trunk/core/lib/TWiki/Users/ApacheHtpasswdUser.pm

@@ -32 +32 @@
 Password manager that uses Apache::HtPasswd to manage users and passwords.
 
-Subclass of [[TWikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
+Subclass of [[WikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
 See documentation of that class for descriptions of the methods of this class.
 
 Duplicates functionality of
-[[TWikiUsersHtPasswdUserDotPm][ =TWiki::Users::HtPasswdUser=]];
+[[WikiUsersHtPasswdUserDotPm][ =TWiki::Users::HtPasswdUser=]];
 provided mainly as an example of how to write a new password manager.
 

trunk/core/lib/TWiki/Users/BaseUserMapping.pm

@@ -365 +365 @@
     else {
 
-        # Add additional mappings defined in TWikiUsers
+        # Add additional mappings defined in WikiUsers
         if ( $this->{W2U}->{$wn} ) {
             push( @users, $this->{W2U}->{$wn} );

trunk/core/lib/TWiki/Users/HtPasswdUser.pm

@@ -24 +24 @@
 Support for htpasswd and htdigest format password files.
 
-Subclass of [[TWikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
+Subclass of [[WikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
 See documentation of that class for descriptions of the methods of this class.
 

trunk/core/lib/TWiki/Users/Password.pm

@@ -267 +267 @@
 
 returns a TWikiIterator of loginnames from the password source. If AllowLoginNames is false
-this is used to remove the need for a TWikiUsers topic.
+this is used to remove the need for a WikiUsers topic.
 
 =cut

trunk/core/templates/messages.tmpl

@@ -45 +45 @@
 %MAKETEXT{"Please make sure you spelled the [_1] correctly and try again. If you get stuck, please mail [_2]." args="%SYSTEMWEB%.LoginName, %WIKIWEBMASTER%"}%
 
-%MAKETEXT{"See [_1] for a list of existing users or register as new user in [_2]." args="%USERSWEB%.TWikiUsers, %SYSTEMWEB%.TWikiRegistration"}% %TMPL:END%
+%MAKETEXT{"See [_1] for a list of existing users or register as new user in [_2]." args="%USERSWEB%.%WIKIUSERSTOPIC%, %SYSTEMWEB%.TWikiRegistration"}% %TMPL:END%
 %TMPL:DEF{"in_a_group"}%
 ---+++ %MAKETEXT{"[_1] is in at least one group and cannot be removed" args="%PARAM1%"}%

trunk/core/tools/TWikiKernel/MANIFEST

@@ -41 +41 @@
 data/Main/WikiGuest.txt 0660
 data/Main/RegistrationAgent.txt 0660
-data/Main/TWikiUsers.txt 0660
+data/Main/WikiUsers.txt 0660
 data/Main/UnknownUser.txt 0660
 data/Main/UserForm.txt 0660

trunk/core/tools/create_large_groups.pl

@@ -3 +3 @@
 # (group size 10000/5000/2500/..)
 
-#warning: does not add users to Main.TWikiUsers topic     *FIXED*
+#warning: does not add users to Main.WikiUsers topic     *FIXED*
 #warning: does not add users and user info to htpasswd file     *FIXED*
 #warning: uses out dated email storage method     *FIXED*
@@ -11 +11 @@
 undef $/;
 open( PWD, ">>data/BIGGROUPS_htpasswd" ) || die $!;
-open( TWUSER, ">>data/Main/TWikiUsers.txt" ) || die $!;
+open( TWUSER, ">>data/Main/WikiUsers.txt" ) || die $!;
 for my $user ( 1 .. 10000 ) {
     my $username = "TestUser$user";

trunk/core/tools/extender.pl

@@ -138 +138 @@
     }
     if (defined $cfg{UsersTopicName}) {
-        $file =~ s#(Main)/TWikiUsers\.txt(.*)$#$1/$cfg{UsersTopicName}.txt$2#;
+        $file =~ s#(Main)/WikiUsers\.txt(.*)$#$1/$cfg{UsersTopicName}.txt$2#;
     }
     foreach my $w qw( SystemWebName TrashWebName UsersWebName ) {