(no commit message)

[git.ikiwiki.info.git] / doc / tips / upgrade_to_3.0.mdwn

diff --git a/doc/tips/upgrade_to_3.0.mdwn b/doc/tips/upgrade_to_3.0.mdwn
index 8adc040a104fc834467eea4e1f7e2e272d8802c2..05b6d6fbd03d72f181c6733ab1fa6bf15f27a433 100644 (file)
--- a/doc/tips/upgrade_to_3.0.mdwn
+++ b/doc/tips/upgrade_to_3.0.mdwn
@@ -13,7 +13,7 @@ interface, need the new format setup file.
 You can convert old setup files into the new format by running
 `ikiwiki-transition setupformat your.setup`
 
 You can convert old setup files into the new format by running
 `ikiwiki-transition setupformat your.setup`
 

-# moving settings from Preferences page
+## moving settings from Preferences page

 
 The admin preferences page used to have settings for allowed attachments,
 locked pages, and banned users. These three settings have moved to the
 
 The admin preferences page used to have settings for allowed attachments,
 locked pages, and banned users. These three settings have moved to the


@@ -37,15 +37,15 @@ following to your setup file:
        
        prefix_directives => 0,
 
        
        prefix_directives => 0,
 

-To convert to the new syntax, run 
-`ikiwiki-transition prefix_directives your.setup`
+To convert to the new syntax, make sure that your setup file does *not*
+contain the above, then run `ikiwiki-transition prefix_directives your.setup`

 
 (And then commit the changes it makes to pages in your srcdir.)
 
 ## GlobLists
 
 In 3.0, the old "GlobList" syntax for [[PageSpecs|ikiwiki/PageSpec]] is no
 
 (And then commit the changes it makes to pages in your srcdir.)
 
 ## GlobLists
 
 In 3.0, the old "GlobList" syntax for [[PageSpecs|ikiwiki/PageSpec]] is no

-longer supported. A GlobList contains multiple term, but does not separate
+longer supported. A GlobList contains multiple terms, but does not separate

 them with "and" or "or":
 
        sandbox !*/Discussion
 them with "and" or "or":
 
        sandbox !*/Discussion