Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

2 files changed, 12 insertions, 2 deletions

diff --git a/doc/plugins/listdirectives.mdwn b/doc/plugins/listdirectives.mdwn
index 3645813b8..0f33855f5 100644
--- a/doc/plugins/listdirectives.mdwn
+++ b/doc/plugins/listdirectives.mdwn
@@ -9,3 +9,13 @@ This plugin generates a list of available
 Each directive links to a wiki page with the same name. The location of the
 pages in the wiki can be controlled via the `directive_description_dir`
 setting in the setup file.
+
+There is one optional keyword argument, `generated`.  Normally the `listdirectives` directive will
+list all built in directives and directives directly registered by [[plugins]].  With this keyword,
+`listdirectives` will also list directives generated later.  For example, all [[shortcuts]] are
+directives generated in turn by the `shortcut` directive.  They will only be listed if the `generated` argument is
+supplied.
+
+    \[[!listdirectives generated]]
+
+This extended list is often quite long, and often contains many undocumented directives.
diff --git a/doc/plugins/table/discussion.mdwn b/doc/plugins/table/discussion.mdwn
index 79a89d8a7..7228a83df 100644
--- a/doc/plugins/table/discussion.mdwn
+++ b/doc/plugins/table/discussion.mdwn
@@ -18,8 +18,8 @@ In my version, there is three options for the header field :
 
 Here is the links to the patch and to a patched version of the plugin :
 
-+ [table.pm.patch](http://lohrun.free.fr/ikiwiki/table.pm.patch)
-+ [table.pm](http://lohrun.free.fr/ikiwiki/table.pm)
++ [table.pm.patch](http://alexandre.dupas.free.fr/code/ikiwiki/table.pm.patch)
++ [table.pm](http://alexandre.dupas.free.fr/code/ikiwiki/table.pm)
 
 I hope this might be intresting for some ikiwiki user's.