new txt plugin, was previously contrib/plaintext

6 files changed, 19 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index 251761633..d92d5fa1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ ikiwiki (2.51) UNRELEASED; urgency=low
   * aggregate: Add template parameter.
   * Add support for the universal edit button <http://universaleditbutton.org/>
     (To get this on all pages of an exiting wiki, rebuild the wiki.)
+  * txt: New plugin, contributed by Gabriel McManus.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Jun 2008 15:03:33 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 2a7bbedf5..d25e0861a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -96,6 +96,10 @@ Files: creole.pm
 Copyright: Copyright (C) 2008 Bernd Zeimetz <bernd@bzed.de>
 License: GPL-2+
 
+Files: txt.pm
+Copyright: Copyright (C) 2008 Gabriel McManus <gmcmanus@gmail.com>
+License: GPL-2+
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
diff --git a/doc/plugins/contrib/plaintext.mdwn b/doc/plugins/contrib/plaintext.mdwn
deleted file mode 100644
index 0350bc3ca..000000000
--- a/doc/plugins/contrib/plaintext.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-[[template id=plugin name=plaintext author="[[JeremieKoenig]]"]]
-[[tag type/format]]
-
-I was surprised that no plugin seems to be available to render plaintext pages;
-as I need one to implement the "[[todo/preview_changes]]" todo item,
-I quickly wrote it. Maybe this can be included in ikiwiki?
-
-This plugins uses HTML::Entities::encode_entities() on the page's content
-and wraps it in a `<pre>`...`</pre>` tag.
-
-Download from [here](http://www.jk.fr.eu.org/ikiwiki/plaintext.pm).
-
-## Problems
-
-Wikilinks are expanded as usual, and as such produce `<a href=...>text</a>`
-tags, which are displayed as plain text. Is there a way to disable the preprocessor
-for some types of pages?
\ No newline at end of file
diff --git a/doc/plugins/plaintext/.discussion.mdwn.swp b/doc/plugins/plaintext/.discussion.mdwn.swp
new file mode 100644
index 000000000..df2347f9e
--- /dev/null
+++ b/doc/plugins/plaintext/.discussion.mdwn.swp
diff --git a/doc/plugins/contrib/plaintext/discussion.mdwn b/doc/plugins/plaintext/discussion.mdwn
index 6b907e65c..6b907e65c 100644
--- a/doc/plugins/contrib/plaintext/discussion.mdwn
+++ b/doc/plugins/plaintext/discussion.mdwn
diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn
new file mode 100644
index 000000000..8d8cb55c2
--- /dev/null
+++ b/doc/plugins/txt.mdwn
@@ -0,0 +1,14 @@
+[[template id=plugin name=txt author="[[Gabriel]]"]]
+[[tag type/format]]
+
+This plugin makes ikiwiki treat files with names ending in ".txt"
+as wiki pages.
+
+Unlike other [[type/format]] plugins, no formatting of markup in 
+txt files is done; the file contents is displayed to the user as-is,
+with html markup characters such as ">" escaped.
+
+The only exceptions are that [[WikiLinks|WikiLink]] and
+[[PreprocessorDirectives|PreprocessorDirective]] are still expanded by
+ikiwiki, and that, if the [[cpan URI::Find]] perl module is installed, URLs
+in the txt file are converted to hyperlinks.