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

diff --git a/Makefile.PL b/Makefile.PL
index 69ba5e5ef6260130fb9a2fd2c4514ae86d409dd3..ef29a950c777b8e3c7b74821790a1b184be28c3b 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -75,7 +75,7 @@ underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        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 -not -name \\*.full.js -not -name \\*.full.css`; do \
+               for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name \\*.full.js ! -name \\*.full.css`; do \
                        cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \

diff --git a/doc/bugs/find_gnuism.mdwn b/doc/bugs/find_gnuism.mdwn
index 89eee78161cf78e0bb79901a33c7ae39756f7373..65ee10657f7a93a0595dd400528f9aa049643402 100644 (file)
--- a/doc/bugs/find_gnuism.mdwn
+++ b/doc/bugs/find_gnuism.mdwn
@@ -3,3 +3,5 @@
 Whoops, somehow missed a spot on the last incarnation of this branch.
 `find -not` doesn't work on NetBSD and `find !` runs equivalently
 for me. Fixed in 9659272e25fac37f896991dab01a05b4f4c85ccb.
+
+> [[done]] --[[Joey]] 

diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn
index 51c320067ef76f10e7980cf0b119441d64ac1f91..ebea43697b8ef745225ffc5ac6e3f8be8a7da2ed 100644 (file)
--- a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn
+++ b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn
@@ -4,7 +4,7 @@ I'd very much like to be able to list my blog posts on a daily basis (used for l
 
 There was some effort to do this as detailed here.
 
-[[http://ikiwiki.info/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin/]]
+[[todo/Set_arbitrary_date_to_be_used_by_calendar_plugin]]
 
 I had a quick go at doing something similar on Debian Stable (Ikiwiki 3.0) but alas my Ikiwiki fu is not strong enough.
 

diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
index 03cbdd86c1c66fdec8126ede029897036f9d8727..d311a1859f66261a16b8296a4fdd7f05156fbca0 100644 (file)
--- a/doc/ikiwiki-calendar.mdwn
+++ b/doc/ikiwiki-calendar.mdwn
@@ -39,7 +39,7 @@ the calendars to highlight the current day.
 
 An example crontab:
 
-       0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion"
+       0 0 * * * ikiwiki-calendar ~/ikiwiki.setup 'posts/* and !*/Discussion'
 
 # TEMPLATES