From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 8 Jan 2012 18:26:56 +0000 (-0500)
Subject: repoint git branches and website
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17d012593acf260ee72e6fa7026ac48894ecf6b7;p=ikiwiki.git

repoint git branches and website
---

diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index b7ae76aeb..566896ec3 100644
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -78,3 +78,9 @@ Brian May
 >>>>> explicitly removed", so if ikiwiki can preferentially find that 
 >>>>> installed, even with the above commit, `openid` won't be able to 
 >>>>> traverse a proxy. --[[schmonz]]
+
+[[!template id=gitbranch branch=schmonz/proxies author="[[schmonz]]"]]
+
+>>>>> I bollixed up my git, recloned, and reapplied the diffs, so
+>>>>> that commit won't exist anymore. My proxy-related changes are
+>>>>> now on a branch. --[[schmonz]]
diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn
index b4ec5ebf4..b27cc4bac 100644
--- a/doc/install/discussion.mdwn
+++ b/doc/install/discussion.mdwn
@@ -349,3 +349,10 @@ I've attempted to mergeably patch these in my git, commit
 5c177c96ac98b24aaa0613ca241fb113f1b32c55.
 
 --[[schmonz]]
+
+-----
+
+[[!template id=gitbranch branch=schmonz/portability author="[[schmonz]]"]]
+
+My git was in a screwy state so I started over. These changes are
+now on a branch. --[[schmonz]]
diff --git a/doc/plugins/contrib/mandoc.mdwn b/doc/plugins/contrib/mandoc.mdwn
index 15d2826ed..672a268cc 100644
--- a/doc/plugins/contrib/mandoc.mdwn
+++ b/doc/plugins/contrib/mandoc.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=mandoc author="[[schmonz]]"]]
-[[!template id=gitbranch branch=schmonz/master author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/mandoc author="[[schmonz]]"]]
 [[!tag type/format]]
 
 This plugin lets ikiwiki convert Unix man pages to HTML. It uses
diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index ebfcf3cdd..fc7558b24 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -1,5 +1,5 @@
-[Amitai Schlair](http://www.netbsd.org/~schmonz/) finds himself
-using ikiwiki for all sorts of things. His attempts at contributing:
+[Amitai Schlair](http://www.schmonz.com/) finds himself using ikiwiki
+for all sorts of things. His attempts at contributing:
 
 [[!map
 pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"