diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-14 22:42:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-14 22:42:22 -0400 |
| commit | 3256522bdaf2ca7c678041a19a4b97bd7dc57c90 (patch) | |
| tree | a9fdd3b36ea778766d1789a8cc740f7ed48909ed /doc | |
| parent | a8daf61b7d3c38e95ba8a168cdba3dfbce750e16 (diff) | |
| parent | b29d11b3c67533ca7addadb40a818a88cf6b8a84 (diff) | |
Merge commit 'smcv/aggregateinternal' into aggregateinternal
Conflicts:
doc/plugins/aggregate.mdwn
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ikiwiki-transition.mdwn | 2 | ||||
| -rw-r--r-- | doc/plugins/aggregate.mdwn | 7 | ||||
| -rw-r--r-- | doc/todo/aggregate_to_internal_pages.mdwn | 2 |
3 files changed, 5 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 d87e33ab9..ecca0232e 100644 --- a/doc/plugins/aggregate.mdwn +++ b/doc/plugins/aggregate.mdwn @@ -101,8 +101,7 @@ you should follow this process: be changed to `internal(foo/*)`. This has to be done because internal pages are not matched by regular globs. 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 --git a/doc/todo/aggregate_to_internal_pages.mdwn b/doc/todo/aggregate_to_internal_pages.mdwn index 7eddc5891..38427133f 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]] [[tag patch done]] |