From 3840d3d8f890a11e6d9605f7c8c929a3b33e6ecc Mon Sep 17 00:00:00 2001 From: simonraven Date: Sat, 28 Mar 2009 03:20:57 -0400 Subject: [PATCH 1/7] --- doc/index/openid/discussion.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/index/openid/discussion.mdwn b/doc/index/openid/discussion.mdwn index 43575d4be..5e7a881b3 100644 --- a/doc/index/openid/discussion.mdwn +++ b/doc/index/openid/discussion.mdwn @@ -10,3 +10,13 @@ Hi, there's no return_to from a designated OpenID server page, specs requires (I > * How can one reproduce the bug? > > PS, please file bugs under [[bugs]] in future. --[[Joey]] + +>> Oops, my bad, didn't know that existed at the time I wrote this. +>> +>> What happened is that the process wouldn't complete, therefore I couldn't login with my OpenID. +>> +>> reproducibility: every time +>> +>> Should probably move this page, eh? ;) +>> I'd do that, but I dunno know other than using the SCM backend in question.... + From b8e08458c90c83c9d9aaa2d8cfcca4d9fae145db Mon Sep 17 00:00:00 2001 From: simonraven Date: Sat, 28 Mar 2009 03:27:47 -0400 Subject: [PATCH 2/7] --- doc/index/openid/discussion.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/index/openid/discussion.mdwn b/doc/index/openid/discussion.mdwn index 5e7a881b3..ae614e5ac 100644 --- a/doc/index/openid/discussion.mdwn +++ b/doc/index/openid/discussion.mdwn @@ -20,3 +20,10 @@ Hi, there's no return_to from a designated OpenID server page, specs requires (I >> Should probably move this page, eh? ;) >> I'd do that, but I dunno know other than using the SCM backend in question.... +Here's some actual output (with my OpenID URL stripped out): + +do=postsignin&oic.time=1238224497-1450566d93097caa707f&openid.assoc_handle=%7BHMAC-SHA1%7D%7B49cdce76%7D%7BBhuXXw%3D%3D%7D&openid.identity=|<==== MY OPENID URL GOES HERE ====>|&openid.mode=id_res&openid.op_endpoint=http%3A%2F%2Fwww.myopenid.com%2Fserver&openid.response_nonce=2009-03-28T07%3A15%3A02ZDUFmG3&openid.return_to=http%3A%2F%2Fsimonraven.kisikew.org%2Fbin%2Fikiwiki.cgi%3Fdo%3Dpostsignin%26oic.time%3D1238224497-1450566d93097caa707f&openid.sig=E51Xh6Gnjku%2B0se57qCyhHbT5QY%3D&openid.signed=assoc_handle%2Cidentity%2Cmode%2Cop_endpoint%2Cresponse_nonce%2Creturn_to%2Csigned + +The `return_to` arg should NOT be `signed`, it should be the originating URL where you initially logged in. + +Also, I dunno what the assoc_handle is doing spitting out an arg like `{HMAC-SHA1}{49cdce76}{BhuXXw%3D%3D}` it should be processed further. I have the needed perl packages installed (latest for Lenny). Hrm, would endianness matter? From 19f3093c49450dea465e554d989dfeca66afa257 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 28 Mar 2009 11:04:36 +0100 Subject: [PATCH 3/7] po: answering Joey --- doc/plugins/contrib/po.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index 3f128c9f8..c42cf3481 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -335,9 +335,28 @@ daring a timid "please pull"... or rather, please review again :) > outside `po.pm`. > > * Is it worth trying to fix compatability with `indexpages`? +>> +>> Supporting `usedirs` being enabled or disabled was already quite +>> hard IIRC, so supporting all four combinations of `usedirs` and +>> `indexpages` settings will probably be painful. I propose we forget +>> about it until someone reports he/she badly needs it, and then +>> we'll see what can be done. +>> > * Would it make sense to go ahead and modify `page.tmpl` to use > OTHERLANGUAGES and PERCENTTRANSLATED, instead of documenting how to modify it? +>> +>> Sure, I'll do this today. +>> > * Would it be better to disable po support for pages that use unsupported > or poorly-supported markup languages? > +>> I prefer keeping it enabled, as: +>> * most wiki markups "almost work" +>> * when someone needs one of these to be fully supported, it's not +>> that hard to add dedicated support for it to po4a; if it were +>> disabled, I fear the ones who could do this would maybe think +>> it's blandly impossible and give up. +>> > --[[Joey]] +>> +>> --[[intrigeri]] From e55d7cf572370b015fab9541dbe920bb8e64089a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 28 Mar 2009 11:13:22 +0100 Subject: [PATCH 4/7] answering Joey --- doc/todo/need_global_renamepage_hook.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/need_global_renamepage_hook.mdwn b/doc/todo/need_global_renamepage_hook.mdwn index b065c82f3..b123340af 100644 --- a/doc/todo/need_global_renamepage_hook.mdwn +++ b/doc/todo/need_global_renamepage_hook.mdwn @@ -111,3 +111,5 @@ hashes is desired, it could return the full set of hashes. >>>> It looks good. I made some small changes to it in my own po branch. >>>> Nothing significant really. If this were not tied up in the po branch, >>>> I've have merged it to master already. --[[Joey]] + +>>>> Thanks, this is great :) --[[intrigeri]] From 00a9b8c176b1c9475fbd9848dea3037c7b287275 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 28 Mar 2009 06:43:31 -0400 Subject: [PATCH 5/7] po follow-up --- doc/plugins/contrib/po.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index c42cf3481..5f0de3b5e 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -345,12 +345,13 @@ daring a timid "please pull"... or rather, please review again :) > * Would it make sense to go ahead and modify `page.tmpl` to use > OTHERLANGUAGES and PERCENTTRANSLATED, instead of documenting how to modify it? >> ->> Sure, I'll do this today. +>> Done in my branch. >> > * Would it be better to disable po support for pages that use unsupported > or poorly-supported markup languages? > >> I prefer keeping it enabled, as: +>> >> * most wiki markups "almost work" >> * when someone needs one of these to be fully supported, it's not >> that hard to add dedicated support for it to po4a; if it were From 638cef639d97ff9065e8a05f1a7923c0d51d6de4 Mon Sep 17 00:00:00 2001 From: simonraven Date: Sun, 29 Mar 2009 01:28:16 -0400 Subject: [PATCH 6/7] minor formatting tweaks --- doc/tips/github.mdwn | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/tips/github.mdwn b/doc/tips/github.mdwn index 974d572f1..0a76166ee 100644 --- a/doc/tips/github.mdwn +++ b/doc/tips/github.mdwn @@ -26,16 +26,16 @@ for more space, or you can migrate your site elsewhere. ## local setup * On your laptop, create two empty git repositories to correspond to the - github repositories: - YOU=# your github username here - mkdir ~/$YOU.github.com - cd ~/$YOU.github.com - git init - git remote add origin git@github.com:$YOU/$YOU.github.com.git - mkdir ~/$YOU - cd ~/$YOU - git init - git remote add origin git@github.com:$YOU/$YOU.git + github repositories:
+ `YOU = your github username here`
+ `mkdir ~/$YOU.github.com`
+ `cd ~/$YOU.github.com`
+ `git init`
+ `git remote add origin git@github.com:$YOU/$YOU.github.com.git`
+ `mkdir ~/$YOU`
+ `cd ~/$YOU`
+ `git init`
+ `git remote add origin git@github.com:$YOU/$YOU.git`
* Add some wiki pages, such as an `index.mdwn`, to `~/$YOU`, and check them in and commit them to git. You need something to push to github. Run `git push origin master` to push the source pages to github. From d9364685baf6f35af44a658ab93206afa8397c6d Mon Sep 17 00:00:00 2001 From: simonraven Date: Sun, 29 Mar 2009 01:33:40 -0400 Subject: [PATCH 7/7] bit more tweakiness --- doc/tips/github.mdwn | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/doc/tips/github.mdwn b/doc/tips/github.mdwn index 0a76166ee..c3fdab734 100644 --- a/doc/tips/github.mdwn +++ b/doc/tips/github.mdwn @@ -11,22 +11,19 @@ two copies of the website in git (source and the compiled site), and all historical versions too. So it could happen. If it does, you can pay github for more space, or you can migrate your site elsewhere. -## github setup +## Github Setup -* Go to [github](http://github.com/) and sign up for an account, if you - haven't already. -* Be sure to add your laptop's ssh key to it so you can push - to github. -* Create a repository on githib named `$YOU.github.com`, substituting your - username. This repository will be used to publish your compiled website. +* Go to [github](http://github.com/) and sign up for an account, if you haven't already. +* Be sure to add your laptop's ssh key to it so you can push to github. +* Create a repository on github named `$YOU.github.com`, substituting your + *username*. This repository will be used to publish your compiled website. * Create a repository on github named `$YOU` (or anything else you like). This repository will be used to publish the source of your website. This is actually optional. -## local setup +## Local Setup -* On your laptop, create two empty git repositories to correspond to the - github repositories:
+* On your laptop, create two empty git repositories to correspond to the github repositories:
`YOU = your github username here`
`mkdir ~/$YOU.github.com`
`cd ~/$YOU.github.com`
@@ -40,22 +37,22 @@ for more space, or you can migrate your site elsewhere. in and commit them to git. You need something to push to github. Run `git push origin master` to push the source pages to github. -## publishing to github +## Publishing to Github -* Now build your wiki with a command such as: - ikiwiki ~/$YOU ~/$YOU.github.com --refresh +* Now build your wiki with a command such as:
+ `ikiwiki ~/$YOU ~/$YOU.github.com --refresh` * Each time you build the wiki you will need to commit the changes - to git, and push the compiled pages to github: - cd ~/YOU.github.com - git add . - git commit -a -m update - git push origin master + to git, and push the compiled pages to github:
+ `cd ~/YOU.github.com`
+ `git add .`
+ `git commit -a -m update`
+ `git push origin master`
Your wiki will show up at `http://$YOU.github.com/` within ten minutes after the first push, and changes you push to it from then on -should show up immediatly. +should show up immediately. -## enhancements +## Enhancements You can follow the instructions in [[laptop_wiki_with_git]] to set up an editable version of your wiki on your laptop. Then you can use the web