Fix sample-config.php. 1: Include scripts with that will work in a wikifarm (PITS:01055). 2: add sample call to xlpage-utf-8.php (PITS:01066)

git-svn-id: svn://pmwiki.org/pmwiki/trunk@2285 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 13 insertions, 10 deletions

diff --git a/docs/sample-config.php b/docs/sample-config.php
index 95d50152..f1875425 100644
--- a/docs/sample-config.php
+++ b/docs/sample-config.php
@@ -1,9 +1,9 @@
 <?php if (!defined('PmWiki')) exit();
 ##  This is a sample config.php file.  To use this file, copy it to
 ##  local/config.php, then edit it for whatever customizations you want.
-##  Also, be sure to take a look at http://www.pmichaud.com/wiki/Cookbook
+##  Also, be sure to take a look at http://www.pmwiki.org/wiki/Cookbook
 ##  for more details on the types of customizations that can be added
-##  to PmWiki.  
+##  to PmWiki.
 
 ##  $WikiTitle is the name that appears in the browser's title bar.
 $WikiTitle = 'PmWiki';
@@ -37,6 +37,9 @@ $WikiTitle = 'PmWiki';
 ## and PmWiki.PasswordsAdmin.
 # $DefaultPasswords['admin'] = crypt('secret');
 
+## Unicode (UTF-8) allows the display of all languages and all alphabets.
+# include_once("$FarmD/scripts/xlpage-utf-8.php");}
+
 ## If you're running a publicly available site and allow anyone to
 ## edit without requiring a password, you probably want to put some
 ## blocklists in place to avoid wikispam.  See PmWiki.Blocklist.
@@ -49,7 +52,7 @@ $WikiTitle = 'PmWiki';
 
 ##  To enable markup syntax from the Creole common wiki markup language
 ##  (http://www.wikicreole.org/), include it here:
-# include_once('scripts/creole.php');
+# include_once("$FarmD/scripts/creole.php");
 
 ##  Some sites may want leading spaces on markup lines to indicate
 ##  "preformatted text blocks", set $EnableWSPre=1 if you want to do
@@ -63,7 +66,7 @@ $WikiTitle = 'PmWiki';
 ##  You'll also need to set a default upload password, or else set
 ##  passwords on individual groups and pages.  For more information
 ##  see PmWiki.UploadsAdmin.
-# $EnableUpload = 1;                       
+# $EnableUpload = 1;
 # $DefaultPasswords['upload'] = crypt('secret');
 
 ##  Setting $EnableDiag turns on the ?action=diag and ?action=phpinfo
@@ -101,14 +104,14 @@ $WikiTitle = 'PmWiki';
 
 ##  The refcount.php script enables ?action=refcount, which helps to
 ##  find missing and orphaned pages.  See PmWiki.RefCount.
-# if ($action == 'refcount') include_once('scripts/refcount.php');
+# if ($action == 'refcount') include_once("$FarmD/scripts/refcount.php");
 
 ##  The feeds.php script enables ?action=rss, ?action=atom, ?action=rdf,
 ##  and ?action=dc, for generation of syndication feeds in various formats.
-# if ($action == 'rss') include_once('scripts/feeds.php');   # RSS 2.0
-# if ($action == 'atom') include_once('scripts/feeds.php');  # Atom 1.0
-# if ($action == 'dc') include_once('scripts/feeds.php');    # Dublin Core
-# if ($action == 'rdf') include_once('scripts/feeds.php');   # RSS 1.0
+# if ($action == 'rss')  include_once("$FarmD/scripts/feeds.php");  # RSS 2.0
+# if ($action == 'atom') include_once("$FarmD/scripts/feeds.php");  # Atom 1.0
+# if ($action == 'dc')   include_once("$FarmD/scripts/feeds.php");  # Dublin Core
+# if ($action == 'rdf')  include_once("$FarmD/scripts/feeds.php");  # RSS 1.0
 
 ##  In the 2.2.0-beta series, {$var} page variables are absolute by
 ##  default, but a future version will make them relative.  This setting
@@ -134,7 +137,7 @@ $EnableRelativePageVars = 1;
 ##  are turned into links, uncomment the line below.  See PmWiki.UrlApprovals.
 ##  Also, setting $UnapprovedLinkCountMax limits the number of unapproved
 ##  links that are allowed in a page (useful to control wikispam).
-# include_once('scripts/urlapprove.php');
+# include_once("$FarmD/scripts/urlapprove.php");
 # $UnapprovedLinkCountMax = 10;
 
 ##  The following lines make additional editing buttons appear in the