diff options
| author | intrigeri <intrigeri@boum.org> | 2010-06-25 14:38:37 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-06-25 14:38:37 +0200 |
| commit | 9f401d6617a11efcedda1c956b2ccea061a7540f (patch) | |
| tree | a5648589b38487427a58a7ebacfdc036a5dd102a /doc/plugins/type | |
| parent | 73f4a8835876c8cb07808367cd72d9ae972893e8 (diff) | |
| parent | 71950b2ae5ff6fd3b631c5504455cc07699b1c11 (diff) | |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/po.pm
Diffstat (limited to 'doc/plugins/type')
| -rw-r--r-- | doc/plugins/type/chrome.mdwn | 2 | ||||
| -rw-r--r-- | doc/plugins/type/useful.mdwn | 1 | ||||
| -rw-r--r-- | doc/plugins/type/widget.mdwn | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/doc/plugins/type/chrome.mdwn b/doc/plugins/type/chrome.mdwn index d3f0eb3d3..a1c6d0728 100644 --- a/doc/plugins/type/chrome.mdwn +++ b/doc/plugins/type/chrome.mdwn @@ -1 +1 @@ -These plugins affect the look and feel of the wiki. +These plugins affect the look and feel of the overall wiki. diff --git a/doc/plugins/type/useful.mdwn b/doc/plugins/type/useful.mdwn deleted file mode 100644 index 92fcf5af1..000000000 --- a/doc/plugins/type/useful.mdwn +++ /dev/null @@ -1 +0,0 @@ -These plugins perform various miscellaneous useful functions. diff --git a/doc/plugins/type/widget.mdwn b/doc/plugins/type/widget.mdwn new file mode 100644 index 000000000..875829d0b --- /dev/null +++ b/doc/plugins/type/widget.mdwn @@ -0,0 +1,2 @@ +These plugins allow inserting various things into pages via a +[[ikiwiki/directive]]. |