Merge commit 'upstream/master' into prv/po

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

diff --git a/doc/todo/aggregate_to_internal_pages.mdwn b/doc/todo/aggregate_to_internal_pages.mdwn
index 017ca242b13493f7451e9e97fff10ef715a868e5..272e146f4f4e0d331f0da79bedd1f29951902a4e 100644 (file)
--- a/doc/todo/aggregate_to_internal_pages.mdwn
+++ b/doc/todo/aggregate_to_internal_pages.mdwn
@@ -53,7 +53,7 @@ change their pagespecs to use `internal()`.
 
 > I've patched ikiwiki-transition to have an aggregateinternal mode.
 > See my aggregateinternal branch, again.
-> "ikiwiki-transition aggregateinternal $srcdir $htmlext" moves the pages around,
+> "ikiwiki-transition aggregateinternal $setupfile" moves the pages around,
 > although it doesn't update the pagespecs (I wouldn't know how...) --[[smcv]]
 
-[[patch]]
+[[!tag patch done]]