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

diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
index 999ddfd6cb247a5b67f8e5bcd1b6d563535a0729..b4a7cd5d6857c7de39e8b9b992cd04d70a6337ba 100644 (file)
--- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
+++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
@@ -9,14 +9,6 @@ so I'm now publishing them here.
 <http://www.schwinge.homeip.net/~thomas/tmp/copyright.pm>
 <http://www.schwinge.homeip.net/~thomas/tmp/license.pm>
 
-/!\ Note that there is still an issue to be resolved with these plugins: have a look at
-[tmpfs](http://www.bddebian.com/~wiki/hurd/translator/tmpfs/).  There are two inlined pages,
-[tmpfs-notes\_bing](http://www.bddebian.com/~wiki/hurd/translator/tmpfs/notes_bing/) and
-[tmpfs-notes\_various](http://www.bddebian.com/~wiki/hurd/translator/tmpfs/notes_various/).
-Compare the *copyright* and *license* information of the inlined pages on *tmpfs* to those
-on the source pages, *tmpfs-notes_bing* and *tmpfs-notes_various*.
-They are different, but shouldn't be.
-
 --[[tschwinge]]
 
 I was asking about this in IRC the other day, but someone pointed me at the

diff --git a/doc/todo/softlinks.mdwn b/doc/todo/softlinks.mdwn
index af99a9f821bc5c34f847e1169b175ecd5762e60d..9c5e3fac15d19e1f3903aae531bb7bbdde6de9e0 100644 (file)
--- a/doc/todo/softlinks.mdwn
+++ b/doc/todo/softlinks.mdwn
@@ -10,3 +10,5 @@ Could softlinks be handled gracefully by ikiwiki?
 > another.  -- [[Will]]
 
 >> Will is right. I don't plan to support symlinks. [[done]] --[[Joey]]
+
+>> With the appropriate template, inline can also help copy pages around [[DavidBremner]]