summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-01 14:47:49 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-01 14:47:49 -0400
commit7308f3da5bf2518f5a9659c7de6212ed5648f27b (patch)
tree936d32ce3678e49588325d836af29604af1ddf62
parent872e7425e49742e4f89de547f392d74575aac800 (diff)
parente21b190be2b306823950ca98e228417bf655f833 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn8
-rw-r--r--doc/todo/softlinks.mdwn2
2 files changed, 2 insertions, 8 deletions
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 999ddfd6c..b4a7cd5d6 100644
--- 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 af99a9f82..9c5e3fac1 100644
--- 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]]