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

doc/ikiwikiusers.mdwn

@@ -26,7 +26,6 @@ Projects
 * [The TOVA Company](http://www.tovatest.com) public site. We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend.
 * Technical support websites for [Homebase](http://support.homebase.dk) and [Kaospilotene](http://support.kaospilot.no) (each with [source](http://source.homebase.dk/) [provided](http://source.kaospilot.no/))
 * [CampusGrün Hamburg](http://www.campusgruen.org/)
-* [Cario](http://cairographics.org/)
 * The [awesome window manager homepage](http://awesome.naquadah.org/)
 
 Personal sites and blogs

doc/sandbox.mdwn

@@ -1,11 +1,9 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
+This is the SandBox, a page anyone can edit to try out this fab ikiwiki.
 
-Foobar.
+# Table of Contents
+testhead
+sandbox
 
-----
-geht das?
-<http://www.orf.at/>
-Hellas zusammen!
 
 <h2>testhead</h2>
 ----
@@ -13,6 +11,7 @@ Do re me fa so la te... git?
 
 i see. i see. lalala hmmmmmmmm.
 
+## sandbox
 [[sandbox]] does that work? yep. yay!
 
 # テスト。

doc/tips/integrated_issue_tracking_with_ikiwiki/discussion.mdwn

@@ -20,6 +20,8 @@ I suppose having a separate branch for public web stuff w/ the following workflo
 Bug origination point: ... anybody have ideas for this?  Create branch at bug origination point and merge into current upstream branches?  (I guess this would be where cherry-picking would work best, since the web UI can't do this)
 
 > Not sure what you mean.
+>> Documentation as to where the bug came from for related branches...
+>> Ex: The bug got located in r30, but really came about r10.  Desire is to propagate the bug to all everything after r10.
 
 Bug naming: any conventions/ideas on how to standardize?  Any suggestions on methods of linking commits to bugs without having to modify the bug in each commit?