Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / fileupload / soc-proposal / discussion.mdwn

diff --git a/doc/todo/fileupload/soc-proposal/discussion.mdwn b/doc/todo/fileupload/soc-proposal/discussion.mdwn
index 1ce52f0ca128922d54b247420548895da8012424..f85a956dbc65e4a771de4da50d3be83f03b5f976 100644 (file)
--- a/doc/todo/fileupload/soc-proposal/discussion.mdwn
+++ b/doc/todo/fileupload/soc-proposal/discussion.mdwn
@@ -29,7 +29,7 @@ For images, videos, etc. it would be nice to have some kind of meta data file to
 height, compression, etc. which could be initially created by 'ikiwiki --generate-meta-stuff'. 
 Then PageSpec should be
 teached to use these. Galleries could then be generated by means of
 height, compression, etc. which could be initially created by 'ikiwiki --generate-meta-stuff'. 
 Then PageSpec should be
 teached to use these. Galleries could then be generated by means of

-\[[inline pages="type(image/*) and year(2007)" template="gallery"]].  It
+\[[!inline pages="type(image/*) and year(2007)" template="gallery"]].  It

 should of course be possible to edit this information via ikiwiki.cgi and with any
 text editor (Name: value). This should also allow for creations of default .html pages with
 the image/video/file/... and a discussion page. Probably named image.mdwn and image/discussion.
 should of course be possible to edit this information via ikiwiki.cgi and with any
 text editor (Name: value). This should also allow for creations of default .html pages with
 the image/video/file/... and a discussion page. Probably named image.mdwn and image/discussion.