summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-03-29 14:54:53 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-03-29 14:54:53 -0400
commit3d8f0b1a3f749006424fb719ea1841ef366b5090 (patch)
tree4f28be138c57ec180f394076d322800020901302
parentb1551ed0e297e75492e578bf2445fcde99dad86a (diff)
parent82c3f6d7f4c8dd00589ba3c039856d6620ec2456 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts: doc/plugins/contrib/po.mdwn
-rw-r--r--doc/index/openid/discussion.mdwn17
-rw-r--r--doc/plugins/contrib/po.mdwn2
-rw-r--r--doc/tips/github.mdwn55
-rw-r--r--doc/todo/inline_postform_autotitles.mdwn (renamed from doc/todo/inline_autotitles.mdwn)5
-rw-r--r--doc/todo/need_global_renamepage_hook.mdwn2
5 files changed, 49 insertions, 32 deletions
diff --git a/doc/index/openid/discussion.mdwn b/doc/index/openid/discussion.mdwn
index 43575d4be..ae614e5ac 100644
--- a/doc/index/openid/discussion.mdwn
+++ b/doc/index/openid/discussion.mdwn
@@ -10,3 +10,20 @@ 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....
+
+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?
diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 3f5a65c05..618e16598 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -359,7 +359,7 @@ daring a timid "please pull"... or rather, please review again :)
>> disabled, I fear the ones who could do this would maybe think
>> it's blandly impossible and give up.
>>
->
+
> * What's the reasoning behind checking that the link plugin
> is enabled? AFAICS, the same code in the scan hook should
> also work when other link plugins like camelcase are used.
diff --git a/doc/tips/github.mdwn b/doc/tips/github.mdwn
index 974d572f1..c3fdab734 100644
--- a/doc/tips/github.mdwn
+++ b/doc/tips/github.mdwn
@@ -11,51 +11,48 @@ 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:
- 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
+* On your laptop, create two empty git repositories to correspond to the github repositories: <br />
+ `YOU = your github username here` <br />
+ `mkdir ~/$YOU.github.com` <br />
+ `cd ~/$YOU.github.com` <br />
+ `git init` <br />
+ `git remote add origin git@github.com:$YOU/$YOU.github.com.git` <br />
+ `mkdir ~/$YOU` <br />
+ `cd ~/$YOU` <br />
+ `git init` <br />
+ `git remote add origin git@github.com:$YOU/$YOU.git` <br />
* 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.
-## 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: <br />
+ `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: <br />
+ `cd ~/YOU.github.com` <br />
+ `git add .` <br />
+ `git commit -a -m update` <br />
+ `git push origin master` <br />
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
diff --git a/doc/todo/inline_autotitles.mdwn b/doc/todo/inline_postform_autotitles.mdwn
index 8bf71deae..5005208be 100644
--- a/doc/todo/inline_autotitles.mdwn
+++ b/doc/todo/inline_postform_autotitles.mdwn
@@ -1,8 +1,9 @@
[[!tag wishlist]]
[[!tag patch]]
-for inlines of pages which follow a certain scheme, it might not be required to
-set the title for each individual post, but to automatically set the title.
+for postforms in inlines of pages which follow a certain scheme, it might not
+be required to set the title for each individual post, but to automatically set
+the title and show no input box prompting for it.
this can either be based on timestamp formatting, or use the already existing
munging mechanism, which appends numbers to page titles in case that page
already exists.
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]]