Recent changes to this wiki:

response
diff --git a/news/login_using_email_address/comment_3_549c852b9f95eb1dbd859343e8da6564._comment b/news/login_using_email_address/comment_3_549c852b9f95eb1dbd859343e8da6564._comment
new file mode 100644
index 0000000..38eafc6
--- /dev/null
+++ b/news/login_using_email_address/comment_3_549c852b9f95eb1dbd859343e8da6564._comment
@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2016-11-29T21:39:01Z"
+ content="""
+Yes, if someone can see your email, they can login as you. The login emails
+do have some safeguards:
+
+* A login link can only be used once, so if you've used it, and were
+  successfully logged in, you know noone else also used it.
+* A login link expires after 1 day.
+* Only the most recently emailed login link can be used to log in.
+
+This should make it secure enough for casual users editing a wiki or
+commenting. In some cases, it's not the best choice for logging in as a
+site's administrator, and you can keep the administrator logins limited to
+openid if necessary.
+
+Encrypting the login email with gpg is a good idea, but would have to be
+implemented in [ikiwiki](https://ikiwiki.info/) ... and you would have to
+paste in their gpg public key so it knew who to encrypt to.
+"""]]

Added a comment: Send encrypted email ?
diff --git a/news/login_using_email_address/comment_2_da24f5e1aa3b4f17e5e6a8d6a69b7bb5._comment b/news/login_using_email_address/comment_2_da24f5e1aa3b4f17e5e6a8d6a69b7bb5._comment
new file mode 100644
index 0000000..ba4e5b9
--- /dev/null
+++ b/news/login_using_email_address/comment_2_da24f5e1aa3b4f17e5e6a8d6a69b7bb5._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="charles@35087836c8a7a60afb0031ac5c77345fd03e9d0c"
+ nickname="charles"
+ avatar="http://cdn.libravatar.org/avatar/862d1e673bd642fd66ce894c87b331b8"
+ subject="Send encrypted email ?"
+ date="2016-11-26T10:36:31Z"
+ content="""
+Thanks a lot, it is a very useful feature, that I just used.  But I wonder... anybody eavesdropping on the network can get the login links.  Would it make sense to send them gpg-encrypted ? (provided of course that the user adds a key ID in the setup.)
+"""]]

Added a comment
diff --git a/forum/Custom_plugins__63__/comment_4_454450319a46cd5f96b6b438b0200663._comment b/forum/Custom_plugins__63__/comment_4_454450319a46cd5f96b6b438b0200663._comment
new file mode 100644
index 0000000..9d42a61
--- /dev/null
+++ b/forum/Custom_plugins__63__/comment_4_454450319a46cd5f96b6b438b0200663._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="martinopenmedi@15a08fd2009e6e038035db82e314202b760eb4e9"
+ nickname="martinopenmedi"
+ avatar="http://cdn.libravatar.org/avatar/a42d16fae5b3d9eafabeca3834c901e0"
+ subject="comment 4"
+ date="2016-11-20T22:16:00Z"
+ content="""
+I see. I guess, I'll have to respect your position and see if I can figure something out. I have [opened an issue over at the plugins repo](https://github.com/sciunto-org/ikiwiki-pandoc/issues/18), to see what they think about either of your suggestions.
+"""]]

comment
diff --git a/forum/Custom_plugins__63__/comment_3_3d6f35f30afa520a7f0927f45b8e5f7f._comment b/forum/Custom_plugins__63__/comment_3_3d6f35f30afa520a7f0927f45b8e5f7f._comment
new file mode 100644
index 0000000..c6920cb
--- /dev/null
+++ b/forum/Custom_plugins__63__/comment_3_3d6f35f30afa520a7f0927f45b8e5f7f._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2016-11-20T17:33:26Z"
+ content="""
+That's right, you'd need to ask Debian to get it packaged
+(or package it yourself and get that package into Debian).
+
+Alternatively, it might make sense to add the plugin to Ikiwiki,
+and as long as its dependecies are available in Debian (which Pandoc is), 
+it could then be enabled on Branchable.
+
+This may seem a roundabout way to get Branchable to support something,
+but many people can add packages to Debian, and anyone can submit patches
+to Ikiwiki to add plugins, while only a few people administer Branchable.
+"""]]

Added a comment
diff --git a/forum/Custom_plugins__63__/comment_2_6305c2ae19028a551b9ef681f3e81e52._comment b/forum/Custom_plugins__63__/comment_2_6305c2ae19028a551b9ef681f3e81e52._comment
new file mode 100644
index 0000000..b579850
--- /dev/null
+++ b/forum/Custom_plugins__63__/comment_2_6305c2ae19028a551b9ef681f3e81e52._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="martinopenmedi@15a08fd2009e6e038035db82e314202b760eb4e9"
+ nickname="martinopenmedi"
+ avatar="http://cdn.libravatar.org/avatar/a42d16fae5b3d9eafabeca3834c901e0"
+ subject="comment 2"
+ date="2016-11-18T20:56:55Z"
+ content="""
+As far as I can tell it should be possible to package the plugin for debian, although I'm but a user, that is not very familiar with debian. Are you trying to say I should either try to pack this plugin myself or get someone to do it?
+"""]]

response
diff --git a/forum/Custom_plugins__63__/comment_1_06fb62b7b62341d31062cb03f65d4690._comment b/forum/Custom_plugins__63__/comment_1_06fb62b7b62341d31062cb03f65d4690._comment
new file mode 100644
index 0000000..67f80a7
--- /dev/null
+++ b/forum/Custom_plugins__63__/comment_1_06fb62b7b62341d31062cb03f65d4690._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-11-18T14:48:39Z"
+ content="""
+Branchable is built on Debian. If the plugin can get packaged and included
+in Debian, we can easily enable it on Branchable.
+"""]]

diff --git a/forum/Custom_plugins__63__.mdwn b/forum/Custom_plugins__63__.mdwn
new file mode 100644
index 0000000..2bdc89c
--- /dev/null
+++ b/forum/Custom_plugins__63__.mdwn
@@ -0,0 +1 @@
+Is it possible to have custom plugins at branchable? I'm asking, because I rely on the [ikiwiki-pandoc](https://github.com/sciunto-org/ikiwiki-pandoc) plugin for building my pages as well as creating references and citations and it is a neccessary component of my wiki.

diff --git a/forum/Not_logged_in_as_an_admin.mdwn b/forum/Not_logged_in_as_an_admin.mdwn
index 3180322..3f7c3cb 100644
--- a/forum/Not_logged_in_as_an_admin.mdwn
+++ b/forum/Not_logged_in_as_an_admin.mdwn
@@ -1,4 +1,4 @@
 I seems that I have the same problem as [this user](http://www.branchable.com/forum/you_are_not_logged_in_as_an_admin/). I might have been disconnected from the internet accidently when I was in the middle of the sign up process.
 
-My wiki: zettelkasten.branchable.com
-My Email: martinopenmedi at Gmail
+My wiki: [redacted]
+My Email: [redacted]

Added a comment
diff --git a/forum/Not_logged_in_as_an_admin/comment_2_619cfa7f675da6d49d94d9d12aba4461._comment b/forum/Not_logged_in_as_an_admin/comment_2_619cfa7f675da6d49d94d9d12aba4461._comment
new file mode 100644
index 0000000..99a9391
--- /dev/null
+++ b/forum/Not_logged_in_as_an_admin/comment_2_619cfa7f675da6d49d94d9d12aba4461._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="martinopenmedi@15a08fd2009e6e038035db82e314202b760eb4e9"
+ nickname="martinopenmedi"
+ avatar="http://cdn.libravatar.org/avatar/a42d16fae5b3d9eafabeca3834c901e0"
+ subject="comment 2"
+ date="2016-11-12T10:24:59Z"
+ content="""
+I see. I might have been confused about the various login methods. I thought I had associated my email with a username and a password and tried to login using that.
+"""]]

comment
diff --git a/forum/Not_logged_in_as_an_admin/comment_1_ee8bb493832f874f85d4bcb46860986c._comment b/forum/Not_logged_in_as_an_admin/comment_1_ee8bb493832f874f85d4bcb46860986c._comment
new file mode 100644
index 0000000..f1a971f
--- /dev/null
+++ b/forum/Not_logged_in_as_an_admin/comment_1_ee8bb493832f874f85d4bcb46860986c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-11-11T18:33:23Z"
+ content="""
+As far as I can see, the site is set up correctly. Your gmail address is
+configured as the admin. I have rebuilt the site just in case.
+"""]]

diff --git a/forum/Not_logged_in_as_an_admin.mdwn b/forum/Not_logged_in_as_an_admin.mdwn
new file mode 100644
index 0000000..3180322
--- /dev/null
+++ b/forum/Not_logged_in_as_an_admin.mdwn
@@ -0,0 +1,4 @@
+I seems that I have the same problem as [this user](http://www.branchable.com/forum/you_are_not_logged_in_as_an_admin/). I might have been disconnected from the internet accidently when I was in the middle of the sign up process.
+
+My wiki: zettelkasten.branchable.com
+My Email: martinopenmedi at Gmail

remove suggestion to use StartSSL, which has been very incompetant lately
diff --git a/tips/using_https.mdwn b/tips/using_https.mdwn
index 54fccc2..081247a 100644
--- a/tips/using_https.mdwn
+++ b/tips/using_https.mdwn
@@ -15,9 +15,6 @@ If you have your [[own domain|tips/using_own_domain]] for your
 Branchable site, you'll need to get your own certificate to go with it
 in order to use https.
 
-One way to get a SSL certificate for free for personal use is from 
-[StartSSL](http://startssl.com/).
-
 ## install your certificate
 
 We don't currently provide an automated way to install your certificate

news
diff --git a/news/beta_Lets_Encrypt_integration.mdwn b/news/beta_Lets_Encrypt_integration.mdwn
new file mode 100644
index 0000000..aeb1387
--- /dev/null
+++ b/news/beta_Lets_Encrypt_integration.mdwn
@@ -0,0 +1,13 @@
+Branchable can now use [Lets Encrypt](https://letsencrypt.org/) to get
+https certificates.
+
+We plan to eventually use this for all sites hosted at Branchable, but if
+you'd like to help test it with your site, you can now. Just go to the 
+[[Control_Panel|controlpanel]], click on the Setup button for your site,
+check the box for "use Lets Encrypt to generate http certificate", and save
+the change.
+
+It may take a day or two for your site to get a certificate from Lets
+Encrypt, depending on how many others are requesting a certificate. Once
+your site gets a Lets Encrypt certificate, it should be renewed every 90
+days automatically from then on.
diff --git a/tips/using_https.mdwn b/tips/using_https.mdwn
index 47d7da7..54fccc2 100644
--- a/tips/using_https.mdwn
+++ b/tips/using_https.mdwn
@@ -6,6 +6,9 @@ extension called Server Name Indication ([RFC 4366](http://www.ietf.org/rfc/rfc4
 Some older browsers may lack support for it, and won't be able to use
 https with Branchable.
 
+Update: Rather than sending us a certificate as described below, consider
+using our new [[news/beta_Lets_Encrypt_integration]]!
+
 ## get a certificate for your own domain
 
 If you have your [[own domain|tips/using_own_domain]] for your

response
diff --git a/forum/is_not_here_yet/comment_1_a6de7f4e27e84a74a9ae6b486741c68f._comment b/forum/is_not_here_yet/comment_1_a6de7f4e27e84a74a9ae6b486741c68f._comment
new file mode 100644
index 0000000..4ff8ab1
--- /dev/null
+++ b/forum/is_not_here_yet/comment_1_a6de7f4e27e84a74a9ae6b486741c68f._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-10-13T18:10:02Z"
+ content="""
+This is because your site has been configured to also be served up for an
+external domain, www.guppy.uk.to in particular. When using an external
+domain, https is only enabled if you send us a certificate for that domain,
+see [[tips/using_https]].
+"""]]

diff --git a/forum/is_not_here_yet.mdwn b/forum/is_not_here_yet.mdwn
new file mode 100644
index 0000000..bd7e1ac
--- /dev/null
+++ b/forum/is_not_here_yet.mdwn
@@ -0,0 +1,3 @@
+"The site guppy.branchable.com is not here yet" for the https version. http version works fine. How to fix?
+
+Thanks

Added a comment
diff --git a/forum/you_are_not_logged_in_as_an_admin/comment_6_08e27044a7b44f3619f157e2851aae7f._comment b/forum/you_are_not_logged_in_as_an_admin/comment_6_08e27044a7b44f3619f157e2851aae7f._comment
new file mode 100644
index 0000000..9d0f2b4
--- /dev/null
+++ b/forum/you_are_not_logged_in_as_an_admin/comment_6_08e27044a7b44f3619f157e2851aae7f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="svetlana@192500fb6a2e2ef8e78d1a08cca64b1bca9833b9"
+ nickname="svetlana"
+ subject="comment 6"
+ date="2016-07-22T00:36:25Z"
+ content="""
+have same problem again, using a different email now
+"""]]

response
diff --git a/forum/Using_subdirectory_for_ikiwiki_source_dir_for_git_project/comment_5_224cca19aaefafe205b0c583d81047e9._comment b/forum/Using_subdirectory_for_ikiwiki_source_dir_for_git_project/comment_5_224cca19aaefafe205b0c583d81047e9._comment
new file mode 100644
index 0000000..880057b
--- /dev/null
+++ b/forum/Using_subdirectory_for_ikiwiki_source_dir_for_git_project/comment_5_224cca19aaefafe205b0c583d81047e9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""standingwithresilience"""
+ date="2016-05-29T15:00:46Z"
+ content="""
+I moved standingwithresilience to use the wiki folder you had already
+created. 
+"""]]

Added a comment: Subdirectory Request
diff --git a/forum/Using_subdirectory_for_ikiwiki_source_dir_for_git_project/comment_4_b3690f610b4901c5ca2c5ba4b82b2c6e._comment b/forum/Using_subdirectory_for_ikiwiki_source_dir_for_git_project/comment_4_b3690f610b4901c5ca2c5ba4b82b2c6e._comment
new file mode 100644
index 0000000..8f1306d
--- /dev/null
+++ b/forum/Using_subdirectory_for_ikiwiki_source_dir_for_git_project/comment_4_b3690f610b4901c5ca2c5ba4b82b2c6e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="standing.with.resilience@81199d01341bd8e54302967072b3ee54a43b6232"
+ nickname="standing.with.resilience"
+ subject="Subdirectory Request"
+ date="2016-05-26T20:50:24Z"
+ content="""
+Hi, could you move standingwithresilience to a /wiki subfolder?
+"""]]

Added a comment
diff --git a/bugs/login_failures_without_https/comment_2_69a96da3a434557d6f55aaecf2423704._comment b/bugs/login_failures_without_https/comment_2_69a96da3a434557d6f55aaecf2423704._comment
new file mode 100644
index 0000000..1ff1663
--- /dev/null
+++ b/bugs/login_failures_without_https/comment_2_69a96da3a434557d6f55aaecf2423704._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="comment 2"
+ date="2016-04-29T00:15:36Z"
+ content="""
+it says:
+
+    Error: login failed, perhaps you need to turn on cookies?
+
+to post this comment, I had to login to this very wiki. i tried to login through HTTP, and now it failed with the `time_bad_sig` error. flip to HTTPS and I am logged in fine again.
+
+so i feel something fishy is going on with HTTPS.
+"""]]

response
diff --git a/bugs/login_failures_without_https/comment_1_32a4255ad40c3db97eb3a4e22c951558._comment b/bugs/login_failures_without_https/comment_1_32a4255ad40c3db97eb3a4e22c951558._comment
new file mode 100644
index 0000000..00ce9b0
--- /dev/null
+++ b/bugs/login_failures_without_https/comment_1_32a4255ad40c3db97eb3a4e22c951558._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-04-28T23:26:05Z"
+ content="""
+It's up to individial site admins whether a site is configured to redirect
+http to https or support both.
+
+There's nothing https-specific in the login interface. I can log into
+ikiwiki.info using http just fine.
+
+Please describe what you mean by "impossible to login". What do you do to
+login? What does it say?
+"""]]

diff --git a/bugs/login_failures_without_https.mdwn b/bugs/login_failures_without_https.mdwn
index 552c11a..1ba00e5 100644
--- a/bugs/login_failures_without_https.mdwn
+++ b/bugs/login_failures_without_https.mdwn
@@ -5,3 +5,5 @@ https://ikiwiki.info/bugs/cannot_login/
 Basically, on ikiwiki.info and git-annex.branchable.com, if I use plain HTTP, it is impossible to login. However, going to HTTPS works fine and I am *already* logged in.
 
 It is unclear to me why HTTP is still supported if HTTPS just works out of the box: it should just be a redirection and all traffic should be in HTTPS. -- [[anarcat]]
+
+Ah and do note that I am editing this site in HTTP without problem - presumably it's how I logged in here so it works.

move bug here?
diff --git a/bugs/login_failures_without_https.mdwn b/bugs/login_failures_without_https.mdwn
new file mode 100644
index 0000000..552c11a
--- /dev/null
+++ b/bugs/login_failures_without_https.mdwn
@@ -0,0 +1,7 @@
+I originally filed that bug in Ikiwiki, but now I starting to think this is a problem specific to the branchable deployment here:
+
+https://ikiwiki.info/bugs/cannot_login/
+
+Basically, on ikiwiki.info and git-annex.branchable.com, if I use plain HTTP, it is impossible to login. However, going to HTTPS works fine and I am *already* logged in.
+
+It is unclear to me why HTTP is still supported if HTTPS just works out of the box: it should just be a redirection and all traffic should be in HTTPS. -- [[anarcat]]

Added a comment: clarification
diff --git a/bugs/joey_no_longer_has_hair/comment_2_f0046f7f7a9bce1684616e86dbd510bd._comment b/bugs/joey_no_longer_has_hair/comment_2_f0046f7f7a9bce1684616e86dbd510bd._comment
new file mode 100644
index 0000000..9c1e610
--- /dev/null
+++ b/bugs/joey_no_longer_has_hair/comment_2_f0046f7f7a9bce1684616e86dbd510bd._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="clarification"
+ date="2016-04-28T14:09:31Z"
+ content="""
+i consider joey's lack of hair to be the bug here, not the pictures. :p i'm a hair fan, sorry, couldn't help it.. ;)
+"""]]

Added a comment: no invoice sent
diff --git a/news/login_using_email_address/comment_1_5115ea4c14c1cb6d71349bee97ad023f._comment b/news/login_using_email_address/comment_1_5115ea4c14c1cb6d71349bee97ad023f._comment
new file mode 100644
index 0000000..464c5f6
--- /dev/null
+++ b/news/login_using_email_address/comment_1_5115ea4c14c1cb6d71349bee97ad023f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="standing.with.resilience@81199d01341bd8e54302967072b3ee54a43b6232"
+ nickname="standing.with.resilience"
+ subject="no invoice sent"
+ date="2016-03-13T23:42:27Z"
+ content="""
+I started a new branchable using e-mail address login and was never sent an introductory invoice.  I thought I would be given an option to pay, and was wondering if perhaps it was an issue with using e-mail address login.
+"""]]

diff --git a/forum/community_wiki_accept_donations__63__.mdwn b/forum/community_wiki_accept_donations__63__.mdwn
new file mode 100644
index 0000000..671f5c1
--- /dev/null
+++ b/forum/community_wiki_accept_donations__63__.mdwn
@@ -0,0 +1 @@
+Is there some way to embed the current balance for the website owner on a wiki, such that visitors can decide to donate to keep it alive?

Added a comment
diff --git a/bugs/Launchpad_OpenID_login_failure/comment_2_132a57c7756138476aeacdd90141daa1._comment b/bugs/Launchpad_OpenID_login_failure/comment_2_132a57c7756138476aeacdd90141daa1._comment
new file mode 100644
index 0000000..9025f01
--- /dev/null
+++ b/bugs/Launchpad_OpenID_login_failure/comment_2_132a57c7756138476aeacdd90141daa1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f"
+ nickname="grawity"
+ subject="comment 2"
+ date="2016-03-03T05:47:14Z"
+ content="""
+Yeah, that seems like the case. (Just yesterday I had problems with LJ and some other websites, too.) I guess it's typical for Launchpad, based on other bugs I've reported about their service as well.
+
+I've been using the email logins for now, but it's not exactly the most convenient method. Will probably try switching to another OpenID provider too.
+"""]]

response
diff --git a/bugs/Launchpad_OpenID_login_failure/comment_1_18e9230c4ffd481ad848904fbd070a5a._comment b/bugs/Launchpad_OpenID_login_failure/comment_1_18e9230c4ffd481ad848904fbd070a5a._comment
new file mode 100644
index 0000000..dfb54f7
--- /dev/null
+++ b/bugs/Launchpad_OpenID_login_failure/comment_1_18e9230c4ffd481ad848904fbd070a5a._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-02T19:58:10Z"
+ content="""
+Could be that Launchpad's openid support has broken, or changed in some way
+that makes it not compatable with the openid library that ikiwiki uses.
+
+I'd recommend using the email login method indead.
+"""]]

Added a comment: Error: you are not logged in as an admin
diff --git a/forum/Login_failures/comment_8_f2c1c3ed676efffd5580f2594c505ab2._comment b/forum/Login_failures/comment_8_f2c1c3ed676efffd5580f2594c505ab2._comment
new file mode 100644
index 0000000..16481c1
--- /dev/null
+++ b/forum/Login_failures/comment_8_f2c1c3ed676efffd5580f2594c505ab2._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="philippe.gimmel@ffabc88f944f9cee46d0b2113b9b5b38c9be7e0d"
+ nickname="philippe.gimmel"
+ subject="  Error: you are not logged in as an admin"
+ date="2016-02-26T11:28:59Z"
+ content="""
+I think I have the exact same issue. The account creation somehow went wrong but the site is there and works, I can edit the posts, but not change themes etc.
+
+Could you make the email that I used to create the account admin? The site is manykilometres.branchable.com. Sorry!
+"""]]

diff --git a/bugs/Launchpad_OpenID_login_failure.mdwn b/bugs/Launchpad_OpenID_login_failure.mdwn
new file mode 100644
index 0000000..8657ba8
--- /dev/null
+++ b/bugs/Launchpad_OpenID_login_failure.mdwn
@@ -0,0 +1,5 @@
+I can't seem to log in with my Launchpad-provided OpenID (neither delegated via `https://nullroute.eu.org/~grawity/`, nor directly via `https://launchpad.net/~grawity`). After authenticating to Launchpad/UbuntuOne, I get redirected back to an error message:
+
+> Error: OpenID failure: naive_verify_failed_return: Direct contact invalidated ID provider response
+
+However I've noticed that Launchpad OpenID works fine for [other people](http://source.git-annex.branchable.com/?p=source.git;a=commit;h=c72ffee7356b518896bb8d1f46c17932321cf5cd).

comment
diff --git a/forum/Login_failures/comment_7_c1ed7e8f1085a0a6b48f37d280ce258e._comment b/forum/Login_failures/comment_7_c1ed7e8f1085a0a6b48f37d280ce258e._comment
new file mode 100644
index 0000000..350fc59
--- /dev/null
+++ b/forum/Login_failures/comment_7_c1ed7e8f1085a0a6b48f37d280ce258e._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 7"""
+ date="2016-01-20T00:54:52Z"
+ content="""
+Thanks for checking that. It makes sense; until you accept the terms, you
+don't control the site. Since we can't tell when users skip that step, vs
+just taking a long time to do it, we keep such sites around for a day and
+then normally delete them.
+
+As for logging it to blog.tosdr.org, log in using the email address 
+hugo+branchable(at)tosdr.org and you should then be the admin.
+"""]]

Added a comment: Error: ikisite-wrapper failed
diff --git a/forum/Login_failures/comment_6_718c5a3b1de92c0dc87ff57b33c9e880._comment b/forum/Login_failures/comment_6_718c5a3b1de92c0dc87ff57b33c9e880._comment
new file mode 100644
index 0000000..6fa5073
--- /dev/null
+++ b/forum/Login_failures/comment_6_718c5a3b1de92c0dc87ff57b33c9e880._comment
@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="hugo"
+ subject="Error: ikisite-wrapper failed"
+ date="2016-01-14T21:07:21Z"
+ content="""
+So, I manage to replicate it:
+
+1. Create a new ikiwiki site from the control panel
+2. Do not accept the new terms
+3. Try to delete the newly created site
+4. Login by email
+5. Then choose the button to delete the entire site
+6. 
+
+    lex/ Error
+    
+        RecentChanges Preferences Branchable 
+    
+    Error: ikisite-wrapper failed
+
+
+"""]]

Added a comment
diff --git a/forum/Login_failures/comment_5_054d6f1ec88709cb52c8c85d74e26f66._comment b/forum/Login_failures/comment_5_054d6f1ec88709cb52c8c85d74e26f66._comment
new file mode 100644
index 0000000..6184f23
--- /dev/null
+++ b/forum/Login_failures/comment_5_054d6f1ec88709cb52c8c85d74e26f66._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="hugo"
+ subject="comment 5"
+ date="2016-01-14T20:59:52Z"
+ content="""
+I still can't login as admin for blog.tosdr.org (where I want to update the DNS settings).
+
+I will try to replicate what I did to give you more information, but there wasn't much besides the error about ikisite-wrapper failing. 
+"""]]

comment
diff --git a/forum/Login_failures/comment_4_56111b1eaed3b002f990ce60c1ac3102._comment b/forum/Login_failures/comment_4_56111b1eaed3b002f990ce60c1ac3102._comment
new file mode 100644
index 0000000..61676cf
--- /dev/null
+++ b/forum/Login_failures/comment_4_56111b1eaed3b002f990ce60c1ac3102._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2016-01-14T20:28:57Z"
+ content="""
+I've deleted all 3 sites. So, you should be either able to make a new site
+with the name you wanted, or perhaps replicate what happened before and
+send enough details so I can debug it.
+"""]]

Added a comment
diff --git a/forum/Login_failures/comment_3_2756a7b80ac7373fa47a640d32c30fc3._comment b/forum/Login_failures/comment_3_2756a7b80ac7373fa47a640d32c30fc3._comment
new file mode 100644
index 0000000..bf995fc
--- /dev/null
+++ b/forum/Login_failures/comment_3_2756a7b80ac7373fa47a640d32c30fc3._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="hugo+branchable.com@cc01427534be4a58ff943f31c8545e03297bab82"
+ nickname="hugo+branchable.com"
+ subject="comment 3"
+ date="2016-01-14T07:45:40Z"
+ content="""
+I have tried to delete the websites, but I got an iki-wrapper error. They still show up in the controlpanel, although it appears they have well be deleted.
+
+I still can't login as admin for blog.tosdr.org. I get:
+
+Error: you are not logged in as an admin 
+"""]]

Added a comment: Thank you!
diff --git a/forum/Login_failures/comment_2_f2526cc986f55f3fee1b45d45d647623._comment b/forum/Login_failures/comment_2_f2526cc986f55f3fee1b45d45d647623._comment
new file mode 100644
index 0000000..1a85ef7
--- /dev/null
+++ b/forum/Login_failures/comment_2_f2526cc986f55f3fee1b45d45d647623._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="hugo+branchable.com@cc01427534be4a58ff943f31c8545e03297bab82"
+ nickname="hugo+branchable.com"
+ subject="Thank you!"
+ date="2016-01-13T21:50:05Z"
+ content="""
+... and sorry for the mess
+"""]]

response
diff --git a/forum/Login_failures/comment_1_5d8748c00dc1988e725df45f1193aa8f._comment b/forum/Login_failures/comment_1_5d8748c00dc1988e725df45f1193aa8f._comment
new file mode 100644
index 0000000..2fbc2be
--- /dev/null
+++ b/forum/Login_failures/comment_1_5d8748c00dc1988e725df45f1193aa8f._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-01-12T21:44:18Z"
+ content="""
+It seems that you never finished the setup process for these two sites, so
+neither one had you configured as an admin.
+
+The only way that could normally happen is if you asked for the site to be
+created, but then didn't click on the next button.
+
+I have set your email address as the admin for both sites, so you should
+now be able to delete or whatever them yourself.
+"""]]

diff --git a/forum/Login_failures.mdwn b/forum/Login_failures.mdwn
index 68e1319..4b4e077 100644
--- a/forum/Login_failures.mdwn
+++ b/forum/Login_failures.mdwn
@@ -1,4 +1,4 @@
-I have a hard time to login as admin of ikiwikis that I have created from the Control Panel. 
+I have a hard time to login as admin of ikiwikis that I have created from the Control Panel.  As a result I'm blocked from doing any of these actions:
 
 Can you delete these two sites?
 	
@@ -10,13 +10,12 @@ lex
 lex-hroy-eu.branchable.com
 Created 3 minutes ago
 
+Can you move the DNS settings from tosdr-blog.branchable.com to blog-tosdr-org.branchable.com and then delete tosdr-blog.branchable.com?
 
-and make me an admin account for:
+Can you make me an admin account for:
 	
 lex
 lex-hroy-eu2.branchable.com
 Created 3 minutes ago 
 
 Thank you.
-
-This puts me in 4 sites out of 3 from the basic plan but I'm moving the tosdr blog to another account so I may delete this one too soon.

diff --git a/forum/Login_failures.mdwn b/forum/Login_failures.mdwn
index cfd2e40..68e1319 100644
--- a/forum/Login_failures.mdwn
+++ b/forum/Login_failures.mdwn
@@ -17,6 +17,6 @@ lex
 lex-hroy-eu2.branchable.com
 Created 3 minutes ago 
 
-Thanks.
+Thank you.
 
 This puts me in 4 sites out of 3 from the basic plan but I'm moving the tosdr blog to another account so I may delete this one too soon.

diff --git a/forum/Login_failures.mdwn b/forum/Login_failures.mdwn
new file mode 100644
index 0000000..cfd2e40
--- /dev/null
+++ b/forum/Login_failures.mdwn
@@ -0,0 +1,22 @@
+I have a hard time to login as admin of ikiwikis that I have created from the Control Panel. 
+
+Can you delete these two sites?
+	
+Hugo Roy / avocat
+hugoroyavocat.branchable.com
+Created 2 days and 9 hours ago
+	
+lex
+lex-hroy-eu.branchable.com
+Created 3 minutes ago
+
+
+and make me an admin account for:
+	
+lex
+lex-hroy-eu2.branchable.com
+Created 3 minutes ago 
+
+Thanks.
+
+This puts me in 4 sites out of 3 from the basic plan but I'm moving the tosdr blog to another account so I may delete this one too soon.

Added a comment: Original bug reported to text-multimarkdown
diff --git a/bugs/Tables_in_Multimarkdown_are_not_rendered_properly/comment_2_670e26064a24c563167fbd90609cc855._comment b/bugs/Tables_in_Multimarkdown_are_not_rendered_properly/comment_2_670e26064a24c563167fbd90609cc855._comment
new file mode 100644
index 0000000..d4443ad
--- /dev/null
+++ b/bugs/Tables_in_Multimarkdown_are_not_rendered_properly/comment_2_670e26064a24c563167fbd90609cc855._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="emacsprimerwiki@2c9233a5c0092621dad30675288c42dd2017ebba"
+ nickname="emacsprimerwiki"
+ subject="Original bug reported to text-multimarkdown"
+ date="2015-12-28T18:06:39Z"
+ content="""
+Original bug reported to text-multimarkdown as <https://github.com/bobtfish/text-multimarkdown/issues/28>
+"""]]

response
diff --git a/bugs/Tables_in_Multimarkdown_are_not_rendered_properly/comment_1_e9422d76093ce3a21302dc31c93d5e9c._comment b/bugs/Tables_in_Multimarkdown_are_not_rendered_properly/comment_1_e9422d76093ce3a21302dc31c93d5e9c._comment
new file mode 100644
index 0000000..ea0d1e6
--- /dev/null
+++ b/bugs/Tables_in_Multimarkdown_are_not_rendered_properly/comment_1_e9422d76093ce3a21302dc31c93d5e9c._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2015-12-28T16:20:44Z"
+ content="""
+Clearly this is a bug in multimarkdown. Note that ikiwiki does not use
+multimarkdown by default. Also note that ikiwiki has its own
+[[table directive|ikiwiki/directive/table]] which can build html tables,
+and that exists largely because markdown's table support doesn't work very
+well.
+
+So, your choices are:
+
+1. File a bug report on <https://github.com/bobtfish/text-multimarkdown/issues>
+2. Disable multimarkdown, and use the standard markdown tables.
+3. Use ikiwiki's table directive.
+"""]]

diff --git a/bugs/Tables_in_Multimarkdown_are_not_rendered_properly.mdwn b/bugs/Tables_in_Multimarkdown_are_not_rendered_properly.mdwn
index bf65cc6..581b220 100644
--- a/bugs/Tables_in_Multimarkdown_are_not_rendered_properly.mdwn
+++ b/bugs/Tables_in_Multimarkdown_are_not_rendered_properly.mdwn
@@ -47,9 +47,4 @@ This is what is reported when I commit the above page.
     remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
     remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
 
-Here is how it is rendered on my screen
 
-
-
-
-[[!img Screenshot_from_2015-12-28_12:44:45.png align="left" size="" alt="" captions="Multimarkdown tables not rendered properly"]]

creating tag page tags/essentials
diff --git a/tags/essentials.mdwn b/tags/essentials.mdwn
new file mode 100644
index 0000000..7fd8576
--- /dev/null
+++ b/tags/essentials.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged essentials"]]
+
+[[!inline pages="tagged(essentials)" actions="no" archive="yes"
+feedshow=10]]

diff --git a/bugs/Tables_in_Multimarkdown_are_not_rendered_properly.mdwn b/bugs/Tables_in_Multimarkdown_are_not_rendered_properly.mdwn
new file mode 100644
index 0000000..bf65cc6
--- /dev/null
+++ b/bugs/Tables_in_Multimarkdown_are_not_rendered_properly.mdwn
@@ -0,0 +1,55 @@
+Summary: Tables in Multimarkdown are not rendered properly
+
+Here is the page that demonstrates the bug: <http://emacs-primer.branchable.com/bugs/Text_Editing_Essentials/>
+
+Note that the second table is rendered properly while the first and
+last tables are clobbered.  I expect the first and last table to be
+rendered without any header rows.
+
+Here is the markdown content.
+
+    [[!tag essentials]]
+    
+    # Keys
+    
+    | Notation | How to read it | Where on the keyboard |
+    | C        | CONTROL key    | CTRL, CTL             |
+    | M        | META key       | EDIT or ALT           |
+    
+    # Key Notation
+    
+    | Notation | What to do                                         |
+    | `C-x`    | Hold the CONTROL key and type character `x`        |
+    | `M-x`    | Hold the META or EDIT or ALT key down and type `x` |
+    |          | Press and release the ESC key and type `x`         |
+    
+    # Save My Soul
+    
+    | Task       | Binding   |
+    | SOS        | `C-g`     |
+    | Exit Emacs | `C-x C-c` |
+
+This is what is reported when I commit the above page.
+
+    emacsprimer@debian-8:~/src/emacs-primer/bugs$ git push
+    Counting objects: 4, done.
+    Delta compression using up to 2 threads.
+    Compressing objects: 100% (4/4), done.
+    Writing objects: 100% (4/4), 616 bytes | 0 bytes/s, done.
+    Total 4 (delta 1), reused 0 (delta 0)
+    remote: From /home/b-emacs-primer/source
+    remote:    41f0c60..875f459  master     -> origin/master
+    remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
+    remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
+    remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
+    remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
+    remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
+    remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
+    remote: Use of uninitialized value $body in split at /usr/share/perl5/Text/MultiMarkdown.pm line 1140.
+
+Here is how it is rendered on my screen
+
+
+
+
+[[!img Screenshot_from_2015-12-28_12:44:45.png align="left" size="" alt="" captions="Multimarkdown tables not rendered properly"]]

Make idempotent.
diff --git a/tips/Off-line_copy_of_a_Branchable_site.mdwn b/tips/Off-line_copy_of_a_Branchable_site.mdwn
index 5f76474..4dcdfb7 100644
--- a/tips/Off-line_copy_of_a_Branchable_site.mdwn
+++ b/tips/Off-line_copy_of_a_Branchable_site.mdwn
@@ -26,9 +26,8 @@ export LOCALDOMAIN=example.com
    merged in that branch.
 
 <pre>
-cd $LOCALPATH
-mkdir -p $NAME/setup
-cd $NAME/setup
+mkdir -p $LOCALPATH/$NAME/setup
+cd $LOCALPATH/$NAME/setup
 
 git init
 git remote add origin -t setup ssh://b-$NAME@$NAME.branchable.com/

cleanup
diff --git a/people/LabDesobediente.mdwn b/people/LabDesobediente.mdwn
deleted file mode 100644
index eb26a38..0000000
--- a/people/LabDesobediente.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-##Teste de página

Revert ""
This reverts commit c9b7cb462e8b03bba550703a7e9e07b0c07ff1a9.
diff --git a/people/ookgioplatan1975.mdwn b/people/ookgioplatan1975.mdwn
deleted file mode 100644
index 1e06e51..0000000
--- a/people/ookgioplatan1975.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-how are you

diff --git a/people/ookgioplatan1975.mdwn b/people/ookgioplatan1975.mdwn
new file mode 100644
index 0000000..1e06e51
--- /dev/null
+++ b/people/ookgioplatan1975.mdwn
@@ -0,0 +1 @@
+how are you

diff --git a/tips/using_https.mdwn b/tips/using_https.mdwn
index f8814c9..47d7da7 100644
--- a/tips/using_https.mdwn
+++ b/tips/using_https.mdwn
@@ -31,5 +31,5 @@ password from it by running this command:
 	openssl rsa -in ssl.key -out ssl.key
 
 To protect your private key, you should GPG encrypt it before sending
-it to us. Our GPG keys are 2512E3C7 (Joey) and 5E8511F9 (Lars).
+it to us. Our GPG keys are 2512E3C7 (Joey) and B8611E9C (Lars).
 <a href="mailto:admins@branchable.com">Email us</a>.

diff --git a/people/liw.mdwn b/people/liw.mdwn
index c52c8e3..640f3ae 100644
--- a/people/liw.mdwn
+++ b/people/liw.mdwn
@@ -6,7 +6,7 @@ Lars Wirzenius is perhaps best known for being the college
 officemate of Linus Torvalds, and has been involved in Linux
 since its pre-history. Lars is an avid photographer.
 
-Lars is originally from Finland, but currently resides in the UK.
+Lars is originally from Finland.
 
 [[!more linktext="contact" text="""
 * home page: <http://liw.fi/>

commet
diff --git a/forum/Writing_custom_theme/comment_1_b95e4cd169910feb8bf0c7df121ebb0c._comment b/forum/Writing_custom_theme/comment_1_b95e4cd169910feb8bf0c7df121ebb0c._comment
new file mode 100644
index 0000000..1f9a398
--- /dev/null
+++ b/forum/Writing_custom_theme/comment_1_b95e4cd169910feb8bf0c7df121ebb0c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2015-08-03T13:41:13Z"
+ content="""
+Thanks for reporting this problem. I've fixed it by upgrading the ikiwiki
+on branchable to the latest version.
+"""]]

related discussion
diff --git a/forum/Writing_custom_theme.mdwn b/forum/Writing_custom_theme.mdwn
index 8c68db4..d542e8b 100644
--- a/forum/Writing_custom_theme.mdwn
+++ b/forum/Writing_custom_theme.mdwn
@@ -50,6 +50,8 @@ Connection log shows this:
 
 And I get the same error message even when I try to upload local.css -- odd, as it was designed to be customizable!
 
+Related discussion: <https://ikiwiki.info/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/> I tried to make use of it, but I don't know what ikiwiki version we have at Branchable.
+
 How do I best achieve what I want?
 
 Regards,<br>

add error text
diff --git a/forum/Writing_custom_theme.mdwn b/forum/Writing_custom_theme.mdwn
index c708255..8c68db4 100644
--- a/forum/Writing_custom_theme.mdwn
+++ b/forum/Writing_custom_theme.mdwn
@@ -4,9 +4,53 @@ Following http://www.branchable.com/tips/customizing_the_look_of_your_site/ ,
 
 I would like to completely replace the default style.css so that I can write my custom style and my custom template. But your documentation says to not replace style.css (and when I try to do this, the site says 'Failed!').
 
+Connection log shows this:
+
+    Request URL: http://guppy.branchable.com/ikiwiki.cgi
+    Method:	POST
+    Code: HTTP/1.1 200 OK
+
+    <!DOCTYPE html>
+    <html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <base href="/" />
+        <meta charset="utf-8" /> 
+        <title>Error</title>
+        <link rel="icon" href="/favicon.ico" type="image/x-icon" /> 
+        <link rel="stylesheet" href="/style.css" type="text/css" /> 
+        <link rel="stylesheet" href="/local.css" type="text/css" /> 
+    </head>
+    <body> 
+        <article class="page"> 
+            <section class="pageheader">    
+                <header class="header">
+                    <span>
+                        <span class="parentlinks">
+                            <a href="/">guppy</a>/
+                        </span>
+                        <span class="title"> Error </span>
+                    </span>
+                </header>
+                <nav class="actions"> 
+                    <ul>
+                        <li><a href="/ikiwiki.cgi?do=prefs">Preferences</a></li>
+                        <li><a href="/ikiwiki.cgi?do=branchable">Branchable</a></li>
+                    </ul>
+                </nav>
+            </section>
+            <div id="pagebody"> 
+                <section id="content" role="main">
+                    <p class="error">Error: CGI::tmpFileName failed to return the uploaded file name </p>
+                </section>
+            </div> 
+            <footer id="footer" class="pagefooter" role="contentinfo"> <!-- from guppy --> </footer>
+        </article>
+    </body>
+    </html> 
+
 And I get the same error message even when I try to upload local.css -- odd, as it was designed to be customizable!
 
 How do I best achieve what I want?
 
-Regards,
+Regards,<br>
 Svetlana.

diff --git a/forum/Writing_custom_theme.mdwn b/forum/Writing_custom_theme.mdwn
index 64d5fbb..c708255 100644
--- a/forum/Writing_custom_theme.mdwn
+++ b/forum/Writing_custom_theme.mdwn
@@ -2,7 +2,11 @@ Hi,
 
 Following http://www.branchable.com/tips/customizing_the_look_of_your_site/ ,
 
-I would like to completely replace the default style.css so that I can write my custom style and my custom template. But your documentation says to not replace style.css (and when I try to do this, the site says 'Failed!'). How do I best achieve what I want?
+I would like to completely replace the default style.css so that I can write my custom style and my custom template. But your documentation says to not replace style.css (and when I try to do this, the site says 'Failed!').
+
+And I get the same error message even when I try to upload local.css -- odd, as it was designed to be customizable!
+
+How do I best achieve what I want?
 
 Regards,
 Svetlana.

diff --git a/forum/Writing_custom_theme.mdwn b/forum/Writing_custom_theme.mdwn
new file mode 100644
index 0000000..64d5fbb
--- /dev/null
+++ b/forum/Writing_custom_theme.mdwn
@@ -0,0 +1,8 @@
+Hi,
+
+Following http://www.branchable.com/tips/customizing_the_look_of_your_site/ ,
+
+I would like to completely replace the default style.css so that I can write my custom style and my custom template. But your documentation says to not replace style.css (and when I try to do this, the site says 'Failed!'). How do I best achieve what I want?
+
+Regards,
+Svetlana.

response
diff --git a/forum/fatal:_remote_error:_access_denied_or_repository_not_exported:___47__/comment_1_882e9dca4c69a52bfbfcd5c2f403a4b1._comment b/forum/fatal:_remote_error:_access_denied_or_repository_not_exported:___47__/comment_1_882e9dca4c69a52bfbfcd5c2f403a4b1._comment
new file mode 100644
index 0000000..eb07308
--- /dev/null
+++ b/forum/fatal:_remote_error:_access_denied_or_repository_not_exported:___47__/comment_1_882e9dca4c69a52bfbfcd5c2f403a4b1._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2015-07-30T22:04:22Z"
+ content="""
+ssh keys are not relevant when using a git:// url.
+If you want to clone using ssh, there's a different url for that.
+
+Branchable sites only support git:// urls when they are configured to let
+anyone check them out, which is configured by the `branchable` setting,
+which shows up in the site's web configuration page as "Allow anyone to
+branch, check out, and copy this site?"
+
+This is enabled by default for sites hosted on branchable, so I guess it
+must be turned off on your site.
+"""]]

diff --git a/forum/fatal:_remote_error:_access_denied_or_repository_not_exported:___47__.mdwn b/forum/fatal:_remote_error:_access_denied_or_repository_not_exported:___47__.mdwn
new file mode 100644
index 0000000..618850f
--- /dev/null
+++ b/forum/fatal:_remote_error:_access_denied_or_repository_not_exported:___47__.mdwn
@@ -0,0 +1 @@
+«git clone git://mywikiname.branchable.com/» gives «fatal: remote error: access denied or repository not exported: /». I already added SSH key. How do I troubleshoot this, please?

Gitorious has shut down
diff --git a/tips/setting_up_git_pushes_from_Branchable.mdwn b/tips/setting_up_git_pushes_from_Branchable.mdwn
index f04dff3..81ca5f9 100644
--- a/tips/setting_up_git_pushes_from_Branchable.mdwn
+++ b/tips/setting_up_git_pushes_from_Branchable.mdwn
@@ -28,11 +28,6 @@ key to receive pushes.
 On [Github](http://github.com/), go to the git repository Branchable will
 push to, click on  "Admin", then "Deploy Keys", and paste in our `ssh` key.
 
-## Gitorious
-
-On [Gitorious](http://gitorious.org/), go to your Dashboard, click
-on "Manage SSH keys", then "Add SSH Key", and paste in our `ssh` key.
-
 ## other servers
 
 Put our `ssh` key in the file `~/.ssh/authorized_keys` on the server.

linkify to get despam
diff --git a/paypal.mdwn b/paypal.mdwn
index da418c4..54a012e 100644
--- a/paypal.mdwn
+++ b/paypal.mdwn
@@ -6,7 +6,7 @@ there. This will ensure you pay the right amount for your account.
 
 If you need to handle payment for a Branchable site which you do not
 administer, you can instead use Paypal to send money directly to
-the email address "payments@branchable.com"
+the email address <payments@branchable.com>
 
 Or, use one of the following Paypal payment buttons...
 

update
diff --git a/paypal.mdwn b/paypal.mdwn
index b909766..da418c4 100644
--- a/paypal.mdwn
+++ b/paypal.mdwn
@@ -8,7 +8,7 @@ If you need to handle payment for a Branchable site which you do not
 administer, you can instead use Paypal to send money directly to
 the email address "payments@branchable.com"
 
-Or, use one of the following Paypal payment buttons:
+Or, use one of the following Paypal payment buttons...
 
 Make a one-time payment of $9.99 to cover one month:
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">

update
diff --git a/paypal.mdwn b/paypal.mdwn
index cb58e16..b909766 100644
--- a/paypal.mdwn
+++ b/paypal.mdwn
@@ -8,7 +8,7 @@ If you need to handle payment for a Branchable site which you do not
 administer, you can instead use Paypal to send money directly to
 the email address "payments@branchable.com"
 
-Or, use one of the following Paypel payment buttons:
+Or, use one of the following Paypal payment buttons:
 
 Make a one-time payment of $9.99 to cover one month:
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">

reorg
diff --git a/paypal.mdwn b/paypal.mdwn
index 76d97e1..cb58e16 100644
--- a/paypal.mdwn
+++ b/paypal.mdwn
@@ -10,7 +10,18 @@ the email address "payments@branchable.com"
 
 Or, use one of the following Paypel payment buttons:
 
-Make a one-time yearly payment of $59.99:
+Make a one-time payment of $9.99 to cover one month:
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="hidden" name="hosted_button_id" value="YUFSWDNE5LW2G">
+<input type="hidden" name="on0" value="Hosting Plan">
+<input type="hidden" name="os0" value="Basic">
+<input type="hidden" name="currency_code" value="USD">
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_paynow_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
+</form>
+
+Make a one-time payment of $59.99 to cover one year:
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="hidden" name="hosted_button_id" value="GGT3RVBQ3KZRE">
@@ -32,14 +43,3 @@ Set up recurring monthly payments of $9.99:
 <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_subscribe_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"><br />
 </form>
-
-Make a one-time payment of $9.99:
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="YUFSWDNE5LW2G">
-<input type="hidden" name="on0" value="Hosting Plan">
-<input type="hidden" name="os0" value="Basic">
-<input type="hidden" name="currency_code" value="USD">
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_paynow_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
-</form>

paypel page
diff --git a/paypal.mdwn b/paypal.mdwn
new file mode 100644
index 0000000..76d97e1
--- /dev/null
+++ b/paypal.mdwn
@@ -0,0 +1,45 @@
+Branchable accepts payments made via Paypal.
+
+The best way to make a payment is to open the
+[[Control Panel|controlpanel]] and use one of the Paypal payment buttons
+there. This will ensure you pay the right amount for your account.
+
+If you need to handle payment for a Branchable site which you do not
+administer, you can instead use Paypal to send money directly to
+the email address "payments@branchable.com"
+
+Or, use one of the following Paypel payment buttons:
+
+Make a one-time yearly payment of $59.99:
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="hidden" name="hosted_button_id" value="GGT3RVBQ3KZRE">
+<input type="hidden" name="on0" value="Hosting Plan">
+<input type="hidden" name="os0" value="Basic">
+<input type="hidden" name="currency_code" value="USD">
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_paynow_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay onli
+ne!">
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
+</form>
+
+Set up recurring monthly payments of $9.99:
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="hidden" name="hosted_button_id" value="H9TA5T32Y9QCS">
+<input type="hidden" name="on0" value="Hosting plan">
+<input type="hidden" name="os0" value="Basic">
+<input type="hidden" name="currency_code" value="USD">
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_subscribe_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"><br />
+</form>
+
+Make a one-time payment of $9.99:
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="hidden" name="hosted_button_id" value="YUFSWDNE5LW2G">
+<input type="hidden" name="on0" value="Hosting Plan">
+<input type="hidden" name="os0" value="Basic">
+<input type="hidden" name="currency_code" value="USD">
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_paynow_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
+</form>
diff --git a/pricing.mdwn b/pricing.mdwn
index dd110d7..46c42ee 100644
--- a/pricing.mdwn
+++ b/pricing.mdwn
@@ -10,7 +10,7 @@ We have three hosting plans:
   $99.99/month or $599.99/year
 
 Pay for a year upfront and save 50%. All prices are in US Dollars.
-We accept payments via PayPal.
+We accept [[payments via PayPal|paypal]].
 
 All plans come with no hard traffic limitations, and no hard storage
 limitations.  We reserve the right to limit uses of bandwidth or storage that

announcement
diff --git a/forum/Replacement_for_Open_ID___63__/comment_4_116fc20c5f16c6a5927a8755d0c86ca5._comment b/forum/Replacement_for_Open_ID___63__/comment_4_116fc20c5f16c6a5927a8755d0c86ca5._comment
new file mode 100644
index 0000000..a9c60cf
--- /dev/null
+++ b/forum/Replacement_for_Open_ID___63__/comment_4_116fc20c5f16c6a5927a8755d0c86ca5._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2015-05-19T21:53:42Z"
+ content="""
+Branchable support [[news/login_using_email_address]] now.
+"""]]
diff --git a/forum/myopenid.com_down__44___regaining_access_to_my_site/comment_4_8e92f94e308ddb4c01fa567e23585001._comment b/forum/myopenid.com_down__44___regaining_access_to_my_site/comment_4_8e92f94e308ddb4c01fa567e23585001._comment
new file mode 100644
index 0000000..8041a0b
--- /dev/null
+++ b/forum/myopenid.com_down__44___regaining_access_to_my_site/comment_4_8e92f94e308ddb4c01fa567e23585001._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2015-05-19T21:54:37Z"
+ content="""
+Now that Branchable supports [[news/login_using_email_address]], we can
+switch accounts from using a defunct openid provider to an email address.
+Just get in touch with us.
+"""]]
diff --git a/news/free_hosting_for_Free_Software.mdwn b/news/free_hosting_for_Free_Software.mdwn
index 9552933..e2a665f 100644
--- a/news/free_hosting_for_Free_Software.mdwn
+++ b/news/free_hosting_for_Free_Software.mdwn
@@ -20,15 +20,15 @@ continue to provide free hosting to projects that signed up in time. So
 The procedure to get a free site hosted by Branchable for your Free
 Software project is pretty simple:
 
-1. Get an OpenId that will *only* be used for this Free Software project.
-   (Don't use your personal OpenID. This is important.)
-2. [[Sign_up|makesite]] using that OpenId, and the "Basic"
+1. Get an OpenId or email address that will *only* be used for this Free Software project.
+   (Don't use your personal OpenID or email. This is important.)
+2. [[Sign_up|makesite]] using that OpenId or email address, and the "Basic"
    [[price_plan|pricing]]. Since the first month is free, you have a few
    weeks to build your site and see if Branchable will work for your Free
    Software project.
 3. Email <admin@branchable.com> with "free software" in the subject, and
-   a link to your site(s). We will check them, and convert the project's
-   OpenId to a free account.
+   a link to your site(s). We will check them, and convert it to a 
+   free account.
 
 ## faq
 
diff --git a/news/google_openid.mdwn b/news/google_openid.mdwn
index 5593db4..ce8e7fa 100644
--- a/news/google_openid.mdwn
+++ b/news/google_openid.mdwn
@@ -13,4 +13,5 @@ Update: Seems that Google has changed their minds and
 their openid is going to continue to work until April 2015 or possibly 2017.
 We still recommend changing to a different openid provider.
 
-Update: Discontinued for real as of 23 April 2015.
+Update: Discontinued for real as of 23 April 2015. See
+[[login_using_email_address]] for a new way to log in.
diff --git a/news/login_using_email_address.mdwn b/news/login_using_email_address.mdwn
new file mode 100644
index 0000000..78d0f9c
--- /dev/null
+++ b/news/login_using_email_address.mdwn
@@ -0,0 +1,9 @@
+Today we've enabled login by email address on Branchable, as an alternative
+to openid login.
+
+So, all you need to make a site on Branchable now is an email address!
+Also, users can log into your sites on Branchable using their email.
+
+We know that some Branchable users were relying on now defunct
+openid providers like Google and MyOpenid. We can switch your sites over to
+use an email address instead if you want; just get in touch.

update
diff --git a/news/scheduled_upgrade.mdwn b/news/scheduled_upgrade.mdwn
index 366ad28..83ceaaf 100644
--- a/news/scheduled_upgrade.mdwn
+++ b/news/scheduled_upgrade.mdwn
@@ -5,4 +5,7 @@ release. We do not anticipate significant downtime during this upgrade.
 
 Update: Upgrade has completed successfully. Sites were down for 5 minutes.
 
+Update 19 May: Branchable was overloaded this morning, due to some config
+changes that happened as part of this updated. This should be fixed now.
+
 [[!meta author=Joey]]

update
diff --git a/news/scheduled_upgrade.mdwn b/news/scheduled_upgrade.mdwn
index ef9f058..366ad28 100644
--- a/news/scheduled_upgrade.mdwn
+++ b/news/scheduled_upgrade.mdwn
@@ -1,4 +1,8 @@
 On Saturday, May 16th, Branchable will be upgraded to the new Debian 8.0
 release. We do not anticipate significant downtime during this upgrade.
 
+---
+
+Update: Upgrade has completed successfully. Sites were down for 5 minutes.
+
 [[!meta author=Joey]]

post
diff --git a/news/scheduled_upgrade.mdwn b/news/scheduled_upgrade.mdwn
new file mode 100644
index 0000000..ef9f058
--- /dev/null
+++ b/news/scheduled_upgrade.mdwn
@@ -0,0 +1,4 @@
+On Saturday, May 16th, Branchable will be upgraded to the new Debian 8.0
+release. We do not anticipate significant downtime during this upgrade.
+
+[[!meta author=Joey]]

update
diff --git a/news/google_openid.mdwn b/news/google_openid.mdwn
index 033c75e..5593db4 100644
--- a/news/google_openid.mdwn
+++ b/news/google_openid.mdwn
@@ -12,3 +12,5 @@ with your new openid, so we can update your site to use it.
 Update: Seems that Google has changed their minds and
 their openid is going to continue to work until April 2015 or possibly 2017.
 We still recommend changing to a different openid provider.
+
+Update: Discontinued for real as of 23 April 2015.

Added a comment
diff --git a/forum/free_plan_for_copyleft_content__63__/comment_3_681c3d1df2b5bfb9b7ea89699eee0c0a._comment b/forum/free_plan_for_copyleft_content__63__/comment_3_681c3d1df2b5bfb9b7ea89699eee0c0a._comment
new file mode 100644
index 0000000..ee4c734
--- /dev/null
+++ b/forum/free_plan_for_copyleft_content__63__/comment_3_681c3d1df2b5bfb9b7ea89699eee0c0a._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ subject="comment 3"
+ date="2015-04-15T18:03:57Z"
+ content="""
+It's decided on a case-by-case basis, but mainly free software projects only, I'm afraid.
+"""]]

Added a comment
diff --git a/forum/free_plan_for_copyleft_content__63__/comment_2_1382eacee08f10d77dd0c98a65a79446._comment b/forum/free_plan_for_copyleft_content__63__/comment_2_1382eacee08f10d77dd0c98a65a79446._comment
new file mode 100644
index 0000000..8d2b9f8
--- /dev/null
+++ b/forum/free_plan_for_copyleft_content__63__/comment_2_1382eacee08f10d77dd0c98a65a79446._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnbC86Ku5q1g3TkrrBM2Dqgj2WhrkmvLIY"
+ nickname="Svetlana"
+ subject="comment 2"
+ date="2015-04-15T09:14:26Z"
+ content="""
+is this offer limited to free software, or to any copyleft -- broadly licensed -- content?
+
+www.copyleft.org
+"""]]

Added a comment
diff --git a/forum/using_meta_tag_or_robots.txt/comment_1_ebe93088793ddfee7ac5bc9454bac1ce._comment b/forum/using_meta_tag_or_robots.txt/comment_1_ebe93088793ddfee7ac5bc9454bac1ce._comment
new file mode 100644
index 0000000..a8c0690
--- /dev/null
+++ b/forum/using_meta_tag_or_robots.txt/comment_1_ebe93088793ddfee7ac5bc9454bac1ce._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ subject="comment 1"
+ date="2015-04-14T16:42:28Z"
+ content="""
+Can you just attach robot.txt to the front page of the site?
+"""]]

Added a comment
diff --git a/forum/free_plan_for_copyleft_content__63__/comment_1_8183233ddb49bcea0023f0969aaf0207._comment b/forum/free_plan_for_copyleft_content__63__/comment_1_8183233ddb49bcea0023f0969aaf0207._comment
new file mode 100644
index 0000000..92239bf
--- /dev/null
+++ b/forum/free_plan_for_copyleft_content__63__/comment_1_8183233ddb49bcea0023f0969aaf0207._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ subject="comment 1"
+ date="2015-04-14T16:41:08Z"
+ content="""
+We offer some free hosting for free software projects.
+
+http://www.branchable.com/news/free_hosting_for_Free_Software/ has the details.
+"""]]

diff --git a/forum/free_plan_for_copyleft_content__63__.mdwn b/forum/free_plan_for_copyleft_content__63__.mdwn
new file mode 100644
index 0000000..22efe32
--- /dev/null
+++ b/forum/free_plan_for_copyleft_content__63__.mdwn
@@ -0,0 +1 @@
+do you offer free plan for websites which are dedicated to hosting free software or freely licensed (public domain) text/documentation?

Added a comment
diff --git a/forum/you_are_not_logged_in_as_an_admin/comment_5_e6ae1b194ded02c1d5b88c2d9ea24888._comment b/forum/you_are_not_logged_in_as_an_admin/comment_5_e6ae1b194ded02c1d5b88c2d9ea24888._comment
new file mode 100644
index 0000000..bacc51d
--- /dev/null
+++ b/forum/you_are_not_logged_in_as_an_admin/comment_5_e6ae1b194ded02c1d5b88c2d9ea24888._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnbC86Ku5q1g3TkrrBM2Dqgj2WhrkmvLIY"
+ nickname="Svetlana"
+ subject="comment 5"
+ date="2015-04-13T10:30:23Z"
+ content="""
+Thank you, I appreciate the fix and the explanation greatly.
+"""]]

created
diff --git a/forum/using_meta_tag_or_robots.txt.mdwn b/forum/using_meta_tag_or_robots.txt.mdwn
new file mode 100644
index 0000000..f505fe9
--- /dev/null
+++ b/forum/using_meta_tag_or_robots.txt.mdwn
@@ -0,0 +1,2 @@
+how do i put a meta tag or set up a robots.txt for my wiki to be unavailable to bots from the outside?
+like the robots example at <https://www.branchable.com/ikiwiki/directive/meta/> but for all pages

comment
diff --git a/forum/you_are_not_logged_in_as_an_admin/comment_4_b269ca781b5e44480dd4b4d9f60f8619._comment b/forum/you_are_not_logged_in_as_an_admin/comment_4_b269ca781b5e44480dd4b4d9f60f8619._comment
new file mode 100644
index 0000000..294494d
--- /dev/null
+++ b/forum/you_are_not_logged_in_as_an_admin/comment_4_b269ca781b5e44480dd4b4d9f60f8619._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2015-04-12T19:34:31Z"
+ content="""
+User confirmed they didn't finish the setup process.
+"""]]

add email
diff --git a/tips/using_https.mdwn b/tips/using_https.mdwn
index ead6a87..f8814c9 100644
--- a/tips/using_https.mdwn
+++ b/tips/using_https.mdwn
@@ -32,3 +32,4 @@ password from it by running this command:
 
 To protect your private key, you should GPG encrypt it before sending
 it to us. Our GPG keys are 2512E3C7 (Joey) and 5E8511F9 (Lars).
+<a href="mailto:admins@branchable.com">Email us</a>.

comment
diff --git a/forum/you_are_not_logged_in_as_an_admin/comment_2_2245b2cfdb1da9fd78f34cf457218d24._comment b/forum/you_are_not_logged_in_as_an_admin/comment_2_2245b2cfdb1da9fd78f34cf457218d24._comment
new file mode 100644
index 0000000..7f3b727
--- /dev/null
+++ b/forum/you_are_not_logged_in_as_an_admin/comment_2_2245b2cfdb1da9fd78f34cf457218d24._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2015-04-10T16:06:41Z"
+ content="""
+The site had its admin set to http://none/ so that's why.
+
+Normally, a site would only be in this state if you'd started setting it
+up, but not finished the site setup process.
+
+I see that this has happened with several sites you've tried to make,
+but site creating seems to be working fine for the rest of us. So
+I'm wondering what you might have done to have this problem.
+
+Anyway, I have manually set up your openid as the site admin now.
+"""]]

Added a comment
diff --git a/forum/you_are_not_logged_in_as_an_admin/comment_2_74f33f3292b49d61bdbb3cfc1c4644de._comment b/forum/you_are_not_logged_in_as_an_admin/comment_2_74f33f3292b49d61bdbb3cfc1c4644de._comment
new file mode 100644
index 0000000..4e7097f
--- /dev/null
+++ b/forum/you_are_not_logged_in_as_an_admin/comment_2_74f33f3292b49d61bdbb3cfc1c4644de._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnbC86Ku5q1g3TkrrBM2Dqgj2WhrkmvLIY"
+ nickname="Svetlana"
+ subject="comment 2"
+ date="2015-04-10T15:06:47Z"
+ content="""
+Ok thanks; information sent to the email address visible on your profile page.
+"""]]

followup
diff --git a/forum/you_are_not_logged_in_as_an_admin/comment_1_7f7de2bc66d2df9823efd1e30331079b._comment b/forum/you_are_not_logged_in_as_an_admin/comment_1_7f7de2bc66d2df9823efd1e30331079b._comment
new file mode 100644
index 0000000..41d80e2
--- /dev/null
+++ b/forum/you_are_not_logged_in_as_an_admin/comment_1_7f7de2bc66d2df9823efd1e30331079b._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2015-04-08T21:17:18Z"
+ content="""
+Can you tell us what the site is, and what openid shows up on your
+Preferences page, both on that site, and on
+<https://www.branchable.com/ikiwiki.cgi?do=prefs>
+
+If you don't want to post that info here, you can email us.
+"""]]

creates the page
diff --git a/forum/you_are_not_logged_in_as_an_admin.mdwn b/forum/you_are_not_logged_in_as_an_admin.mdwn
new file mode 100644
index 0000000..978d887
--- /dev/null
+++ b/forum/you_are_not_logged_in_as_an_admin.mdwn
@@ -0,0 +1 @@
+Created a wiki using an openid provider. Trying to log in at the new wiki using the same openid provider but when I click 'Branchable' and then click 'Setup page' link at the bottom, it complains "you are not logged in as an admin". Huh?

Added a comment
diff --git a/forum/Replacement_for_Open_ID___63__/comment_3_0856c204556b0cb4373ec63bc03e8827._comment b/forum/Replacement_for_Open_ID___63__/comment_3_0856c204556b0cb4373ec63bc03e8827._comment
new file mode 100644
index 0000000..74d1412
--- /dev/null
+++ b/forum/Replacement_for_Open_ID___63__/comment_3_0856c204556b0cb4373ec63bc03e8827._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="svetlana"
+ subject="comment 3"
+ date="2015-04-04T06:29:23Z"
+ content="""
+would like to just use password auth without 3rd party site
+"""]]

commen
diff --git a/forum/Stuck_in_new_wiki/comment_2_2074f8f285adbed8f63bc0b749d9414f._comment b/forum/Stuck_in_new_wiki/comment_2_2074f8f285adbed8f63bc0b749d9414f._comment
new file mode 100644
index 0000000..971c5f7
--- /dev/null
+++ b/forum/Stuck_in_new_wiki/comment_2_2074f8f285adbed8f63bc0b749d9414f._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2015-03-25T14:12:56Z"
+ content="""
+The simple answer to this is, edit a page, put in a [[ikiwiki/WikiLink]]
+to a new page, and click on it to create the page. 
+
+Continue until you have Wikipedia or something. ;)
+"""]]

Added a comment: Not stuck.
diff --git a/forum/Stuck_in_new_wiki/comment_1_18c4477ba13e354b39e57a18f2b44da2._comment b/forum/Stuck_in_new_wiki/comment_1_18c4477ba13e354b39e57a18f2b44da2._comment
new file mode 100644
index 0000000..bd77c5e
--- /dev/null
+++ b/forum/Stuck_in_new_wiki/comment_1_18c4477ba13e354b39e57a18f2b44da2._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/eetjWe8B34ZeUsHyFzpwC5QvBcEuVxllSvpJHw--#376d7"
+ nickname="Bob"
+ subject="Not stuck."
+ date="2015-03-25T06:14:38Z"
+ content="""
+Never mind. Sorry!
+"""]]

removed
diff --git a/forum/Stuck_in_new_wiki/comment_1_806c99b63823ac71b2a54ae7c0d7b927._comment b/forum/Stuck_in_new_wiki/comment_1_806c99b63823ac71b2a54ae7c0d7b927._comment
deleted file mode 100644
index af34fc0..0000000
--- a/forum/Stuck_in_new_wiki/comment_1_806c99b63823ac71b2a54ae7c0d7b927._comment
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!comment format=mdwn
- username="http://neuropathia.livejournal.com/"
- subject="comment 1"
- date="2015-03-24T01:28:40Z"
- content="""
-I can add stuff now from the clone I have on my home machine, but I am not clear as to how to add structure (direcctories?) as well as pages. Is there a nice sample of a simple hierarchy of dirs and contents available for perusal?
-"""]]

Added a comment
diff --git a/forum/Stuck_in_new_wiki/comment_1_806c99b63823ac71b2a54ae7c0d7b927._comment b/forum/Stuck_in_new_wiki/comment_1_806c99b63823ac71b2a54ae7c0d7b927._comment
new file mode 100644
index 0000000..af34fc0
--- /dev/null
+++ b/forum/Stuck_in_new_wiki/comment_1_806c99b63823ac71b2a54ae7c0d7b927._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://neuropathia.livejournal.com/"
+ subject="comment 1"
+ date="2015-03-24T01:28:40Z"
+ content="""
+I can add stuff now from the clone I have on my home machine, but I am not clear as to how to add structure (direcctories?) as well as pages. Is there a nice sample of a simple hierarchy of dirs and contents available for perusal?
+"""]]

diff --git a/forum/Stuck_in_new_wiki.mdwn b/forum/Stuck_in_new_wiki.mdwn
new file mode 100644
index 0000000..92cb414
--- /dev/null
+++ b/forum/Stuck_in_new_wiki.mdwn
@@ -0,0 +1 @@
+My new wiki is up and I have made a few minor changes to the index page, but I cannot seem a way to *add* anything to it!

diff --git a/people/LabDesobediente.mdwn b/people/LabDesobediente.mdwn
new file mode 100644
index 0000000..eb26a38
--- /dev/null
+++ b/people/LabDesobediente.mdwn
@@ -0,0 +1 @@
+##Teste de página

comment
diff --git a/bugs/An_issue_in_the_format_directive/comment_1_d7de4d60bffad022d26e20f4e1625591._comment b/bugs/An_issue_in_the_format_directive/comment_1_d7de4d60bffad022d26e20f4e1625591._comment
new file mode 100644
index 0000000..9d19043
--- /dev/null
+++ b/bugs/An_issue_in_the_format_directive/comment_1_d7de4d60bffad022d26e20f4e1625591._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2015-01-14T20:59:38Z"
+ content="""
+What's going on here is that the double-brackets make ikiwiki treat it as
+a wikilink.
+
+This is a known problem in ikiwiki.
+"""]]

diff --git a/bugs/An_issue_in_the_format_directive.mdwn b/bugs/An_issue_in_the_format_directive.mdwn
new file mode 100644
index 0000000..681ab88
--- /dev/null
+++ b/bugs/An_issue_in_the_format_directive.mdwn
@@ -0,0 +1,25 @@
+I am using the format directive from long time ago without any problem. 
+
+However, now I have an issue. When I try to show the following code in my site:
+
+
+\[[!format  R """
+
+  matx <- cfa [ ['ch2'] ] / 16383
+
+"""]]
+
+
+I get what follows in the rendered page. Both, through google chrome and mozilla firefox:
+
+[[!format  R """
+  matx <- cfa[['ch2']] / 16383
+"""]]
+
+In the format example, I am using spaces after and before each `[` and `]`, because otherwise, here in this post, it is not shown as-is but with the very same issue I am actually reporting. To reproduce the problem please remove those spaces.
+
+Also, here in this post. If I set inline this \`cfa\[['ch2'\]]\` appears this `cfa[['ch2']]`.
+
+It seems this directives are not showing the code as-is but they are somehow interpreting it.
+
+OdL

Added a comment: Disabling the PO plugin
diff --git a/bugs/_Discussion_page_not_created_/comment_5_cac813070343727e9242cc6123842644._comment b/bugs/_Discussion_page_not_created_/comment_5_cac813070343727e9242cc6123842644._comment
new file mode 100644
index 0000000..a647bb4
--- /dev/null
+++ b/bugs/_Discussion_page_not_created_/comment_5_cac813070343727e9242cc6123842644._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY"
+ nickname="Hugo"
+ subject="Disabling the PO plugin"
+ date="2014-11-13T15:55:25Z"
+ content="""
+What would happen if we remove the Po plugin after it's been enabled?
+"""]]

Added a comment
diff --git a/forum/Email_address_for_notifyemail__63__/comment_2_afed298fc6076516c9ba59b80bdf067d._comment b/forum/Email_address_for_notifyemail__63__/comment_2_afed298fc6076516c9ba59b80bdf067d._comment
new file mode 100644
index 0000000..60aece1
--- /dev/null
+++ b/forum/Email_address_for_notifyemail__63__/comment_2_afed298fc6076516c9ba59b80bdf067d._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://id.mayfirst.org/sazius"
+ subject="comment 2"
+ date="2014-11-09T18:11:19Z"
+ content="""
+Thanks! That's great!
+"""]]

Added a comment: Alternative
diff --git a/bugs/_Discussion_page_not_created_/comment_4_49e4c63813990f00ba316a2960b0fb07._comment b/bugs/_Discussion_page_not_created_/comment_4_49e4c63813990f00ba316a2960b0fb07._comment
new file mode 100644
index 0000000..f985c1a
--- /dev/null
+++ b/bugs/_Discussion_page_not_created_/comment_4_49e4c63813990f00ba316a2960b0fb07._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY"
+ nickname="Hugo"
+ subject="Alternative"
+ date="2014-11-06T21:20:05Z"
+ content="""
+Hi Joey, thanks for having a look.
+
+So what do you suggest we do to handle multiple languages on the wiki?
+
+
+"""]]

comment
diff --git a/bugs/index.en.html_independently_created/index.en/comment_1_79d35fb548a9a05255e7ba269877e924._comment b/bugs/index.en.html_independently_created/index.en/comment_1_79d35fb548a9a05255e7ba269877e924._comment
new file mode 100644
index 0000000..7a283be
--- /dev/null
+++ b/bugs/index.en.html_independently_created/index.en/comment_1_79d35fb548a9a05255e7ba269877e924._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2014-11-06T19:16:37Z"
+ content="""
+I see you're using the po plugin. I suspect this is yet another instance of
+it being buggy. It seems so buggy that I'd just as soon not provide it on
+branchable, to be honest.
+"""]]

po plugin related?
diff --git a/bugs/Strange_behavior_when_encountering_internal_error_with_recentchanges..mdwn b/bugs/Strange_behavior_when_encountering_internal_error_with_recentchanges..mdwn
index afb24fe..a25a303 100644
--- a/bugs/Strange_behavior_when_encountering_internal_error_with_recentchanges..mdwn
+++ b/bugs/Strange_behavior_when_encountering_internal_error_with_recentchanges..mdwn
@@ -44,3 +44,6 @@ site is done in an off-line copy ?
 > Is there any particular change you can make that reliably reproduces
 > this? If so I'll branch your site and make the change in the branch
 > to debug it. --[[Joey]]
+
+>> I have seen this once or twice when the po plugin broke buiding of a
+>> site. --[[Joey]]

close old and long fixed bug
diff --git a/bugs/Statistics.mdwn b/bugs/Statistics.mdwn
index 784efff..5668baf 100644
--- a/bugs/Statistics.mdwn
+++ b/bugs/Statistics.mdwn
@@ -11,3 +11,7 @@ One show be able to get enough statistics from Apache logs.
 I quite like [visitor's](http://www.hping.org/visitors/) <http://hugh.vm.bytemark.co.uk/>, though I would prefer a less noisy list of saying how many people are simply subscribed to my feed(s).
 
 Many thanks,
+
+> [[done]]; there's a Statistics button on the Preferences page of a site's
+> admin. The logs can also be rerieved with ssh for running your own stats.
+> --[[Joey]]

comment
diff --git a/bugs/_Discussion_page_not_created_/comment_3_576cf310ef5c3a1f4c9ca873bdeb5d4c._comment b/bugs/_Discussion_page_not_created_/comment_3_576cf310ef5c3a1f4c9ca873bdeb5d4c._comment
new file mode 100644
index 0000000..2cda6f4
--- /dev/null
+++ b/bugs/_Discussion_page_not_created_/comment_3_576cf310ef5c3a1f4c9ca873bdeb5d4c._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2014-11-06T19:06:29Z"
+ content="""
+I've manually rebuilt the site again and it seems to be working, but the
+fact is that ikiwiki's po plugin is known to be buggy and you're likely to
+continue to experience bugs if you keep using it.
+"""]]

fixed
diff --git a/bugs/Email_address_for_notifyemail__63__.mdwn b/bugs/Email_address_for_notifyemail__63__.mdwn
index 7a50da1..919037f 100644
--- a/bugs/Email_address_for_notifyemail__63__.mdwn
+++ b/bugs/Email_address_for_notifyemail__63__.mdwn
@@ -1 +1,4 @@
 I am not getting any emails from notifyemail, and I suspect my openid provider isn't reporting any email address (and I don't use their domain for email anyway). Is there some way to debug this, or manually set an email address for my account?
+
+> [[fixed|done]], email address can now be see for openid users on the
+> Preferences page. --[[Joey]]