summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-12 11:58:11 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-12 11:58:11 -0400
commite93ec71748c2014d18375ed11dd28004ecce5df6 (patch)
tree80b9c0d617cb5929fbb0b8184f8d22a1916a800e
parentcbfcaede12f205217aba633a80f53882d5424dc8 (diff)
parentf3b561721bca340baf2fff9a9547480457556afb (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts: doc/todo/aggregate_to_internal_pages.mdwn
-rw-r--r--doc/todo/aggregate_to_internal_pages.mdwn6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/todo/aggregate_to_internal_pages.mdwn b/doc/todo/aggregate_to_internal_pages.mdwn
index 8b848093b..614407c9d 100644
--- a/doc/todo/aggregate_to_internal_pages.mdwn
+++ b/doc/todo/aggregate_to_internal_pages.mdwn
@@ -5,9 +5,9 @@ How to transition to it though? inlines of aggregated content would need to
change their pagespecs to use `internal()`.
> [[patch]] in git://git.debian.org/git/users/smcv/ikiwiki.git, branch "aggregate"; [see also gitweb](http://git.debian.org/?p=users/smcv/ikiwiki.git;a=commit;h=01d7ae803710bb0d84fc8d172fd98fd57fb77e9d). --smcv.pseudorandom.co.uk
+> Migration is a two-step process: first change all your pagespecs to use `internal()`, then add `internalize="yes"` to all your aggregate invocations. --smcv.pseudorandom.co.uk
-> Thanks for working on this, it doesn't solve the transition problems, but
-> at least the feature is implemented.
+> Thanks for working on this.
>
> I see one problem, if internalize is flipped on and there are existing
> aggregated pages, htmlfn will not return the right filename for those
@@ -31,3 +31,5 @@ change their pagespecs to use `internal()`.
> If internal has to be manually enabled, people will forget to. I'd rather
> not have to worry about these bugs in the future. So, I'm thinking flag
> day. --[[Joey]]
+
+[[patch]]