From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 6 Nov 2007 00:33:56 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c1e4bed9d6c57c6c8fd08712ba20f303980b1e69?hp=1c9946ff484f46cdbd3fd2c9dababbbb2a95ed63

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

diff --git a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
new file mode 100644
index 000000000..ad379da1a
--- /dev/null
+++ b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn
@@ -0,0 +1,15 @@
+It seems like gettext only searches for locale information in /usr/share/locale, by default. I installed ikiwiki into /usr/local, therefore the locale information wasn't found. This patch fixes the issue:
+
+    --- a/IkiWiki.pm
+    +++ b/IkiWiki.pm
+    @@ -1057,6 +1057,7 @@ sub gettext { #{{{
+                                    $gettext_obj=undef;
+                                    return shift;
+                            }
+    +                       $gettext_obj->dir("$installdir/share/locale/");
+                    }
+                    return $gettext_obj->get(shift);
+            }
+
+[[tag patch]]
+-- [[ThomasBleher]]
\ No newline at end of file
diff --git a/doc/news/server_speed.mdwn b/doc/news/server_speed.mdwn
index e4cd189e9..56f1d15ab 100644
--- a/doc/news/server_speed.mdwn
+++ b/doc/news/server_speed.mdwn
@@ -1,7 +1,7 @@
 Quick poll: Do you feel that ikiwiki is fast enough on this server, or
 should I move it to my much beefier auxillary server?
 
-[[poll 27 "It's fast enough" 4 "It's too slow!" 3 "No opinion"]]
+[[poll 33 "It's fast enough" 4 "It's too slow!" 4 "No opinion"]]
 
 If you have specifics on performance issues, you might mention them on the
 [[discussion]] page.
diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn
index 8b1abcd61..398da4b5e 100644
--- a/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@@ -8,7 +8,7 @@ Aggregate a feed as follows
 	feedurl="http://example.com/index.rss"
 	url="http://example.com/" updateinterval="15"]]
 
-That example aggregates posts from the expecified RSS feed, updating no
+That example aggregates posts from the specified RSS feed, updating no
 more frequently than once every 15 minutes, and puts a page per post under
 the example/ directory in the wiki.
 
diff --git a/doc/plugins/contrib/gallery/discussion.mdwn b/doc/plugins/contrib/gallery/discussion.mdwn
index 60b8fde0f..37fa6f884 100644
--- a/doc/plugins/contrib/gallery/discussion.mdwn
+++ b/doc/plugins/contrib/gallery/discussion.mdwn
@@ -1,3 +1,5 @@
+# Adaptation to Newer Versions of ikiwiki
+
 I tried using this plugin, but to no success so far.  I used *gallery* git branch,
 rebased it onto the *origin/master*, built a Debian package and installed that one.
 
@@ -29,3 +31,15 @@ New version updated at SVN REPO : http://ned.snow-crash.org:8080/svn/ikiwiki-gal
 
 --[[arpitjain]]
 
+
+# Bug With Referring to *js* and *css* Files
+
+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?