10 files changed, 73 insertions, 47 deletions
diff --git a/doc/en_US/2fa.markdown b/doc/en_US/2fa.markdown
index ed9b0c99..fe55cbe3 100644
--- a/doc/en_US/2fa.markdown
+++ b/doc/en_US/2fa.markdown
@@ -12,7 +12,7 @@ There are many software compatible with the standard TOTP system.
 For example, you can use these applications:
 
 - [Google Authenticator](https://github.com/google/google-authenticator/) (Android, iOS, Blackberry)
-- [FreeOTP](https://fedorahosted.org/freeotp/) (Android, iOS)
+- [FreeOTP](https://freeotp.github.io/) (Android, iOS)
 - [OATH Toolkit](http://www.nongnu.org/oath-toolkit/) (Command line utility on Unix/Linux)
 
 This system can work offline and you don't necessarily need to have a mobile phone.
diff --git a/doc/en_US/centos-installation.markdown b/doc/en_US/centos-installation.markdown
index 1d83aef0..a15f43f1 100644
--- a/doc/en_US/centos-installation.markdown
+++ b/doc/en_US/centos-installation.markdown
@@ -22,10 +22,13 @@ Install Kanboard:
 
 ```bash
 cd /var/www/html
-wget https://kanboard.net/kanboard-latest.zip
-unzip kanboard-latest.zip
-chown -R apache:apache kanboard/data
-rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+wget https://github.com/kanboard/kanboard/archive/v<version>.zip
+
+unzip kanboard-<version>.zip
+chown -R apache:apache kanboard-<version>/data
+rm kanboard-<version>.zip
 ```
 
 Centos 6.x
@@ -54,10 +57,13 @@ Install Kanboard:
 
 ```bash
 cd /var/www/html
-wget https://kanboard.net/kanboard-latest.zip
-unzip kanboard-latest.zip
-chown -R apache:apache kanboard/data
-rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+wget https://github.com/kanboard/kanboard/archive/v<version>.zip
+
+unzip kanboard-<version>.zip
+chown -R apache:apache kanboard-<version>/data
+rm kanboard-<version>.zip
 ```
 
 SELinux restrictions
diff --git a/doc/en_US/config.markdown b/doc/en_US/config.markdown
index 4fbb9548..f5f57b6f 100644
--- a/doc/en_US/config.markdown
+++ b/doc/en_US/config.markdown
@@ -36,7 +36,7 @@ define('PLUGIN_INSTALLER', true); // Default is true
 Change default plugin directory URL:
 
 ```php
-define('PLUGIN_API_URL', 'https://kanboard.net/plugins.json');
+define('PLUGIN_API_URL', 'https://kanboard.org/plugins.json');
 ```
 
 Folder for uploaded files
diff --git a/doc/en_US/contributing.markdown b/doc/en_US/contributing.markdown
index a08fa591..89306c52 100644
--- a/doc/en_US/contributing.markdown
+++ b/doc/en_US/contributing.markdown
@@ -37,7 +37,7 @@ I want to translate Kanboard
 ----------------------------
 
 Kanboard is translated in many languages.
-However, translations are not complete, take look at the [translation guide to contribute](https://kanboard.net/documentation/translations).
+However, translations are not complete, take look at the [translation guide to contribute](translations.markdown).
 
 I want to improve the documentation
 -----------------------------------
diff --git a/doc/en_US/debian-installation.markdown b/doc/en_US/debian-installation.markdown
index 0fe72f4c..52710328 100644
--- a/doc/en_US/debian-installation.markdown
+++ b/doc/en_US/debian-installation.markdown
@@ -16,10 +16,13 @@ Install Kanboard:
 
 ```bash
 cd /var/www/html
-wget https://kanboard.net/kanboard-latest.zip
-unzip kanboard-latest.zip
-chown -R www-data:www-data kanboard/data
-rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+wget https://github.com/kanboard/kanboard/archive/v<version>.zip
+
+unzip kanboard-<version>.zip
+chown -R www-data:www-data kanboard-<version>/data
+rm kanboard-<version>.zip
 ```
 
 Debian 7 (Wheezy)
@@ -36,10 +39,13 @@ Install Kanboard:
 
 ```bash
 cd /var/www
-wget https://kanboard.net/kanboard-latest.zip
-unzip kanboard-latest.zip
-chown -R www-data:www-data kanboard/data
-rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+wget https://github.com/kanboard/kanboard/archive/v<version>.zip
+
+unzip kanboard-<version>.zip
+chown -R www-data:www-data kanboard-<version>/data
+rm kanboard-<version>.zip
 ```
 
 Debian 6 (Squeeze)
@@ -56,10 +62,13 @@ Install Kanboard:
 
 ```bash
 cd /var/www
-wget https://kanboard.net/kanboard-latest.zip
-unzip kanboard-latest.zip
-chown -R www-data:www-data kanboard/data
-rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+wget https://github.com/kanboard/kanboard/archive/v<version>.zip
+
+unzip kanboard-<version>.zip
+chown -R www-data:www-data kanboard-<version>/data
+rm kanboard-<version>.zip
 ```
 
 Notes
diff --git a/doc/en_US/email-configuration.markdown b/doc/en_US/email-configuration.markdown
index 61d5980a..33772292 100644
--- a/doc/en_US/email-configuration.markdown
+++ b/doc/en_US/email-configuration.markdown
@@ -90,12 +90,11 @@ That can be useful if your SMTP server configuration doesn't accept the default
 
 ### How to display a link to the task in notifications?
 
-To do that, you have to specify the URL of your Kanboard installation in your [Application Settings](https://kanboard.net/documentation/application-configuration).
+To do that, you have to specify the URL of your Kanboard installation in your [Application Settings](application-configuration.markdown).
 By default, nothing is defined, so no links will be displayed.
 
 Examples:
 
-- http://demo.kanboard.net/
 - http://myserver/kanboard/
 - http://kanboard.mydomain.com/
 
diff --git a/doc/en_US/suse-installation.markdown b/doc/en_US/suse-installation.markdown
index 2af773f7..6bd4720e 100644
--- a/doc/en_US/suse-installation.markdown
+++ b/doc/en_US/suse-installation.markdown
@@ -7,8 +7,11 @@ OpenSuse Leap 42.1
 ```bash
 sudo zypper install php5 php5-sqlite php5-gd php5-json php5-mcrypt php5-mbstring php5-openssl
 cd /srv/www/htdocs
-sudo wget https://kanboard.net/kanboard-latest.zip
-sudo unzip kanboard-latest.zip
-sudo chown -R wwwrun /srv/www/htdocs/kanboard
-sudo rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+sudo wget https://github.com/kanboard/kanboard/archive/v<VERSION>.zip
+
+sudo unzip kanboard-<version>.zip
+sudo chown -R wwwrun /srv/www/htdocs/kanboard-<version>
+sudo rm kanboard-<version>.zip
 ```
diff --git a/doc/en_US/syntax-guide.markdown b/doc/en_US/syntax-guide.markdown
index 28d0e297..951523ad 100644
--- a/doc/en_US/syntax-guide.markdown
+++ b/doc/en_US/syntax-guide.markdown
@@ -73,17 +73,17 @@ Links
 ### Source
 
 ```
-[My link title](https://kanboard.net/)
+[My link title](https://kanboard.org/)
 
-<https://kanboard.net>
+<https://kanboard.org>
 
 ```
 
 ### Result
 
-[My link title](https://kanboard.net/)
+[My link title](https://kanboard.org/)
 
-<https://kanboard.net>
+<https://kanboard.org>
 
 Source code
 -----------
diff --git a/doc/en_US/ubuntu-installation.markdown b/doc/en_US/ubuntu-installation.markdown
index 196b506a..5242cceb 100644
--- a/doc/en_US/ubuntu-installation.markdown
+++ b/doc/en_US/ubuntu-installation.markdown
@@ -16,10 +16,13 @@ Install Kanboard:
 
 ```bash
 cd /var/www/html
-sudo wget https://kanboard.net/kanboard-latest.zip
-sudo unzip kanboard-latest.zip
-sudo chown -R www-data:www-data kanboard/data
-sudo rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+wget https://github.com/kanboard/kanboard/archive/v<version>.zip
+
+unzip kanboard-<version>.zip
+chown -R www-data:www-data kanboard-<version>/data
+rm kanboard-<version>.zip
 ```
 
 Ubuntu Trusty 14.04 LTS
@@ -36,10 +39,13 @@ Install Kanboard:
 
 ```bash
 cd /var/www/html
-sudo wget https://kanboard.net/kanboard-latest.zip
-sudo unzip kanboard-latest.zip
-sudo chown -R www-data:www-data kanboard/data
-sudo rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+wget https://github.com/kanboard/kanboard/archive/v<version>.zip
+
+unzip kanboard-<version>.zip
+chown -R www-data:www-data kanboard-<version>/data
+rm kanboard-<version>.zip
 ```
 
 Ubuntu Precise 12.04 LTS
@@ -56,10 +62,13 @@ Install Kanboard:
 
 ```bash
 cd /var/www
-sudo wget https://kanboard.net/kanboard-latest.zip
-sudo unzip kanboard-latest.zip
-sudo chown -R www-data:www-data kanboard/data
-sudo rm kanboard-latest.zip
+
+# Download the latest release from https://github.com/kanboard/kanboard/releases
+wget https://github.com/kanboard/kanboard/archive/v<version>.zip
+
+unzip kanboard-<version>.zip
+chown -R www-data:www-data kanboard-<version>/data
+rm kanboard-<version>.zip
 ```
 
 Some features of Kanboard require that you run [a daily background job](cronjob.markdown).
diff --git a/doc/en_US/worker.markdown b/doc/en_US/worker.markdown
index 89becacd..b4ba4271 100644
--- a/doc/en_US/worker.markdown
+++ b/doc/en_US/worker.markdown
@@ -18,7 +18,7 @@ This feature is optional and require the installation of a queue daemon on your
 [Beanstalk](http://kr.github.io/beanstalkd/) is a simple, fast work queue.
 
 - To install Beanstalk, you can simply use the package manager of your Linux distribution
-- Install the [Kanboard plugin for Beanstalk](https://kanboard.net/plugin/beanstalk)
+- Install the [Kanboard plugin for Beanstalk](https://github.com/kanboard/plugin-beanstalk)
 - Start the worker with the Kanboard command line tool: `./cli worker`
 
 ### RabbitMQ
@@ -26,7 +26,7 @@ This feature is optional and require the installation of a queue daemon on your
 [RabbitMQ](https://www.rabbitmq.com/) is a robust messaging system that is more suitable for high-availability infrastructure.
 
 - Follow the official documentation of RabbitMQ for the installation and the configuration
-- Install the [Kanboard plugin for RabbitMQ](https://kanboard.net/plugin/rabbitmq)
+- Install the [Kanboard plugin for RabbitMQ](https://github.com/kanboard/plugin-rabbitmq)
 - Start the worker with the Kanboard command line tool: `./cli worker`
 
 ### Notes