diff options
| -rw-r--r-- | doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn | 8 | ||||
| -rw-r--r-- | doc/rcs/git.mdwn | 6 | ||||
| -rw-r--r-- | doc/todo/softlinks.mdwn | 2 |
3 files changed, 3 insertions, 13 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/rcs/git.mdwn b/doc/rcs/git.mdwn index 9b6f2c36a..b210af825 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -17,11 +17,7 @@ shallow, single level tree, with a bare repository (meaning that it does not have a working tree checked out) at the root, and various working clones (with working directories) as leaf nodes. The root (bare) repository is meant to be pushed to and pulled from the various -working clones. The image below displays the relationship between the -root repository and the clone repositories (this is not a directory -layout): - - +working clones. One of the leaf node clone repositories is special; it has working directory which is used to compile the wiki from, and is also used by 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]] |