Changeset 527

Timestamp:

11/10/08 22:47:48 (3 years ago)

Author:

KennethLavrsen

Message:

Item109: Finally reached the end of the renaming of
TWikiPreferences to Default/SitePreferences in trunk

Location:

trunk

Files:

• AliasPlugin/data/TWiki/AliasPlugin.txt (modified) (2 diffs)
• AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin.pm (modified) (1 diff)
• BuildContrib/lib/TWiki/Contrib/Build.pm (modified) (1 diff)
• CacheChooserAddOn/bin/cache (modified) (1 diff)
• ContributorsPlugin/data/TWiki/ContributorsPlugin.txt (modified) (1 diff)
• DirectedGraphWebMapPlugin/data/TWiki/DirectedGraphWebMapPlugin.txt (modified) (2 diffs)
• EditRowPlugin/data/TWiki/EditRowPlugin.txt (modified) (1 diff)
• EditSyntaxPlugin/data/TWiki/EditSyntaxPlugin.txt (modified) (1 diff)
• EmptyPlugin/lib/TWiki/Plugins/EmptyPlugin.pm (modified) (1 diff)
• FakeBasicAuthRegPlugin/data/TWiki/FakeBasicAuthRegPlugin.txt (modified) (1 diff)
• FallbackPlugin/data/Sandbox/FallbackTest.txt (modified) (1 diff)
• FormPivotPlugin/data/TWiki/FormPivotPlugin.txt (modified) (1 diff)
• FuncUsersContrib/test/unit/FuncUsersContrib/FuncUsersContribSuite.pm (modified) (1 diff)
• FundraisingPlugin/data/TWiki/FundraisingPlugin.txt (modified) (2 diffs)
• GenPDFAddOn/data/TWiki/GenPDFAddOn.txt (modified) (1 diff)
• GenPDFLatexAddOn/data/TWiki/GenPDFLatexAddOn.txt (modified) (1 diff)
• HttpsRedirectPlugin/lib/TWiki/Plugins/HttpsRedirectPlugin.pm (modified) (1 diff)
• KoalaSkin/bin/koalaskin-generate (modified) (3 diffs)
• KoalaSkin/bin/ks_lastchanges.sh (modified) (3 diffs)
• KoalaSkin/data/TWiki/KoalaSkin.txt (modified) (12 diffs)
• KupuContrib/data/TWiki/KupuContrib.txt (modified) (1 diff)
• MeetingBingoPlugin/lib/TWiki/Plugins/MeetingBingoPlugin.pm (modified) (1 diff)
• MovableTypePlugin/data/TWiki/MovableTypePlugin.txt (modified) (1 diff)
• MoveableTypeSkin/data/TWiki/MoveableTypeMantisDesign.txt (modified) (1 diff)
• MoveableTypeSkin/data/TWiki/MoveableTypeSample2Design.txt (modified) (1 diff)
• MoveableTypeSkin/data/TWiki/MoveableTypeSample3Design.txt (modified) (1 diff)
• MoveableTypeSkin/data/TWiki/MoveableTypeSampleDesign.txt (modified) (1 diff)
• MoveableTypeSkin/data/TWiki/MoveableTypeSkin.txt (modified) (1 diff)
• MultiLangPlugin/data/TWiki/MultiLangPlugin.txt (modified) (1 diff)
• NatEditPlugin/data/TWiki/NatEditPlugin.txt (modified) (1 diff)
• NatSkinPlugin/data/TWiki/NatSkinPlugin.txt (modified) (3 diffs)
• PeerPlugin/data/TWiki/PeerReviewInstall.txt (modified) (1 diff)
• PerforcePlugin/lib/TWiki/Plugins/PerforcePlugin.pm (modified) (1 diff)
• PreferencesPlugin/lib/TWiki/Plugins/PreferencesPlugin/MANIFEST (modified) (1 diff)
• QuickMenuSkin/data/TWiki/QuickMenuSkin.txt (modified) (1 diff)
• RenderFormPlugin/data/TWiki/RenderFormPlugin.txt (modified) (1 diff)
• SearchEngineKinoSearchAddOn/data/TWiki/SearchEngineKinoSearchAddOn.txt (modified) (3 diffs)
• SkillsPlugin/lib/TWiki/Plugins/SkillsPlugin.pm (modified) (1 diff)
• SpacedWikiWordPlugin/data/TWiki/SpacedWikiWordPlugin.txt (modified) (1 diff)
• SpanishTWikiContrib/data/TWiki_ES/ArchivosAdjuntos.txt (modified) (1 diff)
• SpanishTWikiContrib/data/TWiki_ES/ComoFormatearTexto.txt (modified) (1 diff)
• SpanishTWikiContrib/data/TWiki_ES/GlosarioTWiki.txt (modified) (1 diff)
• SpanishTWikiContrib/data/TWiki_ES/MailerContrib.txt (modified) (1 diff)
• SpanishTWikiContrib/data/TWiki_ES/PalabraWiki.txt (modified) (1 diff)
• SpanishTWikiContrib/data/TWiki_ES/PreguntasSobreFormatearTexto.txt (modified) (1 diff)
• TWikiDeploymentSpiderAddOn/twiki-deployment-spider.pl (modified) (3 diffs)
• TWikiInstallerContrib/lib/TWiki/Contrib/TWikiInstallerContrib/remote-install (modified) (1 diff)
• TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm (modified) (1 diff)
• TagMePlugin/data/TWiki/TagMePlugin.txt (modified) (3 diffs)
• TalkContrib/data/TWiki/TalkContrib.txt (modified) (2 diffs)
• TaskExeContrib/data/TWiki/TaskExeContrib.txt (modified) (1 diff)
• TaskExePlugin/lib/TWiki/Plugins/TaskExePlugin.pm (modified) (1 diff)
• TemplateToolkitPlugin/lib/TWiki/Plugins/TemplateToolkitPlugin.pm (modified) (1 diff)
• TopicClassificationAddOn/data/TCAO/TopicClassificationAddOn.txt (modified) (1 diff)
• TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt (modified) (1 diff)
• TwistyBundleTWiki04x00x05/data/TWiki/TwistyContrib.txt (modified) (1 diff)
• TwistyBundleTWiki04x01/data/TWiki/TwistyContrib.txt (modified) (1 diff)
• UnitTestContrib/test/unit/PrefsTests.pm (modified) (1 diff)
• UpdateAttachmentsPlugin/lib/TWiki/Plugins/UpdateAttachmentsPlugin.pm (modified) (1 diff)
• UpdateInfoPlugin/data/TWiki/UpdateInfoPlugin.txt (modified) (1 diff)
• VotePlugin/data/TWiki/VotePlugin.txt (modified) (2 diffs)
• WidgetsSkin/data/TWiki/WidgetsMantisDesign.txt (modified) (1 diff)
• WidgetsSkin/data/TWiki/WidgetsSample2Design.txt (modified) (1 diff)
• WidgetsSkin/data/TWiki/WidgetsSample3Design.txt (modified) (1 diff)
• WidgetsSkin/data/TWiki/WidgetsSampleDesign.txt (modified) (1 diff)
• WidgetsSkin/data/TWiki/WidgetsSkin.txt (modified) (1 diff)
• WikiwygContrib/data/TWiki/WikiwygContrib.txt (modified) (1 diff)
• WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin/Constants.pm (modified) (1 diff)
• core/lib/TWiki.pm (modified) (1 diff)
• core/lib/TWiki/Contrib/core/MANIFEST (modified) (3 diffs)
• core/lib/TWiki/UI/Search.pm (modified) (1 diff)
• core/tools/TWikiKernel/MANIFEST (modified) (3 diffs)
• core/tools/benchmark.pl (modified) (1 diff)
• core/tools/pkg/debian/postinst (modified) (1 diff)

trunk/AliasPlugin/data/TWiki/AliasPlugin.txt

@@ -46 +46 @@
 By default no alias substitution is applied to a page. You can configure all of your TWiki
 pages to get alias substitution by 
-   1 prepending =alias= to your =SKIN= variable in your <nop>TWikiPreferences/<nop>WebPreferences/topic preferenes
+   1 prepending =alias= to your =SKIN= variable in your <nop>%SYSTEMWEB%.DefaultPreferences/<nop>%USERSWEB%.SitePreferences/<nop>WebPreferences/topic preferenes
      <verbatim>Set SKIN = alias, pattern</verbatim>
    2 appending =?cover=alias= to an url or
@@ -110 +110 @@
 %$MANIFEST%
    * Visit =configure= in your TWiki installation, and enable the plugin in the {Plugins} section.
-   * Edit your %MAINWEB%.TWikiPreferences and prepend to your SKIN variable the =alias= identifier,
+   * Edit your %USERSWEB%.SitePreferences and prepend to your SKIN variable the =alias= identifier,
      for example to
      <verbatim>   * Set SKIN = alias,pattern</verbatim>

trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin.pm

@@ -103 +103 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 0; #TODO: Set it back to one

trunk/BuildContrib/lib/TWiki/Contrib/Build.pm

@@ -2066 +2066 @@
       1 Manually edit !LocalSite.cfg to set any configuration variables.
 
-%IF{"defined 'SYSTEMWEB'" else="<div class='twikiAlert'>%X% WARNING: SYSTEMWEB is not defined. Please add these definitions to your %MAINWEB%.TWikiPreferences, if they are not already there:<br><pre>   * <nop>Set SYSTEMWEB = %<nop>TWIKIWEB%<br>   * <nop>Set USERSWEB = %<nop>MAINWEB%</pre></div>"}%
+%IF{"defined 'SYSTEMWEB'" else="<div class='twikiAlert'>%X% WARNING: SYSTEMWEB is not defined. Please add these definitions to your %USERSWEB%.SitePreferences, if they are not already there:<br><pre>   * <nop>Set SYSTEMWEB = %<nop>TWIKIWEB%<br>   * <nop>Set USERSWEB = %<nop>MAINWEB%</pre></div>"}%

trunk/CacheChooserAddOn/bin/cache

@@ -29 +29 @@
 cache=${PWD%bin}/cache
 errlog=$cache/.htcacherr.log
-twikipref=$data/TWiki/TWikiPreferences.txt
+twikipref=$data/TWiki/DefaultPreferences.txt
 #
 # debug:

trunk/ContributorsPlugin/data/TWiki/ContributorsPlugin.txt

@@ -56 +56 @@
 
 ---++ Examples
-Use %<nop>CONTRIBUTORS{web="TWiki" topic="TWikiPreferences" last="7"}% to get
+Use %<nop>CONTRIBUTORS{web="TWiki" topic="DefaultPreferences" last="7"}% to get
 
-%CONTRIBUTORS{web="TWiki" topic="TWikiPreferences" last="7"}%
+%CONTRIBUTORS{web="TWiki" topic="DefaultPreferences" last="7"}%
 
 ---
-Use %<nop>CONTRIBUTORS{web="TWiki" topic="TWikiPreferences" last="7" rev="1.20"}% to get
+Use %<nop>CONTRIBUTORS{web="TWiki" topic="DefaultPreferences" last="7" rev="1.20"}% to get
 
-%CONTRIBUTORS{web="TWiki" topic="TWikiPreferences" last="7" rev="1.20"}%
+%CONTRIBUTORS{web="TWiki" topic="DefaultPreferences" last="7" rev="1.20"}%
 
 ---
-Use %<nop>CONTRIBUTORS{web="TWiki" topic="TWikiPreferences" last="7" rev="1.20" format="        * $author$n"}% to get
+Use %<nop>CONTRIBUTORS{web="TWiki" topic="DefaultPreferences" last="7" rev="1.20" format="      * $author$n"}% to get
 
-%CONTRIBUTORS{web="TWiki" topic="TWikiPreferences" last="7" rev="1.20" format=" * $author$n"}%
+%CONTRIBUTORS{web="TWiki" topic="DefaultPreferences" last="7" rev="1.20" format="       * $author$n"}%
 ---
 
-Use %<nop>CONTRIBUTORS{web="TWiki" topic="TWikiPreferences" last="7" rev="1.20" format="        * $author$n" nodups="on"}% to get
+Use %<nop>CONTRIBUTORS{web="TWiki" topic="DefaultPreferences" last="7" rev="1.20" format="      * $author$n" nodups="on"}% to get
 
-%CONTRIBUTORS{web="TWiki" topic="TWikiPreferences" last="7" rev="1.20" format=" * $author$n"  nodups="on"}%
+%CONTRIBUTORS{web="TWiki" topic="DefaultPreferences" last="7" rev="1.20" format="       * $author$n"  nodups="on"}%
 ---
-Use  %<nop>CONTRIBUTORS{web="TWiki" topic="TWikiPreferences"  last="7" rev="1.20" format="|$author|$date|$rev|$n" header="|*Author*|*Date*|*Revision*|$n"}% to get:
+Use  %<nop>CONTRIBUTORS{web="TWiki" topic="DefaultPreferences"  last="7" rev="1.20" format="|$author|$date|$rev|$n" header="|*Author*|*Date*|*Revision*|$n"}% to get:
 
-%CONTRIBUTORS{web="TWiki" topic="TWikiPreferences"  last="7" rev="1.20" format="|$author|$date|$rev|$n" header="|*Author*|*Date*|*Revision*|$n"}%
+%CONTRIBUTORS{web="TWiki" topic="DefaultPreferences"  last="7" rev="1.20" format="|$author|$date|$rev|$n" header="|*Author*|*Date*|*Revision*|$n"}%
 
 ---++ Plugin Installation Instructions

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/%MAINWEB%/TWikiPreferences" title="TWikiPreferences" 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%/TWikiGuest" title="TWikiGuest" alt="" coords="511,383,583,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiRegistrationAgent" title="TWikiRegistrationAgent" 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%/TWikiGuestLeftBar" title="TWikiGuestLeftBar" 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%/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%/TWikiGuest" title="TWikiGuest" alt="" coords="511,383,583,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiRegistrationAgent" title="TWikiRegistrationAgent" 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%/TWikiGuestLeftBar" title="TWikiGuestLeftBar" 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">
@@ -72 +72 @@
 
         * Simulated: <br />\
-          <map id="sample" name="sample"><area shape="rect" href="DirectedGraphWebMapPlugin" title="DirectedGraphWebMapPlugin" alt="" coords="272,7,509,50"><area shape="rect" href="DirectedGraphPlugin" title="DirectedGraphPlugin" alt="" coords="8,93,182,136"><area shape="rect" href="GoodStyle" title="GoodStyle" alt="" coords="204,93,307,136"><area shape="rect" href="TWikiPlugins" title="TWikiPlugins" alt="" coords="328,93,453,136"><area shape="rect" href="TWikiPreferences" title="TWikiPreferences" alt="" coords="474,93,627,136"><area shape="rect" href="TextFormattingRules" title="TextFormattingRules" alt="" coords="649,93,823,136">
+          <map id="sample" name="sample"><area shape="rect" href="DirectedGraphWebMapPlugin" title="DirectedGraphWebMapPlugin" alt="" coords="272,7,509,50"><area shape="rect" href="DirectedGraphPlugin" title="DirectedGraphPlugin" alt="" coords="8,93,182,136"><area shape="rect" href="GoodStyle" title="GoodStyle" alt="" coords="204,93,307,136"><area shape="rect" href="TWikiPlugins" title="TWikiPlugins" alt="" coords="328,93,453,136"><area shape="rect" href="SitePreferences" title="SitePreferences" alt="" coords="474,93,627,136"><area shape="rect" href="TextFormattingRules" title="TextFormattingRules" alt="" coords="649,93,823,136">
 </map><img usemap="#sample" src="%ATTACHURLPATH%/sample.png">
 

trunk/EditRowPlugin/data/TWiki/EditRowPlugin.txt

@@ -172 +172 @@
 Also, the plugin can be selectively disabled using
 | =EDITROWPLUGIN_DISABLE= | Set to =on= to disable the plugin. Default is =off=. |
-These preferences can be defined in %MAINWEB%.TWikiPreferences, in !WebPreferences for an individual web, or in the topic.
+These preferences can be defined in %USERSWEB%.SitePreferences, in !WebPreferences for an individual web, or in the topic.
 
 ---++ Relationships

trunk/EditSyntaxPlugin/data/TWiki/EditSyntaxPlugin.txt

@@ -91 +91 @@
          * View raw should show you the content in TWiki syntax
    * Show proper edit syntax summary in edit screen:
-      * Create an =EDITSYNTAX= setting in your =%MAINWEB%.TWikiPreferences= and set it to an empty value
+      * Create an =EDITSYNTAX= setting in your =%USERSWEB%.SitePreferences= and set it to an empty value
       * Edit =twiki/templates/edit.pattern.tmpl= and change ="%<nop>SYSTEMWEB%.WikiSyntaxSummary"= to ="%<nop>SYSTEMWEB%.%EDITSYNTAX%WikiSyntaxSummary"=
       * Change other =twiki/templates/edit.*.tmpl= template files as needed

trunk/EmptyPlugin/lib/TWiki/Plugins/EmptyPlugin.pm

@@ -95 +95 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 1;

trunk/FakeBasicAuthRegPlugin/data/TWiki/FakeBasicAuthRegPlugin.txt

@@ -10 +10 @@
 How it works is: SSL logs you in based on your client cert.  Instead of popping a login box, it gets your userid from the cert, and then authenticates you by doing a "fake" login using that userid and a password of "password".  If you have a valid entry in the htpassword file, login succeeds and REMOTE_USER is set.  If it fails, the login box pops up (and unfortunately you can't login; which is ok).
 
-This plugin only provides authentication/registration.  It's up to you to configure access restrictions later via WebPreferences, TWikiPreferences, Main.TWikiGroups, etc, or using an access restrictions plugin (are there any?).  See TWiki.TWikiAccessControl for more info.
+This plugin only provides authentication/registration.  It's up to you to configure access restrictions later via WebPreferences, %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, Main.TWikiGroups, etc, or using an access restrictions plugin (are there any?).  See TWiki.TWikiAccessControl for more info.
 
 In addition, this plugin provides access to environment variables in a TWiki topic (this was necessary for registration to work).

trunk/FallbackPlugin/data/Sandbox/FallbackTest.txt

@@ -1 +1 @@
 %META:TOPICINFO{author="MeredithLesly" date="1149267380" format="1.1" version="1.1"}%
-%INCLUDE{%FALLBACK{"TWikiPreferences" otherwebs="Main, TWiki"}%}%
+%INCLUDE{%FALLBACK{"DefaultPreferences" otherwebs="Main, TWiki"}%}%
 
 

trunk/FormPivotPlugin/data/TWiki/FormPivotPlugin.txt

@@ -1 +1 @@
 %META:TOPICINFO{author="JohnTalintyre" date="1018985829" format="1.0" version="1.8"}%
-%META:TOPICPARENT{name="TWikiPreferences"}%
 ---+ Form Pivot Plugin
 

trunk/FuncUsersContrib/test/unit/FuncUsersContrib/FuncUsersContribSuite.pm

@@ -93 +93 @@
     $TWiki::cfg{UsersWebName} = $testUsersWeb;
     $TWiki::cfg{SystemWebName} = $testSysWeb;
-    $TWiki::cfg{LocalSitePreferences} = "$testUsersWeb.TWikiPreferences";
+    $TWiki::cfg{LocalSitePreferences} = "$testUsersWeb.SitePreferences";
     $TWiki::cfg{MapUserToWikiName} = 1;
     $TWiki::cfg{PasswordManager} = 'TWiki::Users::HtPasswdUser';

trunk/FundraisingPlugin/data/TWiki/FundraisingPlugin.txt

@@ -2 +2 @@
 ---+!! Fundraising Plugin
 
-This plugin defines %<nop>FUNDRAISINGMESSAGE%, using a few variables defined on <nop>FundraisingPlugin; this can be used as %<nop>BROADCASTMESSAGE% on [[%MAINWEB%.TWikiPreferences]].
+This plugin defines %<nop>FUNDRAISINGMESSAGE%, using a few variables defined on <nop>FundraisingPlugin; this can be used as %<nop>BROADCASTMESSAGE% on [[%USERSWEB%.SitePreferences]].
 
 %TOC%
@@ -87 +87 @@
      | ==lib/TWiki/Plugins/%TOPIC%.pm== | Plugin Perl module |
    * Edit <nop>FundraisingPlugin to suit your needs.
-   * Write-protect %TOPIC% against modifications (with bullet =* Set ALLOWTOPICCHANGE = <nop>%MAINWEB%.TWikiAdminGroup=).
+   * Write-protect %TOPIC% against modifications (with bullet =* Set ALLOWTOPICCHANGE = <nop>%USERSWEB%.TWikiAdminGroup=).
       * #Set ALLOWTOPICCHANGE = %MAINWEB%.TWikiAdminGroup
-   * To enable it on all pages, set %<nop>BROADCASTMESSAGE% to %<nop>FUNDRAISINGMESSAGE% in [[%MAINWEB%.TWikiPreferences]] topic.
+   * To enable it on all pages, set %<nop>BROADCASTMESSAGE% to %<nop>FUNDRAISINGMESSAGE% in [[%USERSWEB%.SitePreferences]] topic.
 
 ---++ Plugin Info

trunk/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt

@@ -131 +131 @@
         * %X% *BEFORE TWiki-4* Add the variable =$htmldocCmd = "/path/to/htmldoc";= to your =lib/TWiki.cfg= file so TWiki can find the location of the htmldoc executable. Look for $fgrepCmd.
         * %X% *TWiki-4 and later* Configure the =$TWiki::cfg{Extensions}{GenPDFAddOn}{htmldocCmd} = "/path/to/htmldoc";= using =configure= (in the =Extensions= section)
-        * %T% Copy the preferences from above and paste them into %MAINWEB%.TWikiPreferences, or the !WebPreferences topic for a single web.
+        * %T% Copy the preferences from above and paste them into %USERSWEB%.SitePreferences, or the !WebPreferences topic for a single web.
         * Test if the installation was successful:
                 * Try loading [[%SCRIPTURL{genpdf}%/%WEB%/%TOPIC%][this page]]

trunk/GenPDFLatexAddOn/data/TWiki/GenPDFLatexAddOn.txt

@@ -83 +83 @@
       * Set up the pdflatex generation form. Note, this form topic is _optional_.  If no form is declared, the cgi script will use a default form which can be modified by the administrator instead.
          * Modify the file generation form, <nop>GenPDFLatexForm, to reflect your own needs.  
-         * declare which topic to use as the form in a Preferences topic %BR% (e.g.  declare %BR% * Set GENPDFLATEX_OPTIONSPAGE = Main.<nop>GenPDFLatexForm %BR% in the TWiki.TWikiPreferences topic)
+         * declare which topic to use as the form in a Preferences topic %BR% (e.g.  declare %BR% * Set GENPDFLATEX_OPTIONSPAGE = Main.<nop>GenPDFLatexForm %BR% in the %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences topic)
       * Test if the installation was successful:
          * point your browser to a TWiki topic that contains TWiki:Plugins.LatexModePlugin markup.

trunk/HttpsRedirectPlugin/lib/TWiki/Plugins/HttpsRedirectPlugin.pm

@@ -79 +79 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 1;

trunk/KoalaSkin/bin/koalaskin-generate

@@ -571 +571 @@
 
 # looks into the TWiki site prefs to see if user has set the needed vars
+# SMELL: Does not cope with DefaultPreferences and SitePreferences
 check_ks_variables () {
   local tp v
   if $onsite; then
-    for tp in $data/*/TWikiPreferences.txt; do
+    for tp in $data/*/DefaultPreferences.txt; do
       for v in `egrep '^        +[*] +Set +[A-Z_]+ +=' $tp | sed -e 's/^[        *]*Set  *\([A-Z_][A-Z_]*\) .*/\1/'`; do
         needed_vars="${needed_vars/ $v / +$v }"
@@ -582 +583 @@
       case "$v" in
         +*) : ;; # ok, found
-        *) W You must define the TWiki variable \"$v\" in TWiki.TWikiPreferences, e.g.:
+        *) W You must define the TWiki variable \"$v\" in TWiki.DefaultPreferences, e.g.:
            echo "      * Set $v ="
            ;;
@@ -1222 +1223 @@
 check_settings () {
   if $onsite; then
-    if grep -q '^               [*] Set TOPICS =' $data/TWiki/TWikiPreferences.txt
+    if grep -q '^               [*] Set TOPICS =' $data/TWiki/DefaultPreferences.txt
     then :; else W "You must set the TOPICS variable in Wiki prefs like this:
       * Set TOPICS ="
     fi
-    if grep -q '^               [*] Set SKIN = koala' $data/TWiki/TWikiPreferences.txt
+    if grep -q '^               [*] Set SKIN = koala' $data/TWiki/DefaultPreferences.txt
     then :; else W "You must set the SKIN variable in Wiki prefs like this:
       * Set SKIN = koala"
     fi
-    if grep -q '^               [*] Set EDITBOXSTYLE =' $data/TWiki/TWikiPreferences.txt
+    if grep -q '^               [*] Set EDITBOXSTYLE =' $data/TWiki/DefaultPreferences.txt
     then :; else W "You must set the EDITBOXSTYLE variable in Wiki prefs like this:
       * Set EDITBOXSTYLE = width: 99%"

trunk/KoalaSkin/bin/ks_lastchanges.sh

@@ -102 +102 @@
 
 parse_webs_webcore () {
-bgcolor="`grep '[*] Set WEBBGCOLOR =' TWiki/TWikiPreferences.txt|sed -e 's/.*=[         ]*//' -e 's///g'`"
-fgcolor="`grep '[*] Set WEBFGCOLOR =' TWiki/TWikiPreferences.txt|sed -e 's/.*=[         ]*//' -e 's///g'`"
+bgcolor="`grep '[*] Set WEBBGCOLOR =' TWiki/DefaultPreferences.txt|sed -e 's/.*=[       ]*//' -e 's///g'`"
+fgcolor="`grep '[*] Set WEBFGCOLOR =' TWiki/DefaultPreferences.txt|sed -e 's/.*=[       ]*//' -e 's///g'`"
 cat <<EOF
 <html><head><title>$title $wikiname</title>
@@ -213 +213 @@
 case "$PATH_INFO" in /[0-9]*) max="${PATH_INFO#/}"; max="${max%%/*}";; esac
 
-wikiname=`grep '^[      ]*[*] Set WIKITOOLNAME =' TWiki/TWikiPreferences.txt | sed -e 's/[^=]*=[        ]*//' -e 's/[   
+wikiname=`grep '^[      ]*[*] Set WIKITOOLNAME =' TWiki/DefaultPreferences.txt | sed -e 's/[^=]*=[      ]*//' -e 's/[   
 ]*$//'`
 wikiname=${wikiname:-Wiki}
@@ -229 +229 @@
 title="Changed topics in last $max days in"
 
-if grep '^              [*]  *Set  *SKIN  *=  *koala' TWiki/TWikiPreferences.txt >/dev/null 2>&1; then
+if grep '^              [*]  *Set  *SKIN  *=  *koala' TWiki/DefaultPreferences.txt >/dev/null 2>&1; then
     if grep '^          [*]  *Set  *KSTHEME  *=  *webcore' TWiki/KoalaSkinWebList.txt >/dev/null 2>&1
     then parse_webs_webcore; parse_log=parse_log_mono 2>&1

trunk/KoalaSkin/data/TWiki/KoalaSkin.txt

@@ -179 +179 @@
                 Tradition versions of Sun, HP, etc,... will not work
           <ol>
-        4 Set in your global web preferences TWiki.TWikiPreferences:
+        4 Set in your global web preferences %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences:
           <br> _6 spaces_ * Set SKIN = koala
           <br> _6 spaces_ * Set TOPICS = 
@@ -288 +288 @@
           and generated templates. Leaves the local customizations 
           (<nop>KoalaSkinWebList topic) untouched. You need also to change or remove
-          the  <tt>* Set SKIN = koala</tt> in TWiki.TWikiPreferences
+          the  <tt>* Set SKIN = koala</tt> in %SYSTEMWEB%.DefaultPreferences or 
+          %USERSWEB%.SitePreferences
           to complete the uninstallation.
 
@@ -339 +340 @@
 will be seen in all the site, and that local web topics are appended to these
 but do not override them (as is the case if you redefine TOPICS in a web),
-define in your site prefs TWiki.TWikiPreferences:
+define in your site prefs %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences:
         * *Set TOPICS =* _some globally visible topics..._ %<nop>TOPICS_WEB%
         * *Set TOPICS_WEB =* 
@@ -425 +426 @@
           Can be used to redefine any KoalaSkin template, see Theming.
 To do this, set in TWiki.KoalaSkinWebList the variable to a %-var, that you will
-have to define the default in the site preferences in TWiki.TWikiPreferences,
+have to define the default in the site preferences in %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences,
 that then can be used to define things per web. For instance, in
 TWiki.KoalaSkinWebList, with the following declaration you will be able to use
@@ -496 +497 @@
 
 ---+++ Boxes
-If you insert in your TWiki.TWikiPreferences site-wide preferences
+If you insert in your %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences site-wide preferences
 the contents of the provided file =templates/ks_boxes.koala.txt=
 you will have %-macros to create colored boxes of text in the colors scheme
@@ -808 +809 @@
                 * new PRINTCSS twiki var
                 * *%X%* you must add a <tt>* Set PRINTCSS =</tt> to your
-                  site global prefs, in TWiki.TWikiPreferences
+                  site global prefs, in %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences
                 * new NOSHOW option
                 * =bin/koalaskin-generate= config: new lib var
                 * Beijing: *%X%* you must add a 
                   <tt>* Set BROADCASTMESSAGE =</tt> to 
-                  your site global prefs, in TWiki.TWikiPreferences
+                  your site global prefs, in %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences
                   Cairo users do not need it.
                 * the topic list is now <nop>TWiki.KoalaSkinWebList, not
@@ -940 +941 @@
                   <br> *%X%* You *must* add a line:
                   <br> _3 spaces_ * Set RELATEDWEBS =
-                  <br> to your TWiki.<nop>TWikiPreferences topic
+                  <br> to your !%SYSTEMWEB%.DefaultPreferences or !%USERSWEB%.SitePreferences topic
                 * bugfix: the script searchmulti ignored the templatetopic
                   parameter (searchmulti can be used to create topics, with
@@ -1031 +1032 @@
                 * Final bugfix for macintoshes (by Jon Reid)
                 * *%X%* new variable KSBUTTONS. You *must* declare it
-                  in your TWiki.TWikiPreferences as a:
+                  in your %SYSTEMWEB%.DefaultPreferences / %USERSWEB%.SitePreferences as a:
                   <br> * Set KSBUTTONS =
                 * *%X%* Apply patch TWiki:Codev/TopicMovedMessageTooVisible
@@ -1100 +1101 @@
                 * koalaskin-generate -i was broken
                 * *%X%* new version of =ks_boxes.koala.txt= , update your
-                  TWiki.TWikiPreferences with it (MBOXHEAD, MBOXBODY, MBOXEND)
+                  %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences with it (MBOXHEAD, MBOXBODY, MBOXEND)
                 * *%X%* New recommended patch 
                   TWiki:Codev/LinksToWebHomeShowWebName
@@ -1152 +1153 @@
                 * docfix: TOPICSTOP was not documented
                 * script now checks that the needed variables are defined in
-                  TWiki.TWikiPreferences, and issue warnings on missing ones
+                  %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences, and issue warnings on missing ones
                 * default css for html tags &lt;b> and &lt;i>, and twiki __
                   constructs are rendered in a colored ink. Note that this is
@@ -1166 +1167 @@
                   (it is only cosmetics, will not break if not applied)
                 * *%X%* define the variable *%<nop>CSS%* in the
-                  TWiki.TWikiPreferences to nothing.
+                  %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences to nothing.
                 * *%X%* define the variable *%<nop>TOPICSTOP%* in the
-                  TWiki.TWikiPreferences to nothing.
+                  %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences to nothing.
                 * New %<nop>CSS% TWiki var to override CSS per web
                 * New global Koala Skin KSCSS var to define an additional
@@ -1213 +1214 @@
         * *1.17* _21 Aug 2002_
                 * *%X%* add the line to your Site Prefs
-                  (TWiki.TWikiPreferences), to be forward-compatible with the
+                  (%SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences), to be forward-compatible with the
                   upcoming TWiki release.
                   <br> _6 spaces_ * Set EDITBOXSTYLE = width: 99%

trunk/KupuContrib/data/TWiki/KupuContrib.txt

@@ -31 +31 @@
 Kupu uses a special edit template (see TWiki.TWikiTemplates). 
 
-*Important* Set the name of the skin to use for WYSIWYG editing. This preference can be set in %MAINWEB%.<nop>TWikiPreferences, !WebPreferences or in individual topics. *If it is not set the editor is disabled*. For example,
+*Important* Set the name of the skin to use for WYSIWYG editing. This preference can be set in !%USERSWEB%.SitePreferences, !WebPreferences or in individual topics. *If it is not set the editor is disabled*. For example,
         * <nop>Set WYSWIYGPLUGIN_WYSIWYGSKIN = kupu
 

trunk/MeetingBingoPlugin/lib/TWiki/Plugins/MeetingBingoPlugin.pm

@@ -57 +57 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 0;

trunk/MovableTypePlugin/data/TWiki/MovableTypePlugin.txt

@@ -10 +10 @@
 %TABLE{ sort="on" headerrows="1" }% 
 | *%<nop>MOVABLETYPE% Parameter* | *Explanation* | *Default* |
-| =blog_id= | id of the blog | %<nop>MOVABLETYPEPLUGIN_BLOG_ID%, Set in TWikiPreferences or WebPreferences.  Currently set to %MOVABLETYPEPLUGIN_BLOG_ID%. |
+| =blog_id= | id of the blog | %<nop>MOVABLETYPEPLUGIN_BLOG_ID%, Set in %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, or WebPreferences.  Currently set to %MOVABLETYPEPLUGIN_BLOG_ID%. |
 | =category= | blog category label | none |
 | =format= | Format of one item. Can include variables in the table below. | none |

trunk/MoveableTypeSkin/data/TWiki/MoveableTypeMantisDesign.txt

@@ -4 +4 @@
 
 ---++ Enable this design
-Copy and paste the following section to your %MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+Copy and paste the following section to your %USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 <textarea readonly rows="13" style="width:85%;margin:10px;">
-   * Set TWiki to use this MoveableType design, set the following on %MAINWEB%.TWikiPreferences (don't copy the raw text)
+   * Set TWiki to use this MoveableType design, set the following on %USERSWEB%.SitePreferences (don't copy the raw text)
       * Set SKIN=moveabletype
    * set the moveabletype skin to use this topic to get the _Moveable Type Common Text sections_ from this topic

trunk/MoveableTypeSkin/data/TWiki/MoveableTypeSample2Design.txt

@@ -8 +8 @@
 
 ---++ Enable this design
-Copy and paste the following section to your %MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+Copy and paste the following section to your %USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 <textarea readonly rows="13" style="width:85%;margin:10px;">
-   * Set TWiki to use this MoveableType design, set the following on %MAINWEB%.TWikiPreferences (don't copy the raw text)
+   * Set TWiki to use this MoveableType design, set the following on %USERSWEB%.SitePreferences (don't copy the raw text)
       * Set SKIN=moveabletype
    * set the moveabletype skin to use this topic to get the _Moveable Type Common Text sections_ from this topic

trunk/MoveableTypeSkin/data/TWiki/MoveableTypeSample3Design.txt

@@ -38 +38 @@
 
 ---++ Enable this design
-Copy and paste the following section to your %MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+Copy and paste the following section to your %USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 
 <noautolink>
 <textarea readonly rows="13" style="width:85%;margin:10px;">
-   * Set TWiki to use this MoveableType design, set the following on %MAINWEB%.TWikiPreferences (don't copy the raw text)
+   * Set TWiki to use this MoveableType design, set the following on %USERSWEB%.SitePreferences (don't copy the raw text)
       * Set SKIN=moveabletype
    * set the moveabletype skin to use this topic to get the _Moveable Type Common Text sections_ from this topic

trunk/MoveableTypeSkin/data/TWiki/MoveableTypeSampleDesign.txt

@@ -4 +4 @@
 
 ---++ Enable this design
-Copy and paste the following section to your %MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+Copy and paste the following section to your %USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 <textarea readonly rows="13" style="width:85%;margin:10px;">
-   * Set TWiki to use this MoveableType design, set the following on %MAINWEB%.TWikiPreferences (don't copy the raw text)
+   * Set TWiki to use this MoveableType design, set the following on %USERSWEB%.SitePreferences (don't copy the raw text)
       * Set SKIN=moveabletype
    * set the moveabletype skin to use this topic to get the _Moveable Type Common Text sections_ from this topic

trunk/MoveableTypeSkin/data/TWiki/MoveableTypeSkin.txt

@@ -113 +113 @@
 options. If you have used the Theme Browser to select your preferred setup,
 you can copy and paste the following section to your
-%MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+%USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 
 <noautolink>

trunk/MultiLangPlugin/data/TWiki/MultiLangPlugin.txt

@@ -124 +124 @@
 
 
----+++ Settings to change in TWikiPreferences/WebPreferences
+---+++ Settings to change in %SYSTEMWEB%.DefaultPreferences /%USERSWEB%.SitePreferences / WebPreferences
 
 This plug-in comes with a proposed [[TWikiForms][TWikiForm]]: TWiki.TranslationForm, you may

trunk/NatEditPlugin/data/TWiki/NatEditPlugin.txt

@@ -48 +48 @@
 *PatternSkin:* %BR%
 To enable the <nop>NatEditPlugin add the identifier =natedit= to the =SKIN= 
-variable in %MAINWEB%.TWikiPreferences or WebPreferences, e.g.
+variable in %USERSWEB%.SitePreferences or WebPreferences, e.g.
 <pre>
    * <!-- -->Set SKIN = natedit,pattern

trunk/NatSkinPlugin/data/TWiki/NatSkinPlugin.txt

@@ -172 +172 @@
 So given you want to have the string <nop>%WIKITOOLNAME% in the logo position
 when using NatSkin but not so when using a different skin on the same site.
-Then add the following to the %MAINWEB%.TWikiPreferences:
+Then add the following to the %USERSWEB%.SitePreferences:
 <verbatim>
   * Set NATWEBLOGONAME = %WIKITOOLNAME%
@@ -179 +179 @@
 
 If you want to have a different logo using NatSkin than using another skin on the same site
-then add the following to  the %MAINWEB%.TWikiPreferences:
+then add the following to  the %USERSWEB%.SitePreferences:
 <verbatim>
   * Set NATWEBLOGOIMG = /path/to/your/natskinlogo.gif
@@ -328 +328 @@
      customize the default style adding the variables SKINSTYLE, STYLEBORDER,
      STYLEBUTTONS and STYLESIDEBAR (see NatSkin)
-   * If you have set up ssl for your server add the following variable to your <nop>TWikiPreferences:
+   * If you have set up ssl for your server add the following variable to your <nop>SitePreferences:
      <verbatim> * Set HTTPSLOGON = on </verbatim>
      This will prevent passwords being sent in clear-text over a possibly insecure net.

trunk/PeerPlugin/data/TWiki/PeerReviewInstall.txt

@@ -13 +13 @@
                 * my $dbUsername  = "myusername";
                 * my $dbPassword  = "mypassword";
-        1 Edit the %SYSTEMWEB%.<nop>TWikiPreferences, %SYSTEMWEB%.<nop>WebPreferences and the WebPreferences topic in each web as shown below. (Or follow the instructions in PeerReviewExamples to modify any skin).
+        1 Edit the !%SYSTEMWEB%.DefaultPreferences, !%USERSWEB%.SitePreferences, %SYSTEMWEB%.<nop>WebPreferences and the WebPreferences topic in each web as shown below. (Or follow the instructions in PeerReviewExamples to modify any skin).
 
 *Change...*

trunk/PerforcePlugin/lib/TWiki/Plugins/PerforcePlugin.pm

@@ -95 +95 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 1;

trunk/PreferencesPlugin/lib/TWiki/Plugins/PreferencesPlugin/MANIFEST

@@ -1 +1 @@
 data/TWiki/PreferencesPlugin.txt 0644
-data/TWiki/TWikiPreferencesForm.txt 0644
+data/TWiki/DefaultPreferencesForm.txt 0644
 lib/TWiki/Plugins/PreferencesPlugin.pm 0444

trunk/QuickMenuSkin/data/TWiki/QuickMenuSkin.txt

@@ -28 +28 @@
 To add different menus to the menubar you can set =QUICKMENUBAR= to the topic containing the javascript for your own custom menus. By default =QUICKMENUBAR= is set to =%%NOP%SYSTEMWEB%.QuickMenuBar=, have a look at %SYSTEMWEB%.QuickMenuBar to see how the menus are created.
 
-To change settings just add them to %MAINWEB%.TWikiPreferences, WebPreferences, or your personal page.%BR%
+To change settings just add them to %USERSWEB%.SitePreferences, WebPreferences, or your personal page.%BR%
 Eg:
 <pre>

trunk/RenderFormPlugin/data/TWiki/RenderFormPlugin.txt

@@ -180 +180 @@
 
 Plugin settings are stored as preferences variables. To reference
-a plugin setting write ==%<nop>&lt;plugin&gt;_&lt;ATTRIBUTENAME&gt;%== to your Main.TWikiPreferences topic, i.e. ==%<nop>RENDERFORM_SHORTDESCRIPTION%==
+a plugin setting write ==%<nop>&lt;plugin&gt;_&lt;ATTRIBUTENAME&gt;%== to your %USERSWEB%.SitePreferences topic, i.e. ==%<nop>RENDERFORM_SHORTDESCRIPTION%==
 
 You can also use template based preferences, just write ==RENDERFORM_TEMPLATE_&lt;templatename&gt;_&lt;ATTRIBUTENAME&gt;==.

trunk/SearchEngineKinoSearchAddOn/data/TWiki/SearchEngineKinoSearchAddOn.txt

@@ -126 +126 @@
 ---+++ Attachment file types to be indexed
 
-All the PDF, HTML, DOC, XLS and text attachments are indexed by default. If you want to override this setting you can use a TWiki preference ==KINOSEARCHINDEXEXTENSIONS==. You can copy & paste the next lines in your [[%MAINWEB%.TWikiPreferences]] topic
+All the PDF, HTML, DOC, XLS and text attachments are indexed by default. If you want to override this setting you can use a TWiki preference ==KINOSEARCHINDEXEXTENSIONS==. You can copy & paste the next lines in your [[%USERSWEB%.SitePreferences]] topic
 <verbatim>
    * KinoSearch settings
@@ -161 +161 @@
    * The plugin must implement the method =$text = stringForFile ($filename)=
 
-Then you should add to the list in =KINOSEARCHINDEXEXTENSIONS= in %MAINWEB%.TWikiPreferences. Now
+Then you should add to the list in =KINOSEARCHINDEXEXTENSIONS= in %USERSWEB%.SitePreferences. Now
 the defined document type should be indexed and the new stringifier should be used. 
 
@@ -260 +260 @@
 ---+++ Configuration
 
-This add-on uses several preferences which should be set at [[%MAINWEB%.TWikiPreferences]]. All these preferences are optional. If you are fine with the default values given below, you need not change anything.
+This add-on uses several preferences which should be set at [[%USERSWEB%.SitePreferences]]. All these preferences are optional. If you are fine with the default values given below, you need not change anything.
 <verbatim>
 (Note, these are not where the defaults are set)

trunk/SkillsPlugin/lib/TWiki/Plugins/SkillsPlugin.pm

@@ -145 +145 @@
 
 # manage categories/skills
-# If there is a preference in Main.TWikiPreferences, only people listed and admins can add categories/skills
+# If there is a preference in %USERSWEB%.SitePreferences, only people listed and admins can add categories/skills
     unless ( isAllowed() ) {
         $_[0] =~ s!%ADDSKILLSMESSAGE%!<div class="skillNotification">

trunk/SpacedWikiWordPlugin/data/TWiki/SpacedWikiWordPlugin.txt

@@ -14 +14 @@
 Use underscore topic names if you want total control over links:
    1 (Optionally) disable automatic linking of !WikiWords. Do this if you are in the position to teach your users to only write links in bracket notation like =[<nop>[WebHome]]=. This is also how Wikipedia links are written. Bracket notation is necessary to create links for underscore topic names, but you can also mix both link notations.
-      * In [[Main.TWikiPreferences]] write =[3 spaces]* Set NOAUTOLINK = on=
+      * In [[%USERSWEB%.SitePreferences]] write =[3 spaces]* Set NOAUTOLINK = on=
    1 Use bracket notation without explicit link labels:
       * =[<nop>[WebHome][TWiki WebHome]]= - explicit link label, no spacing out

trunk/SpanishTWikiContrib/data/TWiki_ES/ArchivosAdjuntos.txt

@@ -32 +32 @@
       * Se puede subir cualquier tipo de archivo. Algunos archivos que puedan comprometer la seguridad del sistema serán renombrados, por ejemplo: archivos =*.php= serán renombrados a =*.php.txt= con el fin de que nadie puede incluir código en el archivo que pueda ser ejecutado en el momento de leer el archivo .php.
       * Se mantendrá la ruta del archivo que se adjuntó anteriormente para su conveniencia. En caso que haga modificaciones al archivo local y quiere volver a subirlo, puede copiar la ruta nuevamente al campo de Archivo local.
-      * TWiki puede limitar el tamaño de archivos. Esto está definido en la variable =%<nop>ATTACHFILESIZELIMIT%= de las TWiki.TWikiPreferences %FLAGGB%; el límite actual son %ATTACHFILESIZELIMIT% kB.
+      * TWiki puede limitar el tamaño de archivos. Esto está definido en la variable =%<nop>ATTACHFILESIZELIMIT%= de las %SYSTEMWEB%.DefaultPreferences %FLAGGB%; el límite actual son %ATTACHFILESIZELIMIT% kB.
          * %X% No se recomienda subir archivos que tengan más que algunos cien kB de tamaño a través del navegador. Archivos grandes se suben extremadamente despacio y muchas veces causan una extralimitación de tiempo. Utilice un acceso FTP para subir archivos grandes.
    * Archivos adjuntos automáticos:

trunk/SpanishTWikiContrib/data/TWiki_ES/ComoFormatearTexto.txt

@@ -48 +48 @@
 %PLUGINDESCRIPTIONS%
 
-Revise el estado de estas extensiones y su configuración en TWiki.TWikiPreferences %FLAGGB%.
+Revise el estado de estas extensiones y su configuración en %SYSTEMWEB%.DefaultPreferences %FLAGGB%.
 
 ---++ Errores comunes de edición

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.TWikiPlugins][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 TWiki.TWikiPreferences %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%.TWikiUsers %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/MailerContrib.txt

@@ -128 +128 @@
       1 Manually edit !LocalSite.cfg to set any configuration variables.
 
-%IF{"defined 'SYSTEMWEB'" else="<div class='twikiAlert'>%X% WARNING: SYSTEMWEB is not defined in this TWiki. Please add these definitions to your %MAINWEB%.TWikiPreferences, if they are not already there:<br><pre>   * <nop>Set SYSTEMWEB = %<nop>SYSTEMWEB%<br>   * <nop>Set USERSWEB = %<nop>MAINWEB%</pre></div>"}%
+%IF{"defined 'SYSTEMWEB'" else="<div class='twikiAlert'>%X% WARNING: SYSTEMWEB is not defined in this TWiki. Please add these definitions to your %USERSWEB%.SitePreferences, if they are not already there:<br><pre>   * <nop>Set SYSTEMWEB = %<nop>SYSTEMWEB%<br>   * <nop>Set USERSWEB = %<nop>MAINWEB%</pre></div>"}%
 
    * To make sure the installation was successful, run the =mailnotify= script from the command line, with no parameters. In this case it will print out what it would have done to =STDOUT=.

trunk/SpanishTWikiContrib/data/TWiki_ES/PalabraWiki.txt

@@ -54 +54 @@
       * Números se consideran como minúscula, lo cual convierte =Año2Mil= en una !PalabraWiki, pero no =Año2000=.
       * Convierte acrónimos en !PalabrasWiki, por ejemplo utilice =FaqIndex= para la página "FAQ index".
-   * Es posible de apagar la generación automática de !PalabrasWiki y basarse unicamente en la anotación con corchetes. Revise el comando NOAUTOLINK en TWiki.TWikiPreferences#Default_Web_Preferences %FLAGGB%.
+   * Es posible de apagar la generación automática de !PalabrasWiki y basarse unicamente en la anotación con corchetes. Revise el comando NOAUTOLINK en %SYSTEMWEB%.DefaultPreferences#Default_Web_Preferences %FLAGGB%.
    * %X% Cuando cree un enlace a la página <nop>%HOMETOPIC% _en otra red_, el enlace se va a mostrar como el nombre de la red, por ejemplo =Sandbox.%HOMETOPIC%= se convierte en Sandbox.%HOMETOPIC%.
 

trunk/SpanishTWikiContrib/data/TWiki_ES/PreguntasSobreFormatearTexto.txt

@@ -160 +160 @@
 ---+++ Puede escribir texto coloreado?
 
-TWiki.TWikiPreferences %FLAGGB% define algunos colores comunes: *%YELLOW% %<nop>YELLOW%%ENDCOLOR%, %RED% %<nop>RED%%ENDCOLOR%, %PINK% %<nop>PINK%%ENDCOLOR%, %PURPLE% %<nop>PURPLE%%ENDCOLOR%, %TEAL% %<nop>TEAL%%ENDCOLOR%, %NAVY% %<nop>NAVY%%ENDCOLOR%, %BLUE% %<nop>BLUE%%ENDCOLOR%, %AQUA% %<nop>AQUA%%ENDCOLOR%, %LIME% %<nop>LIME%%ENDCOLOR%, %GREEN% %<nop>GREEN%%ENDCOLOR%, %OLIVE% %<nop>OLIVE%%ENDCOLOR%, %MAROON% %<nop>MAROON%%ENDCOLOR%, %BLACK% %<nop>BLACK%%ENDCOLOR%, %GRAY% %<nop>GRAY%%ENDCOLOR%, %SILVER% %<nop>SILVER%%ENDCOLOR%* y *%<nop>ENDCOLOR%*.
+%SYSTEMWEB%.DefaultPreferences %FLAGGB% define algunos colores comunes: *%YELLOW% %<nop>YELLOW%%ENDCOLOR%, %RED% %<nop>RED%%ENDCOLOR%, %PINK% %<nop>PINK%%ENDCOLOR%, %PURPLE% %<nop>PURPLE%%ENDCOLOR%, %TEAL% %<nop>TEAL%%ENDCOLOR%, %NAVY% %<nop>NAVY%%ENDCOLOR%, %BLUE% %<nop>BLUE%%ENDCOLOR%, %AQUA% %<nop>AQUA%%ENDCOLOR%, %LIME% %<nop>LIME%%ENDCOLOR%, %GREEN% %<nop>GREEN%%ENDCOLOR%, %OLIVE% %<nop>OLIVE%%ENDCOLOR%, %MAROON% %<nop>MAROON%%ENDCOLOR%, %BLACK% %<nop>BLACK%%ENDCOLOR%, %GRAY% %<nop>GRAY%%ENDCOLOR%, %SILVER% %<nop>SILVER%%ENDCOLOR%* y *%<nop>ENDCOLOR%*.
 
    * __Digite:__ =%<nop>RED% texto color rojo %<nop>ENDCOLOR% y %<nop>GREEN% texto color verde %<nop>ENDCOLOR%= <p /> 

trunk/TWikiDeploymentSpiderAddOn/twiki-deployment-spider.pl

@@ -17 +17 @@
 # Description:
 #    1 Locates TWiki installs (uses Google SOAP API)
-#    2 Finds common information from TWikiPreferences
+#    2 Finds common information from DefaultPreferences
 #    2 Catalog users
 #    2 Discovers webs
@@ -122 +122 @@
 | Users | http://sitename/..../Main/TWikiUsers
 | Webs names |
-| TWiki prefs | http://sitename/..../TWiki/TWikiPreferences
+| TWiki prefs | http://sitename/..../TWiki/DefaultPreferences
 | Plugins installed |
 | Main skin |
@@ -223 +223 @@
 #  print "\t$baseurl \n";
   my $site = new TWikiSite ($siteurl);
-  my @webs = get_wikiweblist($baseurl."/TWiki/TWikiPreferences", $siteurl);
+  my @webs = get_wikiweblist($baseurl."/TWiki/DefaultPreferences", $siteurl);
   $site->webs(@webs);
 

trunk/TWikiInstallerContrib/lib/TWiki/Contrib/TWikiInstallerContrib/remote-install

@@ -603 +603 @@
 
 <b>WebMasterEmail</b> <input type="text" name="WebMasterEmail" id=WebMasterEmail value="$WebMasterEmail" size="35" /><br />
-<div class=help id=WebMasterEmail_help>This will automatically set the TWiki webmaster email address <a target="_new" href="http://twiki.org/cgi-bin/view/TWiki/TWikiPreferences#Email_and_Proxy_Server_Settings">WebMasterEmail</a> <!-- in Main.TWikiPreferences --><br/></div>
+<div class=help id=WebMasterEmail_help>This will automatically set the TWiki webmaster email address <a target="_new" href="http://twiki.org/cgi-bin/view/TWiki/DefaultPreferences#Email_and_Proxy_Server_Settings">WebMasterEmail</a> <!-- in Main.SitePreferences --><br/></div>
 
 <!--

trunk/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm

@@ -59 +59 @@
     $TWiki::cfg{UsersWebName} = $testUsersWeb;
     $TWiki::cfg{SystemWebName} = $testSysWeb;
-    $TWiki::cfg{LocalSitePreferences} = "$testUsersWeb.TWikiPreferences";
+    $TWiki::cfg{LocalSitePreferences} = "$testUsersWeb.SitePreferences";
     $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TWikiUserMapping';
     $TWiki::cfg{Register}{AllowLoginName} = 1;

trunk/TagMePlugin/data/TWiki/TagMePlugin.txt

@@ -193 +193 @@
 To show the tag interface at the top of the page directly below the breadcrumb (like on twiki.org), use the default template =view.tagme.tmpl= in the templates directory.
 
-This template is in fact a 'skin' template. To enable it, write in [[%MAINWEB%.TWikiPreferences]]:
+This template is in fact a 'skin' template. To enable it, write in [[%USERSWEB%.SitePreferences]]:
 <pre>
    * Set S<nop>KIN = tagme,pattern
@@ -223 +223 @@
    * Create an empty CSS file, for instance =sitestyle.css=
    * Copy the CSS styles for =tagmetags= (see below at [[%TOPIC%#ExampleStyle][Example styles used on twiki.org]]) into the file
-   * Attach the file to [[%MAINWEB%.TWikiPreferences]]
-   * In [[%MAINWEB%.TWikiPreferences]], write: 
+   * Attach the file to [[%USERSWEB%.SitePreferences]]
+   * In [[%USERSWEB%.SitePreferences]], write: 
    <verbatim>
-   * Set USERSTYLEURL = %PUBURL%/%MAINWEB%/TWikiPreferences/sitestyle.css
+   * Set USERSTYLEURL = %PUBURL%/%MAINWEB%/SitePreferences/sitestyle.css
    </verbatim>
 
@@ -237 +237 @@
 </verbatim>
 
-To show the tags at the bottom of every page, write in [[%MAINWEB%.TWikiPreferences]]:
+To show the tags at the bottom of every page, write in [[%USERSWEB%.SitePreferences]]:
 <verbatim>
  * Set WEBCOPYRIGHT = Tags: %TAGME{ tpaction="%URLPARAM{tpaction}%" web="%WEB%" tag="%URLPARAM{tag}%" }%, [[TWiki.TagMeViewAllTags][view all tags]] %BR% Copyright &copy; 1999-%GMTIME{"$year"}% by... etc

trunk/TalkContrib/data/TWiki/TalkContrib.txt

@@ -23 +23 @@
 <img src="%ATTACHURLPATH%/TalkSuffix.jpg" alt="TalkSuffix.jpg" width='320' height='200' style="float:right;margin:10px;border:1px solid black;"/>
 
-To enable Talk Topics, add the =talk= skin to the SKIN path in %MAINWEB%.TWikiPreferences or the <nop>WebPreferences topic of whatever web you want to enable Talk topics in (eg, if you're using PatternSkin):
+To enable Talk Topics, add the =talk= skin to the SKIN path in %USERSWEB%.SitePreferences or the <nop>WebPreferences topic of whatever web you want to enable Talk topics in (eg, if you're using PatternSkin):
 <verbatim>
       * Set <nop>SKIN = talk,pattern
@@ -30 +30 @@
 
 
-You can over-ride the suffix (defaults to =Talk=) that is appended to a topic to create its Talk topic by setting =TALKSUFFIX= in %MAINWEB%.TWikiPreferences
+You can over-ride the suffix (defaults to =Talk=) that is appended to a topic to create its Talk topic by setting =TALKSUFFIX= in %USERSWEB%.SitePreferences
 <verbatim>
       * Set <nop>TALKSUFFIX = Talk
 </verbatim>
 
-You can over-ride the Topic template that is used when creating a new Talk topic by setting =TALKTOPICTEMPLATE= in %MAINWEB%.TWikiPreferences
+You can over-ride the Topic template that is used when creating a new Talk topic by setting =TALKTOPICTEMPLATE= in %USERSWEB%.SitePreferences
 <verbatim>
       * Set <nop>TALKTOPICTEMPLATE = TWiki.MyTalkTemplate
 </verbatim>
-You can over-ride the Topic formtemplate that is used when creating a new Talk topic by setting =TALKTOPICFORMTEMPLATE= in %MAINWEB%.TWikiPreferences
+You can over-ride the Topic formtemplate that is used when creating a new Talk topic by setting =TALKTOPICFORMTEMPLATE= in %USERSWEB%.SitePreferences
 <verbatim>
       * Set <nop>TALKTOPICFORMTEMPLATE = TWiki.MyTalkFormTemplate

trunk/TaskExeContrib/data/TWiki/TaskExeContrib.txt

@@ -309 +309 @@
    * Once the above is working you should customize your application for your needs:
       * Create a Web dedicated to TaskExeContrib and install TaskExeContrib in it.
-      * Fix the settings for TWiki.TaskExePlugin on %MAINWEB%.TWikiPreferences.
+      * Fix the settings for TWiki.TaskExePlugin on %USERSWEB%.SitePreferences.
       * Create [[#Task_Specification][task specifications]] to suite your needs.
 

trunk/TaskExePlugin/lib/TWiki/Plugins/TaskExePlugin.pm

@@ -88 +88 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 1;

trunk/TemplateToolkitPlugin/lib/TWiki/Plugins/TemplateToolkitPlugin.pm

@@ -55 +55 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 1;

trunk/TopicClassificationAddOn/data/TCAO/TopicClassificationAddOn.txt

@@ -35 +35 @@
    1 Download the ZIP file from the Add-on Home (see below)
    1 Unpack the Add-on archive in the root of your TWiki installation.
-   1 Add the following preference section to [[Main.TWikiPreferences]]:
+   1 Add the following preference section to [[%USERSWEB%.SitePreferences]]:
 <verbatim>
 ---++ TWiki.TopicClassificationAddOn Preferences 

trunk/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt

@@ -25 +25 @@
 After installing this add-on, there are a few additional steps needed before it will function properly:
    * Make sure ={EnableHierarchicalWebs}= is enabled in =configure= (under "Store settings" tab). 
-   * Add the following preference section to [[Main.TWikiPreferences]]:
+   * Add the following preference section to [[%USERSWEB%.SitePreferences]]:
 <verbatim>
 ---++ TWiki.TopicClassificationAddOn Preferences 

trunk/TwistyBundleTWiki04x00x05/data/TWiki/TwistyContrib.txt

@@ -67 +67 @@
 
 ---+++ You Write 
-In your !Main.TWikiPreferences write:
+In your !%USERSWEB%.SitePreferences write:
 <verbatim>
    * Set FLIP = <span id="twid_%CALC{$SETM(twisty_id, + 1)$GET(twisty_id)}%show" class="twistyTrigger twistyMakeVisible">

trunk/TwistyBundleTWiki04x01/data/TWiki/TwistyContrib.txt

@@ -67 +67 @@
 
 ---+++ You Write 
-In your !Main.TWikiPreferences write:
+In your !%USERSWEB%.SitePreferences write:
 <verbatim>
    * Set FLIP = <span id="twid_%CALC{$SETM(twisty_id, + 1)$GET(twisty_id)}%show" class="twistyTrigger twistyMakeVisible">

trunk/UnitTestContrib/test/unit/PrefsTests.pm

@@ -30 +30 @@
 
     $TWiki::cfg{SystemWebName} = $testSysWeb;
-    $TWiki::cfg{LocalSitePreferences} = "$this->{users_web}.TWikiPreferences";
+    $TWiki::cfg{LocalSitePreferences} = "$this->{users_web}.SitePreferences";
 
     $twiki = $this->{twiki};

trunk/UpdateAttachmentsPlugin/lib/TWiki/Plugins/UpdateAttachmentsPlugin.pm

@@ -76 +76 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 1;

trunk/UpdateInfoPlugin/data/TWiki/UpdateInfoPlugin.txt

@@ -49 +49 @@
         * Main.WebHome %ISNEW%
         * TWiki.WebHome %ISNEW{days="15"}%
-        * TWiki.TWikiPreferences %ISNEW{days="20" version="1.4"}%
+        * %SYSTEMWEB%.DefaultPreferences %ISNEW{days="20" version="1.4"}%
         * Sandbox.UpdateInfoPluginTest %ISNEW% (Edit and save the <nop/>Sandbox.UpdateInfoPluginTest topic, and it should be highlighted with a %N% icon)
 

trunk/VotePlugin/data/TWiki/VotePlugin.txt

@@ -106 +106 @@
    *<nop> Set VOTEPLUGIN_DEFAULTS = open="on" global="on" bayesian="on"
 </pre>
- You can do this in an individual topic, for an entire web (in !WebPreferences), or for the whole TWiki (in %MAINWEB%.<nop>TWikiPreferences).
+ You can do this in an individual topic, for an entire web (in !WebPreferences), or for the whole TWiki (in !%USERSWEB%.SitePreferences).
 
 #FormattingResults
@@ -182 +182 @@
    * Set VOTEPLUGIN_RESETTERS = none
 </verbatim>
-in Main.<nop>TWikiPreferences, and add =VOTEPLUGIN_RESETTERS= to =FINALPREFERENCES=.
+in !%USERSWEB%.SitePreferences, and add =VOTEPLUGIN_RESETTERS= to =FINALPREFERENCES=.
 </verbatim>
 

trunk/WidgetsSkin/data/TWiki/WidgetsMantisDesign.txt

@@ -4 +4 @@
 
 ---++ Enable this design
-Copy and paste the following section to your %MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+Copy and paste the following section to your %USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 <textarea readonly rows="13" style="width:85%;margin:10px;">
-   * Set TWiki to use this Widget design, set the following on %MAINWEB%.TWikiPreferences (don't copy the raw text)
+   * Set TWiki to use this Widget design, set the following on %USERSWEB%.SitePreferences (don't copy the raw text)
       * Set SKIN=Widget
    * set the Widget skin to use this topic to get the _Moveable Type Common Text sections_ from this topic

trunk/WidgetsSkin/data/TWiki/WidgetsSample2Design.txt

@@ -8 +8 @@
 
 ---++ Enable this design
-Copy and paste the following section to your %MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+Copy and paste the following section to your %USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 <textarea readonly rows="13" style="width:85%;margin:10px;">
-   * Set TWiki to use this Widget design, set the following on %MAINWEB%.TWikiPreferences (don't copy the raw text)
+   * Set TWiki to use this Widget design, set the following on %USERSWEB%.SitePreferences (don't copy the raw text)
       * Set SKIN=Widget
    * set the Widget skin to use this topic to get the _Moveable Type Common Text sections_ from this topic

trunk/WidgetsSkin/data/TWiki/WidgetsSample3Design.txt

@@ -38 +38 @@
 
 ---++ Enable this design
-Copy and paste the following section to your %MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+Copy and paste the following section to your %USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 
 <noautolink>
 <textarea readonly rows="13" style="width:85%;margin:10px;">
-   * Set TWiki to use this Widget design, set the following on %MAINWEB%.TWikiPreferences (don't copy the raw text)
+   * Set TWiki to use this Widget design, set the following on %USERSWEB%.SitePreferences (don't copy the raw text)
       * Set SKIN=Widget
    * set the Widget skin to use this topic to get the _Moveable Type Common Text sections_ from this topic

trunk/WidgetsSkin/data/TWiki/WidgetsSampleDesign.txt

@@ -4 +4 @@
 
 ---++ Enable this design
-Copy and paste the following section to your %MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+Copy and paste the following section to your %USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 <textarea readonly rows="13" style="width:85%;margin:10px;">
-   * Set TWiki to use this Widget design, set the following on %MAINWEB%.TWikiPreferences (don't copy the raw text)
+   * Set TWiki to use this Widget design, set the following on %USERSWEB%.SitePreferences (don't copy the raw text)
       * Set SKIN=widgets
    * set the Widget skin to use this topic to get the _Moveable Type Common Text sections_ from this topic

trunk/WidgetsSkin/data/TWiki/WidgetsSkin.txt

@@ -65 +65 @@
 options. If you have used the Theme Browser to select your preferred setup,
 you can copy and paste the following section to your
-%MAINWEB%.TWikiPreferences topic (or !WebPreferences, or your personal topic)
+%USERSWEB%.SitePreferences topic (or !WebPreferences, or your personal topic)
 
 <noautolink>

trunk/WikiwygContrib/data/TWiki/WikiwygContrib.txt

@@ -23 +23 @@
 
 If you are using =pattern= skin:
-   * set the COMPOSER variable to 'wikiwyg' in %MAINWEB%.TWikiPreferences
+   * set the COMPOSER variable to 'wikiwyg' in %USERSWEB%.SitePreferences
 Otherwise:
         * To enable the editor in one of your skins, add the following link to the skin alongside or in place of the existing 'edit' link:<br /><code>&lt;a href="%<nop>SCRIPTURLPATH%/edit%<nop>SCRIPTSUFFIX%/%<nop>WEB%/%<nop>TOPIC%?skin=wikiwyg"&gt;Wikiwyg&lt;/a&gt;</code><br />As you can see this is just a standard edit link with the wikiwyg skin in place of the usual edit skin. Here it is for this topic: <a href="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%?skin=wikiwyg">Wikiwyg</a>. Try clicking on it, but _do not save_!

trunk/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin/Constants.pm

@@ -22 +22 @@
 our (%KNOWN_COLOUR);
 
-# Colours with colour settings in TWikiPreferences. WTF does TWiki see
+# Colours with colour settings in DefaultPreferences. WTF does TWiki see
 # fit to *redefine* the standard colors? e.g. ORANGE below is *not* orange.
 # For goodness sakes!

trunk/core/lib/TWiki.pm

@@ -1549 +1549 @@
     $this->{forms} = {};
 
-    # Push global preferences from TWiki.TWikiPreferences
+    # Push global preferences from %SYSTEMWEB%.DefaultPreferences
     $prefs->pushGlobalPreferences();
 

trunk/core/lib/TWiki/Contrib/core/MANIFEST

@@ -58 +58 @@
 bin/viewfile 0555
 data/Main/ProjectContributor.txt 0644
+data/Main/SitePreferences.txt 0644
 data/Main/TWikiAdminUser.txt 0644
 data/Main/TWikiGroups.txt 0644
 data/Main/TWikiGuest.txt 0644
-data/Main/TWikiPreferences.txt 0644
 data/Main/UnknownUser.txt 0644
 data/Main/WebAtom.txt 0644
@@ -99 +99 @@
 data/TWiki/ClassMethod.txt 0644
 data/TWiki/ContributedAddOns.txt 0644
+data/TWiki/DefaultPreferences.txt 0644
 data/TWiki/DeleteOrRenameATopic.txt 0644
 data/TWiki/DeleteOrRenameAnAttachment.txt 0644
@@ -164 +165 @@
 data/TWiki/TWikiPlannedFeatures.txt 0644
 data/TWiki/TWikiPlugins.txt 0644
-data/TWiki/TWikiPreferences.txt 0644
 data/TWiki/TWikiReferenceManual.txt 0644
 data/TWiki/TWikiReleaseNotes04x00.txt 0644

trunk/core/lib/TWiki/UI/Search.pm

@@ -44 +44 @@
 | =topic="%WEBPREFSTOPIC%"= <br /> =topic="*Bug"= | Limit search to topics: A topic, a topic with asterisk wildcards, or a list of topics separated by comma. | All topics in a web |
 | =excludetopic="Web*"= <br /> =excludetopic="%HOMETOPIC%, <nop>WebChanges"= | Exclude topics from search: A topic, a topic with asterisk wildcards, or a list of topics separated by comma. | None |
-| =type="keyword"= <br /> =type="literal"= <br /> =type="regex"= | Do a keyword search like =soap "web service" -shampoo=; a literal search like =web service=; or RegularExpression search like =soap;web service;!shampoo= | =%<nop>SEARCHVAR- DEFAULTTYPE%= [[TWikiPreferences][preferences]] setting (%SEARCHVARDEFAULTTYPE%) |
+| =type="keyword"= <br /> =type="literal"= <br /> =type="regex"= | Do a keyword search like =soap "web service" -shampoo=; a literal search like =web service=; or RegularExpression search like =soap;web service;!shampoo= | =%<nop>SEARCHVAR- DEFAULTTYPE%= [[DefaultPreferences][preferences]] setting (%SEARCHVARDEFAULTTYPE%) |
 | =scope="topic"= <br /> =scope="text"= <br /> =scope="all"= | Search topic name (title); the text (body) of topic; or all (both) | ="text"= |
 | =order="topic"= <br /> =order="created"= <br />  =order="modified"= <br /> =order="editby"= <br /> =order=<br />&nbsp;"formfield(name)"= | Sort the results of search by the topic names, topic creation time, last modified time, last editor, or named field of TWikiForms. The sorting is done web by web; in case you want to sort across webs, create a [[FormattedSearch][formatted]] table and sort it with TablePlugin's initsort | Sort by topic name |

trunk/core/tools/TWikiKernel/MANIFEST

@@ -35 +35 @@
 data/Main/NobodyGroup.txt 0660
 data/Main/ProjectContributor.txt 0660
+data/Main/SitePreferences.txt 0660
 data/Main/TWikiAdminGroup.txt 0660
 data/Main/TWikiGroupTemplate.txt 0660
 data/Main/TWikiGroups.txt 0660
 data/Main/TWikiGuest.txt 0660
-data/Main/TWikiPreferences.txt 0660
 data/Main/TWikiRegistrationAgent.txt 0660
 data/Main/TWikiUsers.txt 0660
@@ -89 +89 @@
 data/TWiki/DeleteOrRenameATopic.txt 0660
 data/TWiki/DeleteOrRenameAnAttachment.txt 0660
+data/TWiki/DefaultPreferences.txt 0660
 data/TWiki/DeveloperDocumentationCategory.txt 0660
 data/TWiki/DontNotify.txt 0660
@@ -151 +152 @@
 data/TWiki/TWikiPlannedFeatures.txt 0660
 data/TWiki/TWikiPlugins.txt 0660
-data/TWiki/TWikiPreferences.txt 0660
 data/TWiki/TWikiReferenceManual.txt 0660
 data/TWiki/TWikiRegistration.txt 0660

trunk/core/tools/benchmark.pl

@@ -62 +62 @@
 
     $skin = "" unless $skin;
-    my $url = "$server/$install/bin/view/TWiki/TWikiPreferences";
+    my $url = "$server/$install/bin/view/TWiki/DefaultPreferences";
     print "*** Getting plugins for $install\n" if $debug;
     my $plugins = `wget -O - $url 2>&1 | grep 'Currently activated plugins:' | sed -e 's/^.*: //'`;

trunk/core/tools/pkg/debian/postinst

@@ -68 +68 @@
 db_get twiki/wikiwebmaster
 # do rcs checkout first?
-#TODO: these settings should move to Main.TWikiPreferences
-if [ ! -e /var/lib/twiki/data/TWiki/TWikiPreferences.txt ]; then
-        perl -pi~ -e '$U=q{'"$RET"'}; s/^(.*\*\s*Set\s*WIKIWEBMASTER\s*=\s*).*(\r?\n)$/\1$U\2/;' /var/lib/twiki/data/TWiki/TWikiPreferences.txt
+#TODO: these settings should move to Main.SitePreferences
+if [ ! -e /var/lib/twiki/data/TWiki/DefaultPreferences.txt ]; then
+        perl -pi~ -e '$U=q{'"$RET"'}; s/^(.*\*\s*Set\s*WIKIWEBMASTER\s*=\s*).*(\r?\n)$/\1$U\2/;' /var/lib/twiki/data/TWiki/DefaultPreferences.txt
         #force default to use sendmail by setting SMTPMAILHOST to blank
-        perl -pi~ -e 's/^(\s*\*\s*Set\s*SMTPMAILHOST\s*=\s*).*(\r\n)$/$1$2/;' /var/lib/twiki/data/TWiki/TWikiPreferences.txt
+        perl -pi~ -e 's/^(\s*\*\s*Set\s*SMTPMAILHOST\s*=\s*).*(\r\n)$/$1$2/;' /var/lib/twiki/data/TWiki/DefaultPreferences.txt
 fi