i rebased all my branches to the latest release and renamed some branches, 2 bugs still await merging to be fixed

3 files changed, 6 insertions, 6 deletions

diff --git a/doc/bugs/notifyemail_fails_with_some_openid_providers.mdwn b/doc/bugs/notifyemail_fails_with_some_openid_providers.mdwn
index ca3599660..90e2c7900 100644
--- a/doc/bugs/notifyemail_fails_with_some_openid_providers.mdwn
+++ b/doc/bugs/notifyemail_fails_with_some_openid_providers.mdwn
@@ -1,3 +1,5 @@
+[[!template  id=gitbranch branch=anarcat/dev/openid_email author="[[anarcat]]"]]
+
 This bug affects [[plugins/notifyemail]] but is probably caused more by [[plugins/openid]]. When using OpenID to login to a site, no email notification is sent to the user (pagespec set to `*`) when a modification is done on the wiki. I believe this is because the OpenID plugin assumes the email comes from the OpenID provider - which is not necessarily going to succeed if, for privacy reason, the OpenID provider refuses to transmit the email to ikiwiki.
 
 In the OpenID plugin, the email is actually fetched when authenticating and is stored in the session, like so:
@@ -56,9 +58,7 @@ sub formbuilder_setup (@) {
 
 I believe this could be worked around simply by re-enabling that field and allowing the user to specify an email there by hand, making a note that the OpenID provider's email is used by default.
 
-[[!template  id=gitbranch branch=anarcat/openid_email author="[[anarcat]]"]]
-
-The dumbest [[!taglink patch]] that actually fixes the problem for me is in the branch mentionned here.
+The dumbest [[!taglink patch]] that actually fixes the problem for me is in the branch mentionned above.
 
 It would probably be better to add a comment on the field as indicated above, but it's a good proof of concept.
 
diff --git a/doc/bugs/syslog_fails_with_non-ASCII_wikinames.mdwn b/doc/bugs/syslog_fails_with_non-ASCII_wikinames.mdwn
index 151c023be..dad974a81 100644
--- a/doc/bugs/syslog_fails_with_non-ASCII_wikinames.mdwn
+++ b/doc/bugs/syslog_fails_with_non-ASCII_wikinames.mdwn
@@ -1,4 +1,4 @@
-[[!template  id=gitbranch branch=anarcat/syslog_utf8 author="[[anarcat]]"]]
+[[!template  id=gitbranch branch=anarcat/dev/syslog_utf8 author="[[anarcat]]"]]
 
 [[this feature|todo/syslog_should_show_wiki_name]] made it so syslog doesn't work anymore if the site being logged has non-ASCII characters it in.
 
diff --git a/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn b/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
index fa74d3126..3496cff68 100644
--- a/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
+++ b/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
@@ -1,5 +1,5 @@
 [[!template  id=gitbranch branch=anarcat/osm_kml_formatting author="[[anarcat]]"]]
-[[!template  id=gitbranch branch=anarcat/osm_openlayers_misc author="[[anarcat]]"]]
+[[!template  id=gitbranch branch=anarcat/attic/osm_emacs_indent author="[[anarcat]]"]]
 
 I have accumulated a small series of patches to the OSM plugin along with the [[other|todo/osm_arbitrary_layers]] [[fixes|bugs/osm_KML_maps_do_not_display_properly_on_google_maps]] I have submitted here. They have lived in a tangled mess on my master branch so far, but not anymore!
 
@@ -20,7 +20,7 @@ I have two main branches that need merging (on top of [[todo/osm_arbitrary_layer
 > doubly for files served over the network. Cherry-picked the layer sorting
 > change. --[[Joey]]
 
-> > Alright, I am fine with that, thanks. -- [[anarcat]]
+> > Alright, I am fine with that, thanks. I moved my branch to the attic. -- [[anarcat]]
 
 Those two branches are also merged directly on my master branch... along with [[todo/osm_arbitrary_layers]].