Skip to content

Commit

Permalink
Item109: Renaming TWikiUpgradeGuide to UpgradeGuide
Browse files Browse the repository at this point in the history
plus a couple of other fixes missed earlier


git-svn-id: http://svn.foswiki.org/trunk@719 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
KennethLavrsen authored and KennethLavrsen committed Nov 16, 2008
1 parent f76737a commit 8644dea
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion core/data/TWiki/CompleteDocumentation.txt
Expand Up @@ -18,7 +18,7 @@ __Related Topics:__ TWikiSite, ReleaseHistory, EnhancementRequests, UserDocument
[[#PageTop][Back to top]]

------
%INCLUDE{"TWikiUpgradeGuide"}%
%INCLUDE{"UpgradeGuide"}%

[[#PageTop][Back to top]]

Expand Down
6 changes: 3 additions & 3 deletions core/data/TWiki/InstallationGuide.txt
Expand Up @@ -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%

Expand All @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion core/data/TWiki/ReferenceManual.txt
Expand Up @@ -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]]
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion core/index.html
Expand Up @@ -1818,7 +1818,7 @@ <h1>Welcome to TWiki</h1>
<li><a href="LICENSE">LICENSE</a></li>
<li><a href="INSTALL.html">Installation Guide</a></li>
<li><a href="bin/configure">Configure TWiki</a></li>
<li><a href="TWikiUpgradeGuide.html">TWiki Upgrade Guide</a></li>
<li><a href="UpgradeGuide.html">Upgrade Guide</a></li>
<li><a href="ReleaseNotes01x00.html">TWiki-4.2 Release Notes</a></li>
</ul>
<p><strong>Note:</strong> These pages do not need to be accessible by browsers. Preventing access will increase security and will not affect TWiki in any way.</p>
Expand Down
16 changes: 8 additions & 8 deletions core/lib/TWiki/Contrib/core/MANIFEST
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/tools/TWikiKernel/MANIFEST
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/tools/build.pl
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion core/tools/pkg/debian/index.html
Expand Up @@ -1818,7 +1818,7 @@ <h1>Welcome to TWiki</h1>
<li><a href="LICENSE">LICENSE</a></li>
<li><a href="INSTALL.html">Installation Guide</a></li>
<li><a href="bin/configure">Configure TWiki</a></li>
<li><a href="TWikiUpgradeGuide.html">TWiki Upgrade Guide</a></li>
<li><a href="UpgradeGuide.html">Upgrade Guide</a></li>
<li><a href="ReleaseNotes01x00.html">TWiki-4.2 Release Notes</a></li>
</ul>
<p><strong>Note:</strong> These pages do not need to be accessible by browsers. Preventing access will increase security and will not affect TWiki in any way.</p>
Expand Down

0 comments on commit 8644dea

Please sign in to comment.