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

diff --git a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
index 4af8c9f7254a15d76daf0df5eda02fbf4c4a3834..746a56f6f995ede49854767e771fc9e4d36f4b80 100644 (file)
--- a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
+++ b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
@@ -68,3 +68,5 @@ error: ikiwiki failed
 
 > > > > I don't see that branch in your git repo, could you repost it please?
 > > > > (I'm trying to review some of the pending patches.) --[[smcv]]
+
+>>>>> Ooops.. I forgot to push the branch, it should be good now! --[[anarcat]]

diff --git a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
index 5c1e7b2ed7f6fd60ea72735a940228ec3fcf0f3c..6d259d047ec051ac012abb4fba853194a6b00d7f 100644 (file)
--- a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
+++ b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
@@ -45,7 +45,11 @@ A simple fix would be to ship those icons with ikiwiki and serve them locally, b
 >> by technologists, the OpenID selector is a bit of a waste of time.
 >>
 >>> Not done yet. -s
->>
+>>>
+>>>> FWIW, I don't think we should implement this. The current selector is 
+>>>> fine: if elite technologists don't want the selector, they can just 
+>>>> turn off javascript. :) -- [[anarcat]]
+>> 
 >> One way to have recognisable icons would be to ship DFSG imitations of
 >> the "real" logos in the underlay. Between gnome-online-accounts and
 >> Empathy, we can probably find most of them (mostly or perhaps all done by
@@ -60,6 +64,8 @@ A simple fix would be to ship those icons with ikiwiki and serve them locally, b
 >>> -s
 >>>>
 >>>> Awesome work Simon! I owe you a beer. [[merged|done]] --[[Joey]] 
+>>>>
+>>>> Same here, thanks for this!!! -- [[anarcat]]
 >>
 >> If people want the "real" logos, we could have some code to make IkiWiki
 >> download the favicons into transient underlay (which I think is
@@ -69,4 +75,5 @@ A simple fix would be to ship those icons with ikiwiki and serve them locally, b
 >>> Not done yet. I'm not sure whether I'm going to bother, but I'd review
 >>> someone else's implementation. -s
 >>
+>>>> Doesn't seem to be a priority to me either. --[[anarcat]]
 >> --[[smcv]]

diff --git a/doc/tips/convert_moinmoin_to_ikiwiki/discussion.mdwn b/doc/tips/convert_moinmoin_to_ikiwiki/discussion.mdwn
index 2fe55d944052aa89c353608d28ccfe0f5fcc99c6..ad35a3027986e28e7450822d46d362710d2a6d90 100644 (file)
--- a/doc/tips/convert_moinmoin_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_moinmoin_to_ikiwiki/discussion.mdwn
@@ -3,3 +3,5 @@ I look forward to trying this.  I have a large (~10 year old) MoinMoin installat
 > I'll make that clearer in the docs, but we do not deal with ACL (yet?), as ikiwiki doesn't support Moinmoin's level of ACL flexibility. See [[todo/per_page_ACLs]] for more information. --[[anarcat]]
 
 >> I was actually thinking the ACLs would cause a problem just for the crawler, I hadn't considered their re-implementation (but yes, that would be good!) — [[Jon]]
+
+Note that freedesktop.org are doing a moinmoin to ikiwiki conversion, see [this page](http://www.freedesktop.org/wiki/conversion/) for some documentation. It's unclear which software they are using for that purpose. — [[anarcat]]