X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1f7175e891f87c350decc1ec821bebb5adc22c2a..5e5f60278250330a29e4bbc9b5bf91cc8e7eddf8:/doc/ikiwiki/directive/sidebar.mdwn?ds=sidebyside

diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 34f078672..599695d22 100644
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -1,14 +1,20 @@
 The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin.
 
-This directive specifies a custom sidebar to display on the page,
+This directive can specify a custom sidebar to display on the page,
 overriding any sidebar that is displayed globally.
 
+If no custom sidebar content is specified, it forces the sidebar page to
+be used as the sidebar, even if the `global_sidebars` setting has been
+used to disable use of the sidebar page by default.
+
 ## examples
 
-	\[[!sidebar """
+	\[[!sidebar content="""
 	This is my custom sidebar for this page.
 
 	\[[!calendar pages="posts/*"]]
 	"""]]
 
+	\[[!sidebar]]
+
 [[!meta robots="noindex, follow"]]