diff options
Diffstat (limited to 'doc/ikiwiki')
| -rw-r--r-- | doc/ikiwiki/directive.mdwn | 7 | ||||
| -rw-r--r-- | doc/ikiwiki/directive/edittemplate.mdwn | 4 | ||||
| -rw-r--r-- | doc/ikiwiki/formatting.mdwn | 4 | ||||
| -rw-r--r-- | doc/ikiwiki/pagespec/attachment.mdwn | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/doc/ikiwiki/directive.mdwn b/doc/ikiwiki/directive.mdwn index 8789849ad..c4342dee8 100644 --- a/doc/ikiwiki/directive.mdwn +++ b/doc/ikiwiki/directive.mdwn @@ -43,10 +43,3 @@ Here is a list of currently available directives in this wiki: [[!listdirectives ]] """]] - -[[!if test="!enabled(listdirectives)" then=""" -Here is a list of all directives documented in this wiki. Not all of them may be enabled: - -[[!inline pages="ikiwiki/directive/* and !*/Discussion" archive="yes" sort=title -rootpage="ikiwiki/directive/contrib" postformtext="Add a new directive named:" show=0]] -"""]] diff --git a/doc/ikiwiki/directive/edittemplate.mdwn b/doc/ikiwiki/directive/edittemplate.mdwn index 779c3fa3c..d731bdb47 100644 --- a/doc/ikiwiki/directive/edittemplate.mdwn +++ b/doc/ikiwiki/directive/edittemplate.mdwn @@ -7,7 +7,9 @@ template, insert a [[ikiwiki/directive/template]] directive on some other page. \[[!edittemplate template="bugtemplate" match="bugs/*"]] In the above example, the page named "bugtemplate" is registered as a -template to be used when any page named "bugs/*" is created. +template to be used when any page named "bugs/*" is created. To avoid +the directive displaying a note about the template being registered, add +"silent=yes". Often the template page contains a simple skeleton for a particular type of page. For the bug report pages in the above example, it might look diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn index 8b74cd73d..a8e0c58f8 100644 --- a/doc/ikiwiki/formatting.mdwn +++ b/doc/ikiwiki/formatting.mdwn @@ -77,7 +77,7 @@ you use the following additional features: * Insert various [[directives|directive]] onto a page to perform useful actions. -[[!if test="enabled(toc) or enabled(meta) or (enabled(inline) and blog)" then=""" +[[!if test="enabled(toc) or enabled(meta) or (enabled(inline))" then=""" For example, you can: """]] @@ -94,7 +94,7 @@ you use the following additional features: \[[!meta title="full page title"]] """]] -[[!if test="enabled(inline) and blog" then=""" +[[!if test="enabled(inline)" then=""" * Create a blog by inlining a set of pages: \[[!inline pages="blog/*"]] diff --git a/doc/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn index 6b86c510b..234fcdf02 100644 --- a/doc/ikiwiki/pagespec/attachment.mdwn +++ b/doc/ikiwiki/pagespec/attachment.mdwn @@ -41,6 +41,10 @@ additional tests: Tests whether the attachment is being uploaded by a user with the specified username. If openid is enabled, an openid can also be put here. +* adminuser() + + Tests whether the attachment is being uploded by one of the wiki admins. + * ip(address) Tests whether the attacment is being uploaded from the specified IP |