X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/358fa953e189d6f8a7925be8533fe7b7c5699503..fc268b311d8d9ac28a0f52cbede79fde18c6cd47:/doc/ikiwiki/directive/sidebar.mdwn?ds=inline

diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 46f016747..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, instead
-of any sidebar that is displayed globally.
+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"]]