diff --git a/core/data/TWiki/CompleteDocumentation.txt b/core/data/TWiki/CompleteDocumentation.txt index 2d2aa5b21c..0ae012dd81 100644 --- a/core/data/TWiki/CompleteDocumentation.txt +++ b/core/data/TWiki/CompleteDocumentation.txt @@ -18,7 +18,7 @@ __Related Topics:__ TWikiSite, ReleaseHistory, EnhancementRequests, UserDocument [[#PageTop][Back to top]] ------ -%INCLUDE{"TWikiUpgradeGuide"}% +%INCLUDE{"UpgradeGuide"}% [[#PageTop][Back to top]] diff --git a/core/data/TWiki/InstallationGuide.txt b/core/data/TWiki/InstallationGuide.txt index 7811226dd8..70c63d50c1 100644 --- a/core/data/TWiki/InstallationGuide.txt +++ b/core/data/TWiki/InstallationGuide.txt @@ -4,9 +4,9 @@ *The following is installation instructions for the TWiki 4.2 production release on an Apache web server on Linux.* Visit TWiki:TWiki.InstallingTWiki for the latest updates to this guide and supplemental information for installing or upgrading TWiki, including notes on installing TWiki on different platforms, environments and web hosting sites. -If you are upgrading from a previous version of TWiki, you probably want to read =TWikiUpgradeGuide= instead. +If you are upgrading from a previous version of TWiki, you probably want to read =UpgradeGuide= instead. -Both this document and the !TWikiUpgradeGuide are also available in the root of the distribution as HTML files. For this reason links to pages inside your own TWiki are written like =%SYSTEMWEB%.WebHome= and not like live web links. +Both this document and the !UpgradeGuide are also available in the root of the distribution as HTML files. For this reason links to pages inside your own TWiki are written like =%SYSTEMWEB%.WebHome= and not like live web links. %TOC% @@ -20,7 +20,7 @@ While this installation guide specifically describes installation on an Apache w If you are installing TWiki without Unix/Linux root (administrator) priviledges (for example, on a hosted domain), see "Notes on Installing TWiki on Non-Root Account" below for supplemental instructions to the basic steps presented below. -If you are upgrading from an earlier major version of TWiki such as Cairo (TWiki 3) you will need the information found in TWiki:TWiki.TWikiUpgradeGuide. There is also a static HTML =TWikiUpgradeGuide.html= included in the root of your TWiki distribution. +If you are upgrading from an earlier major version of TWiki such as Cairo (TWiki 3) you will need the information found in TWiki:TWiki.UpgradeGuide. There is also a static HTML =UpgradeGuide.html= included in the root of your TWiki distribution. Upgrading from a recent TWiki4 release is much simpler. Upgraders from earlier TWiki4 versions can follow the steps described in TWiki:TWiki.UpgradingTWiki04x00PatchReleases to ensure a safe upgrade without accidently overwriting customizations. diff --git a/core/data/TWiki/ReferenceManual.txt b/core/data/TWiki/ReferenceManual.txt index 9c59321973..0570cdffcc 100644 --- a/core/data/TWiki/ReferenceManual.txt +++ b/core/data/TWiki/ReferenceManual.txt @@ -10,7 +10,7 @@ All manual sections in one big page: Manual sections in separate pages: 1. [[TWikiSystemRequirements][System Requirements]] 1. [[InstallationGuide][Installation Guide]] - 1. [[TWikiUpgradeGuide][Upgrade Guide]] + 1. [[UpgradeGuide][Upgrade Guide]] 1. [[UserAuthentication][User Authentication]] 1. [[AccessControl][Access Control]] 1. [[TextFormattingRules][Formatting Rules]] diff --git a/core/data/TWiki/TWikiUpgradeGuide.txt b/core/data/TWiki/UpgradeGuide.txt similarity index 100% rename from core/data/TWiki/TWikiUpgradeGuide.txt rename to core/data/TWiki/UpgradeGuide.txt diff --git a/core/index.html b/core/index.html index 18e9d3643e..d1fe4ea965 100644 --- a/core/index.html +++ b/core/index.html @@ -1818,7 +1818,7 @@

Welcome to TWiki

  • LICENSE
  • Installation Guide
  • Configure TWiki
    • -
  • TWiki Upgrade Guide
    • +
  • Upgrade Guide
  • TWiki-4.2 Release Notes

    • Note: These pages do not need to be accessible by browsers. Preventing access will increase security and will not affect TWiki in any way.

    diff --git a/core/lib/TWiki/Contrib/core/MANIFEST b/core/lib/TWiki/Contrib/core/MANIFEST index a8d347d5b3..8d92e0aff0 100644 --- a/core/lib/TWiki/Contrib/core/MANIFEST +++ b/core/lib/TWiki/Contrib/core/MANIFEST @@ -86,7 +86,7 @@ data/Sandbox/WebSearch.txt 0644 data/Sandbox/WebSearchAdvanced.txt 0644 data/Sandbox/WebStatistics.txt 0644 data/Sandbox/WebTopicList.txt 0644 -data/TWiki/AccessControl.txt 0660 +data/TWiki/AccessControl.txt 0644 data/TWiki/AccessKeys.txt 0644 data/TWiki/AdminDocumentationCategory.txt 0644 data/TWiki/AdminSkillsAssumptions.txt 0644 @@ -96,7 +96,7 @@ data/TWiki/AppendixEncodeURLsWithUTF8.txt 0644 data/TWiki/BeginnersStartHere.txt 0644 data/TWiki/BookView.txt 0644 data/TWiki/BumpyWord.txt 0644 -data/TWiki/CascadingStyleSheets.txt 0660 +data/TWiki/CascadingStyleSheets.txt 0644 data/TWiki/CategoryCategory.txt 0644 data/TWiki/ClassMethod.txt 0644 data/TWiki/CompleteDocumentation.txt 0644 @@ -109,18 +109,18 @@ data/TWiki/DeleteOrRenameAnAttachment.txt 0644 data/TWiki/DeveloperDocumentationCategory.txt 0644 data/TWiki/DocumentGraphics.txt 0644 data/TWiki/DontNotify.txt 0644 -data/TWiki/DownloadSources.txt 0660 +data/TWiki/DownloadSources.txt 0644 data/TWiki/EditDoesNotIncreaseTheRevision.txt 0644 data/TWiki/EditingShorthand.txt 0644 data/TWiki/EnhancementRequests.txt 0644 data/TWiki/ExampleTopicTemplate.txt 0644 -data/TWiki/FaqTemplate.txt 0660 +data/TWiki/FaqTemplate.txt 0644 data/TWiki/FormatTokens.txt 0644 data/TWiki/FileAttachment.txt 0644 data/TWiki/FileAttribute.txt 0644 data/TWiki/ForceNewRevision.txt 0644 data/TWiki/FormattedSearch.txt 0644 -data/TWiki/FrequentlyAskedQuestions.txt 0660 +data/TWiki/FrequentlyAskedQuestions.txt 0664 data/TWiki/GlossaryOfTerms.txt 0644 data/TWiki/GnuGeneralPublicLicense.txt 0644 data/TWiki/GoBox.txt 0644 @@ -130,7 +130,7 @@ data/TWiki/HierarchicalNavigation.txt 0644 data/TWiki/HierarchicalNavigationChildExample.txt 0644 data/TWiki/IfStatements.txt 0644 data/TWiki/IncludeTopicsAndWebPages.txt 0644 -data/TWiki/InstallationGuide.txt 0660 +data/TWiki/InstallationGuide.txt 0644 data/TWiki/InstalledPlugins.txt 0644 data/TWiki/InstantEnhancements.txt 0644 data/TWiki/JavascriptFiles.txt 0644 @@ -165,7 +165,7 @@ data/TWiki/SimultaneousEdits.txt 0644 data/TWiki/SiteChanges.txt 0644 data/TWiki/SiteMap.txt 0644 data/TWiki/SitePermissions.txt 0644 -data/TWiki/Skins.txt 0660 +data/TWiki/Skins.txt 0644 data/TWiki/SkinTemplates.txt 0644 data/TWiki/StandardColors.txt 0644 data/TWiki/StartingPoints.txt 0644 @@ -181,7 +181,6 @@ data/TWiki/TWikiSiteTools.txt 0644 data/TWiki/TWikiSkinBrowser.txt 0644 data/TWiki/TWikiSystemRequirements.txt 0644 data/TWiki/TWikiTopics.txt 0644 -data/TWiki/TWikiUpgradeGuide.txt 0644 data/TWiki/TWikiUserAuthentication.txt 0644 data/TWiki/TWikiWebsTable.txt 0644 data/TWiki/TemplateWeb.txt 0644 @@ -190,6 +189,7 @@ data/TWiki/TextFormattingFAQ.txt 0644 data/TWiki/TextFormattingRules.txt 0644 data/TWiki/TimBernersLee.txt 0644 data/TWiki/TimeSpecifications.txt 0644 +data/TWiki/UpgradeGuide.txt 0644 data/TWiki/UserDocumentationCategory.txt 0644 data/TWiki/UsersGuide.txt 0644 data/TWiki/UserToolsCategory.txt 0644 diff --git a/core/tools/TWikiKernel/MANIFEST b/core/tools/TWikiKernel/MANIFEST index 2834310b0a..3471843ec7 100644 --- a/core/tools/TWikiKernel/MANIFEST +++ b/core/tools/TWikiKernel/MANIFEST @@ -164,7 +164,6 @@ data/TWiki/TWikiSiteTools.txt 0660 data/TWiki/TWikiSkinBrowser.txt 0660 data/TWiki/TWikiSystemRequirements.txt 0660 data/TWiki/TWikiTopics.txt 0660 -data/TWiki/TWikiUpgradeGuide.txt 0660 data/TWiki/TWikiUpgradeTo01Dec2000.txt 0660 data/TWiki/TWikiUpgradeTo01Dec2001.txt 0660 data/TWiki/TWikiUpgradeTo01Feb2003.txt 0660 @@ -178,6 +177,7 @@ data/TWiki/TextFormattingFAQ.txt 0660 data/TWiki/TextFormattingRules.txt 0660 data/TWiki/TimBernersLee.txt 0660 data/TWiki/TimeInterval.txt 0660 +data/TWiki/UpgradeGuide.txt 0660 data/TWiki/UserDocumentationCategory.txt 0660 data/TWiki/UserForm.txt 0660 data/TWiki/UsersGuide.txt 0660 diff --git a/core/tools/build.pl b/core/tools/build.pl index e9baddd3bb..71c160d516 100755 --- a/core/tools/build.pl +++ b/core/tools/build.pl @@ -253,7 +253,7 @@ sub stage_gendocs { # print `cd $this->{basedir}/bin ; ./view TWiki.CompleteDocumentation skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/CompleteDocumentation.html`; print `cd $this->{basedir}/bin ; ./view TWiki.ReleaseHistory skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/ReleaseHistory.html`; print `cd $this->{basedir}/bin ; ./view TWiki.ReleaseNotes01x00 skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/ReleaseNotes01x00.html`; - print `cd $this->{basedir}/bin ; ./view TWiki.TWikiUpgradeGuide skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/TWikiUpgradeGuide.html`; + print `cd $this->{basedir}/bin ; ./view TWiki.UpgradeGuide skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/UpgradeGuide.html`; print `cd $this->{basedir}/bin ; ./view TWiki.InstallationGuide skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/INSTALL.html`; $this->filter_txt("$this->{tmpDir}/ReleaseNotes01x00.html", "$this->{tmpDir}/ReleaseNotes01x00.html"); print "Automatic documentation built\n"; diff --git a/core/tools/pkg/debian/index.html b/core/tools/pkg/debian/index.html index 18e9d3643e..d1fe4ea965 100755 --- a/core/tools/pkg/debian/index.html +++ b/core/tools/pkg/debian/index.html @@ -1818,7 +1818,7 @@

    Welcome to TWiki

  • LICENSE
  • Installation Guide
  • Configure TWiki
    • -
  • TWiki Upgrade Guide
    • +
  • Upgrade Guide
  • TWiki-4.2 Release Notes

    • Note: These pages do not need to be accessible by browsers. Preventing access will increase security and will not affect TWiki in any way.