Merge commit 'upstream/master' into pub/po

[git.ikiwiki.info.git] / doc / plugins / contrib / gallery / discussion.mdwn

diff --git a/doc/plugins/contrib/gallery/discussion.mdwn b/doc/plugins/contrib/gallery/discussion.mdwn
index 1f7c76eb37e5b2f23c3bcb8411b17ababba7b1c3..08fc2456f95ab2cf7bdef72b9c166f2b0e2a3f4f 100644 (file)
--- a/doc/plugins/contrib/gallery/discussion.mdwn
+++ b/doc/plugins/contrib/gallery/discussion.mdwn
@@ -6,13 +6,13 @@ rebased it onto the *origin/master*, built a Debian package and installed that o
 However, I can't even get simply things like this to work:
 
     $ cat web/index.mdwn
 However, I can't even get simply things like this to work:
 
     $ cat web/index.mdwn

-    [[gallery imagedir="b" vcs="0"]]
+    [[!gallery imagedir="b" vcs="0"]]

     $ ls web/b/
     1.jpg  2.jpg  3.jpg  4.jpg
     $ ikiwiki [...] --plugin gallery web web.rendered
     [...]
     $ grep gallery web.rendered/index.html 
     $ ls web/b/
     1.jpg  2.jpg  3.jpg  4.jpg
     $ ikiwiki [...] --plugin gallery web web.rendered
     [...]
     $ grep gallery web.rendered/index.html 

-    <p>[[gallery Failed to Read Directory b.]]</p>
+    <p>[[!gallery Failed to Read Directory b.]]</p>

 
 When using `vcs="1"` it's no better:
 
 
 When using `vcs="1"` it's no better:
 


@@ -25,7 +25,7 @@ When using `vcs="1"` it's no better:
 Its probably because of the restriction of permissions by plugins in newer version of IkiWiki. 
 For the time being, you can turn resizing off till I look into conditional underlay directory feature. 
 
 Its probably because of the restriction of permissions by plugins in newer version of IkiWiki. 
 For the time being, you can turn resizing off till I look into conditional underlay directory feature. 
 

-USAGE : [[gallery imagedir="directory" resize="0"]]
+USAGE : [[!gallery imagedir="directory" resize="0"]]

 
 New version updated at SVN REPO : http://ned.snow-crash.org:8080/svn/ikiwiki-gallery/
 
 
 New version updated at SVN REPO : http://ned.snow-crash.org:8080/svn/ikiwiki-gallery/
 


@@ -37,3 +37,9 @@ New version updated at SVN REPO : http://ned.snow-crash.org:8080/svn/ikiwiki-gal
 In the generated files `gallery/index/index.html` and `gallery/index/*/gallery_*`
 it should not be referred to `/js` but to `../../js` and `../../../js`, respectively.
 Likewise for `/css`.
 In the generated files `gallery/index/index.html` and `gallery/index/*/gallery_*`
 it should not be referred to `/js` but to `../../js` and `../../../js`, respectively.
 Likewise for `/css`.

+
+
+# All Thumbnails on One Page
+
+Could `rows="0"` be used to state that all thumbnails should be put on the same page,
+no matter how much there are?