Merge remote branch 'remotes/origin/master'

[ikiwiki.git] / doc / plugins / contrib / default_content_for___42__copyright__42___and___42__license__42__.mdwn

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 5e3db3d7c4ddae958c8dd8da7d2e93e1736035fc..7b7cd9ccddc57b2c91dc9a821c62629cf5d223d1 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
@@ -10,6 +10,8 @@ so I'm now publishing them here.
 and
 [`license.pm`](http://www.schwinge.homeip.net/~thomas/tmp/license.pm)
 
+> These links are dead
+
 Usage instructions are found inside the two plugin files.
 
 --[[tschwinge]]
@@ -39,3 +41,9 @@ I'm missing something terribly obvious? --Peter
 By the way: these need not be *HTML* files; `copyright.mdwn`,
 respectively `license.mdwn`, or every other format supported
 by ikiwiki are likewise fine.  --[[tschwinge]]
+
+> Jon has done something similar in [[todo/allow_site-wide_meta_definitions]];
+> his version has the advantages that it doesn't invent magical page names,
+> and can extend beyond just copyright and license, but has the disadvantage
+> that it doesn't support setting defaults for a given "subdirectory"
+> only. --[[smcv]]