From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:28:49 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a45f31ae03dc97b27482a717b03f5f266efcf99e?hp=e779098796e18c11c43e9e38339577376ded8e2b

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 0f280fb35..a5fd742ca 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -62,6 +62,7 @@ think about merging them. This is recommended. :-)
   ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
 * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
+* [[privat]] `git://github.com/privat/ikiwiki.git`
 
 ## branches
 
diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index b71263dae..2000c5dfb 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -245,3 +245,12 @@ Thank you! I'm not a Perl programmer, so what's your opinion: is this behavior a
 
 I am experiencing the same problem "/etc/ikiwiki/custom: failed to set up the repository with ikiwiki-makerepo
 " on Debian squeeze with perl5.10.0. Upgrading to ikiwiki 3.10 fixes it. -- [Albert](http://www.docunext.com/)
+
+----
+
+Just a note, perl 5.10 isn't packaged as part of RHEL or thus CentOS nor EPEL,
+so it's not especially trivial to satisfy that requirement for ikiwiki on
+those platforms, without backporting it from Fedora or building from source.
+However, I have an ikiwiki 3.20100403 running on RHEL-4 supplied 5.8.8 without
+(seemingly too much) complaint.  How strong is the 5.10 requirement? what
+precicely breaks without it? -- [[Jon]]
diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 02b83244e..bb4339f88 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -15,6 +15,8 @@ those contents instead.
 
 >> Here a simple [[patch]] for multiple sidebars. Not too fancy but better than having multiple copies of the sidebar plugin. --[[jeanprivat]]
 
+>>> I made a [[git]] branch for it [[!template id=gitbranch branch="privat/multiple_sidebars" author="[[jeanprivat]]"]] --[[jeanprivat]]
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index d5593dcbf..eb01821ff 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -51,6 +51,8 @@ Penultimately, the following are merely half-formed thoughts:
    unticking checkboxes next to a tag name (rather than entering the 
    directive into the text of the page directly)
  * perhaps the same for meta
+ * I'd like to make profiling ikiwiki in action very easy for newcomers.
+   Perhaps even a plugin that created a file /profile or similar on build.
 
 Finally, backlinks (since I have issues with the current backlinks
 implementation, see [[bugs/backlinks onhover thing can go weird]]):