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

diff --git a/news/going_noncorporate.mdwn b/news/going_noncorporate.mdwn
index 22f5202..9d77738 100644
--- a/news/going_noncorporate.mdwn
+++ b/news/going_noncorporate.mdwn
@@ -14,7 +14,7 @@ The above is the essence of the change, but I wanted to say something
 personal as well.
 
 When Lars and I started working on Branchable two years ago, our goal was
-not to get ritch quick. We hoped to provide ourselves with a small income
+not to get rich quick. We hoped to provide ourselves with a small income
 that would supplement our other work and add some flexability to our lives,
 and we wanted to build a service for people who valued [[about/freedom]]
 from proprietary lock-in, while wanting something easy to use. I think
@@ -34,3 +34,13 @@ it's a labor of love.
 ### message from Lars
 
 [[!img people/liw/lars.jpg align=right alt="photo"]]
+
+I originally started Braawi as a backup service company, and then did several
+years of consulting through it. However, I'm now working in a normal job,
+and it takes a bit of time and money to keep the company alive, so that's
+why it's shutting down.
+
+I love Branchable. It is wonderful to have a sensible hosting service
+for my own web/wiki/blog sites, and I enjoy being able to help others
+host their stuff the same way. I plan to help Joey keep Branchable alive
+for a long, long time to come.

diff --git a/news/going_noncorporate.mdwn b/news/going_noncorporate.mdwn
index 2e887f4..22f5202 100644
--- a/news/going_noncorporate.mdwn
+++ b/news/going_noncorporate.mdwn
@@ -15,7 +15,7 @@ personal as well.
 
 When Lars and I started working on Branchable two years ago, our goal was
 not to get ritch quick. We hoped to provide ourselves with a small income
-that would suppliment our other work and add some flexability to our lives,
+that would supplement our other work and add some flexability to our lives,
 and we wanted to build a service for people who valued [[about/freedom]]
 from proprietary lock-in, while wanting something easy to use. I think
 we've succeeded well at the latter goal; as to the former, we've only
@@ -27,9 +27,9 @@ Ikiwiki available now, in Branchable.
 
 So I plan to contine operating Branchable, and hope that the users keep
 paying its operating expenses. And if our current slow growth in new
-users continues, then who knows, it may still pay the bills. Until and
-unless that happens, Branchable isn't a business venture for me, it's a
-labor of love.
+users continues, then who knows, it may still put some food on my table.
+Until and unless that happens, Branchable isn't a business venture for me,
+it's a labor of love.
 
 ### message from Lars
 

diff --git a/news/going_noncorporate.mdwn b/news/going_noncorporate.mdwn
index 3a08ad4..2e887f4 100644
--- a/news/going_noncorporate.mdwn
+++ b/news/going_noncorporate.mdwn
@@ -32,3 +32,5 @@ unless that happens, Branchable isn't a business venture for me, it's a
 labor of love.
 
 ### message from Lars
+
+[[!img people/liw/lars.jpg align=right alt="photo"]]

diff --git a/news/going_noncorporate.mdwn b/news/going_noncorporate.mdwn
new file mode 100644
index 0000000..3a08ad4
--- /dev/null
+++ b/news/going_noncorporate.mdwn
@@ -0,0 +1,34 @@
+We've changed the focus of Branchable, away from being a for-profit
+corporation. Branchable's parent company, [Braawi Ltd](http://braawi.com/)
+will be closed down. Branchable will continue as a service run by 
+[[Joey Hess|people/joey]] and [[Lars Wirzenius|people/liw]]. 
+
+This change will be reflected in the bills we send our users going forward.
+Users who have set up recurring PayPal payments to Braawi will need to
+stop them.
+
+### message from Joey
+
+[[!img people/joey/joey.jpg align=right alt="photo"]]
+The above is the essence of the change, but I wanted to say something
+personal as well.
+
+When Lars and I started working on Branchable two years ago, our goal was
+not to get ritch quick. We hoped to provide ourselves with a small income
+that would suppliment our other work and add some flexability to our lives,
+and we wanted to build a service for people who valued [[about/freedom]]
+from proprietary lock-in, while wanting something easy to use. I think
+we've succeeded well at the latter goal; as to the former, we've only
+made enough money to pay for operating expenses, but not for our time.
+
+And to me, that's ok. I'd rather build something that is done right than
+make money. And I'm proud that there's a very easy hosting service for
+Ikiwiki available now, in Branchable.
+
+So I plan to contine operating Branchable, and hope that the users keep
+paying its operating expenses. And if our current slow growth in new
+users continues, then who knows, it may still pay the bills. Until and
+unless that happens, Branchable isn't a business venture for me, it's a
+labor of love.
+
+### message from Lars

diff --git a/about.mdwn b/about.mdwn
index 7f32956..551fd6e 100644
--- a/about.mdwn
+++ b/about.mdwn
@@ -24,8 +24,6 @@ The people behind Branchable:
 
 ---
 
-Branchable is a project of [Braawi Ltd](http://braawi.com/).
-
 Our [[Privacy_Policy|privacy]] and [[Terms_Of_Service|terms]].
 
 [[Testimonials]]
diff --git a/terms.mdwn b/terms.mdwn
index b88c424..ca58378 100644
--- a/terms.mdwn
+++ b/terms.mdwn
@@ -12,26 +12,26 @@ show=3 description="Branchable Terms of Service changes"]]
 """]]
 
 
-* The Branchable.com service is provided by Braawi Ltd on a best-effort
+* The Branchable.com service is provided on a best-effort
   basis. Higher service levels may be provided based on separate agreements.
-* Braawi may limit disk space or bandwidth usage of a site to protect
-  other sites from adverse impact. Braawi will inform affected site owners
+* We may limit disk space or bandwidth usage of a site to protect
+  other sites from adverse impact. We will inform affected site owners
   of any action taken.
-* Braawi makes no ownership claim regarding the content of customer's sites.
+* We make no ownership claim regarding the content of customer's sites.
   Customers are responsible for the content of their sites.
-* Braawi will only modify the content of a site at the site owner's request.
-* Braawi will not take down any site without the site owner's consent,
+* We will only modify the content of a site at the site owner's request.
+* We will not take down any site without the site owner's consent,
   except as required by law; or due to the owner's failure to pay their
   bills; or if the site is being used for spamming or the distribution
-  of malware. When possible, Braawi will inform affected site owners of
+  of malware. When possible, We will inform affected site owners of
   takedowns, and allow them to respond.
-* Braawi owns all DNS subdomains of Branchable.com. After a site is taken
+* We own all DNS subdomains of Branchable.com. After a site is taken
   down, its subdomain may later by reused for another site.
-* Braawi provides NO WARRANTY of any kind for the Branchable.com
+* We provide NO WARRANTY of any kind for the Branchable.com
   service or our software.
-* Braawi will not be held liable for damages arising from use of the
+* We will not be held liable for damages arising from use of the
   Branchable.com service or our software (including but not limited to
   loss of data).
-* These Terms of Service may be changed by Braawi at any time. Customers
+* These Terms of Service may be changed at any time. Customers
   will be notified of changes via RSS and e-mails.
 
diff --git a/terms/change/remove_Braawi.mdwn b/terms/change/remove_Braawi.mdwn
new file mode 100644
index 0000000..6582620
--- /dev/null
+++ b/terms/change/remove_Braawi.mdwn
@@ -0,0 +1,4 @@
+The Terms of Service were updated. Branchable is no longer run by Braawi;
+it is now run as a personal project of Joey Hess and Lars Wirzenius. Since
+the ToS mentioned Braawi, those mentions had to be changed. No other
+changes made.

diff --git a/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__/comment_2_23f8e0da82d492ff4d0e3c26f53258d4._comment b/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__/comment_2_23f8e0da82d492ff4d0e3c26f53258d4._comment
new file mode 100644
index 0000000..c9aad2e
--- /dev/null
+++ b/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__/comment_2_23f8e0da82d492ff4d0e3c26f53258d4._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://jamestechnotes.com/"
+ nickname="James"
+ subject="determine canonical url"
+ date="2012-02-25T19:29:27Z"
+ content="""
+Is there a way to determine the canonical url of the page?  BASEURL resolves to some like ../../.., URL is empty.
+"""]]

diff --git a/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__/comment_1_42cab8fab2a93893a7bc64751a04d6a7._comment b/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__/comment_1_42cab8fab2a93893a7bc64751a04d6a7._comment
new file mode 100644
index 0000000..4773dd4
--- /dev/null
+++ b/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__/comment_1_42cab8fab2a93893a7bc64751a04d6a7._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2012-02-25T16:11:49Z"
+ content="""
+The best way depends..
+
+If someone had written a plugin for ikiwiki, that would be the best way, but while it has one for flatter it doesn't have ones for these others.
+
+If you want to put it on *every* page, edit `page.tmpl` and insert whatever html you like into there. This is also
+the best choice if the html includes javascript, `<object>`, or other stuff that ikiwiki's htmlscrubber strips out, since the admin of a site can bypass those protections by putting it into `page.tmpl`.
+
+Or, you can [add a template to your site](http://jamestechnotes.com/templates/), and put the stuff in there. Then
+use the template directive to include it into whatever pages you like. (Something like: `[[!template id=bling]]`)
+But on pages with the htmlscrubber enabled, the template content will be subjected to sanitization.
+"""]]

diff --git a/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41./comment_2_b0a6e77d66a2138bb8c5e798ef156bee._comment b/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41./comment_2_b0a6e77d66a2138bb8c5e798ef156bee._comment
new file mode 100644
index 0000000..f6a2167
--- /dev/null
+++ b/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41./comment_2_b0a6e77d66a2138bb8c5e798ef156bee._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 2"
+ date="2012-02-25T16:03:47Z"
+ content="""
+Well, you worked around the problem in the right way. It's nothing to do with your page.tmpl or anything you did, this is some sort of bug in the Xapian serach engine, where it seems to corrupt its database, and the only thing I know to do about it so far is delete its database and reindex.
+
+Ideally, I should eventually capture one of these corrupt databases and investigate further what's going wrong in it.
+
+For now, I have upgraded our version of xapian, in the hope that this fixes whatever bug in it has been causing this problem. If not, at least we'll have a current version to report a bug about.
+"""]]

diff --git a/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41./comment_1_e1805ae5335c50fc9101529dd6fd7617._comment b/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41./comment_1_e1805ae5335c50fc9101529dd6fd7617._comment
new file mode 100644
index 0000000..32c5938
--- /dev/null
+++ b/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41./comment_1_e1805ae5335c50fc9101529dd6fd7617._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://jamestechnotes.com/"
+ nickname="James"
+ subject="it is ok now"
+ date="2012-02-25T15:46:53Z"
+ content="""
+I disabled search through the web interface. let the site rebuild itself.
+I enabled search through the web interface, let the site rebuild itself, it seems ok.
+
+Not sure if it was something I did in my page.tmpl or not.
+"""]]

diff --git a/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41..mdwn b/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41..mdwn
new file mode 100644
index 0000000..bc4e583
--- /dev/null
+++ b/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41..mdwn
@@ -0,0 +1,19 @@
+I'm getting this when I push push up changes:
+
+The complete thing:
+
+~/src/wiki/jamestechnotes.com (master) $ git push
+Counting objects: 7, done.
+Delta compression using up to 8 threads.
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (4/4), 354 bytes, done.
+Total 4 (delta 2), reused 0 (delta 0)
+remote: From /home/b-jamestechnicalnotes/source
+remote:    f3c7965..e4e796f  master     -> origin/master
+remote: Exception: Cannot open tables at consistent revisions at /usr/lib/perl5/Search/Xapian/WritableDatabase.pm line 41.
+To b-jamestechnicalnotes@jamestechnicalnotes.branchable.com:/
+   f3c7965..e4e796f  master -> master
+~/src/wiki/jamestechnotes.com (master) $ 
+
+
+I am trying to update templates/page.tmpl.

diff --git a/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__.mdwn b/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__.mdwn
new file mode 100644
index 0000000..de6fea6
--- /dev/null
+++ b/forum/What_is_the_best_way_to_add_a_google+__47__facebook_like__47__tweet_me_button__63__.mdwn
@@ -0,0 +1,4 @@
+I wish to add a google+, facebook like, and tweet me button to various pages of my site.
+
+What is the best way to do such a thing?
+

diff --git a/about/intro.mdwn b/about/intro.mdwn
index be14faf..2ed8153 100644
--- a/about/intro.mdwn
+++ b/about/intro.mdwn
@@ -19,7 +19,7 @@ or **$59.99/year**, for up to two sites.
 <td>
 <ul>
 <li><a href="http://www.crec76.org/">Clinch River Educational Center</a></li>
-<li><a href="http://wiki.effi.org/">Electronic Frontier Finland's wiki</a></li>
+<li><a href="http://gardengeek.org">Garden Geek</a></li>
 </ul>
 </td>
 <td>

diff --git a/about/intro.mdwn b/about/intro.mdwn
index 85df804..be14faf 100644
--- a/about/intro.mdwn
+++ b/about/intro.mdwn
@@ -24,8 +24,8 @@ or **$59.99/year**, for up to two sites.
 </td>
 <td>
 <ul>
-<li><a href="http://updo.debian.net/">Planet Debian upstream</a></li>
-<li><a href="http://geekout.org.uk/">Mongol Ralley Team Geekout</a></li>
+<li><a href="http://webconverger.org/">Webconverger</a></li>
+<li><a href="http://geekout.org.uk/">Mongol Rally Team Geekout</a></li>
 </ul>
 </td>
 <td>

diff --git a/news/new_faster_markdown_engine.mdwn b/news/new_faster_markdown_engine.mdwn
new file mode 100644
index 0000000..dab2c12
--- /dev/null
+++ b/news/new_faster_markdown_engine.mdwn
@@ -0,0 +1,5 @@
+Today I've installed a new version of ikiwiki, which uses a
+faster markdown engine called "discount". It's been benchmarked to be up to
+40 times faster than the old engine, so enjoy the speed boost! --[[Joey]]
+
+[[!meta author=Joey]]

diff --git a/news/new_faster_markdown_engine.mdwn b/news/new_faster_markdown_engine.mdwn
deleted file mode 100644
index dab2c12..0000000
--- a/news/new_faster_markdown_engine.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Today I've installed a new version of ikiwiki, which uses a
-faster markdown engine called "discount". It's been benchmarked to be up to
-40 times faster than the old engine, so enjoy the speed boost! --[[Joey]]
-
-[[!meta author=Joey]]

diff --git a/news/scheduled_downtime.mdwn b/news/scheduled_downtime.mdwn
index dce5a76..2c4111c 100644
--- a/news/scheduled_downtime.mdwn
+++ b/news/scheduled_downtime.mdwn
@@ -16,5 +16,7 @@ continue to work too, for the next month.
 Our new IP address is: `66.228.46.55`  
 Our new IPv6 address is: `2600:3c03::f03c:91ff:fedf:c0e5`
 
+**Update**: The old IP address was decommissioned on January 5th 2012.
+
 [[!meta title="we've moved!"]]
 [[!meta author=Joey]]

diff --git a/news/new_faster_markdown_engine.mdwn b/news/new_faster_markdown_engine.mdwn
new file mode 100644
index 0000000..dab2c12
--- /dev/null
+++ b/news/new_faster_markdown_engine.mdwn
@@ -0,0 +1,5 @@
+Today I've installed a new version of ikiwiki, which uses a
+faster markdown engine called "discount". It's been benchmarked to be up to
+40 times faster than the old engine, so enjoy the speed boost! --[[Joey]]
+
+[[!meta author=Joey]]

diff --git a/about/git.mdwn b/about/git.mdwn
index 3398075..86ddd8d 100644
--- a/about/git.mdwn
+++ b/about/git.mdwn
@@ -1,6 +1,6 @@
 [[!img gitlogo.png link="http://git-scm.com/" align=right]]
 
-<big>It's 2011. You should be able to `git clone` your wiki or blog.</big>
+<big>It's 2012. You should be able to `git clone` your wiki or blog.</big>
 
 Yes: At Branchable, everything about your web site is version controlled
 using [Git](http://git-scm.com/). Right down to the site's configuration.

diff --git a/forum/Including_Google_fonts/comment_1_7cba8ff7ae44bcf38de53ea49c2fcb2d._comment b/forum/Including_Google_fonts/comment_1_7cba8ff7ae44bcf38de53ea49c2fcb2d._comment
new file mode 100644
index 0000000..09f9fae
--- /dev/null
+++ b/forum/Including_Google_fonts/comment_1_7cba8ff7ae44bcf38de53ea49c2fcb2d._comment
@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-12-07T16:16:48Z"
+ content="""
+You can actually do this on a per-page basis without template modifications using the [[!ikiwiki/directive/meta]] directive on a page:
+
+<pre>
+[[!meta link=\"http://fonts.googleapis.com/css?family=Open+Sans:400,700\" rel=\"stylesheet\" type=\"text/css\"]]
+[[!meta link=\"http://fonts.googleapis.com/css?family=Arvo:700\" rel=\"stylesheet\" type=\"text/css\"]]
+</pre>
+
+Although this is blocked by the [[!ikiwiki/plugin/htmlscrubber]] so you have to disable it for at least that page in your site's configuration:
+
+<pre>
+# PageSpec specifying pages not to scrub
+htmlscrubber_skip: fontypage
+</pre>
+
+---
+
+If you do want to add the fonts to every page, templates are the way. Get a copy of ikiwiki's `page.tmpl` from [here](http://source.ikiwiki.branchable.com/?p=source.git;a=tree;f=templates), modify to add the html and put it in the `templates/` directory of your site in git (or just go to the [[templates]] page on your site and upload it as an attachment).
+"""]]

diff --git a/tips/customizing_the_look_of_your_site.mdwn b/tips/customizing_the_look_of_your_site.mdwn
index 9590864..c296564 100644
--- a/tips/customizing_the_look_of_your_site.mdwn
+++ b/tips/customizing_the_look_of_your_site.mdwn
@@ -129,6 +129,6 @@ The modified template needs to be uploaded as an attachment to the templates
 page of your site. So go to `http://yoursite.branchable.com/templates`,
 click on the "Edit" link, and use the attachments interface to upload
 a page.tmpl. You can find copies of all the templates to use as starting
-points [here](http://git.ikiwiki.info/?p=ikiwiki;a=tree;f=templates).
+points [here](http://source.ikiwiki.branchable.com/?p=source.git;a=tree;f=templates).
 
 [[!meta author="joey and liw"]]

diff --git a/forum/Including_Google_fonts.mdwn b/forum/Including_Google_fonts.mdwn
new file mode 100644
index 0000000..11c856d
--- /dev/null
+++ b/forum/Including_Google_fonts.mdwn
@@ -0,0 +1,6 @@
+Hi! Want to please include the following fonts to <http://webconverger.org>
+
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Arvo:700' rel='stylesheet' type='text/css'>
+
+How do I do that? I suspect I need to edit a template file somewhere. Not sure where, not sure how to add it into the [git repo](http://source.webconverger-org.branchable.com/?p=source.git;a=tree). From there I'm at ease with [local.css](http://source.webconverger-org.branchable.com/?p=source.git;a=blob;f=local.css;).

diff --git a/bugs/ssh_push_problem.mdwn b/bugs/ssh_push_problem.mdwn
index 8f5ae52..8afe1cf 100644
--- a/bugs/ssh_push_problem.mdwn
+++ b/bugs/ssh_push_problem.mdwn
@@ -10,4 +10,5 @@ fix it. (You may have to re-push repeatedly.)
 Update: We think that only sites that have anonymous git push enabled
 experience this problem.
 
+Update: We've fixed the problem. [[done]]
 --[[Joey]]

diff --git a/bugs/ssh_push_problem.mdwn b/bugs/ssh_push_problem.mdwn
index 760d453..8f5ae52 100644
--- a/bugs/ssh_push_problem.mdwn
+++ b/bugs/ssh_push_problem.mdwn
@@ -7,4 +7,7 @@ We're still trying to track the problem down, but when this happens,
 your push did not get through, and running the same push again will
 fix it. (You may have to re-push repeatedly.)
 
+Update: We think that only sites that have anonymous git push enabled
+experience this problem.
+
 --[[Joey]]

diff --git a/bugs/ssh_push_problem.mdwn b/bugs/ssh_push_problem.mdwn
new file mode 100644
index 0000000..760d453
--- /dev/null
+++ b/bugs/ssh_push_problem.mdwn
@@ -0,0 +1,10 @@
+Users who use ssh to push changes to their Branchable sites may see this
+message:
+
+	fatal: The remote end hung up unexpectedly
+
+We're still trying to track the problem down, but when this happens,
+your push did not get through, and running the same push again will
+fix it. (You may have to re-push repeatedly.)
+
+--[[Joey]]

diff --git a/landing.mdwn b/landing.mdwn
index 5e151e1..3b0b022 100644
--- a/landing.mdwn
+++ b/landing.mdwn
@@ -16,7 +16,7 @@ enough for beginners but powerful enough to fuel a small (or not so small)
 business.
 
 Branchable adds <span style="font-weight: bold;">extra control and security</span>
-on top of features you can find on free blogging platforms.  
+on top of features you can find on free blogging platforms.
 You can make and change web pages, post blog entries, and control your web site
 completely from your web browser. Place Google ads on the sidebar or insert
 customized banners from individual advertisers. Download your

diff --git a/landing.mdwn b/landing.mdwn
new file mode 100644
index 0000000..5e151e1
--- /dev/null
+++ b/landing.mdwn
@@ -0,0 +1,42 @@
+[[!meta title="Do you want to make money blogging?"]]
+
+[[!inline raw=yes pages=makesite]]
+
+<img style="width: 277px; height: 300px;" alt="Anna" src="http://www.waldeneffect.org/20111130anna.jpg" align="right" hspace="10" vspace="10">
+
+My husband and I have been using Branchable and related software as our
+blogging platform for the last three years. Now our blog and other online
+businesses <span style="font-weight: bold;">bring in $60,000
+annually</span>.
+
+The key to making a living on the internet is flexibility, and that means
+<span style="font-weight: bold;">starting with a blogging platform that
+will let you grow and change</span>. Branchable is simple
+enough for beginners but powerful enough to fuel a small (or not so small)
+business.
+
+Branchable adds <span style="font-weight: bold;">extra control and security</span>
+on top of features you can find on free blogging platforms.  
+You can make and change web pages, post blog entries, and control your web site
+completely from your web browser. Place Google ads on the sidebar or insert
+customized banners from individual advertisers. Download your
+entire blog to your home computer to work offline (or just preserve
+your data), then merge the revised version with the old web site on the
+internet...even if your partner has been making other edits at the same
+time.
+
+Branchable also means peace of mind that <span style="font-weight: bold;">you
+control your data</span>. When you make a web site on Branchable, they don't lock
+you in. You can download the entire source code of your web site at any time, and
+move it elsewhere if you desire.
+
+When it comes right down to it, I use Branchable because
+<span style="font-weight: bold;">it's easy, and it just works</span>.
+You've got nothing to lose by giving it a try --- 
+<span style="font-weight: bold;">the first month is free</span>.
+So, go ahead, create your website, wiki, or blog in
+<span style="font-weight: bold;">just one minute</span>! 
+The sooner you start, the sooner you will have blogged your way to
+financial independence.<br>
+
+[[!inline raw=yes pages=makesite]]

diff --git a/news/scheduled_downtime.mdwn b/news/scheduled_downtime.mdwn
index 9267a2c..dce5a76 100644
--- a/news/scheduled_downtime.mdwn
+++ b/news/scheduled_downtime.mdwn
@@ -11,9 +11,10 @@ owners of such sites to help them move to the new IP address after the
 transition. To keep such sites from breaking, our old IP address will
 continue to work too, for the next month.
 
-Our new IP address is: `66.228.46.55`
+**Update**: The move is complete.
 
-(Our new IPv6 address is: `2600:3c03::f03c:91ff:fedf:c0e5`)
+Our new IP address is: `66.228.46.55`  
+Our new IPv6 address is: `2600:3c03::f03c:91ff:fedf:c0e5`
 
-[[!meta title="scheduled downtime -- we're moving!"]]
+[[!meta title="we've moved!"]]
 [[!meta author=Joey]]

diff --git a/news/scheduled_downtime.mdwn b/news/scheduled_downtime.mdwn
index 277a825..9267a2c 100644
--- a/news/scheduled_downtime.mdwn
+++ b/news/scheduled_downtime.mdwn
@@ -1,6 +1,7 @@
 On Saturday, 26 November, at 12 pm EST (17:00 GMT),
-Branchable will be transitioned to new hosting, and will be briefly
-offline. We expect the move to take less than an hour, and
+Branchable will be transitioned to new hosting. 
+During this time we expect sites to remain accessible, but in a read-only
+mode. We expect the move to take less than an hour, and
 will post updates on [identi.ca](http://identi.ca/branchable) and
 [twitter](http://twitter.com/#!/branchable).
 
@@ -10,5 +11,9 @@ owners of such sites to help them move to the new IP address after the
 transition. To keep such sites from breaking, our old IP address will
 continue to work too, for the next month.
 
+Our new IP address is: `66.228.46.55`
+
+(Our new IPv6 address is: `2600:3c03::f03c:91ff:fedf:c0e5`)
+
 [[!meta title="scheduled downtime -- we're moving!"]]
 [[!meta author=Joey]]
diff --git a/tips/using_own_domain.mdwn b/tips/using_own_domain.mdwn
index 5b285ea..1ca6be5 100644
--- a/tips/using_own_domain.mdwn
+++ b/tips/using_own_domain.mdwn
@@ -20,7 +20,7 @@ how.
    `example.com CNAME foo.branchable.com`
 
    If you cannot set up a CNAME, you can instead configure your domain
-   name to point to the IP address `194.187.214.164`. But if you do,
+   name to point to the IP address `66.228.46.55`. But if you do,
    keep in mind that you will need to change it if the IP address has
    to change. (We'd contact you if that happened.)
 

diff --git a/news/scheduled_downtime.mdwn b/news/scheduled_downtime.mdwn
index d528ff7..277a825 100644
--- a/news/scheduled_downtime.mdwn
+++ b/news/scheduled_downtime.mdwn
@@ -1,7 +1,7 @@
 On Saturday, 26 November, at 12 pm EST (17:00 GMT),
 Branchable will be transitioned to new hosting, and will be briefly
 offline. We expect the move to take less than an hour, and
-will post updates on [identi.ca](http://identi.ca/branchable) or
+will post updates on [identi.ca](http://identi.ca/branchable) and
 [twitter](http://twitter.com/#!/branchable).
 
 The move involves an IP address change. Some sites hosted here that have

diff --git a/news/scheduled_downtime.mdwn b/news/scheduled_downtime.mdwn
new file mode 100644
index 0000000..d528ff7
--- /dev/null
+++ b/news/scheduled_downtime.mdwn
@@ -0,0 +1,14 @@
+On Saturday, 26 November, at 12 pm EST (17:00 GMT),
+Branchable will be transitioned to new hosting, and will be briefly
+offline. We expect the move to take less than an hour, and
+will post updates on [identi.ca](http://identi.ca/branchable) or
+[twitter](http://twitter.com/#!/branchable).
+
+The move involves an IP address change. Some sites hosted here that have
+their own domain names hardcode our current IP address. We will contact the
+owners of such sites to help them move to the new IP address after the
+transition. To keep such sites from breaking, our old IP address will
+continue to work too, for the next month.
+
+[[!meta title="scheduled downtime -- we're moving!"]]
+[[!meta author=Joey]]

diff --git a/tips/Off-line_copy_of_a_Branchable_site.mdwn b/tips/Off-line_copy_of_a_Branchable_site.mdwn
index e69df41..6993599 100644
--- a/tips/Off-line_copy_of_a_Branchable_site.mdwn
+++ b/tips/Off-line_copy_of_a_Branchable_site.mdwn
@@ -9,7 +9,7 @@ separate subdirectories.
    programs needed by many plugins, but not all. Depending on which
    ones you use, it may be necessary to look in the packages
    _suggested_ by `ikiwiki` and install the relevant ones if you
-   encounter errors when copiling your local website copy.
+   encounter errors when compiling your local website copy.
 
  * In a first step, export the name of the Branchable site, the path
    to the directory that will store the local copy, and the local

diff --git a/bugs/vim-outliner_page_does_not_render.mdwn b/bugs/vim-outliner_page_does_not_render.mdwn
index 8cba942..6368a2d 100644
--- a/bugs/vim-outliner_page_does_not_render.mdwn
+++ b/bugs/vim-outliner_page_does_not_render.mdwn
@@ -3,4 +3,4 @@ I put a link to vo_README.otl on my /NewPage, but it's not being rendered by otl
 Here's a link: <http://tjgolubi.branchable.com/NewPage>  
 and <http://tjgolubi.branchable.com/NewPage/vo_README>
 
-[[!tag bugs/done]]
+[[done]]

diff --git a/bugs/vim-outliner_page_does_not_render.mdwn b/bugs/vim-outliner_page_does_not_render.mdwn
index fed04bc..8cba942 100644
--- a/bugs/vim-outliner_page_does_not_render.mdwn
+++ b/bugs/vim-outliner_page_does_not_render.mdwn
@@ -3,4 +3,4 @@ I put a link to vo_README.otl on my /NewPage, but it's not being rendered by otl
 Here's a link: <http://tjgolubi.branchable.com/NewPage>  
 and <http://tjgolubi.branchable.com/NewPage/vo_README>
 
-[[!tag done]]
+[[!tag bugs/done]]

diff --git a/bugs/vim-outliner_page_does_not_render.mdwn b/bugs/vim-outliner_page_does_not_render.mdwn
index 684a081..fed04bc 100644
--- a/bugs/vim-outliner_page_does_not_render.mdwn
+++ b/bugs/vim-outliner_page_does_not_render.mdwn
@@ -2,3 +2,5 @@ I put a link to vo_README.otl on my /NewPage, but it's not being rendered by otl
 
 Here's a link: <http://tjgolubi.branchable.com/NewPage>  
 and <http://tjgolubi.branchable.com/NewPage/vo_README>
+
+[[!tag done]]

diff --git a/bugs/vim-outliner_page_does_not_render/comment_1_30a1b00a8e3ed32eb596ced10b873176._comment b/bugs/vim-outliner_page_does_not_render/comment_1_30a1b00a8e3ed32eb596ced10b873176._comment
new file mode 100644
index 0000000..7fdb8bd
--- /dev/null
+++ b/bugs/vim-outliner_page_does_not_render/comment_1_30a1b00a8e3ed32eb596ced10b873176._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-11-10T21:52:10Z"
+ content="""
+We didn't have vimoutliner on Branchable.
+
+We do now. :) Enjoy..
+"""]]

diff --git a/bugs/vim-outliner_page_does_not_render.mdwn b/bugs/vim-outliner_page_does_not_render.mdwn
new file mode 100644
index 0000000..684a081
--- /dev/null
+++ b/bugs/vim-outliner_page_does_not_render.mdwn
@@ -0,0 +1,4 @@
+I put a link to vo_README.otl on my /NewPage, but it's not being rendered by otl2html (I think).
+
+Here's a link: <http://tjgolubi.branchable.com/NewPage>  
+and <http://tjgolubi.branchable.com/NewPage/vo_README>

diff --git a/forum/All_my_pages_have_blank_sidebar.../comment_3_9b3ad08f92e56a991202d124b10721c4._comment b/forum/All_my_pages_have_blank_sidebar.../comment_3_9b3ad08f92e56a991202d124b10721c4._comment
new file mode 100644
index 0000000..3fb7ebc
--- /dev/null
+++ b/forum/All_my_pages_have_blank_sidebar.../comment_3_9b3ad08f92e56a991202d124b10721c4._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw"
+ nickname="Terry"
+ subject="GoldType and BlueView themes do do it, but vacantly."
+ date="2011-11-09T17:19:18Z"
+ content="""
+Both GoldType and BlueView themes do display a sidebar on every page even though global sidebars are disabled in the setup.
+However, the sidebars are empty on all pages that don't specify a sidebar.
+"""]]

diff --git a/forum/All_my_pages_have_blank_sidebar.../comment_2_d6a67497a0098d99142836d7eda3ad8e._comment b/forum/All_my_pages_have_blank_sidebar.../comment_2_d6a67497a0098d99142836d7eda3ad8e._comment
new file mode 100644
index 0000000..606fb79
--- /dev/null
+++ b/forum/All_my_pages_have_blank_sidebar.../comment_2_d6a67497a0098d99142836d7eda3ad8e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw"
+ nickname="Terry"
+ subject="GoldType and BlueView themes do it too."
+ date="2011-11-09T17:15:24Z"
+ content="""
+Both GoldType and BlueView themes display sidebars globally, even though global sidebars are disabled in the setup.
+"""]]

diff --git a/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_5_5754878b3e1a1e3821cce6d50aa29292._comment b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_5_5754878b3e1a1e3821cce6d50aa29292._comment
new file mode 100644
index 0000000..bc114fe
--- /dev/null
+++ b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_5_5754878b3e1a1e3821cce6d50aa29292._comment
@@ -0,0 +1,30 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 5"
+ date="2011-11-07T14:35:27Z"
+ content="""
+> The setup GUI and ikiwiki.setup still have Discussion in several places.
+
+Your site is configured correctly.
+
+> I can't see the video on my index/discussion.mdwn page now. Perhaps htmlscrubber isn't configured correctly.
+
+You seem to have deleted the page. The htmlscrubber allows the html5 video tag, but blocks unsafe merthods used to embed flash.
+
+> Should \"name of Discussion pages\" be \"discussion\" or \"discussion.mdwn\".?
+
+The page's name is discussion; the filename is discussion.mdwn.
+
+> Should \"PageSpec specifying pages not to scrub be: \"!/discussion\" or \"!/discussion.mdwn\"? 
+
+The former; page names are always used in PageSpecs, not filenames.
+
+> Also, what should \"PageSpec of pages where comments are allowed\"? I have \"posts/* and !/discussion\" now. 
+
+Seems ok.
+
+> For calendar, I have \"page(posts/) and !*/discussion\". Is that correct? Why is page() used here, but not above?
+
+Because you don't want non-page files to be displayed in the calendar.
+"""]]

diff --git a/forum/All_my_pages_have_blank_sidebar.../comment_1_4cd2e4445cff21aff69e1e25754623ba._comment b/forum/All_my_pages_have_blank_sidebar.../comment_1_4cd2e4445cff21aff69e1e25754623ba._comment
new file mode 100644
index 0000000..9e48f71
--- /dev/null
+++ b/forum/All_my_pages_have_blank_sidebar.../comment_1_4cd2e4445cff21aff69e1e25754623ba._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw"
+ nickname="Terry"
+ subject="Works okay now, removed custom local.css."
+ date="2011-11-07T14:25:11Z"
+ content="""
+local.css was provided by Danny Castonguay, found at <http://ikiwiki.info/css_market>: [ikiwiked gray-orange][].
+
+[ikiwiked gray-orange]: https://github.com/AntPortal/ikiwiked/raw/master/theme/gray-orange/local.css
+"""]]

diff --git a/forum/All_my_pages_have_blank_sidebar....mdwn b/forum/All_my_pages_have_blank_sidebar....mdwn
new file mode 100644
index 0000000..a7b19ee
--- /dev/null
+++ b/forum/All_my_pages_have_blank_sidebar....mdwn
@@ -0,0 +1,9 @@
+... even though ikiwiki.setup has
+
+    global_sidebars: 0
+
+There is a sidebar.mdwn in the top-level directory with a calendar in it.
+It displays correctly on the "posts" page that does have a `\[[!sidebar]]` directive on it.
+
+My site is [[here|http://tjgolubi.branchable.com]].
+

diff --git a/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_4_65e96daaa7a663c3fbe2d2ef51c15473._comment b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_4_65e96daaa7a663c3fbe2d2ef51c15473._comment
new file mode 100644
index 0000000..db6cb93
--- /dev/null
+++ b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_4_65e96daaa7a663c3fbe2d2ef51c15473._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw"
+ nickname="Terry"
+ subject="Check setup files, comments, and setup gui for "Discussion" too"
+ date="2011-11-06T23:20:58Z"
+ content="""
+The setup GUI and ikiwiki.setup still have Discussion in several places.
+I can't see the video on my index/discussion.mdwn page now.  Perhaps htmlscrubber isn't configured correctly.
+
+Should \"name of Discussion pages\" be \"discussion\" or \"discussion.mdwn\".?
+Should \"PageSpec specifying pages not to scrub be: \"!*/discussion\" or \"!*/discussion.mdwn\"?
+How about \"PageSpec controlling which pages are locked\"?
+Also, what should \"PageSpec of pages where comments are allowed\"?  I have \"posts/* and !*/discussion\" now.
+For calendar, I have \"page(posts/*) and !*/discussion\".  Is that correct?  Why is page() used here, but not above?
+
+
+"""]]

diff --git a/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_3_da87428c09e937a024b58f7d6b2b9b13._comment b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_3_da87428c09e937a024b58f7d6b2b9b13._comment
new file mode 100644
index 0000000..a8c0169
--- /dev/null
+++ b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_3_da87428c09e937a024b58f7d6b2b9b13._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="bug fixed; fixes fixed"
+ date="2011-11-06T20:26:28Z"
+ content="""
+The ikiwiki bug has been fixed.
+
+I've gone in and renamed the discussion pages on your site.
+
+I've also scanned Branchable for other sites affected by the same problem, and fixed them.
+"""]]

diff --git a/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_2_677fe306e19a70094ad1c804f6600ce7._comment b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_2_677fe306e19a70094ad1c804f6600ce7._comment
new file mode 100644
index 0000000..519990a
--- /dev/null
+++ b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_2_677fe306e19a70094ad1c804f6600ce7._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 2"
+ date="2011-11-06T19:58:41Z"
+ content="""
+The weird behavior will go away if you just rename `Discussion.mdwn` to `index/discussion.mdwn`
+
+That ikiwiki does not pick that filename by default must be a bug. Opened a bug here: <http://ikiwiki.info/bugs/wrong_discussion_page_created/>
+"""]]

diff --git a/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_1_c141487bc1ababb90940f42893ea5305._comment b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_1_c141487bc1ababb90940f42893ea5305._comment
new file mode 100644
index 0000000..fe3effc
--- /dev/null
+++ b/forum/Action_still_says___91____63____93__Discussion__44___why__63__/comment_1_c141487bc1ababb90940f42893ea5305._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw"
+ nickname="Terry"
+ subject="Document action nav tab on a new page goes to top-level Discussion instead."
+ date="2011-11-06T14:43:05Z"
+ content="""
+I created a NewPage link on my main page.  Then I tried to start a discussion page on that page.
+That seemed to work, putting the discussion in NewPage/Discussion, but on NewPage I still see [?]Discussion.
+More surprising when I click on that, I go to my main page's discussion instead.
+"""]]

diff --git a/forum/Action_still_says___91____63____93__Discussion__44___why__63__.mdwn b/forum/Action_still_says___91____63____93__Discussion__44___why__63__.mdwn
new file mode 100644
index 0000000..30edf5b
--- /dev/null
+++ b/forum/Action_still_says___91____63____93__Discussion__44___why__63__.mdwn
@@ -0,0 +1,20 @@
+I'm new to ikiwiki and trying to setup my pages with Discussion enabled and blogging capabilities too.
+I copied many of the files from the ikiwiki blog site example, and tried to match that setup, but the Discussion button on the action nav bar still looks like [?]Discussion instead of [Discussion].
+
+In the Setup, I have Discussion enabled.  Here are the relevant (I think) lines from ikiwiki.setup.
+
+    discussion: 1
+    discussionpage: Discussion
+    html5: 0
+    htmlscrubber_skip: '!*/Discussion' # Should this have '!*/posts' too for comments?
+    locked_pages: '* and !postcomment(*) and !*/Discussion'
+    comments_pagespec: posts/* and !*/Discussion
+    comments_closed_pagespec: ''
+    comments_pagename: comment_
+    comments_allowdirectives: 0
+    comments_allowauthor: 0
+    comments_commit: 1
+
+Calendar is disabled for now.
+
+Any suggestions what I might be doing wrong?

diff --git a/forum/Drafts_posts__63__/comment_2_f202788edb808dcbdb25e9f5896ecf49._comment b/forum/Drafts_posts__63__/comment_2_f202788edb808dcbdb25e9f5896ecf49._comment
new file mode 100644
index 0000000..1657b80
--- /dev/null
+++ b/forum/Drafts_posts__63__/comment_2_f202788edb808dcbdb25e9f5896ecf49._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://jamiek.it/"
+ nickname="Jamie Kitson"
+ subject="Thanks"
+ date="2011-10-31T22:24:50Z"
+ content="""
+That sounds like a good solution, thanks.
+"""]]

diff --git a/forum/Drafts_posts__63__/comment_1_29243f3242dff2f49a937927e672e2c5._comment b/forum/Drafts_posts__63__/comment_1_29243f3242dff2f49a937927e672e2c5._comment
new file mode 100644
index 0000000..add9ce8
--- /dev/null
+++ b/forum/Drafts_posts__63__/comment_1_29243f3242dff2f49a937927e672e2c5._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-10-30T17:34:56Z"
+ content="""
+Do you mind if someone who knows where the draft posts are hidden can dig them out before they're published? If you're not a journalist who needs to scoop the competition, you may not care about completely hiding drafts, and then there is an easy way to do this:
+
+Add a tag with a name like \"draft\". Then just tag your draft posts with it, and remove the tag when ready to publish. And modify your blog to not show drafts.
+
+The modification is to the [[ikiwiki/directive/inline]] directive in your blog. Where it has something like
+`pages=\"page(./posts/*) and !*/Discussion\"`, add `and !tagged(draft)`
+
+"""]]

diff --git a/forum/Order_Tags_Case-Insensitively__63__/comment_1_73527071b86b7912153ad562389d58c4._comment b/forum/Order_Tags_Case-Insensitively__63__/comment_1_73527071b86b7912153ad562389d58c4._comment
new file mode 100644
index 0000000..97a5a80
--- /dev/null
+++ b/forum/Order_Tags_Case-Insensitively__63__/comment_1_73527071b86b7912153ad562389d58c4._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="where are the tags being displayed?"
+ date="2011-10-30T17:27:51Z"
+ content="""
+I think this comes down to the `LC_COLLATE` setting. We don't allow users to directly modify their environment on Branchable for security reasons, but I can go in and set a particular environment value for your site if desired.
+
+The [[ikiwiki/directive/inline]] directive does have a knob to control [[ikiwiki/pagespec/sorting]], there's no an option there for case-insensative sorting but it should be easy to add one. If your tags are being displayed by an inline for some reason.
+"""]]

diff --git a/forum/Order_Tags_Case-Insensitively__63__.mdwn b/forum/Order_Tags_Case-Insensitively__63__.mdwn
new file mode 100644
index 0000000..91cb983
--- /dev/null
+++ b/forum/Order_Tags_Case-Insensitively__63__.mdwn
@@ -0,0 +1,5 @@
+Hi,
+
+is it possible to order tags case-insensitively?
+
+Thanks, Jamie

diff --git a/forum/Drafts_posts__63__.mdwn b/forum/Drafts_posts__63__.mdwn
new file mode 100644
index 0000000..4756394
--- /dev/null
+++ b/forum/Drafts_posts__63__.mdwn
@@ -0,0 +1,5 @@
+Hi,
+
+is it possible to save a draft blog post (without having to rename the post)?
+
+Thanks, Jamie

diff --git a/testimonials.mdwn b/testimonials.mdwn
index f3fbb46..d1a798d 100644
--- a/testimonials.mdwn
+++ b/testimonials.mdwn
@@ -20,3 +20,14 @@
 > the option that is just right.
 
 -- [Anna](http://wetknee.com/posts/Branchable:_Wiki___40__and_blog__41___hosting/)
+
+----
+
+> Many other Mongol rally teams failed to get past one or two blogs. Jamie
+> and I blogged continuously through the trip... How? Without an internet
+> connection? We used git to commit blogs, and when we had internet in the
+> briefest of moments we pushed and our readership got to enjoy our updates!
+> Other blogging platforms basically assume you are on the Internet whilst
+> writing the post, which sucks. Branchable powered by Ikiwiki rocks.
+
+-- [Mongol Ralley Team Geekout (Jamie&Kai)](http://geekout.org.uk/posts/Kit_debrief/)

diff --git a/forum/https_support__63__/comment_2_c755f35ca641c84209ecc0855572278f._comment b/forum/https_support__63__/comment_2_c755f35ca641c84209ecc0855572278f._comment
new file mode 100644
index 0000000..8191899
--- /dev/null
+++ b/forum/https_support__63__/comment_2_c755f35ca641c84209ecc0855572278f._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://merriam.myopenid.com/"
+ nickname="merriam"
+ subject="related features: read access restriction, https-only access"
+ date="2011-09-02T23:56:31Z"
+ content="""
+I'm waiting for https too.  I'd also like sites (or parts of sites) that require authentication for read access, and that are inaccessible without encryption.
+
+Meanwhile I have to make do with Google services.
+
+I appreciate that it's hard work and takes time.  Thanks for all that work on Branchable and ikiwiki.
+
+"""]]

diff --git a/forum/https_support__63__/comment_1_e2be5d9b3aef6bafbdd33a95664a7f43._comment b/forum/https_support__63__/comment_1_e2be5d9b3aef6bafbdd33a95664a7f43._comment
new file mode 100644
index 0000000..6ea48cd
--- /dev/null
+++ b/forum/https_support__63__/comment_1_e2be5d9b3aef6bafbdd33a95664a7f43._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="No https yet"
+ date="2011-08-20T08:52:07Z"
+ content="""
+Unfortunately, we're not yet ready to support https. The nature of SSL certificates and the business around them has made it a bit awkward to do, so we've postponed it repeatedly. We'll announce it when it's ready. --liw
+"""]]

diff --git a/forum/https_support__63__.mdwn b/forum/https_support__63__.mdwn
new file mode 100644
index 0000000..e2fe906
--- /dev/null
+++ b/forum/https_support__63__.mdwn
@@ -0,0 +1,5 @@
+Hello,
+
+How can I do to create an Ikiwiki site with access through https (ie. <https://foo.branchable.com/>?)
+
+Best regards

diff --git a/bugs/Aggregate_flickr_rss_feed_not_working.mdwn b/bugs/Aggregate_flickr_rss_feed_not_working.mdwn
new file mode 100644
index 0000000..8905e0f
--- /dev/null
+++ b/bugs/Aggregate_flickr_rss_feed_not_working.mdwn
@@ -0,0 +1,11 @@
+Hi,
+
+I am having trouble diagnosing why flickr rss feeds are not working at:
+
+http://geekout.org.uk/planet/
+
+The bullets at the bottom of the page seem to be updating correctly, but nothing from flickr is appearing from the inline directive at the top of the page. As I cannot log into the server, and presumably this content is not in the git repo I'm finding it difficult to diagnose.
+
+Thanks, Jamie
+
+[[done]]
diff --git a/bugs/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment b/bugs/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment
new file mode 100644
index 0000000..9617244
--- /dev/null
+++ b/bugs/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-07-06T17:51:25Z"
+ content="""
+I've checked and the flickr feeds seem to be working fine, it's just that the page only shows the most recent 10 items and all 10 are currently twitter messages.
+
+You probably want to increase the number of items that show on the page. Add show=100 to the inline directive, for example. Or you could even set show=0 to show *everything*.
+
+Another tool to tune this is the expirecount setting (that you already have at expirecount=25 for each aggregate directive). You could turn it down to say, expirecount=5 for twitter to avoid flooding the top of the page with so many tweets and only showing the newest five.
+"""]]
diff --git a/bugs/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment b/bugs/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment
new file mode 100644
index 0000000..f40bd6a
--- /dev/null
+++ b/bugs/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://jamiek.it/"
+ nickname="Jamie Kitson"
+ subject="Thanks"
+ date="2011-07-07T09:28:48Z"
+ content="""
+Thanks Joey
+"""]]
diff --git a/bugs/Some_important_front-page_links_seem_broken__63__.mdwn b/bugs/Some_important_front-page_links_seem_broken__63__.mdwn
new file mode 100644
index 0000000..c8261a8
--- /dev/null
+++ b/bugs/Some_important_front-page_links_seem_broken__63__.mdwn
@@ -0,0 +1,5 @@
+Hi, thanks for ikiwiki and thanks for this service - looks like I'll be a customer soon. 
+
+Just wanted to point out though that the intro/git/ikiwiki/freedom/hosting-plans links on the front page don't seem to get me anywhere (I'm on Firefox 4, with Javascript enabled). So now I had to use a search engine to find the hosting plans :)
+
+[[done]]
diff --git a/bugs/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment b/bugs/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment
new file mode 100644
index 0000000..4245a59
--- /dev/null
+++ b/bugs/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="Thanks! Fixed!"
+ date="2011-07-26T10:02:32Z"
+ content="""
+Thanks for pointing that out! It seems to have gone wrong around July 7. Joey just fixed it, and it works again now.
+"""]]
diff --git a/forum/Aggregate_flickr_rss_feed_not_working.mdwn b/forum/Aggregate_flickr_rss_feed_not_working.mdwn
deleted file mode 100644
index e250ed2..0000000
--- a/forum/Aggregate_flickr_rss_feed_not_working.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-Hi,
-
-I am having trouble diagnosing why flickr rss feeds are not working at:
-
-http://geekout.org.uk/planet/
-
-The bullets at the bottom of the page seem to be updating correctly, but nothing from flickr is appearing from the inline directive at the top of the page. As I cannot log into the server, and presumably this content is not in the git repo I'm finding it difficult to diagnose.
-
-Thanks, Jamie
diff --git a/forum/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment b/forum/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment
deleted file mode 100644
index 9617244..0000000
--- a/forum/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 1"
- date="2011-07-06T17:51:25Z"
- content="""
-I've checked and the flickr feeds seem to be working fine, it's just that the page only shows the most recent 10 items and all 10 are currently twitter messages.
-
-You probably want to increase the number of items that show on the page. Add show=100 to the inline directive, for example. Or you could even set show=0 to show *everything*.
-
-Another tool to tune this is the expirecount setting (that you already have at expirecount=25 for each aggregate directive). You could turn it down to say, expirecount=5 for twitter to avoid flooding the top of the page with so many tweets and only showing the newest five.
-"""]]
diff --git a/forum/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment b/forum/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment
deleted file mode 100644
index f40bd6a..0000000
--- a/forum/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://jamiek.it/"
- nickname="Jamie Kitson"
- subject="Thanks"
- date="2011-07-07T09:28:48Z"
- content="""
-Thanks Joey
-"""]]
diff --git a/forum/Some_important_front-page_links_seem_broken__63__.mdwn b/forum/Some_important_front-page_links_seem_broken__63__.mdwn
deleted file mode 100644
index 5abb9b2..0000000
--- a/forum/Some_important_front-page_links_seem_broken__63__.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Hi, thanks for ikiwiki and thanks for this service - looks like I'll be a customer soon. 
-
-Just wanted to point out though that the intro/git/ikiwiki/freedom/hosting-plans links on the front page don't seem to get me anywhere (I'm on Firefox 4, with Javascript enabled). So now I had to use a search engine to find the hosting plans :)
diff --git a/forum/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment b/forum/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment
deleted file mode 100644
index 4245a59..0000000
--- a/forum/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://liw.fi/"
- nickname="Lars Wirzenius"
- subject="Thanks! Fixed!"
- date="2011-07-26T10:02:32Z"
- content="""
-Thanks for pointing that out! It seems to have gone wrong around July 7. Joey just fixed it, and it works again now.
-"""]]

diff --git a/bugs/atom_and_rss_blog_feeds_are_broken.mdwn b/bugs/atom_and_rss_blog_feeds_are_broken.mdwn
new file mode 100644
index 0000000..0de1887
--- /dev/null
+++ b/bugs/atom_and_rss_blog_feeds_are_broken.mdwn
@@ -0,0 +1,11 @@
+I first noticed it here:
+
+[http://blog.liw.fi/index.atom](http://blog.liw.fi/index.atom)
+
+It's linking to itself instead of to posts.
+
+Some rss feeds were recently broken too, linking to the home page, but Lars's feed seems to have returned to normal:
+
+[http://blog.liw.fi/index.rss](http://blog.liw.fi/index.rss)
+
+[[done]]
diff --git a/bugs/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment b/bugs/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment
new file mode 100644
index 0000000..ef50905
--- /dev/null
+++ b/bugs/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="Confirmed"
+ date="2011-07-29T07:27:00Z"
+ content="""
+I can verify that I also see this, or rather my Liferea sees it.
+"""]]
diff --git a/bugs/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment b/bugs/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment
new file mode 100644
index 0000000..6c346da
--- /dev/null
+++ b/bugs/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 2"
+ date="2011-07-29T09:58:25Z"
+ content="""
+I've fixed this. It should not have caused any aggregator flooding, maybe broken links on certian aggregators.
+"""]]
diff --git a/bugs/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment b/bugs/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment
new file mode 100644
index 0000000..a239b32
--- /dev/null
+++ b/bugs/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://merriam.myopenid.com/"
+ nickname="merriam"
+ subject="fixed"
+ date="2011-07-30T21:15:30Z"
+ content="""
+Thanks for the quick response.  Yes, the feeds look good now, with no flooding.
+
+"""]]
diff --git a/forum/atom_and_rss_blog_feeds_are_broken.mdwn b/forum/atom_and_rss_blog_feeds_are_broken.mdwn
deleted file mode 100644
index 9832386..0000000
--- a/forum/atom_and_rss_blog_feeds_are_broken.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-I first noticed it here:
-
-[http://blog.liw.fi/index.atom](http://blog.liw.fi/index.atom)
-
-It's linking to itself instead of to posts.
-
-Some rss feeds were recently broken too, linking to the home page, but Lars's feed seems to have returned to normal:
-
-[http://blog.liw.fi/index.rss](http://blog.liw.fi/index.rss)
-
-
diff --git a/forum/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment b/forum/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment
deleted file mode 100644
index ef50905..0000000
--- a/forum/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://liw.fi/"
- nickname="Lars Wirzenius"
- subject="Confirmed"
- date="2011-07-29T07:27:00Z"
- content="""
-I can verify that I also see this, or rather my Liferea sees it.
-"""]]
diff --git a/forum/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment b/forum/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment
deleted file mode 100644
index 6c346da..0000000
--- a/forum/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 2"
- date="2011-07-29T09:58:25Z"
- content="""
-I've fixed this. It should not have caused any aggregator flooding, maybe broken links on certian aggregators.
-"""]]
diff --git a/forum/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment b/forum/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment
deleted file mode 100644
index a239b32..0000000
--- a/forum/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="http://merriam.myopenid.com/"
- nickname="merriam"
- subject="fixed"
- date="2011-07-30T21:15:30Z"
- content="""
-Thanks for the quick response.  Yes, the feeds look good now, with no flooding.
-
-"""]]

diff --git a/forum/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment b/forum/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment
new file mode 100644
index 0000000..a239b32
--- /dev/null
+++ b/forum/atom_and_rss_blog_feeds_are_broken/comment_3_7971c8a04a0b188315003ec593e631e2._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://merriam.myopenid.com/"
+ nickname="merriam"
+ subject="fixed"
+ date="2011-07-30T21:15:30Z"
+ content="""
+Thanks for the quick response.  Yes, the feeds look good now, with no flooding.
+
+"""]]

diff --git a/forum/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment b/forum/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment
new file mode 100644
index 0000000..6c346da
--- /dev/null
+++ b/forum/atom_and_rss_blog_feeds_are_broken/comment_2_058b8ee654ebf27ebef6c65b2e414ce8._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 2"
+ date="2011-07-29T09:58:25Z"
+ content="""
+I've fixed this. It should not have caused any aggregator flooding, maybe broken links on certian aggregators.
+"""]]

diff --git a/forum/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment b/forum/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment
new file mode 100644
index 0000000..ef50905
--- /dev/null
+++ b/forum/atom_and_rss_blog_feeds_are_broken/comment_1_1b2f1a79bfac21ac7584f76dc6bbfe1b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="Confirmed"
+ date="2011-07-29T07:27:00Z"
+ content="""
+I can verify that I also see this, or rather my Liferea sees it.
+"""]]

diff --git a/forum/atom_and_rss_blog_feeds_are_broken.mdwn b/forum/atom_and_rss_blog_feeds_are_broken.mdwn
index 2a2d0a2..9832386 100644
--- a/forum/atom_and_rss_blog_feeds_are_broken.mdwn
+++ b/forum/atom_and_rss_blog_feeds_are_broken.mdwn
@@ -1,9 +1,11 @@
 I first noticed it here:
 
-http://blog.liw.fi/index.atom
+[http://blog.liw.fi/index.atom](http://blog.liw.fi/index.atom)
 
 It's linking to itself instead of to posts.
 
 Some rss feeds were recently broken too, linking to the home page, but Lars's feed seems to have returned to normal:
 
-http://blog.liw.fi/index.rss
+[http://blog.liw.fi/index.rss](http://blog.liw.fi/index.rss)
+
+

diff --git a/forum/atom_and_rss_blog_feeds_are_broken.mdwn b/forum/atom_and_rss_blog_feeds_are_broken.mdwn
new file mode 100644
index 0000000..2a2d0a2
--- /dev/null
+++ b/forum/atom_and_rss_blog_feeds_are_broken.mdwn
@@ -0,0 +1,9 @@
+I first noticed it here:
+
+http://blog.liw.fi/index.atom
+
+It's linking to itself instead of to posts.
+
+Some rss feeds were recently broken too, linking to the home page, but Lars's feed seems to have returned to normal:
+
+http://blog.liw.fi/index.rss

diff --git a/forum/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment b/forum/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment
new file mode 100644
index 0000000..4245a59
--- /dev/null
+++ b/forum/Some_important_front-page_links_seem_broken__63__/comment_1_ff8dfb2302a44bdbc873fd6fe23fbad9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="Thanks! Fixed!"
+ date="2011-07-26T10:02:32Z"
+ content="""
+Thanks for pointing that out! It seems to have gone wrong around July 7. Joey just fixed it, and it works again now.
+"""]]

diff --git a/templates/slidesetup.mdwn b/templates/slidesetup.mdwn
index ab59007..c7d0a62 100644
--- a/templates/slidesetup.mdwn
+++ b/templates/slidesetup.mdwn
@@ -11,7 +11,7 @@ a.slidelink:hover { color: red; }
 </style>
 
 <!-- include jQuery library (using ikiwiki's copy also used for openid login) -->
-<script type="text/javascript" src="/ikiwiki/openid/jquery.js"></script>
+<script type="text/javascript" src="/ikiwiki/jquery.min.js"></script>
 
 <!-- include Cycle plugin -->
 <script type="text/javascript" src="/js/jquery.cycle.js"></script>

diff --git a/forum/Some_important_front-page_links_seem_broken__63__.mdwn b/forum/Some_important_front-page_links_seem_broken__63__.mdwn
new file mode 100644
index 0000000..5abb9b2
--- /dev/null
+++ b/forum/Some_important_front-page_links_seem_broken__63__.mdwn
@@ -0,0 +1,3 @@
+Hi, thanks for ikiwiki and thanks for this service - looks like I'll be a customer soon. 
+
+Just wanted to point out though that the intro/git/ikiwiki/freedom/hosting-plans links on the front page don't seem to get me anywhere (I'm on Firefox 4, with Javascript enabled). So now I had to use a search engine to find the hosting plans :)

diff --git a/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn b/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
index 6131613..942fe10 100644
--- a/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
+++ b/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
@@ -12,4 +12,4 @@ Not:
 
 http://geekout.org.uk/ikiwiki.cgi?page=posts%2FNewPage&from=&do=create
 
-[[!tag bugs/done]]
+[[done]]

diff --git a/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn b/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
index 6b239c2..6131613 100644
--- a/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
+++ b/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
@@ -12,4 +12,4 @@ Not:
 
 http://geekout.org.uk/ikiwiki.cgi?page=posts%2FNewPage&from=&do=create
 
-[[!tag done]]
+[[!tag bugs/done]]

diff --git a/bugs/cannot_add_attachment_to_child_pages.mdwn b/bugs/cannot_add_attachment_to_child_pages.mdwn
index 75bc355..4acd27b 100644
--- a/bugs/cannot_add_attachment_to_child_pages.mdwn
+++ b/bugs/cannot_add_attachment_to_child_pages.mdwn
@@ -1,3 +1,7 @@
 Adding attachments to index page of http://aed1.branchable.com/ works fine
 
 Create a child page and adding the same attachment gives "bad attachment filename" error.
+
+> This was an ikiwiki bug: <http://ikiwiki.info/bugs/Unable_to_add_attachments_to_some_pages/>
+> 
+> I was able to create a branch of your site and reproduce the problem, which helped me to fix it. Thanks.. Fix is now deployed to Branchable. [[done]] --[[Joey]]

diff --git a/bugs/cannot_add_attachment_to_child_pages.mdwn b/bugs/cannot_add_attachment_to_child_pages.mdwn
new file mode 100644
index 0000000..75bc355
--- /dev/null
+++ b/bugs/cannot_add_attachment_to_child_pages.mdwn
@@ -0,0 +1,3 @@
+Adding attachments to index page of http://aed1.branchable.com/ works fine
+
+Create a child page and adding the same attachment gives "bad attachment filename" error.

diff --git a/forum/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment b/forum/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment
new file mode 100644
index 0000000..f40bd6a
--- /dev/null
+++ b/forum/Aggregate_flickr_rss_feed_not_working/comment_2_2149934a47f526c9ab270c973b7c82ab._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://jamiek.it/"
+ nickname="Jamie Kitson"
+ subject="Thanks"
+ date="2011-07-07T09:28:48Z"
+ content="""
+Thanks Joey
+"""]]

diff --git a/forum/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment b/forum/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment
new file mode 100644
index 0000000..9617244
--- /dev/null
+++ b/forum/Aggregate_flickr_rss_feed_not_working/comment_1_dfc0d186a847dab719b80d5131388090._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-07-06T17:51:25Z"
+ content="""
+I've checked and the flickr feeds seem to be working fine, it's just that the page only shows the most recent 10 items and all 10 are currently twitter messages.
+
+You probably want to increase the number of items that show on the page. Add show=100 to the inline directive, for example. Or you could even set show=0 to show *everything*.
+
+Another tool to tune this is the expirecount setting (that you already have at expirecount=25 for each aggregate directive). You could turn it down to say, expirecount=5 for twitter to avoid flooding the top of the page with so many tweets and only showing the newest five.
+"""]]

diff --git a/forum/Aggregate_flickr_rss_feed_not_working.mdwn b/forum/Aggregate_flickr_rss_feed_not_working.mdwn
new file mode 100644
index 0000000..e250ed2
--- /dev/null
+++ b/forum/Aggregate_flickr_rss_feed_not_working.mdwn
@@ -0,0 +1,9 @@
+Hi,
+
+I am having trouble diagnosing why flickr rss feeds are not working at:
+
+http://geekout.org.uk/planet/
+
+The bullets at the bottom of the page seem to be updating correctly, but nothing from flickr is appearing from the inline directive at the top of the page. As I cannot log into the server, and presumably this content is not in the git repo I'm finding it difficult to diagnose.
+
+Thanks, Jamie

diff --git a/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_5_c32066d63e6da6d11cdfc4f81e830d19._comment b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_5_c32066d63e6da6d11cdfc4f81e830d19._comment
new file mode 100644
index 0000000..9b6f406
--- /dev/null
+++ b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_5_c32066d63e6da6d11cdfc4f81e830d19._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://abhidg.wordpress.com/"
+ nickname="abhidg"
+ subject="use aliases"
+ date="2011-07-05T07:22:13Z"
+ content="""
+@Jimmy, this problem can be easily solved with aliases in apache or any other webserver.  
+Just create something like /srv/wikis/code1 /srv/wikis/labbook1 and so on and let
+http://whatever/code1 an alias to the appropriate folder. All these wikis will then
+have separate repositories - so there's no need to use ikiwiki-hosting.
+"""]]

diff --git a/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn b/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
index f56d0f2..6b239c2 100644
--- a/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
+++ b/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
@@ -11,3 +11,5 @@ http://geekout.org.uk/ikiwiki.cgi?page=posts%2Fnewpage&from=&do=create
 Not:
 
 http://geekout.org.uk/ikiwiki.cgi?page=posts%2FNewPage&from=&do=create
+
+[[!tag done]]
diff --git a/bugs/Case_not_preserved_when_creating_pages_from_URL/comment_1_8acafe1fc517e984c0aede3ca5ad4de7._comment b/bugs/Case_not_preserved_when_creating_pages_from_URL/comment_1_8acafe1fc517e984c0aede3ca5ad4de7._comment
index 037dee8..f80bbfb 100644
--- a/bugs/Case_not_preserved_when_creating_pages_from_URL/comment_1_8acafe1fc517e984c0aede3ca5ad4de7._comment
+++ b/bugs/Case_not_preserved_when_creating_pages_from_URL/comment_1_8acafe1fc517e984c0aede3ca5ad4de7._comment
@@ -5,4 +5,6 @@
  date="2011-06-29T19:17:56Z"
  content="""
 This is a bug in Ikiwiki, and there is some discussion of it at <http://ikiwiki.info/bugs/Titles_are_lower-cased_when_creating_a_page/>. 
+
+Update: And now fixed in ikiwiki, and deployed here.
 """]]

diff --git a/bugs/Case_not_preserved_when_creating_pages_from_URL/comment_1_8acafe1fc517e984c0aede3ca5ad4de7._comment b/bugs/Case_not_preserved_when_creating_pages_from_URL/comment_1_8acafe1fc517e984c0aede3ca5ad4de7._comment
new file mode 100644
index 0000000..037dee8
--- /dev/null
+++ b/bugs/Case_not_preserved_when_creating_pages_from_URL/comment_1_8acafe1fc517e984c0aede3ca5ad4de7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-06-29T19:17:56Z"
+ content="""
+This is a bug in Ikiwiki, and there is some discussion of it at <http://ikiwiki.info/bugs/Titles_are_lower-cased_when_creating_a_page/>. 
+"""]]

diff --git a/bugs/Statistics/comment_1_6e43c34d371550b379817e50d08f27f5._comment b/bugs/Statistics/comment_1_6e43c34d371550b379817e50d08f27f5._comment
new file mode 100644
index 0000000..91fc432
--- /dev/null
+++ b/bugs/Statistics/comment_1_6e43c34d371550b379817e50d08f27f5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-06-29T19:15:09Z"
+ content="""
+This is something we plan to provide, although we have to keep our [[privacy]] policy in mind when doing it. So only site owners would be able to see the info. I was thinking Analog, but Visitors does look nice.
+"""]]

diff --git a/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash/comment_2_7c98622c0b18d981ab7482d944956db5._comment b/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash/comment_2_7c98622c0b18d981ab7482d944956db5._comment
new file mode 100644
index 0000000..2e540ad
--- /dev/null
+++ b/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash/comment_2_7c98622c0b18d981ab7482d944956db5._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://jamiek.it/"
+ nickname="Jamie Kitson"
+ subject="comment 2"
+ date="2011-06-25T01:09:13Z"
+ content="""
+I think what's happening is that when you log in a trailing slash automatically gets added if it's missing. You can see this on the preference page. So the Admin ID always needs a trailing slash too.
+
+Incidentally, before tonight I didn't need to have an \"http://\" preceding jamiek.it, now I do. However jamiekitson.myopenid.com still works without it.
+
+Something else I noticed, if you try to login when you're already logged in you get the error: 
+
+Error: login failed, perhaps you need to turn on cookies?
+
+Cheers
+"""]]

diff --git a/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash/comment_1_0ca7f2ae0054a483c086c640af967fa7._comment b/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash/comment_1_0ca7f2ae0054a483c086c640af967fa7._comment
new file mode 100644
index 0000000..9f91315
--- /dev/null
+++ b/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash/comment_1_0ca7f2ae0054a483c086c640af967fa7._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-06-24T18:51:03Z"
+ content="""
+I don't think there is any requirement that \"$foo\" and \"$foo/\" are the openid of the same entity. Of course, it would be foolish for a system to give out such similar addresses to two different people, but it would be perhaps more foolish for Ikiwiki to try to normalize openids in such a way, opening an attack vector. So, ikiwiki compares openids exactly. (It also doesn't let the capitalization vary!)
+
+The best way to deal with this is to copy and paste the openid out of your Preferences page or elsewhere.
+"""]]

diff --git a/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn b/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
new file mode 100644
index 0000000..f56d0f2
--- /dev/null
+++ b/bugs/Case_not_preserved_when_creating_pages_from_URL.mdwn
@@ -0,0 +1,13 @@
+If you visit a page that does not exist yet, the create link is always lower case. Since the name of the page becomes the title this is important.
+
+eg, visit:
+
+http://geekout.org.uk/posts/NewPage
+
+Create link is:
+
+http://geekout.org.uk/ikiwiki.cgi?page=posts%2Fnewpage&from=&do=create
+
+Not:
+
+http://geekout.org.uk/ikiwiki.cgi?page=posts%2FNewPage&from=&do=create

diff --git a/about/intro.mdwn b/about/intro.mdwn
index b8d3716..85df804 100644
--- a/about/intro.mdwn
+++ b/about/intro.mdwn
@@ -30,7 +30,7 @@ or **$59.99/year**, for up to two sites.
 </td>
 <td>
 <ul>
-<li><a href="http://bullyfactory.branchable.com/">Bulley Factory</a></li>
+<li><a href="http://bullyfactory.branchable.com/">Bully Factory</a></li>
 <li><b>Your site here...</b></li>
 </ul>
 </td>

diff --git a/about/intro.mdwn b/about/intro.mdwn
index 61dc644..b8d3716 100644
--- a/about/intro.mdwn
+++ b/about/intro.mdwn
@@ -30,7 +30,7 @@ or **$59.99/year**, for up to two sites.
 </td>
 <td>
 <ul>
-<li><a href="http://wadley.branchable.com/">David Wadley</a></li>
+<li><a href="http://bullyfactory.branchable.com/">Bulley Factory</a></li>
 <li><b>Your site here...</b></li>
 </ul>
 </td>

diff --git a/bugs/Hard_refresh_needed_to_show_changes.mdwn b/bugs/Hard_refresh_needed_to_show_changes.mdwn
index 131311b..66cf425 100644
--- a/bugs/Hard_refresh_needed_to_show_changes.mdwn
+++ b/bugs/Hard_refresh_needed_to_show_changes.mdwn
@@ -1 +1,4 @@
 I find that when a page changes I need to do a ctrl+f5 in firefox in order to see the changes. I imagine that the server reports an incorrect last updated time/date for the page and so the browser displays the cache rather than reloading the page...?
+
+> Seems our carefully set up cache control broke in an upgrade. [[liw]]
+> has fixed it now. [[done]] --[[Joey]] 

diff --git a/bugs/Hard_refresh_needed_to_show_changes.mdwn b/bugs/Hard_refresh_needed_to_show_changes.mdwn
new file mode 100644
index 0000000..131311b
--- /dev/null
+++ b/bugs/Hard_refresh_needed_to_show_changes.mdwn
@@ -0,0 +1 @@
+I find that when a page changes I need to do a ctrl+f5 in firefox in order to see the changes. I imagine that the server reports an incorrect last updated time/date for the page and so the browser displays the cache rather than reloading the page...?

diff --git a/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash.mdwn b/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash.mdwn
new file mode 100644
index 0000000..d8fac08
--- /dev/null
+++ b/bugs/OpenID_Admin_IDs_don__39__t_work_without_a_trailing_slash.mdwn
@@ -0,0 +1 @@
+In Preferences -> Setup if I add "http://jamiek.it" as an admin that user cannot edit pages. Adding a trailing slash solves the problem. This is non-obvious and would be good to fix.

diff --git a/bugs/Statistics.mdwn b/bugs/Statistics.mdwn
new file mode 100644
index 0000000..784efff
--- /dev/null
+++ b/bugs/Statistics.mdwn
@@ -0,0 +1,13 @@
+It would be nice to have some statistics for my branchable site <http://geekout.org.uk/>
+
+It's not urgent, just a wishlist.
+
+# Thoughts on statistics
+
+I don't like `ga.js` aka Google analytics bit of Javascript on every page. Ewww.
+
+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,

diff --git a/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_4_300f0c88136adff14b6778e16294ad2e._comment b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_4_300f0c88136adff14b6778e16294ad2e._comment
new file mode 100644
index 0000000..5bcbaf1
--- /dev/null
+++ b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_4_300f0c88136adff14b6778e16294ad2e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
+ nickname="Jimmy"
+ subject="comment 4"
+ date="2011-05-30T07:50:18Z"
+ content="""
+@joey okay that clarifies things for me, I think I will take a look at the templates and poke at the ikiwiki-hosting software/templates and see if I can make it do what I want. Unfortunately some of the stuff that I do want to host with something like branchable needs to be cleared and signed off :P so hosting internally is the only way to go for me.
+"""]]

diff --git a/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_3_2edf0bf760f759bf310d2458bdfd2b88._comment b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_3_2edf0bf760f759bf310d2458bdfd2b88._comment
new file mode 100644
index 0000000..d6e055b
--- /dev/null
+++ b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_3_2edf0bf760f759bf310d2458bdfd2b88._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 3"
+ date="2011-05-30T03:54:54Z"
+ content="""
+To be on-topic for Branchable, you'd need to be hosting the sites here, and perhaps redirecting them to subdirectories of a domain name you control.
+
+Yes, [ikiwiki-hosting](http://ikiwiki-hosting.branchable.com/) does not support using subdirectories for sites, only one (sub)domain per site. I don't anticipate that being very useful for Branchable users, and while ikiwiki-hosting is a nice solution for rolling your own ikiwiki hosting for lots of sites as well, the needs of Branchable are what drove its design.
+
+I have not thought in detail about what would be needed to use subdomains with ikiwiki-hosting -- it might be possible to just modify the apache template used for sites to not create a virtual host, but only add a directory to a host and get most of the way there, but other stuff would probably need to be changed as well.
+"""]]

diff --git a/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_2_b486cb7724fd1fe713f53e54bb554e67._comment b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_2_b486cb7724fd1fe713f53e54bb554e67._comment
new file mode 100644
index 0000000..cca295c
--- /dev/null
+++ b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_2_b486cb7724fd1fe713f53e54bb554e67._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
+ nickname="Jimmy"
+ subject="comment 2"
+ date="2011-05-29T16:15:52Z"
+ content="""
+I might have not been too clear with what I wanted to ask, what I am interested in is if I had 3 projects - \"code1\", \"labbook1\"  and \"labbook2\" and I wish to setup these three on 'myprivatelabserver' with no sub-domains, i.e. is it possible for the ikiwiki-hosting tools to manage sites with the following outcome
+
+1. http://myprivatelabserver/code1/
+1. http://myprivatelabserver/labbook1/
+1. http://myprivatelabserver/labbook2/
+
+where I have no control over the name of 'myprivateserver' because it's been assigned to me (or named after the lab), perhaps this is might be better discussed on the ikiwiki-hosting project page.
+"""]]

diff --git a/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_1_3f046baed755307a4e2e1ef7bec657e4._comment b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_1_3f046baed755307a4e2e1ef7bec657e4._comment
new file mode 100644
index 0000000..ddafcc3
--- /dev/null
+++ b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain/comment_1_3f046baed755307a4e2e1ef7bec657e4._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="Yep, you can use your own domain"
+ date="2011-05-29T14:54:08Z"
+ content="""
+Using your own domain is perfectly possible. See
+[[tips/using_own_domain]] for instructions on how
+to do that.
+"""]]

diff --git a/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain.mdwn b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain.mdwn
index 44405d5..53098e5 100644
--- a/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain.mdwn
+++ b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain.mdwn
@@ -6,4 +6,4 @@ I was wondering if it's possible to do the follow with ikiwiki-hosting
 
     www.branchable.com/foo/
 
-I'm somewhat interested in setting up a few related projects with ikiwiki-hosting where it would be more sensible to not have subdomains.
+I'm somewhat interested in setting up a few related projects with ikiwiki-hosting (on an internal machine at a lab) where it would be more sensible to not have subdomains.

diff --git a/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain.mdwn b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain.mdwn
new file mode 100644
index 0000000..44405d5
--- /dev/null
+++ b/forum/ikiwiki-hosting_sites_without_a_hostname__47__subdomain.mdwn
@@ -0,0 +1,9 @@
+I was just reading through <http://ikiwiki-hosting.branchable.com/design/>  and the very first item in the design is
+
+> Each site has a hostname, which is a subdomain of one of our domains. For example, foo.branchable.com.
+
+I was wondering if it's possible to do the follow with ikiwiki-hosting
+
+    www.branchable.com/foo/
+
+I'm somewhat interested in setting up a few related projects with ikiwiki-hosting where it would be more sensible to not have subdomains.

diff --git a/news/on_Branchable_and_backups/comment_1_112dfe3306f9bcb041c23754b66836d2._comment b/news/on_Branchable_and_backups/comment_1_112dfe3306f9bcb041c23754b66836d2._comment
new file mode 100644
index 0000000..47590d6
--- /dev/null
+++ b/news/on_Branchable_and_backups/comment_1_112dfe3306f9bcb041c23754b66836d2._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlUbH3eytydcwlWqv8oauE2Jg4NwcV9uA0"
+ nickname="anna"
+ subject="Blogger lost comments during downtime"
+ date="2011-05-14T18:40:10Z"
+ content="""
+My blog is hosted on Branchable (and I'm so glad!), but I do read several blogs on blogger.  I was interested to see that, as of this morning, even though the posts were back up, the comments on the problematic posts seem to have been lost for good.  I'm not sure that the lost comments won't turn up later, but I know how much I'd hate to lose even comments on my blog.  As my husband says, you get what you pay for.  Those free blogging services seem good up front, but I'd never go back to letting some big corporation manage my data.
+"""]]

diff --git a/news/on_Branchable_and_backups.mdwn b/news/on_Branchable_and_backups.mdwn
index b2d067e..a7e008b 100644
--- a/news/on_Branchable_and_backups.mdwn
+++ b/news/on_Branchable_and_backups.mdwn
@@ -24,7 +24,7 @@ including all of its history, of your site as an
 To make that even easier and more automated, today we've added a
 way to make Branchable push changes from your site out to other git
 repositories. So every change can be automatically pushed to
-like Github, Gitorious, your own personal server, and as many
+Github, Gitorious, your own personal server, and as many
 other places as you can think of.
 
 [[!img screenshots/gitpush.png link="tips/setting_up_git_pushes_from_Branchable"]]

diff --git a/news/on_Branchable_and_backups.mdwn b/news/on_Branchable_and_backups.mdwn
index a549108..b2d067e 100644
--- a/news/on_Branchable_and_backups.mdwn
+++ b/news/on_Branchable_and_backups.mdwn
@@ -11,7 +11,8 @@ uncertainty about data they have entrusted to us?
 Well, the [[two_of_us|about]] behind Branchable bring our own perspectives
 to keeping your data safe. Actually, we both care so much about backups
 that each of us felt we had to set up our own backup strategy for
-Branchable. It's all backed up redundantly in multiple different ways.
+Branchable, even though that was redundant work for us. In total we keep
+at least six copies of all data.
 
 So, we have pretty good backups (we think!), but then so does Blogger (we
 hope!) The key difference is that we are very interested in making sure

diff --git a/news/on_Branchable_and_backups.mdwn b/news/on_Branchable_and_backups.mdwn
index d8096d1..a549108 100644
--- a/news/on_Branchable_and_backups.mdwn
+++ b/news/on_Branchable_and_backups.mdwn
@@ -13,7 +13,7 @@ to keeping your data safe. Actually, we both care so much about backups
 that each of us felt we had to set up our own backup strategy for
 Branchable. It's all backed up redundantly in multiple different ways.
 
-So, we have pretty good backups (we think), but then so does Blogger (we
+So, we have pretty good backups (we think!), but then so does Blogger (we
 hope!) The key difference is that we are very interested in making sure
 you have a copy of all your data, no matter what happens to Branchable.
 That's why we built Branchable on git, and provide the entire content,

diff --git a/news/on_Branchable_and_backups.mdwn b/news/on_Branchable_and_backups.mdwn
index f37e6bd..d8096d1 100644
--- a/news/on_Branchable_and_backups.mdwn
+++ b/news/on_Branchable_and_backups.mdwn
@@ -8,20 +8,10 @@ While the Blogger posts were [later restored](http://buzz.blogger.com/2011/05/bl
 this made us wonder: Could users of Branchable experience the same
 uncertainty about data they have entrusted to us?
 
-Well, the two of us behind Branchable bring our own perspectives to
-keeping your data safe.
-
-* [[Lars|people/liw]] has spent years working on backup technology,
-  which has led to him developing [Obnam](http://braawi.org/obnam/),
-  a secure and extremely well tested backup program. We plan to use Obnam
-  to back up Branchable soon. Since Obnam was not quite ready back when
-  we launched Branchable, Lars deployed the previous generation of his
-  backup technology instead, as a whole-system backup of Branchable.
-
-* [[Joey|people/joey]] is more interested in version control technology
-  and archiving. He developed a second, redundant backup system for
-  Branchable that efficiently backs up the individual git repositories
-  that store our users' data.
+Well, the [[two_of_us|about]] behind Branchable bring our own perspectives
+to keeping your data safe. Actually, we both care so much about backups
+that each of us felt we had to set up our own backup strategy for
+Branchable. It's all backed up redundantly in multiple different ways.
 
 So, we have pretty good backups (we think), but then so does Blogger (we
 hope!) The key difference is that we are very interested in making sure
@@ -32,8 +22,8 @@ including all of its history, of your site as an
 
 To make that even easier and more automated, today we've added a
 way to make Branchable push changes from your site out to other git
-repositories. So every change can be automatically pushed to places
-like Github, Gitorious, and your own personal server, and as many
+repositories. So every change can be automatically pushed to
+like Github, Gitorious, your own personal server, and as many
 other places as you can think of.
 
 [[!img screenshots/gitpush.png link="tips/setting_up_git_pushes_from_Branchable"]]