Item109: Another batch of TWikiPreference -> Default and Site prefs

More to come


git-svn-id: http://svn.foswiki.org/trunk@499 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

BehaviourContrib/data/TWiki/BehaviourContrib.txt

@@ -290,7 +290,7 @@ You can also set the global TWiki variable BEHAVIOURCONTRIB_DEBUG to 1 to make t
 |  Feedback: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev |
 |  Appraisal: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal |
 
-__Related Topics:__ %SYSTEMWEB%.TWikiPreferences
+__Related Topics:__ %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences
 
 %META:FILEATTACHMENT{name="behaviour.js" attr="" autoattached="1" comment="" date="1162075796" path="behaviour.compressed.js" size="2902" user="UnknownUser" version=""}%
 

FamFamFamContrib/data/TWiki/FamFamFamContrib.txt

@@ -49,7 +49,7 @@ At this point, the only way to access these Icons is using the url - see below.
 |  Feedback: | http://twiki.org/cgi-bin/view/Plugins/FamFamFamContribDev |
 |  Appraisal: | http://twiki.org/cgi-bin/view/Plugins/FamFamFamContribAppraisal |
 
-__Related Topics:__ %SYSTEMWEB%.WikiContribs, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.TWikiPreferences
+__Related Topics:__ %SYSTEMWEB%.WikiContribs, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences
 
 <!-- Do _not_ attempt to edit this topic; it is auto-generated. Please add comments/questions/remarks to the feedback topic on twiki.org instead. -->
 

PatternSkin/data/TWiki/PatternSkinCssCookbookEditTableStyle.txt

@@ -20,7 +20,7 @@ This line loads the extra style definition:
 <verbatim>
    * Set USERSTYLEURL = %ATTACHURL%/edittable.css
 </verbatim>
-You can write this line in %SYSTEMWEB%.TWikiPreferences, in WebPreferences, in your user topic or on a single page.
+You can write this line in %SYSTEMWEB%.DefaultPreferences, in %USERSWEB%.SitePreferences, in WebPreferences, in your user topic or on a single page.
 </div>
 
 

PatternSkin/data/TWiki/PatternSkinCssCookbookNoLeftBar.txt

@@ -7,7 +7,7 @@ This line loads the extra style definition:
 <verbatim>
    * Set USERSTYLEURL = %ATTACHURL%/hideleftbar.css
 </verbatim>
-You can write this line in %SYSTEMWEB%.TWikiPreferences, in WebPreferences, in your user topic, or on a single page.
+You can write this line in %SYSTEMWEB%.DefaultPreferences, in %USERSWEB%.SitePreferences, in WebPreferences, in your user topic, or on a single page.
 </div>
 
 

PatternSkin/data/TWiki/PatternSkinCssCookbookNoTopBar.txt

@@ -9,7 +9,7 @@ This line loads the extra style definition:
 <verbatim>
    * Set USERSTYLEURL=%ATTACHURL%/notopbar.css
 </verbatim>
-You can write this line in %SYSTEMWEB%.TWikiPreferences, in WebPreferences, in your user topic or on a single page.
+You can write this line in %SYSTEMWEB%.DefaultPreferences, in %USERSWEB%.SitePreferences, in WebPreferences, in your user topic or on a single page.
 </div>
 
 Add the dynamic variable link to the logo image to the topic text:

WysiwygPlugin/data/TWiki/WysiwygPlugin.txt

@@ -191,7 +191,7 @@ Many thanks to the following sponsors for supporting this work:
 |  Feedback: | TWiki:Plugins/%TOPIC%Dev |
 |  Appraisal: | http://twiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal |
 
-__Related Topics:__ %SYSTEMWEB%.TWikiPreferences, %SYSTEMWEB%.TWikiPlugins
+__Related Topics:__ %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, %SYSTEMWEB%.TWikiPlugins
 
 <!-- Do _not_ attempt to edit this topic; it is auto-generated. Please add comments/questions/remarks to the Dev topic instead. -->
 

core/data/Main/WebHome.txt

@@ -5,8 +5,8 @@ Congratulations, you have finished installing TWiki.
 This site is running TWiki version *%WIKIVERSION%*, Plugin API version *%PLUGINVERSION{}%*
 
 To learn more about TWiki, visit the [[%SYSTEMWEB%.WebHome][TWiki web]]. Please ensure that the read/write
-permissions for each web on your site match your access control policies (see TWiki.SitePermissions
-and [[%SYSTEMWEB%.TWikiPreferences]]). Replace this text with a description of your new
+permissions for each web on your site match your access control policies (see [[%SYSTEMWEB%.DefaultPreferences]] 
+and [[%USERSWEB%.SitePreferences]]). Replace this text with a description of your new
 %IF{"defined WIKITOOLNAME" then="<nop>%WIKITOOLNAME%" else="TWiki"}% site. 
 
 ---++ <nop>%WEB% Web Utilities

core/data/Main/WebPreferences.txt

@@ -8,7 +8,7 @@ The following settings are __web preferences__ of the [[%WEB%.%HOMETOPIC%][%WEB%
 
 ---++ Web Preferences Settings
 
-These settings override the defaults for this web only. See [[%SYSTEMWEB%.TWikiPreferences#DefaultWebPreferences][full list of defaults with explanation]].
+These settings override the defaults for this web only. See [[%SYSTEMWEB%.DefaultPreferences#DefaultWebPreferences][full list of defaults with explanation]].
 
    * Web settings:
       * Set WEBTOPICLIST = [[%WIKIUSERSTOPIC%][Users]] %SEP% [[TWikiGroups][Groups]] %SEP% [[WebChanges][Changes]] %SEP% [[WebIndex][Index]] %SEP% [[WebSearch][Search]] %SEP% Go <input type="text" name="topic" size="16" />

core/data/Sandbox/WebPreferences.txt

@@ -7,7 +7,7 @@ The following settings are __web preferences__ of the [[%WEB%.%HOMETOPIC%][%WEB%
 
 ---++ Web Preferences Settings
 
-These settings override the defaults for this web only. See [[%SYSTEMWEB%.TWikiPreferences#DefaultWebPreferences][full list of defaults with explanation]].
+These settings override the defaults for this web only. See [[%SYSTEMWEB%.DefaultPreferences#DefaultWebPreferences][full list of defaults with explanation]].
 
    * Web Settings:
       * Set WEBBGCOLOR = #B9DAFF

core/data/TWiki/TWikiUpgradeGuide.txt

@@ -104,7 +104,7 @@ The main steps are:
 
 ---+++ Apply Preferences From Old Installation
 
-   * Transfer any customized and local settings from [[%SYSTEMWEB%.TWikiPreferences]] to the topic pointed at by {LocalSitePreferences} ([[%LOCALSITEPREFS%]]). Per default this is =Main.TWikiPreferences=. This avoids having to write over files in the distribution on a later upgrade.
+   * Transfer any customized and local settings from [[%SYSTEMWEB%.DefaultPreferences]] to the topic pointed at by {LocalSitePreferences} ([[%LOCALSITEPREFS%]]). Per default this is =Main.TWikiPreferences=. This avoids having to write over files in the distribution on a later upgrade.
    * If you changed any of the topics in the original TWiki distribution, you will have to transfer your changes to the new install manually. There is no simple way to do this, though a suggestion is to use 'diff' to find changed files in the =data/TWiki= of the old and new TWiki installation, and transfer the changes into the new TWiki install. If you can run a GUI on your server, you may find that using a visual diff tool like !WinMerge, meld, kdiff3, xxdiff, etc. is helpful.
    * Compare the =WebPreferences= topics in the old TWiki Installation with the default from the new TWiki installation and add any new Preferences that may be relevant.
    * Compare the =WebLeftBar= topics in the old TWiki Installation with the default from the new TWiki installation and add any new feature that you desire.

core/data/Trash/WebPreferences.txt

@@ -8,7 +8,7 @@ The following settings are __web preferences__ of the [[%WEB%.%HOMETOPIC%][%WEB%
 
 ---++ Web Preferences Settings
 
-These settings override the defaults for this web only. See [[%SYSTEMWEB%.TWikiPreferences#DefaultWebPreferences][full list of defaults with explanation]].
+These settings override the defaults for this web only. See [[%SYSTEMWEB%.DefaultPreferences#DefaultWebPreferences][full list of defaults with explanation]].
 
    * Set WEBBGCOLOR = #FF0099
    * Set SITEMAPWHAT = Place for trashed topics and attachments.