fix bad example of exclude configuration item, and remove some stuff about

it from discussion, since it is indeed documented

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 52b112a44c9e3430425788a6eb2b395f1ffc171d..69162c0e46a7097b317d1d20c6c5f41c96119009 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -81,7 +81,7 @@ use IkiWiki::Setup::Standard {
        discussion => 1,
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.
        discussion => 1,
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.

-       #exclude => qr/\*.wav/,
+       #exclude => qr/*\.wav/,

        # Time format (for strftime)
        #timeformat => '%c',
        # Locale to use. Must be a UTF-8 locale.
        # Time format (for strftime)
        #timeformat => '%c',
        # Locale to use. Must be a UTF-8 locale.

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index d02564ff604519e71e5764180ca67393a0d6be27..6f346a3f19e1b4e9c0ac9b21057f77e563db03d9 100644 (file)
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -188,30 +188,6 @@ Moved to [[bugs]] -- [[Joey]]
 
 ----
 
 
 ----
 

-# wiki\_file\_regexp and RCS ,v files
-
-I have RCS ,v files in my source directory. But get many "skipping bad filename" warnings.
-
-Also I don't see wiki\_file\_regexp documented. Because it is used with $config{wiki\_file\_regexp} I assume it can be set in the ikiwiki.setup.
-I added a comma to it in my IkiWiki.pm in the defaultconfig(). But that was wrong (so I reverted back), because then the ,v files were copied to my www tree.
-
-What is the correct way to include ,v RCS revision files in my source tree without receiving the "bad" messages and without copying over to www tree?
-
--- [[JeremyReed]]
-
-> Add the ,v to the $config{wiki\_file\_prune\_regexps} array. This is how we
-> skip equivilant files from other revision control systems too.
-> --[[Joey]]]
-
->> Okay, I used in my setup configuration:
->>    exclude => qr/\,v$/,
->> I looked in source for the array you mentioned above and noticed the $setup{exclude}. And now I see that is documented.
->> (By the way, the example there doesn't seem correct with a literal asterisk and period wildcard.
->> Maybe it should be qr/\.wav$/,)
->> --[[JeremyReed]]
-
-----
-

 # Textile Plugin
 
 It was trivial, but I put together a plugin that uses the Textile markup
 # Textile Plugin
 
 It was trivial, but I put together a plugin that uses the Textile markup