diff --git a/news/ssh_RSA_key_deprecation.mdwn b/news/ssh_RSA_key_deprecation.mdwn
new file mode 100644
index 0000000..d2c3fb6
--- /dev/null
+++ b/news/ssh_RSA_key_deprecation.mdwn
@@ -0,0 +1,42 @@
+Openssh is deprecating RSA keys for security reasons in an upcoming
+release, and many Branchable users use RSA keys with their sites.
+
+Here's what you need to do, sometime before that deprecation happens.
+You probably have a few years to do it, but we wanted to document it now:
+
+## ssh keys that can push to your branchable site
+
+If you sometimes `git push` changes from a clone of your branchable site
+out to the website, you must have configured it to accept your
+ssh public key.
+
+Open your Branchable site, and click on the "Branchable" tab. In there,
+click on the "ssh keys" link, to see a list of the ssh keys that you
+have configured to allow to push to your site.
+
+Any that start with "ssh-rsa" are the ones that will eventually stop working.
+You'll need to generate a new ssh key, and paste the public key into that
+page.
+
+For example, to generate a Ed25519 key (probably
+the most secure kind that ssh supports), run:
+
+	ssh-keygen -t ed25519
+
+And then paste the content of the `id_ed25519.pub` file that generated
+into the web form.
+
+## ssh keys that your branchable site uses when pushing to other clones
+
+Some Branchable sites are configured so that, after a change is made
+to the site, the change is git pushed out to other clones of the
+repository.
+
+To check if your site has this set up, open its Preferences page and go to
+Setup, and search for "gitpush". If the gitpush plugin is enabled and 
+a repository url is listed for it to push to, click on the "this ssh key"
+link to see the RSA public key that it's using when pushing.
+
+Along with the RSA key, that page will list a Ed25519 public key.
+It's up to you to change the configuration of the repository that it pushes
+to so it will accept that Ed25519 key.

diff --git a/forum/suggestion:_add_separators_to_links_list_at_bottom_of_page.mdwn b/forum/suggestion:_add_separators_to_links_list_at_bottom_of_page.mdwn
new file mode 100644
index 0000000..a1645bd
--- /dev/null
+++ b/forum/suggestion:_add_separators_to_links_list_at_bottom_of_page.mdwn
@@ -0,0 +1,2 @@
+In the auto-generated list of links to the given page, the links are separated by a space, which makes it hard to see link boundaries when the links themselves contain spaces: e.g.
+[here](https://git-annex.branchable.com/todo/moreinfo/).  Maybe, add semicolons or other non-whitespace between links?

diff --git a/forum/suggestion:_show_replied-to_post__47__comment_when_entering_a_reply.mdwn b/forum/suggestion:_show_replied-to_post__47__comment_when_entering_a_reply.mdwn
new file mode 100644
index 0000000..12cfd89
--- /dev/null
+++ b/forum/suggestion:_show_replied-to_post__47__comment_when_entering_a_reply.mdwn
@@ -0,0 +1,2 @@
+On the screen for replying to a post or comment, could the post/comment being replied to be shown above the box where the reply is entered?
+Thanks!

diff --git a/about.mdwn b/about.mdwn
index 10c24af..0c40d88 100644
--- a/about.mdwn
+++ b/about.mdwn
@@ -13,7 +13,7 @@ in everything we do. We release the software that runs Branchable
 at our [ikiwiki-hosting](http://ikiwiki-hosting.branchable.com/) site.
 
 To contact us, please use the [[forum]], or 
-[e-mail](mailto:admins-2017@branchable.com) for private queries.
+[e-mail](mailto:admins-2020@branchable.com) for private queries.
 
 The people behind Branchable:
 
diff --git a/news/free_hosting_for_Free_Software.mdwn b/news/free_hosting_for_Free_Software.mdwn
index 6a73294..53dcabc 100644
--- a/news/free_hosting_for_Free_Software.mdwn
+++ b/news/free_hosting_for_Free_Software.mdwn
@@ -26,7 +26,7 @@ Software project is pretty simple:
    [[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 <admins-2017@branchable.com> with "free software" in the subject, and
+3. Email <admins-2020@branchable.com> with "free software" in the subject, and
    a link to your site(s). We will check them, and convert it to a 
    free account.
 
diff --git a/news/google_openid.mdwn b/news/google_openid.mdwn
index 4c88090..941967b 100644
--- a/news/google_openid.mdwn
+++ b/news/google_openid.mdwn
@@ -6,7 +6,7 @@ login cookie expires, you can't log back in via Google.
 
 We recommend getting an openid from a different provider, such as
 <http://pip.verisignlabs.com/>. If you created a Branchable site using a
-Google openid, you should <a href="mailto:admins-2017@branchable.com">email us</a>
+Google openid, you should <a href="mailto:admins-2020@branchable.com">email us</a>
 with your new openid, so we can update your site to use it.
 
 Update: Seems that Google has changed their minds and
diff --git a/support.mdwn b/support.mdwn
index 76ca4e5..29b6a65 100644
--- a/support.mdwn
+++ b/support.mdwn
@@ -5,6 +5,6 @@ We also have some [[Tips]] for using Branchable.
 Bugs in Branchable itself are tracked [[here|bugs]], while bugs in Ikiwiki
 are tracked [on its site](http://ikiwiki.info/bugs/).
 
-If you have an urgent technical problem, email <admins-2017@branchable.com>.
+If you have an urgent technical problem, email <admins-2020@branchable.com>.
 That goes directly to [[people/Joey]] and [[Lars|people/liw]], so
 don't wear it out.
diff --git a/tips/importing_an_existing_ikiwiki_site_to_branchable.mdwn b/tips/importing_an_existing_ikiwiki_site_to_branchable.mdwn
index 712d10d..6186fff 100644
--- a/tips/importing_an_existing_ikiwiki_site_to_branchable.mdwn
+++ b/tips/importing_an_existing_ikiwiki_site_to_branchable.mdwn
@@ -27,7 +27,7 @@ import it into Branchable.
    your site uses, or make other configuration tweaks. 
 
 8. It may be necessary to set the file modification timestamps
-   to match git commit times. E-mail [admin](mailto:admins-2017@branchable.com)
+   to match git commit times. E-mail [admin](mailto:admins-2020@branchable.com)
    and we'll do it.
 
 9. Finally, update your site's DNS to point to the site at Branchable.
diff --git a/tips/using_https.mdwn b/tips/using_https.mdwn
index 1cff41a..d2d48d8 100644
--- a/tips/using_https.mdwn
+++ b/tips/using_https.mdwn
@@ -32,4 +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 B8611E9C (Lars).
-<a href="mailto:admins-2017@branchable.com">Email us</a>.
+<a href="mailto:admins-2020@branchable.com">Email us</a>.

diff --git a/forum/Everything_is___34__locked__34__/comment_1_65270d5dc5a9195f192e5125017ffe33._comment b/forum/Everything_is___34__locked__34__/comment_1_65270d5dc5a9195f192e5125017ffe33._comment
new file mode 100644
index 0000000..2080069
--- /dev/null
+++ b/forum/Everything_is___34__locked__34__/comment_1_65270d5dc5a9195f192e5125017ffe33._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/eetjWe8B34ZeUsHyFzpwC5QvBcEuVxllSvpJHw--#376d7"
+ nickname="Bob"
+ avatar="http://cdn.libravatar.org/avatar/082537b38e3775fe9d6faecd3ce17cefd0023a52f468a0a8204634f431f44710"
+ subject="comment 1"
+ date="2019-11-27T16:12:40Z"
+ content="""
+I have made some bad moves. Let's say when I created my blog \"Duckman\" that I used \"fred\" for a username. Then, at some later point in time, this was altered to \"Fred\" -- changing the first char to upper case. Now when I log in as Fred I am not recognized as an admin. 
+
+Does that help to get things unlocked?
+"""]]

diff --git a/forum/Everything_is___34__locked__34__.mdwn b/forum/Everything_is___34__locked__34__.mdwn
new file mode 100644
index 0000000..34d2aeb
--- /dev/null
+++ b/forum/Everything_is___34__locked__34__.mdwn
@@ -0,0 +1,3 @@
+I am using your email login mechanism. I think it is successfully logging me in, but every attempt to click on "Edit" anywhere is met with something like this:
+
+Error: <a href="./posts/Duckman_is_back/">Duckman is back</a> is locked and cannot be edited 

diff --git a/forum/TLS_for_source.__42__.branchable.com__63__/comment_5_7f77e93a8db324adae603e7cff3b3d9a._comment b/forum/TLS_for_source.__42__.branchable.com__63__/comment_5_7f77e93a8db324adae603e7cff3b3d9a._comment
new file mode 100644
index 0000000..86571a7
--- /dev/null
+++ b/forum/TLS_for_source.__42__.branchable.com__63__/comment_5_7f77e93a8db324adae603e7cff3b3d9a._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="pabs3@49c776417680694a0f3295ee80df4edfca300096"
+ nickname="pabs3"
+ avatar="http://cdn.libravatar.org/avatar/3bf5f3b29a3d68ddf11eb1a3d8c5dc65"
+ subject="git clone over https"
+ date="2019-11-09T07:32:50Z"
+ content="""
+It would be nice to be able to git clone over https too:
+
+```
+$ git clone https://myrepos.branchable.com/
+Cloning into 'myrepos.branchable.com'...
+fatal: repository 'https://myrepos.branchable.com/' not found
+```
+"""]]

diff --git a/forum/search_engine_indexing.mdwn b/forum/search_engine_indexing.mdwn
new file mode 100644
index 0000000..263d9b0
--- /dev/null
+++ b/forum/search_engine_indexing.mdwn
@@ -0,0 +1 @@
+I am not sure why search engine does not index my Branchable site. Is there anything that I need to do?

diff --git a/forum/Building_outside_of_branchable/comment_2_25c06924a96382044f2fbdf5e123e88b._comment b/forum/Building_outside_of_branchable/comment_2_25c06924a96382044f2fbdf5e123e88b._comment
new file mode 100644
index 0000000..662355c
--- /dev/null
+++ b/forum/Building_outside_of_branchable/comment_2_25c06924a96382044f2fbdf5e123e88b._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2019-09-05T20:29:23Z"
+ content="""
+The `setup` branch in the site's git repo contains its setup file.
+"""]]

diff --git a/forum/Building_outside_of_branchable/comment_1_20020189ea7b2104ebab457bbddc3b5f._comment b/forum/Building_outside_of_branchable/comment_1_20020189ea7b2104ebab457bbddc3b5f._comment
new file mode 100644
index 0000000..fcfde1d
--- /dev/null
+++ b/forum/Building_outside_of_branchable/comment_1_20020189ea7b2104ebab457bbddc3b5f._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="branchable@974c8dbffe691e96a5a54fea28df2586c140fb8c"
+ nickname="branchable"
+ avatar="http://cdn.libravatar.org/avatar/18032b56d3e314e5f6c70e04ad7cc4bd"
+ subject="comment 1"
+ date="2019-09-05T10:34:28Z"
+ content="""
+Ok, the answer is _yes_ to all those questions, how do we get a copy of the setup file?
+"""]]

diff --git a/forum/Building_outside_of_branchable.mdwn b/forum/Building_outside_of_branchable.mdwn
new file mode 100644
index 0000000..8c05c1f
--- /dev/null
+++ b/forum/Building_outside_of_branchable.mdwn
@@ -0,0 +1,3 @@
+How easy is it to build a copy of a branchable site locally? The .setup file does not appear to be in the git repo, would this be all that we would need? Would this cover, for example, themes? The site.css does not appear to contain the theme that was used on branchable.
+
+Thanks, Jamie

diff --git a/forum/generating_anchors___40__link_targets__41___in_middle_of_page.mdwn b/forum/generating_anchors___40__link_targets__41___in_middle_of_page.mdwn
new file mode 100644
index 0000000..6f7c644
--- /dev/null
+++ b/forum/generating_anchors___40__link_targets__41___in_middle_of_page.mdwn
@@ -0,0 +1 @@
+Currently there is no way to link to a heading or item in the middle of a long page, such as the [git-annex man page](https://git-annex.branchable.com/git-annex/).  Would it be possible to automatically generate unique HTML anchors for each heading and list item on a page?  The anchors would need to be based on the text of the heading/item, so that they are stable when the page is edited.

diff --git a/news/login_using_email_address/comment_1_5115ea4c14c1cb6d71349bee97ad023f._comment b/news/login_using_email_address/comment_1_5115ea4c14c1cb6d71349bee97ad023f._comment
deleted file mode 100644
index 464c5f6..0000000
--- a/news/login_using_email_address/comment_1_5115ea4c14c1cb6d71349bee97ad023f._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!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/news/login_using_email_address/comment_4_114c867aeb5fef12dd6cbe4addec9b04._comment b/news/login_using_email_address/comment_4_114c867aeb5fef12dd6cbe4addec9b04._comment
new file mode 100644
index 0000000..c255374
--- /dev/null
+++ b/news/login_using_email_address/comment_4_114c867aeb5fef12dd6cbe4addec9b04._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="opinioncr91@db82365e9dc923b30d01333e28493553e7b90801"
+ nickname="opinioncr91"
+ avatar="http://cdn.libravatar.org/avatar/e1a90aa031ba7867b322cd7c08101981"
+ subject="help"
+ date="2019-03-11T08:33:34Z"
+ content="""
+sorry, I'm still confused how to register at branchable. whether after receiving an email, can you directly enter the branchable site?
+
+because there is a choice of sites and emails, I enter the <a href=”http://opinioncr.com/”>opinioncr</a>
+"""]]

diff --git a/forum/return_to_xapian_search_engine.mdwn b/forum/return_to_xapian_search_engine.mdwn
new file mode 100644
index 0000000..1b54687
--- /dev/null
+++ b/forum/return_to_xapian_search_engine.mdwn
@@ -0,0 +1,10 @@
+For the last ~five years, most wikis on this instance of Branchable have been relying on Google for searches. This is because of a (now) old bug in Xapian, since then resolved, and documented here:
+
+ * [[bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41.]] - original bug report (2012)
+ * [[forum/bug remote “Exception: Expected block 6 to be level 1, not 0”]] - decision to switch to Google (2013)
+ * [Debian bug #724610: incrementally updated databases eventually become corrupt](http://bugs.debian.org/724610), fixed in 1.4.0 (stretch and above) but not 1.2.19 (jessie) (2013-2016)
+ * [Upstream bug #675: Exception in [Chert/Glass]Cursor::find_entry()](https://trac.xapian.org/ticket/675), fixed in 1.2.21 (2015)
+
+May I humbly suggest to try the Xapian search engine again? The reason is mostly that I want to avoid using Google products in my day to day routine: I have long ago stopped trusting they do the right thing with our data and their "free" services are nothing but, both in terms of "beer" (we pay with our privacy) and "speech" (we have zero access to their code).
+
+Thank you for reconsidering Xapian! I note that ikiwiki is featured prominently in the [Xapian users](https://xapian.org/users) page, it would only be fair that the main ikiwiki deployment would effectively honor that advertisement and switch back to Xapian. :) -- [[anarcat]]

diff --git a/about.mdwn b/about.mdwn
index 431418d..10c24af 100644
--- a/about.mdwn
+++ b/about.mdwn
@@ -8,7 +8,7 @@ content of your site at any time, and move it elsewhere if you desire.
 Everything about your site is version controlled using 
 [Git](http://git-scm.com/). It's branchable.
 
-We support the [Franklin Street Statement on Freedom and Network Services](http://autonomo.us/2008/07/franklin-street-statement/)
+We support the [Franklin Street Statement on Freedom and Network Services](https://web.archive.org/web/20100324100218/http://autonomo.us:80/2008/07/franklin-street-statement)
 in everything we do. We release the software that runs Branchable 
 at our [ikiwiki-hosting](http://ikiwiki-hosting.branchable.com/) site.
 
diff --git a/about/freedom.mdwn b/about/freedom.mdwn
index 697bf96..4db4d2a 100644
--- a/about/freedom.mdwn
+++ b/about/freedom.mdwn
@@ -1,4 +1,4 @@
-[[!img agpllogo.png link="http://autonomo.us/2008/07/franklin-street-statement/" align=right]]
+[[!img agpllogo.png link="https://web.archive.org/web/20100324100218/http://autonomo.us:80/2008/07/franklin-street-statement" align=right]]
 
 <big>We care about your freedom.</big>
 
@@ -8,7 +8,7 @@ source code of your web site at any time, and move it elsewhere if you desire.
 (We're confident that you won't want to, but it's important that you *can*.)
 
 We support the [Franklin Street Statement on Freedom and Network
-Services](http://autonomo.us/2008/07/franklin-street-statement/).
+Services](https://web.archive.org/web/20100324100218/http://autonomo.us:80/2008/07/franklin-street-statementt).
 
 We built Branchable out of 100% Free Software. Powerful software,
 like Git and IkiWiki. Software that is being continually improved by
diff --git a/news/free_hosting_for_Free_Software.mdwn b/news/free_hosting_for_Free_Software.mdwn
index df59e6a..6a73294 100644
--- a/news/free_hosting_for_Free_Software.mdwn
+++ b/news/free_hosting_for_Free_Software.mdwn
@@ -42,7 +42,7 @@ A: We don't enforce hard resource limits, but please keep disk usage to
 Q: Branchable is just a startup. What if it fails?  
 A: You can back up your entire site at any time using `git clone`.
    And move it, if needed, to any other system with ikiwiki.
-   (That's what the [Franklin Street Statement](http://autonomo.us/2008/07/franklin-street-statement/)
+   (That's what the [Franklin Street Statement](https://web.archive.org/web/20100324100218/http://autonomo.us:80/2008/07/franklin-street-statement)
    is all about.)
    Or, if you'd like to help us not fail, please consider also paying
    Branchable to host your blog or personal website.

diff --git a/forum/Light-weight_pull_requests__63__/comment_1_3a20dab0e499b02e7b473cb6d5d847df._comment b/forum/Light-weight_pull_requests__63__/comment_1_3a20dab0e499b02e7b473cb6d5d847df._comment
new file mode 100644
index 0000000..1b7d2bb
--- /dev/null
+++ b/forum/Light-weight_pull_requests__63__/comment_1_3a20dab0e499b02e7b473cb6d5d847df._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2018-06-06T18:03:30Z"
+ content="""
+I agree, and blogged about something similar a while ago:
+
+<https://joeyh.name/blog/entry/idea:_git_push_requests/>
+
+ikiwiki-hosting would be one place to implement this, it already has hooks
+that filter incoming pushes for wiki criteria. However, it would probably
+be better to implement something standalone and then ikiwiki-hosting could
+just use it.
+"""]]

diff --git a/forum/Light-weight_pull_requests__63__.mdwn b/forum/Light-weight_pull_requests__63__.mdwn
new file mode 100644
index 0000000..dd54f2f
--- /dev/null
+++ b/forum/Light-weight_pull_requests__63__.mdwn
@@ -0,0 +1,45 @@
+I had an idea that might be interesting to branchable folks. I originally [posted](https://public-inbox.org/git/1486427537.16949.42.camel@bonedaddy.net/) it to the git mailing lists there was some discussion there too.
+
+light-weight pull requests:
+
+Anonymous and ssh/http-identified users should be able to push just
+using git, within the refs/pull/ namespace, to any non-existent branch
+name or to a branch they created when previously identified, without
+forking off a new repository.
+
+Advantages:
+
+Removes the need to look up who to send the pull request notification
+to since configuring that is up to the project itself.
+
+Removes the annoying scenario of having lots of remotes that have been
+removed after the corresponding pull request was closed.
+
+Moves git hosting services from primarily a model of forests of
+forks to one of contributions to well maintained ongoing projects.
+
+Allows users to use their preferred git clients to issue pull requests
+instead of using web interfaces of popular git hosting services.
+
+Creates a new standard for contributing to repositories on all git
+repository hosting services.
+
+Contributions from people without an account on those services are
+possible.
+
+Contributions from people without any git repository hosting of their
+own are possible.
+
+Contributions from people who don't use or dislike MUAs are possible.
+
+Disadvantages:
+
+Pull request spam, could be mitigated with configuration options.
+
+Extra configuration and complexity on the server side. This is once
+only and means less complexity on the pull requester side.
+
+Will not work with typical setups where the git/http/ssh user does not
+have write access to the repositories. A workaround could be some sort
+of hybrid-repository setup with the new refs and objects in a second
+repository which would be shared by all pull requesters.

diff --git a/forum/TLS_for_source.__42__.branchable.com__63__/comment_4_403f5e695faf689d1406c36088ed7539._comment b/forum/TLS_for_source.__42__.branchable.com__63__/comment_4_403f5e695faf689d1406c36088ed7539._comment
new file mode 100644
index 0000000..4e0c424
--- /dev/null
+++ b/forum/TLS_for_source.__42__.branchable.com__63__/comment_4_403f5e695faf689d1406c36088ed7539._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="pabs3@49c776417680694a0f3295ee80df4edfca300096"
+ nickname="pabs3"
+ avatar="http://cdn.libravatar.org/avatar/3bf5f3b29a3d68ddf11eb1a3d8c5dc65"
+ subject="naming, HSTS, redirects?"
+ date="2018-05-30T00:59:36Z"
+ content="""
+I would go with $foo.source.branchable.com instead.
+
+Could we get HSTS and redirects from http to https?
+
+Adding the site to HSTS preloads and or https-everywhere would be good too.
+"""]]

diff --git a/forum/TLS_for_source.__42__.branchable.com__63__/comment_3_0af14cb64db344c5d61729ff7cd0e613._comment b/forum/TLS_for_source.__42__.branchable.com__63__/comment_3_0af14cb64db344c5d61729ff7cd0e613._comment
new file mode 100644
index 0000000..af533ee
--- /dev/null
+++ b/forum/TLS_for_source.__42__.branchable.com__63__/comment_3_0af14cb64db344c5d61729ff7cd0e613._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2018-05-29T17:22:42Z"
+ content="""
+We're using letsencrypt wildcard support -- but it only
+allows for a single level of domain name above the wildcard,
+so does not work for source.$foo.branchable.com.
+
+Renaming them to source-$foo.branchable.com, with a redirect from the old
+domain seems like the best way.
+"""]]

diff --git a/forum/Logout__63__/comment_1_2a7970f9d82bac3fef52faa7ca3a5201._comment b/forum/Logout__63__/comment_1_2a7970f9d82bac3fef52faa7ca3a5201._comment
new file mode 100644
index 0000000..a2412ea
--- /dev/null
+++ b/forum/Logout__63__/comment_1_2a7970f9d82bac3fef52faa7ca3a5201._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="pabs3@49c776417680694a0f3295ee80df4edfca300096"
+ nickname="pabs3"
+ avatar="http://cdn.libravatar.org/avatar/3bf5f3b29a3d68ddf11eb1a3d8c5dc65"
+ subject="ikiwiki codebase supports logout"
+ date="2018-05-24T00:49:15Z"
+ content="""
+Aha, the ikiwiki logout button is on the Preferences page. I think it would be a good idea to include a \"Logout\" link that just goes to the Preferences page (or a new logout page).
+"""]]

diff --git a/forum/Logout__63__.mdwn b/forum/Logout__63__.mdwn
new file mode 100644
index 0000000..eb2f505
--- /dev/null
+++ b/forum/Logout__63__.mdwn
@@ -0,0 +1 @@
+I'd like to be able to logout but I can't see anything in the interface. Can ikiwiki invalidate sessions and delete the corresponding cookies?

diff --git a/forum/TLS_for_source.__42__.branchable.com__63__/comment_2_1cd84913b4e753952928f764b7dfa068._comment b/forum/TLS_for_source.__42__.branchable.com__63__/comment_2_1cd84913b4e753952928f764b7dfa068._comment
new file mode 100644
index 0000000..d69a2cd
--- /dev/null
+++ b/forum/TLS_for_source.__42__.branchable.com__63__/comment_2_1cd84913b4e753952928f764b7dfa068._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="pabs3@49c776417680694a0f3295ee80df4edfca300096"
+ nickname="pabs3"
+ avatar="http://cdn.libravatar.org/avatar/3bf5f3b29a3d68ddf11eb1a3d8c5dc65"
+ subject="use letsencrypt wildcard support?"
+ date="2018-05-24T00:41:04Z"
+ content="""
+I note that Let's Encrypt now offers wildcard support, which could be a useful option for supporting TLS.
+"""]]

diff --git a/news/google_openid/comment_1_a71a6f2d30e8a6f4b1d98b049cf39857._comment b/news/google_openid/comment_1_a71a6f2d30e8a6f4b1d98b049cf39857._comment
deleted file mode 100644
index 62f0f6f..0000000
--- a/news/google_openid/comment_1_a71a6f2d30e8a6f4b1d98b049cf39857._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="tyeew@9ba9d28fe94f247a8221c4c9382e8956856026a2"
- nickname="tyeew"
- avatar="http://cdn.libravatar.org/avatar/f7dec28e1f29b367c23e1a6a63ae2557"
- subject="comment 1"
- date="2018-02-16T09:17:51Z"
- content="""
-I try to follow tha link given in the article and chech my personal profile <a href=\"http://qualityenglishproofreading.com/choose-proofreading-service-with-our-help/\">http://qualityenglishproofreading.com/choose-proofreading-service-with-our-help/</a>. This procedure is needed when you want to update the content on the website.
-"""]]

diff --git a/news/login_using_email_address/comment_4_e51181c596042d8ee6652c0f7d5bf193._comment b/news/login_using_email_address/comment_4_e51181c596042d8ee6652c0f7d5bf193._comment
deleted file mode 100644
index 7836458..0000000
--- a/news/login_using_email_address/comment_4_e51181c596042d8ee6652c0f7d5bf193._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="tyeew@9ba9d28fe94f247a8221c4c9382e8956856026a2"
- nickname="tyeew"
- avatar="http://cdn.libravatar.org/avatar/f7dec28e1f29b367c23e1a6a63ae2557"
- subject="comment 4"
- date="2018-02-16T09:14:30Z"
- content="""
-It will be better to attach the necessary information to this post <a href=\"http://resume-service.org/blog/category/services/page/5\">http://resume-service.org/blog/category/services/page/5</a>. Then people will know all useful details and information.
-"""]]

diff --git a/news/impact_of_heartbleed_openssl_vulnerability/comment_1_94e06e8a16f837662d95adf24e8ffd5c._comment b/news/impact_of_heartbleed_openssl_vulnerability/comment_1_94e06e8a16f837662d95adf24e8ffd5c._comment
deleted file mode 100644
index c8272c9..0000000
--- a/news/impact_of_heartbleed_openssl_vulnerability/comment_1_94e06e8a16f837662d95adf24e8ffd5c._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="Derek@849dcf47603ad75df52131d466abdaa15f9187da"
- nickname="Derek"
- avatar="http://cdn.libravatar.org/avatar/a93542d4a9ed793001a0c800f6f0d82d"
- subject="impact"
- date="2018-02-11T09:19:09Z"
- content="""
-The restoring of the security will allow the users to protect their data <a href=\"http://check-my-essay.com/\">checker my essays free</a>. However, this process will take some time to get a new security key.
-"""]]

diff --git a/news/scheduled_upgrade/comment_2_3cf6963ce8b756982cf27d6613359f91._comment b/news/scheduled_upgrade/comment_2_3cf6963ce8b756982cf27d6613359f91._comment
deleted file mode 100644
index caccfa4..0000000
--- a/news/scheduled_upgrade/comment_2_3cf6963ce8b756982cf27d6613359f91._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="tyeew@9ba9d28fe94f247a8221c4c9382e8956856026a2"
- nickname="tyeew"
- avatar="http://cdn.libravatar.org/avatar/f7dec28e1f29b367c23e1a6a63ae2557"
- subject="comment 2"
- date="2018-02-16T09:16:01Z"
- content="""
-The upgraded publication is more useful and informatine. I have no doubts concerning this. Read more on <a href=\"http://resumeperk.com/blog/page/2\">http://resumeperk.com/blog/page/2</a> and get more writing tips. Wish you every success.
-"""]]

diff --git a/news/scheduled_upgrade/comment_1_de45c2475771d527fe1233c12a72a5b5._comment b/news/scheduled_upgrade/comment_1_de45c2475771d527fe1233c12a72a5b5._comment
deleted file mode 100644
index fc049ac..0000000
--- a/news/scheduled_upgrade/comment_1_de45c2475771d527fe1233c12a72a5b5._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="Derek@849dcf47603ad75df52131d466abdaa15f9187da"
- nickname="Derek"
- avatar="http://cdn.libravatar.org/avatar/a93542d4a9ed793001a0c800f6f0d82d"
- subject="upgrade"
- date="2018-02-11T09:16:52Z"
- content="""
-The update <a href=\"http://edit-it.org/blog/professional-paper-editing-service-to-make-papers-perfect\">http://edit-it.org/blog/professional-paper-editing-service-to-make-papers-perfect</a> allowed getting some additional functions. However, now access is slightly limited due to the congestion. The problem will be solved soon.
-"""]]

diff --git a/news/https_encryption_for_Branchable_sites/comment_1_8fbbb4defdeeb13e1a493e3c8f9a239b._comment b/news/https_encryption_for_Branchable_sites/comment_1_8fbbb4defdeeb13e1a493e3c8f9a239b._comment
deleted file mode 100644
index ded018c..0000000
--- a/news/https_encryption_for_Branchable_sites/comment_1_8fbbb4defdeeb13e1a493e3c8f9a239b._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="Derek@849dcf47603ad75df52131d466abdaa15f9187da"
- nickname="Derek"
- avatar="http://cdn.libravatar.org/avatar/a93542d4a9ed793001a0c800f6f0d82d"
- subject="encryption"
- date="2018-02-11T09:11:30Z"
- content="""
-Such changes provide some advantages for the users. Using the site <a href=\"http://essaycorrector.org/\">essay corrector org - proofreading assistant cheap</a> in your own purposes will achieve a successful position in all directions.
-"""]]

diff --git a/news/beta_Lets_Encrypt_integration/comment_1_cea91d1f7dcc725e5635d3222ee9f6ce._comment b/news/beta_Lets_Encrypt_integration/comment_1_cea91d1f7dcc725e5635d3222ee9f6ce._comment
deleted file mode 100644
index c10d396..0000000
--- a/news/beta_Lets_Encrypt_integration/comment_1_cea91d1f7dcc725e5635d3222ee9f6ce._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="Derek@849dcf47603ad75df52131d466abdaa15f9187da"
- nickname="Derek"
- avatar="http://cdn.libravatar.org/avatar/a93542d4a9ed793001a0c800f6f0d82d"
- subject="certificate"
- date="2018-02-11T08:32:09Z"
- content="""
-The creation of a certificate has become a simpler process for users. It's great that we can test its work on our own website <a href=\"http://essay-editor.net/blog/category/services/page/2\">free papers editing</a>. We just need to take this opportunity.
-"""]]

diff --git a/news/beta_Lets_Encrypt_integration/comment_2_8a7127933b76929608aec641c5e14e9e._comment b/news/beta_Lets_Encrypt_integration/comment_2_8a7127933b76929608aec641c5e14e9e._comment
deleted file mode 100644
index 40de230..0000000
--- a/news/beta_Lets_Encrypt_integration/comment_2_8a7127933b76929608aec641c5e14e9e._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="tyeew@9ba9d28fe94f247a8221c4c9382e8956856026a2"
- nickname="tyeew"
- avatar="http://cdn.libravatar.org/avatar/f7dec28e1f29b367c23e1a6a63ae2557"
- subject="comment 2"
- date="2018-02-16T09:12:31Z"
- content="""
-But I hope that the sertificate provides more opportunities and <a href=\"http://resume-writer.net/blog/category/services/page/5\">http://resume-writer.net/blog/category/services/page/5</a> is very helpful for this aim. So, take care now.
-
-"""]]

diff --git a/news/google_openid/comment_1_a71a6f2d30e8a6f4b1d98b049cf39857._comment b/news/google_openid/comment_1_a71a6f2d30e8a6f4b1d98b049cf39857._comment
new file mode 100644
index 0000000..62f0f6f
--- /dev/null
+++ b/news/google_openid/comment_1_a71a6f2d30e8a6f4b1d98b049cf39857._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="tyeew@9ba9d28fe94f247a8221c4c9382e8956856026a2"
+ nickname="tyeew"
+ avatar="http://cdn.libravatar.org/avatar/f7dec28e1f29b367c23e1a6a63ae2557"
+ subject="comment 1"
+ date="2018-02-16T09:17:51Z"
+ content="""
+I try to follow tha link given in the article and chech my personal profile <a href=\"http://qualityenglishproofreading.com/choose-proofreading-service-with-our-help/\">http://qualityenglishproofreading.com/choose-proofreading-service-with-our-help/</a>. This procedure is needed when you want to update the content on the website.
+"""]]

diff --git a/news/scheduled_upgrade/comment_2_3cf6963ce8b756982cf27d6613359f91._comment b/news/scheduled_upgrade/comment_2_3cf6963ce8b756982cf27d6613359f91._comment
new file mode 100644
index 0000000..caccfa4
--- /dev/null
+++ b/news/scheduled_upgrade/comment_2_3cf6963ce8b756982cf27d6613359f91._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="tyeew@9ba9d28fe94f247a8221c4c9382e8956856026a2"
+ nickname="tyeew"
+ avatar="http://cdn.libravatar.org/avatar/f7dec28e1f29b367c23e1a6a63ae2557"
+ subject="comment 2"
+ date="2018-02-16T09:16:01Z"
+ content="""
+The upgraded publication is more useful and informatine. I have no doubts concerning this. Read more on <a href=\"http://resumeperk.com/blog/page/2\">http://resumeperk.com/blog/page/2</a> and get more writing tips. Wish you every success.
+"""]]

diff --git a/news/login_using_email_address/comment_4_e51181c596042d8ee6652c0f7d5bf193._comment b/news/login_using_email_address/comment_4_e51181c596042d8ee6652c0f7d5bf193._comment
new file mode 100644
index 0000000..7836458
--- /dev/null
+++ b/news/login_using_email_address/comment_4_e51181c596042d8ee6652c0f7d5bf193._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="tyeew@9ba9d28fe94f247a8221c4c9382e8956856026a2"
+ nickname="tyeew"
+ avatar="http://cdn.libravatar.org/avatar/f7dec28e1f29b367c23e1a6a63ae2557"
+ subject="comment 4"
+ date="2018-02-16T09:14:30Z"
+ content="""
+It will be better to attach the necessary information to this post <a href=\"http://resume-service.org/blog/category/services/page/5\">http://resume-service.org/blog/category/services/page/5</a>. Then people will know all useful details and information.
+"""]]

diff --git a/news/beta_Lets_Encrypt_integration/comment_2_8a7127933b76929608aec641c5e14e9e._comment b/news/beta_Lets_Encrypt_integration/comment_2_8a7127933b76929608aec641c5e14e9e._comment
new file mode 100644
index 0000000..40de230
--- /dev/null
+++ b/news/beta_Lets_Encrypt_integration/comment_2_8a7127933b76929608aec641c5e14e9e._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="tyeew@9ba9d28fe94f247a8221c4c9382e8956856026a2"
+ nickname="tyeew"
+ avatar="http://cdn.libravatar.org/avatar/f7dec28e1f29b367c23e1a6a63ae2557"
+ subject="comment 2"
+ date="2018-02-16T09:12:31Z"
+ content="""
+But I hope that the sertificate provides more opportunities and <a href=\"http://resume-writer.net/blog/category/services/page/5\">http://resume-writer.net/blog/category/services/page/5</a> is very helpful for this aim. So, take care now.
+
+"""]]

diff --git a/news/impact_of_heartbleed_openssl_vulnerability/comment_1_94e06e8a16f837662d95adf24e8ffd5c._comment b/news/impact_of_heartbleed_openssl_vulnerability/comment_1_94e06e8a16f837662d95adf24e8ffd5c._comment
new file mode 100644
index 0000000..c8272c9
--- /dev/null
+++ b/news/impact_of_heartbleed_openssl_vulnerability/comment_1_94e06e8a16f837662d95adf24e8ffd5c._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Derek@849dcf47603ad75df52131d466abdaa15f9187da"
+ nickname="Derek"
+ avatar="http://cdn.libravatar.org/avatar/a93542d4a9ed793001a0c800f6f0d82d"
+ subject="impact"
+ date="2018-02-11T09:19:09Z"
+ content="""
+The restoring of the security will allow the users to protect their data <a href=\"http://check-my-essay.com/\">checker my essays free</a>. However, this process will take some time to get a new security key.
+"""]]

diff --git a/news/scheduled_upgrade/comment_1_de45c2475771d527fe1233c12a72a5b5._comment b/news/scheduled_upgrade/comment_1_de45c2475771d527fe1233c12a72a5b5._comment
new file mode 100644
index 0000000..fc049ac
--- /dev/null
+++ b/news/scheduled_upgrade/comment_1_de45c2475771d527fe1233c12a72a5b5._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Derek@849dcf47603ad75df52131d466abdaa15f9187da"
+ nickname="Derek"
+ avatar="http://cdn.libravatar.org/avatar/a93542d4a9ed793001a0c800f6f0d82d"
+ subject="upgrade"
+ date="2018-02-11T09:16:52Z"
+ content="""
+The update <a href=\"http://edit-it.org/blog/professional-paper-editing-service-to-make-papers-perfect\">http://edit-it.org/blog/professional-paper-editing-service-to-make-papers-perfect</a> allowed getting some additional functions. However, now access is slightly limited due to the congestion. The problem will be solved soon.
+"""]]

diff --git a/news/https_encryption_for_Branchable_sites/comment_1_8fbbb4defdeeb13e1a493e3c8f9a239b._comment b/news/https_encryption_for_Branchable_sites/comment_1_8fbbb4defdeeb13e1a493e3c8f9a239b._comment
new file mode 100644
index 0000000..ded018c
--- /dev/null
+++ b/news/https_encryption_for_Branchable_sites/comment_1_8fbbb4defdeeb13e1a493e3c8f9a239b._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Derek@849dcf47603ad75df52131d466abdaa15f9187da"
+ nickname="Derek"
+ avatar="http://cdn.libravatar.org/avatar/a93542d4a9ed793001a0c800f6f0d82d"
+ subject="encryption"
+ date="2018-02-11T09:11:30Z"
+ content="""
+Such changes provide some advantages for the users. Using the site <a href=\"http://essaycorrector.org/\">essay corrector org - proofreading assistant cheap</a> in your own purposes will achieve a successful position in all directions.
+"""]]

diff --git a/news/beta_Lets_Encrypt_integration/comment_1_cea91d1f7dcc725e5635d3222ee9f6ce._comment b/news/beta_Lets_Encrypt_integration/comment_1_cea91d1f7dcc725e5635d3222ee9f6ce._comment
new file mode 100644
index 0000000..c10d396
--- /dev/null
+++ b/news/beta_Lets_Encrypt_integration/comment_1_cea91d1f7dcc725e5635d3222ee9f6ce._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Derek@849dcf47603ad75df52131d466abdaa15f9187da"
+ nickname="Derek"
+ avatar="http://cdn.libravatar.org/avatar/a93542d4a9ed793001a0c800f6f0d82d"
+ subject="certificate"
+ date="2018-02-11T08:32:09Z"
+ content="""
+The creation of a certificate has become a simpler process for users. It's great that we can test its work on our own website <a href=\"http://essay-editor.net/blog/category/services/page/2\">free papers editing</a>. We just need to take this opportunity.
+"""]]

diff --git a/forum/gettext_disabled__63__/comment_5_32a14cb9d27052fca0fb7212744b78b5._comment b/forum/gettext_disabled__63__/comment_5_32a14cb9d27052fca0fb7212744b78b5._comment
new file mode 100644
index 0000000..c8bf321
--- /dev/null
+++ b/forum/gettext_disabled__63__/comment_5_32a14cb9d27052fca0fb7212744b78b5._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="svetlana@192500fb6a2e2ef8e78d1a08cca64b1bca9833b9"
+ nickname="svetlana"
+ avatar="http://cdn.libravatar.org/avatar/5821f2dec97d186ce3b455b806d33035"
+ subject="comment 5"
+ date="2017-12-24T01:16:32Z"
+ content="""
+Are you aware of alternative ways to provide content in multiple languages?
+"""]]

diff --git a/forum/gettext_disabled__63__/comment_4_4db28de3a06cc800af1e5b4557fa8ee8._comment b/forum/gettext_disabled__63__/comment_4_4db28de3a06cc800af1e5b4557fa8ee8._comment
new file mode 100644
index 0000000..9986d01
--- /dev/null
+++ b/forum/gettext_disabled__63__/comment_4_4db28de3a06cc800af1e5b4557fa8ee8._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2017-12-23T18:48:54Z"
+ content="""
+Yes, as far as I know there's not been any improvements to the 'po' module.
+"""]]

diff --git a/forum/gettext_disabled__63__/comment_3_84aecabe8cca085f7279cd9b5ed345c1._comment b/forum/gettext_disabled__63__/comment_3_84aecabe8cca085f7279cd9b5ed345c1._comment
new file mode 100644
index 0000000..42e2ac5
--- /dev/null
+++ b/forum/gettext_disabled__63__/comment_3_84aecabe8cca085f7279cd9b5ed345c1._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="svetlana@192500fb6a2e2ef8e78d1a08cca64b1bca9833b9"
+ nickname="svetlana"
+ avatar="http://cdn.libravatar.org/avatar/5821f2dec97d186ce3b455b806d33035"
+ subject="comment 3"
+ date="2017-12-19T00:25:59Z"
+ content="""
+Is this still the case?
+"""]]

diff --git a/forum/TLS_for_source.__42__.branchable.com__63__/comment_1_f1e64db925c80e0750f84ffebc4d7ff6._comment b/forum/TLS_for_source.__42__.branchable.com__63__/comment_1_f1e64db925c80e0750f84ffebc4d7ff6._comment
new file mode 100644
index 0000000..8796b33
--- /dev/null
+++ b/forum/TLS_for_source.__42__.branchable.com__63__/comment_1_f1e64db925c80e0750f84ffebc4d7ff6._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2017-12-05T18:01:52Z"
+ content="""
+It would be good to use letsencrypt for that, the difficulty is that
+they only allow renewing a limited number of certs per month, and doubling
+the number of domains would be problimatic. 
+
+There are ways to bundle multiple domain into a letsencrypt cert,
+and getting source.foo.branchable.com at the same time it gets
+foo.branchable.com is doable, but would add complexity.
+
+It might be simpler to get rid of the "source." domain and move that
+to somewhere under the main domain. Where exactly to avoid conflicting
+with any page names? Probably not "/source" ...
+"""]]

diff --git a/forum/TLS_for_source.__42__.branchable.com__63__.mdwn b/forum/TLS_for_source.__42__.branchable.com__63__.mdwn
new file mode 100644
index 0000000..654db39
--- /dev/null
+++ b/forum/TLS_for_source.__42__.branchable.com__63__.mdwn
@@ -0,0 +1,9 @@
+It would be nice to have TLS for the source repository browsing site, this URL gives me an error message:
+
+https://source.myrepos.branchable.com/
+
+> source.myrepos.branchable.com uses an invalid security certificate.
+> The certificate is only valid for the following names:
+> *.branchable.com, branchable.com
+> 
+> Error code: SSL_ERROR_BAD_CERT_DOMAIN

diff --git a/forum/Refreshing_the_wiki_and_rebuilding_takes_forever.mdwn b/forum/Refreshing_the_wiki_and_rebuilding_takes_forever.mdwn
index 8d0f972..8ed6aa3 100644
--- a/forum/Refreshing_the_wiki_and_rebuilding_takes_forever.mdwn
+++ b/forum/Refreshing_the_wiki_and_rebuilding_takes_forever.mdwn
@@ -1,3 +1,3 @@
 Hi, 
 
-I've pushed some changes to my branchable's ikiwiki, but it's taking forever to refresh.
+I've pushed some changes to my branchable's ikiwiki (hroy.eu), but it's taking forever to refresh.

diff --git a/forum/Refreshing_the_wiki_and_rebuilding_takes_forever.mdwn b/forum/Refreshing_the_wiki_and_rebuilding_takes_forever.mdwn
new file mode 100644
index 0000000..8d0f972
--- /dev/null
+++ b/forum/Refreshing_the_wiki_and_rebuilding_takes_forever.mdwn
@@ -0,0 +1,3 @@
+Hi, 
+
+I've pushed some changes to my branchable's ikiwiki, but it's taking forever to refresh.

diff --git a/about.mdwn b/about.mdwn
index 551fd6e..431418d 100644
--- a/about.mdwn
+++ b/about.mdwn
@@ -13,7 +13,7 @@ in everything we do. We release the software that runs Branchable
 at our [ikiwiki-hosting](http://ikiwiki-hosting.branchable.com/) site.
 
 To contact us, please use the [[forum]], or 
-[e-mail](mailto:support@branchable.com) for private queries.
+[e-mail](mailto:admins-2017@branchable.com) for private queries.
 
 The people behind Branchable:
 
diff --git a/news/free_hosting_for_Free_Software.mdwn b/news/free_hosting_for_Free_Software.mdwn
index e2a665f..df59e6a 100644
--- a/news/free_hosting_for_Free_Software.mdwn
+++ b/news/free_hosting_for_Free_Software.mdwn
@@ -26,7 +26,7 @@ Software project is pretty simple:
    [[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
+3. Email <admins-2017@branchable.com> with "free software" in the subject, and
    a link to your site(s). We will check them, and convert it to a 
    free account.
 
diff --git a/news/google_openid.mdwn b/news/google_openid.mdwn
index ce8e7fa..4c88090 100644
--- a/news/google_openid.mdwn
+++ b/news/google_openid.mdwn
@@ -6,7 +6,7 @@ login cookie expires, you can't log back in via Google.
 
 We recommend getting an openid from a different provider, such as
 <http://pip.verisignlabs.com/>. If you created a Branchable site using a
-Google openid, you should <a href="mailto:admins@branchable.com">email us</a>
+Google openid, you should <a href="mailto:admins-2017@branchable.com">email us</a>
 with your new openid, so we can update your site to use it.
 
 Update: Seems that Google has changed their minds and
diff --git a/support.mdwn b/support.mdwn
index a7b4307..76ca4e5 100644
--- a/support.mdwn
+++ b/support.mdwn
@@ -5,6 +5,6 @@ We also have some [[Tips]] for using Branchable.
 Bugs in Branchable itself are tracked [[here|bugs]], while bugs in Ikiwiki
 are tracked [on its site](http://ikiwiki.info/bugs/).
 
-If you have an urgent technical problem, email <admin@branchable.com>.
+If you have an urgent technical problem, email <admins-2017@branchable.com>.
 That goes directly to [[people/Joey]] and [[Lars|people/liw]], so
 don't wear it out.
diff --git a/tips/importing_an_existing_ikiwiki_site_to_branchable.mdwn b/tips/importing_an_existing_ikiwiki_site_to_branchable.mdwn
index a04498b..712d10d 100644
--- a/tips/importing_an_existing_ikiwiki_site_to_branchable.mdwn
+++ b/tips/importing_an_existing_ikiwiki_site_to_branchable.mdwn
@@ -27,7 +27,7 @@ import it into Branchable.
    your site uses, or make other configuration tweaks. 
 
 8. It may be necessary to set the file modification timestamps
-   to match git commit times. E-mail [admin](mailto:admin@branchable.com)
+   to match git commit times. E-mail [admin](mailto:admins-2017@branchable.com)
    and we'll do it.
 
 9. Finally, update your site's DNS to point to the site at Branchable.
diff --git a/tips/using_https.mdwn b/tips/using_https.mdwn
index 081247a..1cff41a 100644
--- a/tips/using_https.mdwn
+++ b/tips/using_https.mdwn
@@ -32,4 +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 B8611E9C (Lars).
-<a href="mailto:admins@branchable.com">Email us</a>.
+<a href="mailto:admins-2017@branchable.com">Email us</a>.

diff --git a/forum/How_do_I_disable_openid_and_email_auth__63__/comment_1_04d006275d086de3f3f7d415d4d9295e._comment b/forum/How_do_I_disable_openid_and_email_auth__63__/comment_1_04d006275d086de3f3f7d415d4d9295e._comment
new file mode 100644
index 0000000..6764634
--- /dev/null
+++ b/forum/How_do_I_disable_openid_and_email_auth__63__/comment_1_04d006275d086de3f3f7d415d4d9295e._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2017-03-18T16:43:00Z"
+ content="""
+The web interface does not allow disabling openid and emailauth plugins
+because that's probaly how the admin logs in and they could lock themselves
+out making that change.
+
+Branchable admins can do it, so the procedure is:
+
+1. Create an account using password authentication.
+2. Change site configuration so that account is one of the admins.
+3. Contact us to make the change.
+
+I see you already had done #1 and #2 for guppy.branchable.com, so I've
+disabled openid and emailauth for that site.
+"""]]

diff --git a/forum/How_do_I_disable_openid_and_email_auth__63__.mdwn b/forum/How_do_I_disable_openid_and_email_auth__63__.mdwn
new file mode 100644
index 0000000..02be656
--- /dev/null
+++ b/forum/How_do_I_disable_openid_and_email_auth__63__.mdwn
@@ -0,0 +1,11 @@
+Good day,
+
+I would like a password to be required for logging in via any method.
+
+- Passworded login - asks to enter 'username', 'password', and 'account creation password' - this is ok
+- Openid - asks to enter openid uri - not ok
+- Email login - asks to enter email and click a link in the email - not ok
+
+Please advise how to password protect or disable the two last methods, I do not even see 'openid' mentioned in the setup. It is for the guppy.* site.
+
+Thank you in advance.

diff --git a/forum/How_to_enable_private_wiki_with_httpauth__63__/comment_1_f12e31a9499c244347717ebb63a4fed4._comment b/forum/How_to_enable_private_wiki_with_httpauth__63__/comment_1_f12e31a9499c244347717ebb63a4fed4._comment
new file mode 100644
index 0000000..9cfed25
--- /dev/null
+++ b/forum/How_to_enable_private_wiki_with_httpauth__63__/comment_1_f12e31a9499c244347717ebb63a4fed4._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2017-01-29T18:17:53Z"
+ content="""
+See [[forum/Read_access_restrictions]].
+"""]]

diff --git a/forum/How_to_enable_private_wiki_with_httpauth__63__.mdwn b/forum/How_to_enable_private_wiki_with_httpauth__63__.mdwn
new file mode 100644
index 0000000..02e2213
--- /dev/null
+++ b/forum/How_to_enable_private_wiki_with_httpauth__63__.mdwn
@@ -0,0 +1,5 @@
+Hi, I'd like to set up a completely private wiki, and httpauth would work well.
+
+However, when I go to Setup -> Advanced Mode -> enable httpauth, the checkbox is disabled, so I can't enable httpauth.
+
+What am I missing?

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.
+"""]]

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.)
+"""]]

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.
+"""]]

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.
+"""]]

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?
+"""]]

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]

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.
+"""]]

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

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

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

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

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
+"""]]

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. 
+"""]]

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?
+"""]]

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.
+"""]]

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.

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]]

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.. ;)
+"""]]

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?

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.
+"""]]

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.
+"""]]

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).

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.
+"""]]

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
+
+
+"""]]

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. 
+"""]]

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.
+"""]]

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 
+"""]]

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
+"""]]

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.

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>
+"""]]

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"]]

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"]]

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/

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

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