From 165cf333db8ce6374c2f67389ccad3bec8459e11 Mon Sep 17 00:00:00 2001 From: PeterThoeny Date: Thu, 16 Jan 2003 07:35:00 +0000 Subject: [PATCH] none --- TWiki/IncludeTopicsAndWebPages.mdwn | 15 ++++++--------- TWiki/TWikiInstallationGuide.mdwn | 2 +- TWiki/TWikiSystemRequirements.mdwn | 19 ++++++++++++++----- TWiki/WebHome.mdwn | 2 +- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/TWiki/IncludeTopicsAndWebPages.mdwn b/TWiki/IncludeTopicsAndWebPages.mdwn index 7a4eba4..8b96732 100644 --- a/TWiki/IncludeTopicsAndWebPages.mdwn +++ b/TWiki/IncludeTopicsAndWebPages.mdwn @@ -1,4 +1,4 @@ -**Include Topics and Web Pages Using **%INCLUDE\{...\}%** Variable** +# Include Topics and Web Pages Using **%INCLUDE\{...\}%** Variable Use the **%INCLUDE\{...\}%** variable to embed the content of another topic or web page inside a %WIKITOOLNAME% topic. The whole content or only parts of a page can be included. @@ -35,31 +35,28 @@ Use the **%INCLUDE\{...\}%** variable to embed the content of anoth ### 1. Display regression test results in a TWiki page
-      %INCLUDEURL{"http://domain/~qa/v1.1/REDTest.log.txt"}%
+      %INCLUDE{"http://domain/~qa/v1.1/REDTest.log.txt"}%
       
### 2. Display Yahoo's robot.txt file - You type: - - **%INCLUDE\{"http://www.yahoo.com/robots.txt"\}%**
-- You get: - - %INCLUDE{"http://www.yahoo.com/robots.txt"}% + - **%INCLUDE\{"http://www.yahoo.com/robots.txt"\}%** ### 3. Display the SUNW stock quote in a TWiki page - You type: - - **SUNW: %INCLUDE\{"http://finance.yahoo.com/q?s=SUNW&d=v1&o=t" pattern="^.\*?>SUNW</a>[^<]+(.\*?)\\s+\\S+\\s+<small.\*"\}%**
+ - **SUNW: %INCLUDE\{"http://finance.yahoo.com/q?s=SUNW&d=v1&o=t" pattern="^.\*?>SUNW</a>[^<]+(.\*?)\\s+\\S+\\s+<small.\*"\}%** - You get: - SUNW: ### 4. Display the temperature in San Francisco - You type: - - **San Francisco: %INCLUDE\{"http://weather.yahoo.com/forecast/San\_Francisco\_CA\_US\_f.html" pattern="^.\*?([0-9]+\\&ordm\\;F).\*"\}%**
+ - **San Francisco: %INCLUDE\{"http://weather.yahoo.com/forecast/San\_Francisco\_CA\_US\_f.html" pattern="^.\*?([0-9]+\\&ordm\\;F).\*"\}%** - You get: - San Francisco: See also other [[TWikiVariables]]. --- [[PeterThoeny]] - 25 Jun 2001
+-- [[PeterThoeny]] - 15 Jan 2003 diff --git a/TWiki/TWikiInstallationGuide.mdwn b/TWiki/TWikiInstallationGuide.mdwn index de47081..fa1ba3f 100644 --- a/TWiki/TWikiInstallationGuide.mdwn +++ b/TWiki/TWikiInstallationGuide.mdwn @@ -27,7 +27,7 @@ _Installation instructions for the TWiki 01-Dec-2001 production release. Update notes for the new RCS configuration are marked_ **_Dataframework_**. -These installation steps are based on the **Apache** web server on **Linux**. TWiki runs on other web servers and Unix systems, and should be fine with any web server and OS that meet the [[system requirements|Main/TWikiImplementationNotes]]. Documentation for other platforms is somewhat limited: +These installation steps are based on the **Apache** web server on **Linux**. TWiki runs on other web servers and Unix systems, and should be fine with any web server and OS that meet the [[system requirements|Main/TWikiSystemRequirements]]. Documentation for other platforms is somewhat limited: - For Unix or Linux, check TWiki:Codev/TWikiOnUnix and TWiki:Codev/TWikiOnLinux. - For Windows, check the [[WindowsInstallCookbook]]. diff --git a/TWiki/TWikiSystemRequirements.mdwn b/TWiki/TWikiSystemRequirements.mdwn index 3c24cc8..18952b5 100644 --- a/TWiki/TWikiSystemRequirements.mdwn +++ b/TWiki/TWikiSystemRequirements.mdwn @@ -11,7 +11,7 @@ # TWiki System Requirements -_Server and client requirements for TWiki 01-Dec-2001_ +_Server and client requirements for TWiki 01-Feb-2003 (pending release)_ Low client and server requirements are core features that keep TWiki widely deployable, particularly across a range of browser platforms and versions. @@ -30,7 +30,7 @@ TWiki is written in Perl 5, uses a number of shell commands, and requires [RCS ( Perl - 5.005_03 or higher + 5.005_03 or higher (5.6.1 recommended) Non-standard Perl modules @@ -39,19 +39,28 @@ TWiki is written in Perl 5, uses a number of shell commands, and requires [RCS ( RCS - 5.7 or higher + 5.7 or higher (including GNU diff) %BR% Optional, but the all-Perl replacement is not currently recommended for live sites - see TWiki:Codev/RcsLite. + + + GNU diff + GNU diff 2.7 or higher is required when TWiki's uses RCS binaries. %BR% Install on PATH if not included with RCS (check version with diff -v) Other external programs ls, fgrep, egrep + Cron/scheduler + cron + cron equivalents + + Web server - Apache; others (with CGI support, authentication, extended path) + Apache is well supported; for other servers, CGI support, authentication, extended path required -%X% **\*** _Current documentation covers Linux/Apache only. See TWiki:Codev/TWikiOnWindows for work-to-date on a Windows installation guide._ +%X% **\*** _Current documentation mainly covers Linux and Apache installations. See [[WindowsInstallCookbook]] for a Windows installation guide._ diff --git a/TWiki/WebHome.mdwn b/TWiki/WebHome.mdwn index e2e9f78..e145d3b 100644 --- a/TWiki/WebHome.mdwn +++ b/TWiki/WebHome.mdwn @@ -76,7 +76,7 @@ Documentation for webmasters, system administrators, project managers, team
leaders, and all other users of the TWiki advanced online collaboration tool. - **[[TWikiDocumentation]]**: All manual sections in one file... - 1. [[System Requirements|Main/TWikiImplementationNotes]] + 1. [[System Requirements|Main/TWikiSystemRequirements]] 2. [[Installation Guide|Main/TWikiInstallationGuide]] 3. [[Upgrade Guide|Main/TWikiUpgradeGuide]] 4. [[User Authentication|Main/TWikiUserAuthentication]] -- 1.9.4