Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / conditional_underlay_files.mdwn

diff --git a/doc/todo/conditional_underlay_files.mdwn b/doc/todo/conditional_underlay_files.mdwn
index 87f70696bd9b4e7e184d7da9805911ced1426b46..c578bceafacc96ff12f8d2816130ab6715adf61d 100644 (file)
--- a/doc/todo/conditional_underlay_files.mdwn
+++ b/doc/todo/conditional_underlay_files.mdwn
@@ -12,7 +12,7 @@ I can see two good ways to implement this.  Ideally, with
 [[conditional_text_based_on_ikiwiki_features]] available, ikiwiki could
 parse a page like conditionalpages.mdwn, which could contain a set of
 conditional-wrapped page names; that seems like the most elegant and
 [[conditional_text_based_on_ikiwiki_features]] available, ikiwiki could
 parse a page like conditionalpages.mdwn, which could contain a set of
 conditional-wrapped page names; that seems like the most elegant and

-ikiwiki-like approach.  Alternatively, [[/ikiwiki.setup]] could contain a
+ikiwiki-like approach.  Alternatively, ikiwiki.setup could contain a

 Perl-generated exclude option by default; that would work, but it seems
 hackish.
 
 Perl-generated exclude option by default; that would work, but it seems
 hackish.
 


@@ -21,4 +21,9 @@ hackish.
 > plugins were enabled.
 > 
 > Using the conditionals in a page to control what other pages get built
 > plugins were enabled.
 > 
 > Using the conditionals in a page to control what other pages get built

-> feels complex to me, --[[Joey]]
+> feels complex to me.
+> 
+> Instead, this has been implmented as the `add_underlay()` function.
+> [[done]]
+> --[[Joey]]
+