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/plugins | |
parent | a8daf61b7d3c38e95ba8a168cdba3dfbce750e16 (diff) | |
parent | b29d11b3c67533ca7addadb40a818a88cf6b8a84 (diff) | |
download | ikiwiki-3256522bdaf2ca7c678041a19a4b97bd7dc57c90.tar ikiwiki-3256522bdaf2ca7c678041a19a4b97bd7dc57c90.tar.gz |
Merge commit 'smcv/aggregateinternal' into aggregateinternal
Conflicts:
doc/plugins/aggregate.mdwn
Diffstat (limited to 'doc/plugins')
-rw-r--r-- | doc/plugins/aggregate.mdwn | 7 |
1 files changed, 3 insertions, 4 deletions
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`) |