Item11383: Sync doc changes edited on foswiki.org

git-svn-id: http://svn.foswiki.org/branches/Release01x01@14149 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 29, 2012 · 925d206 · 925d206
1 parent 1833684
commit 925d206
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/PatternSkin/data/System/PatternSkinThemeFatWillyNavigation.txt b/PatternSkin/data/System/PatternSkinThemeFatWillyNavigation.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1300477710" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1328484070" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkinFatwillyTheme"}%
 ---+!! <nop>PatternSkin theme: Foswiki "Fat Willy" Site Skin - Navigation
 
@@ -22,15 +22,15 @@ Include meta navigation with:
 }%
 %INCLUDE{
     "%TOPIC%" section="topbarbutton"
-    ID="" DESTWEB="System" DESTTOPIC="WebHome" LABEL="Documentation"
+    ID="" DESTWEB="Blog" DESTTOPIC="WebHome" LABEL="Blog"
 }%
 %INCLUDE{
     "%TOPIC%" section="topbarbutton"
     ID="" DESTWEB="Extensions" DESTTOPIC="WebHome" LABEL="Extensions"
 }%
 %INCLUDE{
     "%TOPIC%" section="topbarbutton"
-    ID="" DESTWEB="Support" DESTTOPIC="WebHome" LABEL="Support"
+    ID="" DESTWEB="System" DESTTOPIC="WebHome" LABEL="Documentation"
 }%
 %INCLUDE{
     "%TOPIC%" section="topbarbutton"
@@ -48,6 +48,10 @@ Include meta navigation with:
     "%TOPIC%" section="topbarbutton"
     ID="" DESTWEB="Download" DESTTOPIC="WebHome" LABEL="Download"
 }%
+%INCLUDE{
+    "%TOPIC%" section="topbarbutton"
+    ID="" DESTWEB="Support" DESTTOPIC="WebHome" LABEL="Support"
+}%
 </ul><div class="foswikiClear"></div></div>%ENDSECTION{"main"}%
 
 

diff --git a/core/data/System/PreferenceSettings.txt b/core/data/System/PreferenceSettings.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1318089897" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1328243172" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminToolsCategory"}%
 
 #SettingPrefs
@@ -18,7 +18,7 @@ Preferences can be defined in a number of places:
    1 In user topics, if the user has one (yours is [[%WIKIUSERNAME%]])
    1 In (some) plugin documentation topics
    1 In the topic being accessed
-=Set= statements which occur at higher-numbered locations override macros of the same name defined at lower numbered levels, _unless the macro was listed in a FINALPREFERENCES setting (finalised) at a lower-numbered level._ In this case, the macro is locked to the value at that level; =Set= statements at higher-numbered levels are ignored.</blockquote>
+=Set= statements which occur at higher-numbered locations override macros of the same name defined at lower numbered levels, _unless the macro was listed in a FINALPREFERENCES setting (finalised) at a lower-numbered level._ In this case, the macro is locked to the value at that level; =Set= statements at higher-numbered levels are ignored.
 
 %I% Preference settings can easily be disabled with a # sign. Example:%BR%
    <verbatim class="tml">   * #Set DENYWEBCHANGE = %USERSWEB%.UnknownUser</verbatim>