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

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 20afec1462e323b0f6f6efd67b26b442e10eed39..435f67f642fb09d716c7fa6968c9c0b56f0f4c91 100644 (file)
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[poll 54 "Accept only OpenID for logins" 18 "Accept only password logins" 34 "Accept both"]]
+[[poll 55 "Accept only OpenID for logins" 18 "Accept only password logins" 34 "Accept both"]]

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a0c20fff4175b50f5fcd4b83a73568b620b471dc..155a5ba4c4bd63daf270043c7faef1c95ab96ce9 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -14,6 +14,8 @@ There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 
 Korean characters test : 한글테스트입니다.
 
+some hindī? हिन्दी
+
 # Header
 
 ## Subheader

diff --git a/doc/todo/git_attribution/discussion.mdwn b/doc/todo/git_attribution/discussion.mdwn
index 5932e9d42052d066dbdb7a22caa91d8714b60f64..45f40e40832dd4ab70502a63e5344395e076acc3 100644 (file)
--- a/doc/todo/git_attribution/discussion.mdwn
+++ b/doc/todo/git_attribution/discussion.mdwn
@@ -4,4 +4,45 @@ I might even have a try at this patch, though I'd have to hack the user preferen
 
 As to the question of whether the committer was the 'script' or the wiki editor... I'm not sure.  Marking it as the script somehow (`ikiwiki-cgi <ikiwiki@sitename>`)? seems to make sense and would make it easier to manage.
 
-[[harningt]]
\ No newline at end of file
+[[harningt]]
+
+I've been thinking a bit about the GIT attribution in ikiwiki...
+
+If no email set, I think "$USERNAME" is reasonable... no point in the
+'<>' causing clutter.
+
+If no username set... then something like '@[IPADDR]' makes sense...
+(not in email brackets).
+
+In the case of OpenID login.. I think that's a special case...  I don't
+think attempting to munge something meaningful out of the OpenID makes
+sense... but I think some massaging might need to be done.
+
+Ex:  I've noticed in the current mode where logging in w/
+harningt.eharning.us/ shows up in the logs w/o HTTP and if I login w/
+http://harningt.eharning.us/ is shows up w/ the http... causing some
+inconsistency.  I think it oughtta make sure that it has the properly
+discovered, canonicalized form (ex:  if there's a redirect to another
+site  (harningt.eharning.us -> www.eharning.us) then technically the
+target site is the 'real' openid (at least according to how most OpenID
+RPs take it).
+
+...
+
+For OpenID edits, I think there should be a way to tell it what
+username to show in the preferences dialog (so you can have a 'normal'
+$USER <$EMAIL> setup.)  This could by default be filled in w/ sreg
+nickname value (as well as email for that matter)...
+
+To convey the openid used to make the edit, I think it would be
+important that some sort of footer line along the lines of the
+Signed-off: $USER <$EMAIL> conventions I've seen.
+
+Perhaps an OpenID: $OPENID_URL would make sense.  This could help w/
+making sure that no one irrefutably spoofs a post by someone (since w/
+the setup where email and effective username are configurable, there's
+no determination of uniqueness)
+
+[[harningt]]
+
+[[madduck]]: git requires `Name <Email@address>` format, as far as I know.

diff --git a/doc/users/harningt.mdwn b/doc/users/harningt.mdwn
index 11502aa4fa67821750480ea399ad63e20419b1c4..cbb588cd8a3a3b253ebd890f0200d9f11ccd4207 100644 (file)
--- a/doc/users/harningt.mdwn
+++ b/doc/users/harningt.mdwn
@@ -8,4 +8,4 @@ OpenID:
 
 <http://openid.eharning.us/> or <http://harningt.eharning.us/>
 
-Refs <http://harningt.myopenid.com/>
+Refs <https://openid.trustbearer.com/harningt>