Merge commit 'smcv/aggregateinternal' into aggregateinternal

Conflicts:

	doc/plugins/aggregate.mdwn

diff --cc doc/plugins/aggregate.mdwn
index d87e33ab93aec8be9e6d49254231696459d00cb0,8c2e7b076aa654f6e415d803a6e53d21abb380f7..ecca0232ea0aacbac18a451dc3446a10d27787f5
--- 1/doc/plugins/aggregate.mdwn
--- 2/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@@@ -100,9 -100,8 +100,8 @@@ you should follow this process
     in those PageSpecs. For example, if the PageSpec was `foo/*`, it should
     be changed to `internal(foo/*)`. This has to be done because internal
     pages are not matched by regular globs.
 -2. Use [[ikiwiki-transition]] to rename all existing aggregated `.html`
 -   files in the input directory, and delete the corresponding files from
 -   the output directory. The command to run is
 -   `ikiwiki-transition aggregateinternal $setupfile`
 -3. Turn on `aggregateinternal` in the setup file and rebuild the wiki.
 +2. Turn on `aggregateinternal` in the setup file.
- 3. Use [[ikiwiki-transition]] to move all existing aggregated `.html`
-    files. The command to run is `ikiwiki-transition aggregateinternal $srcdir`,
-    or if you have changed the `htmlext` option to something other than "html",
-    `ikiwiki-transition aggregateinternal $srcdir $htmlext`
++3. Use [[ikiwiki-transition]] to rename all existing aggregated `.html`
++   files in the srcdir. The command to run is
++   `ikiwiki-transition aggregateinternal $setupfile`,
 +4. Refresh the wiki. (`ikiwiki -setup your.setup -refresh`)

diff --cc doc/todo/aggregate_to_internal_pages.mdwn
index 7eddc589131fc7a8e8a91fac2de6533b8bba9c34,ee3aee17a7f1be6abda9a5b4ce42e56988010273..38427133f006e73338bf426eafde5a822eaa89e2
--- 1/doc/todo/aggregate_to_internal_pages.mdwn
--- 2/doc/todo/aggregate_to_internal_pages.mdwn
+++ b/doc/todo/aggregate_to_internal_pages.mdwn
@@@ -53,7 -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]]