diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ikiwiki.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/blog.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/formatting.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/markdown.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/openid.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/pagespec.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/preprocessordirective.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/subpage.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/subpage/linkingrules.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwiki/wikilink.mdwn | 3 | ||||
| -rw-r--r-- | doc/plugins/meta.mdwn | 11 | ||||
| -rw-r--r-- | doc/templates.mdwn | 1 |
12 files changed, 20 insertions, 4 deletions
diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn index 9f8693ec4..485ac8826 100644 --- a/doc/ikiwiki.mdwn +++ b/doc/ikiwiki.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] This wiki is powered by [ikiwiki](http://ikiwiki.info/). [[!if test="enabled(version)" then="(Currently running version [[!version ]].)" diff --git a/doc/ikiwiki/blog.mdwn b/doc/ikiwiki/blog.mdwn index 6a206bb62..f1293ece8 100644 --- a/doc/ikiwiki/blog.mdwn +++ b/doc/ikiwiki/blog.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] [[!if test="enabled(inline)" then="This wiki has the inline plugin **enabled**." else="This wiki has the inline plugin **disabled**."]] diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn index dc1fa77fd..29dbce181 100644 --- a/doc/ikiwiki/formatting.mdwn +++ b/doc/ikiwiki/formatting.mdwn @@ -1,4 +1,5 @@ [[!meta title="Formatting wiki pages"]] +[[!meta robots="noindex, follow"]] Text on this wiki is, by default, written in a form very close to how you might write text for an email message. This style of text formatting is diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn index 73aee9c16..7c3b71f70 100644 --- a/doc/ikiwiki/markdown.mdwn +++ b/doc/ikiwiki/markdown.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] [Markdown](http://daringfireball.net/projects/markdown/) is a minimal markup language that resembles plain text as used in email messages. It is the markup language used by this wiki by default. diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn index 01a4b32b7..8fd708659 100644 --- a/doc/ikiwiki/openid.mdwn +++ b/doc/ikiwiki/openid.mdwn @@ -1,4 +1,5 @@ [[!meta title="OpenID"]] +[[!meta robots="noindex, follow"]] [[!if test="enabled(openid)" then="This wiki has OpenID **enabled**." diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 3cd6bb9f4..156e3f6ca 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] To select a set of pages, such as pages that are locked, pages whose commit emails you want subscribe to, or pages to combine into a blog, the wiki uses a PageSpec. This is an expression that matches diff --git a/doc/ikiwiki/preprocessordirective.mdwn b/doc/ikiwiki/preprocessordirective.mdwn index 2cb602ebe..743c0d9f5 100644 --- a/doc/ikiwiki/preprocessordirective.mdwn +++ b/doc/ikiwiki/preprocessordirective.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] Preprocessor directives are similar to a [[WikiLink]] in form, except they begin with `!` and may contain parameters. The general form is: diff --git a/doc/ikiwiki/subpage.mdwn b/doc/ikiwiki/subpage.mdwn index 43669209c..e047b860c 100644 --- a/doc/ikiwiki/subpage.mdwn +++ b/doc/ikiwiki/subpage.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] ikiwiki supports placing pages in a directory hierarchy. For example, this page, [[SubPage]] has some related pages placed under it, like [[SubPage/LinkingRules]]. This is a useful way to add some order to your diff --git a/doc/ikiwiki/subpage/linkingrules.mdwn b/doc/ikiwiki/subpage/linkingrules.mdwn index c1062304a..e547f3090 100644 --- a/doc/ikiwiki/subpage/linkingrules.mdwn +++ b/doc/ikiwiki/subpage/linkingrules.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] To link to or from a [[SubPage]], you can normally use a regular [[WikiLink]] that does not contain the name of the parent directory of the [[SubPage]]. Ikiwiki descends the directory hierarchy looking for a diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn index debbe7305..bd5e3d185 100644 --- a/doc/ikiwiki/wikilink.mdwn +++ b/doc/ikiwiki/wikilink.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] WikiLinks provide easy linking between pages of the wiki. To create a [[WikiLink]], just put the name of the page to link to in double brackets. For example `\[[WikiLink]]`. @@ -32,4 +33,4 @@ in WikiLinks, and must replace spaces with underscores. The newer syntax, enabled with the `prefix_directives` option in an ikiwiki setup file, prefixes directives with `!`, and thus does not prevent links with spaces. Future versions of ikiwiki will turn this option -on by default.
\ No newline at end of file +on by default. diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn index b503e4511..0a934fc5c 100644 --- a/doc/plugins/meta.mdwn +++ b/doc/plugins/meta.mdwn @@ -64,10 +64,15 @@ Supported fields: * openid Adds html <link> tags to perform OpenID delegation to an external - OpenID server. This lets you use an ikiwiki page as your OpenID. Example: + OpenID server (for `openid` and `openid2`). An optional `xrds-location` + parameter lets you specify the location of any [eXtensible Resource + DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml). - \\[[meta openid="http://joeyh.myopenid.com/" - server="http://www.myopenid.com/server"]] + This lets you use an ikiwiki page as your OpenID. Example: + + \\[[meta openid="http://joeyh.myopenid.com/" + server="http://www.myopenid.com/server" + xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]] * link diff --git a/doc/templates.mdwn b/doc/templates.mdwn index 205cb5b04..58d5d1146 100644 --- a/doc/templates.mdwn +++ b/doc/templates.mdwn @@ -1,3 +1,4 @@ +[[!meta robots="noindex, follow"]] [[!if test="enabled(template)" then="This wiki has templates **enabled**." else="This wiki has templates **disabled**." |