diff options
| author | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2008-07-15 03:24:05 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2008-07-15 03:24:05 +0100 |
| commit | b29d11b3c67533ca7addadb40a818a88cf6b8a84 (patch) | |
| tree | ab632ee5678e82d18d14b805384f0b1b108d9942 /doc | |
| parent | d3008b626ea6130d3b75662725f6f2c412fc71ea (diff) | |
Fix aggregateinternal migration so it skips expired entries, and deletes output
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ikiwiki-transition.mdwn | 2 | ||||
| -rw-r--r-- | doc/plugins/aggregate.mdwn | 8 | ||||
| -rw-r--r-- | doc/todo/aggregate_to_internal_pages.mdwn | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/ikiwiki-transition.mdwn b/doc/ikiwiki-transition.mdwn index 624268d23..3290ca7e9 100644 --- a/doc/ikiwiki-transition.mdwn +++ b/doc/ikiwiki-transition.mdwn @@ -28,7 +28,7 @@ treat these as preprocessor directives and convert them. # aggregateinternal The `aggregateinternal` mode moves pages aggregated by the aggregate plugin -so that the `aggregateinternal` option can be endabled +so that the `aggregateinternal` option can be enabled. # indexdb diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn index 61743a816..8c2e7b076 100644 --- a/doc/plugins/aggregate.mdwn +++ b/doc/plugins/aggregate.mdwn @@ -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 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` +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. diff --git a/doc/todo/aggregate_to_internal_pages.mdwn b/doc/todo/aggregate_to_internal_pages.mdwn index 017ca242b..ee3aee17a 100644 --- 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]] |