Recent changes to this wiki:

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.
 

fix link to my blog post
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 20e9913..a6f6643 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 [http://feeding.cloud.geek.nz/posts/usual-server-setup/ tweak a few things]
+* Install Debian and [tweak a few things](http://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`

fix db username
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 006021a..20e9913 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -95,7 +95,7 @@ you've installed Debian and the usual server packages.
 
         sudo -u postgres createuser -s francois
         createuser -s root
-        createuser -S -R -D dude
+        createuser -S -R -D djangouser
 
 * Install pgbouncer and turn it on in `/etc/default/pgbouncer`
   * Put the following in `/etc/pgbouncer/pgbouncer.ini`:

link to my server setup post and mention the logcheck.logfiles changes
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 3520f8b..006021a 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -3,6 +3,7 @@ you've installed Debian and the usual server packages.
 
 # Basic setup
 
+* Install Debian and [http://feeding.cloud.geek.nz/posts/usual-server-setup/ tweak a few things]
 * Install rssh and uncomment `allowrsync` in `/etc/rssh.conf`
 * Setup appropriate mail aliases
   * Add these to `/etc/aliases`
@@ -15,7 +16,13 @@ you've installed Debian and the usual server packages.
   * Run `newaliases` to update `/etc/aliases.db`
   * Test the aliases by running `mail root`
 
-* Copy the local logcheck rules from the old server
+* Copy the local logcheck rules from the old server and add the following to `/etc/logcheck/logcheck.logfiles`:
+
+      /var/log/libravatar/error-cdn.log
+      /var/log/libravatar/error-seccdn.log
+      /var/log/libravatar/error-www.log
+      /var/log/libravatar/workers.log
+      /var/log/postgresql/postgresql-8.4-main.log
 
 # Firewall
 

There is Libravatar support in kdepim
diff --git a/libraries.mdwn b/libraries.mdwn
index 9827c3f..56d7066 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -102,6 +102,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)
 * [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)
 * [MediaWiki](http://www.mediawiki.org/wiki/Extension:Libravatar)
 * [Mojolicious](https://metacpan.org/release/Mojolicious-Plugin-Libravatar)

Replace all gitorious URLs with Launchpad and Gitlab ones
diff --git a/code_checkout.mdwn b/code_checkout.mdwn
index f20218c..1e1f1e0 100644
--- a/code_checkout.mdwn
+++ b/code_checkout.mdwn
@@ -4,11 +4,11 @@ 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://gitorious.org/libravatar/libravatar/trees) on Gitorious and [clone the repository](https://gitorious.org/libravatar/libravatar/clone).
+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.
 
 Otherwise, just check the code out locally:
 
-    git clone git://gitorious.org/libravatar/libravatar.git
+    git clone https://git.nzoss.org.nz/libravatar/libravatar.git
 
 A mirror of it is also available on [Github](https://github.com/libravatar/libravatar).
 
diff --git a/code_layout.mdwn b/code_layout.mdwn
index 16f7944..8042e52 100644
--- a/code_layout.mdwn
+++ b/code_layout.mdwn
@@ -1,18 +1,18 @@
 Libravatar is a fairly simple [Django](http://www.djangoproject.org) application.
 
-Here's what you'll find in the [main repository](https://gitorious.org/libravatar/libravatar):
+Here's what you'll find in the [main repository](https://git.nzoss.org.nz/libravatar/libravatar):
 
-* [config/](https://gitorious.org/libravatar/libravatar/trees/master/config): [Apache](http://httpd.apache.org/) configuration files
-* [contrib/](https://gitorious.org/libravatar/libravatar/trees/master/contrib): contributed code related to the project but not needed by the main application
-* [debian/](https://gitorious.org/libravatar/libravatar/trees/master/debian): installation scripts and cron jobs
-* [libravatar/](https://gitorious.org/libravatar/libravatar/trees/master/libravatar): [Gearman](http://gearman.org/) workers and Django configuration
- * [libravatar/account/](https://gitorious.org/libravatar/libravatar/trees/master/libravatar/account): main application (logged in)
- * [libravatar/locale/](https://gitorious.org/libravatar/libravatar/trees/master/libravatar/locale): [translations](https://translations.launchpad.net/libravatar/trunk/+translations)
- * [libravatar/public/](https://gitorious.org/libravatar/libravatar/trees/master/libravatar/public): public-facing website (logged out)
- * [libravatar/schemas/](https://gitorious.org/libravatar/libravatar/trees/master/libravatar/schemas): XML schema used for account exports
- * [libravatar/templates/](https://gitorious.org/libravatar/libravatar/trees/master/libravatar/templates): HTML templates
- * [libravatar/tools/](https://gitorious.org/libravatar/libravatar/trees/master/libravatar/tools): helpful interactive tools
-* [static/](https://gitorious.org/libravatar/libravatar/trees/master/static): CSS stylesheets, Javascripts and images need by the Django application
- * [static/cdn/](https://gitorious.org/libravatar/libravatar/trees/master/static/cdn): images needed by the avatar CDNs
+* [config/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/config): [Apache](http://httpd.apache.org/) configuration files
+* [contrib/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/contrib): contributed code related to the project but not needed by the main application
+* [debian/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/debian): installation scripts and cron jobs
+* [libravatar/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar): [Gearman](http://gearman.org/) workers and Django configuration
+ * [libravatar/account/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar/account): main application (logged in)
+ * [libravatar/locale/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar/locale): [translations](https://translations.launchpad.net/libravatar/trunk/+translations)
+ * [libravatar/public/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar/public): public-facing website (logged out)
+ * [libravatar/schemas/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar/schemas): XML schema used for account exports
+ * [libravatar/templates/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar/templates): HTML templates
+ * [libravatar/tools/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar/tools): helpful interactive tools
+* [static/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/static): CSS stylesheets, Javascripts and images need by the Django application
+ * [static/cdn/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/static/cdn): images needed by the avatar CDNs
 
 As far as getting your head around the Django-specific code, have a look at the [excellent manual](https://docs.djangoproject.com/en/1.2/) they provide.
diff --git a/coding_guidelines.mdwn b/coding_guidelines.mdwn
index 7994730..cf49088 100644
--- a/coding_guidelines.mdwn
+++ b/coding_guidelines.mdwn
@@ -2,4 +2,4 @@ The main Django application follows the usual the usual [PEP-8](http://www.pytho
 
 We also enforce some of this through [pylint](http://www.logilab.org/project/pylint) in the test suite (<tt>make test</tt>).
 
-(These guidelines are also included in the [HACKING.md](https://gitorious.org/libravatar/libravatar/blobs/master/HACKING.md) file distributed with Libravatar.)
+(These guidelines are also included in the [HACKING.md](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/HACKING.md) file distributed with Libravatar.)
diff --git a/designer.mdwn b/designer.mdwn
index 51a1987..13ba792 100644
--- a/designer.mdwn
+++ b/designer.mdwn
@@ -4,6 +4,6 @@ We would be delighted to have you on board!
 
 The best place to start is to [[talk to us]] and then:
 
-1. grab a copy of the [HTML templates](https://gitorious.org/libravatar/libravatar/trees/master/libravatar/templates) and [CSS files](https://gitorious.org/libravatar/libravatar/trees/master/static/css)
+1. grab a copy of the [HTML templates](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar/templates/) and [CSS files](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/static/css/)
 2. make them look fresh and attractive (i.e. the hard creative bit)
 3. attach them to a [new bug report](https://bugs.launchpad.net/libravatar/+filebug)
diff --git a/development_environment.mdwn b/development_environment.mdwn
index 7eba31f..b93bd9b 100644
--- a/development_environment.mdwn
+++ b/development_environment.mdwn
@@ -59,7 +59,7 @@ To create and initialize your chroot-based environment:
 * get a copy of the repo:
 
       cd /root
-      git clone git://gitorious.org/libravatar/libravatar.git
+      git clone https://git.nzoss.org.nz/libravatar/libravatar.git
 
 * create a config file for your environment:
 
diff --git a/easy_development_tasks.mdwn b/easy_development_tasks.mdwn
index b954457..90ab494 100644
--- a/easy_development_tasks.mdwn
+++ b/easy_development_tasks.mdwn
@@ -1,7 +1,7 @@
 There are two places where we keep track of things to do in the project:
 
 * [Bug tracker](https://bugs.launchpad.net/libravatar): for bugs and suggested features in the code
-* [TODO file](https://gitorious.org/libravatar/libravatar/blobs/master/TODO.md): for project-wide or sysadmin tasks
+* [TODO file](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/TODO.md): for project-wide or sysadmin tasks
 
 But if you are looking for an easy bug / feature to start with, you may want to:
 
diff --git a/freedom-respecting_infrastructure.mdwn b/freedom-respecting_infrastructure.mdwn
index 5458f61..b6147c4 100644
--- a/freedom-respecting_infrastructure.mdwn
+++ b/freedom-respecting_infrastructure.mdwn
@@ -1,6 +1,6 @@
 The Libravatar project is proud to support other [free-as-in-freedom](http://autonomo.us/2008/07/franklin-street-statement/) services:
 
 * [Branchable](http://www.branchable.com) ([blog](http://blog.libravatar.org) and [wiki](http://wiki.libravatar.org))
-* [Gitorious](http://gitorious.org) ([code mirror](http://gitorious.org/libravatar))
+* [Gitlab CE](https://gitlab.com/gitlab-org/gitlab-ce) ([code hosting](https://git.nzoss.org.nz/libravatar))
 * [Identica](http://identi.ca) ([micro-blogging](http://identi.ca/libravatar))
-* [Launchpad](https://launchpad.net) ([bug tracker](https://bugs.launchpad.net/libravatar), [translations](https://translations.launchpad.net/libravatar), [code hosting](https://code.launchpad.net/libravatar) and [mailing list](https://launchpad.net/~libravatar-fans))
+* [Launchpad](https://launchpad.net) ([bug tracker](https://bugs.launchpad.net/libravatar), [translations](https://translations.launchpad.net/libravatar), [code mirror](https://code.launchpad.net/libravatar) and [mailing list](https://launchpad.net/~libravatar-fans))
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 6edef5a..624d5f4 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
@@ -60,7 +60,7 @@ and then lookup images using the [test tool](https://www.libravatar.org/tools/ch
        cdn      AAAA 10   dead::beef
        seccdn   AAAA 10   dead::beef
 
-2. Add the same records to the [JSON zone file](https://gitorious.org/libravatar/libravatar/blobs/master/config/dns.json) and then use <tt>namecoind</tt> to update the <tt>libravatar.bit</tt> zone:
+2. Add the same records to the [JSON zone file](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/config/dns.json) and then use <tt>namecoind</tt> to update the <tt>libravatar.bit</tt> zone:
 
        namecoind name_update d/libravatar "`xargs echo < config/dns.json`"
 
diff --git a/how_to_add_a_new_translation.mdwn b/how_to_add_a_new_translation.mdwn
index 3d71506..5ea4522 100644
--- a/how_to_add_a_new_translation.mdwn
+++ b/how_to_add_a_new_translation.mdwn
@@ -1,8 +1,8 @@
 Here is the current list of steps required to add a new po-based translation to the Libravatar codebase:
 
 1. get the po file from the [Launchpad repo](https://code.launchpad.net/~libravatar/libravatar/libravatar-po)
-2. add the po file under [po/libravatar](https://gitorious.org/libravatar/libravatar/trees/master/po/libravatar)
-3. create a new directory under [libravatar/locale/](https://gitorious.org/libravatar/libravatar/trees/master/libravatar/locale) add the appropriate symlink pointing to the above po file
-4. add the language to the <tt>LANGUAGES</tt> array in [libravatar/settings.py.example](https://gitorious.org/libravatar/libravatar/blobs/master/libravatar/settings.py.example) and the local <tt>settings.py</tt>
-5. add the language code to the for loop in the <tt>pofiles</tt> target of the [Makefile](https://gitorious.org/libravatar/libravatar/blobs/master/Makefile)
+2. add the po file under [po/libravatar](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/po/libravatar)
+3. create a new directory under [libravatar/locale/](https://bazaar.launchpad.net/~libravatar/libravatar/master/files/head:/libravatar/locale) add the appropriate symlink pointing to the above po file
+4. add the language to the <tt>LANGUAGES</tt> array in [libravatar/settings.py.example](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/libravatar/settings.py.example) and the local <tt>settings.py</tt>
+5. add the language code to the for loop in the <tt>pofiles</tt> target of the [Makefile](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/Makefile)
 6. run the <tt>make pofiles</tt> command and commit changes to the <tt>en</tt> translation (i.e. the POT file)
diff --git a/running_your_own.mdwn b/running_your_own.mdwn
index 53fc2cc..36479cb 100644
--- a/running_your_own.mdwn
+++ b/running_your_own.mdwn
@@ -19,17 +19,17 @@ The following instructions are about the official libravatar.org software.
 
 ## System requirements
 
-You can find the latest system requirements in the [installation instructions](https://gitorious.org/libravatar/libravatar/blobs/master/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 6](http://www.debian.org/releases/squeeze/) (squeeze).
 
 ## Getting the code
 
-We are not currently doing regular releases of the code, but you can easily get the latest copy from our [git repository](https://gitorious.org/libravatar/libravatar):
+We are not currently doing regular releases of the code, but you can easily get the latest copy from our [git repository](https://git.nzoss.org.nz/libravatar/libravatar):
 
-    git clone git://gitorious.org/libravatar/libravatar.git
+    git clone https://git.nzoss.org.nz/libravatar/libravatar.git
 
 ## Installation
 
-Once you've got a copy of the code, follow the instructions in the [INSTALL](https://gitorious.org/libravatar/libravatar/blobs/master/INSTALL.md) file.
+Once you've got a copy of the code, follow the instructions in the [INSTALL](https://bazaar.launchpad.net/~libravatar/libravatar/master/view/head:/INSTALL.md) file.
 
 ## Configuration
 
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 45d769b..3520f8b 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -241,7 +241,7 @@ you've installed Debian and the usual server packages.
       #!/bin/bash
       
       DIR=/home/francois/git-mirrors
-      cd $DIR/gitorious
+      cd $DIR/git
       git fetch --quiet origin 2> /dev/null
       git reset --quiet --hard origin/master
       git push --quiet github master 2> /dev/null
@@ -251,11 +251,11 @@ you've installed Debian and the usual server packages.
 
       #!/bin/bash
       DIR=/home/francois/git-mirrors
-      cd $DIR/gitorious
+      cd $DIR/git
       git fetch --quiet origin 2> /dev/null
       git reset --quiet --hard origin/master
       cd $DIR
-      hg --quiet convert gitorious libravatar-hg
+      hg --quiet convert git libravatar-hg
       cd $DIR/libravatar-hg
       hg --quiet update
       hg --quiet push ssh://bitbucket.org/libravatar/libravatar 2> /dev/null
@@ -263,8 +263,6 @@ you've installed Debian and the usual server packages.
 

(Diff truncated)
Gitorious is defunct :(
diff --git a/suggested_plugins.mdwn b/suggested_plugins.mdwn
index 0d3dc42..2edade9 100644
--- a/suggested_plugins.mdwn
+++ b/suggested_plugins.mdwn
@@ -13,7 +13,6 @@ The following [[plugins|libraries]] have been suggested:
 * [GroupServer/OnlineGroups.net](http://groupserver.org/)
 * [gnus](http://julien.danjou.info/blog/index.html#Gnus_and_Gravatar_support)
 * [Redmine](http://www.redmine.org) - [Feature #9112](http://www.redmine.org/issues/9112)
-* [Gitorious](https://issues.gitorious.org/issues/62)
 * Pidgin
 * BuddyCloud
 

Use the canonical repositories for ikiwiki and koha
My gitorious branches have been deleted.
diff --git a/writing_a_plugin.mdwn b/writing_a_plugin.mdwn
index a7b065e..2919326 100644
--- a/writing_a_plugin.mdwn
+++ b/writing_a_plugin.mdwn
@@ -2,8 +2,12 @@ Most of the time, writing a plugin or adding Libravatar support to an existing w
 
 For example, have a look at how it was done for these two Perl applications:
 
-* [Ikiwiki](https://gitorious.org/~fmarier/ikiwiki/fmarier-sandbox/commits/libravatar-in-comments)
-* [Koha](https://gitorious.org/~fmarier/koha/francois-sandbox/commits/libravatar_support)
+* [Ikiwiki](http://ikiwiki.info)
+ * <http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=7723e94218a8c526fc8d869086c05dd382268649>
+ * <http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=e2e1b1cd20928e2b80871e5daffaea60738d054e>
+* [Koha](http://koha-community.org)
+ * <http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=d3990031eda7f1c87d8b9f74d97625cf0c143eb3>
+ * <http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=f44b674ed5a70663bc5e9808b6d0a41cec5497a0>
 
 As you can see, all of the hard bits are done in the [Libravatar::URL](http://search.cpan.org/~fmarier/Gravatar-URL-1.04/lib/Libravatar/URL.pm) CPAN module. Which brings us to the most important guideline...
 

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

Move the encode call to the string to make the next step more readable
diff --git a/api.mdwn b/api.mdwn
index e6adfdb..ff40c57 100644
--- a/api.mdwn
+++ b/api.mdwn
@@ -13,8 +13,8 @@ There are 5 steps for displaying Libravatar-hosted images into your application:
 Here's an example in Python:
 
     import hashlib
-    email = 'George@example.com'
-    hash = hashlib.md5(email.encode('utf-8').strip().lower()).hexdigest()
+    email = 'George@example.com'.encode('utf-8')
+    hash = hashlib.md5(email.strip().lower()).hexdigest()
 
 which gives us a hash of <tt>40f8d096a3777232204cb3f796c577b7</tt> and therefore the following image tag:
 

python told me TypeError: Unicode-objects must be encoded before hashing
diff --git a/api.mdwn b/api.mdwn
index 9f135d9..e6adfdb 100644
--- a/api.mdwn
+++ b/api.mdwn
@@ -14,7 +14,7 @@ Here's an example in Python:
 
     import hashlib
     email = 'George@example.com'
-    hash = hashlib.md5(email.strip().lower()).hexdigest()
+    hash = hashlib.md5(email.encode('utf-8').strip().lower()).hexdigest()
 
 which gives us a hash of <tt>40f8d096a3777232204cb3f796c577b7</tt> and therefore the following image tag:
 

Add missing linters
diff --git a/development_environment.mdwn b/development_environment.mdwn
index 48f6441..7eba31f 100644
--- a/development_environment.mdwn
+++ b/development_environment.mdwn
@@ -54,7 +54,7 @@ To create and initialize your chroot-based environment:
 
 * install the required packages in the chroot:
 
-      apt-get install git make debhelper yui-compressor python-django python-psycopg2 python-gearman.libgearman python-imaging python-openid python-dns pylint
+      apt-get install git make debhelper yui-compressor python-django python-psycopg2 python-gearman.libgearman python-imaging python-openid python-dns pylint pep8 pyflakes
 
 * get a copy of the repo:
 

Fix formatting
diff --git a/development_environment.mdwn b/development_environment.mdwn
index 40db212..48f6441 100644
--- a/development_environment.mdwn
+++ b/development_environment.mdwn
@@ -8,20 +8,20 @@ You must do the following **in your host environment**:
 
 * install a database server:
 
-        apt-get install postgresql
+      apt-get install postgresql
 
 * create a user and a database:
 
-        sudo -u postgres createuser -D -P -R -S djangouser
-        sudo -u postgres createdb -O djangouser libravatar
+      sudo -u postgres createuser -D -P -R -S djangouser
+      sudo -u postgres createdb -O djangouser libravatar
 
 * stop Apache (if running):
 
-        sudo /etc/init.d/apache2 stop
+      sudo /etc/init.d/apache2 stop
 
 * put the following in your <tt>/etc/hosts</tt>:
 
-        127.0.0.1 www.localavatar.org cdn.localavatar.org seccdn.localavatar.org
+      127.0.0.1 www.localavatar.org cdn.localavatar.org seccdn.localavatar.org
 
 # Initial setup
 
@@ -29,69 +29,69 @@ To create and initialize your chroot-based environment:
 
 * create a new chroot:
 
-        mkdir /var/chroot/squeeze-amd64
-        debootstrap squeeze /var/chroot/squeeze-amd64 http://ftp.us.debian.org/debian
+      mkdir /var/chroot/squeeze-amd64
+      debootstrap squeeze /var/chroot/squeeze-amd64 http://ftp.us.debian.org/debian
 
 * add this line to <tt>/etc/fstab</tt>:
 
-        proc  /var/chroot/squeeze-amd64/proc  proc  defaults  0  0
+      proc  /var/chroot/squeeze-amd64/proc  proc  defaults  0  0
 
 * mount the necessary filesystems:
 
-        mount -a 
+      mount -a
 
 * install the schroot package and put this in your /etc/schroot/schroot.conf:
 
-        [squeeze]
-        description=Debian Squeeze amd64 (squeeze)
-        directory=/var/chroot/squeeze-amd64
-        root-groups=root
-        personality=linux
+      [squeeze]
+      description=Debian Squeeze amd64 (squeeze)
+      directory=/var/chroot/squeeze-amd64
+      root-groups=root
+      personality=linux
 
 * enter the chroot as root:
 
-        sudo schroot -c squeeze
+      sudo schroot -c squeeze
 
 * install the required packages in the chroot:
 
-        apt-get install git make debhelper yui-compressor python-django python-psycopg2 python-gearman.libgearman python-imaging python-openid python-dns pylint
+      apt-get install git make debhelper yui-compressor python-django python-psycopg2 python-gearman.libgearman python-imaging python-openid python-dns pylint
 
 * get a copy of the repo:
 
-        cd /root
-        git clone git://gitorious.org/libravatar/libravatar.git
+      cd /root
+      git clone git://gitorious.org/libravatar/libravatar.git
 
 * create a config file for your environment:
 
-        cd /root/libravatar/libravatar
-        cp libravatar/settings.py.example libravatar/settings.py
+      cd /root/libravatar/libravatar
+      cp libravatar/settings.py.example libravatar/settings.py
 
     (edit <tt>settings.py</tt> to use <tt>localavatar.org</tt> as the domain and contain the right database credentials)
 
 * build the packages:
 
-        cd /root/libravatar
-        make package
+      cd /root/libravatar
+      make package
 
 * install the packages:
 
-        cd /root
-        dpkg -i libravatar-{common,cdn,seccdn,www}*deb
-        apt-get install -f
+      cd /root
+      dpkg -i libravatar-{common,cdn,seccdn,www}*deb
+      apt-get install -f
 
     (use <tt>localavatar.org</tt> as the domain name and <tt>localhost</tt> as the db hostname)
 
 * create a self-signed SSL certificate:
 
-        make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /etc/libravatar/seccdn.pem
-        cp /etc/libravatar/seccdn.{pem,crt}
-        cp /etc/libravatar/{seccdn,chain}.pem
+      make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /etc/libravatar/seccdn.pem
+      cp /etc/libravatar/seccdn.{pem,crt}
+      cp /etc/libravatar/{seccdn,chain}.pem
 
     (use <tt>seccdn.localavatar.org</tt> as the common name)
 
 * start Apache:
 
-        /etc/init.d/apache2 start
+      /etc/init.d/apache2 start
 
 # Entering the chroot to work
 
@@ -99,16 +99,16 @@ The next time you want to get inside the chroot to do some work, simply do the f
 
 * stop Apache on the main host:
 
-        sudo /etc/init.d/apache2 stop
+      sudo /etc/init.d/apache2 stop
 
 * enter the chroot as root:
 
-        sudo schroot -c squeeze
+      sudo schroot -c squeeze
 
 * start apache and gearman in the chroot guest:
 
-        /etc/init.d/apache2 start
-        /etc/init.d/gearman-job-server start
+      /etc/init.d/apache2 start
+      /etc/init.d/gearman-job-server start
 
 
 # Updating the codebase
@@ -117,22 +117,22 @@ If you want to update the Libravatar codebase you are working from, do this:
 
 * update the branch:
 
-        cd /root/libravatar
-        git pull
+      cd /root/libravatar
+      git pull
 
 * get rid of old packages:
 
-        cd /root
-        rm -f libravatar*.deb
+      cd /root
+      rm -f libravatar*.deb
 
 * build and install new packages:
 
-        cd /root/libravatar
-        make package
+      cd /root/libravatar
+      make package
 
-        cd /root
-        dpkg -i libravatar-{common,cdn,seccdn,www}*deb
+      cd /root
+      dpkg -i libravatar-{common,cdn,seccdn,www}*deb
 
 * restart apache:
 
-        /etc/init.d/apache2 restart
+      /etc/init.d/apache2 restart

spam
This reverts commit ad4082bc4a6f905bfce9df557e0dc764841c6be7
diff --git a/libraries.mdwn b/libraries.mdwn
index 3e8d43e..9827c3f 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -115,6 +115,3 @@ There aren't many plugins available at the moment, but please [[suggest the ones
 # Contribute!
 
 Interested in writing a plugin for your favourite framework/CMS or a library for your favourite language? Please [[get in touch|talk to us]], we would be more than happy to link to them from this page!
-
-
-[exeter cleaners](https://www.maid2clean.co.uk/domestic-cleaning/exeter/)

diff --git a/libraries.mdwn b/libraries.mdwn
index 9827c3f..3e8d43e 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -115,3 +115,6 @@ There aren't many plugins available at the moment, but please [[suggest the ones
 # Contribute!
 
 Interested in writing a plugin for your favourite framework/CMS or a library for your favourite language? Please [[get in touch|talk to us]], we would be more than happy to link to them from this page!
+
+
+[exeter cleaners](https://www.maid2clean.co.uk/domestic-cleaning/exeter/)

mention publication deadlines
diff --git a/security.mdwn b/security.mdwn
index c86b47b..3fe799e 100644
--- a/security.mdwn
+++ b/security.mdwn
@@ -8,6 +8,8 @@ Alternatively, you can talk to us at [security@libravatar.org](mailto:security@l
 
 We will do our best to respond to you within 24-48 hours.
 
+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!*

basic ideas
diff --git a/Security_researcher.mdwn b/Security_researcher.mdwn
new file mode 100644
index 0000000..1cd4c52
--- /dev/null
+++ b/Security_researcher.mdwn
@@ -0,0 +1,3 @@
+If you are a security researcher and would like to test Libravatar, please [[get in touch|talk to us]] so that we can discuss scope.
+
+If you have already found a security vulnerability and would like to share it with us, please see our [[disclosure policy|security]].

create a new contribution role: security researcher
diff --git a/contribute.mdwn b/contribute.mdwn
index b06099d..f7f3d6a 100644
--- a/contribute.mdwn
+++ b/contribute.mdwn
@@ -5,6 +5,7 @@ There are a few more specific pages for particular profiles of contributors:
 * [[Designer]]
 * [[Developer]]
 * [[Translator]]
+* [[Security researcher]]
 
 as well as a few other ideas:
 

add information about reporting security bugs
diff --git a/security.mdwn b/security.mdwn
new file mode 100644
index 0000000..c86b47b
--- /dev/null
+++ b/security.mdwn
@@ -0,0 +1,13 @@
+# Reporting security bugs
+
+If you discover a security issue in Libravatar, please report it to us privately so that we can push a fix to the main service before disclosing the problem publicly. We will credit you publicly (unless you don't want to) with this discovery.
+
+The best way to do that is to file a security bug on our [bug tracker](https://bugs.launchpad.net/libravatar/+filebug). Make sure you change the bug visibibility (see "This bug contains information that is") to **Private Security**.
+
+Alternatively, you can talk to us at [security@libravatar.org](mailto:security@libravatar.org).
+
+We will do our best to respond to you within 24-48 hours.
+
+# Security Hall of fame
+
+*Report a security bug you discovered and get your name added here!*

Switch to HTTPS image to get rid of mixed content warnings when accessing the main page over HTTPS
diff --git a/index.mdwn b/index.mdwn
index 357dc31..d081eb5 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,4 +1,4 @@
-<img src="http://cdn.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">
 
 [Libravatar](https://www.libravatar.org) is a free service for hosting
 profile images tied to your email address or OpenID. Once you have an

update link to claws mail plugin
diff --git a/libraries.mdwn b/libraries.mdwn
index 1e28437..9827c3f 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -98,7 +98,7 @@ The [txLibravatar](http://pypi.python.org/pypi/txLibravatar) module can be used
 
 There aren't many plugins available at the moment, but please [[suggest the ones|suggested plugins]] you'd like to have.
 
-* [Claws Mail](http://git.claws-mail.org/?p=claws.git;a=blob;f=src/plugins/libravatar/README)
+* [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)
 * [Ikiwiki](http://ikiwiki.info) (part of core, automatically enabled if [Libravatar::URL](http://search.cpan.org/dist/Gravatar-URL/) is installed)

Use the right filenames and include the last steps
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index e833718..45d769b 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -108,13 +108,14 @@ you've installed Debian and the usual server packages.
 
 * Generate a new certificate:
 
-      openssl genrsa -out www.libravatar.org.pem 2048
+      openssl genrsa -out www.pem 2048
 
 * Create a certificate signing request:
 
-      openssl req -new -key www.libravatar.org.pem -subj "/CN=www.libravatar.org" -out www.libravatar.org.csr
+      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.
+* 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
 

Fix formatting
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 44ac8b1..e833718 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -101,8 +101,8 @@ you've installed Debian and the usual server packages.
 
 * Put the following in `/etc/pgbouncer/userlist.txt`:
 
-        "djangouser" ""
-        "postgres" ""
+      "djangouser" ""
+      "postgres" ""
 
 # TLS certificate
 

Add instructions on how to generate / update the TLS cert
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index f4aedf6..44ac8b1 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -99,11 +99,23 @@ 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" ""
 
+# TLS certificate
+
+* Generate a new certificate:
+
+      openssl genrsa -out www.libravatar.org.pem 2048
+
+* Create a certificate signing request:
+
+      openssl req -new -key www.libravatar.org.pem -subj "/CN=www.libravatar.org" -out www.libravatar.org.csr
+
+* Login into <https://startssl.com> to submit the CSR and download the signed certificate.
+
 # Web server
 
 * Setup some Apache vhosts:

emphasize that git is the master repo
diff --git a/code_checkout.mdwn b/code_checkout.mdwn
index 9ecd0e5..f20218c 100644
--- a/code_checkout.mdwn
+++ b/code_checkout.mdwn
@@ -1,12 +1,4 @@
-The main repository is using git, but that doesn't mean you have to use it since we provide mirrors of the repository in other version control systems.
-
-# 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
+The main repository is using **git**, but that doesn't mean you have to use it since we provide mirrors of the repository in other version control systems.
 
 # Using [git](http://www.git-scm.com)
 
@@ -20,6 +12,14 @@ Otherwise, just check the code out locally:
 
 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 claws mail
diff --git a/libraries.mdwn b/libraries.mdwn
index c8bb46b..1e28437 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -98,6 +98,7 @@ The [txLibravatar](http://pypi.python.org/pypi/txLibravatar) module can be used
 
 There aren't many plugins available at the moment, but please [[suggest the ones|suggested plugins]] you'd like to have.
 
+* [Claws Mail](http://git.claws-mail.org/?p=claws.git;a=blob;f=src/plugins/libravatar/README)
 * [Foswiki](http://foswiki.org/Extensions/AvatarPlugin)
 * [Friendica](https://github.com/friendica/friendica-addons/tree/master/libravatar)
 * [Ikiwiki](http://ikiwiki.info) (part of core, automatically enabled if [Libravatar::URL](http://search.cpan.org/dist/Gravatar-URL/) is installed)

Hardened authorized_keys 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 3006278..6edef5a 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
@@ -33,7 +33,9 @@ Do this on the **slave**:
 
 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`.
+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:
+
+       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
 
 Within about 15 minutes, you should see these files pop up on the slave:
 

Mail aliases need to be tested
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 979e864..f4aedf6 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -13,6 +13,7 @@ you've installed Debian and the usual server packages.
         libravatar-master: root
 
   * Run `newaliases` to update `/etc/aliases.db`
+  * Test the aliases by running `mail root`
 
 * Copy the local logcheck rules from the old server
 

Fix formatting of mirror deployment instructions
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 ae3a6ac..3006278 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
@@ -94,8 +94,8 @@ At the very least, add something like <http://ismyblogworking.com/1.cdn.libravat
 
 1. install the deployment package:
 
-      apt-get install libravatar-deployment
+       apt-get install libravatar-deployment
 
 2. add your ssh user to the `libravatar-deployment` group:
 
-      adduser francois libravatar-deployment
+       adduser francois libravatar-deployment

Document automated deployment setup
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 1c42098..ae3a6ac 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
@@ -89,3 +89,13 @@ At the very least, add something like <http://ismyblogworking.com/1.cdn.libravat
 
        ln -s /usr/share/awstats/icon/ /var/www/awstats-icon
        ln -s /var/cache/awstats/ /var/www/stats
+
+# Enable automated deployments (optional)
+
+1. install the deployment package:
+
+      apt-get install libravatar-deployment
+
+2. add your ssh user to the `libravatar-deployment` group:
+
+      adduser francois libravatar-deployment

add a link to the Libravatar Replace wordpress plugin
diff --git a/libraries.mdwn b/libraries.mdwn
index c3a79af..c8bb46b 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -108,7 +108,7 @@ There aren't many plugins available at the moment, but please [[suggest the ones
 * [Symfony](https://github.com/julienfastre/LibravatarBundle)
 * [Trac](https://pypi.python.org/pypi/tracvatar/)
 * [Weblate](http://weblate.org/) (part of core starting in 1.5)
-* [WordPress](http://wordpress.org/extend/plugins/libravatar/)
+* Wordpress: [Libravatar](http://wordpress.org/extend/plugins/libravatar/) and [Libravatar Replace](http://wordpress.org/plugins/libravatar-replace/)
 * [Zookeepr](http://zookeepr.org/) (part of core, starting with PyCon AU 2012)
 
 # Contribute!

add Trac plugin
diff --git a/libraries.mdwn b/libraries.mdwn
index 61a722b..c3a79af 100644
--- a/libraries.mdwn
+++ b/libraries.mdwn
@@ -106,6 +106,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)
+* [Trac](https://pypi.python.org/pypi/tracvatar/)
 * [Weblate](http://weblate.org/) (part of core starting in 1.5)
 * [WordPress](http://wordpress.org/extend/plugins/libravatar/)
 * [Zookeepr](http://zookeepr.org/) (part of core, starting with PyCon AU 2012)

Fix punctuation typo
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 f4fd33a..1c42098 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
@@ -33,7 +33,7 @@ Do this on the **slave**:
 
 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`:
+1. add the slave's ssh pubkey (in `/var/lib/libravatar/slave/.ssh/id_rsa.pub`) to `/var/lib/libravatar/master/.ssh/authorized_keys`.
 
 Within about 15 minutes, you should see these files pop up on the slave:
 

Another attempt at fixing indentation
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 3a8a5fe..f4fd33a 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,29 +7,29 @@ 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
-      gpg --keyserver pgp.net.nz --recv 007c98d1
-      gpg -a --export 007c98d1 | apt-key add -
+       echo "deb http://apt.libravatar.org/ wheezy main" >> /etc/apt/sources.list
+       gpg --keyserver pgp.net.nz --recv 007c98d1
+       gpg -a --export 007c98d1 | apt-key add -
 
 1. install the required packages on the slave:
 
-      apt-get update
-      apt-get install libravatar-{common,cdn-common,cdn,seccdn,slave}
+       apt-get update
+       apt-get install libravatar-{common,cdn-common,cdn,seccdn,slave}
 
 2. create SSL certificate placeholders:
 
-      touch /etc/libravatar/seccdn-chain.pem
-      touch /etc/libravatar/seccdn.pem
-      touch /etc/libravatar/seccdn.crt
+       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
+       libravatar-slave: mirrors@libravatar.org
 
 4. update the postfix config:
 
-      newaliases
-      /etc/init.d/postfix reload
+       newaliases
+       /etc/init.d/postfix reload
 
 Do this on the **master**:
 
@@ -53,14 +53,14 @@ and then lookup images using the [test tool](https://www.libravatar.org/tools/ch
 
 1. Add these two DNS records in the <tt>libravatar.org</tt> zone:
 
-      cdn      A    10   123.123.123.123
-      seccdn   A    10   123.123.123.123
-      cdn      AAAA 10   dead::beef
-      seccdn   AAAA 10   dead::beef
+       cdn      A    10   123.123.123.123
+       seccdn   A    10   123.123.123.123
+       cdn      AAAA 10   dead::beef
+       seccdn   AAAA 10   dead::beef
 
 2. Add the same records to the [JSON zone file](https://gitorious.org/libravatar/libravatar/blobs/master/config/dns.json) and then use <tt>namecoind</tt> to update the <tt>libravatar.bit</tt> zone:
 
-      namecoind name_update d/libravatar "`xargs echo < config/dns.json`"
+       namecoind name_update d/libravatar "`xargs echo < config/dns.json`"
 
 
 # SSL testing
@@ -77,15 +77,15 @@ At the very least, add something like <http://ismyblogworking.com/1.cdn.libravat
 
 1. install awstats:
 
-      apt-get install awstats
+       apt-get install awstats
 
 2. add this to <tt>/etc/awstats/awstats.conf.local</tt>:
 
-      SiteDomain="libravatar.org"
-      LogType=W
-      LogFormat=1
+       SiteDomain="libravatar.org"
+       LogType=W
+       LogFormat=1
 
 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/awstats-icon
+       ln -s /var/cache/awstats/ /var/www/stats

A few fixes after setting up cdn5
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 dc8c33c..3a8a5fe 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,33 +7,33 @@ 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/ squeeze main" >> /etc/apt/sources.list
-        gpg --keyserver pgp.net.nz --recv 007c98d1
-        gpg -a --export 007c98d1 | apt-key add -
+      echo "deb http://apt.libravatar.org/ wheezy main" >> /etc/apt/sources.list
+      gpg --keyserver pgp.net.nz --recv 007c98d1
+      gpg -a --export 007c98d1 | apt-key add -
 
 1. install the required packages on the slave:
 
-        apt-get update
-        apt-get install libravatar-{common,cdn-common,cdn,seccdn,slave}
+      apt-get update
+      apt-get install libravatar-{common,cdn-common,cdn,seccdn,slave}
 
-2. copy the SSL certificate into place:
+2. create SSL certificate placeholders:
 
-        cp seccdn-chain.pem /etc/libravatar/
-        cp seccdn.pem /etc/libravatar/
-        cp seccdn.crt /etc/libravatar/
+      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
+      libravatar-slave: mirrors@libravatar.org
 
 4. update the postfix config:
 
-        newaliases
-        /etc/init.d/postfix reload
+      newaliases
+      /etc/init.d/postfix reload
 
 Do this on the **master**:
 
-1. add the slave's ssh pubkey to `/var/lib/libravatar/master/.ssh/authorized_keys`:
+1. add the slave's ssh pubkey (in `/var/lib/libravatar/slave/.ssh/id_rsa.pub`) to `/var/lib/libravatar/master/.ssh/authorized_keys`:
 
 Within about 15 minutes, you should see these files pop up on the slave:
 
@@ -53,14 +53,14 @@ and then lookup images using the [test tool](https://www.libravatar.org/tools/ch
 
 1. Add these two DNS records in the <tt>libravatar.org</tt> zone:
 
-        cdn      A    10   123.123.123.123
-        seccdn   A    10   123.123.123.123
-        cdn      AAAA 10   dead::beef
-        seccdn   AAAA 10   dead::beef
+      cdn      A    10   123.123.123.123
+      seccdn   A    10   123.123.123.123
+      cdn      AAAA 10   dead::beef
+      seccdn   AAAA 10   dead::beef
 
 2. Add the same records to the [JSON zone file](https://gitorious.org/libravatar/libravatar/blobs/master/config/dns.json) and then use <tt>namecoind</tt> to update the <tt>libravatar.bit</tt> zone:
 
-        namecoind name_update d/libravatar "`xargs echo < config/dns.json`"
+      namecoind name_update d/libravatar "`xargs echo < config/dns.json`"
 
 
 # SSL testing
@@ -77,15 +77,15 @@ At the very least, add something like <http://ismyblogworking.com/1.cdn.libravat
 
 1. install awstats:
 
-        apt-get install awstats
+      apt-get install awstats
 
 2. add this to <tt>/etc/awstats/awstats.conf.local</tt>:
 
-        SiteDomain="libravatar.org"
-        LogType=W
-        LogFormat=1
+      SiteDomain="libravatar.org"
+      LogType=W
+      LogFormat=1
 
 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/awstats-icon
+      ln -s /var/cache/awstats/ /var/www/stats

More formatting fixes
diff --git a/setup_instructions.mdwn b/setup_instructions.mdwn
index 525a480..979e864 100644
--- a/setup_instructions.mdwn
+++ b/setup_instructions.mdwn
@@ -80,7 +80,7 @@ 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 
+        log_min_duration_statement =  400
         ssl = false
 
   * Create postgres users:
@@ -109,8 +109,8 @@ you've installed Debian and the usual server packages.
   * `/etc/apache2/sites-enabled/000-default`:
  
         <VirtualHost *:80>
-          RewriteEngine On
-          RewriteRule ^ https://www.libravatar.org [redirect=301,last]
+            RewriteEngine On
+            RewriteRule ^ https://www.libravatar.org [redirect=301,last]
         </VirtualHost>
 
   * `/etc/apache2/sites-enabled/default-ssl`:
@@ -222,56 +222,55 @@ you've installed Debian and the usual server packages.
 
 # Git mirrors
 
-* Setup the Github and Bitbucket mirrors
-  * Add this script in `/usr/local/bin/git-mirror`:
+* Add this script in `/usr/local/bin/git-mirror`:
 
-        #!/bin/bash
-        
-        DIR=/home/francois/git-mirrors
-        cd $DIR/gitorious
-        git fetch --quiet origin 2> /dev/null
-        git reset --quiet --hard origin/master
-        git push --quiet github master 2> /dev/null
-        exit 0
-
-  * Add this script in `/usr/local/bin/hg-mirror`:
-
-        #!/bin/bash
-        DIR=/home/francois/git-mirrors
-        cd $DIR/gitorious
-        git fetch --quiet origin 2> /dev/null
-        git reset --quiet --hard origin/master
-        cd $DIR
-        hg --quiet convert gitorious libravatar-hg
-        cd $DIR/libravatar-hg
-        hg --quiet update
-        hg --quiet push ssh://bitbucket.org/libravatar/libravatar 2> /dev/null
-        exit 0
-
-  * Add this to `/home/francois/.ssh/config`:
-
-        Host gitorious.org
-          AddressFamily inet
-        Host bitbucket.org
-          User hg
-          IdentityFile ~/.ssh/repository_mirrors
-        Host github.com
-          User git
-          IdentityFile ~/.ssh/repository_mirrors
-          AddressFamily inet
-
-  * Copy `repository_mirrors` ssh key from old server into `/home/francois/.ssh/`
-  * Create directory for mercurial mirror: `mkdir -p /home/francois/git-mirrors/libravatar-hg`
-  * Prepare directory for git repository:
-
-        cd /home/francois/git-mirrors/
-        git clone git://gitorious.org/libravatar/libravatar.git gitorious
-        git remote add github git@github.com:libravatar/libravatar.git      
-
-  * Create the following cron jobs in `/etc/cron.d/libravatar_git-mirrors`:
-
-        50 * * * *      francois        /usr/local/bin/git-mirror
-        55 * * * *      francois        /usr/local/bin/hg-mirror
+      #!/bin/bash
+      
+      DIR=/home/francois/git-mirrors
+      cd $DIR/gitorious
+      git fetch --quiet origin 2> /dev/null
+      git reset --quiet --hard origin/master
+      git push --quiet github master 2> /dev/null
+      exit 0
+
+* Add this script in `/usr/local/bin/hg-mirror`:
+
+      #!/bin/bash
+      DIR=/home/francois/git-mirrors
+      cd $DIR/gitorious
+      git fetch --quiet origin 2> /dev/null
+      git reset --quiet --hard origin/master
+      cd $DIR
+      hg --quiet convert gitorious libravatar-hg
+      cd $DIR/libravatar-hg
+      hg --quiet update
+      hg --quiet push ssh://bitbucket.org/libravatar/libravatar 2> /dev/null
+      exit 0
+
+* Add this to `/home/francois/.ssh/config`:
+
+      Host gitorious.org
+        AddressFamily inet
+      Host bitbucket.org
+        User hg
+        IdentityFile ~/.ssh/repository_mirrors
+      Host github.com
+        User git
+        IdentityFile ~/.ssh/repository_mirrors
+        AddressFamily inet
+
+* Copy `repository_mirrors` ssh key from old server into `/home/francois/.ssh/`
+* Create directory for mercurial mirror: `mkdir -p /home/francois/git-mirrors/libravatar-hg`
+* Prepare directory for git repository:
+
+      cd /home/francois/git-mirrors/
+      git clone git://gitorious.org/libravatar/libravatar.git gitorious
+      git remote add github git@github.com:libravatar/libravatar.git
+
+* Create the following cron jobs in `/etc/cron.d/libravatar_git-mirrors`:
+
+      50 * * * *      francois        /usr/local/bin/git-mirror
+      55 * * * *      francois        /usr/local/bin/hg-mirror
 
 
 # From the old server
@@ -279,8 +278,16 @@ you've installed Debian and the usual server packages.
 If migrating from one server to another:
 
 * Setup the database
-  * Get a DB dump from the previous server: `pg_dump -Fc libravatar > libravatar.pg`
-  * Create a new database: `createdb -O djangouser -E utf8 libravatar`
-  * Restore the database: `pg_restore -d libravatar < libravatar.pg`
+  * Get a DB dump from the old server:
+
+        pg_dump -Fc libravatar > libravatar.pg
+
+  * Create a new database:
+
+        createdb -O djangouser -E utf8 libravatar
+
+  * Restore the database:
+
+        pg_restore -d libravatar < libravatar.pg
 
 * Copy the contents of `/var/lib/libravatar/` from the old server