Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / ikiwiki-transition.mdwn

diff --git a/doc/ikiwiki-transition.mdwn b/doc/ikiwiki-transition.mdwn
index 624268d23b6c49c9a5fea73baefb5962c826f295..8b7c3579fabd3c1af8cc58bb43d4a0f7b7d00985 100644 (file)
--- a/doc/ikiwiki-transition.mdwn
+++ b/doc/ikiwiki-transition.mdwn
@@ -25,10 +25,18 @@ Note that if the page contains wiki links with spaces, which some
 older versions of ikiwiki accepted, the prefix_directives transition will
 treat these as preprocessor directives and convert them.
 
 older versions of ikiwiki accepted, the prefix_directives transition will
 treat these as preprocessor directives and convert them.
 

+# setupformat
+
+The `setupformat` mode converts a setup file from using a single `wrappers` block
+to using `cgi_wrapper`, `git_wrapper`, etc.
+
+Note that all comments and any unusual stuff like perl code in the setup
+file will be lost, as it is entirely rewritten by the transition.
+

 # aggregateinternal
 
 The `aggregateinternal` mode moves pages aggregated by the aggregate plugin
 # 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
 
 
 # indexdb