Recent changes to this wiki:

diff --git a/doc/todo/merge_bootstrap_branch.mdwn b/doc/todo/merge_bootstrap_branch.mdwn
index a928e14..ee42bf5 100644
--- a/doc/todo/merge_bootstrap_branch.mdwn
+++ b/doc/todo/merge_bootstrap_branch.mdwn
@@ -14,3 +14,10 @@ did them in a way that makes the diff pretty clear that nothing changes
 except when the bootstrap theme is enabled.
 
 --[[Joey]]
+
+> [bootstrap3 is in debian](https://tracker.debian.org/pkg/twitter-bootstrap3).
+> As far as I know, there is no effort to package b4 just yet,
+> maybe a RFP?
+>
+> My work on bootstrap also involved some changes to the base templates,
+> not sure there is a way to work around that. --[[anarcat]]

response
diff --git a/doc/bugs/cannot_login.mdwn b/doc/bugs/cannot_login.mdwn
index c2c4d91..96d2bad 100644
--- a/doc/bugs/cannot_login.mdwn
+++ b/doc/bugs/cannot_login.mdwn
@@ -60,3 +60,15 @@ Update2: it seems this is specific to the HTTP/HTTPS switch. If I use HTTPS, thi
 > to go back to a previous login form and try to reuse it.
 > 
 > --[[Joey]]
+
+>> I am sorry. I thought the problem was originally related to ikiwiki
+>> then figured it was *only* happening on branchable sites, so I figured
+>> it was better to report it on the branchable.com forums.
+>>
+>> I know that there's a OpenID-specific issue, but I had such issues in
+>> the past and succesfuly solved those. Because the timing of the emergence
+>> of the problem, i felt there was a correlation between the two issues.
+>>
+>> And indeed, there seems to be a HTTPS-related issue: both login mechanisms
+>> work fine when on HTTPS, and both fail on HTTP. So I don't see those things
+>> as being necessarily distinct. -- [[anarcat]]

Merge branch 'master' of ssh://git.ikiwiki.info
response
diff --git a/doc/bugs/cannot_login.mdwn b/doc/bugs/cannot_login.mdwn
index a4f1295..cd13ba3 100644
--- a/doc/bugs/cannot_login.mdwn
+++ b/doc/bugs/cannot_login.mdwn
@@ -38,3 +38,23 @@ Thanks. --[[anarcat]]
 
 Update: now I can't login to the ikiwiki.info site anymore, getting
 the same errors as on the git-annex site.
+
+> This seems to be a concacentation of multiple unrelated problems with
+> different stuff, which is not a good bug report technique. Then to add to
+> the fun, you filed the same bug on branchable too. Sigh!
+> 
+> The `time_bad_sig` problem with the perl openid library is a problem I am
+> aware of but it's not clear if the problem is clock skew, or a protocol
+> problem. At least one user to report it seemed to get it due to a http
+> proxy. I'm pretty sure it could also happen if multiple openid logins
+> were attempted at the same time (the `consumer_secret` which is stored
+> server-side is used). The problem is not specific to ikiwiki.
+> 
+> Ikiwiki says "login failed, perhaps you need to turn on cookies?" when
+> the user successfully logged in, but their cookie does not indicate why
+> they were logging in to begin with, so ikiwiki does not know what action
+> to continue to. One way to get this when cookies are enabled is to
+> re-post a login form after already using it, by eg using the back button
+> to go back to a previous login form and try to reuse it.
+> 
+> --[[Joey]]

diff --git a/doc/bugs/cannot_login.mdwn b/doc/bugs/cannot_login.mdwn
index c0537e8..c363f07 100644
--- a/doc/bugs/cannot_login.mdwn
+++ b/doc/bugs/cannot_login.mdwn
@@ -39,4 +39,4 @@ Thanks. --[[anarcat]]
 Update: now I can't login to the ikiwiki.info site anymore, getting
 the same errors as on the git-annex site.
 
-Update2: it seems this is specific to the HTTP/HTTPS switch. If I use HTTPS, things work fine, but not with plain HTTP.
+Update2: it seems this is specific to the HTTP/HTTPS switch. If I use HTTPS, things work fine, but not with plain HTTP. So I'm moving this to the branchable wiki, as I am not having that problem on other ikiwiki sites. Maybe the bug specific to ikiwiki is the lack of clarity in figuring out wth is going on here... See <http://www.branchable.com/bugs/login_failures_without_https>

http/https issue
diff --git a/doc/bugs/cannot_login.mdwn b/doc/bugs/cannot_login.mdwn
index a4f1295..c0537e8 100644
--- a/doc/bugs/cannot_login.mdwn
+++ b/doc/bugs/cannot_login.mdwn
@@ -38,3 +38,5 @@ Thanks. --[[anarcat]]
 
 Update: now I can't login to the ikiwiki.info site anymore, getting
 the same errors as on the git-annex site.
+
+Update2: it seems this is specific to the HTTP/HTTPS switch. If I use HTTPS, things work fine, but not with plain HTTP.

smaller is too small for large blocks
diff --git a/doc/bugs/footnotes-look-weird.mdwn b/doc/bugs/footnotes-look-weird.mdwn
index 9ce3870..a5af38e 100644
--- a/doc/bugs/footnotes-look-weird.mdwn
+++ b/doc/bugs/footnotes-look-weird.mdwn
@@ -9,7 +9,7 @@ way to demonstrate this here, you'll have to trust me on this. :)
 The following stylesheet should be added to `style.css`:
 
     a.footnote { vertical-align: super; font-size: xx-small; }
-    div.footnotes { font-size: smaller; }
+    div.footnotes { font-size: small; }
 
 This is a typical style that user-agents apply to the `<sup>` tag. For
 example, chromium has this builtin style for `<sup>`:

fix typo and comment
diff --git a/doc/bugs/footnotes-look-weird.mdwn b/doc/bugs/footnotes-look-weird.mdwn
index 4747353..9ce3870 100644
--- a/doc/bugs/footnotes-look-weird.mdwn
+++ b/doc/bugs/footnotes-look-weird.mdwn
@@ -3,10 +3,13 @@ wiki, they don't look so good with the default stylesheet, however, as
 the references are in the same size and positioning as everything
 else.
 
+This particular wiki does not use multimarkdown, so there's no easy
+way to demonstrate this here, you'll have to trust me on this. :)
+
 The following stylesheet should be added to `style.css`:
 
     a.footnote { vertical-align: super; font-size: xx-small; }
-    div.footnote { font-size: smaller; }
+    div.footnotes { font-size: smaller; }
 
 This is a typical style that user-agents apply to the `<sup>` tag. For
 example, chromium has this builtin style for `<sup>`:

new CSS bug
diff --git a/doc/bugs/footnotes-look-weird.mdwn b/doc/bugs/footnotes-look-weird.mdwn
new file mode 100644
index 0000000..4747353
--- /dev/null
+++ b/doc/bugs/footnotes-look-weird.mdwn
@@ -0,0 +1,41 @@
+Multimarkdown footnotes are pretty useful. If they are enabled in a
+wiki, they don't look so good with the default stylesheet, however, as
+the references are in the same size and positioning as everything
+else.
+
+The following stylesheet should be added to `style.css`:
+
+    a.footnote { vertical-align: super; font-size: xx-small; }
+    div.footnote { font-size: smaller; }
+
+This is a typical style that user-agents apply to the `<sup>` tag. For
+example, chromium has this builtin style for `<sup>`:
+
+    vertical-align: super;
+    font-size: smaller;
+
+Bootstrap uses this instead:
+
+    sup {
+        top: -.5em;
+    }
+    
+    sub, sup {
+        position: relative;
+        font-size: 75%;
+        line-height: 0;
+        vertical-align: baseline;
+    }
+
+I settled on `xx-small` because it's the only size that doesn't affect
+line-height here. However, Bootstrap's way may be better.
+
+At any rate, the correct way to fix this is to *avoid* custom styling
+and use the `<sup>` tag for the footnote reference, as it has
+*meaning* which is important to have proper semantic output (e.g. for
+screen readers), as detailed in [this Stack Overflow discussion][].
+
+[this Stack Overflow discussion]: http://stackoverflow.com/questions/501671/superscript-in-css-only
+
+Note that I also make the bottom `<div>` small as well so that it has
+less weight than the rest of the text. -- [[anarcat]]

explain footnotes
diff --git a/doc/tips/convert_moinmoin_to_ikiwiki.mdwn b/doc/tips/convert_moinmoin_to_ikiwiki.mdwn
index 4b3deb2..492418b 100644
--- a/doc/tips/convert_moinmoin_to_ikiwiki.mdwn
+++ b/doc/tips/convert_moinmoin_to_ikiwiki.mdwn
@@ -46,7 +46,7 @@ Usage instructions are in the `README` file.
    vertical list instead of an horizontal list)
  * PageList, through [[ikiwiki/directive/map]]
  * MonthCalendar, partially, through [[ikiwiki/directive/calendar]]
- * FootNote, through markdown
+ * FootNote, through multimarkdown (`[^foo]` → `[^foo]: this is the footnote`)
  * Anchor, through markdown and plain HTML
  * `<<BR>>`, through the weird line ending thing
  * AttachList, through a weird [[ikiwiki/directive/inline]]

Changed the expired domain and added question
diff --git a/doc/bugs/Anon_edit_caused_lock_out_on_entire_site_.mdwn b/doc/bugs/Anon_edit_caused_lock_out_on_entire_site_.mdwn
index dc79bba..a669413 100644
--- a/doc/bugs/Anon_edit_caused_lock_out_on_entire_site_.mdwn
+++ b/doc/bugs/Anon_edit_caused_lock_out_on_entire_site_.mdwn
@@ -30,7 +30,7 @@ The `anonok` plugin is **not** enabled
 
 ## Steps
 
-I've tried to place a comment clicking in the obvious [Add a comment](https://dev.iikb.org/ikiwiki.cgi?do=comment&page=forum%2FTema_bootstrap) in a [forum post](https://dev.iikb.org/forum/Tema_bootstrap/).
+I've tried to place a comment clicking in the obvious [Add a comment](https://dev.iikb.xyz/ikiwiki.cgi?do=comment&page=forum%2FTema_bootstrap) in a [forum post](https://dev.iikb.xyz/forum/Tema_bootstrap/).
 
 I've not signed in because the *sign in* page didn't come up, instead a simple `(You might want to Signin first?)` showed up, which I've haven't read and commented away.
 
@@ -38,9 +38,9 @@ I've not signed in because the *sign in* page didn't come up, instead a simple `
 
 ## Results
 
-As a consequence of that, the user '' - that's a null character, have somehow logged in and it seems that there is no way to [log it out](https://dev.iikb.org/ikiwiki.cgi?do=prefs).
+As a consequence of that, the user '' - that's a null character, have somehow logged in and it seems that there is no way to [log it out](https://dev.iikb.xyz/ikiwiki.cgi?do=prefs).
 
-None of this phantom user edits are being commited - this [blog post](https://dev.iikb.org/blog/posts/Bug_severo_neste_site/) was made with that user logged in via web.
+None of this phantom user edits are being commited - this [blog post](https://dev.iikb.xyz/blog/posts/Bug_severo_neste_site/) was made with that user logged in via web.
 
 It seems I can't log out from nowhere. I've rebuild the wiki from the command line and restarted the nginx server, the phantom user remains logged in and open to anyone willing to edit away the wiki.
 
@@ -50,4 +50,10 @@ It seems I can't log out from nowhere. I've rebuild the wiki from the command li
 
 If I wanted to do a totally anonnymous wiki, this would be the best setup ever.
 
-For [this particular installation](https://dev.iikb.org), that's not the case.
+For [this particular installation](https://dev.iikb.xyz), that's not the case.
+
+---
+
+## Question
+
+Is there a session file or something to logout this phantom user?

Fixed dead link.
diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn
index 6dc9734..64c995e 100644
--- a/doc/tips/Importing_posts_from_Wordpress.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress.mdwn
@@ -2,7 +2,7 @@
 
 Use case: You want to move away from Wordpress to Ikiwiki as your blogging/website platform, but you want to retain your old posts.
 
-[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file.
+[This](https://chris-lamb.co.uk/projects/ikiwiki-wordpress-import) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file.
 
 WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
 

add screenshot
diff --git a/doc/todo/admonitions.mdwn b/doc/todo/admonitions.mdwn
index 0f47901..50f62bf 100644
--- a/doc/todo/admonitions.mdwn
+++ b/doc/todo/admonitions.mdwn
@@ -118,4 +118,8 @@ bangs and all...
 [admon-caution.png]: https://moinmo.in/moin_static19/modernized/img/admon-caution.png
 
 Update: I have made a [[plugins/contrib/admonition]] plugin for this
-purpose, as a patch. Hopefully it will be mergeable here?
+purpose, as a patch. Hopefully it will be mergeable here? Here's a
+screenshot of what the help page would look like, to give you an idea
+of the results:
+
+<img src="http://paste.anarc.at/snaps/snap-2016.04.15-18.07.39.png" />

fix typos
diff --git a/doc/plugins/contrib/admonition.mdwn b/doc/plugins/contrib/admonition.mdwn
index de71738..43c63e4 100644
--- a/doc/plugins/contrib/admonition.mdwn
+++ b/doc/plugins/contrib/admonition.mdwn
@@ -9,11 +9,11 @@ sections of text using a custom style sheet and bright icons.
 
 5 directives are available:
 
-* [[ikiwiki/directives/tip]]
-* [[ikiwiki/directives/note]]
-* [[ikiwiki/directives/important]]
-* [[ikiwiki/directives/caution]]
-* [[ikiwiki/directives/warning]]
+* [[ikiwiki/directive/tip]]
+* [[ikiwiki/directive/note]]
+* [[ikiwiki/directive/important]]
+* [[ikiwiki/directive/caution]]
+* [[ikiwiki/directive/warning]]
 
 Or, in Ikiwiki markup:
 

announce the admonition plugin
diff --git a/doc/plugins/contrib/admonition.mdwn b/doc/plugins/contrib/admonition.mdwn
new file mode 100644
index 0000000..de71738
--- /dev/null
+++ b/doc/plugins/contrib/admonition.mdwn
@@ -0,0 +1,56 @@
+[[!meta author="anarcat"]]
+[[!template id=plugin name=admonition author="[[anarcat]]"]]
+[[!tag type/chrome]]
+
+# Admonitions
+
+This plugin adds directives that allow users to outline certain
+sections of text using a custom style sheet and bright icons.
+
+5 directives are available:
+
+* [[ikiwiki/directives/tip]]
+* [[ikiwiki/directives/note]]
+* [[ikiwiki/directives/important]]
+* [[ikiwiki/directives/caution]]
+* [[ikiwiki/directives/warning]]
+
+Or, in Ikiwiki markup:
+
+    \[[!tip "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."]]
+    \[[!note "Vivamus id enim."]]
+    \[[!important "In id erat non orci commodo lobortis."]]
+    \[[!caution "In id erat non orci commodo lobortis."]]
+    \[[!warning "Phasellus neque orci, porta a, aliquet quis, semper a, massa."]]
+
+Those directives simply create a `<div>` elements in the right
+style. So the above can also be simply written as:
+
+    <div class="tip">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</div>
+    <div class="note">Vivamus id enim.</div>
+    <div class="important">In id erat non orci commodo lobortis.</div>
+    <div class="caution">In id erat non orci commodo lobortis.</div>
+    <div class="warning">Phasellus neque orci, porta a, aliquet quis, semper a, massa.</div>
+
+# Rationale
+
+The idea behind the directives is to make the the CSS elements easier
+to discover through the builtin documentation. Obviously, more
+admonitions can be created simply by adding similar icons and CSS
+elements. Of course, you will not get the above directives expanded
+automatically unless you patch the admonition plugin, unfortunately.
+
+# Code
+
+[[!template id=gitbranch branch=anarcat/admonitions author="[[anarcat]]"]]
+
+The [[!taglink patch]] is available from
+[anarcat's "admonition" branch][] and is designed to be merged in
+Ikiwiki directly:
+
+    git clone -b admonitions git://src.anarc.at/ikiwiki.git
+
+[anarcat's "admonition" branch]: http://src.anarc.at/ikiwiki.git/shortlog/refs/heads/admonitions
+
+See also [[todo/admonitions]] for the discussion leading to the
+creation of this plugin.
diff --git a/doc/todo/admonitions.mdwn b/doc/todo/admonitions.mdwn
index 7523aba..0f47901 100644
--- a/doc/todo/admonitions.mdwn
+++ b/doc/todo/admonitions.mdwn
@@ -116,3 +116,6 @@ bangs and all...
 [admon-tip.png]: https://moinmo.in/moin_static19/modernized/img/admon-tip.png
 [admon-important.png]: https://moinmo.in/moin_static19/modernized/img/admon-important.png
 [admon-caution.png]: https://moinmo.in/moin_static19/modernized/img/admon-caution.png
+
+Update: I have made a [[plugins/contrib/admonition]] plugin for this
+purpose, as a patch. Hopefully it will be mergeable here?

elaborate copyright investigation. ugh.
diff --git a/doc/todo/admonitions.mdwn b/doc/todo/admonitions.mdwn
index 80c1a30..7523aba 100644
--- a/doc/todo/admonitions.mdwn
+++ b/doc/todo/admonitions.mdwn
@@ -87,3 +87,32 @@ bangs and all...
 >> creating associated styles. Is that something you would be open to?
 >>
 >> --[[anarcat]]
+
+>> Looking more at the MoinMoin images, the source (and license!) for
+>> them is not quite clear, so they don't make such great targets for
+>> inclusion. They are, nevertheless, included in Debian so presumably
+>> they are DFSG-friendly? The copyright file marks them as "UNKNOWN"
+>> which is worrisome... I have found the following results about them:
+>>
+>> * [admon-warning.png][] seems to be [public domain according to this sketchy site][]
+>> * [admon-note.png][] seems to have a [source in XFCE][], as part of
+>>   the notes plugin
+>> * [admon-tip.png][] is used in the Debian release notes, so is
+>presumably fine as well [source there](https://www.debian.org/releases/testing/amd64/release-notes/images/note.png)
+>> * [admon-important.png][], same, [important.png](https://www.debian.org/releases/testing/amd64/release-notes/images/important.png)
+>> * [admon-caution.png][] can be found in Mediawiki as well, which is
+>> a good source of icons. According to Debian, some are public domain,
+>> some are LGPL (!?). In MediaWiki itself, the source of that file is
+>> lost in the mists of time.
+>>
+>> Even though there is some confusion about the source of those
+>> images, I think, in good faith, that they can be generally be
+>> considered reusable. --[[anarcat]]
+
+[public domain according to this sketchy site]: http://all-free-download.com/free-vector/download/tango_process_stop_115912.html
+[source in XFCE]: http://git.xfce.org/panel-plugins/xfce4-notes-plugin/tree/data/icons/scalable/xfce4-notes-plugin.svg
+[admon-warning.png]: https://moinmo.in/moin_static19/modernized/img/admon-warning.png
+[admon-note.png]: https://moinmo.in/moin_static19/modernized/img/admon-note.png
+[admon-tip.png]: https://moinmo.in/moin_static19/modernized/img/admon-tip.png
+[admon-important.png]: https://moinmo.in/moin_static19/modernized/img/admon-important.png
+[admon-caution.png]: https://moinmo.in/moin_static19/modernized/img/admon-caution.png

response
diff --git a/doc/todo/admonitions.mdwn b/doc/todo/admonitions.mdwn
index fb3268c..80c1a30 100644
--- a/doc/todo/admonitions.mdwn
+++ b/doc/todo/admonitions.mdwn
@@ -66,3 +66,24 @@ bangs and all...
 > There's a "note" template bundled with ikiwiki already.
 >
 > --[[smcv]]
+
+>> I think you mean the `htmlize` hook, as I cannot find any `htmlize`
+>> plugin.. That said, yeah, i understand the limitations of Ikiwiki
+>> here. I guess that the [[ikiwiki/directive/template]] directive is a
+>> good workaround, but it's not really shorter to write:
+>>
+>>     \[[!template id=warning text="Do as I say, not as I do."]]
+>>
+>> than to write:
+>>
+>> [[!format txt """<div class="warning">Do as I say, not as I do.</div>"""]]
+>>
+>> ... in fact, it's actually longer. So short of allowing arbitrary
+>> classes *and* fenced blocks, I don't think this can go much
+>> further.
+>>
+>> We *could*, however, import the admonition styles from MoinMoin
+>> directly. It would involve importing 5 icons from MoinMoin and
+>> creating associated styles. Is that something you would be open to?
+>>
+>> --[[anarcat]]

can't login again
diff --git a/doc/bugs/cannot_login.mdwn b/doc/bugs/cannot_login.mdwn
index 4574fbe..a4f1295 100644
--- a/doc/bugs/cannot_login.mdwn
+++ b/doc/bugs/cannot_login.mdwn
@@ -35,3 +35,6 @@ So I guess the problem is mostly with git-annex.branchable.com? Not
 sure how to debug this further.
 
 Thanks. --[[anarcat]]
+
+Update: now I can't login to the ikiwiki.info site anymore, getting
+the same errors as on the git-annex site.

escape
diff --git a/doc/todo/admonitions.mdwn b/doc/todo/admonitions.mdwn
index 2b777b3..fb3268c 100644
--- a/doc/todo/admonitions.mdwn
+++ b/doc/todo/admonitions.mdwn
@@ -61,7 +61,7 @@ bangs and all...
 > [[templates|ikiwiki/directive/template]] are another way this could
 > work:
 >
->     [[!template id=warning text="Do as I say, not as I do."]]
+>     \[[!template id=warning text="Do as I say, not as I do."]]
 >
 > There's a "note" template bundled with ikiwiki already.
 >

templates are another way to do this
diff --git a/doc/todo/admonitions.mdwn b/doc/todo/admonitions.mdwn
index 752eec3..2b777b3 100644
--- a/doc/todo/admonitions.mdwn
+++ b/doc/todo/admonitions.mdwn
@@ -56,4 +56,13 @@ bangs and all...
 > might use the right one?) could interpret an ad-hoc syntax and
 > turn it into a `<div>` either before or after `htmlize` processing.
 > However, that would be adding an extra layer of syntax for your
-> users to keep track of. --[[smcv]]
+> users to keep track of.
+>
+> [[templates|ikiwiki/directive/template]] are another way this could
+> work:
+>
+>     [[!template id=warning text="Do as I say, not as I do."]]
+>
+> There's a "note" template bundled with ikiwiki already.
+>
+> --[[smcv]]

diff --git a/doc/todo/admonitions.mdwn b/doc/todo/admonitions.mdwn
index 3d5b7f1..752eec3 100644
--- a/doc/todo/admonitions.mdwn
+++ b/doc/todo/admonitions.mdwn
@@ -23,3 +23,37 @@ bangs and all...
 
 [MoinMoin wiki]: https://moinmo.in/
 [Admonitions]: https://moinmo.in/HelpOnAdmonitions
+
+> ikiwiki's general design is that it supports exactly three forms
+> of markup:
+>
+> * whatever the `htmlize` plugin does
+> * as a special ikiwiki-specific extension, \[[wikilinks]]
+> * as another special ikiwiki-specific extension, \[[!directives]]
+>
+> All markup interpretation beyond wikilinks and directives is
+> the `htmlize` plugin's responsibility. The `mdwn` plugin
+> interprets Markdown, the `rst` plugin interprets
+> reStructuredText and so on.
+>
+> It sounds as though you're asking for a `htmlize` plugin which
+> interprets an extended dialect of Markdown:
+>
+> * standard Markdown (inasmuch as such a thing exists) as usual
+> * mapping certain syntax (what?) to "admonitions"
+>
+> ikiwiki deliberately doesn't implement Markdown parsing, it just
+> calls out to one of several Perl implementations of Markdown.
+>
+> Alternatively, you could have a small plugin that translates
+>
+>     [[!warning "Do what I say, not as I do."]]
+>
+> into an appropriate `<div>`. That's the "lightest" form of
+> markup that is built into ikiwiki itself.
+>
+> Alternatively^2, some different hook (I think [[plugins/typography]]
+> might use the right one?) could interpret an ad-hoc syntax and
+> turn it into a `<div>` either before or after `htmlize` processing.
+> However, that would be adding an extra layer of syntax for your
+> users to keep track of. --[[smcv]]

a weird authentication bug
diff --git a/doc/bugs/cannot_login.mdwn b/doc/bugs/cannot_login.mdwn
new file mode 100644
index 0000000..4574fbe
--- /dev/null
+++ b/doc/bugs/cannot_login.mdwn
@@ -0,0 +1,37 @@
+I can't seem to login to ikiwiki sites reliably anymore.
+
+I am not sure what is going on. It affects this wiki and the git-annex
+wiki. I am editing this through the anonymous git push interface.
+
+OpenID is failing on me. That is, sometimes it works, sometimes it
+doesn't. For example, while writing this, I clicked the "Preferences"
+link and I seemed to have been logged in automatically without
+problem, even though I previously *tried* to login and failed with an
+error similar to [[bugs/Error:_OpenID_failure:_time_bad_sig:]], which
+of course I cannot reproduce anymore on ikiwiki.info now:
+
+    Error: OpenID failure: time_bad_sig: Return_to signature is not
+    valid.
+
+I *can* still reproduce this on the git-annex wiki, however, which is
+odd. This *could* be because the OpenID host is screwing up, as I am
+not directly responsible for that box anymore... but then why would it
+work on one wiki and not the other?
+
+But worse, I cannot login with my regular non-OpenID user, which I
+started using more regularly now. When I type the wrong password, the
+login form gives me "Invalid entry" next to the password field. But
+then if I do a password recall and reset my password, I get a
+different error:
+
+    Error: login failed, perhaps you need to turn on cookies?
+
+That happens reliably on git-annex.branchable.com. ikiwiki.info seems
+to be more stable: i can eventually login. i can login to my personal
+wiki with OpenID fine. I can also login to branchable.com itself with
+openid without issues.
+
+So I guess the problem is mostly with git-annex.branchable.com? Not
+sure how to debug this further.
+
+Thanks. --[[anarcat]]

admonitions proposal
diff --git a/doc/todo/admonitions.mdwn b/doc/todo/admonitions.mdwn
new file mode 100644
index 0000000..3d5b7f1
--- /dev/null
+++ b/doc/todo/admonitions.mdwn
@@ -0,0 +1,25 @@
+In the [MoinMoin wiki][], there is this neat little hack called
+[Admonitions][] that basically create a `<div>` block with a specific
+style out of a certain section of the text.
+
+I couldn't find a way to do this easily in Ikiwiki. On the one hand,
+there is no easy way to create div blocks with arbitrary styles (which
+is basically what MoinMoin admonitions are). On the other hand, there
+are no neat little logos in stylesheets like there are in Moinmoin
+either.
+
+It would be great to see this implemented in Ikiwiki. Now, I know I
+can make a `<div>` myself, but I am not sure we should encourage users
+to inject arbitrary HTML in ikiwiki pages. And even then, we should
+add adminition CSS classes to make that easier to use.
+
+Ideally, Ikiwiki would support Pandoc or Github-style fenced blocks
+and could abuse those to allow arbitrary styles (and markup!) to kick
+in. The [[ikiwiki/directive/format]] directive could also be used, I
+guess, but I dislike how it requires all those brackets and quotes and
+bangs and all...
+
+-- [[anarcat]]
+
+[MoinMoin wiki]: https://moinmo.in/
+[Admonitions]: https://moinmo.in/HelpOnAdmonitions

Arguing more
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index d8241a8..1c0dd91 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -35,6 +35,12 @@ links to the actual theme. -- [[anarcat]]
 >>> version of `page.tmpl` containing only the features you personally
 >>> need, but the `page.tmpl` in ikiwiki should be comprehensive. --[[smcv]]
 
+>>>> I've tried to make the least changes possible in [this page.tmpl file](https://notabug.org/iikb/ikiwiki-theme-bootstrap/raw/master/templates/page.tmpl), but I couldn't overcome the suckness of bootstrap itself.
+>>>> I am aware of alternatives to bootstrap, but it seems that every one of them would require some changes in the `page.tmpl` to work as expected.
+>>>> I think it is realistic to have a bootstrap (or other superb, fantastic css frame*lazy*work) without a `page.tmpl`,
+>>>> but I also think there should be other way around the chaos of each and every [[available theme|theme_market]] having it's own installing proccess.
+>>>> Other argument I have is: could we have a theme-contrib, like the [[plugins]] have? This would require the mantainer to implement the new features in their themes.
+
 ---
 
 I have a question.

Added systemd for nginx
diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn
index a33c8f3..3fc4048 100644
--- a/doc/tips/dot_cgi.mdwn
+++ b/doc/tips/dot_cgi.mdwn
@@ -82,6 +82,32 @@ made into a startup script in `init.d`. You may also need to make this file writ
 
     chmod a+w /tmp/fcgi.socket
 
+If you have [systemd](https://en.wikipedia.org/wiki/Systemd), you may use a service file like so:
+
+Edit/create a service file (in Debian it would be: `sudo vim /lib/systemd/system/ikiwiki.service`
+
+Content of `ikiwiki.service`:
+
+    [Unit]
+    Description=Ikiwiki fcgi socket wrap
+    After=network.target
+    
+    [Service]
+    Type=simple
+    User=www-data
+    Group=www-data
+    ExecStart=/usr/bin/spawn-fcgi -s /tmp/fcgi.socket -n -- /usr/sbin/fcgiwrap
+    
+    [Install]
+    WantedBy=multi-user.target
+
+Then run:
+
+    # This enables the service at startup
+    sudo systemctl enable ikiwiki.service
+    # This attempts to start the service
+    sudo systemctl start ikiwiki.service
+
 Then you need an nginx config plugged in that wrapper. Here's an
 example virtual host configuration:
 

diff --git a/doc/bugs/Anon_edit_caused_lock_out_on_entire_site_.mdwn b/doc/bugs/Anon_edit_caused_lock_out_on_entire_site_.mdwn
new file mode 100644
index 0000000..dc79bba
--- /dev/null
+++ b/doc/bugs/Anon_edit_caused_lock_out_on_entire_site_.mdwn
@@ -0,0 +1,53 @@
+Probably caused by something misconfigured about the [[plugins/comments]] plugin.
+
+---
+
+## Config
+
+My setup file:
+
+    # comments plugin
+    # PageSpec of pages where comments are allowed
+    comments_pagespec: forum/* or blog/posts/* or tarefa/*
+    # PageSpec of pages where posting new comments is not allowed
+    comments_closed_pagespec: ''
+    # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"
+    comments_pagename: comment_
+    # Interpret directives in comments?
+    #comments_allowdirectives: 0
+    # Allow anonymous commenters to set an author name?
+    comments_allowauthor: 1
+    # commit comments to the VCS
+    comments_commit: 1
+    # Restrict formats for comments to (no restriction if empty)
+    comments_allowformats: mdwn txt
+
+The `moderatedcomments` plugins is **not** enabled
+
+The `anonok` plugin is **not** enabled
+
+---
+
+## Steps
+
+I've tried to place a comment clicking in the obvious [Add a comment](https://dev.iikb.org/ikiwiki.cgi?do=comment&page=forum%2FTema_bootstrap) in a [forum post](https://dev.iikb.org/forum/Tema_bootstrap/).
+
+I've not signed in because the *sign in* page didn't come up, instead a simple `(You might want to Signin first?)` showed up, which I've haven't read and commented away.
+
+---
+
+## Results
+
+As a consequence of that, the user '' - that's a null character, have somehow logged in and it seems that there is no way to [log it out](https://dev.iikb.org/ikiwiki.cgi?do=prefs).
+
+None of this phantom user edits are being commited - this [blog post](https://dev.iikb.org/blog/posts/Bug_severo_neste_site/) was made with that user logged in via web.
+
+It seems I can't log out from nowhere. I've rebuild the wiki from the command line and restarted the nginx server, the phantom user remains logged in and open to anyone willing to edit away the wiki.
+
+---
+
+## Conclusion
+
+If I wanted to do a totally anonnymous wiki, this would be the best setup ever.
+
+For [this particular installation](https://dev.iikb.org), that's not the case.

Document new feature.
diff --git a/doc/plugins/contrib/compile.mdwn b/doc/plugins/contrib/compile.mdwn
index 564f7f6..7527f26 100644
--- a/doc/plugins/contrib/compile.mdwn
+++ b/doc/plugins/contrib/compile.mdwn
@@ -91,6 +91,7 @@ using python-like string formatting, and described in the setup options section.
   advertised).
 - `template`: Name of the template to use (if set, the `source` option is
   irrelevant).
+- `var_*`: Any argument with a name starting with ``var_`` is transmitted to the template. For instance, if directive has argument ``var_foo=bar``, then the template will have a variable named ``foo``, and ``<TMPL_VAR FOO>`` will be replaced by ``bar``.
 
 ### Extensions
 

clarify that theme and css is not only to change stylesheets, but the look in general
diff --git a/doc/examples.mdwn b/doc/examples.mdwn
index 19631ad..c772dc0 100644
--- a/doc/examples.mdwn
+++ b/doc/examples.mdwn
@@ -9,4 +9,4 @@ Each example is contained in its own subdirectory; just copy the source
 files into your wiki to start using one of the examples.
 
 The [[tips]] page has some other ideas for ways to use ikiwiki, and the
-[[css_market]] and [[theme market|themes]] has some example stylesheets to change ikiwiki's look.
+[[css_market]] and [[theme market|themes]] explain how to change ikiwiki's look.

link to localstyle after a user struggled for hours to figure out exactly that
diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index 65e2f5c..d41a4a3 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -4,6 +4,9 @@ User contributed stylesheet files for ikiwiki. Unless otherwise noted,
 these style sheets can be installed by copying them into your wiki's source
 dir with a filename of `local.css`.
 
+Note that if you enable the [[plugins/localstyle]] plugin, you can also
+create stylesheets that affect only certain parts of the wiki.
+
 Some of stylesheets have developed into fullfledged [[themes]] that are
 included in ikiwiki for easy use.
 

explain why multiple page.tmpl is a showstopper for upstream even if not for local themes
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index d7bd8d6..d8241a8 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -21,6 +21,20 @@ links to the actual theme. -- [[anarcat]]
 
 >> Would you reconsider? I've made [[this bootstrap theme|/forum/bootstrap_theme]] that works within the theme plugin without changing the `templatedir` configuration option. It seems that the `page.tmpl` I have in the subfolder `templates` takes precedence. Not sure what you meant by "two versions of page.tmpl", though. -- [[desci]]
 
+>>> The reason we don't want individual themes shipped with ikiwiki
+>>> to have to include their own `page.tmpl` is that when we add new
+>>> features (such as new plugins) to the ikiwiki core, if those features
+>>> require a `page.tmpl` change, we don't want to have to add them to
+>>> multiple variations of `page.tmpl`. This would either lead to
+>>> increased maintenance work (repeating ourselves), or theme-dependent
+>>> feature availability like what happens in Wordpress (for instance
+>>> imagine if `osm` only worked with Bootstrap and `sidebar` only worked
+>>> with Actiontabs - you wouldn't be able to have both).
+>>>
+>>> If you maintain your own local theme, you're welcome to maintain a
+>>> version of `page.tmpl` containing only the features you personally
+>>> need, but the `page.tmpl` in ikiwiki should be comprehensive. --[[smcv]]
+
 ---
 
 I have a question.

diff --git a/doc/users/desci.mdwn b/doc/users/desci.mdwn
index f3592cc..dce4ea4 100644
--- a/doc/users/desci.mdwn
+++ b/doc/users/desci.mdwn
@@ -10,21 +10,15 @@ A plugin to add facebook spyware to your ikiwiki: [[plugins/contrib/opengraph/]]
 
 ---
 
+# Ikiwiki Themes
+
+A theme to add [bootstrap 3](https://getbootstrap.com) to ikiwiki without overhauling the installation: [[forum/bootstrap_theme]]
+
+---
+
 # Ikiwiki Sites
 
 ## Currently online:
 
 * <https://dev.iikb.org>
 * <https://dev.iikb.xyz> (proxy_pass)
-
-## Offline:
-
-Sites I **was** using Ikiwiki with the [[bootstrap 3 theme|/theme_market]]:
-
-* *<https://hi.ato.br>*
-* *<https://capoeira.li/blog>*
-* *<http://dissertosradicais.tem.blog.br>*
-* *<http://epelaspracasnaoteranome.tem.blog.br>*
-* *<http://iuri.tem.blog.br>*
-* *<http://mim.tem.blog.br>*
-* *<http://piratas.xyz>*

Updated link
diff --git a/doc/tips/bootstrap_themes_evaluation.mdwn b/doc/tips/bootstrap_themes_evaluation.mdwn
index 9308a64..77849db 100644
--- a/doc/tips/bootstrap_themes_evaluation.mdwn
+++ b/doc/tips/bootstrap_themes_evaluation.mdwn
@@ -39,7 +39,7 @@ As for the [[theme_market]] page, since the modifications didn't provide much in
 
 ---
 
-There you go, I've provided a minimalistic [Bootstrap 3 Template](https://notabug.org/iikb/ikiwiki-theme-bootstrap) that should behave the proper way (tm) and it's easy as cloning the repository on `/usr/share/ikiwiki/themes/boostrap` and setting `theme: bootstrap`.
+There you go, I've provided a minimalistic [[Bootstrap 3 Template|/forum/bootstrap_theme]] that should behave the proper way (tm) and it's easy as cloning the repository on `/usr/share/ikiwiki/themes/boostrap` and setting `theme: bootstrap`.
 
 I've saved an [example on the wayback machine](https://web.archive.org/web/20160409044511/https://dev.iikb.org/forum/Tema_bootstrap/), because I will continue to improve that theme and the idea now is to make multiple variations of it, so the user has a choice. For example, changing the navbar from black to white requires some bootstrap specific changes, so I'll probably make another theme just for that.
 

Updated link
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index 39b9264..d7bd8d6 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -19,7 +19,7 @@ links to the actual theme. -- [[anarcat]]
 > so the page.tmpl could use that to do different things if the boostrap
 > theme was enabled. --[[Joey]]
 
->> Would you reconsider? I've made [this bootstrap theme](https://notabug.org/iikb/ikiwiki-theme-bootstrap/releases) that works within the theme plugin without changing the `templatedir` configuration option. It seems that the `page.tmpl` I have in the subfolder `templates` takes precedence. Not sure what you meant by "two versions of page.tmpl", though. -- [[desci]]
+>> Would you reconsider? I've made [[this bootstrap theme|/forum/bootstrap_theme]] that works within the theme plugin without changing the `templatedir` configuration option. It seems that the `page.tmpl` I have in the subfolder `templates` takes precedence. Not sure what you meant by "two versions of page.tmpl", though. -- [[desci]]
 
 ---
 
@@ -31,8 +31,6 @@ I put `.pm` plugins on `~/.ikiwiki/Ikiwiki/Plugin` and it works well.
 
 How would I go about not tampering with the root filesystem to install a theme?
 
---[[desci]]
-
 Also, I have another question:
 
 I have a complex theme I'm working on, and it doesn't even have a `style.css`, because it is about editing `.tmpl` files and relying on the bootstrap files, so I want to know if the theme plugin will understand this structure:

Edited old sentence to reference the forum
diff --git a/doc/todo/compatible_templates.mdwn b/doc/todo/compatible_templates.mdwn
index eef2bd3..687515d 100644
--- a/doc/todo/compatible_templates.mdwn
+++ b/doc/todo/compatible_templates.mdwn
@@ -25,7 +25,9 @@ I think it was anarcat who had the patches
 > someone else ported bootstrap4 to ikiwiki (see
 > [ikistrap][]). -- [[anarcat]]
 
-> The only standard i know of for the web that actually worked is html5. I've started [yet another bootstrap template](https://web.archive.org/web/20160409044511/https://dev.iikb.org/forum/Tema_bootstrap/). I want to get it right the way bootstrap proposes in order to form a base theme to make many others. Bootstrap sucks, by the way, I am already working on other frameworks. --[[desci]]
+---
+
+I've started [yet another bootstrap theme](https://notabug.org/iikb/ikiwiki-theme-bootstrap). The main reason being because I wanted a theme that actually worked within the [[theme plugin|/plugins/theme]] without changing anything else, and [[I've made it|/forum/bootstrap_theme]]. --[[desci]]
 
 [ikistrap]: https://github.com/gsliepen/ikistrap
 [bootstrap theme]: https://anarc.at/blog/2015-09-09-bootstrap/

diff --git a/doc/forum/bootstrap_theme.mdwn b/doc/forum/bootstrap_theme.mdwn
new file mode 100644
index 0000000..949aef5
--- /dev/null
+++ b/doc/forum/bootstrap_theme.mdwn
@@ -0,0 +1,17 @@
+I've edited a lot of pages with redundant questions, so I will centralize this right here.
+
+After reading a lot until I've found the [[/forum/debconf13_ikiwiki_bof]], and I saw there was a *welcome* for a generic bootstrap theme, so I've delivered.
+
+The 'yet another bootstrap theme' has it's source code on [notabug](https://notabug.org/iikb/ikiwiki-theme-bootstrap).
+
+The installation is like I expected any other theme to be:
+
+* [Untar](https://notabug.org/iikb/ikiwiki-theme-bootstrap/archive/1.0.0.25.tar.gz) or [unzip](https://notabug.org/iikb/ikiwiki-theme-bootstrap/archive/1.0.0.25.zip) the [release files](https://notabug.org/iikb/ikiwiki-theme-bootstrap/releases) into `/usr/share/ikiwiki/themes/bootstrap/`;
+* Active the theme `bootstrap` in the setup file or web setup like [[the manual said|/plugins/theme]];
+* Rebuild the wiki if it doesn't automatically and the site should look like [this](https://web.archive.org/web/20160409044511/https://dev.iikb.org/forum/Tema_bootstrap/).
+
+The [current release](https://notabug.org/iikb/ikiwiki-theme-bootstrap/archive/1.0.0.25.tar.gz) has less than the basics, however it should work out of the box and without modifying anything else, the template files that are tampered with are contained inside the theme folder.
+
+It also shouldn't use external *cdn*s, it does currently use [my own cdn](https://cdn.iik.org) but no one should rely on it so I'm moving the files inside the git tree so it will be auto contained.
+
+It is available in the [[theme_market]] already.

Asked Joey to reconsider
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index 5e5362e..39b9264 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -19,6 +19,8 @@ links to the actual theme. -- [[anarcat]]
 > so the page.tmpl could use that to do different things if the boostrap
 > theme was enabled. --[[Joey]]
 
+>> Would you reconsider? I've made [this bootstrap theme](https://notabug.org/iikb/ikiwiki-theme-bootstrap/releases) that works within the theme plugin without changing the `templatedir` configuration option. It seems that the `page.tmpl` I have in the subfolder `templates` takes precedence. Not sure what you meant by "two versions of page.tmpl", though. -- [[desci]]
+
 ---
 
 I have a question.

Added yet another bootstrap theme
diff --git a/doc/theme_market.mdwn b/doc/theme_market.mdwn
index d7ebd1c..dd3b073 100644
--- a/doc/theme_market.mdwn
+++ b/doc/theme_market.mdwn
@@ -12,6 +12,8 @@ Feel free to add your own [[theme|themes]] here, but first consider writing a si
 
 * **[Bootstrap theme](http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary)**, contributed by [JAK LINUX](http://jak-linux.org/about/), based on [Twitter Bootstrap](http://twitter.github.com/bootstrap/), [modifications available](https://anarc.at/blog/2015-09-09-bootstrap/) from [[anarcat]] as well
 
+  * [Yet another bootstrap theme](https://notabug.org/iikb/ikiwiki-theme-bootstrap), this one can be used like a regular theme by placing [the theme files](https://notabug.org/iikb/ikiwiki-theme-bootstrap/archive/1.0.0.25.zip) on `/usr/share/ikiwiki/themes/bootstrap/` and changing the `theme` configuration to `boostrap`.
+
 * **[Bootstrap 3](https://github.com/ramseydsilva/ikiwiki-bootstrap-theme)**, contributed by [[ramsey]], based on [Twitter Bootstrap 3](http://getbootstrap.com). [Example](http://bootstrap-ramseydsilva.wiki.orangeseeds.org). This template has been forked and modified in many ways:
 
   * Modification for [dequis.org](https://github.com/dequis/ikiwiki-bootstrap-theme/tree/dequis.org). [Example](http://bootstrap-dequis.wiki.orangeseeds.org).
@@ -22,5 +24,6 @@ Feel free to add your own [[theme|themes]] here, but first consider writing a si
 
   * And one more **[Bootstrap 3](https://github.com/tgpfeiffer/ikiwiki-bootstrap-template)** theme (can't you guys get along already?!), contributed by tgpfeiffer, this one shipping a copy of the bootstrap files. [Example](http://bootstrap-tgpfeiffer.wiki.orangeseeds.org).
 
+
 * **[Ikistrap](https://github.com/gsliepen/ikistrap)**, contributed by gsliepen, based on Bootstrap 4.
 

Added question
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index 88a1e38..5e5362e 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -57,4 +57,8 @@ I have a complex theme I'm working on, and it doesn't even have a `style.css`, b
         └── whatever.tmpl
 ```
 
---[[desci]]
+**Edit:** no, it doesn't. When i change theme in the config to `my-theme`, the engine only uses the `templates` subfolder under `theme/my-theme`, and not `basewiki`. So the workaround is doing like [IkiStrap](https://github.com/gsliepen/ikistrap) proposed, suggesting the user to alter the `underlaydir` and `templatedir` configs instead of choosing a theme via the old fashioned `theme` config.
+
+This feels more like an overhaul than a theme for me, could we clarify what is a theme, a template, an overhaul, a change to the look and feel, a change to the frontend, a change to the design, etc.?
+
+-- [[desci]]

There's also a config file option.
diff --git a/doc/plugins/typography.mdwn b/doc/plugins/typography.mdwn
index 9ff6c4f..4b274d1 100644
--- a/doc/plugins/typography.mdwn
+++ b/doc/plugins/typography.mdwn
@@ -7,6 +7,8 @@ plain ASCII punctuation characters into ``smart'' typographic punctuation HTML
 entities. To use it, you need to have the [[!cpan Text::Typography]] module
 installed.
 
-This plugin has a configuration option. To change the attributes,
-set `--typographyattributes=whatever`. See the documentation for
-[[!cpan Text::Typography]] for available attributes.
+This plugin has a configuration option. To change the attributes, set
+`--typographyattributes=whatever`.  Alternatively, set
+`typograph_attributes: whatever` in your config file.  The default is
+`3`.  See the documentation for [[!cpan Text::Typography]] for available
+attributes.

Marketing
diff --git a/doc/todo/compatible_templates.mdwn b/doc/todo/compatible_templates.mdwn
index a47f4ba..eef2bd3 100644
--- a/doc/todo/compatible_templates.mdwn
+++ b/doc/todo/compatible_templates.mdwn
@@ -25,6 +25,8 @@ I think it was anarcat who had the patches
 > someone else ported bootstrap4 to ikiwiki (see
 > [ikistrap][]). -- [[anarcat]]
 
+> The only standard i know of for the web that actually worked is html5. I've started [yet another bootstrap template](https://web.archive.org/web/20160409044511/https://dev.iikb.org/forum/Tema_bootstrap/). I want to get it right the way bootstrap proposes in order to form a base theme to make many others. Bootstrap sucks, by the way, I am already working on other frameworks. --[[desci]]
+
 [ikistrap]: https://github.com/gsliepen/ikistrap
 [bootstrap theme]: https://anarc.at/blog/2015-09-09-bootstrap/
 [custom theme]: http://anarcat.ath.cx/night_city/README/

Delivering what I've promised
diff --git a/doc/tips/bootstrap_themes_evaluation.mdwn b/doc/tips/bootstrap_themes_evaluation.mdwn
index 8f41a60..9308a64 100644
--- a/doc/tips/bootstrap_themes_evaluation.mdwn
+++ b/doc/tips/bootstrap_themes_evaluation.mdwn
@@ -36,3 +36,11 @@ The webdev collective has just met again and the plan to make multiple ikiwiki b
 As for the [[theme_market]] page, since the modifications didn't provide much innovation, mine included, I've [edited the page](http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=b18ae270ac7b93fe51f83bd7dc885d068165e407), see if it seems cleaner now.
 
 --[[desci]]
+
+---
+
+There you go, I've provided a minimalistic [Bootstrap 3 Template](https://notabug.org/iikb/ikiwiki-theme-bootstrap) that should behave the proper way (tm) and it's easy as cloning the repository on `/usr/share/ikiwiki/themes/boostrap` and setting `theme: bootstrap`.
+
+I've saved an [example on the wayback machine](https://web.archive.org/web/20160409044511/https://dev.iikb.org/forum/Tema_bootstrap/), because I will continue to improve that theme and the idea now is to make multiple variations of it, so the user has a choice. For example, changing the navbar from black to white requires some bootstrap specific changes, so I'll probably make another theme just for that.
+
+--[[desci]]

Ok now I've got it right
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index 1dba08a..88a1e38 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -40,16 +40,17 @@ I have a complex theme I'm working on, and it doesn't even have a `style.css`, b
 └── my-theme/
     ├── basewiki/
     │   ├── bootstrap/
-    │   │   └── bootstrap.min.css
-    │   ├── js/
-    │   │   ├── bootstrap.js
-    │   │   └── bootstrap.min.js
-    │   ├── fonts/
-    │   │   ├── glyphicons-halflings-regular.eot
-    │   │   ├── glyphicons-halflings-regular.svg
-    │   │   ├── glyphicons-halflings-regular.ttf
-    │   │   ├── glyphicons-halflings-regular.woff
-    │   │   └── glyphicons-halflings-regular.woff2
+    │   │   ├── css/
+    │   │   │   └── bootstrap.min.css
+    │   │   ├── js/
+    │   │   │   ├── bootstrap.js
+    │   │   │   └── bootstrap.min.js
+    │   │   └── fonts/
+    │   │       ├── glyphicons-halflings-regular.eot
+    │   │       ├── glyphicons-halflings-regular.svg
+    │   │       ├── glyphicons-halflings-regular.ttf
+    │   │       ├── glyphicons-halflings-regular.woff
+    │   │       └── glyphicons-halflings-regular.woff2
     │   └── index.mdwn
     └── templates/
         ├── page.tmpl

The structure was all wrong
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index 98d8056..1dba08a 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -38,18 +38,19 @@ I have a complex theme I'm working on, and it doesn't even have a `style.css`, b
 ```
 /usr/share/ikiwiki/themes/
 └── my-theme/
-    ├── bootstrap/
-    │   └── bootstrap.min.css
-    ├── js/
-    │   ├── bootstrap.js
-    │   └── bootstrap.min.js
-    ├── fonts/
-    │   ├── glyphicons-halflings-regular.eot
-    │   ├── glyphicons-halflings-regular.svg
-    │   ├── glyphicons-halflings-regular.ttf
-    │   ├── glyphicons-halflings-regular.woff
-    │   └── glyphicons-halflings-regular.woff2
-    ├── index.mdwn
+    ├── basewiki/
+    │   ├── bootstrap/
+    │   │   └── bootstrap.min.css
+    │   ├── js/
+    │   │   ├── bootstrap.js
+    │   │   └── bootstrap.min.js
+    │   ├── fonts/
+    │   │   ├── glyphicons-halflings-regular.eot
+    │   │   ├── glyphicons-halflings-regular.svg
+    │   │   ├── glyphicons-halflings-regular.ttf
+    │   │   ├── glyphicons-halflings-regular.woff
+    │   │   └── glyphicons-halflings-regular.woff2
+    │   └── index.mdwn
     └── templates/
         ├── page.tmpl
         └── whatever.tmpl

Forgot to add the main folder
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index 2ac7576..98d8056 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -36,6 +36,7 @@ Also, I have another question:
 I have a complex theme I'm working on, and it doesn't even have a `style.css`, because it is about editing `.tmpl` files and relying on the bootstrap files, so I want to know if the theme plugin will understand this structure:
 
 ```
+/usr/share/ikiwiki/themes/
 └── my-theme/
     ├── bootstrap/
     │   └── bootstrap.min.css

Added two questions
diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn
index 5c0766a..2ac7576 100644
--- a/doc/themes/discussion.mdwn
+++ b/doc/themes/discussion.mdwn
@@ -18,3 +18,40 @@ links to the actual theme. -- [[anarcat]]
 > theme yet. I recently made `<TMPL_IF THEME_$NAME>` be available,
 > so the page.tmpl could use that to do different things if the boostrap
 > theme was enabled. --[[Joey]]
+
+---
+
+I have a question.
+
+Where should I put a custom theme other than `/usr/share/ikiwiki/themes/`?
+
+I put `.pm` plugins on `~/.ikiwiki/Ikiwiki/Plugin` and it works well.
+
+How would I go about not tampering with the root filesystem to install a theme?
+
+--[[desci]]
+
+Also, I have another question:
+
+I have a complex theme I'm working on, and it doesn't even have a `style.css`, because it is about editing `.tmpl` files and relying on the bootstrap files, so I want to know if the theme plugin will understand this structure:
+
+```
+└── my-theme/
+    ├── bootstrap/
+    │   └── bootstrap.min.css
+    ├── js/
+    │   ├── bootstrap.js
+    │   └── bootstrap.min.js
+    ├── fonts/
+    │   ├── glyphicons-halflings-regular.eot
+    │   ├── glyphicons-halflings-regular.svg
+    │   ├── glyphicons-halflings-regular.ttf
+    │   ├── glyphicons-halflings-regular.woff
+    │   └── glyphicons-halflings-regular.woff2
+    ├── index.mdwn
+    └── templates/
+        ├── page.tmpl
+        └── whatever.tmpl
+```
+
+--[[desci]]

Added a comment: Any chance on moving forward on this?
diff --git a/doc/forum/Translating_ikiwiki_interface/comment_1_389a8173abcc0990f6670796c5f8b227._comment b/doc/forum/Translating_ikiwiki_interface/comment_1_389a8173abcc0990f6670796c5f8b227._comment
new file mode 100644
index 0000000..fbee2ce
--- /dev/null
+++ b/doc/forum/Translating_ikiwiki_interface/comment_1_389a8173abcc0990f6670796c5f8b227._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="desci"
+ subject="Any chance on moving forward on this?"
+ date="2016-04-09T00:21:45Z"
+ content="""
+How about having an intermediate file defining TMPL_VAR_STRING_X and creating .pot files from this intermediate file? --[[desci]]
+"""]]

todo
diff --git a/doc/todo/merge_bootstrap_branch.mdwn b/doc/todo/merge_bootstrap_branch.mdwn
new file mode 100644
index 0000000..a928e14
--- /dev/null
+++ b/doc/todo/merge_bootstrap_branch.mdwn
@@ -0,0 +1,16 @@
+I've prepared a bootstrap branch based on
+<https://github.com/gsliepen/ikistrap>. 
+
+Main impediment to merging it is jquery; bootstrap probably needs
+a newer version than the 1.6.2 included in ikiwiki and upgrading
+it would need testing the parts of ikiwiki that use jquery.
+
+It also needs to include bootstrap 4 in ikiwiki, rather than pulling
+it from the CDN, probably. Although depending on a debian package
+would be nicer, if bootstrap 4 got packaged in Debian.
+
+Note that the template changes are not entirely optimial, but I
+did them in a way that makes the diff pretty clear that nothing changes
+except when the bootstrap theme is enabled.
+
+--[[Joey]]

Explanation of my part on the confusion
diff --git a/doc/tips/bootstrap_themes_evaluation.mdwn b/doc/tips/bootstrap_themes_evaluation.mdwn
index f1f6553..8f41a60 100644
--- a/doc/tips/bootstrap_themes_evaluation.mdwn
+++ b/doc/tips/bootstrap_themes_evaluation.mdwn
@@ -12,3 +12,27 @@ In order to figure out exactly which ones fares the best, i made test wikis for
 Hopefully this will help others figure out what the heck is going on here... Personnally, I think I prefer the JAK linux one, but i don't like the idea of depending on a theme-specific plugin...  -- [[anarcat]]
 
 Update: I ended up forking the Jak theme also... My experience has been documented in [this blog post](http://anarc.at/blog/2015-09-09-bootstrap/?updated). --[[anarcat]]
+
+---
+
+Congratulations on your setup and here is my *mea culpa* on this:
+
+Originally I've started making the [hiatobr](http://bootstrap-hiatobr.wiki.orangeseeds.org)'s fork to address the following issues with the other attempts to make a bootstrap theme:
+
+* The sidebar wasn't working;
+* The themes were poorly written and did not found a way to incorporate the bootstrap proposal to the ikiwiki's template model;
+* I wanted diversity and the original idea was to provide a handful of templates like the [bootstrap examples](http://getbootstrap.com/getting-started/#examples).
+
+Turns out:
+
+* I've fixed the sidebar, don't remember how but you may find out in the [history](https://notabug.org/hiatobr/ikiwiki-bootstrap-theme-2/commits/d3769844c536a0d97955157f4c55e719af1dd3d0);
+* I've added an [[opengraph plugin|plugins/contrib/opengraph/]] in the template so your facebook friends can share your blog posts;
+* We have translated stuff to Brazilian Portuguese totally ignoring the i18n conventions so that kind of broke the template;
+* The "proper way" to use the template is not documented;
+* We did not provide other templates as planned because of the [end of Hacklab Independência](https://we.riseup.net/hiatobr/fim-do-hacklab-independ-ncia);
+
+The webdev collective has just met again and the plan to make multiple ikiwiki blog bootstrap templates will continue, but since I've failed once, this shall wait for results.
+
+As for the [[theme_market]] page, since the modifications didn't provide much innovation, mine included, I've [edited the page](http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=b18ae270ac7b93fe51f83bd7dc885d068165e407), see if it seems cleaner now.
+
+--[[desci]]

Tried to fix considering http://ikiwiki.info/tips/bootstrap_themes_evaluation/
diff --git a/doc/theme_market.mdwn b/doc/theme_market.mdwn
index 90f8d90..d7ebd1c 100644
--- a/doc/theme_market.mdwn
+++ b/doc/theme_market.mdwn
@@ -6,18 +6,21 @@ It is usually preferable (and more maintainable) to create a [[css]] file instea
 
 Feel free to add your own [[theme|themes]] here, but first consider writing a simpler [[css]] file and adding it to the [[css market]] instead, or look at the [[themes]] shipped with ikiwiki.
 
- * **[Ikistrap](https://github.com/gsliepen/ikistrap)**, contributed by gsliepen, based on Bootstrap 4.
+* **[AntPortal theme](https://github.com/AntPortal/ikiwiked)**, contributed by Danny, see an example [on the Antportal wiki](https://antportal.com/wiki/)
 
- * **[AntPortal theme](https://github.com/AntPortal/ikiwiked)**, contributed by Danny, see an example [on the Antportal wiki](https://antportal.com/wiki/)
+* **[Night city theme](http://anarcat.ath.cx/night_city/README/)**, contributed by [[anarcat]].
 
- * **[Night city theme](http://anarcat.ath.cx/night_city/README/)**, contributed by [[anarcat]], see an example [on his homepage](http://anarc.at)
+* **[Bootstrap theme](http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary)**, contributed by [JAK LINUX](http://jak-linux.org/about/), based on [Twitter Bootstrap](http://twitter.github.com/bootstrap/), [modifications available](https://anarc.at/blog/2015-09-09-bootstrap/) from [[anarcat]] as well
 
- * **[Bootstrap theme](http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary)**, contributed by [JAK LINUX](http://jak-linux.org/about/), based on [Twitter Bootstrap](http://twitter.github.com/bootstrap/), [modifications available](https://anarc.at/blog/2015-09-09-bootstrap/) from [[anarcat]] as well
+* **[Bootstrap 3](https://github.com/ramseydsilva/ikiwiki-bootstrap-theme)**, contributed by [[ramsey]], based on [Twitter Bootstrap 3](http://getbootstrap.com). [Example](http://bootstrap-ramseydsilva.wiki.orangeseeds.org). This template has been forked and modified in many ways:
 
- * **[Bootstrap 3](https://github.com/ramseydsilva/ikiwiki-bootstrap-theme)**, contributed by [[ramsey]], based on [Twitter Bootstrap 3](http://getbootstrap.com), also modified by [dequis.org](https://github.com/dequis/ikiwiki-bootstrap-theme/tree/dequis.org)
+  * Modification for [dequis.org](https://github.com/dequis/ikiwiki-bootstrap-theme/tree/dequis.org). [Example](http://bootstrap-dequis.wiki.orangeseeds.org).
 
- * **[Bootstrap 2](https://notabug.org/hiatobr/ikiwiki-bootstrap-theme-2)**, contributed by [Hacklab Independência](https://hi.ato.br), a fork of [[ramsey]]'s [Bootstrap 3](https://github.com/ramseydsilva/ikiwiki-bootstrap-theme) original work. You may see examples on [[my user page|/users/desci]]
+  * Modification to fix the sidebar: **[Bootstrap 2](https://notabug.org/hiatobr/ikiwiki-bootstrap-theme-2)**, contributed by [Hacklab Independência](http://hi.ato.br). This one is hard translated to brazilian portuguese. [Example](http://bootstrap-hiatobr.wiki.orangeseeds.org).
 
- * yet another **[Bootstrap 3](https://github.com/anderbubble/ikiwiki-bootstrap)** theme, contributed by anderbubble
+  * Yet another **[Bootstrap 3](https://github.com/anderbubble/ikiwiki-bootstrap)** theme, contributed by anderbubble. [Example](http://bootstrap-anderbubble.wiki.orangeseeds.org).
+
+  * And one more **[Bootstrap 3](https://github.com/tgpfeiffer/ikiwiki-bootstrap-template)** theme (can't you guys get along already?!), contributed by tgpfeiffer, this one shipping a copy of the bootstrap files. [Example](http://bootstrap-tgpfeiffer.wiki.orangeseeds.org).
+
+* **[Ikistrap](https://github.com/gsliepen/ikistrap)**, contributed by gsliepen, based on Bootstrap 4.
 
- * and one more **[Bootstrap 3](https://github.com/tgpfeiffer/ikiwiki-bootstrap-template)** theme (can't you guys get along already?!), contributed by tgpfeiffer, this one shipping a copy of the bootstrap files

added personal information
diff --git a/doc/users/desci.mdwn b/doc/users/desci.mdwn
index f36dc62..f3592cc 100644
--- a/doc/users/desci.mdwn
+++ b/doc/users/desci.mdwn
@@ -1,3 +1,15 @@
+# Personal information
+
+<https://desci.xyz>
+
+---
+
+# Ikiwiki Plugins
+
+A plugin to add facebook spyware to your ikiwiki: [[plugins/contrib/opengraph/]]
+
+---
+
 # Ikiwiki Sites
 
 ## Currently online:
@@ -9,16 +21,10 @@
 
 Sites I **was** using Ikiwiki with the [[bootstrap 3 theme|/theme_market]]:
 
-* <https://hi.ato.br>
-* <https://capoeira.li/blog>
-* <http://dissertosradicais.tem.blog.br>
-* <http://epelaspracasnaoteranome.tem.blog.br>
-* <http://iuri.tem.blog.br>
-* <http://mim.tem.blog.br>
-* <http://piratas.xyz>
-
----
-
-# Plugins
-
-A plugin to add facebook spyware to your ikiwiki: [[plugins/contrib/opengraph/]]
+* *<https://hi.ato.br>*
+* *<https://capoeira.li/blog>*
+* *<http://dissertosradicais.tem.blog.br>*
+* *<http://epelaspracasnaoteranome.tem.blog.br>*
+* *<http://iuri.tem.blog.br>*
+* *<http://mim.tem.blog.br>*
+* *<http://piratas.xyz>*

updated sites list
diff --git a/doc/users/desci.mdwn b/doc/users/desci.mdwn
index 47335b9..f36dc62 100644
--- a/doc/users/desci.mdwn
+++ b/doc/users/desci.mdwn
@@ -1,4 +1,13 @@
-Sites I am using Ikiwiki with the [[bootstrap 3 theme|/theme_market]]:
+# Ikiwiki Sites
+
+## Currently online:
+
+* <https://dev.iikb.org>
+* <https://dev.iikb.xyz> (proxy_pass)
+
+## Offline:
+
+Sites I **was** using Ikiwiki with the [[bootstrap 3 theme|/theme_market]]:
 
 * <https://hi.ato.br>
 * <https://capoeira.li/blog>
@@ -10,4 +19,6 @@ Sites I am using Ikiwiki with the [[bootstrap 3 theme|/theme_market]]:
 
 ---
 
+# Plugins
+
 A plugin to add facebook spyware to your ikiwiki: [[plugins/contrib/opengraph/]]

diff --git a/doc/todo/Reduce_browser_wait_after_adding_comment.mdwn b/doc/todo/Reduce_browser_wait_after_adding_comment.mdwn
new file mode 100644
index 0000000..11bd0de
--- /dev/null
+++ b/doc/todo/Reduce_browser_wait_after_adding_comment.mdwn
@@ -0,0 +1,15 @@
+Instead of waiting to complete the full ``refresh`` return to commented page
+as soon as it has been rebuilt.
+
+After commenting on a page the browser wait for what I presume to be the whole
+``--refresh`` to finish. This is often a considerable lag and many users think
+something has gone wrong (at least my users). The actual commented page is
+often regenerated quite quickly as you notice by clicking the backbutton
+immediately after posting a comment.  The rest of the time ikiwiki spends
+regenerating dependent pages such as inlines etc.
+
+I don't know if ikiwiki can communicate that a single specific page has been
+regenerated but if possible it would greatly improve the interactivity of
+ikiwiki.
+
+[[!tag wishlist]]

New inline's same as old, plus plugins/contrib/*.
diff --git a/doc/reviewed.mdwn b/doc/reviewed.mdwn
index ce2c0b0..4c4db1e 100644
--- a/doc/reviewed.mdwn
+++ b/doc/reviewed.mdwn
@@ -3,7 +3,4 @@ shows up here, the ball is back in your court, to respond to the review and
 deal with whatever is preventing it from being merged into ikiwiki. Once
 you do, remove the "reviewed" tag.
 
-[[!inline pages="(todo/* or bugs/*) and link(/branches) and !link(bugs/done)
-and !link(todo/done) and !*/*/* and link(.)" show=0 archive=yes]]
-
 [[!inline pages="tagged(reviewed)" show=0 archive=yes]]

Retry previous with more brain cells engaged.
diff --git a/doc/reviewed.mdwn b/doc/reviewed.mdwn
index 66c441b..ce2c0b0 100644
--- a/doc/reviewed.mdwn
+++ b/doc/reviewed.mdwn
@@ -6,4 +6,4 @@ you do, remove the "reviewed" tag.
 [[!inline pages="(todo/* or bugs/*) and link(/branches) and !link(bugs/done)
 and !link(todo/done) and !*/*/* and link(.)" show=0 archive=yes]]
 
-[[!inline tagged(reviewed) show=0 archive=yes]]
+[[!inline pages="tagged(reviewed)" show=0 archive=yes]]

Try another inline with just tagged(reviewed).
diff --git a/doc/reviewed.mdwn b/doc/reviewed.mdwn
index 14772a3..66c441b 100644
--- a/doc/reviewed.mdwn
+++ b/doc/reviewed.mdwn
@@ -5,3 +5,5 @@ you do, remove the "reviewed" tag.
 
 [[!inline pages="(todo/* or bugs/*) and link(/branches) and !link(bugs/done)
 and !link(todo/done) and !*/*/* and link(.)" show=0 archive=yes]]
+
+[[!inline tagged(reviewed) show=0 archive=yes]]

describe XSS issue
diff --git a/doc/plugins/contrib/remark/discussion.mdwn b/doc/plugins/contrib/remark/discussion.mdwn
index 2a4dbe7..ab8d409 100644
--- a/doc/plugins/contrib/remark/discussion.mdwn
+++ b/doc/plugins/contrib/remark/discussion.mdwn
@@ -38,4 +38,22 @@ they do, is that dangerous? --[[schmonz]]
 
 > Yes, it's likely both possible and dangerous. If you've already
 > deployed this plugin, make sure it's covered by [[plugins/lockedit]].
-> --[[smcv]]
+>
+> Every *page* that is not *internal* can be edited. Look at
+> [[plugins/editpage]] for the (only) logic that is applied when deciding
+> whether to accept an edit: whether there is an action link is irrelevant.
+>
+> Here *page* is a jargon term for something matching `page()`, i.e. its
+> extension is the same as the name of a `htmlize` hook, while *internal*
+> means a *page* whose extension additionally starts with `_`.
+>
+> I think there's a cross-site scripting vulnerability here. If there is
+> some Markdown source that is seen as OK by
+> [[plugins/htmlscrubber]] and [[plugins/htmlbalance]], but induces
+> remark.js to produce HTML that is then evaluated in the security context
+> of your wiki and executes attacker-supplied JavaScript in visitors' browsers,
+> then an attacker able to edit the remark source could act with the
+> privileges of your wiki and anything else that shares its origin
+> (domain name). In particular, the attacker could steal login cookies.
+> The simplest proof-of-concept would be something like
+> `[click here](javascript:alert("XSS! " + document.cookie))`. --[[smcv]]

briefly describe XSS issue
diff --git a/doc/plugins/contrib/remark.mdwn b/doc/plugins/contrib/remark.mdwn
index 20f5b7d..8c17832 100644
--- a/doc/plugins/contrib/remark.mdwn
+++ b/doc/plugins/contrib/remark.mdwn
@@ -21,10 +21,11 @@ not elegantly). Clicking through to the slides works right, of course.
 
 See [[Discussion#inline]].
 
-## Concern: safety of web-editing
+## Problem: safety of web-editing
 
-Even though `remarkpage.tmpl` has no action links, is it still possible
-for someone to trick their way into web-editing a slide deck? And if
-they do, is that dangerous?
+This plugin is not currently safe for wikis where `.remark` pages can be
+edited by untrusted users; the [[plugins/htmlscrubber]] is unlikely to be
+able to prevent cross-site scripting in this plugin. Make sure only trusted
+(administrative) users can create or edit `.remark` pages.
 
 See [[Discussion#editing]].

new bug
diff --git a/doc/bugs/password_reset_failure.mdwn b/doc/bugs/password_reset_failure.mdwn
new file mode 100644
index 0000000..1e40981
--- /dev/null
+++ b/doc/bugs/password_reset_failure.mdwn
@@ -0,0 +1,22 @@
+I can't seem to do a password reset on this wiki. I am writing this
+through the anonymous git push interface (phew for that!).
+
+I have tried three times now to reset my password through the user
+interface - my account name is [[anarcat]], and when i do the password
+reset, I get a token. I go visit the website, set a passphrase, click
+`Save Preferences` and I end up on a login form. I enter my
+passphrase, click `Login` and I get the error:
+
+    1 error(s) were encountered with your submission. Please correct the fields highlighted below.
+    
+    Name
+    [anarcat]
+    
+    Password
+    [*************] Invalid entry
+
+`Password` is highlighted.
+
+Even if I leave the password there (my cleartext password is in the
+login form by default after the password reset, which is strange), it
+still gives me that error. -- [[anarcat]]

add my modifications to bootstrap
diff --git a/doc/theme_market.mdwn b/doc/theme_market.mdwn
index adbc36b..90f8d90 100644
--- a/doc/theme_market.mdwn
+++ b/doc/theme_market.mdwn
@@ -12,7 +12,7 @@ Feel free to add your own [[theme|themes]] here, but first consider writing a si
 
  * **[Night city theme](http://anarcat.ath.cx/night_city/README/)**, contributed by [[anarcat]], see an example [on his homepage](http://anarc.at)
 
- * **[Bootstrap theme](http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary)**, contributed by [JAK LINUX](http://jak-linux.org/about/), based on [Twitter Bootstrap](http://twitter.github.com/bootstrap/)
+ * **[Bootstrap theme](http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary)**, contributed by [JAK LINUX](http://jak-linux.org/about/), based on [Twitter Bootstrap](http://twitter.github.com/bootstrap/), [modifications available](https://anarc.at/blog/2015-09-09-bootstrap/) from [[anarcat]] as well
 
  * **[Bootstrap 3](https://github.com/ramseydsilva/ikiwiki-bootstrap-theme)**, contributed by [[ramsey]], based on [Twitter Bootstrap 3](http://getbootstrap.com), also modified by [dequis.org](https://github.com/dequis/ikiwiki-bootstrap-theme/tree/dequis.org)
 

fix links
diff --git a/doc/theme_market.mdwn b/doc/theme_market.mdwn
index e65b028..adbc36b 100644
--- a/doc/theme_market.mdwn
+++ b/doc/theme_market.mdwn
@@ -6,17 +6,17 @@ It is usually preferable (and more maintainable) to create a [[css]] file instea
 
 Feel free to add your own [[theme|themes]] here, but first consider writing a simpler [[css]] file and adding it to the [[css market]] instead, or look at the [[themes]] shipped with ikiwiki.
 
- * **[[Ikistrap|https://github.com/gsliepen/ikistrap]]**, contributed by gsliepen, based on Bootstrap 4.
+ * **[Ikistrap](https://github.com/gsliepen/ikistrap)**, contributed by gsliepen, based on Bootstrap 4.
 
- * **[[AntPortal theme|https://github.com/AntPortal/ikiwiked]]**, contributed by Danny, see an example [[on the Antportal wiki|https://antportal.com/wiki/]]
+ * **[AntPortal theme](https://github.com/AntPortal/ikiwiked)**, contributed by Danny, see an example [on the Antportal wiki](https://antportal.com/wiki/)
 
- * **[[Night city theme|http://anarcat.ath.cx/night_city/README/]]**, contributed by [[anarcat]], see an example [[on his homepage|http://anarcat.ath.cx/]]
+ * **[Night city theme](http://anarcat.ath.cx/night_city/README/)**, contributed by [[anarcat]], see an example [on his homepage](http://anarc.at)
 
- * **[[Bootstrap theme|http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary]]**, contributed by [[JAK LINUX|http://jak-linux.org/about/]], based on [[Twitter Bootstrap|http://twitter.github.com/bootstrap/]]
+ * **[Bootstrap theme](http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary)**, contributed by [JAK LINUX](http://jak-linux.org/about/), based on [Twitter Bootstrap](http://twitter.github.com/bootstrap/)
 
- * **[[Bootstrap 3|https://github.com/ramseydsilva/ikiwiki-bootstrap-theme]]**, contributed by [[ramsey]], based on [[Twitter Bootstrap 3|http://getbootstrap.com]], also modified by [dequis.org](https://github.com/dequis/ikiwiki-bootstrap-theme/tree/dequis.org)
+ * **[Bootstrap 3](https://github.com/ramseydsilva/ikiwiki-bootstrap-theme)**, contributed by [[ramsey]], based on [Twitter Bootstrap 3](http://getbootstrap.com), also modified by [dequis.org](https://github.com/dequis/ikiwiki-bootstrap-theme/tree/dequis.org)
 
- * **[[Bootstrap 2|https://notabug.org/hiatobr/ikiwiki-bootstrap-theme-2]]**, contributed by [Hacklab Independência](https://hi.ato.br), a fork of [[ramsey]]'s [[Bootstrap 3|https://github.com/ramseydsilva/ikiwiki-bootstrap-theme]] original work. You may see examples on [[my user page|/users/desci]]
+ * **[Bootstrap 2](https://notabug.org/hiatobr/ikiwiki-bootstrap-theme-2)**, contributed by [Hacklab Independência](https://hi.ato.br), a fork of [[ramsey]]'s [Bootstrap 3](https://github.com/ramseydsilva/ikiwiki-bootstrap-theme) original work. You may see examples on [[my user page|/users/desci]]
 
  * yet another **[Bootstrap 3](https://github.com/anderbubble/ikiwiki-bootstrap)** theme, contributed by anderbubble
 

respond
diff --git a/doc/todo/compatible_templates.mdwn b/doc/todo/compatible_templates.mdwn
index c2d5ba1..a47f4ba 100644
--- a/doc/todo/compatible_templates.mdwn
+++ b/doc/todo/compatible_templates.mdwn
@@ -15,3 +15,16 @@ As requested per IRC:
     18:42:53 < smcv> sorry, I am not going to remember this when not at work
 
 I think it was anarcat who had the patches
+
+> For the record, I don't quite know what we are talking about here. I
+> was not aware there was such a thing as a "common template
+> standard". Also, all my work on Ikiwiki has been published in this
+> wiki, as far as I know. I have made a [custom theme][], which is
+> linked in the [[theme_market]] and also worked on the
+> [bootstrap theme][]... which is now basicallly irrelevant because
+> someone else ported bootstrap4 to ikiwiki (see
+> [ikistrap][]). -- [[anarcat]]
+
+[ikistrap]: https://github.com/gsliepen/ikistrap
+[bootstrap theme]: https://anarc.at/blog/2015-09-09-bootstrap/
+[custom theme]: http://anarcat.ath.cx/night_city/README/

review
diff --git a/doc/plugins/contrib/remark/discussion.mdwn b/doc/plugins/contrib/remark/discussion.mdwn
index 1c9cdeb..2a4dbe7 100644
--- a/doc/plugins/contrib/remark/discussion.mdwn
+++ b/doc/plugins/contrib/remark/discussion.mdwn
@@ -10,10 +10,32 @@ not elegantly). Clicking through to the slides works right, of course.
 Should [[inline]] (and more generally [[ikiwiki/PageSpec]]) understand
 that web slides are not exactly regular pages? And/or should this plugin
 detect when slides are being inlined and allow ikiwiki to process the
-Markdown as a sort of "preview"?
+Markdown as a sort of "preview"? --[[schmonz]]
+
+> If you want web slides to not be a normal page, that's what internal
+> pages are for. An internal page has an extension (file type) starting
+> with `_`, and has the following properties:
+>
+> * `foo._ext` does not automatically render `foo[/index].html`
+> * `glob(foo)` (for which unadorned globs are syntactic sugar) does not
+>   match it, you have to use `internal(foo)`
+> * [[plugins/editpage]] won't edit it
+>
+> I'd be very tempted to use `foo._remark` and set it up so all such pages
+> are copied to `foo.html` unchanged. You'd probably have to add a new hook
+> that is run instead of most or all of `render()`, and also make those
+> pages exempt from `derender_internal()`?
+>
+> When a remark page is inlined (via `internal()` if it's internal)
+> I think it might be nice to pass it through (the htmlize function of)
+> ikiwiki's normal [[plugins/mdwn]] instead. --[[smcv]]
 
 ## Concern: safety of web-editing <a id="editing"></a>
 
 Even though `remarkpage.tmpl` has no action links, is it still possible
 for someone to trick their way into web-editing a slide deck? And if
-they do, is that dangerous?
+they do, is that dangerous? --[[schmonz]]
+
+> Yes, it's likely both possible and dangerous. If you've already
+> deployed this plugin, make sure it's covered by [[plugins/lockedit]].
+> --[[smcv]]

move discussion points to Discussion
diff --git a/doc/plugins/contrib/remark.mdwn b/doc/plugins/contrib/remark.mdwn
index c13cb4e..20f5b7d 100644
--- a/doc/plugins/contrib/remark.mdwn
+++ b/doc/plugins/contrib/remark.mdwn
@@ -19,13 +19,12 @@ any other page, which -- because the Markdown is deliberately not being
 rendered by ikiwiki -- results in the slide source being displayed (and
 not elegantly). Clicking through to the slides works right, of course.
 
-Should [[inline]] (and more generally [[ikiwiki/PageSpec]]) understand
-that web slides are not exactly regular pages? And/or should this plugin
-detect when slides are being inlined and allow ikiwiki to process the
-Markdown as a sort of "preview"?
+See [[Discussion#inline]].
 
 ## Concern: safety of web-editing
 
 Even though `remarkpage.tmpl` has no action links, is it still possible
 for someone to trick their way into web-editing a slide deck? And if
 they do, is that dangerous?
+
+See [[Discussion#editing]].

copy from main page
diff --git a/doc/plugins/contrib/remark/discussion.mdwn b/doc/plugins/contrib/remark/discussion.mdwn
new file mode 100644
index 0000000..1c9cdeb
--- /dev/null
+++ b/doc/plugins/contrib/remark/discussion.mdwn
@@ -0,0 +1,19 @@
+## Problem: `inline` <a id="inline"></a>
+
+Web slides are sort of a regular web page, but not exactly: no action
+links, and almost none of the other accoutrements of `page.tmpl`. The
+branch's current behavior is that Remark slides are naively inlined like
+any other page, which -- because the Markdown is deliberately not being
+rendered by ikiwiki -- results in the slide source being displayed (and
+not elegantly). Clicking through to the slides works right, of course.
+
+Should [[inline]] (and more generally [[ikiwiki/PageSpec]]) understand
+that web slides are not exactly regular pages? And/or should this plugin
+detect when slides are being inlined and allow ikiwiki to process the
+Markdown as a sort of "preview"?
+
+## Concern: safety of web-editing <a id="editing"></a>
+
+Even though `remarkpage.tmpl` has no action links, is it still possible
+for someone to trick their way into web-editing a slide deck? And if
+they do, is that dangerous?

tag as patch, reviewed
diff --git a/doc/plugins/contrib/listsubscribe.mdwn b/doc/plugins/contrib/listsubscribe.mdwn
index 0b93cde..6467319 100644
--- a/doc/plugins/contrib/listsubscribe.mdwn
+++ b/doc/plugins/contrib/listsubscribe.mdwn
@@ -1,6 +1,6 @@
 [[!template id=plugin name=listsubscribe author="[[schmonz]]"]]
 [[!template id=gitbranch branch=schmonz/listsubscribe author="[[schmonz]]"]]
-[[!tag type/web]]
+[[!tag type/web patch reviewed]]
 
 This plugin provides the `listsubscribe` directive, which inserts a web
 form for your readers to subscribe to a mailing list. The directive

review
diff --git a/doc/plugins/contrib/listsubscribe/discussion.mdwn b/doc/plugins/contrib/listsubscribe/discussion.mdwn
new file mode 100644
index 0000000..2815349
--- /dev/null
+++ b/doc/plugins/contrib/listsubscribe/discussion.mdwn
@@ -0,0 +1,44 @@
+## Code review
+
+### Main things 
+
+[[!format diff """
++<form method="get" action="<TMPL_VAR LISTSUBSCRIBEACTION>" id="listsubscribeform">
+"""]]
+
+This should have `ESCAPE=HTML` (see [[!cpan HTML::Template]]). The other TMPL_VARs probably
+should too.
+
+The method should be `post`, and the CGI should ideally not respond to `GET`s (because sending
+email isn't idempotent).
+
+### Minor things
+
+It would be good to have the documentation specify exactly what "API" it expects from the
+mailing list: in this case it seems to be an address to which you can send a blank message
+with the desired subscription address in the `From:` header. I believe that works for most
+but not all mailing list managers (hopefully the ones where you're meant to mail the posting
+address with "subscribe" in the body have died out by now).
+
+[[!format diff """
++<h4>Join <TMPL_VAR LISTSUBSCRIBELISTNAME></h4>
+"""]]
+
+Might be better to have a separate parameter for the human-readable name?
+
+[[!format diff """
++       my $list_subscribe_form = template('listsubscribeform.tmpl');
+"""]]
+
+I wonder whether this would benefit from an optional `template` parameter, with this as default? 
+
+```
+listsubscribe:
+  'my supercool mailing list': supercool-subscribe@neato.great
+```
+
+This won't be available to [[plugins/websetup]], which doesn't understand hashes/dicts/maps.
+If it was a list of flat strings with a syntactic structure, like the language list for `po`,
+then it would be. Sorry, I can't think of a particularly good syntax...
+
+--[[smcv]]

diff --git a/doc/todo/Let_plugins_influence_what_environment_variables_a_wrapper_will_preserve.mdwn b/doc/todo/Let_plugins_influence_what_environment_variables_a_wrapper_will_preserve.mdwn
index 4f44783..208e5f6 100644
--- a/doc/todo/Let_plugins_influence_what_environment_variables_a_wrapper_will_preserve.mdwn
+++ b/doc/todo/Let_plugins_influence_what_environment_variables_a_wrapper_will_preserve.mdwn
@@ -1,6 +1,7 @@
 [[!template id=gitbranch branch=jcflack/config-envsave
 author="[[Chapman Flack|jcflack]]"
 browse=https://github.com/joeyh/ikiwiki/pull/14]]
+[[!tag reviewed]]
 
 I created this [[!taglink patch]] in advance of writing the [[plugins/contrib/signinview]] plugin. This patch does nothing `signinview`-specific, but simply refactors wrapper generation a bit so that plugins have some influence over what environment variables a wrapper will preserve.
 

compatible_templates.mdwn: Fix typesetting
diff --git a/doc/todo/compatible_templates.mdwn b/doc/todo/compatible_templates.mdwn
index de146c6..c2d5ba1 100644
--- a/doc/todo/compatible_templates.mdwn
+++ b/doc/todo/compatible_templates.mdwn
@@ -1,17 +1,17 @@
 As requested per IRC:
 
-18:07:32  * RichiH notes (again) that if ikiwiki produced html which fit the common template standards, there would be hundreds of high quality templates there for the taking ;)
-18:09:47 < smcv> RichiH: where by "common template standards" you mean "something specific to bootstrap"?
-18:10:05 < smcv> or is there an actual standard with some sort of spec, a la microformats?
-18:32:16 < RichiH> smcv: all the free webdesign sites have one shared format
-18:32:48 < RichiH> iirc, there's a patchset for ikiwiki. again iirc, it was already old by debconf13 when we discussed that
-18:35:16 < smcv> RichiH: please point me to something I can review, I'll try to look at it
-18:35:40 < smcv> RichiH: also please point to something resembling a specification so I can tell whether the patchset is appropriate
-18:36:12 < smcv> RichiH: you certainly didn't discuss anything with me at dc13, I haven't been to a debconf since 7 :-)
-18:38:57 < RichiH> smcv: we discussed it with joeyh 
-18:39:04 < RichiH> i forgot the name of the other guy with the patch series
-18:39:39 < RichiH> http://penta.debconf.org/dc13_schedule/events/1060.en.html should have interesting bits and pieces
-18:42:37 < smcv> please open a todo on ikiwiki.info?
-18:42:53 < smcv> sorry, I am not going to remember this when not at work
+    18:07:32  * RichiH notes (again) that if ikiwiki produced html which fit the common template standards, there would be hundreds of high quality templates there for the taking ;)
+    18:09:47 < smcv> RichiH: where by "common template standards" you mean "something specific to bootstrap"?
+    18:10:05 < smcv> or is there an actual standard with some sort of spec, a la microformats?
+    18:32:16 < RichiH> smcv: all the free webdesign sites have one shared format
+    18:32:48 < RichiH> iirc, there's a patchset for ikiwiki. again iirc, it was already old by debconf13 when we discussed that
+    18:35:16 < smcv> RichiH: please point me to something I can review, I'll try to look at it
+    18:35:40 < smcv> RichiH: also please point to something resembling a specification so I can tell whether the patchset is appropriate
+    18:36:12 < smcv> RichiH: you certainly didn't discuss anything with me at dc13, I haven't been to a debconf since 7 :-)
+    18:38:57 < RichiH> smcv: we discussed it with joeyh 
+    18:39:04 < RichiH> i forgot the name of the other guy with the patch series
+    18:39:39 < RichiH> http://penta.debconf.org/dc13_schedule/events/1060.en.html should have interesting bits and pieces
+    18:42:37 < smcv> please open a todo on ikiwiki.info?
+    18:42:53 < smcv> sorry, I am not going to remember this when not at work
 
 I think it was anarcat who had the patches

Add compatible_templates.mdwn
diff --git a/doc/todo/compatible_templates.mdwn b/doc/todo/compatible_templates.mdwn
new file mode 100644
index 0000000..de146c6
--- /dev/null
+++ b/doc/todo/compatible_templates.mdwn
@@ -0,0 +1,17 @@
+As requested per IRC:
+
+18:07:32  * RichiH notes (again) that if ikiwiki produced html which fit the common template standards, there would be hundreds of high quality templates there for the taking ;)
+18:09:47 < smcv> RichiH: where by "common template standards" you mean "something specific to bootstrap"?
+18:10:05 < smcv> or is there an actual standard with some sort of spec, a la microformats?
+18:32:16 < RichiH> smcv: all the free webdesign sites have one shared format
+18:32:48 < RichiH> iirc, there's a patchset for ikiwiki. again iirc, it was already old by debconf13 when we discussed that
+18:35:16 < smcv> RichiH: please point me to something I can review, I'll try to look at it
+18:35:40 < smcv> RichiH: also please point to something resembling a specification so I can tell whether the patchset is appropriate
+18:36:12 < smcv> RichiH: you certainly didn't discuss anything with me at dc13, I haven't been to a debconf since 7 :-)
+18:38:57 < RichiH> smcv: we discussed it with joeyh 
+18:39:04 < RichiH> i forgot the name of the other guy with the patch series
+18:39:39 < RichiH> http://penta.debconf.org/dc13_schedule/events/1060.en.html should have interesting bits and pieces
+18:42:37 < smcv> please open a todo on ikiwiki.info?
+18:42:53 < smcv> sorry, I am not going to remember this when not at work
+
+I think it was anarcat who had the patches

diff --git a/doc/theme_market.mdwn b/doc/theme_market.mdwn
index 3cd6149..e65b028 100644
--- a/doc/theme_market.mdwn
+++ b/doc/theme_market.mdwn
@@ -6,6 +6,8 @@ It is usually preferable (and more maintainable) to create a [[css]] file instea
 
 Feel free to add your own [[theme|themes]] here, but first consider writing a simpler [[css]] file and adding it to the [[css market]] instead, or look at the [[themes]] shipped with ikiwiki.
 
+ * **[[Ikistrap|https://github.com/gsliepen/ikistrap]]**, contributed by gsliepen, based on Bootstrap 4.
+
  * **[[AntPortal theme|https://github.com/AntPortal/ikiwiked]]**, contributed by Danny, see an example [[on the Antportal wiki|https://antportal.com/wiki/]]
 
  * **[[Night city theme|http://anarcat.ath.cx/night_city/README/]]**, contributed by [[anarcat]], see an example [[on his homepage|http://anarcat.ath.cx/]]

This reverts commit 4712595e6304cc224b2dfdbb1cfe9f2e61bed371
diff --git a/doc/sandbox/discussion.mdwn b/doc/sandbox/discussion.mdwn
index d64ee72..ec651a5 100644
--- a/doc/sandbox/discussion.mdwn
+++ b/doc/sandbox/discussion.mdwn
@@ -5,5 +5,3 @@ Whilst discussing Ikiwiki on IRC, someone pointed out that "This is the SandBox,
 > `nofollow` configuration, so edits to that wiki aren't archived
 > in ikiwiki's git history forever; perhaps with a cron job to
 > reset the sandbox every few days? --[[smcv]]
-
-This is a test~~~~

revert test commit outside sandbox
This reverts commit cc5ad8efcd9378b114a51511b548779b2000e50d
diff --git a/doc/test_link.mdwn b/doc/test_link.mdwn
deleted file mode 100644
index c7c7da3..0000000
--- a/doc/test_link.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-hello there

diff --git a/doc/test_link.mdwn b/doc/test_link.mdwn
new file mode 100644
index 0000000..c7c7da3
--- /dev/null
+++ b/doc/test_link.mdwn
@@ -0,0 +1 @@
+hello there

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b3eb52f..038412d 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,10 @@
 Nope my friend.
 
+<<<<<<< HEAD
 [[test link]]
+=======
+[[Test link]]
+>>>>>>> 59f04c5ad3daf0c01e81d28ec1106e23567a1100
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index fbaf7f9..b3eb52f 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,7 @@
 Nope my friend.
 
+[[test link]]
+
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki

nothing
diff --git a/doc/users/public.mdwn b/doc/users/public.mdwn
new file mode 100644
index 0000000..1cb50e1
--- /dev/null
+++ b/doc/users/public.mdwn
@@ -0,0 +1,5 @@
+[[!img p238572.jpg align="right" size="" alt=""]]
+
+# About me
+
+- I'm Cheung, from China.

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a2e56b3..fbaf7f9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -35,11 +35,13 @@ testing markdown
 
 - bar
 
-###
+### trois
 
 - blah
     - more blah
 
+#### quatre
+
 ## bir
 - bir
 
@@ -50,7 +52,7 @@ testing markdown
 ** cyildiz
 
 - tire
--- ctire
+  - ctire
 
 * *i dene*
 * **b dene**

diff --git a/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn b/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn
index 4eff651..d4dae77 100644
--- a/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn
+++ b/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn
@@ -34,7 +34,7 @@ This is the proposed patch to the second solution. I did not yet test it with th
 
 The part that could probably be removed in toc is the handler call "$p->handler(text => sub {" in line 110. It collects all text in the header as HTML::Parser "dtext", which means entities are decoded in the text. Since that step is probably already done in ikiwiki or doesn't need to be done (otherwise ikiwiki with toc.pm disabled would not work correctly) I'm pretty sure the "dtext" is not necessary. And in that case the patch below would just collect that text in the default handler. Not tested at all, I want to hear a second opinion first. 
 
-**EDIT** After testing the handler call is still necessary, but the "dtext" could be changed to "text". Also I needed to add 3 more lines, the patch below is up to date. It works with all markup and markdown I could think of. The only case not handled optimal is if the header is just a link and nothing else, then there is no text left for the local link, the toc links directly to a different page. Is that acceptable or not?
+**EDIT** Ok, the handler call is still necessary, but the "dtext" could be changed to "text". Also I needed to add 3 more lines, the patch below is up to date. It works with all markup and markdown I could think of. The only case not handled optimal is if the header is just a link and nothing else, then there is no text left for the local link, the toc links directly to a different page. Is that acceptable or not?
 
 (Should I upload this patch as a branch to ikiwiki.info? Not sure about how patch submission works here)
 

diff --git a/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn b/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn
index 487dbb5..4eff651 100644
--- a/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn
+++ b/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn
@@ -21,7 +21,7 @@ Reason for this behaviour is:
 There are a few possible solutions to this depending on how it should work:
 
 1. The easiest thing would be to just add a "last" parameter to the toc plugin format hook (or "first" to the color plugin). Result: No color in tocs at all
-1. Adding four lines to toc.pm (and possibly removing ~4 now superfluous lines) would make it preserve ALL markup in headers, color as well as html markup or markdown (*emphasize* for example). Execution order of the plugins would not matter at all
+1. Adding four (**EDIT** seven) lines to toc.pm (and possibly removing ~4 now superfluous lines **EDIT** No) would make it preserve ALL markup in headers, color as well as html markup or markdown (*emphasize* for example). Execution order of the plugins would not matter at all
 1. A bit more code would be necessary to just specifically preserve the color, but nothing else
 
 I would propose implementing the second option because visual markers in headers are useful to convey additional information very fast and this information should be preserved in the toc. Example: Bug or task/project tracker with color conveying status of the bug or task.
@@ -34,10 +34,12 @@ This is the proposed patch to the second solution. I did not yet test it with th
 
 The part that could probably be removed in toc is the handler call "$p->handler(text => sub {" in line 110. It collects all text in the header as HTML::Parser "dtext", which means entities are decoded in the text. Since that step is probably already done in ikiwiki or doesn't need to be done (otherwise ikiwiki with toc.pm disabled would not work correctly) I'm pretty sure the "dtext" is not necessary. And in that case the patch below would just collect that text in the default handler. Not tested at all, I want to hear a second opinion first. 
 
+**EDIT** After testing the handler call is still necessary, but the "dtext" could be changed to "text". Also I needed to add 3 more lines, the patch below is up to date. It works with all markup and markdown I could think of. The only case not handled optimal is if the header is just a link and nothing else, then there is no text left for the local link, the toc links directly to a different page. Is that acceptable or not?
+
 (Should I upload this patch as a branch to ikiwiki.info? Not sure about how patch submission works here)
 
-     diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
-    index ac07b9a..b75a184 100644
+    diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
+    index ac07b9a..5c2b056 100644
     --- a/IkiWiki/Plugin/toc.pm
     +++ b/IkiWiki/Plugin/toc.pm
     @@ -57,6 +57,7 @@ sub format (@) {
@@ -56,15 +58,17 @@ The part that could probably be removed in toc is the handler call "$p->handler(
 			    $p->handler(text => sub {
 				    $page.=join("", @_);
 				    $index.=join("", @_);
-    @@ -114,6 +116,7 @@ sub format (@) {
-			    $p->handler(end => sub {
-				    my $tagname=shift;
-				    if ($tagname =~ /^h(\d+)$/i) {
-    +				        $headercollect=0;
+    @@ -117,12 +119,17 @@ sub format (@) {
 					    $p->handler(text => undef);
 					    $p->handler(end => undef);
 					    $index.="</a>\n";
-    @@ -123,6 +126,7 @@ sub format (@) {
+    +					$headercollect=0;
+    +				}
+    +				else {
+    +				    $index.=join("",@_);
+				    }
+				    $page.=join("", @_);
+			    }, "tagname, text");
 		    }
 		    else {
 			    $page.=$text;
@@ -73,5 +77,5 @@ The part that could probably be removed in toc is the handler call "$p->handler(
 	    }, "tagname, text");
 	    $p->handler(default => sub { $page.=join("", @_) }, "text");
     -- 
-    1.7.10.4
+    1.8.4.5
 

diff --git a/doc/sandbox/discussion.mdwn b/doc/sandbox/discussion.mdwn
index ec651a5..d64ee72 100644
--- a/doc/sandbox/discussion.mdwn
+++ b/doc/sandbox/discussion.mdwn
@@ -5,3 +5,5 @@ Whilst discussing Ikiwiki on IRC, someone pointed out that "This is the SandBox,
 > `nofollow` configuration, so edits to that wiki aren't archived
 > in ikiwiki's git history forever; perhaps with a cron job to
 > reset the sandbox every few days? --[[smcv]]
+
+This is a test~~~~

Added a comment: You'll need a web server, and don't run ikiwiki as root
diff --git a/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki/comment_1_9feba07c25d226bf63d0886139ed7847._comment b/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki/comment_1_9feba07c25d226bf63d0886139ed7847._comment
new file mode 100644
index 0000000..b1689e1
--- /dev/null
+++ b/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki/comment_1_9feba07c25d226bf63d0886139ed7847._comment
@@ -0,0 +1,51 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="You'll need a web server, and don't run ikiwiki as root"
+ date="2016-03-11T20:39:35Z"
+ content="""
+> sudo ikiwiki --setup /opt/local/etc/ikiwiki/auto.setup
+
+This is probably not the cause of your problem, but please don't do this. ikiwiki
+should always be run as an ordinary user, never as root. If it runs as root, any
+bugs in ikiwiki could have very bad consequences.
+
+(I'm tempted to make it just exit with an error message if run as root, actually.)
+
+> ```
+>     url:         http://kund-Mac-2.local/~root/RelatiicuPublicul
+>     srcdir:      ~/RelatiicuPublicul
+>     destdir:     ~/public_html/RelatiicuPublicul
+>     repository:  ~/RelatiicuPublicul.git
+> ```
+
+ikiwiki does not include a web server (http server), so you cannot edit via a
+browser without providing one.
+
+`auto.setup` tries to guess at some reasonable defaults that will work on a
+reasonable number of Unix machines: it assumes that `~/public_html` is
+mapped to `http://${hostname}/~${username}/` by your web server. This is
+the default configuration on many Linux and *BSD systems; I don't know
+whether that's true on OS X or not.
+
+It also assumes that an executable named `ikiwiki.cgi` in `public_html`
+will be run as a CGI script. Again, this is often true, but not always.
+
+Perhaps we should have some wording like
+
+```
+If you have a web server running, your site might be available at:
+
+     url:         http://kund-Mac-2.local/~root/RelatiicuPublicul
+     srcdir:      ~/RelatiicuPublicul
+     destdir:     ~/public_html/RelatiicuPublicul
+     repository:  ~/RelatiicuPublicul.git
+```
+
+as a hint that ikiwiki has done what it can, and the rest is up to you?
+
+> Unescaped left brace in regex is deprecated
+
+I think we fixed this in the latest version of ikiwiki, so you might not
+be running the current version (that won't affect this particular
+issue, but there are other improvements).
+"""]]

fix formatting
diff --git a/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki.mdwn b/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki.mdwn
index 3312e6d..20462f7 100644
--- a/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki.mdwn
+++ b/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki.mdwn
@@ -5,6 +5,7 @@ Haven't tried editing differently, because I'm a total dummy in programming.
 Help wanted!! :)
 Here is what the terminal shows after installation:
 
+```
 kund-Mac-2:~ kund$ sudo ikiwiki --setup /opt/local/etc/ikiwiki/auto.setup
 Password:
 What will the wiki be named? Relatii cu Publicul
@@ -56,3 +57,4 @@ Successfully set up Relatii cu Publicul:
 	repository:  ~/RelatiicuPublicul.git
 To modify settings, edit ~/RelatiicuPublicul.setup and then run:
 	ikiwiki --setup ~/RelatiicuPublicul.setup
+```

comment
diff --git a/doc/forum/An_error_occurred_while_writing_CGI_reply/comment_1_c7a947be22731dba81c936960089fe11._comment b/doc/forum/An_error_occurred_while_writing_CGI_reply/comment_1_c7a947be22731dba81c936960089fe11._comment
new file mode 100644
index 0000000..e3d3cd1
--- /dev/null
+++ b/doc/forum/An_error_occurred_while_writing_CGI_reply/comment_1_c7a947be22731dba81c936960089fe11._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-11T15:43:14Z"
+ content="""
+Please explain why you edited the front page of this site and tried to add
+some image to it?
+
+We reverted the edit.
+"""]]

diff --git a/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn b/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn
new file mode 100644
index 0000000..487dbb5
--- /dev/null
+++ b/doc/bugs/color_plugin_produces_artifacts_in_table-of-contents.mdwn
@@ -0,0 +1,77 @@
+# Bug Descriptipn 
+
+If color and toc plugins are enabled and you use colored headers, those headers are never colored but sometimes are prefixed with text artifacts like "color: red".
+
+Example: The header 
+
+    # [[!color  foreground=red text="Testing"]]
+
+would sometimes be seen in the toc as
+
+    color: redTesting
+
+Reason for this behaviour is: 
+
+1. the color plugin uses a special syntax to preserve the color through sanitize and that syntax has a plain text component. 
+1. the toc plugin removes everything except plain text from headers in the toc
+1. if the toc plugin is executed before the color plugin in the format hook it sees the special syntax and clobbers the toc, otherwise it just removes the color markup
+
+# Solutions
+
+There are a few possible solutions to this depending on how it should work:
+
+1. The easiest thing would be to just add a "last" parameter to the toc plugin format hook (or "first" to the color plugin). Result: No color in tocs at all
+1. Adding four lines to toc.pm (and possibly removing ~4 now superfluous lines) would make it preserve ALL markup in headers, color as well as html markup or markdown (*emphasize* for example). Execution order of the plugins would not matter at all
+1. A bit more code would be necessary to just specifically preserve the color, but nothing else
+
+I would propose implementing the second option because visual markers in headers are useful to convey additional information very fast and this information should be preserved in the toc. Example: Bug or task/project tracker with color conveying status of the bug or task.
+
+It seems you can stuff anything into ordered lists (according to w3.orgs doku), so apart from stylistic reasons I don't see any problems with markup in the toc. 
+
+# Patch
+
+This is the proposed patch to the second solution. I did not yet test it with the latest version of ikiwiki, but I did check that both plugins are identical in my test versions and the latest. I will update my wikis in use to the latest version and test it further, anyway. 
+
+The part that could probably be removed in toc is the handler call "$p->handler(text => sub {" in line 110. It collects all text in the header as HTML::Parser "dtext", which means entities are decoded in the text. Since that step is probably already done in ikiwiki or doesn't need to be done (otherwise ikiwiki with toc.pm disabled would not work correctly) I'm pretty sure the "dtext" is not necessary. And in that case the patch below would just collect that text in the default handler. Not tested at all, I want to hear a second opinion first. 
+
+(Should I upload this patch as a branch to ikiwiki.info? Not sure about how patch submission works here)
+
+     diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
+    index ac07b9a..b75a184 100644
+    --- a/IkiWiki/Plugin/toc.pm
+    +++ b/IkiWiki/Plugin/toc.pm
+    @@ -57,6 +57,7 @@ sub format (@) {
+	    my $startlevel=($params{startlevel} ? $params{startlevel} : 0);
+	    my $curlevel=$startlevel-1;
+	    my $liststarted=0;
+    +	my $headercollect=0;
+	    my $indent=sub { "\t" x $curlevel };
+	    $p->handler(start => sub {
+		    my $tagname=shift;
+    @@ -107,6 +108,7 @@ sub format (@) {
+			    $index.=&$indent."<li class=\"L$curlevel\">".
+				    "<a href=\"#$anchor\">";
+
+    +			$headercollect=1;
+			    $p->handler(text => sub {
+				    $page.=join("", @_);
+				    $index.=join("", @_);
+    @@ -114,6 +116,7 @@ sub format (@) {
+			    $p->handler(end => sub {
+				    my $tagname=shift;
+				    if ($tagname =~ /^h(\d+)$/i) {
+    +				        $headercollect=0;
+					    $p->handler(text => undef);
+					    $p->handler(end => undef);
+					    $index.="</a>\n";
+    @@ -123,6 +126,7 @@ sub format (@) {
+		    }
+		    else {
+			    $page.=$text;
+    +			$index.=$text if ($headercollect);
+		    }
+	    }, "tagname, text");
+	    $p->handler(default => sub { $page.=join("", @_) }, "text");
+    -- 
+    1.7.10.4
+

thanks
diff --git a/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn b/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
index 950019d..29b7114 100644
--- a/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
+++ b/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
@@ -43,3 +43,5 @@ Other notes:
 >> Ubuntu suite (I'm using the latest release 3.20160121 myself), or applying
 >> [the patch](http://source.ikiwiki.branchable.com/?p=source.git;a=commitdiff;h=77a2267dcfb103b63a675e4a2226076166b29d3f)
 >> manually. --[[smcv]]
+
+>>> Thanks so much for digging into that! There's a new LTS around the corner with a [newer (post 2014) version of ikiwiki](http://packages.ubuntu.com/xenial/ikiwiki) so we can probably afford to wait and/or switch to a self-managed packaged. -- [[David Rix]]

This reverts commit c4d0086bd39e3dd5b8a9b240971c2ed2830304dc
diff --git a/doc/index.mdwn b/doc/index.mdwn
index ea66d45..e0e4016 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -35,6 +35,3 @@ Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
 
 
-
-
-[[!img 201204230837557538.jpg align="right" size="" alt=""]]

diff --git a/doc/forum/An_error_occurred_while_writing_CGI_reply.mdwn b/doc/forum/An_error_occurred_while_writing_CGI_reply.mdwn
new file mode 100644
index 0000000..e79697b
--- /dev/null
+++ b/doc/forum/An_error_occurred_while_writing_CGI_reply.mdwn
@@ -0,0 +1,2 @@
+An error occurred while writing CGI reply
+Is my owner error? chmod or chown ?

diff --git a/doc/index.mdwn b/doc/index.mdwn
index e0e4016..ea66d45 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -35,3 +35,6 @@ Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
 
 
+
+
+[[!img 201204230837557538.jpg align="right" size="" alt=""]]

diff --git a/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki.mdwn b/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki.mdwn
new file mode 100644
index 0000000..3312e6d
--- /dev/null
+++ b/doc/forum/can__39__t_connect_to_local_url_after_installing_ikiwiki.mdwn
@@ -0,0 +1,58 @@
+Hello,
+
+I just installed ikiwiki to my local computer, but still can't edit through the browser.
+Haven't tried editing differently, because I'm a total dummy in programming.
+Help wanted!! :)
+Here is what the terminal shows after installation:
+
+kund-Mac-2:~ kund$ sudo ikiwiki --setup /opt/local/etc/ikiwiki/auto.setup
+Password:
+What will the wiki be named? Relatii cu Publicul
+What revision control system to use? git
+Which user (wiki account, openid, or email) will be admin? Kund Kopacz
+
+
+Setting up Relatii cu Publicul ...
+Importing /Users/kund/RelatiicuPublicul into git
+Initialized empty shared Git repository in /Users/kund/RelatiicuPublicul.git/
+Initialized empty Git repository in /Users/kund/RelatiicuPublicul/.git/
+[master (root-commit) 02fa1fa] initial commit
+ Committer: System Administrator <root@kund-Mac-2.local>
+Your name and email address were configured automatically based
+on your username and hostname. Please check that they are accurate.
+You can suppress this message by setting them explicitly:
+
+    git config --global user.name "Your Name"
+    git config --global user.email you@example.com
+
+After doing this, you may fix the identity used for this commit with:
+
+    git commit --amend --reset-author
+
+ 1 file changed, 1 insertion(+)
+ create mode 100644 .gitignore
+Counting objects: 3, done.
+Writing objects: 100% (3/3), 234 bytes | 0 bytes/s, done.
+Total 3 (delta 0), reused 0 (delta 0)
+To /Users/kund/RelatiicuPublicul.git
+ * [new branch]      master -> master
+Directory /Users/kund/RelatiicuPublicul is now a clone of git repository /Users/kund/RelatiicuPublicul.git
+Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/\\documentclass{ <-- HERE article}/ at /opt/local/lib/perl5/vendor_perl/5.22/IkiWiki/Plugin/teximg.pm line 149.
+Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/\\documentclass{ <-- HERE scrartcl}/ at /opt/local/lib/perl5/vendor_perl/5.22/IkiWiki/Plugin/teximg.pm line 150.
+
+
+Creating wiki admin Kund Kopacz ...
+Choose a password: 
+Confirm password: 
+
+
+ikiwiki-update-wikilist: no changes need to be made
+
+
+Successfully set up Relatii cu Publicul:
+	url:         http://kund-Mac-2.local/~root/RelatiicuPublicul
+	srcdir:      ~/RelatiicuPublicul
+	destdir:     ~/public_html/RelatiicuPublicul
+	repository:  ~/RelatiicuPublicul.git
+To modify settings, edit ~/RelatiicuPublicul.setup and then run:
+	ikiwiki --setup ~/RelatiicuPublicul.setup

Added a comment
diff --git a/doc/forum/Instant_Articles/comment_1_4e8ea5e53feba8eee62e1742f01886cd._comment b/doc/forum/Instant_Articles/comment_1_4e8ea5e53feba8eee62e1742f01886cd._comment
new file mode 100644
index 0000000..5e0cba1
--- /dev/null
+++ b/doc/forum/Instant_Articles/comment_1_4e8ea5e53feba8eee62e1742f01886cd._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="comment 1"
+ date="2016-03-06T12:22:33Z"
+ content="""
+If it's a compatible extension to RSS (adds new elements but doesn't require changing much/anything in the existing feed), I don't see why not. I think you'd just need to adapt `templates/rssitem.tmpl` and `templates/rsspage.tmpl`. Please contribute your changes as a [[git]] branch and/or a [[todo]] item.
+
+If Facebook also supports Atom, I'd prefer to use that instead of RSS - RSS is poorly specified, and the Atom spec fixes a lot of the vagueness.
+"""]]

diff --git a/doc/forum/Instant_Articles.mdwn b/doc/forum/Instant_Articles.mdwn
new file mode 100644
index 0000000..c9970f5
--- /dev/null
+++ b/doc/forum/Instant_Articles.mdwn
@@ -0,0 +1,7 @@
+Dave Winer has an interesting post about RSS and "Facebook Instant Articles" here:
+
+http://scripting.com/liveblog/users/davewiner/2016/03/04/1094.html
+
+One feed works for both Facebook and for regular RSS readers.
+
+I'm thinking about doing this on one of my ikiwiki sites. Any reasons not to do this on a feed?

Revert spam.
This reverts commit 36d280fd4df99ec90787f729f81d53d50988e3aa.
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 1cc9474..e0e4016 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,18 +1,37 @@
-Unlock iCloud iPhone 6S, iPhone 5S, iPhone 5, iPhone 6S+, iPhone plus
-Download from:
-<http://unlock-icloud.com>
-Unlock and remove iCloud from:
-All iOS
-iPhone 4S
-iPhone 5
-iPhone 5S
-iPhone 6
-iPhone 6 plus
-iPhone 6S
-iPhone 6S plus
-All iPad's
-Remove iCloud activation lock, bypass iCloud lock
-Real and working by software, work on all Apple iPhones
-Trusted solution work 100% i recommand it's verified!
-The software is easy to use and the support team from unlock-icloud.com offer good technical support with team viewer and video for unlock icloud and iphone repair solutions. The signal work excelent after i have used this software. The software is clean no viruses or other bad things like other software from internet.
-With this software i managed to repair my iPhone 6 iCloud errors and bypass activation lock. It's a realy gsm repair tool.
+[[!template id=links]]
+
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages and history in a
+[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
+There are many other [[features]], including support for
+[[blogging|blog]] and [[podcasting|podcast]], as well as a large
+array of [[plugins]].
+
+Alternatively, think of ikiwiki as a particularly flexible static
+site generator with some dynamic features.
+
+
+
+## using ikiwiki
+
+[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
+[[man_page|usage]]. There are some [[examples]] of things you can do
+with ikiwiki, and some [[tips]].  Basic documentation for ikiwiki plugins
+and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
+discussions.
+
+All wikis are supposed to have a [[sandbox]], so this one does too.
+
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
+
+## developer resources
+
+The [[RoadMap]] describes where the project is going.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
+can be submitted and tracked using this wiki.
+
+Ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].
+
+

diff --git a/doc/index.mdwn b/doc/index.mdwn
index e0e4016..1cc9474 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,37 +1,18 @@
-[[!template id=links]]
-
-Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
-suitable for publishing on a website. Ikiwiki stores pages and history in a
-[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
-There are many other [[features]], including support for
-[[blogging|blog]] and [[podcasting|podcast]], as well as a large
-array of [[plugins]].
-
-Alternatively, think of ikiwiki as a particularly flexible static
-site generator with some dynamic features.
-
-
-
-## using ikiwiki
-
-[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
-[[man_page|usage]]. There are some [[examples]] of things you can do
-with ikiwiki, and some [[tips]].  Basic documentation for ikiwiki plugins
-and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
-discussions.
-
-All wikis are supposed to have a [[sandbox]], so this one does too.
-
-This site generally runs the latest release of ikiwiki; currently, it runs
-ikiwiki [[!version ]].
-
-## developer resources
-
-The [[RoadMap]] describes where the project is going.
-[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
-can be submitted and tracked using this wiki.
-
-Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].
-
-
+Unlock iCloud iPhone 6S, iPhone 5S, iPhone 5, iPhone 6S+, iPhone plus
+Download from:
+<http://unlock-icloud.com>
+Unlock and remove iCloud from:
+All iOS
+iPhone 4S
+iPhone 5
+iPhone 5S
+iPhone 6
+iPhone 6 plus
+iPhone 6S
+iPhone 6S plus
+All iPad's
+Remove iCloud activation lock, bypass iCloud lock
+Real and working by software, work on all Apple iPhones
+Trusted solution work 100% i recommand it's verified!
+The software is easy to use and the support team from unlock-icloud.com offer good technical support with team viewer and video for unlock icloud and iphone repair solutions. The signal work excelent after i have used this software. The software is clean no viruses or other bad things like other software from internet.
+With this software i managed to repair my iPhone 6 iCloud errors and bypass activation lock. It's a realy gsm repair tool.

diff --git a/doc/forum/lockedit_help.mdwn b/doc/forum/lockedit_help.mdwn
new file mode 100644
index 0000000..60decf0
--- /dev/null
+++ b/doc/forum/lockedit_help.mdwn
@@ -0,0 +1,22 @@
+I'm having some trouble getting the lockedit plugin to work as I'd expect.
+
+We have a small in-house wiki that should be public-viewable, but only editable by a few users.
+I've added these users to the `adminuser` keyword in my `.setup` file:
+
+    adminuser:
+      - user1
+      - user2
+      - user3
+
+`lockedit` is enabled:
+
+    add_plugins:
+      - lockedit
+
+And the `locked_pages` is set to '*':
+
+    locked_pages: '*'
+
+However, I can still edit all pages using any user.  To test I simply created a new user
+by attempting to edit a page while not logged in.  After creating the user I could edit the
+page.

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index d3b3486..a2e56b3 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -7,6 +7,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 vvvv
 CamelCase ?
 
+[[!tag sandbox]]
+
 What about [[this page]], nono better [[that page]]?
 
 hello world (right back at ya)

Delete BlankoBlues and BlankoContraste while they are not available
diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index 376f81b..65e2f5c 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -50,21 +50,9 @@ gnomes will convert them to css files..)
 
 * ** http://blog.lastlog.de/, contributed by joachim schiele; please feel free to copy.
 
-* **[blankoblues.css][1]**, contributed by [[Blanko]]. Can be seen on [Blankoblues Demo][2]. Local.css and templates available [here][3].
-
-* **[contraste.css][4]**, contributed by [[Blanko]]. Can be seen on [Contraste Demo][5]. Local.css and templates available [here][6].
-
 * **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. 
   I typically throw this in as `local.css` in new wikis as a slightly more clear and readable
   layout for wikis that need to be functional and elegant, but not necessarily uniquely designed. 
   Currently in use by the [the outeralliance wiki](http://oa.criticalfutures.com/). 
 * **[ikiwiked gray-green](https://github.com/AntPortal/ikiwiked/raw/master/theme/gray-green/local.css)**, contributed by [Danny Castonguay](https://antportal.com/).
 * **[ikiwiked gray-orange](https://github.com/AntPortal/ikiwiked/raw/master/theme/gray-orange/local.css)**, contributed by [Danny Castonguay](https://antportal.com/). Can be seen in action at [antportal.com/wiki](https://antportal.com/wiki/). Feel free to modify and contribute on [Github](https://github.com/AntPortal/ikiwiked)
-<!-- Page links -->
-
- [1]: http://olivier.dossmann.net/demo/ikiwiki/blankoblues/src/local.css (Download Blankoblues CSS)
- [2]: http://olivier.dossmann.net/demo/ikiwiki/blankoblues/htdocs/ (Take a tour on Blankoblues Demo)
- [3]: http://olivier.dossmann.net/demo/ikiwiki/blankoblues/blankoblues.tar.gz (Download local.css and templates for Blankoblues theme)
- [4]: http://olivier.dossmann.net/demo/ikiwiki/contraste/src/local.css (Download Contraste CSS)
- [5]: http://olivier.dossmann.net/demo/ikiwiki/contraste/htdocs/ (Take a tour on Contraste Demo)
- [6]: http://olivier.dossmann.net/demo/ikiwiki/contraste/contraste.tar.gz (Download local.css and templates for Contraste theme)

Document listsubscribe plugin.
diff --git a/doc/plugins/contrib/listsubscribe.mdwn b/doc/plugins/contrib/listsubscribe.mdwn
new file mode 100644
index 0000000..0b93cde
--- /dev/null
+++ b/doc/plugins/contrib/listsubscribe.mdwn
@@ -0,0 +1,25 @@
+[[!template id=plugin name=listsubscribe author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/listsubscribe author="[[schmonz]]"]]
+[[!tag type/web]]
+
+This plugin provides the `listsubscribe` directive, which inserts a web
+form for your readers to subscribe to a mailing list. The directive
+takes a required `listname` parameter, which must refer to one of the
+lists named in the wiki setup file.
+
+## Example
+
+In `ikiwiki.setup`:
+
+    add_plugins:
+    - listsubscribe
+    
+    listsubscribe:
+      'my supercool mailing list': supercool-subscribe@neato.great
+
+(Where `supercool-subscribe@neato.great` is the subscription address
+provided by your mailing list manager.)
+
+In any wiki page:
+
+    [[!listsubscribe listname="my supercool mailing list"]]

Wrong branch
diff --git a/doc/plugins/contrib/remark.mdwn b/doc/plugins/contrib/remark.mdwn
index f357401..c13cb4e 100644
--- a/doc/plugins/contrib/remark.mdwn
+++ b/doc/plugins/contrib/remark.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=remark author="[[schmonz]]"]]
-[[!template id=gitbranch branch=schmonz/remark author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/remark.js author="[[schmonz]]"]]
 [[!tag type/format]]
 
 [Remark.js](http://remarkjs.com) makes web slides from Markdown. This

Update link to Agile in 3 Minutes.
diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index efa3bb6..ff594fd 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -9,7 +9,7 @@ pages="!*/Discussion and ((link(users/schmonz) and plugins/* and !plugins/openid
 ## Public
 
 * [My personal web site](http://www.schmonz.com/)
-* [A very small podcast](http://agilein3minutes.com/)
+* [A very small podcast](https://agilein3minut.es/)
 * [A major open-source project's wiki](http://wiki.netbsd.org) (with
   the [[rcs/cvs]] plugin)
 * [An undergraduate group's university-provided-static-hosted