Merge branch 'master' into po

[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 3a515a61f6e0a20672d501e89459e448749dbbd0..d22813bf26fa2374223f0cf3371828aefb29c2f2 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`
 
-# 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
@@ -21,7 +21,7 @@ setup file, and will no longer appear on the admin preferences page once
 your wiki is upgraded to 3.0.
 
 You can move these preferences into the setup file by running
-`ikiwiki-transition moveprefs your.setup`
+`ikiwiki-transition moveprefs your.setup; ikiwiki -setup your.setup -refresh -wrappers`
 
 (Make sure you have converted the setup file to the new format first.)
 
@@ -37,8 +37,8 @@ following to your setup file:
        
        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.)
 
@@ -82,7 +82,14 @@ Otherwise, follow this procedure to upgrade a wiki using the aggregate plugin:
    `ikiwiki-transition aggregateinternal your.setup`,
 3. Refresh the wiki. (`ikiwiki -setup your.setup -refresh`)
 
-## googlecalendar
+## embed / googlecalendar
 
-This plugin has been deprecated for a long time, and is removed in 3.0. If
-your wiki used it, you should enable the [[plugins/embed]] plugin, instead.
+The googlecalendar plugin has been deprecated for a long time, and is
+removed in 3.0.
+
+The embed plugin is also now deprecated, though not yet removed.
+
+If you use either plugin to embed content from google, youtube, etc,
+into your wiki, you should instead configure the [[plugins/htmlscrubber]]
+to skip sanitising some pages, via the `htmlscrubber_skip` setting.
+See [[embedding_content]] for examples.