summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-02-16 19:17:27 +0100
committerJonas Smedegaard <dr@jones.dk>2012-02-16 19:17:27 +0100
commit310150aea29904bc6a929ddcfbc191362ec19714 (patch)
treed3c9408f8a99acb78d376bfd38a35a3962446c1f
parent57bccb327efdb9fff0ff55ff07be3aed5b31e63f (diff)
Sync with ikiwiki 3.20120202.
-rw-r--r--ikiwiki/directive/graph.mdwn19
-rw-r--r--ikiwiki/directive/meta.mdwn9
2 files changed, 18 insertions, 10 deletions
diff --git a/ikiwiki/directive/graph.mdwn b/ikiwiki/directive/graph.mdwn
index 4331872..8b066c2 100644
--- a/ikiwiki/directive/graph.mdwn
+++ b/ikiwiki/directive/graph.mdwn
@@ -1,13 +1,22 @@
The `graph` directive is supplied by the [[!iki plugins/graphviz desc=graphviz]] plugin.
-This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a
-page. Example usage:
+This directive allows embedding [graphviz](http://www.graphviz.org/)
+graphs in a page. Example usage:
\[[!graph src="a -> b -> c; a -> c;"]]
-Note that graphs will only show up in previews if your browser has
-[[!wikipedia data: URI]] support, or if the same graph already exists on that
-page.
+Nodes on the graph can link to external urls using regular graphviz syntax,
+and a clickable imagemap will be created. As a special extension for
+ikiwiki, [[WikiLinks|ikiwiki/wikilink]] can also be used. For example:
+
+ \[[!graph src=""""
+ google [ href="http://google.com/" ]
+ sandbox [ href=\[[SandBox]] ]
+ help [ href=\[[ikiwiki/formatting]] ]
+ newpage [ href=\[[NewPage]] ]
+
+ google -> sandbox -> help -> newpage -> help -> google;
+ """"]]
The `graph` directive supports the following parameters:
diff --git a/ikiwiki/directive/meta.mdwn b/ikiwiki/directive/meta.mdwn
index 6b381f1..72cfc6f 100644
--- a/ikiwiki/directive/meta.mdwn
+++ b/ikiwiki/directive/meta.mdwn
@@ -109,7 +109,7 @@ Supported fields:
\[[!meta openid="http://joeyh.myopenid.com/"
server="http://www.myopenid.com/server"
- xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]]
+ xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com"]]
* link
@@ -162,14 +162,13 @@ Supported fields:
* guid
- Specifies a globally unique ID for a page. This guid should be a URI
- (in particular, it can be `urn:uuid:` followed by a UUID, as per
- [[!rfc 4122]]), and it will be used to identify the page's entry in RSS
+ Specifies a globally unique ID for a page. This guid should be a URI,
+ and it will be used to identify the page's entry in RSS
and Atom feeds. If not given, the default is to use the page's URL as its
guid.
This is mostly useful when a page has moved, to keep the guids for
- pages unchanged and avoid_flooding_aggregators
+ pages unchanged and avoid flooding aggregators
(see [[!iki tips/howto_avoid_flooding_aggregators]]).
* updated