Recent changes to this wiki:

Mention a C implementation.
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index b7c8215..f7c6584 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -86,3 +86,12 @@ clime@redhat.com
 ---
 
 I am here to help anyway I can, refactoring code, hosting. Please reach out sadin@fedoraproject.org
+
+---
+
+I published today a server-side implementation in C I started three years ago, available here: <https://github.com/Aversiste/libravatar.cgi>.
+It is a CGI program currently implementing the size, default and forcedefault flags with allowed default values of '404', 'mm' and 'blank'.
+
+This is not finished and not a suitable replacement for the current stack as it uses the file system directly but it is good enough for self-hosting. I use it at https://avatars.bouledef.eu/index
+
+I am available for any discussions related to the shutdown and the migration though - tleguern@bouledef.eu

Linkify pagure repo
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 8335619..b7c8215 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -79,7 +79,7 @@ zach@mailcan.com
 
 ---
 
-I have setup a new repo here: https://pagure.io/libravatar2 to modernize/rewrite libravatar to use the latest available tooling. Please concact me if you would like to help.
+I have setup a new repo here: <https://pagure.io/libravatar2> to modernize/rewrite libravatar to use the latest available tooling. Please concact me if you would like to help.
 
 clime@redhat.com
 

Document Launchpad merge requests with git
diff --git a/submitting_a_patch.mdwn b/submitting_a_patch.mdwn
index 46caf11..5d7f9c9 100644
--- a/submitting_a_patch.mdwn
+++ b/submitting_a_patch.mdwn
@@ -1,8 +1,35 @@
-There are three ways to submit your patch:
+The preferred way to submit a patch is via Launchpad merge requests.
+
+# Launchpad merge requests
+
+Once you have a [Launchpad account](https://launchpad.net/+login), here's how to clone the main repository and then push a personal branch to Launchpad:
+
+    git clone https://git.launchpad.net/~libravatar/libravatar
+    cd libravatar
+    git remote add francois git+ssh://git.launchpad.net/~fmarier/libravatar
+    git checkout -b test
+    (commit some changes)
+    git push -u francois test
+
+(In this example, my username is `fmarier`, my branch name is `test` and the git remote for my personal repo is `francois`.)
+
+Once you have done that, your repository will be shown in the list of [libravatar repositories](https://code.launchpad.net/libravatar) and clicking on it will take you to the [list of branches it contains](https://code.launchpad.net/~fmarier/libravatar/+git/libravatar).
+
+To submit a merge request, click on the [branch name](https://code.launchpad.net/~fmarier/libravatar/+git/libravatar/+ref/test) and then click the ["Propose for merging"](https://code.launchpad.net/~fmarier/libravatar/+git/libravatar/+ref/test/+register-merge) button.
+
+Enter the following information:
+
+- Target repository: `~libravatar/libravatar/+git/libravatar`
+- Target branch: `master`
+
+before clicking "Propose merge". This will take you to your newly-created [merge request](https://code.launchpad.net/~fmarier/libravatar/+git/libravatar/+merge/345611).
+
+# Other ways to submit a patch
+
+If the above doesn't work for you, here are other ways to contribute your patch:
 
 1. Attach it to the relevant bug on the [tracker](https://bugs.launchpad.net/libravatar) (create a [new bug](https://bugs.launchpad.net/libravatar/+filebug) if you need to)
-2. Submit a [merge request](https://git.nzoss.org.nz/libravatar/libravatar/merge_requests) on [Gitlab](https://git.nzoss.org.nz/libravatar/libravatar)
-3. Submit a [pull request](https://help.github.com/articles/using-pull-requests) on [Github](https://github.com/libravatar/libravatar)
+2. Submit a [pull request](https://help.github.com/articles/using-pull-requests) on [Github](https://github.com/libravatar/libravatar)
 
 Of course, if you need any help, [[give us a shout|talk to us]]!
 

Mention social media accounts
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 1fc2894..8335619 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -52,6 +52,8 @@ In addition to the domain names (libravatar.org and libravatar.com), the followi
 - [GitHub project](https://github.com/libravatar) (read-only git mirror of the repos)
 - [BitBucket project](https://bitbucket.org/libravatar/) (read-only mercurial mirror of the repo)
 - [Transifex account](https://www.transifex.com/fmarier/libravatar/) (mostly unused alternative service for translations)
+- [Twitter account](https://twitter.com/libravatar)
+- [Identi.ca account](https://identi.ca/libravatar)
 
 --- 
 

Merge all DO details
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index bb1e04c..1fc2894 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -60,9 +60,13 @@ Contact me at ij@2017.bluespice.org or @ingoj on Twitter.
 
 ---
 
-DO would be a good place to move this service.  A couple of $10 droplets could easily handle the load.  The question is who would you want to own the servers?
+# Digital Ocean
 
-https://blog.digitalocean.com/new-droplet-plans
+[DigitalOcean](https://digitalocean.com) would be a good place to move this service.  A couple of [$10 droplets](https://blog.digitalocean.com/new-droplet-plans) could easily handle the load.  The question is who would you want to own the servers?
+
+The email to reach out for potential DO open source sponsorship is opensource@digitalocean.com
+
+They offered $200 to host two droplets for one year.
 
 ---
 
@@ -79,15 +83,4 @@ clime@redhat.com
 
 ---
 
-The email to reach out for potential DigitalOcean open source sponsorship is opensource@digitalocean.com
-
----
-
-Got a response from DO, they offered $200 to host two droplets for one year.
-
-
-digitalocean.com
-
----
-
 I am here to help anyway I can, refactoring code, hosting. Please reach out sadin@fedoraproject.org

typo and capitalization
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 3699ec3..bb1e04c 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -48,9 +48,9 @@ The cost (currently covered by Rackspace through their OSS program) for the mont
 In addition to the domain names (libravatar.org and libravatar.com), the following accounts could be transferred to the new team:
 
 - [Blog](https://blog.libravatar.org) and [wiki](https://wiki.libravatar.org) (hosted for free by [Branchable](https://branchable.com))
-- [Laucnhpad project](https://launchpad.net/libravatar) (bug tracker, git repo, translations)
-- [Github project](https://github.com/libravatar) (read-only git mirror of the repos)
-- [Bitbucket project](https://bitbucket.org/libravatar/) (read-only mercurial mirror of the repo)
+- [Launchhpad project](https://launchpad.net/libravatar) (bug tracker, git repo, translations)
+- [GitHub project](https://github.com/libravatar) (read-only git mirror of the repos)
+- [BitBucket project](https://bitbucket.org/libravatar/) (read-only mercurial mirror of the repo)
 - [Transifex account](https://www.transifex.com/fmarier/libravatar/) (mostly unused alternative service for translations)
 
 --- 

Mention external accounts that could be transferred and clarify the cost of running the service.
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index a6be86e..3699ec3 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -36,11 +36,23 @@ For the month of March 2018, the traffic looked like this:
   * Total hits: 11,191,373
   * Redirects (to Gravatar): 9,605,127
 
-The cost for the month of March 2018 was $70 USD:
+# Cost
+
+The cost (currently covered by Rackspace through their OSS program) for the month of March 2018 was $70 USD:
 
 - Cloud Bandwidth: $13.50
 - Cloud Servers: $56.84
 
+# External accounts
+
+In addition to the domain names (libravatar.org and libravatar.com), the following accounts could be transferred to the new team:
+
+- [Blog](https://blog.libravatar.org) and [wiki](https://wiki.libravatar.org) (hosted for free by [Branchable](https://branchable.com))
+- [Laucnhpad project](https://launchpad.net/libravatar) (bug tracker, git repo, translations)
+- [Github project](https://github.com/libravatar) (read-only git mirror of the repos)
+- [Bitbucket project](https://bitbucket.org/libravatar/) (read-only mercurial mirror of the repo)
+- [Transifex account](https://www.transifex.com/fmarier/libravatar/) (mostly unused alternative service for translations)
+
 --- 
 
 Basically I'm willing to help to keep this service up & running and would like to contribute a VM or some disk space and bandwidth by running a mirror. No Django experience though, but slightly able to read Python, but no programmer at all. 

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 2d48f38..a6be86e 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -73,6 +73,9 @@ The email to reach out for potential DigitalOcean open source sponsorship is ope
 
 Got a response from DO, they offered $200 to host two droplets for one year.
 
-—
+
+digitalocean.com
+
+---
 
 I am here to help anyway I can, refactoring code, hosting. Please reach out sadin@fedoraproject.org

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 478c974..2d48f38 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -72,3 +72,7 @@ The email to reach out for potential DigitalOcean open source sponsorship is ope
 ---
 
 Got a response from DO, they offered $200 to host two droplets for one year.
+
+—
+
+I am here to help anyway I can, refactoring code, hosting. Please reach out sadin@fedoraproject.org

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 659c7f6..478c974 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -71,4 +71,4 @@ The email to reach out for potential DigitalOcean open source sponsorship is ope
 
 ---
 
-I sent a message to Digital Ocean, will let you know if I receive a response.
+Got a response from DO, they offered $200 to host two droplets for one year.

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 99df8ba..659c7f6 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -68,3 +68,7 @@ clime@redhat.com
 ---
 
 The email to reach out for potential DigitalOcean open source sponsorship is opensource@digitalocean.com
+
+---
+
+I sent a message to Digital Ocean, will let you know if I receive a response.

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 5cee705..99df8ba 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -65,3 +65,6 @@ I have setup a new repo here: https://pagure.io/libravatar2 to modernize/rewrite
 
 clime@redhat.com
 
+---
+
+The email to reach out for potential DigitalOcean open source sponsorship is opensource@digitalocean.com

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index b091e94..5cee705 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -59,3 +59,9 @@ DO also ( I believe ) will contribute resources to open source projects that req
 Has anyone formulated a plan at all to update Libravatar to Python 3 and migrate away from unsupported libraries?
 zach@mailcan.com
 
+---
+
+I have setup a new repo here: https://pagure.io/libravatar2 to modernize/rewrite libravatar to use the latest available tooling. Please concact me if you would like to help.
+
+clime@redhat.com
+

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 4e830c1..b091e94 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -52,4 +52,10 @@ DO would be a good place to move this service.  A couple of $10 droplets could e
 
 https://blog.digitalocean.com/new-droplet-plans
 
+---
+
+DO also ( I believe ) will contribute resources to open source projects that request it.
+
+Has anyone formulated a plan at all to update Libravatar to Python 3 and migrate away from unsupported libraries?
+zach@mailcan.com
 

Link to my notes on the server migration plan
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 1bde325..e447dc2 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -1,6 +1,8 @@
 Here are some notes on how to setup the main `libravatar.org` server after
 you've installed Debian and the usual server packages.
 
+If you are migrating to a new server, you may be interested in the [server migration plan](https://feeding.cloud.geek.nz/posts/server-migration-plan/) that has been used for the last few server migrations.
+
 # Basic setup
 
 * Install Debian and [tweak a few things](https://feeding.cloud.geek.nz/posts/usual-server-setup/)

Bump Debian version to the one that's currently in use
diff --git a/running_your_own.mdwn b/running_your_own.mdwn
index 5cb0fd3..b039a08 100644
--- a/running_your_own.mdwn
+++ b/running_your_own.mdwn
@@ -19,7 +19,7 @@ The following instructions are about the official libravatar.org software.
 
 ## System requirements
 
-You can find the latest system requirements in the [installation instructions](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/INSTALL.md) that come with the software, but Libravatar has been confirmed to work on [Debian 7](http://www.debian.org/releases/wheezy/) (wheezy).
+You can find the latest system requirements in the [installation instructions](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/INSTALL.md) that come with the software, but Libravatar has been confirmed to work on [Debian 8](http://www.debian.org/releases/jessie/) (jessie).
 
 ## Getting the code
 

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index ae16b79..4e830c1 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -46,6 +46,8 @@ The cost for the month of March 2018 was $70 USD:
 Basically I'm willing to help to keep this service up & running and would like to contribute a VM or some disk space and bandwidth by running a mirror. No Django experience though, but slightly able to read Python, but no programmer at all. 
 Contact me at ij@2017.bluespice.org or @ingoj on Twitter. 
 
+---
+
 DO would be a good place to move this service.  A couple of $10 droplets could easily handle the load.  The question is who would you want to own the servers?
 
 https://blog.digitalocean.com/new-droplet-plans

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 89f9c8d..ae16b79 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -45,3 +45,9 @@ The cost for the month of March 2018 was $70 USD:
 
 Basically I'm willing to help to keep this service up & running and would like to contribute a VM or some disk space and bandwidth by running a mirror. No Django experience though, but slightly able to read Python, but no programmer at all. 
 Contact me at ij@2017.bluespice.org or @ingoj on Twitter. 
+
+DO would be a good place to move this service.  A couple of $10 droplets could easily handle the load.  The question is who would you want to own the servers?
+
+https://blog.digitalocean.com/new-droplet-plans
+
+

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 1f88412..89f9c8d 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -40,3 +40,8 @@ The cost for the month of March 2018 was $70 USD:
 
 - Cloud Bandwidth: $13.50
 - Cloud Servers: $56.84
+
+--- 
+
+Basically I'm willing to help to keep this service up & running and would like to contribute a VM or some disk space and bandwidth by running a mirror. No Django experience though, but slightly able to read Python, but no programmer at all. 
+Contact me at ij@2017.bluespice.org or @ingoj on Twitter. 

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index a1ab60d..1f88412 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -8,7 +8,7 @@ Can we get some statistics about the service now? Both in terms of the infrastru
 
 I second this.  I would like to see this service keep going if possible.  How many servers are currently in production and what is the monthly cost to host them?  I have over 15 years experience as a server admin including time in the hosting industry and would love to contribute.  Email is wattersm@watters.ws 
 
-[Proxience](http://proxience.com) and I, [Frédéric Lehobey](https://wiki.debian.org/Fr%C3%A9d%C3%A9ricLehobey), are willing in keeping Libravatar running. Email contact is contact@proxience.com.
+[Proxience](http://proxience.com) and I, [Frédéric Lehobey](https://wiki.debian.org/Fr%C3%A9d%C3%A9ricLehobey), are willing in helping keeping Libravatar running. Email contact is contact@proxience.com.
 
 ---
 

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index c552f0e..a1ab60d 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -8,6 +8,8 @@ Can we get some statistics about the service now? Both in terms of the infrastru
 
 I second this.  I would like to see this service keep going if possible.  How many servers are currently in production and what is the monthly cost to host them?  I have over 15 years experience as a server admin including time in the hosting industry and would love to contribute.  Email is wattersm@watters.ws 
 
+[Proxience](http://proxience.com) and I, [Frédéric Lehobey](https://wiki.debian.org/Fr%C3%A9d%C3%A9ricLehobey), are willing in keeping Libravatar running. Email contact is contact@proxience.com.
+
 ---
 
 # Stats

Add requested stats
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index eefc107..c552f0e 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -7,3 +7,34 @@ Please leave some contact details so that others can reach out to you.
 Can we get some statistics about the service now? Both in terms of the infrastructure (assuming infra support won't continue) and in terms of what is required to keep it going?  Do we know how many avatars are served? stored? etc? (bex@pobox.com)
 
 I second this.  I would like to see this service keep going if possible.  How many servers are currently in production and what is the monthly cost to host them?  I have over 15 years experience as a server admin including time in the hosting industry and would love to contribute.  Email is wattersm@watters.ws 
+
+---
+
+# Stats
+
+As of 2018-04-03, the storage requirements are:
+
+* Application server:
+  * 1 GB General Purpose v1 [Rackspace cloud server](https://www.rackspace.com/cloud/servers)
+  * Number of user accounts: 6655
+  * Number of unique avatars: 6919 (355 MB)
+
+* Static image server:
+  * 1 GB General Purpose v1 [Rackspace cloud server](https://www.rackspace.com/cloud/servers)
+  * Size of avatars on disk: 1.8 GB
+
+For the month of March 2018, the traffic looked like this:
+
+* Application server:
+  * Bandwidth: 328.31 MB
+  * Hits: 43,823
+
+* Static image server:
+  * Bandwidth: 18.99 GB
+  * Total hits: 11,191,373
+  * Redirects (to Gravatar): 9,605,127
+
+The cost for the month of March 2018 was $70 USD:
+
+- Cloud Bandwidth: $13.50
+- Cloud Servers: $56.84

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index b658194..eefc107 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -5,3 +5,5 @@ Please leave some contact details so that others can reach out to you.
 ---
 
 Can we get some statistics about the service now? Both in terms of the infrastructure (assuming infra support won't continue) and in terms of what is required to keep it going?  Do we know how many avatars are served? stored? etc? (bex@pobox.com)
+
+I second this.  I would like to see this service keep going if possible.  How many servers are currently in production and what is the monthly cost to host them?  I have over 15 years experience as a server admin including time in the hosting industry and would love to contribute.  Email is wattersm@watters.ws 

diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index 7055f8c..b658194 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -1,3 +1,7 @@
 Here is a place where people who are interested in [taking over Libravatar](https://blog.libravatar.org/posts/Libravatar.org_is_shutting_down_on_2018-09-01/) can coordinate.
 
 Please leave some contact details so that others can reach out to you.
+
+---
+
+Can we get some statistics about the service now? Both in terms of the infrastructure (assuming infra support won't continue) and in terms of what is required to keep it going?  Do we know how many avatars are served? stored? etc? (bex@pobox.com)

Remove links to the donation services
diff --git a/contribute.mdwn b/contribute.mdwn
index 257145a..f7f3d6a 100644
--- a/contribute.mdwn
+++ b/contribute.mdwn
@@ -15,15 +15,6 @@ Given that Libravatar is a community project without a big corporate sponsor, we
 
 If you can spare a bit of disk space and bandwidth, please [get in touch](mailto:mirrors@libravatar.org), we would love your help in building a world-wide mirror network.
 
-# Donate
-
-You can donate money to help us cover the project hosting-related overheads:
-
-* [Gratipay](https://gratipay.com/libravatar/)
-* [Bountysource](https://salt.bountysource.com/checkout/amount?team=libravatar)
-* [Flattr](https://flattr.com/thing/311293/Libravatar)
-* [Liberapay](https://liberapay.com/Libravatar/)
-
 # Advocacy
 
 If you don't fit into of the other categories, you are still more than welcome to join us:

Link to shutdown announcement
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
index b0c06a6..7055f8c 100644
--- a/shutdown-coordination.mdwn
+++ b/shutdown-coordination.mdwn
@@ -1,3 +1,3 @@
-Here is a place where people who are interested in taking over Libravatar can coordinate.
+Here is a place where people who are interested in [taking over Libravatar](https://blog.libravatar.org/posts/Libravatar.org_is_shutting_down_on_2018-09-01/) can coordinate.
 
 Please leave some contact details so that others can reach out to you.

Create stub page for shutdown coordination
diff --git a/shutdown-coordination.mdwn b/shutdown-coordination.mdwn
new file mode 100644
index 0000000..b0c06a6
--- /dev/null
+++ b/shutdown-coordination.mdwn
@@ -0,0 +1,3 @@
+Here is a place where people who are interested in taking over Libravatar can coordinate.
+
+Please leave some contact details so that others can reach out to you.

diff --git a/recentchanges.mdwn b/recentchanges.mdwn
new file mode 100644
index 0000000..3383fc7
--- /dev/null
+++ b/recentchanges.mdwn
@@ -0,0 +1,7 @@
+[[!if test="enabled(meta)" then="""
+[[!meta title="RecentChanges"]]
+"""]]
+Recent changes to this wiki:
+
+[[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
+template=recentchanges show=0]]

Update the version of the Dotclear plugin to the one that includes federation
diff --git a/libraries.mdwn b/libraries.mdwn
index f8e37e5..d445527 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -125,7 +125,7 @@ or, with global context
 There aren't many plugins available at the moment, but please [[suggest the ones|suggested plugins]] you'd like to have.
 
 * [Claws Mail](http://www.claws-mail.org/plugin.php?plugin=libravatar) (since version 3.10)
-* [Dotclear](https://open-time.net/post/2018/01/22/Plugin-Gravatars-07-pour-Dotclear)
+* [Dotclear](https://open-time.net/post/2018/01/23/Plugin-Gravatars-08-pour-Dotclear)
 * [Foswiki](http://foswiki.org/Extensions/AvatarPlugin)
 * [Friendica](https://github.com/friendica/friendica-addons/tree/master/libravatar)
 * [GNOME-shell-extension-timezone](https://github.com/jwendell/gnome-shell-extension-timezone)

Link to Dotclear plugin
diff --git a/libraries.mdwn b/libraries.mdwn
index 7522d89..f8e37e5 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -125,6 +125,7 @@ or, with global context
 There aren't many plugins available at the moment, but please [[suggest the ones|suggested plugins]] you'd like to have.
 
 * [Claws Mail](http://www.claws-mail.org/plugin.php?plugin=libravatar) (since version 3.10)
+* [Dotclear](https://open-time.net/post/2018/01/22/Plugin-Gravatars-07-pour-Dotclear)
 * [Foswiki](http://foswiki.org/Extensions/AvatarPlugin)
 * [Friendica](https://github.com/friendica/friendica-addons/tree/master/libravatar)
 * [GNOME-shell-extension-timezone](https://github.com/jwendell/gnome-shell-extension-timezone)

Switch www to the webroot plugin to avoid having to stop Apache
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index b3e1291..1bde325 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -215,17 +215,17 @@ you've installed Debian and the usual server packages.
 
 * Enable the new vhost:
 
-      a2ensite default-ssl
+      mkdir /var/www/acme
       a2ensite acme
+      a2ensite default-ssl
       a2ensite stats
 
-* Install `certbot` and then create two separate certs:
+* Install `certbot` and then create a few certs:
 
-      systemctl stop apache2
-      certbot certonly -d www.libravatar.org -d libravatar.org -d selfoss.libravatar.org
+      certbot certonly --webroot -w /var/www/acme -d www.libravatar.org -d libravatar.org -d selfoss.libravatar.org
       certbot certonly --webroot -w /var/www/acme -d stats.libravatar.org
       certbot certonly --webroot -w /var/www/acme -d seccdn.libravatar.org
-      systemctl start apache2
+      systemctl restart apache2
 
 * Symlink the letsencrypt certs in the right place:
 
@@ -244,7 +244,7 @@ you've installed Debian and the usual server packages.
 
       #!/bin/bash
       
-      /usr/bin/certbot renew --quiet --pre-hook "/bin/systemctl stop apache2.service" --post-hook "/bin/systemctl start apache2.service"
+      /usr/bin/certbot renew --quiet --post-hook "/bin/systemctl restart apache2.service"
       
       pushd /etc/ > /dev/null
       /usr/bin/git add letsencrypt

Add the ACME proxy for seccdn and switch stats to the webroot certbot plugin
https://feeding.cloud.geek.nz/posts/proxy-acme-challenges-to-single-machine/
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 3c12591..b3e1291 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -144,14 +144,14 @@ you've installed Debian and the usual server packages.
       a2enmod rewrite
 
 * Setup some Apache vhosts:
-  * `/etc/apache2/sites-enabled/000-default`:
+  * `/etc/apache2/sites-enabled/000-default.conf`:
  
         <VirtualHost *:80>
             RewriteEngine On
             RewriteRule ^ https://www.libravatar.org [redirect=301,last]
         </VirtualHost>
 
-  * `/etc/apache2/sites-enabled/default-ssl`:
+  * `/etc/apache2/sites-enabled/default-ssl.conf`:
 
         <VirtualHost *:443>
             SSLEngine on
@@ -163,7 +163,7 @@ you've installed Debian and the usual server packages.
             RewriteRule ^ https://www.libravatar.org [redirect=301,last]
         </VirtualHost>
 
-  * `/etc/apache2/sites-available/stats`:
+  * `/etc/apache2/sites-available/stats.conf`:
  
         <VirtualHost *:443>
             ServerName stats.libravatar.org
@@ -189,26 +189,50 @@ you've installed Debian and the usual server packages.
                 Options +indexes
             </Location>
         </VirtualHost>
+        
+        <VirtualHost *:80>
+            ServerName stats.libravatar.org
+            ServerAdmin webmaster@libravatar.org
+            DocumentRoot /var/www/acme
+            <Directory /var/www/acme>
+                Options -Indexes
+            </Directory>
+        </VirtualHost>
+
+  * `/etc/apache2/sites-available/acme.conf`:
+ 
+        <VirtualHost *:80>
+            ServerName stats.libravatar.org
+            ServerAdmin webmaster@libravatar.org
+            DocumentRoot /var/www/acme
+            <Directory /var/www/acme>
+                Options -Indexes
+            </Directory>
+        </VirtualHost>
+
 
 * Copy the stats password file (`/etc/apache2/stats.passwd`).
 
 * Enable the new vhost:
 
       a2ensite default-ssl
+      a2ensite acme
       a2ensite stats
 
-* Copy seccdn SSL certs in `/etc/libravatar/` from the old server.
-
 * Install `certbot` and then create two separate certs:
 
       systemctl stop apache2
       certbot certonly -d www.libravatar.org -d libravatar.org -d selfoss.libravatar.org
-      certbot certonly -d stats.libravatar.org
+      certbot certonly --webroot -w /var/www/acme -d stats.libravatar.org
+      certbot certonly --webroot -w /var/www/acme -d seccdn.libravatar.org
       systemctl start apache2
 
 * Symlink the letsencrypt certs in the right place:
 
       cd /etc/libravatar/
+      ln -s ../letsencrypt/seccdn.libravatar.org/privkey.pem seccdn.pem
+      ln -s ../letsencrypt/seccdn.libravatar.org/cert.pem seccdn.crt
+      ln -s ../letsencrypt/seccdn.libravatar.org/chain.pem seccdn-chain.pem
       ln -s ../letsencrypt/stats.libravatar.org/privkey.pem stats.pem
       ln -s ../letsencrypt/stats.libravatar.org/cert.pem stats.crt
       ln -s ../letsencrypt/stats.libravatar.org/chain.pem stats-chain.pem

Fix typo
diff --git a/api.mdwn b/api.mdwn
index ed8ba08..baa9db1 100644
--- a/api.mdwn
+++ b/api.mdwn
@@ -50,7 +50,7 @@ The <tt>d</tt> or <tt>default</tt> parameter defaults to the Libravatar logo, bu
 
 * <tt>**404**</tt>: return a 404 error (file not found) instead of an image
 * <table><tr>
-  <td align="center">![mm](httsp://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=mm)
+  <td align="center">![mm](https://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=mm)
   <br><tt>**mm**</tt></td>
   <td align="center">![identicon](https://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=identicon)
   <br><tt>**identicon**</tt></td>

Move inline images to HTTPS to avoid mixed content warnings
diff --git a/api.mdwn b/api.mdwn
index 5392cff..ed8ba08 100644
--- a/api.mdwn
+++ b/api.mdwn
@@ -24,10 +24,10 @@ Here's an example in Python:
 
 which gives us a hash of <tt>40f8d096a3777232204cb3f796c577b7</tt> and therefore the following image tag:
 
-    <img src="http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7" alt="avatar of george@example.com"/>
+    <img src="https://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7" alt="avatar of george@example.com"/>
 
 It will render as follows:
-![George@example.com](http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7)
+![George@example.com](https://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7)
 
 
 # Options
@@ -50,15 +50,15 @@ The <tt>d</tt> or <tt>default</tt> parameter defaults to the Libravatar logo, bu
 
 * <tt>**404**</tt>: return a 404 error (file not found) instead of an image
 * <table><tr>
-  <td align="center">![mm](http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=mm)
+  <td align="center">![mm](httsp://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=mm)
   <br><tt>**mm**</tt></td>
-  <td align="center">![identicon](http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=identicon)
+  <td align="center">![identicon](https://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=identicon)
   <br><tt>**identicon**</tt></td>
-  <td align="center">![monsterid](http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=monsterid)
+  <td align="center">![monsterid](https://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=monsterid)
   <br><tt>**monsterid**</tt></td>
-  <td align="center">![wavatar](http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=wavatar)
+  <td align="center">![wavatar](https://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=wavatar)
   <br><tt>**wavatar**</tt></td>
-  <td align="center">![retro](http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=retro)
+  <td align="center">![retro](https://seccdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7?s=80&d=retro)
   <br><tt>**retro**</tt></td>
   </tr></table>
 

Fix the file ownership as per https://git.launchpad.net/~libravatar/libravatar/commit/?id=b8062fe2d512aa534f7eeb64d80d4e5857fd12ae
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 5c9044f..3c12591 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -375,5 +375,4 @@ If migrating from one server to another:
 
 * Copy the contents of `/var/lib/libravatar/` from the old server and fix the file permissions:
 
-      find /var/lib/libravatar/avatar/ -type f -exec chown libravatar-img:nogroup {} \;
-      find /var/lib/libravatar/user/ -type f -exec chown libravatar-img:nogroup {} \;
+      chown -R root:root /var/lib/libravatar/avatar/* /var/lib/libravatar/user/*

Remove a step now covered by the libravatar-cdn-common postinst script
diff --git a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
index 66b3cb1..92a6106 100644
--- a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
+++ b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
@@ -29,17 +29,11 @@ Do this on the **slave**:
 
        a2enconf tls
 
-1. reduce apache log retention to 10 days in `/etc/logrotate.d/apache` and enable the `removeip` apache module:
+2. reduce apache log retention to 10 days in `/etc/logrotate.d/apache` and enable the `removeip` apache module:
 
        a2enmod removeip
        systemctl restart apache2
 
-2. create SSL certificate placeholders:
-
-       touch /etc/libravatar/seccdn-chain.pem
-       touch /etc/libravatar/seccdn.pem
-       touch /etc/libravatar/seccdn.crt
-
 3. make sure cron errors go somewhere by adding this to `/etc/aliases`:
 
        libravatar-slave: mirrors@libravatar.org

Note the move to HTTPS for the apt repo
diff --git a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
index 7630326..66b3cb1 100644
--- a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
+++ b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
@@ -4,10 +4,10 @@ This will be of interest only to admins who run a Libravatar master server using
 
 Do this on the **slave**:
 
-1. make sure NTP is installed and running
+1. install the `apt-transport-https` package
 1. add the Libravatar apt repository:
 
-       echo "deb http://apt.libravatar.org/ jessie main" >> /etc/apt/sources.list
+       echo "deb https://apt.libravatar.org/ jessie main" >> /etc/apt/sources.list
        gpg --keyserver pgp.net.nz --recv 007c98d1
        gpg -a --export 007c98d1 | apt-key add -
 

Note the move to HTTPS on the apt repo
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 5064d5b..5c9044f 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -279,9 +279,10 @@ you've installed Debian and the usual server packages.
 # Install application
 
 * Install Libravatar packages
+  * Start by installing the `apt-transport-https` package
   * Add the Libravatar repository to `/etc/apt/sources.list`:
 
-        deb http://apt.libravatar.org/ jessie main
+        deb https://apt.libravatar.org/ jessie main
 
   * Then install server packages:
  

Add alt attribute for the main logo image
diff --git a/index.mdwn b/index.mdwn
index c3fc297..c972747 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,4 +1,4 @@
-<img src="https://seccdn.libravatar.org/nobody/256.png" align="right" width="256" height="256">
+<img src="https://seccdn.libravatar.org/nobody/256.png" align="right" width="256" height="256" alt="Libravatar Logo">
 
 [Libravatar](https://www.libravatar.org) (*"Libre Avatar"*) is a free service
 and an [[open specification|api]] for hosting profile images tied to email or OpenID

libravatar-deployment package is also required on the master server
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 730ef4c..5064d5b 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -286,7 +286,7 @@ you've installed Debian and the usual server packages.
   * Then install server packages:
  
         apt update
-        apt install libravatar{,-common,-cdn,-cdn-common,-www,-master}
+        apt install libravatar{,-common,-cdn,-cdn-common,-deployment,-www,-master}
 
   * Use `6432` for the database port number, otherwise accept all of the defaults
 

Remove spam
This reverts commit dce02b838f0862d4a570702939b7715aa5acbee3
diff --git a/diezelsun.mdwn b/diezelsun.mdwn
deleted file mode 100644
index b60e015..0000000
--- a/diezelsun.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-Diezel Sun  - знаменитый 3d моделлер, разработчик 3d движков.
-
-DiezelSun - 3d modeller,  developer 3d engines.
-References 
-http://en.wiki.unrealsoftware.de/index.php/DiezelSun_3d_graphics - unreal engine
-

Remove spam
This reverts commit 88920e8e48390512e0be49c52b0a1d96260895d8
diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..c3fc297
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,39 @@
+<img src="https://seccdn.libravatar.org/nobody/256.png" align="right" width="256" height="256">
+
+[Libravatar](https://www.libravatar.org) (*"Libre Avatar"*) is a free service
+and an [[open specification|api]] for hosting profile images tied to email or OpenID
+addresses.
+
+In order to have your photo displayed next to your posts and comments on [[sites which support
+Libravatar|sites]] you can either create an account with us or [[run your own node|running your own]]
+of the federated avatar network.
+
+* [[What is Libravatar?|description]]
+* [[Features]]
+
+# Technology
+
+Inspired by the elegant solution pioneered by [Gravatar](http://www.gravatar.com),
+Libravatar takes a federated approach to the problem and allows domain owners to
+specify the server that should host images for their organisation.
+
+* [[API documentation|api]]
+* [[Libraries and plugins|libraries]]
+* [[Server software|running your own]]
+
+# Community
+
+Because it is entirely powerered by [Free and Open Source
+Software](http://www.gnu.org/licenses/agpl.html), you are more than
+welcome to join the project and [[run your own instance|Running your own]].
+
+* [[Ways to contribute|contribute]]
+* [[Getting in touch with us|talk to us]]
+
+# Freedom
+
+We value your privacy and freedom which is why we are committed to delivering our service using a [[freedom-respecting infrastructure]].
+
+----
+
+The contents of this wiki is licensed under your choice of the [GNU Affero GPL version 3](http://gnu.org/licenses/agpl.html) or later, or the [Creative Commons Attribution-ShareAlike 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/) license.
diff --git a/index.txt b/index.txt
deleted file mode 100644
index c3fc297..0000000
--- a/index.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-<img src="https://seccdn.libravatar.org/nobody/256.png" align="right" width="256" height="256">
-
-[Libravatar](https://www.libravatar.org) (*"Libre Avatar"*) is a free service
-and an [[open specification|api]] for hosting profile images tied to email or OpenID
-addresses.
-
-In order to have your photo displayed next to your posts and comments on [[sites which support
-Libravatar|sites]] you can either create an account with us or [[run your own node|running your own]]
-of the federated avatar network.
-
-* [[What is Libravatar?|description]]
-* [[Features]]
-
-# Technology
-
-Inspired by the elegant solution pioneered by [Gravatar](http://www.gravatar.com),
-Libravatar takes a federated approach to the problem and allows domain owners to
-specify the server that should host images for their organisation.
-
-* [[API documentation|api]]
-* [[Libraries and plugins|libraries]]
-* [[Server software|running your own]]
-
-# Community
-
-Because it is entirely powerered by [Free and Open Source
-Software](http://www.gnu.org/licenses/agpl.html), you are more than
-welcome to join the project and [[run your own instance|Running your own]].
-
-* [[Ways to contribute|contribute]]
-* [[Getting in touch with us|talk to us]]
-
-# Freedom
-
-We value your privacy and freedom which is why we are committed to delivering our service using a [[freedom-respecting infrastructure]].
-
-----
-
-The contents of this wiki is licensed under your choice of the [GNU Affero GPL version 3](http://gnu.org/licenses/agpl.html) or later, or the [Creative Commons Attribution-ShareAlike 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/) license.

rename index.mdwn to index.txt
diff --git a/index.mdwn b/index.mdwn
deleted file mode 100644
index c3fc297..0000000
--- a/index.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-<img src="https://seccdn.libravatar.org/nobody/256.png" align="right" width="256" height="256">
-
-[Libravatar](https://www.libravatar.org) (*"Libre Avatar"*) is a free service
-and an [[open specification|api]] for hosting profile images tied to email or OpenID
-addresses.
-
-In order to have your photo displayed next to your posts and comments on [[sites which support
-Libravatar|sites]] you can either create an account with us or [[run your own node|running your own]]
-of the federated avatar network.
-
-* [[What is Libravatar?|description]]
-* [[Features]]
-
-# Technology
-
-Inspired by the elegant solution pioneered by [Gravatar](http://www.gravatar.com),
-Libravatar takes a federated approach to the problem and allows domain owners to
-specify the server that should host images for their organisation.
-
-* [[API documentation|api]]
-* [[Libraries and plugins|libraries]]
-* [[Server software|running your own]]
-
-# Community
-
-Because it is entirely powerered by [Free and Open Source
-Software](http://www.gnu.org/licenses/agpl.html), you are more than
-welcome to join the project and [[run your own instance|Running your own]].
-
-* [[Ways to contribute|contribute]]
-* [[Getting in touch with us|talk to us]]
-
-# Freedom
-
-We value your privacy and freedom which is why we are committed to delivering our service using a [[freedom-respecting infrastructure]].
-
-----
-
-The contents of this wiki is licensed under your choice of the [GNU Affero GPL version 3](http://gnu.org/licenses/agpl.html) or later, or the [Creative Commons Attribution-ShareAlike 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/) license.
diff --git a/index.txt b/index.txt
new file mode 100644
index 0000000..c3fc297
--- /dev/null
+++ b/index.txt
@@ -0,0 +1,39 @@
+<img src="https://seccdn.libravatar.org/nobody/256.png" align="right" width="256" height="256">
+
+[Libravatar](https://www.libravatar.org) (*"Libre Avatar"*) is a free service
+and an [[open specification|api]] for hosting profile images tied to email or OpenID
+addresses.
+
+In order to have your photo displayed next to your posts and comments on [[sites which support
+Libravatar|sites]] you can either create an account with us or [[run your own node|running your own]]
+of the federated avatar network.
+
+* [[What is Libravatar?|description]]
+* [[Features]]
+
+# Technology
+
+Inspired by the elegant solution pioneered by [Gravatar](http://www.gravatar.com),
+Libravatar takes a federated approach to the problem and allows domain owners to
+specify the server that should host images for their organisation.
+
+* [[API documentation|api]]
+* [[Libraries and plugins|libraries]]
+* [[Server software|running your own]]
+
+# Community
+
+Because it is entirely powerered by [Free and Open Source
+Software](http://www.gnu.org/licenses/agpl.html), you are more than
+welcome to join the project and [[run your own instance|Running your own]].
+
+* [[Ways to contribute|contribute]]
+* [[Getting in touch with us|talk to us]]
+
+# Freedom
+
+We value your privacy and freedom which is why we are committed to delivering our service using a [[freedom-respecting infrastructure]].
+
+----
+
+The contents of this wiki is licensed under your choice of the [GNU Affero GPL version 3](http://gnu.org/licenses/agpl.html) or later, or the [Creative Commons Attribution-ShareAlike 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/) license.

Use HTTPS in blog link
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 9fa4c2b..730ef4c 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -3,7 +3,7 @@ you've installed Debian and the usual server packages.
 
 # Basic setup
 
-* Install Debian and [tweak a few things](http://feeding.cloud.geek.nz/posts/usual-server-setup/)
+* Install Debian and [tweak a few things](https://feeding.cloud.geek.nz/posts/usual-server-setup/)
 * Install rssh and uncomment `allowrsync` in `/etc/rssh.conf`
 * Setup appropriate mail aliases
   * Add these to `/etc/aliases`

Replace startssl instructions with letsencrypt
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 45c0bdb..9fa4c2b 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -123,19 +123,6 @@ you've installed Debian and the usual server packages.
 
         systemctl restart pgbouncer
 
-# TLS certificate
-
-* Generate a new certificate:
-
-      openssl genrsa -out www.pem 2048
-
-* Create a certificate signing request:
-
-      openssl req -new -key www.pem -subj "/CN=www.libravatar.org" -out www.csr
-
-* Login into <https://startssl.com> to submit the CSR and download the signed certificate as `www.crt`.
-* Copy `www.pem` and `www.crt` into `/etc/libravatar/`.
-
 # Web server
 
 * Create a global TLS configuration in `/etc/apache2/conf-available/tls.conf`:
@@ -210,7 +197,40 @@ you've installed Debian and the usual server packages.
       a2ensite default-ssl
       a2ensite stats
 
-* Copy all SSL certs in `/etc/libravatar/` from the old server
+* Copy seccdn SSL certs in `/etc/libravatar/` from the old server.
+
+* Install `certbot` and then create two separate certs:
+
+      systemctl stop apache2
+      certbot certonly -d www.libravatar.org -d libravatar.org -d selfoss.libravatar.org
+      certbot certonly -d stats.libravatar.org
+      systemctl start apache2
+
+* Symlink the letsencrypt certs in the right place:
+
+      cd /etc/libravatar/
+      ln -s ../letsencrypt/stats.libravatar.org/privkey.pem stats.pem
+      ln -s ../letsencrypt/stats.libravatar.org/cert.pem stats.crt
+      ln -s ../letsencrypt/stats.libravatar.org/chain.pem stats-chain.pem
+      ln -s ../letsencrypt/www.libravatar.org/privkey.pem www.pem
+      ln -s ../letsencrypt/www.libravatar.org/cert.pem www.crt
+      ln -s ../letsencrypt/www.libravatar.org/chain.pem www-chain.pem
+
+* Install a cronjob to [automatically renew these certs](https://feeding.cloud.geek.nz/posts/automatically-renewing-letsencrypt-certs-on-debian-using-certbot/) in `/etc/cron.daily/certbot-renew-libravatar`:
+
+      #!/bin/bash
+      
+      /usr/bin/certbot renew --quiet --pre-hook "/bin/systemctl stop apache2.service" --post-hook "/bin/systemctl start apache2.service"
+      
+      pushd /etc/ > /dev/null
+      /usr/bin/git add letsencrypt
+      DIFFSTAT="$(/usr/bin/git diff --cached --stat)"
+      if [ -n "$DIFFSTAT" ] ; then
+          /usr/bin/git commit --quiet -m "Renewed letsencrypt certs"
+          echo "$DIFFSTAT"
+      fi
+      popd > /dev/null
+
 
 * Install `awstats` and add this to `/etc/awstats/awstats.conf.local`:
 

Put acronym expansion in quotes
diff --git a/index.mdwn b/index.mdwn
index 4e44191..c3fc297 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,6 @@
 <img src="https://seccdn.libravatar.org/nobody/256.png" align="right" width="256" height="256">
 
-[Libravatar](https://www.libravatar.org) (*Libre Avatar*) is a free service
+[Libravatar](https://www.libravatar.org) (*"Libre Avatar"*) is a free service
 and an [[open specification|api]] for hosting profile images tied to email or OpenID
 addresses.
 

add global TLS conf for the mirrors
diff --git a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
index 576958e..7630326 100644
--- a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
+++ b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
@@ -16,6 +16,18 @@ Do this on the **slave**:
        apt update
        apt install libravatar-{common,cdn-common,cdn,seccdn,slave}
 
+1. put the following global TLS config in `/etc/apache2/conf-available/tls.conf`:
+
+       SSLHonorCipherOrder On
+       SSLCompression Off
+       SSLUseStapling on
+       SSLStaplingResponderTimeout 5
+       SSLStaplingReturnResponderErrors off
+       SSLStaplingCache shmcb:/var/run/ocsp(128000)
+
+1. enable the newly-added TLS config:
+
+       a2enconf tls
 
 1. reduce apache log retention to 10 days in `/etc/logrotate.d/apache` and enable the `removeip` apache module:
 

add DNT and jessie-related changes
diff --git a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
index 6eaa07f..576958e 100644
--- a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
+++ b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
@@ -13,8 +13,14 @@ Do this on the **slave**:
 
 1. install the required packages on the slave:
 
-       apt-get update
-       apt-get install libravatar-{common,cdn-common,cdn,seccdn,slave}
+       apt update
+       apt install libravatar-{common,cdn-common,cdn,seccdn,slave}
+
+
+1. reduce apache log retention to 10 days in `/etc/logrotate.d/apache` and enable the `removeip` apache module:
+
+       a2enmod removeip
+       systemctl restart apache2
 
 2. create SSL certificate placeholders:
 
@@ -43,6 +49,10 @@ Do this on the **master**:
 
        from="1.2.3.4",no-X11-forwarding,no-user-rc,no-pty,no-agent-forwarding,no-port-forwarding ssh-rsa AAAAB3Nza...quq5x root@cdn3
 
+2. ensure that the `sshuser` user can connect via ssh:
+
+       adduser libravatar-master sshuser
+
 Within about 15 minutes, you should see these files pop up on the slave:
 
 * <tt>/var/lib/libravatar/slave/cert/chain.pem</tt>

Make a note about localhost and gearman
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index b548470..45c0bdb 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -16,6 +16,7 @@ you've installed Debian and the usual server packages.
   * Run `newaliases` to update `/etc/aliases.db`
   * Test the aliases by running `mail root`
 
+* Ensure that the only entry for `localhost` in `/etc/hosts` is for `127.0.0.1` (if you leave the one for `::1`, [it will confuse gearman](https://feeding.cloud.geek.nz/posts/debugging-gearman-configuration/#comment-5980a879ebda9f23f70eee0ea7236bd2))
 * Copy the local logcheck rules from the old server and add the following to `/etc/logcheck/logcheck.logfiles`:
 
       /var/log/libravatar/error-cdn.log

More explicit installation instructions for pgbouncer
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 7bd9fe0..b548470 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -97,7 +97,14 @@ you've installed Debian and the usual server packages.
         createuser -s root
         createuser -S -R -D djangouser
 
-* Install pgbouncer and turn it on in `/etc/default/pgbouncer`
+* Install pgbouncer
+
+      apt install pgbouncer
+
+  * Turn it on in `/etc/default/pgbouncer`
+
+        START=1
+
   * Put the following in `/etc/pgbouncer/pgbouncer.ini`:
 
         [databases]
@@ -106,10 +113,14 @@ you've installed Debian and the usual server packages.
         [pgbouncer]
         admin_users = postgres
 
-* Put the following in `/etc/pgbouncer/userlist.txt`:
+  * Put the following in `/etc/pgbouncer/userlist.txt`:
+
+        "djangouser" ""
+        "postgres" ""
+
+  * Restart the daemon:
 
-      "djangouser" ""
-      "postgres" ""
+        systemctl restart pgbouncer
 
 # TLS certificate
 

Note that the password file needs to be copied
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 3b64a75..7bd9fe0 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -191,6 +191,8 @@ you've installed Debian and the usual server packages.
             </Location>
         </VirtualHost>
 
+* Copy the stats password file (`/etc/apache2/stats.passwd`).
+
 * Enable the new vhost:
 
       a2ensite default-ssl

Add missing index rule to stats config
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 3a2abd0..3b64a75 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -187,6 +187,7 @@ you've installed Debian and the usual server packages.
                 Require valid-user
                 Order allow,deny
                 allow from all
+                Options +indexes
             </Location>
         </VirtualHost>
 

Remove unnecesssary comment
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 9a4ee74..3a2abd0 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -133,7 +133,6 @@ you've installed Debian and the usual server packages.
       SSLHonorCipherOrder     on
       SSLCompression          off
       
-      # OCSP Stapling, only in httpd 2.3.3 and later
       SSLUseStapling          on
       SSLStaplingResponderTimeout 5
       SSLStaplingReturnResponderErrors off

Move the TLS config to a global config file
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index f62ee3f..9a4ee74 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -126,8 +126,22 @@ you've installed Debian and the usual server packages.
 
 # Web server
 
-* Install the required Apache modules:
+* Create a global TLS configuration in `/etc/apache2/conf-available/tls.conf`:
 
+      SSLProtocol             all -SSLv3 -TLSv1 -TLSv1.1
+      SSLCipherSuite          ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
+      SSLHonorCipherOrder     on
+      SSLCompression          off
+      
+      # OCSP Stapling, only in httpd 2.3.3 and later
+      SSLUseStapling          on
+      SSLStaplingResponderTimeout 5
+      SSLStaplingReturnResponderErrors off
+      SSLStaplingCache        shmcb:/var/run/ocsp(128000)
+
+* Enable TLS and mod_rewrite:
+
+      a2enconf tls
       a2enmod ssl
       a2enmod rewrite
 
@@ -143,11 +157,6 @@ you've installed Debian and the usual server packages.
 
         <VirtualHost *:443>
             SSLEngine on
-            SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
-            SSLHonorCipherOrder On
-            SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
-            SSLCompression Off
-        
             SSLCertificateFile /etc/libravatar/www.crt
             SSLCertificateKeyFile /etc/libravatar/www.pem
             SSLCertificateChainFile /etc/libravatar/www-chain.pem
@@ -166,11 +175,6 @@ you've installed Debian and the usual server packages.
             Alias /favicon.ico /usr/share/libravatar/libravatar/favicon.ico
         
             SSLEngine on
-            SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
-            SSLHonorCipherOrder On
-            SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
-            SSLCompression Off
-            
             SSLCertificateFile /etc/libravatar/stats.crt
             SSLCertificateKeyFile /etc/libravatar/stats.pem
             SSLCertificateChainFile /etc/libravatar/stats-chain.pem
@@ -189,6 +193,7 @@ you've installed Debian and the usual server packages.
 
 * Enable the new vhost:
 
+      a2ensite default-ssl
       a2ensite stats
 
 * Copy all SSL certs in `/etc/libravatar/` from the old server

Move the stats.libravatar.org certs to the /etc/libravatar/ directory
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index d258f7c..f62ee3f 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -170,11 +170,11 @@ you've installed Debian and the usual server packages.
             SSLHonorCipherOrder On
             SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
             SSLCompression Off
-          
-            SSLCertificateFile /etc/apache2/ssl/stats.libravatar.org.crt
-            SSLCertificateKeyFile /etc/apache2/ssl/stats.libravatar.org.pem
-            SSLCertificateChainFile /etc/apache2/ssl/cacert-chain.pem
-          
+            
+            SSLCertificateFile /etc/libravatar/stats.crt
+            SSLCertificateKeyFile /etc/libravatar/stats.pem
+            SSLCertificateChainFile /etc/libravatar/stats-chain.pem
+            
             Header add Strict-Transport-Security: "max-age=15768000"
           
             <Location />

Update the canonical git repo and add mercurial installation instructions
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 9b54fcd..d258f7c 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -257,6 +257,15 @@ you've installed Debian and the usual server packages.
 
 # Git mirrors
 
+* Install `hg`:
+
+      apt install mercurial
+
+* Enable the `convert` mercurial extension by putting this in `/etc/mercurial/hgrc`:
+
+      [extensions]
+      convert =
+
 * Add this script in `/usr/local/bin/git-mirror`:
 
       #!/bin/bash
@@ -297,7 +306,7 @@ you've installed Debian and the usual server packages.
 * Prepare directory for git repository:
 
       cd /home/francois/git-mirrors/
-      git clone https://git.nzoss.org.nz/libravatar/libravatar.git git
+      git clone https://git.launchpad.net/~libravatar/libravatar git
       cd git
       git remote add github git@github.com:libravatar/libravatar.git
 

Point to the jessie repo
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index fc3d198..9b54fcd 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -242,7 +242,7 @@ you've installed Debian and the usual server packages.
 * Install Libravatar packages
   * Add the Libravatar repository to `/etc/apt/sources.list`:
 
-        deb http://apt.libravatar.org/ wheezy main
+        deb http://apt.libravatar.org/ jessie main
 
   * Then install server packages:
  

Switch from apt-get to apt
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 975fb1b..fc3d198 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -246,8 +246,8 @@ you've installed Debian and the usual server packages.
 
   * Then install server packages:
  
-        apt-get update
-        apt-get install libravatar{,-common,-cdn,-cdn-common,-www,-master}
+        apt update
+        apt install libravatar{,-common,-cdn,-cdn-common,-www,-master}
 
   * Use `6432` for the database port number, otherwise accept all of the defaults
 

Update gearman installation instructions for jessie
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index d05b2a7..975fb1b 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -251,8 +251,9 @@ you've installed Debian and the usual server packages.
 
   * Use `6432` for the database port number, otherwise accept all of the defaults
 
-* Install `gearman-job-server` and set it to listen on `localhost` instead of `127.0.0.1` in
-   `/etc/default/gearman-job-server` (to work-around [this bug](http://feeding.cloud.geek.nz/posts/debugging-gearman-configuration/#Gearman_bug))
+* Install `gearman-job-server`:
+
+      apt install --no-install-recommends gearman-job-server
 
 # Git mirrors
 

Expand backup instructions and encrypt database backups
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 2f09fda..d05b2a7 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -212,19 +212,30 @@ you've installed Debian and the usual server packages.
       pg_dump -Fc libravatar > $DUMP_FILE
       chmod 600 $DUMP_FILE
       
+      # Encrypt backup
+      gpg --recipient 007c98d1 --encrypt $DUMP_FILE
+      rm $DUMP_FILE
+      
       # Purge old backups
       find $DUMP_DIR -ctime +7 -delete
 
 * Create an empty `/var/backups/libravatar` directory
-* Add my duplicity backup script to `/home/francois/.backup/`
+* Install duplicity (`apt install duplicity`)
+* Add my duplicity backup script to `/home/francois/.backup/` and update:
+  * GPG passhrase
+  * Destination directory (which includes the hostname)
 * Create this cronjob in `/etc/cron.d/libravatar_backups`:
 
       # Local DB backups
       4 1,13 * * *       root    ionice -c3 nice -n10 /usr/local/sbin/libravatar_backups
       
       # Full backups to Amazon S3
-      6 14 * * *      root    /home/francois/.backup/backup-husavik
-      6 23 * * 3      root    /home/francois/.backup/backup-husavik --full
+      6 14 * * *      root    /home/francois/.backup/backup-selfoss
+      6 23 * * 3      root    /home/francois/.backup/backup-selfoss --full
+
+* Run an initial backup:
+
+      sudo /home/francois/.backup/backup-selfoss
 
 # Install application
 

Modernize Apache config
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 298bdf5..2f09fda 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -126,6 +126,11 @@ you've installed Debian and the usual server packages.
 
 # Web server
 
+* Install the required Apache modules:
+
+      a2enmod ssl
+      a2enmod rewrite
+
 * Setup some Apache vhosts:
   * `/etc/apache2/sites-enabled/000-default`:
  
@@ -138,9 +143,10 @@ you've installed Debian and the usual server packages.
 
         <VirtualHost *:443>
             SSLEngine on
-            SSLProtocol TLSv1
+            SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
             SSLHonorCipherOrder On
-            SSLCipherSuite RC4-SHA:HIGH:!kEDH
+            SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
+            SSLCompression Off
         
             SSLCertificateFile /etc/libravatar/www.crt
             SSLCertificateKeyFile /etc/libravatar/www.pem
@@ -150,9 +156,9 @@ you've installed Debian and the usual server packages.
             RewriteRule ^ https://www.libravatar.org [redirect=301,last]
         </VirtualHost>
 
-  * `/etc/apache2/sites-enables/stats`:
+  * `/etc/apache2/sites-available/stats`:
  
-         <VirtualHost *:443>
+        <VirtualHost *:443>
             ServerName stats.libravatar.org
             ServerAdmin webmaster@libravatar.org
             DocumentRoot /var/cache/awstats
@@ -160,9 +166,10 @@ you've installed Debian and the usual server packages.
             Alias /favicon.ico /usr/share/libravatar/libravatar/favicon.ico
         
             SSLEngine on
-            SSLProtocol TLSv1
+            SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
             SSLHonorCipherOrder On
-            SSLCipherSuite RC4-SHA:HIGH:!kEDH
+            SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
+            SSLCompression Off
           
             SSLCertificateFile /etc/apache2/ssl/stats.libravatar.org.crt
             SSLCertificateKeyFile /etc/apache2/ssl/stats.libravatar.org.pem
@@ -180,16 +187,11 @@ you've installed Debian and the usual server packages.
             </Location>
         </VirtualHost>
 
+* Enable the new vhost:
+
+      a2ensite stats
+
 * Copy all SSL certs in `/etc/libravatar/` from the old server
-* Set the following in `/etc/apache2/conf.d/security`:
- 
-      <Directory />
-          AllowOverride None
-          Order Deny,Allow
-          Deny from all
-      </Directory>
-      ServerTokens Prod
-      ServerSignature Off
 
 * Install `awstats` and add this to `/etc/awstats/awstats.conf.local`:
 

Sync postgres config with prod settings
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index e2dcdcc..298bdf5 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -88,8 +88,8 @@ you've installed Debian and the usual server packages.
   * In `/etc/postgresql/*/main/pg_hba.conf`, change all local connections to `trust`
   * In `/etc/postgresql/*/main/postgresql.conf`, set these:
 
-        log_min_duration_statement =  400
-        ssl = false
+        log_min_duration_statement =  1000
+        ssl = off
 
   * Create postgres users:
 

Use the new name for iptables files
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 2eb204c..e2dcdcc 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -26,7 +26,7 @@ you've installed Debian and the usual server packages.
 
 # Firewall
 
-* In `/etc/network/iptables`, put the following:
+* In `/etc/network/iptables.up.rules`, put the following:
 
       # Set default policies
       *filter
@@ -46,7 +46,7 @@ you've installed Debian and the usual server packages.
       COMMIT
 
 * Enable the rules using `iptables-apply`
-* In `/etc/network/ip6tables`, put the following:
+* In `/etc/network/ip6tables.up.rules`, put the following:
 
       # Set default policies
       *filter
@@ -75,12 +75,12 @@ you've installed Debian and the usual server packages.
           address x.x.x.x
           netmask 255.255.255.0
           gateway x.x.x.x
-          pre-up iptables-restore /etc/network/iptables
+          pre-up iptables-restore /etc/network/iptables.up.rules
       iface eth0 inet6 static
           address x::x
           netmask 64
           gateway x::x
-          pre-up ip6tables-restore /etc/network/ip6tables
+          pre-up ip6tables-restore /etc/network/ip6tables.up.rules
 
 # Database
 

How to fix file permissions in /var/lib/libravatar
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index a6f6643..2eb204c 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -310,4 +310,7 @@ If migrating from one server to another:
 
         pg_restore -d libravatar < libravatar.pg
 
-* Copy the contents of `/var/lib/libravatar/` from the old server
+* Copy the contents of `/var/lib/libravatar/` from the old server and fix the file permissions:
+
+      find /var/lib/libravatar/avatar/ -type f -exec chown libravatar-img:nogroup {} \;
+      find /var/lib/libravatar/user/ -type f -exec chown libravatar-img:nogroup {} \;

diff --git a/diezelsun.mdwn b/diezelsun.mdwn
new file mode 100644
index 0000000..b60e015
--- /dev/null
+++ b/diezelsun.mdwn
@@ -0,0 +1,6 @@
+Diezel Sun  - знаменитый 3d моделлер, разработчик 3d движков.
+
+DiezelSun - 3d modeller,  developer 3d engines.
+References 
+http://en.wiki.unrealsoftware.de/index.php/DiezelSun_3d_graphics - unreal engine
+

Fix Transifex link
diff --git a/translator.mdwn b/translator.mdwn
index ca5d269..43a6f81 100644
--- a/translator.mdwn
+++ b/translator.mdwn
@@ -6,7 +6,7 @@ There is [documentation](https://help.launchpad.net/Translations/StartingToTrans
 
 ## Transifex
 
-If you already use Transifex to translate other projects, you can also find a [Libravatar project](https://www.transifex.net/projects/p/libravatar/) on there and submit your translations that way. We do however prefer that new translators use the Launchpad system.
+If you already use **Transifex** to translate other projects, you can also find a [Libravatar project](https://www.transifex.com/fmarier/libravatar/) on there and submit your translations that way. We do however prefer that new translators use the Launchpad system.
 
 # English speakers
 

link to the Gitlab issue
diff --git a/suggested_plugins.mdwn b/suggested_plugins.mdwn
index 2edade9..9f18fde 100644
--- a/suggested_plugins.mdwn
+++ b/suggested_plugins.mdwn
@@ -15,6 +15,7 @@ The following [[plugins|libraries]] have been suggested:
 * [Redmine](http://www.redmine.org) - [Feature #9112](http://www.redmine.org/issues/9112)
 * Pidgin
 * BuddyCloud
+* [Gitlab](https://gitlab.com/gitlab-org/gitlab-ce/issues/19511)
 
 If you'd like to **vote** for one of these, add a "+" sign at the end of the line.
 

Added golang global object example
diff --git a/libraries.mdwn b/libraries.mdwn
index c73bd48..7522d89 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -113,7 +113,11 @@ The [go-libravatar](https://strk.kbt.io/projects/go/libravatar) module can be us
     import "strk.kbt.io/projects/go/libravatar"
     avt := libravatar.New()
     avatar_url := avt.FromEmail("person@example.com")
-    
+
+or, with global context
+
+    avatar_url := libravatar.FromEmail("person@example.com")
+
 
 <a name="plugins"></a>
 # Plugins

removed
diff --git a/18005457482avg-support-phone-number.mdwn b/18005457482avg-support-phone-number.mdwn
deleted file mode 100644
index 2d7382e..0000000
--- a/18005457482avg-support-phone-number.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-1 800-545-7482 for avg customer support telephone number,
-CANADA 1800-545-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER
-avg tech support number 1 800-545-7482 avg phone Number Usa USA Canada ,avg tech support number avg customer phone number, avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless /avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!! ====avg install TECH SUPPORT PHONE NUMBER FREE USA CANADA !!1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER ===!!! *avg customer service phone number!!! avg phone number==== avg telephone number!!1800-545-7482==avg PHONE NUMBER!!!TECH SUPPORT phone number ++avg TOLL FREE PHONE NUMBERPhone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Numbe here. avg tech support number avg Help Desk Number !!1800-545-7482 Describe toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number here.toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? This article is in need of a technical review. This article is in need of an editorial review. avg Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number?? avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? Customer Service Number jacks avg technical support number((1-800-545-7482 )) avg Customer service number hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,US@~Supp 1-800-545-7482 avg Technical Support phone Number, 1-800-545-7482 avg Customer Support phone Number Caii for @@@1-800-545-7482 avg Tech Support,avg Customer Service Number,avg tech support number,avg customer service numrber,avg toll free number,avg support phone number,WhAt??? Is @SeRvIcE 1-800-545-7482 avg TeChNiCaL SuPpOrT NuMbEr??? USA, avg technical support phone number,1-800-545-7482 Kchintu@@@@((1-800-545-7482))avg Customer service toll free number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Sloves@@@(1-800-545-7482)@avg Customer service number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Helpline Number @@++sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number,avg Helpline Number @@++18008007482 avg Tech Support Customer Service Support Customer Help desk Phone Number USA,Helpline Number @@++ sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number USAfsdf avg customer service number,1-800-545-7482,just ringing it avg technical support number Service Number califorina@@((1-800-545-7482)) avg Tech Support Customer Service Number avg phone number,hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,Dial Technical avg customer service phone number,1 800-545-7482,avg tech support number, Calli for @@@1-800-545-7482 avg Tech Support avg Customer Service Number.,avg tech Antiviruss Support Phone Number @@(1-800-545-7482))) avg Tech Support Customer Service Number.,Helpline Number for avg support @@((1-800-545-7482)) avg Tech Support Customer Service NumberTechk???@@Call, 1 800-545-7482 for avg customer support telephone number, avg support phone number Just dial service avg customer service phone number,1 800-545-7482,Contacts for avg support @@((1 8008007482)) avg Tech Support Customer Service Number ,tECHNICAL ((!1 800-545-7482))) avg tech support number avg customer phone number, avg cusomer service number,Help US avg @ 1-800-545-7482 customer service phone number avg mail tech support number avg phone number,Sooo dial avg customer service phOnline help Support @@((1-8008007482)) avg ber usa ,avg tech support phone number,avg customer service phone number,Usafsdfs avg tech support number,1-800-545-7482 ,avg customer service phone number@@@ 1-800-545-7482 avg tech support number Customer support contact number, @@@ 1-800-545-7482 avg tech support number Customer support contact number avg Help Desk Number avg phone Number Usa USA Canada (((!1 8008007482))) avg tech support number avg customer phone number, Calli for @@@1-800-545-7482 avg Tech Support Customer Service Number,avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!, avg tech support number 1 800-545-7482 avg phone Number Usa USA Canada ,avg tech support number avg customer phone number, avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!! ====avg install TECH SUPPORT PHONE NUMBER FREE USA CANADA !!1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER ===!!! *avg customer service phone number!!! avg phone number==== avg telephone number!!1800-545-7482==avg PHONE NUMBER!!!TECH SUPPORT phone number ++avg TOLL FREE PHONE NUMBERPhone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Numbe here. avg tech support number avg Help Desk Number !!1800-545-7482 Describe toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number here.toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? This article is in need of a technical review. This article is in need of an editorial review. avg Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number?? avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? Customer Service Number jacks avg technical support number((1-800-545-7482 )) avg Customer service number hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,US@~Supp 1-800-545-7482 avg Technical Support phone Number, 1-800-545-7482 avg Customer Support phone Number Caii for @@@1-800-545-7482 avg Tech Support,avg Customer Service Number,avg tech support number,avg customer service numrber,avg toll free number,avg support phone number,WhAt??? Is @SeRvIcE 1-800-545-7482 avg TeChNiCaL SuPpOrT NuMbEr??? USA, avg technical support phone number,1-800-545-7482 Kchintu@@@@((1-800-545-7482))avg Customer service toll free number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Sloves@@@(1-800-545-7482)@avg Customer service number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Helpline Number @@++sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number,avg Helpline Number @@++18008007482 avg Tech Support Customer Service Support Customer Help desk Phone Number USA,Helpline Number @@++ sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number USAfsdf avg customer service number,1-800-545-7482,just ringing it avg technical support number Service Number califorina@@((1-800-545-7482)) avg Tech Support Customer Service Number avg phone number,hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,Dial Technical avg customer service phone number,1 800-545-7482,avg tech support number, Calli for @@@1-800-545-7482 avg Tech Support avg Customer Service Number.,avg tech Antiviruss Support Phone Number @@(1-800-545-7482))) avg Tech Support Customer Service Number.,Helpline Number for avg support @@((1-800-545-7482)) avg Tech Support Customer Service NumberTechk???@@Call, 1 800-545-7482 for avg customer support telephone number, avg support phone number Just dial service avg customer service phone number,1 800-545-7482,Contacts for avg support @@((1 8008007482)) avg Tech Support Customer Service Number ,tECHNICAL ((!1 800-545-7482))) avg tech support number avg customer phone number, avg cusomer service number,Help US avg @ 1-800-545-7482 customer service phone number avg mail tech support number avg phone number,Sooo dial avg customer service phOnline help Support @@((1-8008007482)) avg ber usa ,avg tech support phone number,avg customer service phone number,Usafsdfs avg tech support number,1-800-545-7482 ,avg customer service phone number@@@ 1-800-545-7482 avg tech support number Customer support contact number, @@@ 1-800-545-7482 avg tech support number Customer support contact number avg Help Desk Number avg phone Number Usa USA Canada (((!1 8008007482))) avg tech support number avg customer phone number, Calli for @@@1-800-545-7482 avg Tech Support Customer Service Number,avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!, avg tech support number 1 800-545-7482 avg phone Number Usa USA Canada ,avg tech support number avg customer phone number, avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!! ====avg install TECH SUPPORT PHONE NUMBER FREE USA CANADA !!1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER ===!!! *avg customer service phone number!!! avg phone number==== avg telephone number!!1800-545-7482==avg PHONE NUMBER!!!TECH SUPPORT phone number ++avg TOLL FREE PHONE NUMBERPhone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Numbe here. avg tech support number avg Help Desk Number !!1800-545-7482 Describe toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number here.toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? This article is in need of a technical review. This article is in need of an editorial review. avg Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number?? avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? Customer Service Number jacks avg technical support number((1-800-545-7482 )) avg Customer service number hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,US@~Supp 1-800-545-7482 avg Technical Support phone Number, 1-800-545-7482 avg Customer Support phone Number Caii for @@@1-800-545-7482 avg Tech Support,avg Customer Service Number,avg tech support number,avg customer service numrber,avg toll free number,avg support phone number,WhAt??? Is @SeRvIcE 1-800-545-7482 avg TeChNiCaL SuPpOrT NuMbEr??? USA, avg technical support phone number,1-800-545-7482 Kchintu@@@@((1-800-545-7482))avg Customer service toll free number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Sloves@@@(1-800-545-7482)@avg Customer service number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Helpline Number @@++sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number,avg Helpline Number @@++18008007482 avg Tech Support Customer Service Support Customer Help desk Phone Number USA,Helpline Number @@++ sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number USAfsdf avg customer service number,1-800-545-7482,just ringing it avg technical support number Service Number califorina@@((1-800-545-7482)) avg Tech Support Customer Service Number avg phone number,hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,Dial Technical avg customer service phone number,1 800-545-7482,avg tech support number, Calli for @@@1-800-545-7482 avg Tech Support avg Customer Service Number.,avg tech Antiviruss Support Phone Number @@(1-800-545-7482))) avg Tech Support Customer Service Number.,Helpline Number for avg support @@((1-800-545-7482)) avg Tech Support Customer Service NumberTechk???@@Call, 1 800-545-7482 for avg customer support telephone number, avg support phone number Just dial service avg customer service phone number,1 800-545-7482,Contacts for avg support @@((1 8008007482)) avg Tech Support Customer Service Number ,tECHNICAL ((!1 800-545-7482))) avg tech support number avg customer phone number, avg cusomer service number,Help US avg @ 1-800-545-7482 customer service phone number avg mail tech support number avg phone number,Sooo dial avg customer service phOnline help Support @@((1-8008007482)) avg ber usa ,avg tech support phone number,avg customer service phone number,Usafsdfs avg tech support number,1-800-545-7482 ,avg customer service phone number@@@ 1-800-545-7482 avg tech support number Customer support contact number, @@@ 1-800-545-7482 avg tech support number Customer support contact number avg Help Desk Number avg phone Number Usa USA Canada (((!1 8008007482))) avg tech support number avg customer phone number, Calli for @@@1-800-545-7482 avg Tech Support Customer Service Number,avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!,

diff --git a/18005457482avg-support-phone-number.mdwn b/18005457482avg-support-phone-number.mdwn
new file mode 100644
index 0000000..2d7382e
--- /dev/null
+++ b/18005457482avg-support-phone-number.mdwn
@@ -0,0 +1,3 @@
+1 800-545-7482 for avg customer support telephone number,
+CANADA 1800-545-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER
+avg tech support number 1 800-545-7482 avg phone Number Usa USA Canada ,avg tech support number avg customer phone number, avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless /avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!! ====avg install TECH SUPPORT PHONE NUMBER FREE USA CANADA !!1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER ===!!! *avg customer service phone number!!! avg phone number==== avg telephone number!!1800-545-7482==avg PHONE NUMBER!!!TECH SUPPORT phone number ++avg TOLL FREE PHONE NUMBERPhone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Numbe here. avg tech support number avg Help Desk Number !!1800-545-7482 Describe toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number here.toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? This article is in need of a technical review. This article is in need of an editorial review. avg Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number?? avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? Customer Service Number jacks avg technical support number((1-800-545-7482 )) avg Customer service number hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,US@~Supp 1-800-545-7482 avg Technical Support phone Number, 1-800-545-7482 avg Customer Support phone Number Caii for @@@1-800-545-7482 avg Tech Support,avg Customer Service Number,avg tech support number,avg customer service numrber,avg toll free number,avg support phone number,WhAt??? Is @SeRvIcE 1-800-545-7482 avg TeChNiCaL SuPpOrT NuMbEr??? USA, avg technical support phone number,1-800-545-7482 Kchintu@@@@((1-800-545-7482))avg Customer service toll free number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Sloves@@@(1-800-545-7482)@avg Customer service number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Helpline Number @@++sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number,avg Helpline Number @@++18008007482 avg Tech Support Customer Service Support Customer Help desk Phone Number USA,Helpline Number @@++ sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number USAfsdf avg customer service number,1-800-545-7482,just ringing it avg technical support number Service Number califorina@@((1-800-545-7482)) avg Tech Support Customer Service Number avg phone number,hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,Dial Technical avg customer service phone number,1 800-545-7482,avg tech support number, Calli for @@@1-800-545-7482 avg Tech Support avg Customer Service Number.,avg tech Antiviruss Support Phone Number @@(1-800-545-7482))) avg Tech Support Customer Service Number.,Helpline Number for avg support @@((1-800-545-7482)) avg Tech Support Customer Service NumberTechk???@@Call, 1 800-545-7482 for avg customer support telephone number, avg support phone number Just dial service avg customer service phone number,1 800-545-7482,Contacts for avg support @@((1 8008007482)) avg Tech Support Customer Service Number ,tECHNICAL ((!1 800-545-7482))) avg tech support number avg customer phone number, avg cusomer service number,Help US avg @ 1-800-545-7482 customer service phone number avg mail tech support number avg phone number,Sooo dial avg customer service phOnline help Support @@((1-8008007482)) avg ber usa ,avg tech support phone number,avg customer service phone number,Usafsdfs avg tech support number,1-800-545-7482 ,avg customer service phone number@@@ 1-800-545-7482 avg tech support number Customer support contact number, @@@ 1-800-545-7482 avg tech support number Customer support contact number avg Help Desk Number avg phone Number Usa USA Canada (((!1 8008007482))) avg tech support number avg customer phone number, Calli for @@@1-800-545-7482 avg Tech Support Customer Service Number,avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!, avg tech support number 1 800-545-7482 avg phone Number Usa USA Canada ,avg tech support number avg customer phone number, avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!! ====avg install TECH SUPPORT PHONE NUMBER FREE USA CANADA !!1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER ===!!! *avg customer service phone number!!! avg phone number==== avg telephone number!!1800-545-7482==avg PHONE NUMBER!!!TECH SUPPORT phone number ++avg TOLL FREE PHONE NUMBERPhone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Numbe here. avg tech support number avg Help Desk Number !!1800-545-7482 Describe toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number here.toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? This article is in need of a technical review. This article is in need of an editorial review. avg Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number?? avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? Customer Service Number jacks avg technical support number((1-800-545-7482 )) avg Customer service number hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,US@~Supp 1-800-545-7482 avg Technical Support phone Number, 1-800-545-7482 avg Customer Support phone Number Caii for @@@1-800-545-7482 avg Tech Support,avg Customer Service Number,avg tech support number,avg customer service numrber,avg toll free number,avg support phone number,WhAt??? Is @SeRvIcE 1-800-545-7482 avg TeChNiCaL SuPpOrT NuMbEr??? USA, avg technical support phone number,1-800-545-7482 Kchintu@@@@((1-800-545-7482))avg Customer service toll free number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Sloves@@@(1-800-545-7482)@avg Customer service number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Helpline Number @@++sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number,avg Helpline Number @@++18008007482 avg Tech Support Customer Service Support Customer Help desk Phone Number USA,Helpline Number @@++ sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number USAfsdf avg customer service number,1-800-545-7482,just ringing it avg technical support number Service Number califorina@@((1-800-545-7482)) avg Tech Support Customer Service Number avg phone number,hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,Dial Technical avg customer service phone number,1 800-545-7482,avg tech support number, Calli for @@@1-800-545-7482 avg Tech Support avg Customer Service Number.,avg tech Antiviruss Support Phone Number @@(1-800-545-7482))) avg Tech Support Customer Service Number.,Helpline Number for avg support @@((1-800-545-7482)) avg Tech Support Customer Service NumberTechk???@@Call, 1 800-545-7482 for avg customer support telephone number, avg support phone number Just dial service avg customer service phone number,1 800-545-7482,Contacts for avg support @@((1 8008007482)) avg Tech Support Customer Service Number ,tECHNICAL ((!1 800-545-7482))) avg tech support number avg customer phone number, avg cusomer service number,Help US avg @ 1-800-545-7482 customer service phone number avg mail tech support number avg phone number,Sooo dial avg customer service phOnline help Support @@((1-8008007482)) avg ber usa ,avg tech support phone number,avg customer service phone number,Usafsdfs avg tech support number,1-800-545-7482 ,avg customer service phone number@@@ 1-800-545-7482 avg tech support number Customer support contact number, @@@ 1-800-545-7482 avg tech support number Customer support contact number avg Help Desk Number avg phone Number Usa USA Canada (((!1 8008007482))) avg tech support number avg customer phone number, Calli for @@@1-800-545-7482 avg Tech Support Customer Service Number,avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!, avg tech support number 1 800-545-7482 avg phone Number Usa USA Canada ,avg tech support number avg customer phone number, avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!! ====avg install TECH SUPPORT PHONE NUMBER FREE USA CANADA !!1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER ===!!! *avg customer service phone number!!! avg phone number==== avg telephone number!!1800-545-7482==avg PHONE NUMBER!!!TECH SUPPORT phone number ++avg TOLL FREE PHONE NUMBERPhone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Numbe here. avg tech support number avg Help Desk Number !!1800-545-7482 Describe toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number here.toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number toll free avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? This article is in need of a technical review. This article is in need of an editorial review. avg Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number avg Support Phone Number 1800-545-7482 USA CANADA, avg Phone Number, avg Technical Support Phone Number, avg Service Support Number?? avg Phone Number 1800-545-7482 USA CANADA, avg 800 Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? avg Support Phone Number 1800-545-7482 USA CANADA, avg Support Phone Number, avg Technical Support Phone Number, avg Customer Support Number?? Customer Service Number jacks avg technical support number((1-800-545-7482 )) avg Customer service number hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,US@~Supp 1-800-545-7482 avg Technical Support phone Number, 1-800-545-7482 avg Customer Support phone Number Caii for @@@1-800-545-7482 avg Tech Support,avg Customer Service Number,avg tech support number,avg customer service numrber,avg toll free number,avg support phone number,WhAt??? Is @SeRvIcE 1-800-545-7482 avg TeChNiCaL SuPpOrT NuMbEr??? USA, avg technical support phone number,1-800-545-7482 Kchintu@@@@((1-800-545-7482))avg Customer service toll free number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Sloves@@@(1-800-545-7482)@avg Customer service number, avg Customer Service phone Number,Contacts for avg support @@((1-800-545-7482)) avg Tech Support Customer Service Number,Helpline Number @@++sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number,avg Helpline Number @@++18008007482 avg Tech Support Customer Service Support Customer Help desk Phone Number USA,Helpline Number @@++ sdfsdf avg customer service number,1-800-545-7482 avg Tech Support Customer Service Support Customer Help desk Phone Number USAfsdf avg customer service number,1-800-545-7482,just ringing it avg technical support number Service Number califorina@@((1-800-545-7482)) avg Tech Support Customer Service Number avg phone number,hi avg technical support number Service Number (((1-800-545-7482 )) Customer support contact number avg Help Desk Customer service phone number,Dial Technical avg customer service phone number,1 800-545-7482,avg tech support number, Calli for @@@1-800-545-7482 avg Tech Support avg Customer Service Number.,avg tech Antiviruss Support Phone Number @@(1-800-545-7482))) avg Tech Support Customer Service Number.,Helpline Number for avg support @@((1-800-545-7482)) avg Tech Support Customer Service NumberTechk???@@Call, 1 800-545-7482 for avg customer support telephone number, avg support phone number Just dial service avg customer service phone number,1 800-545-7482,Contacts for avg support @@((1 8008007482)) avg Tech Support Customer Service Number ,tECHNICAL ((!1 800-545-7482))) avg tech support number avg customer phone number, avg cusomer service number,Help US avg @ 1-800-545-7482 customer service phone number avg mail tech support number avg phone number,Sooo dial avg customer service phOnline help Support @@((1-8008007482)) avg ber usa ,avg tech support phone number,avg customer service phone number,Usafsdfs avg tech support number,1-800-545-7482 ,avg customer service phone number@@@ 1-800-545-7482 avg tech support number Customer support contact number, @@@ 1-800-545-7482 avg tech support number Customer support contact number avg Help Desk Number avg phone Number Usa USA Canada (((!1 8008007482))) avg tech support number avg customer phone number, Calli for @@@1-800-545-7482 avg Tech Support Customer Service Number,avg cusomer service number, avg help desk number, avg customer care number, avg support phone number, avg password recovery phone number, avg account recovery phone number, avg toll free numbe help,JUSTs Call USA 1-800-545-7482 avg tech support number, Wireless avg customer service number, avg support number,avg phone number avg customer phone number helpline number,USA CANADA>>1800800-7482 avg TECH SUPPORT PHONE NUMBER avg CUSTOMER SERVICE PHONE NUMBER here.1800-545-7482 avg TECH SUPPORT PHONE NUMBER %%%avg CUSTOMER SERVICE PHONE NUMBER avg technical support number avg helpdesk number avg helpdesk phone number avg Helpline number,avg Phone number USA CANADA,(((1800800-7482))))-avg phone number===avg tech support PHONE NUMBER Helpline tollfree ===!!===1800800-7482== avg tech support phone number ==!,

skeleton page
diff --git a/fmarier.mdwn b/fmarier.mdwn
new file mode 100644
index 0000000..04a06e2
--- /dev/null
+++ b/fmarier.mdwn
@@ -0,0 +1 @@
+[François Marier](https://fmarier.org), lead developer of Libravatar.

Add three users of Libravatar
diff --git a/sites.mdwn b/sites.mdwn
index de96d2e..7cb75ea 100644
--- a/sites.mdwn
+++ b/sites.mdwn
@@ -1 +1,5 @@
-Websites known to support Libravatar (please add yours!)
+Websites known to support Libravatar (please add yours!):
+
+* [Debian Bug tracker](https://www.debian.org/Bugs/)
+* [git.kernel.org](https://git.kernel.org/cgit/)
+* [Mozilla Reps](https://reps.mozilla.org/)

diff --git a/index.mdwn b/index.mdwn
index 5ff2832..4e44191 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,8 +4,9 @@
 and an [[open specification|api]] for hosting profile images tied to email or OpenID
 addresses.
 
-In order to have your photo displayed next to your posts and comments on sites which support
-Libravatar you can either create an account with us or [[run your own service|running your own]].
+In order to have your photo displayed next to your posts and comments on [[sites which support
+Libravatar|sites]] you can either create an account with us or [[run your own node|running your own]]
+of the federated avatar network.
 
 * [[What is Libravatar?|description]]
 * [[Features]]

diff --git a/sites.mdwn b/sites.mdwn
new file mode 100644
index 0000000..de96d2e
--- /dev/null
+++ b/sites.mdwn
@@ -0,0 +1 @@
+Websites known to support Libravatar (please add yours!)

diff --git a/index.mdwn b/index.mdwn
index d081eb5..5ff2832 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,9 +1,11 @@
 <img src="https://seccdn.libravatar.org/nobody/256.png" align="right" width="256" height="256">
 
-[Libravatar](https://www.libravatar.org) is a free service for hosting
-profile images tied to your email address or OpenID. Once you have an
-account with us, your photo will be displayed next to your posts and
-comments on sites which support Libravatar.
+[Libravatar](https://www.libravatar.org) (*Libre Avatar*) is a free service
+and an [[open specification|api]] for hosting profile images tied to email or OpenID
+addresses.
+
+In order to have your photo displayed next to your posts and comments on sites which support
+Libravatar you can either create an account with us or [[run your own service|running your own]].
 
 * [[What is Libravatar?|description]]
 * [[Features]]

Clarify the origin of the name
diff --git a/description.mdwn b/description.mdwn
index df968bf..174ffa4 100644
--- a/description.mdwn
+++ b/description.mdwn
@@ -1,6 +1,6 @@
 # What is Libravatar?
 
-It's a piece of [free software](http://www.gnu.org/philosophy/free-sw.html) to do federated avatar hosting. What does that do and why should you care?
+Libravatar (from "libre" and "avatar") is a piece of [free software](http://www.gnu.org/philosophy/free-sw.html) to do federated avatar hosting. What does that do and why should you care?
 
 Say you've got a profile image you like to use when you have an account somewhere. You want this photo to show up whenever you interact socially with a website. In other words, you want your blog comments, status updates, git commits or anything else you do publicly to be associated with that image.
 

Add a link to Liberapay
https://bugs.launchpad.net/libravatar/+bug/1557185
diff --git a/contribute.mdwn b/contribute.mdwn
index 677aa38..257145a 100644
--- a/contribute.mdwn
+++ b/contribute.mdwn
@@ -22,6 +22,7 @@ You can donate money to help us cover the project hosting-related overheads:
 * [Gratipay](https://gratipay.com/libravatar/)
 * [Bountysource](https://salt.bountysource.com/checkout/amount?team=libravatar)
 * [Flattr](https://flattr.com/thing/311293/Libravatar)
+* [Liberapay](https://liberapay.com/Libravatar/)
 
 # Advocacy
 

The Launchpad bzr repository has migrated to git
diff --git a/code_checkout.mdwn b/code_checkout.mdwn
index 1e1f1e0..8c33658 100644
--- a/code_checkout.mdwn
+++ b/code_checkout.mdwn
@@ -4,22 +4,12 @@ The main repository is using **git**, but that doesn't mean you have to use it s
 
 <img src="git_logo.png" width="64" height="64" align="right">
 
-You can [browse the code](https://bazaar.launchpad.net/~libravatar/libravatar/master/files) on Launchpad and [fork the repository](https://git.nzoss.org.nz/libravatar/libravatar/fork/new) on Gitlab.
+You can [browse the code](https://git.launchpad.net/~libravatar/libravatar) on Launchpad or check the code out locally:
 
-Otherwise, just check the code out locally:
-
-    git clone https://git.nzoss.org.nz/libravatar/libravatar.git
+    git clone https://git.launchpad.net/~libravatar/libravatar
 
 A mirror of it is also available on [Github](https://github.com/libravatar/libravatar).
 
-# Using [bzr](http://bazaar.canonical.com/)
-
-<img src="bzr_logo.png" width="64" height="64" align="right">
-
-You can [browse the repository](http://bazaar.launchpad.net/~libravatar/libravatar/trunk/files) or create a local branch for yourself:
-
-    bzr branch lp:libravatar
-
 # Using [mercurial](http://mercurial.selenic.com/)
 
 <img src="hg_logo.png" width="64" height="64" align="right">

Add GNU social libravatar plugin
diff --git a/libraries.mdwn b/libraries.mdwn
index 3ad5ab0..c73bd48 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -124,6 +124,7 @@ There aren't many plugins available at the moment, but please [[suggest the ones
 * [Foswiki](http://foswiki.org/Extensions/AvatarPlugin)
 * [Friendica](https://github.com/friendica/friendica-addons/tree/master/libravatar)
 * [GNOME-shell-extension-timezone](https://github.com/jwendell/gnome-shell-extension-timezone)
+* [GNU social](https://github.com/chimo/gs-libravatar)
 * [Ikiwiki](http://ikiwiki.info) (part of core, automatically enabled if [Libravatar::URL](http://search.cpan.org/dist/Gravatar-URL/) is installed)
 * [KDE PIM](https://community.kde.org/KDE_PIM) (part of core)
 * [Koha](http://www.koha-community.org) (part of core starting in 3.6, automatically enabled if [Libravatar::URL](http://search.cpan.org/dist/Gravatar-URL/) is installed)

typo in golang section
diff --git a/libraries.mdwn b/libraries.mdwn
index 912ec8e..3ad5ab0 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -112,7 +112,7 @@ The [go-libravatar](https://strk.kbt.io/projects/go/libravatar) module can be us
 
     import "strk.kbt.io/projects/go/libravatar"
     avt := libravatar.New()
-    avatar_url := avt.FromEmail(:person@example.com")
+    avatar_url := avt.FromEmail("person@example.com")
     
 
 <a name="plugins"></a>

add golang library
diff --git a/libraries.mdwn b/libraries.mdwn
index ccdffef..912ec8e 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -104,6 +104,17 @@ The [txLibravatar](http://pypi.python.org/pypi/txLibravatar) module can be used
     d = libravatar_url(email = 'person@example.com')
     d.addCallback(lambda x: print '<img src="' + x + '">')
 
+## Go
+
+<img src="https://blog.golang.org/gopher/gopher.png" width="71" align="right">
+
+The [go-libravatar](https://strk.kbt.io/projects/go/libravatar) module can be used like this:
+
+    import "strk.kbt.io/projects/go/libravatar"
+    avt := libravatar.New()
+    avatar_url := avt.FromEmail(:person@example.com")
+    
+
 <a name="plugins"></a>
 # Plugins
 

Mention gnome-shell-extension-timezone
diff --git a/libraries.mdwn b/libraries.mdwn
index b8db8e7..ccdffef 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -112,6 +112,7 @@ There aren't many plugins available at the moment, but please [[suggest the ones
 * [Claws Mail](http://www.claws-mail.org/plugin.php?plugin=libravatar) (since version 3.10)
 * [Foswiki](http://foswiki.org/Extensions/AvatarPlugin)
 * [Friendica](https://github.com/friendica/friendica-addons/tree/master/libravatar)
+* [GNOME-shell-extension-timezone](https://github.com/jwendell/gnome-shell-extension-timezone)
 * [Ikiwiki](http://ikiwiki.info) (part of core, automatically enabled if [Libravatar::URL](http://search.cpan.org/dist/Gravatar-URL/) is installed)
 * [KDE PIM](https://community.kde.org/KDE_PIM) (part of core)
 * [Koha](http://www.koha-community.org) (part of core starting in 3.6, automatically enabled if [Libravatar::URL](http://search.cpan.org/dist/Gravatar-URL/) is installed)

diff --git a/api.mdwn b/api.mdwn
index 3a0f69b..5392cff 100644
--- a/api.mdwn
+++ b/api.mdwn
@@ -2,7 +2,7 @@ You should probably just use one of the available [[libraries or plugins|librari
 
 # Simple API
 
-There are 5 steps for displaying Libravatar-hosted images into your application:
+There are 4 steps for displaying Libravatar-hosted images into your application:
 
 
 1. Create a hash from the user's email address:
@@ -14,6 +14,8 @@ There are 5 steps for displaying Libravatar-hosted images into your application:
 3. Create a URL like `http://BASEURL/avatar/HASH`.
 4. Put the URL into an `img` tag on your page.
 
+
+## Python example
 Here's an example in Python:
 
     import hashlib
@@ -22,8 +24,14 @@ Here's an example in Python:
 
 which gives us a hash of <tt>40f8d096a3777232204cb3f796c577b7</tt> and therefore the following image tag:
 
+    <img src="http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7" alt="avatar of george@example.com"/>
+
+It will render as follows:
 ![George@example.com](http://cdn.libravatar.org/avatar/40f8d096a3777232204cb3f796c577b7)
 
+
+# Options
+
 ## Picture size
 
 The default size for images is **80x80** pixels, however you can change it by providing an extra parameter to the URL:
@@ -72,22 +80,18 @@ Note that Libravatar does **not** support the <tt>rating</tt> (or simply <tt>r</
 
 In order to support domain name owners who choose to [[run their own instances|running your own]] of Libravatar, you must perform a DNS query to lookup the appropriate base URL for each domain (the domain is extracted from email addresses or OpenID URLs).
 
+DNS host names:
+
+* HTTP
+  * `SRV _avatars._tcp.EMAILDOMAIN`
+* HTTPS
+  * `SRV _avatars-sec._tcp._tcp.EMAILDOMAIN`
+
+
 You will probably want to use an [[existing library|libraries]] for this, but here's how to do that DNS lookup on a UNIX command line:
 
-    $ dig SRV _avatars._tcp.example.com
-    
-    ; <<>> DiG 9.7.2-P3 <<>> SRV _avatars._tcp.example.com
-    ; (1 server found)
-    ;; global options: +cmd
-    ;; Got answer:
-    ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 14684
-    ;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 0
-    
-    ;; QUESTION SECTION:
-    ;_avatars._tcp.example.com.	IN	SRV
-    
-    ;; ANSWER SECTION:
-    _avatars._tcp.example.com. 86400 IN	SRV 0 0 80 avatars.example.com.
+    $ dig +short SRV _avatars._tcp.example.com
+    0 0 80 avatars.example.com.
 
 We also provide a [domain check tool](https://www.libravatar.org/tools/check_domain) to help in your testing.
 

Change the steps to emphasize federation (thanks to cweiske)
diff --git a/api.mdwn b/api.mdwn
index ff40c57..3a0f69b 100644
--- a/api.mdwn
+++ b/api.mdwn
@@ -4,11 +4,15 @@ You should probably just use one of the available [[libraries or plugins|librari
 
 There are 5 steps for displaying Libravatar-hosted images into your application:
 
-1. Take a user's email address as entered by them.
-2. Convert the email address to lowercase.
-3. Compute the hash (using the MD5 or SHA256 hash algorithms).
-4. Turn the image into a URL by prefixing it with the base URL <tt>http://cdn.libravatar.org/avatar/</tt>.
-5. Put the image into an <tt>img</tt> tag on your page.
+
+1. Create a hash from the user's email address:
+   a. Lowercase the email address.
+   b. Compute a MD5 or SHA256 hash of it.
+2. Discover the avatar server base URL:
+   a. Use DNS-based server discovery as described in *Federated Servers*.
+   b. If no server was found, fall back to `cdn.libravatar.org` (or `seccdn.libravatar.org` for HTTPS).
+3. Create a URL like `http://BASEURL/avatar/HASH`.
+4. Put the URL into an `img` tag on your page.
 
 Here's an example in Python:
 

upgrade to Apache 2.4 ACL config
diff --git a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
index 0ce2082..6eaa07f 100644
--- a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
+++ b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
@@ -107,8 +107,7 @@ At the very least, add something like <http://ismyblogworking.com/1.cdn.libravat
        <Directory /var/www/html/>
               Options Indexes FollowSymLinks MultiViews
               AllowOverride None
-              Order allow,deny
-              allow from all
+              Require all granted
        </Directory>
 
 # Enable automated deployments (optional)

add fcheck config
diff --git a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
index 22215a6..0ce2082 100644
--- a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
+++ b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
@@ -31,6 +31,12 @@ Do this on the **slave**:
        newaliases
        /etc/init.d/postfix reload
 
+5. if running fcheck on the slave, add this to `/etc/fcheck/fcheck.local.cfg`:
+
+       Exclusion      = /etc/libravatar/seccdn-chain.pem
+       Exclusion      = /etc/libravatar/seccdn.crt
+       Exclusion      = /etc/libravatar/seccdn.pem
+
 Do this on the **master**:
 
 1. add the slave's ssh pubkey (in `/var/lib/libravatar/slave/.ssh/id_rsa.pub`) to `/var/lib/libravatar/master/.ssh/authorized_keys` using an entry that looks like this:

Update config for jessie
diff --git a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
index 624d5f4..22215a6 100644
--- a/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
+++ b/how_to_add_a_mirror_slave_to_the_mirror_master.mdwn
@@ -7,7 +7,7 @@ Do this on the **slave**:
 1. make sure NTP is installed and running
 1. add the Libravatar apt repository:
 
-       echo "deb http://apt.libravatar.org/ wheezy main" >> /etc/apt/sources.list
+       echo "deb http://apt.libravatar.org/ jessie main" >> /etc/apt/sources.list
        gpg --keyserver pgp.net.nz --recv 007c98d1
        gpg -a --export 007c98d1 | apt-key add -
 
@@ -89,8 +89,21 @@ At the very least, add something like <http://ismyblogworking.com/1.cdn.libravat
 
 3. make the reports available:
 
-       ln -s /usr/share/awstats/icon/ /var/www/awstats-icon
-       ln -s /var/cache/awstats/ /var/www/stats
+       ln -s /usr/share/awstats/icon/ /var/www/html/awstats-icon
+       ln -s /var/cache/awstats/ /var/www/html/stats
+
+4. serve that directory using Apache by putting the following in `/etc/apache/sites-enabled/000-default.conf`:
+
+       <Directory />
+              Options FollowSymLinks
+              AllowOverride None
+       </Directory>
+       <Directory /var/www/html/>
+              Options Indexes FollowSymLinks MultiViews
+              AllowOverride None
+              Order allow,deny
+              allow from all
+       </Directory>
 
 # Enable automated deployments (optional)
 

Libravatar is running on wheezy
diff --git a/running_your_own.mdwn b/running_your_own.mdwn
index 36479cb..5cb0fd3 100644
--- a/running_your_own.mdwn
+++ b/running_your_own.mdwn
@@ -19,7 +19,7 @@ The following instructions are about the official libravatar.org software.
 
 ## System requirements
 
-You can find the latest system requirements in the [installation instructions](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/INSTALL.md) that come with the software, but Libravatar has been confirmed to work on [Debian 6](http://www.debian.org/releases/squeeze/) (squeeze).
+You can find the latest system requirements in the [installation instructions](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/INSTALL.md) that come with the software, but Libravatar has been confirmed to work on [Debian 7](http://www.debian.org/releases/wheezy/) (wheezy).
 
 ## Getting the code
 

Add Toc Messenger to the list
diff --git a/libraries.mdwn b/libraries.mdwn
index 442f255..b8db8e7 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -119,6 +119,7 @@ There aren't many plugins available at the moment, but please [[suggest the ones
 * [Mojolicious](https://metacpan.org/release/Mojolicious-Plugin-Libravatar)
 * [Pidgin](https://code.google.com/p/pidgin-libravatar/)
 * [Symfony](https://github.com/julienfastre/LibravatarBundle)
+* [Toc Messenger](https://github.com/lewisl9029/toc) (part of core)
 * [Trac](https://pypi.python.org/pypi/tracvatar/)
 * [Weblate](http://weblate.org/) (part of core starting in 1.5)
 * Wordpress: [Libravatar](http://wordpress.org/extend/plugins/libravatar/) and [Libravatar Replace](http://wordpress.org/plugins/libravatar-replace/)

Remove details about the security bug
diff --git a/security.mdwn b/security.mdwn
index cbd7f57..9389971 100644
--- a/security.mdwn
+++ b/security.mdwn
@@ -14,4 +14,4 @@ Also, please let us know if you are under any kind of publication deadline.
 
 *We would like to thank the following people who have helped make Libravatar more secure by reporting security issues to us.*
 
-* [Ahmed Adel Abdelfattah](https://www.facebook.com/00SystemError00) ([@00SystemError00](https://twitter.com/00SystemError00)): missing SPF records on `libravatar.org` and `libravatar.com`
+* [Ahmed Adel Abdelfattah](https://www.facebook.com/00SystemError00) ([@00SystemError00](https://twitter.com/00SystemError00)): improvement to mail configuration on `libravatar.org` and `libravatar.com`

Rephrase the "thank you" sentence
diff --git a/security.mdwn b/security.mdwn
index d1203a9..cbd7f57 100644
--- a/security.mdwn
+++ b/security.mdwn
@@ -12,6 +12,6 @@ Also, please let us know if you are under any kind of publication deadline.
 
 # Security Hall of fame
 
-*Report a security bug you discovered and get your name added here!*
+*We would like to thank the following people who have helped make Libravatar more secure by reporting security issues to us.*
 
 * [Ahmed Adel Abdelfattah](https://www.facebook.com/00SystemError00) ([@00SystemError00](https://twitter.com/00SystemError00)): missing SPF records on `libravatar.org` and `libravatar.com`

Move haskell logo to the right place
diff --git a/haskell_logo.png b/haskell_logo.png
deleted file mode 100644
index e36678b..0000000
Binary files a/haskell_logo.png and /dev/null differ
diff --git a/libraries/haskell_logo.png b/libraries/haskell_logo.png
new file mode 100644
index 0000000..e36678b
Binary files /dev/null and b/libraries/haskell_logo.png differ

Add missing haskell logo
diff --git a/haskell_logo.png b/haskell_logo.png
new file mode 100644
index 0000000..e36678b
Binary files /dev/null and b/haskell_logo.png differ

Add Ahmed Adel Abdelfattah
diff --git a/security.mdwn b/security.mdwn
index 3fe799e..d1203a9 100644
--- a/security.mdwn
+++ b/security.mdwn
@@ -13,3 +13,5 @@ Also, please let us know if you are under any kind of publication deadline.
 # Security Hall of fame
 
 *Report a security bug you discovered and get your name added here!*
+
+* [Ahmed Adel Abdelfattah](https://www.facebook.com/00SystemError00) ([@00SystemError00](https://twitter.com/00SystemError00)): missing SPF records on `libravatar.org` and `libravatar.com`

add section on how to donate money
diff --git a/contribute.mdwn b/contribute.mdwn
index f7f3d6a..677aa38 100644
--- a/contribute.mdwn
+++ b/contribute.mdwn
@@ -15,6 +15,14 @@ Given that Libravatar is a community project without a big corporate sponsor, we
 
 If you can spare a bit of disk space and bandwidth, please [get in touch](mailto:mirrors@libravatar.org), we would love your help in building a world-wide mirror network.
 
+# Donate
+
+You can donate money to help us cover the project hosting-related overheads:
+
+* [Gratipay](https://gratipay.com/libravatar/)
+* [Bountysource](https://salt.bountysource.com/checkout/amount?team=libravatar)
+* [Flattr](https://flattr.com/thing/311293/Libravatar)
+
 # Advocacy
 
 If you don't fit into of the other categories, you are still more than welcome to join us:

Ad Haskell logo
diff --git a/libraries.mdwn b/libraries.mdwn
index be577ca..442f255 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -17,6 +17,8 @@ If a library or plugin is not availble for your language or application, your be
 
 ## Haskell
 
+<img src="haskell_logo.png" width="128" height="87" align="right">
+
 The [Libravatar](http://www.rel4tion.org/projects/libravatar/) library is maintained by fr33domlover and is available on [hackage](https://hackage.haskell.org/package/libravatar).
 
     import Network.Libravatar

diff --git a/libraries.mdwn b/libraries.mdwn
index e79fe86..be577ca 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -34,6 +34,8 @@ There is a [Libravatar node.js module](https://npmjs.org/package/libravatar) tha
         console.log('<img src="' + avatar_url + '">');
       });
 
+You can also use the [ember-cli module](https://www.npmjs.com/package/ember-cli-libravatar).
+
 ## Perl
 
 <img src="perl_logo.png" width="75" height="75" align="right">

add haskell sample code
diff --git a/libraries.mdwn b/libraries.mdwn
index 8bc7224..e79fe86 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -19,6 +19,9 @@ If a library or plugin is not availble for your language or application, your be
 
 The [Libravatar](http://www.rel4tion.org/projects/libravatar/) library is maintained by fr33domlover and is available on [hackage](https://hackage.haskell.org/package/libravatar).
 
+    import Network.Libravatar
+    myUrl = avatarUrl (Right "http://example.com/id/john") True Nothing (Just 100)
+
 ## node.js
 
 <img src="nodejs_logo.png" width="219" height="75" align="right">

link to Haskell library
diff --git a/libraries.mdwn b/libraries.mdwn
index 56d7066..8bc7224 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -15,6 +15,10 @@ If a library or plugin is not availble for your language or application, your be
 
 (!) The library does not support federation.
 
+## Haskell
+
+The [Libravatar](http://www.rel4tion.org/projects/libravatar/) library is maintained by fr33domlover and is available on [hackage](https://hackage.haskell.org/package/libravatar).
+
 ## node.js
 
 <img src="nodejs_logo.png" width="219" height="75" align="right">

point to the technical info page
diff --git a/run_a_mirror.mdwn b/run_a_mirror.mdwn
index 14628b6..8d66466 100644
--- a/run_a_mirror.mdwn
+++ b/run_a_mirror.mdwn
@@ -18,7 +18,7 @@ for HTTPS IPv6 mirrors.
 
 If you have a server with some spare disk space and bandwidth, please consider supporting the project by running a mirror.
 
-At the moment, it consists of installing a Debian package which takes care of setting up Apache and receives regular updates via rsync.
+At the moment, it consists of installing a Debian package which takes care of setting up Apache and receives regular updates via rsync. You can take a look at the "initial setup" step in the technical information below.
 
 Please contact [[mirrors@libravatar.org]] for details.