Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/Makefile.PL b/Makefile.PL
index df677262b367b4a6ba4884f7cb51ec12f0278f3f..c3df9759bff46248728e04397f051ce77736faae 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -67,7 +67,7 @@ myclean: clean
 
 underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
-       for dir in `cd underlays && $(FIND) . -follow -type d ! -regex '.*\.svn.*'`; do \
+       for dir in `cd underlays && $(FIND) . -follow -type d`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f`; do \
                        cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
@@ -102,15 +102,15 @@ underlay_install:
 
 extra_install: underlay_install
        # Install example sites.
-       for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*\.svn.*'`; do \
+       for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done
-       for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*\.svn.*'`; do \
+       for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
                cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
                install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
        done
 
-       for dir in `$(FIND) templates -follow -type d ! -regex '.*\.svn.*'`; do \
+       for dir in `$(FIND) templates -follow -type d`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                for file in `$(FIND) $$dir -follow -maxdepth 1 -type f`; do \
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \

diff --git a/doc/bugs/Error:_OpenID_failure:_time_bad_sig:.mdwn b/doc/bugs/Error:_OpenID_failure:_time_bad_sig:.mdwn
index 8cfc655916c758988a44bc6a0a0fb5f1619cad60..5a9758f1532c533046684475b8e017e3900547f6 100644 (file)
--- a/doc/bugs/Error:_OpenID_failure:_time_bad_sig:.mdwn
+++ b/doc/bugs/Error:_OpenID_failure:_time_bad_sig:.mdwn
@@ -50,3 +50,12 @@ Hmmmmm, looks like it is not entirely fixed.  I am getting it on my own
 I am using custom openid with redirection to myopenid.com.
 Please tell me if you need more info.  The same openid worked fine to login to *this* site to post this.
 -- Anton
+
+> Well, this bug is from 2007. Probably you are not encountering the same
+> bug.
+> 
+> I also have a openid delegation to myopenid, and I can reproduce the
+> problem when logging into your site.
+>
+> What version of the
+> Net::OpenId::Consumer perl library do you have installed? --[[Joey]] 

diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn
index 0847872075951d7466f74761b2ff78b70a2590b3..cb71c0887260c10a9ca9b97910bad2017ccae949 100644 (file)
--- a/doc/tips/html5.mdwn
+++ b/doc/tips/html5.mdwn
@@ -1,6 +1,6 @@
 First, if you just want to embed videos using the html5 `<video>` tag,
 you can do that without switching anything else to html5.
-However, if you want to fully enter the brave new world of html5, read on.
+However, if you want to fully enter the brave new world of html5, read on..
 
 Currently, ikiwiki does not use html5 by default. There is a `html5`
 setting that can be turned on, in your setup file. Rebuild with it set, and

diff --git a/t/crazy-badass-perl-bug.t b/t/crazy-badass-perl-bug.t
index 80724d174d95a53e5f5d5db2b8490b77981f29e8..328a979c2a7158dbfa3d98ea3ea49f2405f71c80 100755 (executable)
--- a/t/crazy-badass-perl-bug.t
+++ b/t/crazy-badass-perl-bug.t
@@ -2,6 +2,8 @@
 # DO NOT CHANGE ANYTHING IN THIS FILE.
 # THe crazy bug reproduced here will go away if any of the calls
 # to htmlize are changed.
+# Note: This was http://bugs.debian.org/376329 , and was fixed in 
+# perl 5.14.
 use warnings;
 use strict;
 use Test::More tests => 102;