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

diff --git a/doc/plugins/contrib/gallery.mdwn b/doc/plugins/contrib/gallery.mdwn
index 9ef7df00b1192ec23cf28fb57243f0169e1dddb8..533e3a824b3b4955e288857b4e112cb1c149c116 100644 (file)
--- a/doc/plugins/contrib/gallery.mdwn
+++ b/doc/plugins/contrib/gallery.mdwn
@@ -9,7 +9,7 @@ USAGE :
 Available options : <br>
     * imagedir(required) => Directory containing images. It will scan all the files with jpg|png|gif extension from the directory and will put it in the gallery.<br>
     * thumbnailsize(optional,Default=200x200) => Size of the thumbnail that you want to generate for the gallery.<br>
-    * resize(optional, Default=>800x600) => Width and Height to resize image to.<br>
+    * resize(optional, Default=>800x600) => Width and Height to resize image to. resize="0" for turning resizing off.<br>
     * alt(optional) => If image can not be displayed, it will display the text contained in alt argument.<br>
     * cols(optional,Default=3) => Number of columns of thumbnails that you want to generate.<br>
     * rows(optional, Default=>3) => Number of Rows on a gallery page.<br>

diff --git a/doc/plugins/contrib/gallery/discussion.mdwn b/doc/plugins/contrib/gallery/discussion.mdwn
index 9ea94790f8f31ec7c7dc012495d12c583e06e627..c6ab297b232aa5b47ef7a3fb0c05dee8ede998cf 100644 (file)
--- a/doc/plugins/contrib/gallery/discussion.mdwn
+++ b/doc/plugins/contrib/gallery/discussion.mdwn
@@ -19,3 +19,12 @@ When using `vcs="1"` it's no better:
     internal error: b/800x600-1.jpg cannot be found in web or underlay
 
 --[[tschwinge]]
+
+For the time being, you can turn resizing off till I look into conditional underlay directory feature. 
+
+USAGE : [[gallery imagedir="directory" resize="0"]]
+
+New version updated at SVN REPO : http://ned.snow-crash.org:8080/svn/ikiwiki-gallery/
+
+--[[arpitjain]]
+