aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/COPYING.txt2
-rw-r--r--docs/UPGRADE.txt100
-rw-r--r--docs/sample-config.php1
3 files changed, 51 insertions, 52 deletions
diff --git a/docs/COPYING.txt b/docs/COPYING.txt
index 5b6e7c66..881874c0 100644
--- a/docs/COPYING.txt
+++ b/docs/COPYING.txt
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/docs/UPGRADE.txt b/docs/UPGRADE.txt
index 4d88c0c5..faaf9f91 100644
--- a/docs/UPGRADE.txt
+++ b/docs/UPGRADE.txt
@@ -1,50 +1,50 @@
-This UPGRADE.txt file is a command-line syntax reminder for
-experienced PmWiki administrators. For full documentation on
-upgrading Pmwiki, see the bundled PmWiki.Upgrades page or visit
-
- http://www.pmwiki.org/wiki/PmWiki/Upgrades
-
-See also these related pages:
-
- http://www.pmwiki.org/wiki/PmWiki/BackupAndRestore
- http://www.pmwiki.org/wiki/PmWiki/Subversion
-
-The examples assume your PmWiki site is in a ./pmwiki/
-directory (a directory named "pmwiki" immediately below the
-working directory).
-
-Backing up (always a good idea!):
-
- tar -zcvf ~/pmwiki-backup.tar.gz pmwiki
- zip -9r ~/pmwiki-backup.zip pmwiki
-
-Or, to keep backups organized by date:
-
- tar -zcvf ~/pmwiki-site-`date +%Y%m%d%M`.tar.gz pmwiki
- zip -9r ~/pmwiki-site-`date +%Y%m%d%M`.zip pmwiki
-
-The latest release is available here:
-
- http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
- http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.zip
-
-Example download commands:
-
- wget http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
- lftpget http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
- links http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
- lynx http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
-
-Expanding the archive:
-
- tar -zxvf pmwiki-latest.tgz # for the gzipped tarball
- unzip pmwiki-latest.zip # for the .zip archive
-
-Copying the files (two ways to do it):
-
- cp -av pmwiki-2.1.x/. pmwiki
- cp -Rpv pmwiki-2.1.x/. pmwiki
-
-Subversion upgrade:
-
- svn export svn://pmwiki.org/pmwiki/tags/latest pmwiki --force
+This UPGRADE.txt file is a command-line syntax reminder for
+experienced PmWiki administrators. For full documentation on
+upgrading Pmwiki, see the bundled PmWiki.Upgrades page or visit
+
+ http://www.pmwiki.org/wiki/PmWiki/Upgrades
+
+See also these related pages:
+
+ http://www.pmwiki.org/wiki/PmWiki/BackupAndRestore
+ http://www.pmwiki.org/wiki/PmWiki/Subversion
+
+The examples assume your PmWiki site is in a ./pmwiki/
+directory (a directory named "pmwiki" immediately below the
+working directory).
+
+Backing up (always a good idea!):
+
+ tar -zcvf ~/pmwiki-backup.tar.gz pmwiki
+ zip -9r ~/pmwiki-backup.zip pmwiki
+
+Or, to keep backups organized by date:
+
+ tar -zcvf ~/pmwiki-site-`date +%Y%m%d%M`.tar.gz pmwiki
+ zip -9r ~/pmwiki-site-`date +%Y%m%d%M`.zip pmwiki
+
+The latest release is available here:
+
+ http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
+ http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.zip
+
+Example download commands:
+
+ wget http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
+ lftpget http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
+ links http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
+ lynx http://www.pmichaud.com/pub/pmwiki/pmwiki-latest.tgz
+
+Expanding the archive:
+
+ tar -zxvf pmwiki-latest.tgz # for the gzipped tarball
+ unzip pmwiki-latest.zip # for the .zip archive
+
+Copying the files (two ways to do it):
+
+ cp -av pmwiki-2.1.x/. pmwiki
+ cp -Rpv pmwiki-2.1.x/. pmwiki
+
+Subversion upgrade:
+
+ svn export svn://pmwiki.org/pmwiki/tags/latest pmwiki --force
diff --git a/docs/sample-config.php b/docs/sample-config.php
index c519503f..89c07d07 100644
--- a/docs/sample-config.php
+++ b/docs/sample-config.php
@@ -158,4 +158,3 @@ include_once("scripts/xlpage-utf-8.php");
# $GUIButtons['table'] = array(600,
# '||border=1 width=80%\\n||!Hdr ||!Hdr ||!Hdr ||\\n|| || || ||\\n|| || || ||\\n', '', '',
# '$GUIButtonDirUrlFmt/table.gif"$[Table]"');
-