From 320f1889fdac276083e20e95ae6b96a023d6b812 Mon Sep 17 00:00:00 2001
From: Pavel Borecki <pavel.borecki@gmail.com>
Date: Tue, 10 Sep 2019 07:48:27 +0000
Subject: [PATCH 01/11] Translated using Weblate (Czech)

Currently translated at 98.5% (1057 of 1073 strings)
---
 plinth/locale/cs/LC_MESSAGES/django.po | 60 ++++++++++----------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/plinth/locale/cs/LC_MESSAGES/django.po b/plinth/locale/cs/LC_MESSAGES/django.po
index 64ab0e300..11f001523 100644
--- a/plinth/locale/cs/LC_MESSAGES/django.po
+++ b/plinth/locale/cs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-09 17:49-0400\n"
-"PO-Revision-Date: 2019-08-02 21:11+0000\n"
+"PO-Revision-Date: 2019-09-11 08:23+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/freedombox/plinth/"
 "cs/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 3.8-dev\n"
+"X-Generator: Weblate 3.9-dev\n"
 
 #: plinth/action_utils.py:298
 #, python-brace-format
@@ -128,7 +128,7 @@ msgstr ""
 
 #: plinth/modules/avahi/__init__.py:77
 msgid "Local Network Domain"
-msgstr ""
+msgstr "Doména místní sítě"
 
 #: plinth/modules/backups/__init__.py:40
 msgid "Backups"
@@ -224,11 +224,11 @@ msgstr "Pro šifrování je potřebná heslová fráze."
 
 #: plinth/modules/backups/forms.py:189
 msgid "Select Disk or Partition"
-msgstr ""
+msgstr "Vybrat datové úložiště nebo oddíl"
 
 #: plinth/modules/backups/forms.py:190
 msgid "Backups will be stored in the directory FreedomBoxBackups"
-msgstr ""
+msgstr "Zálohy budou uloženy ve složce FreedomBoxBackups"
 
 #: plinth/modules/backups/forms.py:199
 msgid "SSH Repository Path"
@@ -294,7 +294,7 @@ msgstr ""
 
 #: plinth/modules/backups/repository.py:154
 msgid "Existing repository is not encrypted."
-msgstr ""
+msgstr "Existující repozitář není šifrován."
 
 #: plinth/modules/backups/repository.py:342
 #, python-brace-format
@@ -319,16 +319,12 @@ msgid "Upload and Restore"
 msgstr "Nahrát a obnovit"
 
 #: plinth/modules/backups/templates/backups.html:59
-#, fuzzy
-#| msgid "Add a remote backup location"
 msgid "Add a backup location"
-msgstr "Přidat umístění pro zálohy na protějšku"
+msgstr "Přidat umístění pro zálohy"
 
 #: plinth/modules/backups/templates/backups.html:63
-#, fuzzy
-#| msgid "Add a remote backup location"
 msgid "Add Backup Location"
-msgstr "Přidat umístění pro zálohy na protějšku"
+msgstr "Přidat umístění pro zálohy"
 
 #: plinth/modules/backups/templates/backups.html:66
 msgid "Add a remote backup location"
@@ -509,13 +505,11 @@ msgstr "Obnovit z nahraného souboru"
 
 #: plinth/modules/backups/views.py:255
 msgid "No additional disks available to add a repository."
-msgstr ""
+msgstr "Nejsou k dispozici žádná další úložiště pro přidání repozitáře."
 
 #: plinth/modules/backups/views.py:263
-#, fuzzy
-#| msgid "Create remote backup repository"
 msgid "Create backup repository"
-msgstr "Vytvořit repozitář pro zálohy na protějšku"
+msgstr "Vytvořit repozitář pro zálohy"
 
 #: plinth/modules/backups/views.py:290
 msgid "Create remote backup repository"
@@ -558,10 +552,8 @@ msgid "Remove Repository"
 msgstr "Odebrat repozitář"
 
 #: plinth/modules/backups/views.py:419
-#, fuzzy
-#| msgid "Repository removed. The remote backup itself was not deleted."
 msgid "Repository removed. Backups were not deleted."
-msgstr "Repozitář odebrán. Záloha na protějšku jako taková smazána nebyla."
+msgstr "Repozitář odebrán. Zálohy jako takové smazány nebyly."
 
 #: plinth/modules/backups/views.py:429
 msgid "Unmounting failed!"
@@ -1121,10 +1113,8 @@ msgstr ""
 "IP adresou."
 
 #: plinth/modules/dynamicdns/__init__.py:78
-#, fuzzy
-#| msgid "Domain Name"
 msgid "Dynamic Domain Name"
-msgstr "Doménový název"
+msgstr "Název dynamické domény"
 
 #: plinth/modules/dynamicdns/forms.py:43
 msgid ""
@@ -1617,19 +1607,19 @@ msgstr "Příručka"
 #: plinth/modules/help/templates/help_support.html:24
 #: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Get Support"
-msgstr ""
+msgstr "Získat podporu"
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
 #: plinth/templates/base.html:170 plinth/templates/base.html:171
 msgid "Submit Feedback"
-msgstr ""
+msgstr "Odeslat zpětnou vazbu"
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
 #: plinth/templates/base.html:176 plinth/templates/base.html:177
 msgid "Contribute"
-msgstr ""
+msgstr "Zapojit se"
 
 #: plinth/modules/help/help.py:86
 msgid "Documentation and FAQ"
@@ -1739,7 +1729,7 @@ msgstr "Nastavení %(box_name)s"
 
 #: plinth/modules/help/templates/help_contribute.html:27
 msgid "The FreedomBox project welcomes contributions of all kinds."
-msgstr ""
+msgstr "Projekt FreedomBox vítá příspěvky jakéhokoli druhu."
 
 #: plinth/modules/help/templates/help_contribute.html:33
 msgid ""
@@ -1765,7 +1755,7 @@ msgstr ""
 #: plinth/modules/help/templates/help_feedback.html:27
 #, python-format
 msgid "Your feedback will help us improve %(box_name)s!"
-msgstr ""
+msgstr "Vaše zpětná vazba nám pomůže vylepšit %(box_name)s!"
 
 #: plinth/modules/help/templates/help_feedback.html:33
 msgid ""
@@ -1784,7 +1774,7 @@ msgstr ""
 
 #: plinth/modules/help/templates/help_feedback.html:51
 msgid "Thank you!"
-msgstr ""
+msgstr "Děkujeme!"
 
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
@@ -1831,10 +1821,8 @@ msgstr ""
 "a> kanálu pomocí webového rozhraní k IRC."
 
 #: plinth/modules/help/templates/help_manual.html:40
-#, fuzzy
-#| msgid "Download"
 msgid "Download as PDF"
-msgstr "Stáhnout"
+msgstr "Stáhnout jako PDF"
 
 #: plinth/modules/help/templates/help_support.html:27
 #, python-format
@@ -2908,11 +2896,11 @@ msgstr ""
 
 #: plinth/modules/names/components.py:27
 msgid "All"
-msgstr ""
+msgstr "Vše"
 
 #: plinth/modules/names/components.py:31 plinth/modules/names/components.py:35
 msgid "All web apps"
-msgstr ""
+msgstr "Všechny webové aplikace"
 
 #: plinth/modules/networks/__init__.py:36
 msgid "Networks"
@@ -3683,10 +3671,8 @@ msgstr ""
 "smluvit využití jeho {box_name}."
 
 #: plinth/modules/pagekite/__init__.py:96
-#, fuzzy
-#| msgid "PageKite Account"
 msgid "PageKite Domain"
-msgstr "PageKite účet"
+msgstr "PageKite doména"
 
 #: plinth/modules/pagekite/forms.py:69
 msgid "Enable PageKite"
@@ -4476,7 +4462,7 @@ msgstr ""
 
 #: plinth/modules/security/templates/security.html:42
 msgid "Show security vulnerabilities"
-msgstr ""
+msgstr "Zobrazit zranitelnosti zabezpečení"
 
 #: plinth/modules/security/templates/security.html:49
 msgid "App Name"

From f47da405cecb30bb4e3ebfd020d4b0b22a47a111 Mon Sep 17 00:00:00 2001
From: Anxin YI <2732146152@qq.com>
Date: Thu, 12 Sep 2019 04:53:15 +0000
Subject: [PATCH 02/11] Translated using Weblate (Chinese (Simplified))

Currently translated at 64.6% (693 of 1073 strings)
---
 plinth/locale/zh_Hans/LC_MESSAGES/django.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plinth/locale/zh_Hans/LC_MESSAGES/django.po b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
index dc5f0188e..b6681de2e 100644
--- a/plinth/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Plinth\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-09 17:49-0400\n"
-"PO-Revision-Date: 2019-08-11 14:23+0000\n"
-"Last-Translator: ZeroAurora <zeroaurora@qq.com>\n"
+"PO-Revision-Date: 2019-09-13 05:23+0000\n"
+"Last-Translator: Anxin YI <2732146152@qq.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "freedombox/plinth/zh_Hans/>\n"
 "Language: zh_Hans\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.8-dev\n"
+"X-Generator: Weblate 3.9-dev\n"
 
 #: plinth/action_utils.py:298
 #, python-brace-format
@@ -125,7 +125,7 @@ msgstr ""
 
 #: plinth/modules/avahi/__init__.py:77
 msgid "Local Network Domain"
-msgstr ""
+msgstr "本地网络领域"
 
 #: plinth/modules/backups/__init__.py:40
 msgid "Backups"
@@ -493,7 +493,7 @@ msgstr "从已上传的文件中恢复"
 
 #: plinth/modules/backups/views.py:255
 msgid "No additional disks available to add a repository."
-msgstr ""
+msgstr "没有可增加到信息库的额外可用磁盘。"
 
 #: plinth/modules/backups/views.py:263
 #, fuzzy

From e83f387be12ce88161dfc6875ca557dc9913bb4e Mon Sep 17 00:00:00 2001
From: Pavel Borecki <pavel.borecki@gmail.com>
Date: Mon, 16 Sep 2019 18:31:06 +0000
Subject: [PATCH 03/11] Translated using Weblate (Czech)

Currently translated at 98.9% (1061 of 1073 strings)
---
 plinth/locale/cs/LC_MESSAGES/django.po | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plinth/locale/cs/LC_MESSAGES/django.po b/plinth/locale/cs/LC_MESSAGES/django.po
index 11f001523..7be1ba0fb 100644
--- a/plinth/locale/cs/LC_MESSAGES/django.po
+++ b/plinth/locale/cs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-09 17:49-0400\n"
-"PO-Revision-Date: 2019-09-11 08:23+0000\n"
+"PO-Revision-Date: 2019-09-17 19:24+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/freedombox/plinth/"
 "cs/>\n"
@@ -331,8 +331,6 @@ msgid "Add a remote backup location"
 msgstr "Přidat umístění pro zálohy na protějšku"
 
 #: plinth/modules/backups/templates/backups.html:70
-#, fuzzy
-#| msgid "Add a remote backup location"
 msgid "Add Remote Backup Location"
 msgstr "Přidat umístění pro zálohy na protějšku"
 
@@ -1720,6 +1718,10 @@ msgid ""
 "maintained on a best-effort basis by contributors in Debian and FreedomBox "
 "community."
 msgstr ""
+"Používáte balíčky z Debian backports. Mějte na paměti, že bezpečnostní tým "
+"projektu Debian se nezabývá opravami zabezpečení těchto balíčků. Nicméně "
+"jsou spravovány na základě nejlepší snahy přispěvateli z komunit Debian a "
+"FreedomBox."
 
 #: plinth/modules/help/templates/help_base.html:36
 #: plinth/modules/help/templates/help_index.html:76
@@ -1739,6 +1741,11 @@ msgid ""
 "into your language, hosting hackathons or install fests, and by spreading "
 "the word."
 msgstr ""
+"Můžete přispět programováním, testováním a hlášením chyb, diskutováním o "
+"dalších příkladech použití a nových aplikacích, navrhování log a grafiky, "
+"poskytování podpory dalším uživatelům, překládání FreedomBox a jeho aplikací "
+"do svého jazyka, hostování hackathonů nebo instalačních festivalů a "
+"propagací."
 
 #: plinth/modules/help/templates/help_contribute.html:43
 msgid ""
@@ -1763,6 +1770,9 @@ msgid ""
 "improve them on our <a href=\"https://discuss.freedombox.org\" target="
 "\"_blank\"> discussion forum</a>."
 msgstr ""
+"Dejte nám vědět, které funkce vám chybí, jaké jsou vaše oblíbené aplikace a "
+"jak je můžeme vylepšit na našem <a href=\"https://discuss.freedombox.org\" "
+"target=\"_blank\"> diskuzním fóru</a>."
 
 #: plinth/modules/help/templates/help_feedback.html:41
 msgid ""

From 3e619d6882c1566bb9b59e8008bf4eff1435ed78 Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@riseup.net>
Date: Fri, 13 Sep 2019 07:01:02 +0530
Subject: [PATCH 04/11] firstboot: network connections not used, cleanup

No longer showing network connections in firstboot. Removed dead code.

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
---
 plinth/modules/first_boot/views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plinth/modules/first_boot/views.py b/plinth/modules/first_boot/views.py
index 4bec3b936..bf52c32d4 100644
--- a/plinth/modules/first_boot/views.py
+++ b/plinth/modules/first_boot/views.py
@@ -21,7 +21,6 @@ from django.utils.translation import ugettext as _
 from django.views.generic import TemplateView
 from django.views.generic.edit import FormView
 
-from plinth import network
 from plinth.modules import first_boot
 
 from .forms import FirstbootWizardSecretForm
@@ -62,7 +61,6 @@ class CompleteView(TemplateView):
     def get_context_data(self, **kwargs):
         """Add network connections to context list."""
         context = super().get_context_data(**kwargs)
-        context['connections'] = network.get_connection_list()
         context['title'] = _('Setup Complete')
         context['firstboot_complete'] = True
         return context

From 7cbaec3e26d4daffc59dd791607c18bb57c36813 Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@riseup.net>
Date: Fri, 13 Sep 2019 07:47:25 +0530
Subject: [PATCH 05/11] firstboot: Add new help menu to firstboot navbar

- Refactor the help menu into a django template include.

- Show help menu if user is logged in, instead of after completing firstboot.

Closes: #1517

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
[sunil@medhas.org Rename help-menu.inc to help-menu.inc]
[sunil@medhas.org Use user.is_authenticated instead of another variable]
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
---
 .../first_boot/templates/base_firstboot.html  |  6 +-
 .../templates/firstboot_navbar.html           | 11 +---
 plinth/templates/base.html                    | 46 +------------
 plinth/templates/help-menu.html               | 66 +++++++++++++++++++
 4 files changed, 71 insertions(+), 58 deletions(-)
 create mode 100644 plinth/templates/help-menu.html

diff --git a/plinth/modules/first_boot/templates/base_firstboot.html b/plinth/modules/first_boot/templates/base_firstboot.html
index 78b28ea10..06780bd4d 100644
--- a/plinth/modules/first_boot/templates/base_firstboot.html
+++ b/plinth/modules/first_boot/templates/base_firstboot.html
@@ -29,7 +29,7 @@
 {% endblock %}
 
 {% block mainmenu_right %}
-    {% if firstboot_complete %}
-        {% include "firstboot_navbar.html" %}
-    {% endif %}
+  {% if user.is_authenticated %}
+    {% include "firstboot_navbar.html" %}
+  {% endif %}
 {% endblock %}
diff --git a/plinth/modules/first_boot/templates/firstboot_navbar.html b/plinth/modules/first_boot/templates/firstboot_navbar.html
index a3a8b4ea6..6317f2874 100644
--- a/plinth/modules/first_boot/templates/firstboot_navbar.html
+++ b/plinth/modules/first_boot/templates/firstboot_navbar.html
@@ -17,13 +17,4 @@
 #
 {% endcomment %}
 
-{% load i18n %}
-
-<li>
-  <a href="{% url 'help:index' %}" title="{% trans "Help" %}">
-    <span class="fa fa-question-circle nav-icon"></span>
-    <span class="nav-text hidden-sm hidden-md hidden-lg">
-      {% trans "Help" %}
-    </span>
-  </a>
-</li>
+{% include "help-menu.html" %}
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index ad69921e9..87b2c93d6 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -141,51 +141,7 @@
           {% block mainmenu_right %}
 
             {% if user.is_authenticated %}
-              <li class="dropdown">
-                <a href="{% url 'help:index' %}" title="{% trans "Help" %}"
-                   class="dropdown-toggle" data-toggle="dropdown"
-                   role="button" aria-expanded="false" aria-expanded="false">
-                  <span class="fa fa-question-circle nav-icon"></span>
-                  <span class="nav-text hidden-sm hidden-md hidden-lg">
-                    {% trans "Help" %}
-                  </span>
-                  <span class="caret"></span>
-                </a>
-                <ul class="dropdown-menu" role="menu">
-                  <li>
-                    <a href="{% url 'help:manual' %}"
-                       title="{% trans "Manual"%}">
-                      {% trans "Manual" %}
-                    </a>
-                  </li>
-                  <li role="separator" class="divider hidden-xs"></li>
-                  <li>
-                    <a href="{% url 'help:support' %}"
-                       title="{% trans "Get Support" %}">
-                      {% trans "Get Support" %}
-                    </a>
-                  </li>
-                  <li>
-                    <a href="{% url 'help:feedback' %}"
-                       title="{% trans "Submit Feedback" %}">
-                      {% trans "Submit Feedback" %}
-                    </a>
-                  </li>
-                  <li>
-                    <a href="{% url 'help:contribute' %}"
-                       title="{% trans "Contribute" %}">
-                      {% trans "Contribute" %}
-                    </a>
-                  </li>
-                  <li role="separator" class="divider hidden-xs"></li>
-                  <li>
-                    <a href="{% url 'help:about' %}"
-                       title="{% trans "About" %}">
-                      {% trans "About" %}
-                    </a>
-                  </li>
-                </ul>
-              </li>
+              {% include "help-menu.html" %}
               <li class="dropdown">
                 <a href="{% url 'users:edit' request.user.username %}"
                    class="dropdown-toggle" data-toggle="dropdown"
diff --git a/plinth/templates/help-menu.html b/plinth/templates/help-menu.html
new file mode 100644
index 000000000..f3dfc8181
--- /dev/null
+++ b/plinth/templates/help-menu.html
@@ -0,0 +1,66 @@
+{% comment %}
+#
+# This file is part of FreedomBox.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+{% endcomment %}
+
+{% load i18n %}
+
+<li class="dropdown">
+  <a href="{% url 'help:index' %}" title="{% trans "Help" %}"
+     class="dropdown-toggle" data-toggle="dropdown"
+     role="button" aria-expanded="false" aria-expanded="false">
+    <span class="fa fa-question-circle nav-icon"></span>
+    <span class="nav-text hidden-sm hidden-md hidden-lg">
+      {% trans "Help" %}
+    </span>
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu" role="menu">
+    <li>
+      <a href="{% url 'help:manual' %}"
+         title="{% trans "Manual"%}">
+        {% trans "Manual" %}
+      </a>
+    </li>
+    <li role="separator" class="divider hidden-xs"></li>
+    <li>
+      <a href="{% url 'help:support' %}"
+         title="{% trans "Get Support" %}">
+        {% trans "Get Support" %}
+      </a>
+    </li>
+    <li>
+      <a href="{% url 'help:feedback' %}"
+         title="{% trans "Submit Feedback" %}">
+        {% trans "Submit Feedback" %}
+      </a>
+    </li>
+    <li>
+      <a href="{% url 'help:contribute' %}"
+         title="{% trans "Contribute" %}">
+        {% trans "Contribute" %}
+      </a>
+    </li>
+    <li role="separator" class="divider hidden-xs"></li>
+    <li>
+      <a href="{% url 'help:about' %}"
+         title="{% trans "About" %}">
+        {% trans "About" %}
+      </a>
+    </li>
+  </ul>
+</li>

From 54b0e7c63b8979ffd427db2695f6e480ad64745f Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Mon, 9 Sep 2019 17:34:13 -0700
Subject: [PATCH 06/11] letsencrypt: Update and fix tests involving domain
 changes

- Remove checking of the sender is 'test' and use mocking.

- Remove need for tests being run as root.

- Simplify log messages, avoid pylint warnings.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/modules/letsencrypt/__init__.py        | 15 ++---
 .../tests/test_domain_name_changes.py         | 61 +++++++++++++++++--
 2 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/plinth/modules/letsencrypt/__init__.py b/plinth/modules/letsencrypt/__init__.py
index 5fb061232..23f60bdb4 100644
--- a/plinth/modules/letsencrypt/__init__.py
+++ b/plinth/modules/letsencrypt/__init__.py
@@ -163,9 +163,8 @@ def on_domain_added(sender, domain_type='', name='', description='',
             return False
 
     try:
-        # Obtaining certs during tests or empty names isn't expected to succeed
-        if sender != 'test' and name:
-            logger.info('Obtaining a Let\'s Encrypt certificate for %s', name)
+        if name:
+            logger.info('Obtaining certificate for %s', name)
             certificate_obtain(name)
         return True
     except ActionError:
@@ -178,15 +177,13 @@ def on_domain_removed(sender, domain_type, name='', **kwargs):
         return False
 
     try:
-        # Revoking certs during tests or empty names isn't expected to succeed
-        if sender != 'test' and name:
-            logger.info("Revoking the Let\'s Encrypt certificate for " + name)
+        if name:
+            logger.info('Revoking certificate for %s', name)
             certificate_revoke(name)
         return True
     except ActionError as exception:
-        logger.warning(
-            ('Failed to revoke certificate for domain {domain}: {error}'
-             ).format(domain=name, error=exception.args[2]))
+        logger.warning('Failed to revoke certificate for %s: %s', name,
+                       exception.args[2])
         return False
 
 
diff --git a/plinth/modules/letsencrypt/tests/test_domain_name_changes.py b/plinth/modules/letsencrypt/tests/test_domain_name_changes.py
index 1a0f776f0..394a7a3fd 100644
--- a/plinth/modules/letsencrypt/tests/test_domain_name_changes.py
+++ b/plinth/modules/letsencrypt/tests/test_domain_name_changes.py
@@ -18,21 +18,72 @@
 Tests for letsencrypt module.
 """
 
+from unittest.mock import call, patch
+
 import pytest
 
+from plinth.modules.names.components import DomainType
+
 from .. import on_domain_added, on_domain_removed
 
-pytestmark = pytest.mark.usefixtures('needs_root', 'needs_sudo')
+
+@pytest.fixture(name='domain_types')
+def fixture_domain_types():
+    """Create a domain types required for tests."""
+    DomainType('domain-type-tor', 'Tor Hidden Service', 'tor:index',
+               can_have_certificate=False)
+    DomainType('domain-type-test', 'Test Domain Type', 'test:index')
 
 
+@pytest.mark.usefixtures('domain_types')
 def test_add_onion_domain():
+    """Test that .onion domains are ignored when added/removed."""
     assert not on_domain_added('test', 'domain-type-tor', 'ddddd.onion')
+    assert not on_domain_removed('test', 'domain-type-tor', 'ddddd.onion')
 
 
+@patch('plinth.modules.letsencrypt.get_status')
+@patch('plinth.modules.letsencrypt.certificate_obtain')
 @pytest.mark.usefixtures('load_cfg')
-def test_add_valid_domain():
-    assert on_domain_added('test', 'domainname', 'subdomain.domain.tld')
+@pytest.mark.parametrize('domain,status_input,obtain,result', [
+    ('domain1.tld', {
+        'certificate_available': True,
+        'validity': 'not-valid'
+    }, True, True),
+    ('domain2.tld', {
+        'certificate_available': False,
+        'validity': 'valid'
+    }, True, True),
+    ('domain3.tld', {
+        'certificate_available': True,
+        'validity': 'valid'
+    }, False, False),
+    ('', {
+        'certificate_available': False,
+        'validity': 'valid'
+    }, False, True),
+])
+def test_add_valid_domain(certificate_obtain, get_status, domain, status_input,
+                          obtain, result):
+    """Test adding a domain that can have certificates."""
+    get_status.return_value = {'domains': {domain: status_input}}
+    assert result == on_domain_added('test', 'domain-type-test', domain)
+    if obtain:
+        certificate_obtain.assert_has_calls([call(domain)])
+    else:
+        certificate_obtain.assert_not_called()
 
 
-def test_remove_domain():
-    assert on_domain_removed('test', '', 'somedomain.tld')
+@patch('plinth.modules.letsencrypt.certificate_revoke')
+@pytest.mark.usefixtures('load_cfg')
+@pytest.mark.parametrize('domain,revoke,result', [
+    ('domain1.tld', True, True),
+    ('', False, True),
+])
+def test_remove_domain(certificate_revoke, domain, revoke, result):
+    """Test removing a domain that can certificates."""
+    assert result == on_domain_removed('test', 'domain-type-test', domain)
+    if revoke:
+        certificate_revoke.assert_has_calls([call(domain)])
+    else:
+        certificate_revoke.assert_not_called()

From 6db1926a62bee229838fe3ff832c666114754d2b Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Mon, 9 Sep 2019 17:36:19 -0700
Subject: [PATCH 07/11] tor: Fix test case for getting status

Mock the app so that it doesn't have to be loaded.

Closes: #1645.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/modules/tor/tests/test_tor.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plinth/modules/tor/tests/test_tor.py b/plinth/modules/tor/tests/test_tor.py
index 86985c352..1226f52af 100644
--- a/plinth/modules/tor/tests/test_tor.py
+++ b/plinth/modules/tor/tests/test_tor.py
@@ -18,6 +18,8 @@
 Tests for Tor module.
 """
 
+from unittest.mock import patch
+
 import pytest
 from django.core.exceptions import ValidationError
 
@@ -36,8 +38,9 @@ class TestTor:
         utils.is_apt_transport_tor_enabled()
 
     @staticmethod
+    @patch('plinth.modules.tor.app')
     @pytest.mark.usefixtures('needs_root', 'load_cfg')
-    def test_get_status():
+    def test_get_status(_app):
         """Test that get_status does not raise any unhandled exceptions.
 
         This should work regardless of whether tor is installed, or

From dbb3558aab7190856a62f77465d6f9db0dc7f7c3 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Tue, 17 Sep 2019 19:49:01 -0700
Subject: [PATCH 08/11] firstboot: Hide left menu during first boot as intended

This seems to be a regression from earlier behavior.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Joseph Nuthalapati <njoseph@riseup.net>
---
 .../first_boot/templates/base_firstboot.html  |  3 +
 plinth/templates/base.html                    | 58 ++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/plinth/modules/first_boot/templates/base_firstboot.html b/plinth/modules/first_boot/templates/base_firstboot.html
index 06780bd4d..500e9a8ca 100644
--- a/plinth/modules/first_boot/templates/base_firstboot.html
+++ b/plinth/modules/first_boot/templates/base_firstboot.html
@@ -28,6 +28,9 @@
   </style>
 {% endblock %}
 
+{% block mainmenu_left_collapse %}
+{% endblock %}
+
 {% block mainmenu_right %}
   {% if user.is_authenticated %}
     {% include "firstboot_navbar.html" %}
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 87b2c93d6..1202c2ceb 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -108,34 +108,36 @@
       </div>
       <div class="collapse navbar-collapse">
         <ul class="nav navbar-nav">
-          {% if user.is_authenticated and user_is_admin %}
-            <li>
-              {% url 'index' as index_url %}
-              <a href="{{ index_url }}" title='{% trans "Home" %}'
-                 class="{% if not submenu.url %}
-                 menu_link_active {% else %} menu_link {% endif %}">
-                {% trans "Home" %}
-              </a>
-            </li>
-            <li>
-              {% url 'apps' as apps_url %}
-              <a href="{{ apps_url }}" title='{% trans "Apps" %}'
-                 class="{% if apps_url == submenu.url %}
-                 menu_link_active {% else %} menu_link {% endif %}">
-                <span class="fa fa-th"></span>
-                {% trans "Apps" %}
-              </a>
-            </li>
-            <li>
-              {% url 'system' as system_url %}
-              <a href="{{ system_url }}" title='{% trans "System" %}'
-                 class="{% if system_url == submenu.url %}
-                 menu_link_active {% else %} menu_link {% endif %}">
-                <span class="fa fa-cog nav-icon"></span>
-                {% trans "System" %}
-              </a>
-            </li>
-          {% endif %}
+          {% block mainmenu_left_collapse %}
+            {% if user.is_authenticated and user_is_admin %}
+              <li>
+                {% url 'index' as index_url %}
+                <a href="{{ index_url }}" title='{% trans "Home" %}'
+                   class="{% if not submenu.url %}
+                   menu_link_active {% else %} menu_link {% endif %}">
+                  {% trans "Home" %}
+                </a>
+              </li>
+              <li>
+                {% url 'apps' as apps_url %}
+                <a href="{{ apps_url }}" title='{% trans "Apps" %}'
+                   class="{% if apps_url == submenu.url %}
+                   menu_link_active {% else %} menu_link {% endif %}">
+                  <span class="fa fa-th"></span>
+                  {% trans "Apps" %}
+                </a>
+              </li>
+              <li>
+                {% url 'system' as system_url %}
+                <a href="{{ system_url }}" title='{% trans "System" %}'
+                   class="{% if system_url == submenu.url %}
+                   menu_link_active {% else %} menu_link {% endif %}">
+                  <span class="fa fa-cog nav-icon"></span>
+                  {% trans "System" %}
+                </a>
+              </li>
+            {% endif %}
+          {% endblock %}
         </ul>
         <ul class="nav navbar-nav navbar-right">
           {% block mainmenu_right %}

From 1182c031c29599105a0dfc15205f0ee54f26a24e Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Mon, 23 Sep 2019 17:52:55 -0400
Subject: [PATCH 09/11] locale: Update translation strings

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/locale/bg/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/bn/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/cs/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/da/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/de/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/django.pot                    | 52 ++++++++++----------
 plinth/locale/el/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/es/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/fa/LC_MESSAGES/django.po      | 54 ++++++++++-----------
 plinth/locale/fake/LC_MESSAGES/django.po    | 52 ++++++++++----------
 plinth/locale/fr/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/gl/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/gu/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/hi/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/hu/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/id/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/it/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/ja/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/kn/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/lt/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/nb/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/nl/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/pl/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/pt/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/ru/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/sl/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/sv/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/ta/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/te/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/tr/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/uk/LC_MESSAGES/django.po      | 52 ++++++++++----------
 plinth/locale/zh_Hans/LC_MESSAGES/django.po | 52 ++++++++++----------
 32 files changed, 801 insertions(+), 865 deletions(-)

diff --git a/plinth/locale/bg/LC_MESSAGES/django.po b/plinth/locale/bg/LC_MESSAGES/django.po
index cbf01b329..1232e3734 100644
--- a/plinth/locale/bg/LC_MESSAGES/django.po
+++ b/plinth/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -1166,7 +1166,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1391,18 +1391,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1411,26 +1404,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1571,6 +1564,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1915,7 +1913,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2862,7 +2860,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5146,40 +5144,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/bn/LC_MESSAGES/django.po b/plinth/locale/bn/LC_MESSAGES/django.po
index 121327e2d..115399d89 100644
--- a/plinth/locale/bn/LC_MESSAGES/django.po
+++ b/plinth/locale/bn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1168,7 +1168,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1393,18 +1393,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1413,26 +1406,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1573,6 +1566,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1917,7 +1915,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2864,7 +2862,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5148,40 +5146,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/cs/LC_MESSAGES/django.po b/plinth/locale/cs/LC_MESSAGES/django.po
index 7be1ba0fb..5c6dfacb4 100644
--- a/plinth/locale/cs/LC_MESSAGES/django.po
+++ b/plinth/locale/cs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-09-17 19:24+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -1316,7 +1316,7 @@ msgid "Last update"
 msgstr "Minulá aktualizace"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "O systému"
 
@@ -1576,18 +1576,11 @@ msgstr ""
 "Možná bude třeba zkontrolovat <a href=\"%(networks_url)s\">nastavení sítě</"
 "a> a případně upravit."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Nápověda"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Spustit nastavení"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Nastavení dokončeno"
 
@@ -1596,26 +1589,26 @@ msgid "Documentation"
 msgstr "Dokumentace"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Příručka"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr "Získat podporu"
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr "Odeslat zpětnou vazbu"
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr "Zapojit se"
 
@@ -1786,6 +1779,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr "Děkujeme!"
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Nápověda"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2181,7 +2179,7 @@ msgstr ""
 "XMPP serverem."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "Licenční informace o JavaScriptu"
 
@@ -3265,7 +3263,7 @@ msgid "Edit connection"
 msgstr "Upravit připojení"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Upravit"
 
@@ -5878,40 +5876,40 @@ msgstr "Základní funkce a webové rozhraní pro %(box_name)s"
 msgid "Toggle navigation"
 msgstr "Přepnout navigaci"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Domů"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Aplikace"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "Systém"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Restartovat"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Vypnout"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Odhlásit"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr "Vyberte jazyk"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Přihlásit"
 
diff --git a/plinth/locale/da/LC_MESSAGES/django.po b/plinth/locale/da/LC_MESSAGES/django.po
index 8006ee48e..49c744150 100644
--- a/plinth/locale/da/LC_MESSAGES/django.po
+++ b/plinth/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2016-07-03 21:44+0000\n"
 "Last-Translator: Mikkel Kirkgaard Nielsen <memb_weblate@mikini.dk>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -1353,7 +1353,7 @@ msgid "Last update"
 msgstr "Seneste opdatering"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Om"
 
@@ -1610,18 +1610,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Hjælp"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Start Konfiguration"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Konfiguration Færdig"
 
@@ -1630,26 +1623,26 @@ msgid "Documentation"
 msgstr "Dokumentation"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Brugermanual"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1813,6 +1806,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Hjælp"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2214,7 +2212,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -3337,7 +3335,7 @@ msgid "Edit connection"
 msgstr "Rediger Forbindelse"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Rediger"
 
@@ -5990,46 +5988,46 @@ msgstr "Plinth administrationsværktøj til %(box_name)s"
 msgid "Toggle navigation"
 msgstr "Åbn/luk navigation"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Apps"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "System"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Ændr kodeord"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 #, fuzzy
 #| msgid "Restart Now"
 msgid "Restart"
 msgstr "Genstart Nu"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 #, fuzzy
 #| msgid "Shut Down Now"
 msgid "Shut down"
 msgstr "Sluk Nu"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Log ud"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "Sprog"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Log ind"
 
diff --git a/plinth/locale/de/LC_MESSAGES/django.po b/plinth/locale/de/LC_MESSAGES/django.po
index 95c3b9152..3125ad2b2 100644
--- a/plinth/locale/de/LC_MESSAGES/django.po
+++ b/plinth/locale/de/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-09-03 21:24+0000\n"
 "Last-Translator: Swann Martinet <swann.ranskassa@laposte.net>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -1341,7 +1341,7 @@ msgid "Last update"
 msgstr "Letztes Update"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Über"
 
@@ -1606,18 +1606,11 @@ msgstr ""
 "Möglicherweise wollen Sie die <a href=\"%(networks_url)s"
 "\">Netzwerkeinstellungen</a> prüfen und falls nötig anpassen."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Hilfe"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Einrichten beginnen"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Installation abgeschlossen"
 
@@ -1626,26 +1619,26 @@ msgid "Documentation"
 msgstr "Dokumentation"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Handbuch"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1812,6 +1805,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Hilfe"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2212,7 +2210,7 @@ msgstr ""
 "genutzt."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "JavaScript-Lizenzinformation"
 
@@ -3314,7 +3312,7 @@ msgid "Edit connection"
 msgstr "Verbindung bearbeiten"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -5976,40 +5974,40 @@ msgstr "Kernfunktionalität und Weboberfläche für %(box_name)s"
 msgid "Toggle navigation"
 msgstr "Navigation ein-/ausklappen"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Startseite"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Apps"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "System"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Neu starten"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Herunterfahren"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Abmelden"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr "Sprache wählen"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Anmelden"
 
diff --git a/plinth/locale/django.pot b/plinth/locale/django.pot
index 38143f879..dfd4e8fbd 100644
--- a/plinth/locale/django.pot
+++ b/plinth/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1167,7 +1167,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1392,18 +1392,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1412,26 +1405,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1572,6 +1565,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1916,7 +1914,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2863,7 +2861,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5147,40 +5145,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/el/LC_MESSAGES/django.po b/plinth/locale/el/LC_MESSAGES/django.po
index 5683d0309..21eeb5bb9 100644
--- a/plinth/locale/el/LC_MESSAGES/django.po
+++ b/plinth/locale/el/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -1166,7 +1166,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1391,18 +1391,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1411,26 +1404,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1571,6 +1564,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1915,7 +1913,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2862,7 +2860,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5146,40 +5144,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/es/LC_MESSAGES/django.po b/plinth/locale/es/LC_MESSAGES/django.po
index 694e6d1a6..394d6afcc 100644
--- a/plinth/locale/es/LC_MESSAGES/django.po
+++ b/plinth/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-07-12 17:01+0000\n"
 "Last-Translator: Luis A. Arizmendi <luis.arizmendi@mailfence.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/freedombox/"
@@ -1351,7 +1351,7 @@ msgid "Last update"
 msgstr "Última actualización"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Acerca de"
 
@@ -1611,18 +1611,11 @@ msgstr ""
 "Puede que quiera comprobar la <a href=\"%(networks_url)s\">configuración de "
 "red</a> y modificarla si es necesario."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Ayuda"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Iniciar configuración"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Configuración completada"
 
@@ -1631,26 +1624,26 @@ msgid "Documentation"
 msgstr "Documentación"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Manual"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1812,6 +1805,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Ayuda"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2213,7 +2211,7 @@ msgstr ""
 "local."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "Información de licencia de JavaScript"
 
@@ -3305,7 +3303,7 @@ msgid "Edit connection"
 msgstr "Editar conexión"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Editar"
 
@@ -5943,40 +5941,40 @@ msgstr "Funcionalidad central e interfaz web para %(box_name)s"
 msgid "Toggle navigation"
 msgstr "Cambiar modo de navegación"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Inicio"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "Sistema"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Cambiar clave de acceso"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Apagar"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr "Seleccionar idioma"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Iniciar sesión"
 
diff --git a/plinth/locale/fa/LC_MESSAGES/django.po b/plinth/locale/fa/LC_MESSAGES/django.po
index 791c6d4a7..c7101bd32 100644
--- a/plinth/locale/fa/LC_MESSAGES/django.po
+++ b/plinth/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2016-08-12 15:51+0000\n"
 "Last-Translator: Masoud Abkenar <ampbox@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/freedombox/"
@@ -1320,7 +1320,7 @@ msgid "Last update"
 msgstr "آخرین به‌روزرسانی"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "درباره"
 
@@ -1564,19 +1564,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-#, fuzzy
-msgid "Help"
-msgstr "راهنما"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "آغاز راه‌اندازی"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "راه‌اندازی کامل شد"
 
@@ -1585,26 +1577,26 @@ msgid "Documentation"
 msgstr "راهنما"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "کتاب راهنما"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1768,6 +1760,12 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+#, fuzzy
+msgid "Help"
+msgstr "راهنما"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2152,7 +2150,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -3230,7 +3228,7 @@ msgid "Edit connection"
 msgstr "ویرایش اتصال"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "ویرایش"
 
@@ -5618,43 +5616,43 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 #, fuzzy
 msgid "Apps"
 msgstr "برنامه‌ها"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "زبان"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/fake/LC_MESSAGES/django.po b/plinth/locale/fake/LC_MESSAGES/django.po
index 3fc63da77..0ba1bcaee 100644
--- a/plinth/locale/fake/LC_MESSAGES/django.po
+++ b/plinth/locale/fake/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Plinth 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2016-01-31 22:24+0530\n"
 "Last-Translator: Sunil Mohan Adapa <sunil@medhas.org>\n"
 "Language-Team: Plinth Developers <freedombox-discuss@lists.alioth.debian."
@@ -1416,7 +1416,7 @@ msgid "Last update"
 msgstr "LAST UPDATE"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "ABOUT"
 
@@ -1679,18 +1679,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "HELP"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "START SETUP"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "SETUP COMPLETE"
 
@@ -1699,26 +1692,26 @@ msgid "Documentation"
 msgstr "DOCUMENTATION"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "MANUAL"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1881,6 +1874,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "HELP"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2270,7 +2268,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -3412,7 +3410,7 @@ msgid "Edit connection"
 msgstr "EDIT CONNECTION"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "EDIT"
 
@@ -6095,46 +6093,46 @@ msgstr "PLINTH ADMINISTRATIVE INTERFACE FOR THE %(box_name)s"
 msgid "Toggle navigation"
 msgstr "TOGGLE NAVIGATION"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "APPS"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "SYSTEM"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "CHANGE PASSWORD"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 #, fuzzy
 #| msgid "Restart Now"
 msgid "Restart"
 msgstr "RESTART NOW"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 #, fuzzy
 #| msgid "Shut Down Now"
 msgid "Shut down"
 msgstr "SHUT DOWN NOW"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "LOG OUT"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "LANGUAGE"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "LOG IN"
 
diff --git a/plinth/locale/fr/LC_MESSAGES/django.po b/plinth/locale/fr/LC_MESSAGES/django.po
index a18b9b58d..ee52740d1 100644
--- a/plinth/locale/fr/LC_MESSAGES/django.po
+++ b/plinth/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-09-03 21:24+0000\n"
 "Last-Translator: Swann Martinet <swann.ranskassa@laposte.net>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -1318,7 +1318,7 @@ msgid "Last update"
 msgstr "Dernière mise à jour"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "À propos"
 
@@ -1584,18 +1584,11 @@ msgstr ""
 "Vous pouvez vérifier la <a href=\"%(networks_url)s\">configuration du "
 "réseau</a> et le modifier si nécessaire."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Aide"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Démarrer la configuration"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Installation Achevée"
 
@@ -1604,26 +1597,26 @@ msgid "Documentation"
 msgstr "Documentation"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Manuel"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1790,6 +1783,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Aide"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2203,7 +2201,7 @@ msgstr ""
 "XMPP tournant sur la même machine."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "Information de licence JavaScript"
 
@@ -3285,7 +3283,7 @@ msgid "Edit connection"
 msgstr "Modifier Connexion"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Modifier"
 
@@ -5951,42 +5949,42 @@ msgstr "Interface d'administration Plinth pour %(box_name)s"
 msgid "Toggle navigation"
 msgstr "Basculer Navigation"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Accueil"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Applis"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "Système"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Éteindre"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "Langue"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "S'identifier"
 
diff --git a/plinth/locale/gl/LC_MESSAGES/django.po b/plinth/locale/gl/LC_MESSAGES/django.po
index 9ea77ba75..9c9d0b366 100644
--- a/plinth/locale/gl/LC_MESSAGES/django.po
+++ b/plinth/locale/gl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-07-11 08:01+0000\n"
 "Last-Translator: Miguel A. Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/freedombox/"
@@ -1171,7 +1171,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1396,18 +1396,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1416,26 +1409,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Manual"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1576,6 +1569,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1920,7 +1918,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2867,7 +2865,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5151,40 +5149,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/gu/LC_MESSAGES/django.po b/plinth/locale/gu/LC_MESSAGES/django.po
index 731eefce1..bbeb1a17c 100644
--- a/plinth/locale/gu/LC_MESSAGES/django.po
+++ b/plinth/locale/gu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2018-02-05 18:37+0000\n"
 "Last-Translator: drashti kaushik <drashtipandya37@gmail.com>\n"
 "Language-Team: Gujarati <https://hosted.weblate.org/projects/freedombox/"
@@ -1274,7 +1274,7 @@ msgid "Last update"
 msgstr "છેલ્લો સુધારો"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "વિશે"
 
@@ -1537,18 +1537,11 @@ msgstr ""
 "તમે તપાસી શકો છો <a href=\"%(networks_url)s\">નેટવર્ક સેટઅપ</a> અને જો જરૂરી હોય "
 "તો તેને સુધારો."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "મદદ"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "સેટઅપ પ્રારંભ કરો"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "સેટઅપ પૂર્ણ"
 
@@ -1557,26 +1550,26 @@ msgid "Documentation"
 msgstr "દસ્તાવેજીકરણ"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "માર્ગદર્શિકા"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1717,6 +1710,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "મદદ"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2065,7 +2063,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -3030,7 +3028,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5327,42 +5325,42 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "ભાષા"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/hi/LC_MESSAGES/django.po b/plinth/locale/hi/LC_MESSAGES/django.po
index 879a84cdf..35f49b9be 100644
--- a/plinth/locale/hi/LC_MESSAGES/django.po
+++ b/plinth/locale/hi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2018-08-09 20:39+0000\n"
 "Last-Translator: Gayathri Das <gaya3das@live.unc.edu>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -1333,7 +1333,7 @@ msgid "Last update"
 msgstr "अंतिम अपडेट"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "के बारे में"
 
@@ -1593,18 +1593,11 @@ msgstr ""
 "आप <a href=\"%(networks_url)s\"> नेटवर्क सेटअप </a> जांचना चाह सकते है और अगर जरुरत "
 "हू, इससे बदलें."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "मदद"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "सटअप शुरु करें"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "सेटअप पूरा हो गया"
 
@@ -1613,26 +1606,26 @@ msgid "Documentation"
 msgstr "प्रलेखन"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "मैन्युअल"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1789,6 +1782,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "मदद"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2173,7 +2171,7 @@ msgstr ""
 "किया जाता है."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "जावास्क्रिप्ट लाइसेंस जानकारी"
 
@@ -3228,7 +3226,7 @@ msgid "Edit connection"
 msgstr "कनेक्शन संपादित करें"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "संपादन"
 
@@ -5814,40 +5812,40 @@ msgstr "%(box_name)s के लिए कोर फंक्शनलिटी 
 msgid "Toggle navigation"
 msgstr "टॉगल नेविगेशन"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "होम"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "ऐप्स"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "सिस्टम"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "पासवर्ड बदलें"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "रीस्टार्ट"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "शट डाउन"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "लॉग आउट"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr "भाषा चुनें"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "लॉग इन"
 
diff --git a/plinth/locale/hu/LC_MESSAGES/django.po b/plinth/locale/hu/LC_MESSAGES/django.po
index 34f2865db..db10073dd 100644
--- a/plinth/locale/hu/LC_MESSAGES/django.po
+++ b/plinth/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-08-31 09:24+0000\n"
 "Last-Translator: Doma Gergő <domag02@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/freedombox/"
@@ -1337,7 +1337,7 @@ msgid "Last update"
 msgstr "Legutolsó frissítés"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Leírás"
 
@@ -1600,18 +1600,11 @@ msgstr ""
 "Esetleg leellenőrizheted a <a href=\"%(networks_url)s\">hálózati beállítást</"
 "a> és módosíthatod ha szükséges."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Súgó"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Beállítás elkezdése"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Beállítás kész"
 
@@ -1620,26 +1613,26 @@ msgid "Documentation"
 msgstr "Dokumentáció"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Kézikönyv"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1806,6 +1799,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Súgó"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2208,7 +2206,7 @@ msgstr ""
 "kiszolgálóval használják."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "JavaScript licencinformáció"
 
@@ -3309,7 +3307,7 @@ msgid "Edit connection"
 msgstr "Kapcsolat szerkesztése"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Szerkesztés"
 
@@ -5958,40 +5956,40 @@ msgstr "Alapvető funkcionalitás és webes felület %(box_name)s eszközére"
 msgid "Toggle navigation"
 msgstr "Navigációs sor ki- vagy bekapcsolása"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Kezdőlap"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Alkalmazások"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "Rendszer"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Jelszómódosítás"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Leállítás"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Kijelentkezés"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr "Válassz nyelvet"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Bejelentkezés"
 
diff --git a/plinth/locale/id/LC_MESSAGES/django.po b/plinth/locale/id/LC_MESSAGES/django.po
index fd5f2e5e7..233a723fc 100644
--- a/plinth/locale/id/LC_MESSAGES/django.po
+++ b/plinth/locale/id/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Indonesian (FreedomBox)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2018-11-02 00:44+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/freedombox/"
@@ -1228,7 +1228,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Tentang"
 
@@ -1461,18 +1461,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Bantuan"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Jalankan Pengaturan"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Pengaturan Selesai"
 
@@ -1481,26 +1474,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Panduan"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1643,6 +1636,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Bantuan"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2003,7 +2001,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2993,7 +2991,7 @@ msgid "Edit connection"
 msgstr "Sunting Koneksi"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Sunting"
 
@@ -5356,46 +5354,46 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Apps"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 #, fuzzy
 #| msgid "Restart Now"
 msgid "Restart"
 msgstr "Jalankan ulang Sekarang"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 #, fuzzy
 #| msgid "Shut Down Now"
 msgid "Shut down"
 msgstr "Matikan Sekarang"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "Bahasa"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/it/LC_MESSAGES/django.po b/plinth/locale/it/LC_MESSAGES/django.po
index 251c63f67..1a47171bb 100644
--- a/plinth/locale/it/LC_MESSAGES/django.po
+++ b/plinth/locale/it/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-09-03 21:24+0000\n"
 "Last-Translator: Swann Martinet <swann.ranskassa@laposte.net>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/freedombox/"
@@ -1339,7 +1339,7 @@ msgid "Last update"
 msgstr "Ultimo aggiornamento"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "About"
 
@@ -1605,18 +1605,11 @@ msgstr ""
 "Puoi controllare le <a href=\"%(networks_url)s\">impostazioni di rete</a> e "
 "modificarle se necessario."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Aiuto"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Avvia Configurazione"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Configurazione Completata"
 
@@ -1625,26 +1618,26 @@ msgid "Documentation"
 msgstr "Documentazione"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Manuale"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1807,6 +1800,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Aiuto"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, fuzzy, python-format
 msgid ""
@@ -2198,7 +2196,7 @@ msgstr ""
 "esecuzione nella rete locale."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -3276,7 +3274,7 @@ msgid "Edit connection"
 msgstr "Modifica Connessione"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Modifica"
 
@@ -5681,40 +5679,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/ja/LC_MESSAGES/django.po b/plinth/locale/ja/LC_MESSAGES/django.po
index b51334d15..b1fc0efe3 100644
--- a/plinth/locale/ja/LC_MESSAGES/django.po
+++ b/plinth/locale/ja/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1168,7 +1168,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1393,18 +1393,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1413,26 +1406,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1573,6 +1566,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1917,7 +1915,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2864,7 +2862,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5148,40 +5146,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/kn/LC_MESSAGES/django.po b/plinth/locale/kn/LC_MESSAGES/django.po
index b51334d15..b1fc0efe3 100644
--- a/plinth/locale/kn/LC_MESSAGES/django.po
+++ b/plinth/locale/kn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1168,7 +1168,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1393,18 +1393,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1413,26 +1406,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1573,6 +1566,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1917,7 +1915,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2864,7 +2862,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5148,40 +5146,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/lt/LC_MESSAGES/django.po b/plinth/locale/lt/LC_MESSAGES/django.po
index 0ee1d8743..5450baa5b 100644
--- a/plinth/locale/lt/LC_MESSAGES/django.po
+++ b/plinth/locale/lt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1169,7 +1169,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1394,18 +1394,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1414,26 +1407,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1574,6 +1567,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1918,7 +1916,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2865,7 +2863,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5149,40 +5147,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/nb/LC_MESSAGES/django.po b/plinth/locale/nb/LC_MESSAGES/django.po
index 6de198106..1953e0c05 100644
--- a/plinth/locale/nb/LC_MESSAGES/django.po
+++ b/plinth/locale/nb/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-09-06 18:24+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
@@ -1347,7 +1347,7 @@ msgid "Last update"
 msgstr "Siste oppdatering"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Om"
 
@@ -1607,18 +1607,11 @@ msgstr ""
 "Du vil kanskje kontrollere <a href=\"%(networks_url)s\">network setup</a> "
 "(nettverksoppsettet) og endre det om nødvendig."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Hjelp"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Gå i gang med oppsett"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Oppsett ferdig"
 
@@ -1627,26 +1620,26 @@ msgid "Documentation"
 msgstr "Dokumentasjon"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Manual"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1813,6 +1806,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Hjelp"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2212,7 +2210,7 @@ msgstr ""
 "som kjører lokalt."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "JavaScript lisensinformasjon"
 
@@ -3294,7 +3292,7 @@ msgid "Edit connection"
 msgstr "Rediger tilkobling"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Rediger"
 
@@ -5913,40 +5911,40 @@ msgstr "Kjernefunksjonalitet og nettbrukergrensesnitt for %(box_name)s"
 msgid "Toggle navigation"
 msgstr "Bytt (toggle) navigasjon"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Hjem"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Apps/Programmer"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "System"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Endre passord"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Omstart"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Slå av"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Logg ut"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr "Velg språk"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Logg inn"
 
diff --git a/plinth/locale/nl/LC_MESSAGES/django.po b/plinth/locale/nl/LC_MESSAGES/django.po
index 1b5ff62e2..d087d964a 100644
--- a/plinth/locale/nl/LC_MESSAGES/django.po
+++ b/plinth/locale/nl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-05-07 20:48+0000\n"
 "Last-Translator: Karel Trachet <karel@trachet.eu>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -1354,7 +1354,7 @@ msgid "Last update"
 msgstr "Laatste bijwerking"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Over"
 
@@ -1620,18 +1620,11 @@ msgstr ""
 "Je wilt wellicht de <a href=\"%(networks_url)s\">netwerk instellingen</a> "
 "controleren, en wijzigen indien noodzakelijk."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Hulp"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Setup starten"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Instelling voltooid"
 
@@ -1640,26 +1633,26 @@ msgid "Documentation"
 msgstr "Documentatie"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Handmatig"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1823,6 +1816,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Hulp"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2217,7 +2215,7 @@ msgstr ""
 "server die lokaal wordt uitgevoerd."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "JavaScript licentie-informatie"
 
@@ -3307,7 +3305,7 @@ msgid "Edit connection"
 msgstr "Wijzig verbinding"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Wijzig"
 
@@ -5984,40 +5982,40 @@ msgstr "Basisfunctionaliteit en webinterface voor %(box_name)s"
 msgid "Toggle navigation"
 msgstr "Navigatie in/uitschakelen"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Startpagina"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Apps"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "Systeem"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Herstarten"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Uitschakelen"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Afmelden"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr "Selecteer taal"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Aanmelden"
 
diff --git a/plinth/locale/pl/LC_MESSAGES/django.po b/plinth/locale/pl/LC_MESSAGES/django.po
index f291c56c6..c7f28b666 100644
--- a/plinth/locale/pl/LC_MESSAGES/django.po
+++ b/plinth/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-08-08 00:23+0000\n"
 "Last-Translator: Radek Pasiok <rpasiok@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -1304,7 +1304,7 @@ msgid "Last update"
 msgstr "Ostatnie uaktualnienie"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Informacje"
 
@@ -1568,18 +1568,11 @@ msgstr ""
 "Możesz również sprawdzić <a href=\"%(networks_url)s\">ustawienia sieci</a> i "
 "zmodyfikować je, jeśli to potrzebne."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Pomoc"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Rozpocznij"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Instalacja zakończona"
 
@@ -1588,26 +1581,26 @@ msgid "Documentation"
 msgstr "Dokumentacja"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Instrukcja"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1759,6 +1752,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Pomoc"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2122,7 +2120,7 @@ msgstr ""
 "XMPP uruchomionym lokalnie."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "Informacje o licencji JavaScript"
 
@@ -3094,7 +3092,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5454,42 +5452,42 @@ msgstr "Interfejs administracyjny Plinth dla %(box_name)s"
 msgid "Toggle navigation"
 msgstr "Przełącz nawigację"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Dom"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Aplikacje"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Wyłącz"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Wyloguj się"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "Język"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Zaloguj się"
 
diff --git a/plinth/locale/pt/LC_MESSAGES/django.po b/plinth/locale/pt/LC_MESSAGES/django.po
index 1a0dc2975..a7e6d89bb 100644
--- a/plinth/locale/pt/LC_MESSAGES/django.po
+++ b/plinth/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-06-22 06:01+0000\n"
 "Last-Translator: adaragao <adaragao@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/freedombox/"
@@ -1290,7 +1290,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1517,18 +1517,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1537,26 +1530,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1697,6 +1690,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2053,7 +2051,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -3038,7 +3036,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5351,42 +5349,42 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "Língua"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/ru/LC_MESSAGES/django.po b/plinth/locale/ru/LC_MESSAGES/django.po
index 805f6a7fb..deb31ef41 100644
--- a/plinth/locale/ru/LC_MESSAGES/django.po
+++ b/plinth/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-07-22 17:06+0000\n"
 "Last-Translator: Igor <f2404@yandex.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/freedombox/"
@@ -1341,7 +1341,7 @@ msgid "Last update"
 msgstr "Последнее обновление"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "О службе"
 
@@ -1606,18 +1606,11 @@ msgstr ""
 "Вы можете проверить <a href=\"%(networks_url)s\">настройки сети</a>и "
 "изменить их, если необходимо."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Справка"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Запуск программы установки"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Установка Завершена"
 
@@ -1626,26 +1619,26 @@ msgid "Documentation"
 msgstr "Документация"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Руководство"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1806,6 +1799,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Справка"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2196,7 +2194,7 @@ msgstr ""
 "работающим локально."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "Информация о лицензии JavaScript"
 
@@ -3285,7 +3283,7 @@ msgid "Edit connection"
 msgstr "Редактирование подключения"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Редактировать"
 
@@ -5905,40 +5903,40 @@ msgstr "Базовая функциональность и веб-интерфе
 msgid "Toggle navigation"
 msgstr "Отображение навигации"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Домой"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Приложения"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "Система"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Смена пароля"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Перезапустить"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Завершить работу"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Выход"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr "Выберите язык"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Войти"
 
diff --git a/plinth/locale/sl/LC_MESSAGES/django.po b/plinth/locale/sl/LC_MESSAGES/django.po
index e6733d6db..866941100 100644
--- a/plinth/locale/sl/LC_MESSAGES/django.po
+++ b/plinth/locale/sl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-05-07 20:48+0000\n"
 "Last-Translator: Erik Ušaj <erikusaj@hotmail.com>\n"
 "Language-Team: Slovenian <https://hosted.weblate.org/projects/freedombox/"
@@ -1268,7 +1268,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1493,18 +1493,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1513,26 +1506,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1673,6 +1666,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2017,7 +2015,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2964,7 +2962,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5250,40 +5248,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/sv/LC_MESSAGES/django.po b/plinth/locale/sv/LC_MESSAGES/django.po
index df1ef2c9e..700de7236 100644
--- a/plinth/locale/sv/LC_MESSAGES/django.po
+++ b/plinth/locale/sv/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2016-07-23 19:30+0000\n"
 "Last-Translator: Caly <caly@aktivix.org>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/freedombox/"
@@ -1388,7 +1388,7 @@ msgid "Last update"
 msgstr "Senaste uppdatering"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Om"
 
@@ -1637,18 +1637,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Hjälp"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Starta installationsprogrammet"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Installationen Klar"
 
@@ -1657,27 +1650,27 @@ msgid "Documentation"
 msgstr "Dokumentation"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 #, fuzzy
 msgid "Manual"
 msgstr "Manual"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1839,6 +1832,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Hjälp"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2219,7 +2217,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -3338,7 +3336,7 @@ msgid "Edit connection"
 msgstr "Redigera anslutning"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Redigera"
 
@@ -5707,42 +5705,42 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Appar"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "Språkval"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/ta/LC_MESSAGES/django.po b/plinth/locale/ta/LC_MESSAGES/django.po
index 121327e2d..115399d89 100644
--- a/plinth/locale/ta/LC_MESSAGES/django.po
+++ b/plinth/locale/ta/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1168,7 +1168,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1393,18 +1393,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1413,26 +1406,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1573,6 +1566,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1917,7 +1915,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2864,7 +2862,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5148,40 +5146,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/te/LC_MESSAGES/django.po b/plinth/locale/te/LC_MESSAGES/django.po
index 535bc4488..611ec6303 100644
--- a/plinth/locale/te/LC_MESSAGES/django.po
+++ b/plinth/locale/te/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-07-22 17:06+0000\n"
 "Last-Translator: Joseph Nuthalapati <joseph.kiran92@gmail.com>\n"
 "Language-Team: Telugu <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -1324,7 +1324,7 @@ msgid "Last update"
 msgstr "చివరి నవీకరణ"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "గురించి"
 
@@ -1578,18 +1578,11 @@ msgid ""
 msgstr ""
 "మీరు <a href=\"%(networks_url)s\">నెట్వర్క్ సెటప్</a> తనిఖీ చేసి, అవసరమైతే దాన్ని సవరించవచ్చు."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "సహాయం"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "అమరికను ప్రారంభించు"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "అమరక పూర్తయ్యింది"
 
@@ -1598,26 +1591,26 @@ msgid "Documentation"
 msgstr "పత్రావళి"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "కరదీపిక"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1773,6 +1766,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "సహాయం"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2167,7 +2165,7 @@ msgstr ""
 "JSXC XMPP కోసం ఒక వెబ్ కక్షిదారి. సాధారణంగా ఇది ఒక XMPP సర్వర్ స్థానికంగా అమలు చేయటానికి ఉపయోగిస్తారు."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "జావాస్క్రిప్ట్  లైసెన్స్ సమాచరం"
 
@@ -3277,7 +3275,7 @@ msgid "Edit connection"
 msgstr "అనుసంధానాన్ని సవరించు"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "సవరించు"
 
@@ -5849,44 +5847,44 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "ముంగిలి"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "అనువర్తనాలు"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "వ్యవస్థ"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "సంకేతపదాన్ని మార్చు"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "పునఃప్రారంభించండి"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 #, fuzzy
 #| msgid "Shut Down Now"
 msgid "Shut down"
 msgstr "ఇపుడు మూసివేయండి"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "నిష్క్రమించు"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "భాష"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "లోనికి ప్రవేశించండి"
 
diff --git a/plinth/locale/tr/LC_MESSAGES/django.po b/plinth/locale/tr/LC_MESSAGES/django.po
index 1133c0641..95c991212 100644
--- a/plinth/locale/tr/LC_MESSAGES/django.po
+++ b/plinth/locale/tr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-08-08 00:22+0000\n"
 "Last-Translator: Mesut Akcan <makcan@gmail.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/freedombox/"
@@ -1310,7 +1310,7 @@ msgid "Last update"
 msgstr "Son güncelleme"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "Hakkında"
 
@@ -1580,18 +1580,11 @@ msgstr ""
 "<a href=\"%(networks_url)s\">Şebeke kurulumunu</a> kontrol edip gerekirse "
 "değiştirmek isteyebilirsiniz."
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "Yardım"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "Kuruluma Başla"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "Yapılandırma Tamamlandı"
 
@@ -1600,26 +1593,26 @@ msgid "Documentation"
 msgstr "Belgelendirme"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "Kullanım Kılavuzu"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1784,6 +1777,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "Yardım"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2189,7 +2187,7 @@ msgstr ""
 "XMPP sunucusuyla kullanılır."
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr "JavaScript lisans bilgileri"
 
@@ -3293,7 +3291,7 @@ msgid "Edit connection"
 msgstr "Bağlantıyı Düzenle"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "Düzenle"
 
@@ -6006,42 +6004,42 @@ msgstr "%(box_name)s için Plinth yönetim arayüzü"
 msgid "Toggle navigation"
 msgstr "Tarama Geçişi"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "Ev"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "Uygulamalar"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "Sistem"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr "Tekrar Başlat"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr "Kapat"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "Çıkış yap"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "Lisan"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "Giriş yap"
 
diff --git a/plinth/locale/uk/LC_MESSAGES/django.po b/plinth/locale/uk/LC_MESSAGES/django.po
index dccac4b6b..6126752cf 100644
--- a/plinth/locale/uk/LC_MESSAGES/django.po
+++ b/plinth/locale/uk/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-01-04 17:06+0000\n"
 "Last-Translator: prolinux ukraine <prolinux@ukr.net>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/freedombox/"
@@ -1222,7 +1222,7 @@ msgid "Last update"
 msgstr ""
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr ""
 
@@ -1447,18 +1447,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr ""
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr ""
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr ""
 
@@ -1467,26 +1460,26 @@ msgid "Documentation"
 msgstr ""
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr ""
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1627,6 +1620,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr ""
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -1973,7 +1971,7 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -2920,7 +2918,7 @@ msgid "Edit connection"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr ""
 
@@ -5206,40 +5204,40 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr ""
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr ""
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr ""
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr ""
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 msgid "Restart"
 msgstr ""
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 msgid "Shut down"
 msgstr ""
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr ""
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 msgid "Select language"
 msgstr ""
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr ""
 
diff --git a/plinth/locale/zh_Hans/LC_MESSAGES/django.po b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
index b6681de2e..ccc6cc781 100644
--- a/plinth/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Plinth\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-09 17:49-0400\n"
+"POT-Creation-Date: 2019-09-23 17:50-0400\n"
 "PO-Revision-Date: 2019-09-13 05:23+0000\n"
 "Last-Translator: Anxin YI <2732146152@qq.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -1260,7 +1260,7 @@ msgid "Last update"
 msgstr "最后一次更新"
 
 #: plinth/modules/dynamicdns/views.py:41 plinth/modules/help/help.py:70
-#: plinth/templates/base.html:183 plinth/templates/base.html:184
+#: plinth/templates/help-menu.html:61 plinth/templates/help-menu.html:62
 msgid "About"
 msgstr "关于"
 
@@ -1511,18 +1511,11 @@ msgid ""
 "modify it if necessary."
 msgstr ""
 
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:23
-#: plinth/modules/first_boot/templates/firstboot_navbar.html:26
-#: plinth/modules/help/templates/help_index.html:27
-#: plinth/templates/base.html:145 plinth/templates/base.html:150
-msgid "Help"
-msgstr "帮助"
-
 #: plinth/modules/first_boot/templates/firstboot_welcome.html:52
 msgid "Start Setup"
 msgstr "启动安装程序"
 
-#: plinth/modules/first_boot/views.py:66
+#: plinth/modules/first_boot/views.py:64
 msgid "Setup Complete"
 msgstr "安装完成"
 
@@ -1531,26 +1524,26 @@ msgid "Documentation"
 msgstr "文档"
 
 #: plinth/modules/help/help.py:51 plinth/modules/networks/forms.py:68
-#: plinth/modules/networks/forms.py:108 plinth/templates/base.html:157
-#: plinth/templates/base.html:158 plinth/templates/index.html:135
+#: plinth/modules/networks/forms.py:108 plinth/templates/help-menu.html:35
+#: plinth/templates/help-menu.html:36 plinth/templates/index.html:135
 msgid "Manual"
 msgstr "手册"
 
 #: plinth/modules/help/help.py:56 plinth/modules/help/help.py:104
 #: plinth/modules/help/templates/help_support.html:24
-#: plinth/templates/base.html:164 plinth/templates/base.html:165
+#: plinth/templates/help-menu.html:42 plinth/templates/help-menu.html:43
 msgid "Get Support"
 msgstr ""
 
 #: plinth/modules/help/help.py:61 plinth/modules/help/help.py:98
 #: plinth/modules/help/templates/help_feedback.html:24
-#: plinth/templates/base.html:170 plinth/templates/base.html:171
+#: plinth/templates/help-menu.html:48 plinth/templates/help-menu.html:49
 msgid "Submit Feedback"
 msgstr ""
 
 #: plinth/modules/help/help.py:66 plinth/modules/help/help.py:92
 #: plinth/modules/help/templates/help_contribute.html:24
-#: plinth/templates/base.html:176 plinth/templates/base.html:177
+#: plinth/templates/help-menu.html:54 plinth/templates/help-menu.html:55
 msgid "Contribute"
 msgstr ""
 
@@ -1709,6 +1702,11 @@ msgstr ""
 msgid "Thank you!"
 msgstr ""
 
+#: plinth/modules/help/templates/help_index.html:27
+#: plinth/templates/help-menu.html:23 plinth/templates/help-menu.html:28
+msgid "Help"
+msgstr "帮助"
+
 #: plinth/modules/help/templates/help_index.html:31
 #, python-format
 msgid ""
@@ -2118,7 +2116,7 @@ msgid ""
 msgstr "JSXC 是一个 XMPP 网页客户端，主要用于连接本地 XMPP 服务器的连接。"
 
 #: plinth/modules/jsxc/templates/jsxc_launch.html:140
-#: plinth/templates/base.html:291
+#: plinth/templates/base.html:249
 msgid "JavaScript license information"
 msgstr ""
 
@@ -3189,7 +3187,7 @@ msgid "Edit connection"
 msgstr "编辑连接"
 
 #: plinth/modules/networks/templates/connection_show.html:43
-#: plinth/templates/base.html:200 plinth/templates/base.html:201
+#: plinth/templates/base.html:158 plinth/templates/base.html:159
 msgid "Edit"
 msgstr "編輯"
 
@@ -5785,46 +5783,46 @@ msgstr "Plinth %(box_name)s 管理界面"
 msgid "Toggle navigation"
 msgstr "切换导航"
 
-#: plinth/templates/base.html:114 plinth/templates/base.html:117
+#: plinth/templates/base.html:115 plinth/templates/base.html:118
 msgid "Home"
 msgstr "主页"
 
-#: plinth/templates/base.html:122 plinth/templates/base.html:126
+#: plinth/templates/base.html:123 plinth/templates/base.html:127
 msgid "Apps"
 msgstr "应用程序"
 
-#: plinth/templates/base.html:131 plinth/templates/base.html:135
+#: plinth/templates/base.html:132 plinth/templates/base.html:136
 msgid "System"
 msgstr "系统"
 
-#: plinth/templates/base.html:206 plinth/templates/base.html:207
+#: plinth/templates/base.html:164 plinth/templates/base.html:165
 msgid "Change password"
 msgstr "更改密码"
 
-#: plinth/templates/base.html:214 plinth/templates/base.html:215
+#: plinth/templates/base.html:172 plinth/templates/base.html:173
 #, fuzzy
 #| msgid "Restart Now"
 msgid "Restart"
 msgstr "现在重新启动"
 
-#: plinth/templates/base.html:220 plinth/templates/base.html:221
+#: plinth/templates/base.html:178 plinth/templates/base.html:179
 #, fuzzy
 #| msgid "Shut Down Now"
 msgid "Shut down"
 msgstr "现在关闭"
 
-#: plinth/templates/base.html:228 plinth/templates/base.html:229
-#: plinth/templates/base.html:253 plinth/templates/base.html:255
+#: plinth/templates/base.html:186 plinth/templates/base.html:187
+#: plinth/templates/base.html:211 plinth/templates/base.html:213
 msgid "Log out"
 msgstr "登出"
 
-#: plinth/templates/base.html:237 plinth/templates/base.html:240
+#: plinth/templates/base.html:195 plinth/templates/base.html:198
 #, fuzzy
 #| msgid "Language"
 msgid "Select language"
 msgstr "语言"
 
-#: plinth/templates/base.html:245 plinth/templates/base.html:247
+#: plinth/templates/base.html:203 plinth/templates/base.html:205
 msgid "Log in"
 msgstr "登录"
 

From 2745cb2a1658bad3e8d5ffde65c7a73690dadabd Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Mon, 23 Sep 2019 18:13:11 -0400
Subject: [PATCH 10/11] doc: Fetch latest manual

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
---
 doc/Apache_userdir.raw.xml    |  2 +-
 doc/Backups.raw.xml           |  2 +-
 doc/Cockpit.raw.xml           |  2 +-
 doc/Configure.raw.xml         |  2 +-
 doc/Coquelicot.raw.xml        |  2 +-
 doc/DateTime.raw.xml          |  2 +-
 doc/Deluge.raw.xml            |  2 +-
 doc/Diagnostics.raw.xml       |  2 +-
 doc/DynamicDNS.raw.xml        |  2 +-
 doc/Firewall.raw.xml          |  2 +-
 doc/I2P.raw.xml               |  2 +-
 doc/Ikiwiki.raw.xml           |  2 +-
 doc/Infinoted.raw.xml         |  2 +-
 doc/LetsEncrypt.raw.xml       |  2 +-
 doc/MLDonkey.raw.xml          |  2 +-
 doc/MatrixSynapse.raw.xml     |  2 +-
 doc/MediaWiki.raw.xml         |  2 +-
 doc/Minetest.raw.xml          |  2 +-
 doc/Monkeysphere.raw.xml      |  2 +-
 doc/Mumble.raw.xml            |  2 +-
 doc/NameServices.raw.xml      |  2 +-
 doc/Networks.raw.xml          |  2 +-
 doc/OpenVPN.raw.xml           |  4 ++--
 doc/PageKite.raw.xml          |  2 +-
 doc/Power.raw.xml             |  2 +-
 doc/Privoxy.raw.xml           |  2 +-
 doc/Quassel.raw.xml           |  2 +-
 doc/Radicale.raw.xml          |  2 +-
 doc/Repro.raw.xml             |  2 +-
 doc/Roundcube.raw.xml         |  2 +-
 doc/Searx.raw.xml             |  2 +-
 doc/SecureShell.raw.xml       |  2 +-
 doc/Security.raw.xml          |  2 +-
 doc/ServiceDiscovery.raw.xml  |  2 +-
 doc/Shadowsocks.raw.xml       |  2 +-
 doc/Snapshots.raw.xml         |  2 +-
 doc/Storage.raw.xml           |  2 +-
 doc/Syncthing.raw.xml         |  2 +-
 doc/TinyTinyRSS.raw.xml       |  2 +-
 doc/Tor.raw.xml               |  2 +-
 doc/Transmission.raw.xml      |  2 +-
 doc/Upgrades.raw.xml          |  2 +-
 doc/Users.raw.xml             |  2 +-
 doc/ejabberd.raw.xml          |  2 +-
 doc/freedombox-manual.raw.xml | 32 +++++++++++++++++++++++++++-----
 45 files changed, 72 insertions(+), 50 deletions(-)

diff --git a/doc/Apache_userdir.raw.xml b/doc/Apache_userdir.raw.xml
index 10c4c8f51..f59a25566 100644
--- a/doc/Apache_userdir.raw.xml
+++ b/doc/Apache_userdir.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Apache_userdir</title><revhistory><revision><revnumber>3</revnumber><date>2019-02-27 00:08:57</date><authorinitials>JamesValleroy</authorinitials><revremark>remove wiki links</revremark></revision><revision><revnumber>2</revnumber><date>2019-02-17 21:44:22</date><authorinitials>MikkelKirkgaardNielsen</authorinitials><revremark>refer to ourselves as User websites, add basics table from new template</revremark></revision><revision><revnumber>1</revnumber><date>2019-02-13 23:15:52</date><authorinitials>MikkelKirkgaardNielsen</authorinitials><revremark>add draft page</revremark></revision></revhistory></articleinfo><section><title>User websites (userdir)</title><section><title>What is User websites?</title><para>User websites is a module of the Apache webserver enabled to allow users defined in the FreedomBox system to expose a set of static files on the FreedomBox filesystem as a website to the local network and/or the internet according to the network and firewall setup. </para><informaltable><tgroup cols="2"><colspec colname="col_0"/><colspec colname="col_1"/><tbody><row rowsep="1"><entry align="center" colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para><emphasis role="strong">Application basics</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para>Category</para></entry><entry colsep="1" rowsep="1"><para> File sharing </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para>Available since version </para></entry><entry colsep="1" rowsep="1"><para> 0.9.4</para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para>Upstream project website </para></entry><entry colsep="1" rowsep="1"><para> <ulink url="https://httpd.apache.org/docs/2.4/mod/mod_userdir.html"/></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para>Upstream end user documentation </para></entry><entry colsep="1" rowsep="1"><para> <ulink url="https://httpd.apache.org/docs/2.4/howto/public_html.html"/></para></entry></row></tbody></tgroup></informaltable></section><section><title>Screenshot</title><para><remark>Add when/if an interface is made for Plinth</remark> </para></section><section><title>Using User websites</title><para>The module is always enabled and offers no configuration from the Plinth web interface. Currently its existence is not even visible in the Plinth web interface. </para><para>Using the modules capability to serve documents requires just to place the documents in the designated directory in a Plinth user's home directory in the filesystem. </para><para>This directory is: <emphasis role="strong">public_html</emphasis> </para><para>Thus the absolute path for the directory of a user named fbx with home directory in /home/fbx will be <emphasis role="strong">/home/fbx/public_html</emphasis>. User websites will serve documents placed in this directory when requests for documents with the URI path &quot;~fbx&quot; are received. For the the example.org domain thus a request for the document example.org/~fbx/index.html will transfer the file in /home/fbx/public_html/index.html. </para></section><section><title>Using SFTP to create public_html and upload documents</title><para><remark>To be written</remark> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Apache_userdir</title><revhistory><revision><revnumber>3</revnumber><date>2019-02-27 00:08:57</date><authorinitials>JamesValleroy</authorinitials><revremark>remove wiki links</revremark></revision><revision><revnumber>2</revnumber><date>2019-02-17 21:44:22</date><authorinitials>MikkelKirkgaardNielsen</authorinitials><revremark>refer to ourselves as User websites, add basics table from new template</revremark></revision><revision><revnumber>1</revnumber><date>2019-02-13 23:15:52</date><authorinitials>MikkelKirkgaardNielsen</authorinitials><revremark>add draft page</revremark></revision></revhistory></articleinfo><section><title>User websites (userdir)</title><section><title>What is User websites?</title><para>User websites is a module of the Apache webserver enabled to allow users defined in the FreedomBox system to expose a set of static files on the FreedomBox filesystem as a website to the local network and/or the internet according to the network and firewall setup. </para><informaltable><tgroup cols="2"><colspec colname="col_0"/><colspec colname="col_1"/><tbody><row rowsep="1"><entry align="center" colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para><emphasis role="strong">Application basics</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para>Category</para></entry><entry colsep="1" rowsep="1"><para> File sharing </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para>Available since version </para></entry><entry colsep="1" rowsep="1"><para> 0.9.4</para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para>Upstream project website </para></entry><entry colsep="1" rowsep="1"><para> <ulink url="https://httpd.apache.org/docs/2.4/mod/mod_userdir.html"/></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para>Upstream end user documentation </para></entry><entry colsep="1" rowsep="1"><para> <ulink url="https://httpd.apache.org/docs/2.4/howto/public_html.html"/></para></entry></row></tbody></tgroup></informaltable></section><section><title>Screenshot</title><para><remark>Add when/if an interface is made for Plinth</remark> </para></section><section><title>Using User websites</title><para>The module is always enabled and offers no configuration from the Plinth web interface. Currently its existence is not even visible in the Plinth web interface. </para><para>Using the modules capability to serve documents requires just to place the documents in the designated directory in a Plinth user's home directory in the filesystem. </para><para>This directory is: <emphasis role="strong">public_html</emphasis> </para><para>Thus the absolute path for the directory of a user named fbx with home directory in /home/fbx will be <emphasis role="strong">/home/fbx/public_html</emphasis>. User websites will serve documents placed in this directory when requests for documents with the URI path &quot;~fbx&quot; are received. For the the example.org domain thus a request for the document example.org/~fbx/index.html will transfer the file in /home/fbx/public_html/index.html. </para></section><section><title>Using SFTP to create public_html and upload documents</title><para><remark>To be written</remark> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Apache_userdir/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Backups.raw.xml b/doc/Backups.raw.xml
index 2a2891fd8..154b501fa 100644
--- a/doc/Backups.raw.xml
+++ b/doc/Backups.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Backups</title><revhistory><revision><revnumber>30</revnumber><date>2019-02-26 23:33:42</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about tt-rss</revremark></revision><revision><revnumber>29</revnumber><date>2019-02-23 00:11:05</date><authorinitials>JamesValleroy</authorinitials><revremark>add mldonkey</revremark></revision><revision><revnumber>28</revnumber><date>2019-02-04 01:16:41</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add FreedomBox footer</revremark></revision><revision><revnumber>27</revnumber><date>2019-01-31 01:30:48</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor formatting</revremark></revision><revision><revnumber>26</revnumber><date>2019-01-31 01:29:18</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Make manual friendly, consolidate feature data, update description</revremark></revision><revision><revnumber>25</revnumber><date>2019-01-30 17:45:57</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor release update</revremark></revision><revision><revnumber>24</revnumber><date>2019-01-23 00:43:21</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about syncthing</revremark></revision><revision><revnumber>23</revnumber><date>2019-01-18 22:26:06</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update OpenVPN information</revremark></revision><revision><revnumber>22</revnumber><date>2018-10-30 05:04:32</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about Tahoe-LAFS</revremark></revision><revision><revnumber>21</revnumber><date>2018-10-29 23:50:51</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about users and letsencrypt</revremark></revision><revision><revnumber>20</revnumber><date>2018-10-26 05:36:32</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about Monkeysphere</revremark></revision><revision><revnumber>19</revnumber><date>2018-10-23 23:30:58</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about upgrades</revremark></revision><revision><revnumber>18</revnumber><date>2018-10-23 22:21:23</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about Tor</revremark></revision><revision><revnumber>17</revnumber><date>2018-10-22 17:17:31</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about newly merged changes</revremark></revision><revision><revnumber>16</revnumber><date>2018-10-19 17:12:53</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about SSH</revremark></revision><revision><revnumber>15</revnumber><date>2018-10-19 15:38:54</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information on recent progress</revremark></revision><revision><revnumber>14</revnumber><date>2018-10-15 23:09:09</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update status of datetime and deluge</revremark></revision><revision><revnumber>13</revnumber><date>2018-10-09 03:22:17</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about release of version 0.40</revremark></revision><revision><revnumber>12</revnumber><date>2018-10-04 11:34:24</date><authorinitials>JamesValleroy</authorinitials><revremark>remove links to &quot;FreedomBox&quot; page</revremark></revision><revision><revnumber>11</revnumber><date>2018-10-04 04:47:13</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor formatting</revremark></revision><revision><revnumber>10</revnumber><date>2018-10-04 04:46:50</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update list of supported applications</revremark></revision><revision><revnumber>9</revnumber><date>2018-10-02 15:43:29</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>8</revnumber><date>2018-10-02 15:41:49</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>7</revnumber><date>2018-10-02 15:38:00</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>6</revnumber><date>2018-10-01 17:38:55</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>5</revnumber><date>2018-10-01 16:50:33</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>4</revnumber><date>2018-10-01 16:49:00</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>3</revnumber><date>2018-10-01 16:39:47</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>2</revnumber><date>2018-10-01 16:37:48</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>1</revnumber><date>2018-10-01 16:36:42</date><authorinitials>DannyHaidar</authorinitials></revision></revhistory></articleinfo><section><title>Backups</title><para>FreedomBox includes the ability to backup and restore data, preferences, configuration and secrets from most of the applications. The Backups feature is built using Borg backup software. Borg is a deduplicating and compressing backup program. It is designed for efficient and secure backups. This backups feature can be used to selectively backup and restore data on an app-by-app basis. Backed up data can be stored on the FreedomBox machine itself or on a remote server. Any remote server providing SSH access can be used as a backup storage repository for FreedomBox backups. Data stored remotely may be encrypted and in such cases remote server cannot access your decrypted data. </para><section><title>Status of Backups Feature</title><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis role="strong">App/Feature</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> <emphasis role="strong">Support in Version</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> <emphasis role="strong">Notes</emphasis> </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Avahi </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Backups </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Bind </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Cockpit </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Coquelicot </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> includes uploaded files </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Datetime </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Deluge </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"><para> does not include downloaded/seeding files </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Diagnostics </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Dynamic DNS </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> ejabberd </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes all data and configuration </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Firewall </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> ikiwiki </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes all wikis/blogs and their content </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> infinoted </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes all data and keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> JSXC </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Let's Encrypt </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Matrix Synapse </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes media and uploads </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> MediaWiki </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes wiki pages and uploaded files </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Minetest </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> MLDonkey </para></entry><entry colsep="1" rowsep="1"><para> 19.0 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Monkeysphere </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Mumble </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Names </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Networks </para></entry><entry colsep="1" rowsep="1"><para> No </para></entry><entry colsep="1" rowsep="1"><para> No plans currently to implement backup </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> OpenVPN </para></entry><entry colsep="1" rowsep="1"><para> 0.48 </para></entry><entry colsep="1" rowsep="1"><para> includes all user and server keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Pagekite </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Power </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Privoxy </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Quassel </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> includes users and logs </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Radicale </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes calendar and cards data for all users </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> repro </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes all users, data and keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Roundcube </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> SearX </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Secure Shell (SSH) Server </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"><para> includes host keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Security </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Shadowsocks </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> only secrets </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Sharing </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> does not include the data in the shared folders </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Snapshot </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"><para> only configuration, does not include snapshot data </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Storage </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Syncthing </para></entry><entry colsep="1" rowsep="1"><para> 0.48 </para></entry><entry colsep="1" rowsep="1"><para> does not include data in the shared folders </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Tahoe-LAFS </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"><para> includes all data and configuration </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Tiny Tiny RSS </para></entry><entry colsep="1" rowsep="1"><para> 19.2 </para></entry><entry colsep="1" rowsep="1"><para> includes database containing feeds, stories, etc. </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Tor </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"><para> includes configuration and secrets such as hidden service keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Transmission </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> does not include downloaded/seeding files </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Upgrades </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Users </para></entry><entry colsep="1" rowsep="1"><para> No </para></entry><entry colsep="1" rowsep="1"><para> No plans currently to implement backup </para></entry></row></tbody></tgroup></informaltable></section><section><title>How to install and use Backups</title><para><emphasis role="strong">Step 1</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step1_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 1</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 2</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step2_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 2</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 3</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step3_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 3</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 4</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step4_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 4</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 5</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step5_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 5</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 6</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step6_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 6</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 7</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step7_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 7</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Backups</title><revhistory><revision><revnumber>30</revnumber><date>2019-02-26 23:33:42</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about tt-rss</revremark></revision><revision><revnumber>29</revnumber><date>2019-02-23 00:11:05</date><authorinitials>JamesValleroy</authorinitials><revremark>add mldonkey</revremark></revision><revision><revnumber>28</revnumber><date>2019-02-04 01:16:41</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add FreedomBox footer</revremark></revision><revision><revnumber>27</revnumber><date>2019-01-31 01:30:48</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor formatting</revremark></revision><revision><revnumber>26</revnumber><date>2019-01-31 01:29:18</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Make manual friendly, consolidate feature data, update description</revremark></revision><revision><revnumber>25</revnumber><date>2019-01-30 17:45:57</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor release update</revremark></revision><revision><revnumber>24</revnumber><date>2019-01-23 00:43:21</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about syncthing</revremark></revision><revision><revnumber>23</revnumber><date>2019-01-18 22:26:06</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update OpenVPN information</revremark></revision><revision><revnumber>22</revnumber><date>2018-10-30 05:04:32</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about Tahoe-LAFS</revremark></revision><revision><revnumber>21</revnumber><date>2018-10-29 23:50:51</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about users and letsencrypt</revremark></revision><revision><revnumber>20</revnumber><date>2018-10-26 05:36:32</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about Monkeysphere</revremark></revision><revision><revnumber>19</revnumber><date>2018-10-23 23:30:58</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about upgrades</revremark></revision><revision><revnumber>18</revnumber><date>2018-10-23 22:21:23</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about Tor</revremark></revision><revision><revnumber>17</revnumber><date>2018-10-22 17:17:31</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about newly merged changes</revremark></revision><revision><revnumber>16</revnumber><date>2018-10-19 17:12:53</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about SSH</revremark></revision><revision><revnumber>15</revnumber><date>2018-10-19 15:38:54</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information on recent progress</revremark></revision><revision><revnumber>14</revnumber><date>2018-10-15 23:09:09</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update status of datetime and deluge</revremark></revision><revision><revnumber>13</revnumber><date>2018-10-09 03:22:17</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about release of version 0.40</revremark></revision><revision><revnumber>12</revnumber><date>2018-10-04 11:34:24</date><authorinitials>JamesValleroy</authorinitials><revremark>remove links to &quot;FreedomBox&quot; page</revremark></revision><revision><revnumber>11</revnumber><date>2018-10-04 04:47:13</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor formatting</revremark></revision><revision><revnumber>10</revnumber><date>2018-10-04 04:46:50</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update list of supported applications</revremark></revision><revision><revnumber>9</revnumber><date>2018-10-02 15:43:29</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>8</revnumber><date>2018-10-02 15:41:49</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>7</revnumber><date>2018-10-02 15:38:00</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>6</revnumber><date>2018-10-01 17:38:55</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>5</revnumber><date>2018-10-01 16:50:33</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>4</revnumber><date>2018-10-01 16:49:00</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>3</revnumber><date>2018-10-01 16:39:47</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>2</revnumber><date>2018-10-01 16:37:48</date><authorinitials>DannyHaidar</authorinitials></revision><revision><revnumber>1</revnumber><date>2018-10-01 16:36:42</date><authorinitials>DannyHaidar</authorinitials></revision></revhistory></articleinfo><section><title>Backups</title><para>FreedomBox includes the ability to backup and restore data, preferences, configuration and secrets from most of the applications. The Backups feature is built using Borg backup software. Borg is a deduplicating and compressing backup program. It is designed for efficient and secure backups. This backups feature can be used to selectively backup and restore data on an app-by-app basis. Backed up data can be stored on the FreedomBox machine itself or on a remote server. Any remote server providing SSH access can be used as a backup storage repository for FreedomBox backups. Data stored remotely may be encrypted and in such cases remote server cannot access your decrypted data. </para><section><title>Status of Backups Feature</title><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis role="strong">App/Feature</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> <emphasis role="strong">Support in Version</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> <emphasis role="strong">Notes</emphasis> </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Avahi </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Backups </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Bind </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Cockpit </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Coquelicot </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> includes uploaded files </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Datetime </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Deluge </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"><para> does not include downloaded/seeding files </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Diagnostics </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Dynamic DNS </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> ejabberd </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes all data and configuration </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Firewall </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> ikiwiki </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes all wikis/blogs and their content </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> infinoted </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes all data and keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> JSXC </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Let's Encrypt </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Matrix Synapse </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes media and uploads </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> MediaWiki </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes wiki pages and uploaded files </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Minetest </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> MLDonkey </para></entry><entry colsep="1" rowsep="1"><para> 19.0 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Monkeysphere </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Mumble </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Names </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Networks </para></entry><entry colsep="1" rowsep="1"><para> No </para></entry><entry colsep="1" rowsep="1"><para> No plans currently to implement backup </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> OpenVPN </para></entry><entry colsep="1" rowsep="1"><para> 0.48 </para></entry><entry colsep="1" rowsep="1"><para> includes all user and server keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Pagekite </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Power </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Privoxy </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Quassel </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> includes users and logs </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Radicale </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes calendar and cards data for all users </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> repro </para></entry><entry colsep="1" rowsep="1"><para> 0.39 </para></entry><entry colsep="1" rowsep="1"><para> includes all users, data and keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Roundcube </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> SearX </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Secure Shell (SSH) Server </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"><para> includes host keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Security </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Shadowsocks </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> only secrets </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Sharing </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> does not include the data in the shared folders </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Snapshot </para></entry><entry colsep="1" rowsep="1"><para> 0.41 </para></entry><entry colsep="1" rowsep="1"><para> only configuration, does not include snapshot data </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Storage </para></entry><entry colsep="1" rowsep="1"><para> - </para></entry><entry colsep="1" rowsep="1"><para> no backup needed </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Syncthing </para></entry><entry colsep="1" rowsep="1"><para> 0.48 </para></entry><entry colsep="1" rowsep="1"><para> does not include data in the shared folders </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Tahoe-LAFS </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"><para> includes all data and configuration </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Tiny Tiny RSS </para></entry><entry colsep="1" rowsep="1"><para> 19.2 </para></entry><entry colsep="1" rowsep="1"><para> includes database containing feeds, stories, etc. </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Tor </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"><para> includes configuration and secrets such as hidden service keys </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Transmission </para></entry><entry colsep="1" rowsep="1"><para> 0.40 </para></entry><entry colsep="1" rowsep="1"><para> does not include downloaded/seeding files </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Upgrades </para></entry><entry colsep="1" rowsep="1"><para> 0.42 </para></entry><entry colsep="1" rowsep="1"/></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> Users </para></entry><entry colsep="1" rowsep="1"><para> No </para></entry><entry colsep="1" rowsep="1"><para> No plans currently to implement backup </para></entry></row></tbody></tgroup></informaltable></section><section><title>How to install and use Backups</title><para><emphasis role="strong">Step 1</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step1_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 1</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 2</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step2_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 2</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 3</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step3_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 3</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 4</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step4_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 4</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 5</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step5_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 5</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 6</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step6_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 6</phrase></textobject></inlinemediaobject> </para><para><emphasis role="strong">Step 7</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Backups?action=AttachFile&amp;do=get&amp;target=Backups_Step7_v49.png" width="800"/></imageobject><textobject><phrase>Backups: Step 7</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Backups/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Cockpit.raw.xml b/doc/Cockpit.raw.xml
index b89e48134..7e6c324af 100644
--- a/doc/Cockpit.raw.xml
+++ b/doc/Cockpit.raw.xml
@@ -4,4 +4,4 @@
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
 <article><articleinfo><title>FreedomBox/Manual/Cockpit</title><revhistory><revision><revnumber>4</revnumber><date>2019-08-20 18:22:51</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about .local domain and fix URLs</revremark></revision><revision><revnumber>3</revnumber><date>2019-07-19 00:08:47</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add informatio about Cockpit needing a proper domain name</revremark></revision><revision><revnumber>2</revnumber><date>2019-01-10 21:41:56</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Write manual page for Cockpit</revremark></revision><revision><revnumber>1</revnumber><date>2018-03-02 12:57:48</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Create stub for Cockpit</revremark></revision></revhistory></articleinfo><section><title>Cockpit (Server Administration)</title><para>Cockpit is a server manager that makes it easy to administer GNU/Linux servers via a web browser. On a FreedomBox, controls are available for many advanced functions that are not usually required. A web based terminal for console operations is also available. </para><para>It can be accessed by any user on your FreedomBox belonging to the admin group. Cockpit is only usable when you have proper domain name setup for your FreedomBox and you use that domain name to access Cockpit. See the Troubleshooting section for more information. </para><caution><para>Use cockpit only if you are an administrator of GNU/Linux systems with advanced skills. FreedomBox tries to coexist with changes to system by system administrators and system administration tools like Cockpit. However, improper changes to the system might causes failures in FreedomBox functions. </para></caution><section><title>Using Cockpit</title><para>Install Cockpit like any other application on FreedomBox. Make sure that Cockpit is enabled after that. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-enable.png"/></imageobject><textobject><phrase>cockpit-enable.png</phrase></textobject></inlinemediaobject> </para><para>Ensure that the user account on FreedomBox that will used for Cockpit is part of the administrators group. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-admin-user.png"/></imageobject><textobject><phrase>cockpit-admin-user.png</phrase></textobject></inlinemediaobject> </para><para>Launch the Cockpit web interface. Login using the configured user account. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-login.png"/></imageobject><textobject><phrase>cockpit-login.png</phrase></textobject></inlinemediaobject> </para><para>Start using cockpit. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-system.png"/></imageobject><textobject><phrase>cockpit-system.png</phrase></textobject></inlinemediaobject> </para><para>Cockpit is usable on mobile interfaces too. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-mobile.png"/></imageobject><textobject><phrase>cockpit-mobile.png</phrase></textobject></inlinemediaobject> </para></section><section><title>Features</title><para>The following features of Cockpit may be useful for advanced FreedomBox users. </para><section><title>System Dashboard</title><para>Cockpit has a system dashboard that </para><itemizedlist><listitem><para>Shows detailed hardware information </para></listitem><listitem><para>Shows basic performance metrics of a system </para></listitem><listitem><para>Allows changing system time and timezone </para></listitem><listitem><para>Allows changing hostname. Please use FreedomBox UI to do this </para></listitem><listitem><para>Shows SSH server fingerprints </para></listitem></itemizedlist><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-system.png"/></imageobject><textobject><phrase>cockpit-system.png</phrase></textobject></inlinemediaobject> </para></section><section><title>Viewing System Logs</title><para>Cockpit allows querying system logs and examining them in full detail. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-logs.png"/></imageobject><textobject><phrase>cockpit-logs.png</phrase></textobject></inlinemediaobject> </para></section><section><title>Managing Storage</title><para>Cockpit allows following advanced storage functions: </para><itemizedlist><listitem><para>View full disk information </para></listitem><listitem><para>Editing disk partitions </para></listitem><listitem><para>RAID management </para></listitem></itemizedlist><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-storage1.png"/></imageobject><textobject><phrase>cockpit-storage1.png</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-storage2.png"/></imageobject><textobject><phrase>cockpit-storage2.png</phrase></textobject></inlinemediaobject> </para></section><section><title>Networking</title><para>Cockpit and FreedomBox both rely on NetworkManager to configure the network. However, Cockpit offers some advanced configuration not available on FreedomBox: </para><itemizedlist><listitem><para>Route configuration </para></listitem><listitem><para>Configure Bonds, Bridges, VLANs </para></listitem></itemizedlist><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-network1.png"/></imageobject><textobject><phrase>cockpit-network1.png</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-network2.png"/></imageobject><textobject><phrase>cockpit-network2.png</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-network3.png"/></imageobject><textobject><phrase>cockpit-network3.png</phrase></textobject></inlinemediaobject> </para></section><section><title>Services</title><para>Cockpit allows management of services and periodic jobs (similar to cron). </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-services1.png"/></imageobject><textobject><phrase>cockpit-services1.png</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-services2.png"/></imageobject><textobject><phrase>cockpit-services2.png</phrase></textobject></inlinemediaobject> </para></section><section><title>Web Terminal</title><para>Cockpit offers a web based terminal that can be used perform manual system administration tasks. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Cockpit?action=AttachFile&amp;do=get&amp;target=cockpit-terminal.png"/></imageobject><textobject><phrase>cockpit-terminal.png</phrase></textobject></inlinemediaobject> </para></section></section><section><title>Troubleshooting</title><para>Cockpit requires a domain name to be properly setup on your FreedomBox and will only work when you access it using a URL with that domain name. Cockpit will not work when using IP address in the URL. Using <emphasis>freedombox.local</emphasis> as the domain name also does not work. For example, the following URLs will not work: </para><screen><![CDATA[https://192.168.0.10/_cockpit/
 https://freedombox.local/_cockpit/]]></screen><para>Starting with FreedomBox version 19.15, using <emphasis>.local</emphasis> domain works. You can access Cockpit using the URL <ulink url="https://freedombox.local/_cockpit/"/>. The <emphasis>.local</emphasis> domain is based on your hostname. If your hostname is <emphasis>mybox</emphasis>, your <emphasis>.local</emphasis> domain name will be <emphasis>mybox.local</emphasis> and the Cockpit URL will be <ulink url="https://mybox.local/_cockpit/"/>. </para><para>To properly access Cockpit, use the domain name <ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Manual/Configure#">configured</ulink> for your FreedomBox.Cockpit will also work well when using a <ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor">Tor Hidden Service</ulink>. The following URLs will work: </para><screen><![CDATA[https://mybox.freedombox.rocks/_cockpit/
-https://exampletorhs.onion/_cockpit/]]></screen><para>The reason for this behaviour is that Cockpit uses WebSockets to connect to the backend server. Cross site requests for WebSockets must be prevented for security reasons. To implement this, Cockpit maintains a list of all domains from which requests are allowed. FreedomBox automatically configures this list whenever you add or remove a domain. However, since we can't rely on IP addresses, they are not added by FreedomBox to this domain list. You can see the current list of allowed domains, as managed by FreedomBox, in <emphasis>/etc/cockpit/cockpit.conf</emphasis>. You may edit this, but do so only if you understand web security consequences of this. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+https://exampletorhs.onion/_cockpit/]]></screen><para>The reason for this behaviour is that Cockpit uses WebSockets to connect to the backend server. Cross site requests for WebSockets must be prevented for security reasons. To implement this, Cockpit maintains a list of all domains from which requests are allowed. FreedomBox automatically configures this list whenever you add or remove a domain. However, since we can't rely on IP addresses, they are not added by FreedomBox to this domain list. You can see the current list of allowed domains, as managed by FreedomBox, in <emphasis>/etc/cockpit/cockpit.conf</emphasis>. You may edit this, but do so only if you understand web security consequences of this. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Cockpit/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Configure.raw.xml b/doc/Configure.raw.xml
index 8192404f3..bcd918d05 100644
--- a/doc/Configure.raw.xml
+++ b/doc/Configure.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Configure</title><revhistory><revision><revnumber>9</revnumber><date>2019-02-28 10:25:01</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Rename default app to webserver home page</revremark></revision><revision><revnumber>8</revnumber><date>2018-10-09 09:54:01</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Improve formatting</revremark></revision><revision><revnumber>7</revnumber><date>2018-07-25 08:38:53</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Remove /home as an alias to /freedombox</revremark></revision><revision><revnumber>6</revnumber><date>2018-07-24 17:51:28</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Rename FreedomBox Plinth to FreedomBox Service (Plinth)</revremark></revision><revision><revnumber>5</revnumber><date>2018-07-24 16:12:49</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add tip about bookmarking FreedomBox Plinth</revremark></revision><revision><revnumber>4</revnumber><date>2018-07-24 13:52:47</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add wiki entry about Default App</revremark></revision><revision><revnumber>3</revnumber><date>2016-12-31 04:11:43</date><authorinitials>JamesValleroy</authorinitials><revremark>mention how domain name is used</revremark></revision><revision><revnumber>2</revnumber><date>2016-12-31 04:07:26</date><authorinitials>JamesValleroy</authorinitials><revremark>fix outline</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 16:35:55</date><authorinitials>Drahtseil</authorinitials><revremark>Created Configure</revremark></revision></revhistory></articleinfo><section><title>Configure</title><para>Configure has some general configuration options: </para><section><title>Hostname</title><itemizedlist><listitem override="none"><para>Hostname is the local name by which other devices on the local network can reach your FreedomBox. The default hostname is <emphasis>freedombox</emphasis>. </para></listitem></itemizedlist></section><section><title>Domain Name</title><itemizedlist><listitem override="none"><para>Domain name is the global name by which other devices on the Internet can reach your FreedomBox. The value set here is used by the <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual/ejabberd#">Chat Server (XMPP)</ulink>, <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual/MatrixSynapse#">Matrix Synapse</ulink>, <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual/LetsEncrypt#">Certificates (Let's Encrypt)</ulink>, and <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual/Monkeysphere#">Monkeysphere</ulink>. </para></listitem></itemizedlist></section><section><title>Webserver Home Page</title><itemizedlist><listitem override="none"><para>This is an advanced option that allows you to set something other than FreedomBox Service (Plinth) as the home page to be served on the domain name of the FreedomBox. For example, if your FreedomBox's domain name is <ulink url="https://myfreedombox.rocks"/> and you set MediaWiki as the home page, visiting <ulink url="https://myfreedombox.rocks"/> will take you to <ulink url="https://myfreedombox.rocks/mediawiki/"/> instead of the usual <ulink url="https://myfreedombox.rocks/plinth/"/>. You can set any web application, Ikiwiki wikis and blogs or Apache's default index.html page as the web server home page. </para></listitem></itemizedlist><caution><para>Once some other app is set as the home page, you can only navigate to the FreedomBox Service (Plinth) by typing <ulink url="https://myfreedombox.rocks/plinth/"/> into the browser. </para><para> <emphasis>/freedombox</emphasis> can also be  used as an alias to <emphasis>/plinth</emphasis> </para></caution><itemizedlist><listitem override="none"><para><emphasis>Tip:</emphasis> Bookmark the URL of FreedomBox Service (Plinth) before setting the home page to some other app. </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Configure</title><revhistory><revision><revnumber>9</revnumber><date>2019-02-28 10:25:01</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Rename default app to webserver home page</revremark></revision><revision><revnumber>8</revnumber><date>2018-10-09 09:54:01</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Improve formatting</revremark></revision><revision><revnumber>7</revnumber><date>2018-07-25 08:38:53</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Remove /home as an alias to /freedombox</revremark></revision><revision><revnumber>6</revnumber><date>2018-07-24 17:51:28</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Rename FreedomBox Plinth to FreedomBox Service (Plinth)</revremark></revision><revision><revnumber>5</revnumber><date>2018-07-24 16:12:49</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add tip about bookmarking FreedomBox Plinth</revremark></revision><revision><revnumber>4</revnumber><date>2018-07-24 13:52:47</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add wiki entry about Default App</revremark></revision><revision><revnumber>3</revnumber><date>2016-12-31 04:11:43</date><authorinitials>JamesValleroy</authorinitials><revremark>mention how domain name is used</revremark></revision><revision><revnumber>2</revnumber><date>2016-12-31 04:07:26</date><authorinitials>JamesValleroy</authorinitials><revremark>fix outline</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 16:35:55</date><authorinitials>Drahtseil</authorinitials><revremark>Created Configure</revremark></revision></revhistory></articleinfo><section><title>Configure</title><para>Configure has some general configuration options: </para><section><title>Hostname</title><itemizedlist><listitem override="none"><para>Hostname is the local name by which other devices on the local network can reach your FreedomBox. The default hostname is <emphasis>freedombox</emphasis>. </para></listitem></itemizedlist></section><section><title>Domain Name</title><itemizedlist><listitem override="none"><para>Domain name is the global name by which other devices on the Internet can reach your FreedomBox. The value set here is used by the <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual/ejabberd#">Chat Server (XMPP)</ulink>, <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual/MatrixSynapse#">Matrix Synapse</ulink>, <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual/LetsEncrypt#">Certificates (Let's Encrypt)</ulink>, and <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual/Monkeysphere#">Monkeysphere</ulink>. </para></listitem></itemizedlist></section><section><title>Webserver Home Page</title><itemizedlist><listitem override="none"><para>This is an advanced option that allows you to set something other than FreedomBox Service (Plinth) as the home page to be served on the domain name of the FreedomBox. For example, if your FreedomBox's domain name is <ulink url="https://myfreedombox.rocks"/> and you set MediaWiki as the home page, visiting <ulink url="https://myfreedombox.rocks"/> will take you to <ulink url="https://myfreedombox.rocks/mediawiki/"/> instead of the usual <ulink url="https://myfreedombox.rocks/plinth/"/>. You can set any web application, Ikiwiki wikis and blogs or Apache's default index.html page as the web server home page. </para></listitem></itemizedlist><caution><para>Once some other app is set as the home page, you can only navigate to the FreedomBox Service (Plinth) by typing <ulink url="https://myfreedombox.rocks/plinth/"/> into the browser. </para><para> <emphasis>/freedombox</emphasis> can also be  used as an alias to <emphasis>/plinth</emphasis> </para></caution><itemizedlist><listitem override="none"><para><emphasis>Tip:</emphasis> Bookmark the URL of FreedomBox Service (Plinth) before setting the home page to some other app. </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Configure/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Coquelicot.raw.xml b/doc/Coquelicot.raw.xml
index 71941c6a5..c15f55fd0 100644
--- a/doc/Coquelicot.raw.xml
+++ b/doc/Coquelicot.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Coquelicot</title><revhistory><revision><revnumber>6</revnumber><date>2018-12-30 19:59:56</date><authorinitials>Drahtseil</authorinitials><revremark>Basic priniciple</revremark></revision><revision><revnumber>5</revnumber><date>2018-03-05 09:15:01</date><authorinitials>JosephNuthalapati</authorinitials><revremark>coquelicot: Fix broken links</revremark></revision><revision><revnumber>4</revnumber><date>2018-02-26 17:14:51</date><authorinitials>JamesValleroy</authorinitials><revremark>included in 0.24</revremark></revision><revision><revnumber>3</revnumber><date>2018-02-12 23:48:10</date><authorinitials>JamesValleroy</authorinitials><revremark>bump version</revremark></revision><revision><revnumber>2</revnumber><date>2018-02-12 23:47:14</date><authorinitials>JamesValleroy</authorinitials><revremark>replace fancy quote characters with plain quote characters</revremark></revision><revision><revnumber>1</revnumber><date>2018-02-10 03:14:55</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Create new page for Coquelicot</revremark></revision></revhistory></articleinfo><section><title>File Sharing (Coquelicot)</title><section><title>About Coquelicot</title><para>Coquelicot is a &quot;one-click&quot; file sharing web application with a focus on protecting users' privacy. The basic principle is simple: users can upload a file to the server, in return they get a unique URL which can be shared with others in order to download the file. A download password can be defined. </para><para>After the upload you get a unique link that can be shared to your partners in order to  </para><para>Read more about Coquelicot at <ulink url="https://coquelicot.potager.org/README">the Coquelicot README</ulink> </para><para><emphasis role="strong">Available since:</emphasis>  version 0.24.0 </para></section><section><title>When to use Coquelicot</title><para>Coquelicot is best used to quickly share a single file.  If you want to share a folder,  </para><orderedlist numeration="arabic"><listitem><para>for a single use, compress the folder and share it over Coquelicot </para></listitem><listitem><para>which must be kept synchronized between computers, use <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Manual/Syncthing#">Syncthing</ulink> instead </para></listitem></orderedlist><para>Coquelicot can only provide a reasonable degree of privacy. If anonymity is required, you should consider using the desktop application <ulink url="https://onionshare.org/">Onionshare</ulink> instead. </para><para>Since Coquelicot fully uploads the file to the server, your FreedomBox will incur both upload and download bandwidth costs. For very large files, consider sharing them using BitTorrent by creating a private torrent file. If anonymity is required, use Onionshare. It is P2P and doesn't require a server.  </para></section><section><title>Coquelicot on FreedomBox</title><para>With Coquelicot installed, you can upload files to your FreedomBox server and privately share them.  </para><para>Post installation, the Coquelicot page offers two settings. </para><orderedlist numeration="arabic"><listitem><para><emphasis role="strong">Upload Password</emphasis>: Coquelicot on FreedomBox is currently configured to use simple password authentication for ease of use. Remember that it's one global password for this Coquelicot instance and not your user password for FreedomBox. You need not remember this password. You can set a new one from the Plinth interface anytime.  </para></listitem><listitem><para><emphasis role="strong">Maximum File Size</emphasis>: You can alter the maximum size of the file that can be transferred through Coquelicot using this setting. The size is in <ulink url="https://en.wikipedia.org/wiki/Mebibyte">Mebibytes</ulink>. The maximum file size is only limited by the disk size of your FreedomBox.  </para></listitem></orderedlist></section><section><title>Privacy</title><para>Someone monitoring your network traffic might find out that some file is being transferred through your FreedomBox and also possibly its size, but will not know the file name. Coquelicot encrypts files on the server and also fills the file contents with 0s when deleting them. This eliminates the risk of file contents being revealed in the event of your FreedomBox being confiscated or stolen. The real risk to mitigate here is a third-party also downloading your file along with the intended recipient. </para><section><title>Sharing over instant messengers</title><para>Some instant messengers which have previews for websites might download your file in order to show a preview in the conversation. If you set the option of one-time download  on a file, you might notice that the one download will be used up by the instant messenger. If sharing over such messengers, please use a download password in combination with a one-time download option.  </para></section><section><title>Sharing download links privately</title><para>It is recommended to share your file download links and download passwords over encrypted channels. You can simply avoid all the above problems with instant messenger previews by using instant messengers that support encrypted conversations like Riot with <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Manual/MatrixSynapse#">Matrix Synapse</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Manual/ejabberd#">XMPP</ulink> (ejabberd server on FreedomBox) with clients that support end-to-end encryption. Send the download link and the download password in two separate messages (helps if your messenger supports perfect forward secrecy like XMPP with OTR). You can also share your links over PGP-encrypted email using <ulink url="https://securityinabox.org/en/guide/thunderbird/linux/">Thunderbird</ulink>.  </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/CategoryFreedomBox#">CategoryFreedomBox</ulink> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Coquelicot</title><revhistory><revision><revnumber>7</revnumber><date>2019-09-11 09:45:09</date><authorinitials>fioddor</authorinitials><revremark>Category Deduplicated</revremark></revision><revision><revnumber>6</revnumber><date>2018-12-30 19:59:56</date><authorinitials>Drahtseil</authorinitials><revremark>Basic priniciple</revremark></revision><revision><revnumber>5</revnumber><date>2018-03-05 09:15:01</date><authorinitials>JosephNuthalapati</authorinitials><revremark>coquelicot: Fix broken links</revremark></revision><revision><revnumber>4</revnumber><date>2018-02-26 17:14:51</date><authorinitials>JamesValleroy</authorinitials><revremark>included in 0.24</revremark></revision><revision><revnumber>3</revnumber><date>2018-02-12 23:48:10</date><authorinitials>JamesValleroy</authorinitials><revremark>bump version</revremark></revision><revision><revnumber>2</revnumber><date>2018-02-12 23:47:14</date><authorinitials>JamesValleroy</authorinitials><revremark>replace fancy quote characters with plain quote characters</revremark></revision><revision><revnumber>1</revnumber><date>2018-02-10 03:14:55</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Create new page for Coquelicot</revremark></revision></revhistory></articleinfo><section><title>File Sharing (Coquelicot)</title><section><title>About Coquelicot</title><para>Coquelicot is a &quot;one-click&quot; file sharing web application with a focus on protecting users' privacy. The basic principle is simple: users can upload a file to the server, in return they get a unique URL which can be shared with others in order to download the file. A download password can be defined. </para><para>After the upload you get a unique link that can be shared to your partners in order to  </para><para>Read more about Coquelicot at <ulink url="https://coquelicot.potager.org/README">the Coquelicot README</ulink> </para><para><emphasis role="strong">Available since:</emphasis>  version 0.24.0 </para></section><section><title>When to use Coquelicot</title><para>Coquelicot is best used to quickly share a single file.  If you want to share a folder,  </para><orderedlist numeration="arabic"><listitem><para>for a single use, compress the folder and share it over Coquelicot </para></listitem><listitem><para>which must be kept synchronized between computers, use <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Manual/Syncthing#">Syncthing</ulink> instead </para></listitem></orderedlist><para>Coquelicot can only provide a reasonable degree of privacy. If anonymity is required, you should consider using the desktop application <ulink url="https://onionshare.org/">Onionshare</ulink> instead. </para><para>Since Coquelicot fully uploads the file to the server, your FreedomBox will incur both upload and download bandwidth costs. For very large files, consider sharing them using BitTorrent by creating a private torrent file. If anonymity is required, use Onionshare. It is P2P and doesn't require a server.  </para></section><section><title>Coquelicot on FreedomBox</title><para>With Coquelicot installed, you can upload files to your FreedomBox server and privately share them.  </para><para>Post installation, the Coquelicot page offers two settings. </para><orderedlist numeration="arabic"><listitem><para><emphasis role="strong">Upload Password</emphasis>: Coquelicot on FreedomBox is currently configured to use simple password authentication for ease of use. Remember that it's one global password for this Coquelicot instance and not your user password for FreedomBox. You need not remember this password. You can set a new one from the Plinth interface anytime.  </para></listitem><listitem><para><emphasis role="strong">Maximum File Size</emphasis>: You can alter the maximum size of the file that can be transferred through Coquelicot using this setting. The size is in <ulink url="https://en.wikipedia.org/wiki/Mebibyte">Mebibytes</ulink>. The maximum file size is only limited by the disk size of your FreedomBox.  </para></listitem></orderedlist></section><section><title>Privacy</title><para>Someone monitoring your network traffic might find out that some file is being transferred through your FreedomBox and also possibly its size, but will not know the file name. Coquelicot encrypts files on the server and also fills the file contents with 0s when deleting them. This eliminates the risk of file contents being revealed in the event of your FreedomBox being confiscated or stolen. The real risk to mitigate here is a third-party also downloading your file along with the intended recipient. </para><section><title>Sharing over instant messengers</title><para>Some instant messengers which have previews for websites might download your file in order to show a preview in the conversation. If you set the option of one-time download  on a file, you might notice that the one download will be used up by the instant messenger. If sharing over such messengers, please use a download password in combination with a one-time download option.  </para></section><section><title>Sharing download links privately</title><para>It is recommended to share your file download links and download passwords over encrypted channels. You can simply avoid all the above problems with instant messenger previews by using instant messengers that support encrypted conversations like Riot with <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Manual/MatrixSynapse#">Matrix Synapse</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Manual/ejabberd#">XMPP</ulink> (ejabberd server on FreedomBox) with clients that support end-to-end encryption. Send the download link and the download password in two separate messages (helps if your messenger supports perfect forward secrecy like XMPP with OTR). You can also share your links over PGP-encrypted email using <ulink url="https://securityinabox.org/en/guide/thunderbird/linux/">Thunderbird</ulink>.  </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Coquelicot/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></article>
\ No newline at end of file
diff --git a/doc/DateTime.raw.xml b/doc/DateTime.raw.xml
index 5934a06fc..66c4bca12 100644
--- a/doc/DateTime.raw.xml
+++ b/doc/DateTime.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/DateTime</title><revhistory><revision><revnumber>2</revnumber><date>2017-03-31 20:20:57</date><authorinitials>Drahtseil</authorinitials><revremark>Screenshot DateTime</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 09:26:45</date><authorinitials>Drahtseil</authorinitials><revremark>Created Date &amp; Time</revremark></revision></revhistory></articleinfo><section><title>Date &amp; Time</title><para>This network time server is a program that maintains the system time in synchronization with servers on the Internet. </para><para>You can select your time zone by picking a big city nearby (they are sorted by <emphasis>Continent/City</emphasis>) or select directly the zone with respect to GMT (Greenwich Mean Time). </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/DateTime?action=AttachFile&amp;do=get&amp;target=DateTime.png"/></imageobject><textobject><phrase>DateTime.png</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/DateTime</title><revhistory><revision><revnumber>2</revnumber><date>2017-03-31 20:20:57</date><authorinitials>Drahtseil</authorinitials><revremark>Screenshot DateTime</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 09:26:45</date><authorinitials>Drahtseil</authorinitials><revremark>Created Date &amp; Time</revremark></revision></revhistory></articleinfo><section><title>Date &amp; Time</title><para>This network time server is a program that maintains the system time in synchronization with servers on the Internet. </para><para>You can select your time zone by picking a big city nearby (they are sorted by <emphasis>Continent/City</emphasis>) or select directly the zone with respect to GMT (Greenwich Mean Time). </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/DateTime?action=AttachFile&amp;do=get&amp;target=DateTime.png"/></imageobject><textobject><phrase>DateTime.png</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/DateTime/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/Deluge.raw.xml b/doc/Deluge.raw.xml
index 47249bd94..f4e78313d 100644
--- a/doc/Deluge.raw.xml
+++ b/doc/Deluge.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Deluge</title><revhistory><revision><revnumber>11</revnumber><date>2016-12-31 01:32:15</date><authorinitials>JamesValleroy</authorinitials><revremark>add initial setup directions</revremark></revision><revision><revnumber>10</revnumber><date>2016-12-30 19:20:00</date><authorinitials>JamesValleroy</authorinitials><revremark>reword</revremark></revision><revision><revnumber>9</revnumber><date>2016-12-30 19:14:16</date><authorinitials>JamesValleroy</authorinitials><revremark>add intro paragraph</revremark></revision><revision><revnumber>8</revnumber><date>2016-12-30 19:00:50</date><authorinitials>JamesValleroy</authorinitials><revremark>no space in &quot;BitTorrent&quot;</revremark></revision><revision><revnumber>7</revnumber><date>2016-12-26 18:07:46</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshot</revremark></revision><revision><revnumber>6</revnumber><date>2016-09-01 19:05:24</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>5</revnumber><date>2016-04-10 07:26:48</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>4</revnumber><date>2015-12-15 20:41:02</date><authorinitials>PhilippeBaret</authorinitials><revremark>Correction</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-15 20:40:16</date><authorinitials>PhilippeBaret</authorinitials><revremark>Correction</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 18:16:28</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Deluge definition</revremark></revision><revision><revnumber>1</revnumber><date>2015-12-15 16:59:01</date><authorinitials>PhilippeBaret</authorinitials><revremark>Created new Deluge page for manual</revremark></revision></revhistory></articleinfo><section><title>BitTorrent (Deluge)</title><section><title>What is Deluge?</title><para>BitTorrent is a communications protocol using peer-to-peer (P2P) file sharing. It is not anonymous; you should assume that others can see what files you are sharing. There are two BitTorrent web clients available in FreedomBox: <ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Manual/Transmission#">Transmission</ulink> and Deluge. They have similar features, but you may prefer one over the other. </para><para>Deluge is a lightweight BitTorrent client that is highly configurable. Additional functionality can be added by installing plugins. </para></section><section><title>Screenshot</title><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Deluge?action=AttachFile&amp;do=get&amp;target=deluge.png" width="800"/></imageobject><textobject><phrase>Deluge Web UI</phrase></textobject></inlinemediaobject> </para></section><section><title>Initial Setup</title><para>After installing Deluge, it can be accessed by pointing your browser to <code>https://&lt;your freedombox&gt;/deluge</code>. You will need to enter a password to login: </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Deluge?action=AttachFile&amp;do=get&amp;target=deluge_login.png"/></imageobject><textobject><phrase>Deluge Login</phrase></textobject></inlinemediaobject> </para><para>The initial password is &quot;deluge&quot;. The first time that you login, Deluge will ask if you wish to change the password. You should change it to something that is harder to guess. </para><para>Next you will be shown the connection manager. Click on the first entry (Offline - 127.0.0.1:58846). Then click &quot;Start Daemon&quot; to start the Deluge service that will run in the background. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Deluge?action=AttachFile&amp;do=get&amp;target=deluge_connection_manager.png"/></imageobject><textobject><phrase>Deluge Connection Manager (Offline)</phrase></textobject></inlinemediaobject> </para><para>Now it should say &quot;Online&quot;. Click &quot;Connect&quot; to complete the setup. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Deluge?action=AttachFile&amp;do=get&amp;target=deluge_connection_manager_2.png"/></imageobject><textobject><phrase>Deluge Connection Manager (Online)</phrase></textobject></inlinemediaobject> </para><para>At this point, you are ready to begin using Deluge. You can make further changes in the Preferences, or add a torrent file or URL. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Deluge</title><revhistory><revision><revnumber>11</revnumber><date>2016-12-31 01:32:15</date><authorinitials>JamesValleroy</authorinitials><revremark>add initial setup directions</revremark></revision><revision><revnumber>10</revnumber><date>2016-12-30 19:20:00</date><authorinitials>JamesValleroy</authorinitials><revremark>reword</revremark></revision><revision><revnumber>9</revnumber><date>2016-12-30 19:14:16</date><authorinitials>JamesValleroy</authorinitials><revremark>add intro paragraph</revremark></revision><revision><revnumber>8</revnumber><date>2016-12-30 19:00:50</date><authorinitials>JamesValleroy</authorinitials><revremark>no space in &quot;BitTorrent&quot;</revremark></revision><revision><revnumber>7</revnumber><date>2016-12-26 18:07:46</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshot</revremark></revision><revision><revnumber>6</revnumber><date>2016-09-01 19:05:24</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>5</revnumber><date>2016-04-10 07:26:48</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>4</revnumber><date>2015-12-15 20:41:02</date><authorinitials>PhilippeBaret</authorinitials><revremark>Correction</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-15 20:40:16</date><authorinitials>PhilippeBaret</authorinitials><revremark>Correction</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 18:16:28</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Deluge definition</revremark></revision><revision><revnumber>1</revnumber><date>2015-12-15 16:59:01</date><authorinitials>PhilippeBaret</authorinitials><revremark>Created new Deluge page for manual</revremark></revision></revhistory></articleinfo><section><title>BitTorrent (Deluge)</title><section><title>What is Deluge?</title><para>BitTorrent is a communications protocol using peer-to-peer (P2P) file sharing. It is not anonymous; you should assume that others can see what files you are sharing. There are two BitTorrent web clients available in FreedomBox: <ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Manual/Transmission#">Transmission</ulink> and Deluge. They have similar features, but you may prefer one over the other. </para><para>Deluge is a lightweight BitTorrent client that is highly configurable. Additional functionality can be added by installing plugins. </para></section><section><title>Screenshot</title><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Deluge?action=AttachFile&amp;do=get&amp;target=deluge.png" width="800"/></imageobject><textobject><phrase>Deluge Web UI</phrase></textobject></inlinemediaobject> </para></section><section><title>Initial Setup</title><para>After installing Deluge, it can be accessed by pointing your browser to <code>https://&lt;your freedombox&gt;/deluge</code>. You will need to enter a password to login: </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Deluge?action=AttachFile&amp;do=get&amp;target=deluge_login.png"/></imageobject><textobject><phrase>Deluge Login</phrase></textobject></inlinemediaobject> </para><para>The initial password is &quot;deluge&quot;. The first time that you login, Deluge will ask if you wish to change the password. You should change it to something that is harder to guess. </para><para>Next you will be shown the connection manager. Click on the first entry (Offline - 127.0.0.1:58846). Then click &quot;Start Daemon&quot; to start the Deluge service that will run in the background. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Deluge?action=AttachFile&amp;do=get&amp;target=deluge_connection_manager.png"/></imageobject><textobject><phrase>Deluge Connection Manager (Offline)</phrase></textobject></inlinemediaobject> </para><para>Now it should say &quot;Online&quot;. Click &quot;Connect&quot; to complete the setup. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Deluge?action=AttachFile&amp;do=get&amp;target=deluge_connection_manager_2.png"/></imageobject><textobject><phrase>Deluge Connection Manager (Online)</phrase></textobject></inlinemediaobject> </para><para>At this point, you are ready to begin using Deluge. You can make further changes in the Preferences, or add a torrent file or URL. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Deluge/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Diagnostics.raw.xml b/doc/Diagnostics.raw.xml
index 6f01369ac..a74ba4851 100644
--- a/doc/Diagnostics.raw.xml
+++ b/doc/Diagnostics.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Diagnostics</title><revhistory><revision><revnumber>1</revnumber><date>2016-08-21 09:43:52</date><authorinitials>Drahtseil</authorinitials><revremark>Created Diagnostics</revremark></revision></revhistory></articleinfo><section><title>Diagnostics</title><para>The system diagnostic test will run a number of checks on your system to confirm that applications and services are working as expected. </para><para>Just click <emphasis>Run Diagnostics</emphasis>. This may take some minutes. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Diagnostics</title><revhistory><revision><revnumber>1</revnumber><date>2016-08-21 09:43:52</date><authorinitials>Drahtseil</authorinitials><revremark>Created Diagnostics</revremark></revision></revhistory></articleinfo><section><title>Diagnostics</title><para>The system diagnostic test will run a number of checks on your system to confirm that applications and services are working as expected. </para><para>Just click <emphasis>Run Diagnostics</emphasis>. This may take some minutes. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Diagnostics/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/DynamicDNS.raw.xml b/doc/DynamicDNS.raw.xml
index 9df580458..e4a98e5de 100644
--- a/doc/DynamicDNS.raw.xml
+++ b/doc/DynamicDNS.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/DynamicDNS</title><revhistory><revision><revnumber>16</revnumber><date>2019-07-31 13:18:03</date><authorinitials>NikolasNyby</authorinitials><revremark>fix typo</revremark></revision><revision><revnumber>15</revnumber><date>2019-02-26 03:20:16</date><authorinitials>JamesValleroy</authorinitials><revremark>spelling</revremark></revision><revision><revnumber>14</revnumber><date>2018-03-11 03:11:04</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized image</revremark></revision><revision><revnumber>13</revnumber><date>2017-03-31 20:35:42</date><authorinitials>Drahtseil</authorinitials><revremark>updated screenshot</revremark></revision><revision><revnumber>12</revnumber><date>2016-09-09 15:40:08</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor indentation fix with screenshot</revremark></revision><revision><revnumber>11</revnumber><date>2016-09-01 19:18:48</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>10</revnumber><date>2016-08-15 18:46:51</date><authorinitials>Drahtseil</authorinitials><revremark>Screenshot GNU-DIP</revremark></revision><revision><revnumber>9</revnumber><date>2016-04-14 14:22:41</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added accurate How to create a DNS name with GnuDIP</revremark></revision><revision><revnumber>8</revnumber><date>2016-04-10 07:15:47</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>7</revnumber><date>2016-01-11 06:28:36</date><authorinitials>PhilippeBaret</authorinitials><revremark>Correction</revremark></revision><revision><revnumber>6</revnumber><date>2015-12-15 18:48:25</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added definition title to Dynamic DNS page</revremark></revision><revision><revnumber>5</revnumber><date>2015-09-13 15:02:37</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Demote headings one level for inclusion into manual</revremark></revision><revision><revnumber>4</revnumber><date>2015-09-13 13:14:41</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Move DynamicDNS page to manual</revremark></revision><revision><revnumber>3</revnumber><date>2015-08-13 13:03:13</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add more introduction and re-organize.</revremark></revision><revision><revnumber>2</revnumber><date>2015-08-09 21:38:52</date><authorinitials>DanielSteglich</authorinitials></revision><revision><revnumber>1</revnumber><date>2015-08-09 21:23:48</date><authorinitials>DanielSteglich</authorinitials></revision></revhistory></articleinfo><section><title>Dynamic DNS Client</title><section><title>What is Dynamic DNS?</title><para>In order to reach a server on the Internet, the server needs to have permanent address also known as the static IP address.  Many Internet service providers don't provide home users with a static IP address or they charge more providing a static IP address.  Instead they provide the home user with an IP address that changes every time the user connects to the Internet.  Clients wishing to contact the server will have difficulty reaching the server. </para><para>Dynamic DNS service providers assist in working around a problem.  First they provide you with a domain name, such as 'myhost.example.org'.  Then they associate your IP address, whenever it changes, with this domain name.  Then anyone intending to reach the server will be to contact the server using the domain name 'myhost.example.org' which always points to the latest IP address of the server. </para><para>For this to work, every time you connect to the Internet, you will have to tell your Dynamic DNS provider what your current IP address is.  Hence you need special software on your server to perform this operation. The Dynamic DNS function in FreedomBox will allow users without a static public IP address to push the current public IP address to a Dynamic DNS Server.  This allows you to expose services on FreedomBox, such as ownCloud, to the Internet. </para></section><section><title>GnuDIP vs. Update URL</title><para>There are two main mechanism to notify the Dynamic DNS server of your new IP address; using the <emphasis>GnuDIP</emphasis> protocol and using the <emphasis>Update URL</emphasis> mechanism. </para><para>If a service provided using update URL is not properly secured using HTTPS, your credentials may be visible to an adversary.  Once an adversary gains your credentials, they will be able to replay your request your server and hijack your domain. </para><para>On the other hand, the GnuDIP protocol will only transport a salted MD5 value of your password, in a way that is secure against replay attacks.  </para></section><section><title>Using the GnuDIP protocol</title><orderedlist numeration="arabic"><listitem><para>Register an account with any Dynamic DNS service provider.  A free service provided by the FreedomBox community is available at <ulink url="https://gnudip.datasystems24.net"/> . </para></listitem><listitem><para>In FreedomBox UI, enable the Dynamic DNS Service. </para></listitem><listitem><para>Select <emphasis>GnuDIP</emphasis> as <emphasis>Service type</emphasis>, enter your Dynamic DNS service provider address (for example, gnudip.datasystems24.net) into <emphasis>GnuDIP Server Address</emphasis> field. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS?action=AttachFile&amp;do=get&amp;target=DynamicDNS-Settings.png" width="800"/></imageobject><textobject><phrase>Dynamic DNS Settings</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>Fill <emphasis>Domain Name</emphasis>, <emphasis>Username</emphasis>, <emphasis>Password</emphasis> information given by your provider into the corresponding fields. </para></listitem></orderedlist></section><section><title>Using an Update URL</title><para>This feature is implemented because the most popular Dynamic DNS providers are using Update URLs mechanism. </para><orderedlist numeration="arabic"><listitem><para>Register an account with a Dynamic DNS service provider providing their service using Update URL mechanism.  Some example providers are listed in the configuration page itself. </para></listitem><listitem><para>In FreedomBox UI, enable the Dynamic DNS service. </para></listitem><listitem><para>Select <emphasis>other Update URL</emphasis> as <emphasis>Service type</emphasis>, enter the update URL given by your provider into <emphasis>Update URL</emphasis> field. </para></listitem><listitem><para>If you browse the update URL with your Internet browser and a warning message about untrusted certificate appears, then enable <emphasis>accept all SSL certificates</emphasis>.  WARNING: your credentials may be readable here because man-in-the-middle attacks are possible!  Consider choosing a better service provider instead. </para></listitem><listitem><para>If you browse the update URL with your Internet browser and the username/password box appears, enable <emphasis>use HTTP basic authentication</emphasis> checkbox and provide the <emphasis>Username</emphasis> and <emphasis>Password</emphasis>.  </para></listitem><listitem><para>If the update URL contains your current IP address, replace the IP address with the string <emphasis>&lt;Ip&gt;</emphasis>. </para></listitem></orderedlist></section><section><title>Checking If It Works</title><orderedlist numeration="arabic"><listitem><para>Make sure that external services you have enabled such as /jwchat, /roundcube and /ikiwiki are available on your domain address. </para></listitem><listitem><para>Go to the <emphasis>Status</emphasis> page, make sure that the NAT type is detected correctly. If your FreedomBox is behind a NAT device, this should be detected over there (Text: <emphasis>Behind NAT</emphasis>).  If your FreedomBox has a public IP address assigned, the text should be &quot;Direct connection to the Internet&quot;. </para></listitem><listitem><para>Check that the last update status is not <emphasis>failed</emphasis>. </para></listitem></orderedlist></section><section><title>Recap: How to create a DNS name with GnuDIP</title><para><remark>to delete or to replace the old text</remark> </para><orderedlist numeration="arabic"><listitem><para>Access to <ulink url="https://gnudip.datasystems24.net">GnuIP login page</ulink> (answer Yes to all pop ups) </para></listitem><listitem><para>Click on &quot;Self Register&quot; </para></listitem><listitem><para>Fill the registration form (Username and domain will form the public IP address [username.domain]) </para></listitem><listitem><para>Take note of the username/hostname and password that will be used on the FreedomBox app. </para></listitem><listitem><para>Save and return to the GnuDIP login page to verify your username, domain and password (enter the datas, click login). </para></listitem><listitem><para>Login output should display your new domain name along with your current public IP address (this is a unique address provided by your router for all your local devices). </para></listitem><listitem><para>Leave the GnuDIP interface and open the Dynamic DNS Client app page in your FreedomBox. </para></listitem><listitem><para>Click on &quot;Set Up&quot; in the top menu. </para></listitem><listitem><para>Activate Dynamic DNS </para></listitem><listitem><para>Choose GnuDIP service. </para></listitem><listitem><para>Add server address (gnudip.datasystems24.net) </para></listitem><listitem><para>Add your fresh domain name (username.domain, ie [username].freedombox.rocks) </para></listitem><listitem><para>Add your fresh username (the one used in your new IP address) and password </para></listitem><listitem><para>Add your GnuDIP password </para></listitem><listitem><para>Fill the option with <ulink url="http://myip.datasystems24.de"/> (try this url in your browser, you will figure out immediately) </para></listitem></orderedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/DynamicDNS</title><revhistory><revision><revnumber>16</revnumber><date>2019-07-31 13:18:03</date><authorinitials>NikolasNyby</authorinitials><revremark>fix typo</revremark></revision><revision><revnumber>15</revnumber><date>2019-02-26 03:20:16</date><authorinitials>JamesValleroy</authorinitials><revremark>spelling</revremark></revision><revision><revnumber>14</revnumber><date>2018-03-11 03:11:04</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized image</revremark></revision><revision><revnumber>13</revnumber><date>2017-03-31 20:35:42</date><authorinitials>Drahtseil</authorinitials><revremark>updated screenshot</revremark></revision><revision><revnumber>12</revnumber><date>2016-09-09 15:40:08</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor indentation fix with screenshot</revremark></revision><revision><revnumber>11</revnumber><date>2016-09-01 19:18:48</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>10</revnumber><date>2016-08-15 18:46:51</date><authorinitials>Drahtseil</authorinitials><revremark>Screenshot GNU-DIP</revremark></revision><revision><revnumber>9</revnumber><date>2016-04-14 14:22:41</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added accurate How to create a DNS name with GnuDIP</revremark></revision><revision><revnumber>8</revnumber><date>2016-04-10 07:15:47</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>7</revnumber><date>2016-01-11 06:28:36</date><authorinitials>PhilippeBaret</authorinitials><revremark>Correction</revremark></revision><revision><revnumber>6</revnumber><date>2015-12-15 18:48:25</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added definition title to Dynamic DNS page</revremark></revision><revision><revnumber>5</revnumber><date>2015-09-13 15:02:37</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Demote headings one level for inclusion into manual</revremark></revision><revision><revnumber>4</revnumber><date>2015-09-13 13:14:41</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Move DynamicDNS page to manual</revremark></revision><revision><revnumber>3</revnumber><date>2015-08-13 13:03:13</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add more introduction and re-organize.</revremark></revision><revision><revnumber>2</revnumber><date>2015-08-09 21:38:52</date><authorinitials>DanielSteglich</authorinitials></revision><revision><revnumber>1</revnumber><date>2015-08-09 21:23:48</date><authorinitials>DanielSteglich</authorinitials></revision></revhistory></articleinfo><section><title>Dynamic DNS Client</title><section><title>What is Dynamic DNS?</title><para>In order to reach a server on the Internet, the server needs to have permanent address also known as the static IP address.  Many Internet service providers don't provide home users with a static IP address or they charge more providing a static IP address.  Instead they provide the home user with an IP address that changes every time the user connects to the Internet.  Clients wishing to contact the server will have difficulty reaching the server. </para><para>Dynamic DNS service providers assist in working around a problem.  First they provide you with a domain name, such as 'myhost.example.org'.  Then they associate your IP address, whenever it changes, with this domain name.  Then anyone intending to reach the server will be to contact the server using the domain name 'myhost.example.org' which always points to the latest IP address of the server. </para><para>For this to work, every time you connect to the Internet, you will have to tell your Dynamic DNS provider what your current IP address is.  Hence you need special software on your server to perform this operation. The Dynamic DNS function in FreedomBox will allow users without a static public IP address to push the current public IP address to a Dynamic DNS Server.  This allows you to expose services on FreedomBox, such as ownCloud, to the Internet. </para></section><section><title>GnuDIP vs. Update URL</title><para>There are two main mechanism to notify the Dynamic DNS server of your new IP address; using the <emphasis>GnuDIP</emphasis> protocol and using the <emphasis>Update URL</emphasis> mechanism. </para><para>If a service provided using update URL is not properly secured using HTTPS, your credentials may be visible to an adversary.  Once an adversary gains your credentials, they will be able to replay your request your server and hijack your domain. </para><para>On the other hand, the GnuDIP protocol will only transport a salted MD5 value of your password, in a way that is secure against replay attacks.  </para></section><section><title>Using the GnuDIP protocol</title><orderedlist numeration="arabic"><listitem><para>Register an account with any Dynamic DNS service provider.  A free service provided by the FreedomBox community is available at <ulink url="https://gnudip.datasystems24.net"/> . </para></listitem><listitem><para>In FreedomBox UI, enable the Dynamic DNS Service. </para></listitem><listitem><para>Select <emphasis>GnuDIP</emphasis> as <emphasis>Service type</emphasis>, enter your Dynamic DNS service provider address (for example, gnudip.datasystems24.net) into <emphasis>GnuDIP Server Address</emphasis> field. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS?action=AttachFile&amp;do=get&amp;target=DynamicDNS-Settings.png" width="800"/></imageobject><textobject><phrase>Dynamic DNS Settings</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>Fill <emphasis>Domain Name</emphasis>, <emphasis>Username</emphasis>, <emphasis>Password</emphasis> information given by your provider into the corresponding fields. </para></listitem></orderedlist></section><section><title>Using an Update URL</title><para>This feature is implemented because the most popular Dynamic DNS providers are using Update URLs mechanism. </para><orderedlist numeration="arabic"><listitem><para>Register an account with a Dynamic DNS service provider providing their service using Update URL mechanism.  Some example providers are listed in the configuration page itself. </para></listitem><listitem><para>In FreedomBox UI, enable the Dynamic DNS service. </para></listitem><listitem><para>Select <emphasis>other Update URL</emphasis> as <emphasis>Service type</emphasis>, enter the update URL given by your provider into <emphasis>Update URL</emphasis> field. </para></listitem><listitem><para>If you browse the update URL with your Internet browser and a warning message about untrusted certificate appears, then enable <emphasis>accept all SSL certificates</emphasis>.  WARNING: your credentials may be readable here because man-in-the-middle attacks are possible!  Consider choosing a better service provider instead. </para></listitem><listitem><para>If you browse the update URL with your Internet browser and the username/password box appears, enable <emphasis>use HTTP basic authentication</emphasis> checkbox and provide the <emphasis>Username</emphasis> and <emphasis>Password</emphasis>.  </para></listitem><listitem><para>If the update URL contains your current IP address, replace the IP address with the string <emphasis>&lt;Ip&gt;</emphasis>. </para></listitem></orderedlist></section><section><title>Checking If It Works</title><orderedlist numeration="arabic"><listitem><para>Make sure that external services you have enabled such as /jwchat, /roundcube and /ikiwiki are available on your domain address. </para></listitem><listitem><para>Go to the <emphasis>Status</emphasis> page, make sure that the NAT type is detected correctly. If your FreedomBox is behind a NAT device, this should be detected over there (Text: <emphasis>Behind NAT</emphasis>).  If your FreedomBox has a public IP address assigned, the text should be &quot;Direct connection to the Internet&quot;. </para></listitem><listitem><para>Check that the last update status is not <emphasis>failed</emphasis>. </para></listitem></orderedlist></section><section><title>Recap: How to create a DNS name with GnuDIP</title><para><remark>to delete or to replace the old text</remark> </para><orderedlist numeration="arabic"><listitem><para>Access to <ulink url="https://gnudip.datasystems24.net">GnuIP login page</ulink> (answer Yes to all pop ups) </para></listitem><listitem><para>Click on &quot;Self Register&quot; </para></listitem><listitem><para>Fill the registration form (Username and domain will form the public IP address [username.domain]) </para></listitem><listitem><para>Take note of the username/hostname and password that will be used on the FreedomBox app. </para></listitem><listitem><para>Save and return to the GnuDIP login page to verify your username, domain and password (enter the datas, click login). </para></listitem><listitem><para>Login output should display your new domain name along with your current public IP address (this is a unique address provided by your router for all your local devices). </para></listitem><listitem><para>Leave the GnuDIP interface and open the Dynamic DNS Client app page in your FreedomBox. </para></listitem><listitem><para>Click on &quot;Set Up&quot; in the top menu. </para></listitem><listitem><para>Activate Dynamic DNS </para></listitem><listitem><para>Choose GnuDIP service. </para></listitem><listitem><para>Add server address (gnudip.datasystems24.net) </para></listitem><listitem><para>Add your fresh domain name (username.domain, ie [username].freedombox.rocks) </para></listitem><listitem><para>Add your fresh username (the one used in your new IP address) and password </para></listitem><listitem><para>Add your GnuDIP password </para></listitem><listitem><para>Fill the option with <ulink url="http://myip.datasystems24.de"/> (try this url in your browser, you will figure out immediately) </para></listitem></orderedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/DynamicDNS/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Firewall.raw.xml b/doc/Firewall.raw.xml
index 54cbfe602..b96ffa71c 100644
--- a/doc/Firewall.raw.xml
+++ b/doc/Firewall.raw.xml
@@ -14,4 +14,4 @@ firewall-cmd --permanent --zone=internal --add-port=5353/udp]]></screen></sectio
 firewall-cmd --permanent --zone=<zone> --remove-interface=<interface>]]></screen><para>Example: </para><screen><![CDATA[firewall-cmd --zone=external --remove-interface=eth0
 firewall-cmd --permanent --zone=external --remove-interface=eth0]]></screen><para>To add an interface to a zone: </para><screen><![CDATA[firewall-cmd --zone=<zone> --add-interface=<interface>
 firewall-cmd --permanent --zone=<zone> --add-interface=<interface>]]></screen><para>Example: </para><screen><![CDATA[firewall-cmd --zone=internal --add-interface=eth0
-firewall-cmd --permanent --zone=internal --add-interface=eth0]]></screen><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></article>
\ No newline at end of file
+firewall-cmd --permanent --zone=internal --add-interface=eth0]]></screen><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Firewall/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></article>
\ No newline at end of file
diff --git a/doc/I2P.raw.xml b/doc/I2P.raw.xml
index bf32d5c1d..a74c93f9c 100644
--- a/doc/I2P.raw.xml
+++ b/doc/I2P.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/I2P</title><revhistory><revision><revnumber>1</revnumber><date>2019-04-30 00:40:36</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Initial page for I2P application in FreedomBox</revremark></revision></revhistory></articleinfo><section><title>Anonymity Network (I2P)</title><section><title>About I2P</title><para>The Invisible Internet Project is an anonymous network layer intended to protect communication from censorship and surveillance. I2P provides anonymity by sending encrypted traffic through a volunteer-run network distributed around the world. </para><para>Find more information about I2P on their project <ulink url="https://geti2p.net">homepage</ulink>. </para></section><section><title>Services Offered</title><para>The following services are offered via I2P in FreedomBox by default. Additional services may be available when enabled from I2P router console that can be launched from FreedomBox web interface. </para><itemizedlist><listitem><para><emphasis role="strong">Anonymous Internet browsing</emphasis>: I2P can be used to browse Internet anonymously. For this, configure your browser (preferable a Tor Browser) to connect to I2P proxy. This can be done by setting HTTP proxy and HTTPS proxy to <emphasis>freedombox.local</emphasis> (or your FreedomBox's local IP address) and ports to <emphasis>4444</emphasis> and <emphasis>4445</emphasis> respectively. This service is available only when you are reaching FreedomBox using local network (networks in internal zone) and not available when connecting to FreedomBox from the Internet. One exception to this is when you connect to FreedomBox's VPN service from Internet you can still use this service. </para></listitem><listitem><para><emphasis role="strong">Reaching eepsites</emphasis>: I2P network can host websites that can remain anonymous. These are called eepsites and end with .i2p in their domain name. For example, <ulink url="http://i2p-projekt.i2p/"/> is the website for I2P project in the I2P network. eepsites are not reachable using a regular browser via regular Internet connection. To browse eepsites, your browser needs to be configured to use HTTP, HTTPS proxies as described above. This service is available only when you are reaching FreedomBox using local network (networks in internal zone) and not available when connecting to FreedomBox from the Internet. One exception to this is when you connect to FreedomBox's VPN service from Internet you can still use this service. </para></listitem><listitem><para><emphasis role="strong">Anonymous torrent downloads</emphasis>: I2PSnark, an application for anonymously downloading and sharing files over the BitTorrent network is available in I2P and enabled by default in FreedomBox. This application is controlled via a web interface that can be launched from 'Anonymous torrents' section of I2P app in FreedomBox web interface or from the I2P router console interface. Only logged-in users belonging to 'Manage I2P application' group can use this service. </para></listitem><listitem><para><emphasis role="strong">IRC network</emphasis>: I2P network contains an IRC network called Irc2P. This network hosts the I2P project's official IRC channel among other channels. This service is enabled by default in FreedomBox. To use it, open your favourite IRC client. Then configure it to connect to host <emphasis>freedombox.local</emphasis> (or your FreedomBox's local IP address) with port number <emphasis>6668</emphasis>. This service is available only when you are reaching FreedomBox using local network (networks in internal zone) and not available when connecting to FreedomBox from the Internet. One exception to this is when you connect to FreedomBox's VPN service from Internet you can still use this service. </para></listitem><listitem><para><emphasis role="strong">I2P router console</emphasis>: This is the central management interface for I2P. It shows the current status of I2P, bandwidth statistics and allows modifying various configuration settings. You can tune your participation in the I2P network and use/edit a list of your favourite I2P sites (eepsites). Only logged-in users belonging to 'Manage I2P application' group can use this service. </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/I2P</title><revhistory><revision><revnumber>1</revnumber><date>2019-04-30 00:40:36</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Initial page for I2P application in FreedomBox</revremark></revision></revhistory></articleinfo><section><title>Anonymity Network (I2P)</title><section><title>About I2P</title><para>The Invisible Internet Project is an anonymous network layer intended to protect communication from censorship and surveillance. I2P provides anonymity by sending encrypted traffic through a volunteer-run network distributed around the world. </para><para>Find more information about I2P on their project <ulink url="https://geti2p.net">homepage</ulink>. </para></section><section><title>Services Offered</title><para>The following services are offered via I2P in FreedomBox by default. Additional services may be available when enabled from I2P router console that can be launched from FreedomBox web interface. </para><itemizedlist><listitem><para><emphasis role="strong">Anonymous Internet browsing</emphasis>: I2P can be used to browse Internet anonymously. For this, configure your browser (preferable a Tor Browser) to connect to I2P proxy. This can be done by setting HTTP proxy and HTTPS proxy to <emphasis>freedombox.local</emphasis> (or your FreedomBox's local IP address) and ports to <emphasis>4444</emphasis> and <emphasis>4445</emphasis> respectively. This service is available only when you are reaching FreedomBox using local network (networks in internal zone) and not available when connecting to FreedomBox from the Internet. One exception to this is when you connect to FreedomBox's VPN service from Internet you can still use this service. </para></listitem><listitem><para><emphasis role="strong">Reaching eepsites</emphasis>: I2P network can host websites that can remain anonymous. These are called eepsites and end with .i2p in their domain name. For example, <ulink url="http://i2p-projekt.i2p/"/> is the website for I2P project in the I2P network. eepsites are not reachable using a regular browser via regular Internet connection. To browse eepsites, your browser needs to be configured to use HTTP, HTTPS proxies as described above. This service is available only when you are reaching FreedomBox using local network (networks in internal zone) and not available when connecting to FreedomBox from the Internet. One exception to this is when you connect to FreedomBox's VPN service from Internet you can still use this service. </para></listitem><listitem><para><emphasis role="strong">Anonymous torrent downloads</emphasis>: I2PSnark, an application for anonymously downloading and sharing files over the BitTorrent network is available in I2P and enabled by default in FreedomBox. This application is controlled via a web interface that can be launched from 'Anonymous torrents' section of I2P app in FreedomBox web interface or from the I2P router console interface. Only logged-in users belonging to 'Manage I2P application' group can use this service. </para></listitem><listitem><para><emphasis role="strong">IRC network</emphasis>: I2P network contains an IRC network called Irc2P. This network hosts the I2P project's official IRC channel among other channels. This service is enabled by default in FreedomBox. To use it, open your favourite IRC client. Then configure it to connect to host <emphasis>freedombox.local</emphasis> (or your FreedomBox's local IP address) with port number <emphasis>6668</emphasis>. This service is available only when you are reaching FreedomBox using local network (networks in internal zone) and not available when connecting to FreedomBox from the Internet. One exception to this is when you connect to FreedomBox's VPN service from Internet you can still use this service. </para></listitem><listitem><para><emphasis role="strong">I2P router console</emphasis>: This is the central management interface for I2P. It shows the current status of I2P, bandwidth statistics and allows modifying various configuration settings. You can tune your participation in the I2P network and use/edit a list of your favourite I2P sites (eepsites). Only logged-in users belonging to 'Manage I2P application' group can use this service. </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/I2P/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Ikiwiki.raw.xml b/doc/Ikiwiki.raw.xml
index c0e283785..230493cee 100644
--- a/doc/Ikiwiki.raw.xml
+++ b/doc/Ikiwiki.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Ikiwiki</title><revhistory><revision><revnumber>9</revnumber><date>2016-12-26 19:18:01</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshots</revremark></revision><revision><revnumber>8</revnumber><date>2016-09-01 19:15:54</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>7</revnumber><date>2016-05-26 17:19:45</date><authorinitials>JamesValleroy</authorinitials><revremark>new section on adding users as wiki admins</revremark></revision><revision><revnumber>6</revnumber><date>2016-04-13 01:10:28</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added blog to quick start entry in Ikiwiki Manual</revremark></revision><revision><revnumber>5</revnumber><date>2016-04-13 01:00:22</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added a &quot;Quick Start&quot; entry in Ikiwiki manual</revremark></revision><revision><revnumber>4</revnumber><date>2016-04-10 07:21:53</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-15 19:54:35</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Ikiwiki definition</revremark></revision><revision><revnumber>2</revnumber><date>2015-11-29 19:13:55</date><authorinitials>PhilippeBaret</authorinitials><revremark>added ## BEGIN_INCLUDE</revremark></revision><revision><revnumber>1</revnumber><date>2015-09-13 17:06:14</date><authorinitials>JamesValleroy</authorinitials><revremark>add ikiwiki page for manual</revremark></revision></revhistory></articleinfo><section><title>Wiki and Blog (Ikiwiki)</title><section><title>What is Ikiwiki?</title><para>Ikiwiki converts wiki pages into HTML pages suitable for publishing on a website. It provides particularly blogging, podcasting, calendars and a large selection of plugins. </para></section><section><title>Quick Start</title><para>After the app installation on your box administration interface: </para><itemizedlist><listitem><para>Go to &quot;Create&quot; section and create a wiki or a blog </para></listitem><listitem><para>Go back to &quot;Configure&quot; section and click on /ikiwiki link </para></listitem><listitem><para>Click on your new wiki or blog name under &quot;Parent directory&quot; </para></listitem><listitem><para>Enjoy your new publication page. </para></listitem></itemizedlist></section><section><title>Creating a wiki or blog</title><para>You can create a wiki or blog to be hosted on your FreedomBox through the Wiki &amp; Blog (Ikiwiki) page in Plinth. The first time you visit this page, it will ask to install packages required by Ikiwiki. </para><para>After the package install has completed, select the Create tab. You can select the type to be Wiki or Blog. Also type in a name for the wiki or blog, and the username and password for the wiki's/blog's admin account. Then click Update setup and you will see the wiki/blog added to your list. Note that each wiki/blog has its own admin account. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki?action=AttachFile&amp;do=get&amp;target=ikiwiki_create.png" width="800"/></imageobject><textobject><phrase>ikiwiki: Create</phrase></textobject></inlinemediaobject> </para></section><section><title>Accessing your wiki or blog</title><para>From the Wiki &amp; Blog (Ikiwiki) page, select the Manage tab and you will see a list of your wikis and blogs. Click a name to navigate to that wiki or blog. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki?action=AttachFile&amp;do=get&amp;target=ikiwiki_manage.png" width="800"/></imageobject><textobject><phrase>ikiwiki: Manage</phrase></textobject></inlinemediaobject> </para><para>From here, if you click Edit or Preferences, you will be taken to a login page. To log in with the admin account that you created before, select the Other tab, enter the username and password, and click Login. </para></section><section><title>User login through SSO</title><para>Besides the wiki/blog admin, other FreedomBox users can be given access to login and edit wikis and blogs.  However, they will not have all the same permissions as the wiki admin. They can add or edit pages, but cannot change the wiki's configuration. </para><para>To add a wiki user, go to the Users and Groups page in Plinth (under System configuration, the gear icon at the top right corner of the page). Create or modify a user, and add them to the wiki group. (Users in the admin group will also have wiki access.) </para><para>To login as a FreedomBox user, go to the wiki/blog's login page and select the Other tab.  Then click the &quot;Login with HTTP auth&quot; button. The browser will show a popup dialog where you can enter the username and password of the FreedomBox user. </para></section><section><title>Adding FreedomBox users as wiki admins</title><orderedlist numeration="arabic"><listitem><para>Login to the wiki, using the admin account that was specified when the wiki was created. </para></listitem><listitem><para>Click &quot;Preferences&quot;, then &quot;Setup&quot;. </para></listitem><listitem><para>Under &quot;main&quot;, in the &quot;users who are wiki admins&quot;, add the name of a user on the FreedomBox. </para></listitem><listitem><para>(Optional) Under &quot;auth plugin: passwordauth&quot;, uncheck the &quot;enable passwordauth?&quot; option. (Note: This will disable the old admin account login. Only SSO login using HTTP auth will be possible.) </para></listitem><listitem><para>Click &quot;Save Setup&quot;. </para></listitem><listitem><para>Click &quot;Preferences&quot;, then &quot;Logout&quot;. </para></listitem><listitem><para>Login as the new admin user using &quot;Login with HTTP auth&quot;. </para></listitem></orderedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Ikiwiki</title><revhistory><revision><revnumber>9</revnumber><date>2016-12-26 19:18:01</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshots</revremark></revision><revision><revnumber>8</revnumber><date>2016-09-01 19:15:54</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>7</revnumber><date>2016-05-26 17:19:45</date><authorinitials>JamesValleroy</authorinitials><revremark>new section on adding users as wiki admins</revremark></revision><revision><revnumber>6</revnumber><date>2016-04-13 01:10:28</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added blog to quick start entry in Ikiwiki Manual</revremark></revision><revision><revnumber>5</revnumber><date>2016-04-13 01:00:22</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added a &quot;Quick Start&quot; entry in Ikiwiki manual</revremark></revision><revision><revnumber>4</revnumber><date>2016-04-10 07:21:53</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-15 19:54:35</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Ikiwiki definition</revremark></revision><revision><revnumber>2</revnumber><date>2015-11-29 19:13:55</date><authorinitials>PhilippeBaret</authorinitials><revremark>added ## BEGIN_INCLUDE</revremark></revision><revision><revnumber>1</revnumber><date>2015-09-13 17:06:14</date><authorinitials>JamesValleroy</authorinitials><revremark>add ikiwiki page for manual</revremark></revision></revhistory></articleinfo><section><title>Wiki and Blog (Ikiwiki)</title><section><title>What is Ikiwiki?</title><para>Ikiwiki converts wiki pages into HTML pages suitable for publishing on a website. It provides particularly blogging, podcasting, calendars and a large selection of plugins. </para></section><section><title>Quick Start</title><para>After the app installation on your box administration interface: </para><itemizedlist><listitem><para>Go to &quot;Create&quot; section and create a wiki or a blog </para></listitem><listitem><para>Go back to &quot;Configure&quot; section and click on /ikiwiki link </para></listitem><listitem><para>Click on your new wiki or blog name under &quot;Parent directory&quot; </para></listitem><listitem><para>Enjoy your new publication page. </para></listitem></itemizedlist></section><section><title>Creating a wiki or blog</title><para>You can create a wiki or blog to be hosted on your FreedomBox through the Wiki &amp; Blog (Ikiwiki) page in Plinth. The first time you visit this page, it will ask to install packages required by Ikiwiki. </para><para>After the package install has completed, select the Create tab. You can select the type to be Wiki or Blog. Also type in a name for the wiki or blog, and the username and password for the wiki's/blog's admin account. Then click Update setup and you will see the wiki/blog added to your list. Note that each wiki/blog has its own admin account. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki?action=AttachFile&amp;do=get&amp;target=ikiwiki_create.png" width="800"/></imageobject><textobject><phrase>ikiwiki: Create</phrase></textobject></inlinemediaobject> </para></section><section><title>Accessing your wiki or blog</title><para>From the Wiki &amp; Blog (Ikiwiki) page, select the Manage tab and you will see a list of your wikis and blogs. Click a name to navigate to that wiki or blog. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki?action=AttachFile&amp;do=get&amp;target=ikiwiki_manage.png" width="800"/></imageobject><textobject><phrase>ikiwiki: Manage</phrase></textobject></inlinemediaobject> </para><para>From here, if you click Edit or Preferences, you will be taken to a login page. To log in with the admin account that you created before, select the Other tab, enter the username and password, and click Login. </para></section><section><title>User login through SSO</title><para>Besides the wiki/blog admin, other FreedomBox users can be given access to login and edit wikis and blogs.  However, they will not have all the same permissions as the wiki admin. They can add or edit pages, but cannot change the wiki's configuration. </para><para>To add a wiki user, go to the Users and Groups page in Plinth (under System configuration, the gear icon at the top right corner of the page). Create or modify a user, and add them to the wiki group. (Users in the admin group will also have wiki access.) </para><para>To login as a FreedomBox user, go to the wiki/blog's login page and select the Other tab.  Then click the &quot;Login with HTTP auth&quot; button. The browser will show a popup dialog where you can enter the username and password of the FreedomBox user. </para></section><section><title>Adding FreedomBox users as wiki admins</title><orderedlist numeration="arabic"><listitem><para>Login to the wiki, using the admin account that was specified when the wiki was created. </para></listitem><listitem><para>Click &quot;Preferences&quot;, then &quot;Setup&quot;. </para></listitem><listitem><para>Under &quot;main&quot;, in the &quot;users who are wiki admins&quot;, add the name of a user on the FreedomBox. </para></listitem><listitem><para>(Optional) Under &quot;auth plugin: passwordauth&quot;, uncheck the &quot;enable passwordauth?&quot; option. (Note: This will disable the old admin account login. Only SSO login using HTTP auth will be possible.) </para></listitem><listitem><para>Click &quot;Save Setup&quot;. </para></listitem><listitem><para>Click &quot;Preferences&quot;, then &quot;Logout&quot;. </para></listitem><listitem><para>Login as the new admin user using &quot;Login with HTTP auth&quot;. </para></listitem></orderedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Ikiwiki/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Infinoted.raw.xml b/doc/Infinoted.raw.xml
index 3ebe48a98..7a92ab465 100644
--- a/doc/Infinoted.raw.xml
+++ b/doc/Infinoted.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Infinoted</title><revhistory><revision><revnumber>1</revnumber><date>2017-01-21 17:23:17</date><authorinitials>JamesValleroy</authorinitials><revremark>create page for infinoted</revremark></revision></revhistory></articleinfo><section><title>Gobby Server (infinoted)</title><para>infinoted is a server for Gobby, a collaborative text editor. </para><para>To use it, <ulink url="https://gobby.github.io/">download Gobby</ulink>, desktop client and install it. Then start Gobby and select &quot;Connect to Server&quot; and enter your FreedomBox's domain name. </para><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for infinoted: </para><itemizedlist><listitem><para>TCP 6523 </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Infinoted</title><revhistory><revision><revnumber>1</revnumber><date>2017-01-21 17:23:17</date><authorinitials>JamesValleroy</authorinitials><revremark>create page for infinoted</revremark></revision></revhistory></articleinfo><section><title>Gobby Server (infinoted)</title><para>infinoted is a server for Gobby, a collaborative text editor. </para><para>To use it, <ulink url="https://gobby.github.io/">download Gobby</ulink>, desktop client and install it. Then start Gobby and select &quot;Connect to Server&quot; and enter your FreedomBox's domain name. </para><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for infinoted: </para><itemizedlist><listitem><para>TCP 6523 </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Infinoted/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/LetsEncrypt.raw.xml b/doc/LetsEncrypt.raw.xml
index 72338b908..61cca6892 100644
--- a/doc/LetsEncrypt.raw.xml
+++ b/doc/LetsEncrypt.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/LetsEncrypt</title><revhistory><revision><revnumber>9</revnumber><date>2019-02-26 03:21:08</date><authorinitials>JamesValleroy</authorinitials><revremark>spelling</revremark></revision><revision><revnumber>8</revnumber><date>2018-03-11 03:16:47</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>7</revnumber><date>2017-01-19 00:18:41</date><authorinitials>JamesValleroy</authorinitials><revremark>replace quote character</revremark></revision><revision><revnumber>6</revnumber><date>2017-01-07 19:48:45</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>5</revnumber><date>2017-01-07 18:21:14</date><authorinitials>JamesValleroy</authorinitials><revremark>clarify step</revremark></revision><revision><revnumber>4</revnumber><date>2016-08-21 19:00:07</date><authorinitials>Drahtseil</authorinitials></revision><revision><revnumber>3</revnumber><date>2016-08-21 18:59:20</date><authorinitials>Drahtseil</authorinitials><revremark>Screencast of the setting up</revremark></revision><revision><revnumber>2</revnumber><date>2016-08-21 17:57:07</date><authorinitials>Drahtseil</authorinitials><revremark>screenshots</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 17:43:20</date><authorinitials>Drahtseil</authorinitials><revremark>Created Let's Encypt</revremark></revision></revhistory></articleinfo><section><title>Certificates (Let's Encrypt)</title><para>A digital certificate allows users of a web service to verify the identity of the service and to securely communicate with it. FreedomBox can automatically obtain and setup digital certificates for each available domain. It does so by proving itself to be the owner of a domain to Let's Encrypt, a certificate authority (CA). </para><para>Let's Encrypt is a free, automated, and open certificate authority, run for the public's benefit by the Internet Security Research Group (ISRG). Please read and agree with the Let's Encrypt Subscriber Agreement before using this service. </para><section><title>Why using Certificates</title><para>The communication with your FreedomBox can be secured so that it is not possible to intercept the content of the web pages viewed and about the content exchanged.  </para></section><section><title>How to setup</title><orderedlist numeration="arabic"><listitem><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports: </para><itemizedlist><listitem><para>TCP 80 (http) </para></listitem><listitem><para>TCP 443 (https) </para></listitem></itemizedlist></listitem><listitem><para>Make the domain name known: </para><itemizedlist><listitem><para>In <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual/Configure#">Configure</ulink> insert your <emphasis>domain name</emphasis>, e.g. <emphasis><code>MyWebName.com</code></emphasis> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=LetsEncrypt-Configure.png" width="800"/></imageobject><textobject><phrase>Let's Encrypt</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Verify the domain name was accepted </para><itemizedlist><listitem><para>Check that it is enabled in <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual/NameServices#">Name Services</ulink> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=LetsEncrypt-NameServices.png" width="800"/></imageobject><textobject><phrase>Let's Encrypt Name Services</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Go to the Certificates (Let's Encrypt) page, and complete the module install if needed. Then click the &quot;Obtain&quot; button for your domain name. </para><itemizedlist><listitem><para>After some minutes a valid certificate is available </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=LetsEncrypt.png" width="800"/></imageobject><textobject><phrase>Let's Encrypt</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Verify in your browser by checking <emphasis><code>https://MyWebName.com</code></emphasis> </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=LetsEncrypt-Certificate.png" width="800"/></imageobject><textobject><phrase>Let's Encrypt Certificate</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem></orderedlist><para><emphasis role="strong">Screencast</emphasis>: <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=Let%27s+Encrypt.webm">Let's Encrypt</ulink> </para></section><section><title>Using</title><para>The certificate is valid for 3 months. It is renewed automatically and can also be re-obtained or revoked manually. </para><para>With running <emphasis>diagnostics</emphasis> the certificate can also be verified. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/LetsEncrypt</title><revhistory><revision><revnumber>9</revnumber><date>2019-02-26 03:21:08</date><authorinitials>JamesValleroy</authorinitials><revremark>spelling</revremark></revision><revision><revnumber>8</revnumber><date>2018-03-11 03:16:47</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>7</revnumber><date>2017-01-19 00:18:41</date><authorinitials>JamesValleroy</authorinitials><revremark>replace quote character</revremark></revision><revision><revnumber>6</revnumber><date>2017-01-07 19:48:45</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>5</revnumber><date>2017-01-07 18:21:14</date><authorinitials>JamesValleroy</authorinitials><revremark>clarify step</revremark></revision><revision><revnumber>4</revnumber><date>2016-08-21 19:00:07</date><authorinitials>Drahtseil</authorinitials></revision><revision><revnumber>3</revnumber><date>2016-08-21 18:59:20</date><authorinitials>Drahtseil</authorinitials><revremark>Screencast of the setting up</revremark></revision><revision><revnumber>2</revnumber><date>2016-08-21 17:57:07</date><authorinitials>Drahtseil</authorinitials><revremark>screenshots</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 17:43:20</date><authorinitials>Drahtseil</authorinitials><revremark>Created Let's Encypt</revremark></revision></revhistory></articleinfo><section><title>Certificates (Let's Encrypt)</title><para>A digital certificate allows users of a web service to verify the identity of the service and to securely communicate with it. FreedomBox can automatically obtain and setup digital certificates for each available domain. It does so by proving itself to be the owner of a domain to Let's Encrypt, a certificate authority (CA). </para><para>Let's Encrypt is a free, automated, and open certificate authority, run for the public's benefit by the Internet Security Research Group (ISRG). Please read and agree with the Let's Encrypt Subscriber Agreement before using this service. </para><section><title>Why using Certificates</title><para>The communication with your FreedomBox can be secured so that it is not possible to intercept the content of the web pages viewed and about the content exchanged.  </para></section><section><title>How to setup</title><orderedlist numeration="arabic"><listitem><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports: </para><itemizedlist><listitem><para>TCP 80 (http) </para></listitem><listitem><para>TCP 443 (https) </para></listitem></itemizedlist></listitem><listitem><para>Make the domain name known: </para><itemizedlist><listitem><para>In <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual/Configure#">Configure</ulink> insert your <emphasis>domain name</emphasis>, e.g. <emphasis><code>MyWebName.com</code></emphasis> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=LetsEncrypt-Configure.png" width="800"/></imageobject><textobject><phrase>Let's Encrypt</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Verify the domain name was accepted </para><itemizedlist><listitem><para>Check that it is enabled in <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual/NameServices#">Name Services</ulink> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=LetsEncrypt-NameServices.png" width="800"/></imageobject><textobject><phrase>Let's Encrypt Name Services</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Go to the Certificates (Let's Encrypt) page, and complete the module install if needed. Then click the &quot;Obtain&quot; button for your domain name. </para><itemizedlist><listitem><para>After some minutes a valid certificate is available </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=LetsEncrypt.png" width="800"/></imageobject><textobject><phrase>Let's Encrypt</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Verify in your browser by checking <emphasis><code>https://MyWebName.com</code></emphasis> </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=LetsEncrypt-Certificate.png" width="800"/></imageobject><textobject><phrase>Let's Encrypt Certificate</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem></orderedlist><para><emphasis role="strong">Screencast</emphasis>: <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual/LetsEncrypt?action=AttachFile&amp;do=get&amp;target=Let%27s+Encrypt.webm">Let's Encrypt</ulink> </para></section><section><title>Using</title><para>The certificate is valid for 3 months. It is renewed automatically and can also be re-obtained or revoked manually. </para><para>With running <emphasis>diagnostics</emphasis> the certificate can also be verified. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/LetsEncrypt/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/MLDonkey.raw.xml b/doc/MLDonkey.raw.xml
index 25334f89a..74e538f5a 100644
--- a/doc/MLDonkey.raw.xml
+++ b/doc/MLDonkey.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/MLDonkey</title><revhistory><revision><revnumber>12</revnumber><date>2019-02-08 06:29:35</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update more information about clients</revremark></revision><revision><revnumber>11</revnumber><date>2019-02-06 13:52:06</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>10</revnumber><date>2019-02-02 21:16:52</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>9</revnumber><date>2019-01-23 21:18:05</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>8</revnumber><date>2019-01-23 18:34:25</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>7</revnumber><date>2019-01-23 18:30:54</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>6</revnumber><date>2019-01-23 18:19:19</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Escape from linking</revremark></revision><revision><revnumber>5</revnumber><date>2019-01-23 18:18:47</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Write MLdonkey as MLDonkey</revremark></revision><revision><revnumber>4</revnumber><date>2019-01-23 18:17:54</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Write MLdonkey as MLDonkey and other minor fixes</revremark></revision><revision><revnumber>3</revnumber><date>2019-01-23 17:37:32</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>2</revnumber><date>2019-01-23 13:37:48</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>1</revnumber><date>2019-01-23 13:31:23</date><authorinitials>jcromero</authorinitials></revision></revhistory></articleinfo><section><title>File Sharing (MLDonkey)</title><section><title>What is MLDonkey?</title><para>MLDonkey is an open-source, multi-protocol, peer-to-peer file sharing application that runs as a back-end server application on many platforms. It can be controlled through a user interface provided by one of many separate front-ends, including a Web interface, telnet interface and over a dozen native client programs. </para><para>Originally a Linux client for the eDonkey protocol, it now runs on many flavors of Unix-like, OS X, Microsoft Windows and MorphOS and supports numerous peer-to-peer protocols including ED2K (and Kademlia and Overnet), BitTorrent, DC++ and more. </para><para>Read more about MLDonkey at <ulink url="http://mldonkey.sourceforge.net/Main_Page">the MLDonkey Project Wiki</ulink> </para><para><emphasis role="strong">Available since:</emphasis>  version 0.48.0 </para></section><section><title>Screenshot</title><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/MLDonkey?action=AttachFile&amp;do=get&amp;target=mldonkey.jpg" width="800"/></imageobject><textobject><phrase>MLDonkey Web Interface</phrase></textobject></inlinemediaobject> </para></section><section><title>Using MLDonkey Web Interface</title><para>After installing MLDonkey, its web interface can be accessed from FreedomBox at <code>https://&lt;your freedombox&gt;/mldonkey</code>. Users belonging to the <emphasis>ed2k</emphasis> and <emphasis>admin</emphasis> groups can access this web interface. </para></section><section><title>Using Desktop/Mobile Interface</title><para>Many <ulink url="http://mldonkey.sourceforge.net/Gui">desktop and mobile applications</ulink> can be used to control MLDonkey. MLDonkey server will always be running on FreedomBox. It will download files (or upload them) and store them on FreedomBox even when your local machine is not running or connected to MLDonkey on FreedomBox. Only users of <emphasis>admin</emphasis> group can access MLDonkey on FreedomBox using desktop or mobile clients. This is due to restrictions on which group of users have SSH access into FreedomBox. </para><orderedlist numeration="arabic"><listitem><para>Create an admin user or use an existing admin user. </para></listitem><listitem><para>On your desktop machine, open a terminal and run the following command. It is recommended that you configure and use SSH keys instead of passwords for the this step. </para><screen><![CDATA[$ ssh -L 4001:localhost:4001 -N exampleuser@example.freedombox.rocks]]></screen></listitem><listitem><para>Start the GUI application and then connect it to MLDonkey as if MLDonkey is running on the local desktop machine. After you are done, terminate the SSH command by pressing Control-C. </para></listitem></orderedlist><para>See MLDonkey documentation for <ulink url="http://mldonkey.sourceforge.net/SshTunnel">SSH Tunnel</ulink> for more information. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/MLDonkey</title><revhistory><revision><revnumber>12</revnumber><date>2019-02-08 06:29:35</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update more information about clients</revremark></revision><revision><revnumber>11</revnumber><date>2019-02-06 13:52:06</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>10</revnumber><date>2019-02-02 21:16:52</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>9</revnumber><date>2019-01-23 21:18:05</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>8</revnumber><date>2019-01-23 18:34:25</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>7</revnumber><date>2019-01-23 18:30:54</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>6</revnumber><date>2019-01-23 18:19:19</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Escape from linking</revremark></revision><revision><revnumber>5</revnumber><date>2019-01-23 18:18:47</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Write MLdonkey as MLDonkey</revremark></revision><revision><revnumber>4</revnumber><date>2019-01-23 18:17:54</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Write MLdonkey as MLDonkey and other minor fixes</revremark></revision><revision><revnumber>3</revnumber><date>2019-01-23 17:37:32</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>2</revnumber><date>2019-01-23 13:37:48</date><authorinitials>jcromero</authorinitials></revision><revision><revnumber>1</revnumber><date>2019-01-23 13:31:23</date><authorinitials>jcromero</authorinitials></revision></revhistory></articleinfo><section><title>File Sharing (MLDonkey)</title><section><title>What is MLDonkey?</title><para>MLDonkey is an open-source, multi-protocol, peer-to-peer file sharing application that runs as a back-end server application on many platforms. It can be controlled through a user interface provided by one of many separate front-ends, including a Web interface, telnet interface and over a dozen native client programs. </para><para>Originally a Linux client for the eDonkey protocol, it now runs on many flavors of Unix-like, OS X, Microsoft Windows and MorphOS and supports numerous peer-to-peer protocols including ED2K (and Kademlia and Overnet), BitTorrent, DC++ and more. </para><para>Read more about MLDonkey at <ulink url="http://mldonkey.sourceforge.net/Main_Page">the MLDonkey Project Wiki</ulink> </para><para><emphasis role="strong">Available since:</emphasis>  version 0.48.0 </para></section><section><title>Screenshot</title><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/MLDonkey?action=AttachFile&amp;do=get&amp;target=mldonkey.jpg" width="800"/></imageobject><textobject><phrase>MLDonkey Web Interface</phrase></textobject></inlinemediaobject> </para></section><section><title>Using MLDonkey Web Interface</title><para>After installing MLDonkey, its web interface can be accessed from FreedomBox at <code>https://&lt;your freedombox&gt;/mldonkey</code>. Users belonging to the <emphasis>ed2k</emphasis> and <emphasis>admin</emphasis> groups can access this web interface. </para></section><section><title>Using Desktop/Mobile Interface</title><para>Many <ulink url="http://mldonkey.sourceforge.net/Gui">desktop and mobile applications</ulink> can be used to control MLDonkey. MLDonkey server will always be running on FreedomBox. It will download files (or upload them) and store them on FreedomBox even when your local machine is not running or connected to MLDonkey on FreedomBox. Only users of <emphasis>admin</emphasis> group can access MLDonkey on FreedomBox using desktop or mobile clients. This is due to restrictions on which group of users have SSH access into FreedomBox. </para><orderedlist numeration="arabic"><listitem><para>Create an admin user or use an existing admin user. </para></listitem><listitem><para>On your desktop machine, open a terminal and run the following command. It is recommended that you configure and use SSH keys instead of passwords for the this step. </para><screen><![CDATA[$ ssh -L 4001:localhost:4001 -N exampleuser@example.freedombox.rocks]]></screen></listitem><listitem><para>Start the GUI application and then connect it to MLDonkey as if MLDonkey is running on the local desktop machine. After you are done, terminate the SSH command by pressing Control-C. </para></listitem></orderedlist><para>See MLDonkey documentation for <ulink url="http://mldonkey.sourceforge.net/SshTunnel">SSH Tunnel</ulink> for more information. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/MLDonkey/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/MatrixSynapse.raw.xml b/doc/MatrixSynapse.raw.xml
index 920d340de..e306f6b5c 100644
--- a/doc/MatrixSynapse.raw.xml
+++ b/doc/MatrixSynapse.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/MatrixSynapse</title><revhistory><revision><revnumber>10</revnumber><date>2019-03-01 17:53:22</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Escape FreedomBox hyperlinks</revremark></revision><revision><revnumber>9</revnumber><date>2019-02-27 21:16:58</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Mention IRC as an alternative for large Matrix rooms</revremark></revision><revision><revnumber>8</revnumber><date>2019-02-13 09:09:45</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Remove pop-culture references. Add notes about large rooms and memory usage.</revremark></revision><revision><revnumber>7</revnumber><date>2019-01-14 20:16:04</date><authorinitials>Drahtseil</authorinitials><revremark>System requirements</revremark></revision><revision><revnumber>6</revnumber><date>2018-03-02 12:06:08</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>5</revnumber><date>2018-03-02 10:44:12</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Naming was inconsistent</revremark></revision><revision><revnumber>4</revnumber><date>2017-06-27 05:13:41</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>3</revnumber><date>2017-03-24 06:42:49</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update for explaining more features etc.</revremark></revision><revision><revnumber>2</revnumber><date>2017-03-23 06:36:05</date><authorinitials>rahulde</authorinitials></revision><revision><revnumber>1</revnumber><date>2017-03-23 06:33:43</date><authorinitials>rahulde</authorinitials></revision></revhistory></articleinfo><section><title>Chat Server (Matrix Synapse)</title><section><title>What is Matrix?</title><para><ulink url="https://matrix.org/">Matrix</ulink> is an open standard for interoperable, decentralized, real-time communication over IP. Synapse is the reference implementation of a Matrix server. It can be used to setup instant messaging on FreedomBox to host large chat rooms, end-to-end encrypted communication and audio/video calls.   Matrix Synapse is a federated application where chat rooms can exist on any server and users from any server in the federated network can join them.  <ulink url="https://matrix.org/docs/guides/faq.html">Learn more</ulink> about Matrix. </para><para><emphasis role="strong">Available since:</emphasis> version 0.14.0 </para></section><section><title>How to access your Matrix Synapse server?</title><para>We recommend the <ulink url="https://riot.im">Riot</ulink> client to access the Matrix Synapse server. You can <ulink url="https://riot.im/desktop.html">download</ulink> Riot for desktops.  Mobile applications for Android and iOS are available from their respective app stores. </para></section><section><title>Setting up Matrix Synapse on your FreedomBox</title><para>To enable Matrix, first navigate to the Chat Server (Matrix Synapse) page and install it. Matrix needs a valid domain name to be configured.  After installation, you will be asked to configure it.  You will be able to select a domain from a drop down menu of available domains.  Domains are configured using System -&gt; Configure page.  After configuring a domain, you will see that the service is running. The service will be accessible on the configured FreedomBox domain. All the registered users will have their Matrix IDs as <code>@username:domain</code>. Currently, you will not be able to change the domain once is it configured. </para></section><section><title>Federating with other Matrix instances</title><para>You will be able to interact with any other person running another Matrix instance.  This is done by simply starting a conversation with them using their matrix ID which is of the format <code>@their-username:their-domain</code>.  You can also join rooms which are in another server and have audio/video calls with contacts on other server. </para></section><section><title>Memory usage</title><para>The Synapse reference server implemented in Python is known to be quite RAM hungry, especially when loading large rooms with thousands of members like #matrix:matrix.org. It is recommended to avoid joining such rooms if your FreedomBox device only has 1 GiB RAM or less. Rooms with up to a hundred members should be safe to join. The Matrix team is working on a new implementation of the Matrix server written in Go called Dendrite which might perform better in low-memory environments. </para><para>Some large public rooms in the Matrix network are also available as IRC channels (e.g. #freedombox:matrix.org is also available as #freedombox on irc.debian.org). It is better to use IRC instead of Matrix for such large rooms. You can join the IRC channels using <ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Manual/Quassel#">Quassel</ulink>. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/MatrixSynapse</title><revhistory><revision><revnumber>10</revnumber><date>2019-03-01 17:53:22</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Escape FreedomBox hyperlinks</revremark></revision><revision><revnumber>9</revnumber><date>2019-02-27 21:16:58</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Mention IRC as an alternative for large Matrix rooms</revremark></revision><revision><revnumber>8</revnumber><date>2019-02-13 09:09:45</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Remove pop-culture references. Add notes about large rooms and memory usage.</revremark></revision><revision><revnumber>7</revnumber><date>2019-01-14 20:16:04</date><authorinitials>Drahtseil</authorinitials><revremark>System requirements</revremark></revision><revision><revnumber>6</revnumber><date>2018-03-02 12:06:08</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>5</revnumber><date>2018-03-02 10:44:12</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Naming was inconsistent</revremark></revision><revision><revnumber>4</revnumber><date>2017-06-27 05:13:41</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>3</revnumber><date>2017-03-24 06:42:49</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update for explaining more features etc.</revremark></revision><revision><revnumber>2</revnumber><date>2017-03-23 06:36:05</date><authorinitials>rahulde</authorinitials></revision><revision><revnumber>1</revnumber><date>2017-03-23 06:33:43</date><authorinitials>rahulde</authorinitials></revision></revhistory></articleinfo><section><title>Chat Server (Matrix Synapse)</title><section><title>What is Matrix?</title><para><ulink url="https://matrix.org/">Matrix</ulink> is an open standard for interoperable, decentralized, real-time communication over IP. Synapse is the reference implementation of a Matrix server. It can be used to setup instant messaging on FreedomBox to host large chat rooms, end-to-end encrypted communication and audio/video calls.   Matrix Synapse is a federated application where chat rooms can exist on any server and users from any server in the federated network can join them.  <ulink url="https://matrix.org/docs/guides/faq.html">Learn more</ulink> about Matrix. </para><para><emphasis role="strong">Available since:</emphasis> version 0.14.0 </para></section><section><title>How to access your Matrix Synapse server?</title><para>We recommend the <ulink url="https://riot.im">Riot</ulink> client to access the Matrix Synapse server. You can <ulink url="https://riot.im/desktop.html">download</ulink> Riot for desktops.  Mobile applications for Android and iOS are available from their respective app stores. </para></section><section><title>Setting up Matrix Synapse on your FreedomBox</title><para>To enable Matrix, first navigate to the Chat Server (Matrix Synapse) page and install it. Matrix needs a valid domain name to be configured.  After installation, you will be asked to configure it.  You will be able to select a domain from a drop down menu of available domains.  Domains are configured using System -&gt; Configure page.  After configuring a domain, you will see that the service is running. The service will be accessible on the configured FreedomBox domain. All the registered users will have their Matrix IDs as <code>@username:domain</code>. Currently, you will not be able to change the domain once is it configured. </para></section><section><title>Federating with other Matrix instances</title><para>You will be able to interact with any other person running another Matrix instance.  This is done by simply starting a conversation with them using their matrix ID which is of the format <code>@their-username:their-domain</code>.  You can also join rooms which are in another server and have audio/video calls with contacts on other server. </para></section><section><title>Memory usage</title><para>The Synapse reference server implemented in Python is known to be quite RAM hungry, especially when loading large rooms with thousands of members like #matrix:matrix.org. It is recommended to avoid joining such rooms if your FreedomBox device only has 1 GiB RAM or less. Rooms with up to a hundred members should be safe to join. The Matrix team is working on a new implementation of the Matrix server written in Go called Dendrite which might perform better in low-memory environments. </para><para>Some large public rooms in the Matrix network are also available as IRC channels (e.g. #freedombox:matrix.org is also available as #freedombox on irc.debian.org). It is better to use IRC instead of Matrix for such large rooms. You can join the IRC channels using <ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Manual/Quassel#">Quassel</ulink>. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/MatrixSynapse/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/MediaWiki.raw.xml b/doc/MediaWiki.raw.xml
index 3948d334e..a56b634c1 100644
--- a/doc/MediaWiki.raw.xml
+++ b/doc/MediaWiki.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/MediaWiki</title><revhistory><revision><revnumber>9</revnumber><date>2018-08-28 09:42:01</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Remove internal links to MediaWiki</revremark></revision><revision><revnumber>8</revnumber><date>2018-08-27 23:58:16</date><authorinitials>JamesValleroy</authorinitials><revremark>try to close last section</revremark></revision><revision><revnumber>7</revnumber><date>2018-08-27 23:43:48</date><authorinitials>JamesValleroy</authorinitials><revremark>add consistent newlines after headings</revremark></revision><revision><revnumber>6</revnumber><date>2018-08-27 23:41:37</date><authorinitials>JamesValleroy</authorinitials><revremark>spelling</revremark></revision><revision><revnumber>5</revnumber><date>2018-08-21 07:33:32</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>4</revnumber><date>2018-08-21 07:32:43</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Update wiki to include new features</revremark></revision><revision><revnumber>3</revnumber><date>2018-01-31 06:02:30</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add footer and category</revremark></revision><revision><revnumber>2</revnumber><date>2018-01-17 10:26:45</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix headings</revremark></revision><revision><revnumber>1</revnumber><date>2018-01-13 04:01:22</date><authorinitials>JosephNuthalapati</authorinitials><revremark>New wiki entry for MediaWiki on FreedomBox</revremark></revision></revhistory></articleinfo><section><title>Wiki (MediaWiki)</title><section><title>About MediaWiki</title><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/MediaWiki#">MediaWiki</ulink> is the software that powers the Wikimedia suite of wikis. </para><para>Read more about MediaWiki on <ulink url="https://en.wikipedia.org/wiki/MediaWiki">Wikipedia</ulink> </para><para><emphasis role="strong">Available since:</emphasis>  version 0.20.0 </para></section><section><title>MediaWiki on FreedomBox</title><para>MediaWiki on FreedomBox is configured to be publicly readable and privately editable. Only logged in users can make edits to the wiki. This configuration prevents spam and vandalism on the wiki. </para><section><title>User management</title><para>Users can be created by the MediaWiki administrator (user &quot;admin&quot;) only. The &quot;admin&quot; user can also be used to reset passwords of MediaWiki users. The administrator password, if forgotten can be reset anytime from the MediaWiki page in the Plinth UI. </para></section><section><title>Use cases</title><para>MediaWiki is quite versatile and can be put to many creative uses. It also comes with a lot of plugins and themes and is highly customizable. </para><section><title>Personal Knowledge Repository</title><itemizedlist><listitem override="none"><para>MediaWiki on FreedomBox can be your own personal knowledge repository. Since MediaWiki has good multimedia support, you can write notes, store images, create checklists, store references and bookmarks etc. in an organized manner. You can store the knowledge of a lifetime in your MediaWiki instance. </para></listitem></itemizedlist></section><section><title>Community Wiki</title><itemizedlist><listitem override="none"><para>A community of users can use MediaWiki as their common repository of knowledge and reference material. It can used as a college notice board, documentation server for a small company, common notebook for study groups or as a fan wiki like wikia. </para></listitem></itemizedlist></section><section><title>Personal Wiki-based Website</title><itemizedlist><listitem override="none"><para><ulink url="https://www.mediawiki.org/wiki/Sites_using_MediaWiki/en">Several websites</ulink> on the internet are simply MediaWiki instances. MediaWiki on FreedomBox is read-only to visitors. Hence, it can be adapted to serve as your personal website and/or blog. MediaWiki content is easy to export and can be later moved to use another blog engine. </para></listitem></itemizedlist></section></section><section><title>Editing Wiki Content</title><section><title>Visual Editor</title><itemizedlist><listitem override="none"><para>MediaWiki's new Visual Editor gives a WYSIWYG user interface to creating wiki pages. Unfortunately, it is not yet available in the current version of MediaWiki on Debian. A workaround is to use write your content using the Visual Editor in <ulink url="https://en.wikipedia.org/wiki/Wikipedia:Sandbox">Wikipedia's Sandbox</ulink>, switching to source editing mode and copying the content into your wiki. </para></listitem></itemizedlist></section><section><title>Other Formats</title><itemizedlist><listitem override="none"><para>You don't have to necessarily learn the MediaWiki formatting language. You can write in your favorite format (Markdown, Org-mode, LaTeX etc.) and convert it to the MediaWiki format using <ulink url="https://pandoc.org/try/">Pandoc</ulink>. </para></listitem></itemizedlist></section><section><title>Image Uploads</title><itemizedlist><listitem override="none"><para>Image uploads have been enabled since FreedomBox version 0.36.0. You can also directly use images from Wikimedia Commons using a feature called <ulink url="https://www.mediawiki.org/wiki/InstantCommons">Instant Commons</ulink>. </para></listitem></itemizedlist><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/MediaWiki</title><revhistory><revision><revnumber>9</revnumber><date>2018-08-28 09:42:01</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Remove internal links to MediaWiki</revremark></revision><revision><revnumber>8</revnumber><date>2018-08-27 23:58:16</date><authorinitials>JamesValleroy</authorinitials><revremark>try to close last section</revremark></revision><revision><revnumber>7</revnumber><date>2018-08-27 23:43:48</date><authorinitials>JamesValleroy</authorinitials><revremark>add consistent newlines after headings</revremark></revision><revision><revnumber>6</revnumber><date>2018-08-27 23:41:37</date><authorinitials>JamesValleroy</authorinitials><revremark>spelling</revremark></revision><revision><revnumber>5</revnumber><date>2018-08-21 07:33:32</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>4</revnumber><date>2018-08-21 07:32:43</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Update wiki to include new features</revremark></revision><revision><revnumber>3</revnumber><date>2018-01-31 06:02:30</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add footer and category</revremark></revision><revision><revnumber>2</revnumber><date>2018-01-17 10:26:45</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix headings</revremark></revision><revision><revnumber>1</revnumber><date>2018-01-13 04:01:22</date><authorinitials>JosephNuthalapati</authorinitials><revremark>New wiki entry for MediaWiki on FreedomBox</revremark></revision></revhistory></articleinfo><section><title>Wiki (MediaWiki)</title><section><title>About MediaWiki</title><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/MediaWiki#">MediaWiki</ulink> is the software that powers the Wikimedia suite of wikis. </para><para>Read more about MediaWiki on <ulink url="https://en.wikipedia.org/wiki/MediaWiki">Wikipedia</ulink> </para><para><emphasis role="strong">Available since:</emphasis>  version 0.20.0 </para></section><section><title>MediaWiki on FreedomBox</title><para>MediaWiki on FreedomBox is configured to be publicly readable and privately editable. Only logged in users can make edits to the wiki. This configuration prevents spam and vandalism on the wiki. </para><section><title>User management</title><para>Users can be created by the MediaWiki administrator (user &quot;admin&quot;) only. The &quot;admin&quot; user can also be used to reset passwords of MediaWiki users. The administrator password, if forgotten can be reset anytime from the MediaWiki page in the Plinth UI. </para></section><section><title>Use cases</title><para>MediaWiki is quite versatile and can be put to many creative uses. It also comes with a lot of plugins and themes and is highly customizable. </para><section><title>Personal Knowledge Repository</title><itemizedlist><listitem override="none"><para>MediaWiki on FreedomBox can be your own personal knowledge repository. Since MediaWiki has good multimedia support, you can write notes, store images, create checklists, store references and bookmarks etc. in an organized manner. You can store the knowledge of a lifetime in your MediaWiki instance. </para></listitem></itemizedlist></section><section><title>Community Wiki</title><itemizedlist><listitem override="none"><para>A community of users can use MediaWiki as their common repository of knowledge and reference material. It can used as a college notice board, documentation server for a small company, common notebook for study groups or as a fan wiki like wikia. </para></listitem></itemizedlist></section><section><title>Personal Wiki-based Website</title><itemizedlist><listitem override="none"><para><ulink url="https://www.mediawiki.org/wiki/Sites_using_MediaWiki/en">Several websites</ulink> on the internet are simply MediaWiki instances. MediaWiki on FreedomBox is read-only to visitors. Hence, it can be adapted to serve as your personal website and/or blog. MediaWiki content is easy to export and can be later moved to use another blog engine. </para></listitem></itemizedlist></section></section><section><title>Editing Wiki Content</title><section><title>Visual Editor</title><itemizedlist><listitem override="none"><para>MediaWiki's new Visual Editor gives a WYSIWYG user interface to creating wiki pages. Unfortunately, it is not yet available in the current version of MediaWiki on Debian. A workaround is to use write your content using the Visual Editor in <ulink url="https://en.wikipedia.org/wiki/Wikipedia:Sandbox">Wikipedia's Sandbox</ulink>, switching to source editing mode and copying the content into your wiki. </para></listitem></itemizedlist></section><section><title>Other Formats</title><itemizedlist><listitem override="none"><para>You don't have to necessarily learn the MediaWiki formatting language. You can write in your favorite format (Markdown, Org-mode, LaTeX etc.) and convert it to the MediaWiki format using <ulink url="https://pandoc.org/try/">Pandoc</ulink>. </para></listitem></itemizedlist></section><section><title>Image Uploads</title><itemizedlist><listitem override="none"><para>Image uploads have been enabled since FreedomBox version 0.36.0. You can also directly use images from Wikimedia Commons using a feature called <ulink url="https://www.mediawiki.org/wiki/InstantCommons">Instant Commons</ulink>. </para></listitem></itemizedlist><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/MediaWiki/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></section></article>
\ No newline at end of file
diff --git a/doc/Minetest.raw.xml b/doc/Minetest.raw.xml
index 621d27457..38ad42edf 100644
--- a/doc/Minetest.raw.xml
+++ b/doc/Minetest.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Minetest</title><revhistory><revision><revnumber>3</revnumber><date>2017-01-02 13:29:19</date><authorinitials>JamesValleroy</authorinitials><revremark>fix list</revremark></revision><revision><revnumber>2</revnumber><date>2017-01-02 13:26:03</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>1</revnumber><date>2016-09-04 10:20:44</date><authorinitials>Drahtseil</authorinitials><revremark>stub created</revremark></revision></revhistory></articleinfo><section><title>Block Sandbox (Minetest)</title><para>Minetest is a multiplayer infinite-world block sandbox. This module enables the Minetest server to be run on this FreedomBox, on the default port (30000). To connect to the server, a <ulink url="http://www.minetest.net/downloads/">Minetest client</ulink> is needed. </para><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for Minetest: </para><itemizedlist><listitem><para>UDP 30000 </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Minetest</title><revhistory><revision><revnumber>3</revnumber><date>2017-01-02 13:29:19</date><authorinitials>JamesValleroy</authorinitials><revremark>fix list</revremark></revision><revision><revnumber>2</revnumber><date>2017-01-02 13:26:03</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>1</revnumber><date>2016-09-04 10:20:44</date><authorinitials>Drahtseil</authorinitials><revremark>stub created</revremark></revision></revhistory></articleinfo><section><title>Block Sandbox (Minetest)</title><para>Minetest is a multiplayer infinite-world block sandbox. This module enables the Minetest server to be run on this FreedomBox, on the default port (30000). To connect to the server, a <ulink url="http://www.minetest.net/downloads/">Minetest client</ulink> is needed. </para><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for Minetest: </para><itemizedlist><listitem><para>UDP 30000 </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Minetest/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Monkeysphere.raw.xml b/doc/Monkeysphere.raw.xml
index 463f57c1b..b195d0dd3 100644
--- a/doc/Monkeysphere.raw.xml
+++ b/doc/Monkeysphere.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Monkeysphere</title><revhistory><revision><revnumber>1</revnumber><date>2016-09-04 10:12:10</date><authorinitials>Drahtseil</authorinitials><revremark>stub created</revremark></revision></revhistory></articleinfo><section><title>Monkeysphere</title><para>With Monkeysphere, an OpenPGP key can be generated for each configured domain serving SSH. The OpenPGP public key can then be uploaded to the OpenPGP keyservers. Users connecting to this machine through SSH can verify that they are connecting to the correct host. For users to trust the key, at least one person (usually the machine owner) must sign the key using the regular OpenPGP key signing process. See the <ulink url="http://web.monkeysphere.info/getting-started-ssh/">Monkeysphere SSH documentation</ulink> for more details. </para><para>Monkeysphere can also generate an OpenPGP key for each Secure Web Server (HTTPS) certificate installed on this machine. The OpenPGP public key can then be uploaded to the OpenPGP keyservers. Users accessing the web server through HTTPS can verify that they are connecting to the correct host. To validate the certificate, the user will need to install some software that is available on the <ulink url="https://web.monkeysphere.info/download/">Monkeysphere website</ulink>. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Monkeysphere</title><revhistory><revision><revnumber>1</revnumber><date>2016-09-04 10:12:10</date><authorinitials>Drahtseil</authorinitials><revremark>stub created</revremark></revision></revhistory></articleinfo><section><title>Monkeysphere</title><para>With Monkeysphere, an OpenPGP key can be generated for each configured domain serving SSH. The OpenPGP public key can then be uploaded to the OpenPGP keyservers. Users connecting to this machine through SSH can verify that they are connecting to the correct host. For users to trust the key, at least one person (usually the machine owner) must sign the key using the regular OpenPGP key signing process. See the <ulink url="http://web.monkeysphere.info/getting-started-ssh/">Monkeysphere SSH documentation</ulink> for more details. </para><para>Monkeysphere can also generate an OpenPGP key for each Secure Web Server (HTTPS) certificate installed on this machine. The OpenPGP public key can then be uploaded to the OpenPGP keyservers. Users accessing the web server through HTTPS can verify that they are connecting to the correct host. To validate the certificate, the user will need to install some software that is available on the <ulink url="https://web.monkeysphere.info/download/">Monkeysphere website</ulink>. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Monkeysphere/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/Mumble.raw.xml b/doc/Mumble.raw.xml
index f47faad39..982d65459 100644
--- a/doc/Mumble.raw.xml
+++ b/doc/Mumble.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Mumble</title><revhistory><revision><revnumber>6</revnumber><date>2017-01-02 13:28:53</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>5</revnumber><date>2016-12-31 04:04:56</date><authorinitials>JamesValleroy</authorinitials><revremark>add basic usage info</revremark></revision><revision><revnumber>4</revnumber><date>2016-09-01 19:14:55</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>3</revnumber><date>2016-04-10 07:20:42</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 20:51:58</date><authorinitials>PhilippeBaret</authorinitials></revision><revision><revnumber>1</revnumber><date>2015-12-15 20:06:18</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Mumble page and definition.</revremark></revision></revhistory></articleinfo><section><title>Voice Chat (Mumble)</title><section><title>What is Mumble?</title><para>Mumble is a voice chat software. Primarily intended for use while gaming, it is suitable for simple talking with high audio quality, noise suppression, encrypted communication, public/private-key authentication by default, and &quot;wizards&quot; to configure your microphone for instance. A user can be marked as a &quot;priority speaker&quot; within a channel. </para></section><section><title>Using Mumble</title><para>FreedomBox includes the Mumble server. <ulink url="https://wiki.mumble.info/wiki/Main_Page">Clients</ulink> are available for desktop and mobile platforms. Users can download one of these clients and connect to the server. </para></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for Mumble: </para><itemizedlist><listitem><para>TCP 64738 </para></listitem><listitem><para>UDP 64738 </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Mumble</title><revhistory><revision><revnumber>6</revnumber><date>2017-01-02 13:28:53</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>5</revnumber><date>2016-12-31 04:04:56</date><authorinitials>JamesValleroy</authorinitials><revremark>add basic usage info</revremark></revision><revision><revnumber>4</revnumber><date>2016-09-01 19:14:55</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>3</revnumber><date>2016-04-10 07:20:42</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 20:51:58</date><authorinitials>PhilippeBaret</authorinitials></revision><revision><revnumber>1</revnumber><date>2015-12-15 20:06:18</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Mumble page and definition.</revremark></revision></revhistory></articleinfo><section><title>Voice Chat (Mumble)</title><section><title>What is Mumble?</title><para>Mumble is a voice chat software. Primarily intended for use while gaming, it is suitable for simple talking with high audio quality, noise suppression, encrypted communication, public/private-key authentication by default, and &quot;wizards&quot; to configure your microphone for instance. A user can be marked as a &quot;priority speaker&quot; within a channel. </para></section><section><title>Using Mumble</title><para>FreedomBox includes the Mumble server. <ulink url="https://wiki.mumble.info/wiki/Main_Page">Clients</ulink> are available for desktop and mobile platforms. Users can download one of these clients and connect to the server. </para></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for Mumble: </para><itemizedlist><listitem><para>TCP 64738 </para></listitem><listitem><para>UDP 64738 </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Mumble/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/NameServices.raw.xml b/doc/NameServices.raw.xml
index ff9467712..e103e650a 100644
--- a/doc/NameServices.raw.xml
+++ b/doc/NameServices.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/NameServices</title><revhistory><revision><revnumber>3</revnumber><date>2016-12-31 04:18:51</date><authorinitials>JamesValleroy</authorinitials><revremark>reword</revremark></revision><revision><revnumber>2</revnumber><date>2016-08-21 17:16:56</date><authorinitials>Drahtseil</authorinitials></revision><revision><revnumber>1</revnumber><date>2016-08-21 17:16:41</date><authorinitials>Drahtseil</authorinitials><revremark>Created NameServices</revremark></revision></revhistory></articleinfo><section><title>Name Services</title><para>Name Services provides an overview of ways the box can be reached from the public Internet: domain name, Tor hidden service, and Pagekite. For each type of name, it is shown whether the HTTP, HTTPS, and SSH services are enabled or disabled for incoming connections through the given name. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/NameServices</title><revhistory><revision><revnumber>3</revnumber><date>2016-12-31 04:18:51</date><authorinitials>JamesValleroy</authorinitials><revremark>reword</revremark></revision><revision><revnumber>2</revnumber><date>2016-08-21 17:16:56</date><authorinitials>Drahtseil</authorinitials></revision><revision><revnumber>1</revnumber><date>2016-08-21 17:16:41</date><authorinitials>Drahtseil</authorinitials><revremark>Created NameServices</revremark></revision></revhistory></articleinfo><section><title>Name Services</title><para>Name Services provides an overview of ways the box can be reached from the public Internet: domain name, Tor hidden service, and Pagekite. For each type of name, it is shown whether the HTTP, HTTPS, and SSH services are enabled or disabled for incoming connections through the given name. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/NameServices/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/Networks.raw.xml b/doc/Networks.raw.xml
index 3e26e52c4..1f8c898e6 100644
--- a/doc/Networks.raw.xml
+++ b/doc/Networks.raw.xml
@@ -6,4 +6,4 @@
 wifi.scan-rand-mac-address=no]]></screen><para>Then reboot the machine. </para></section></section><section><title>Adding a new network device</title><para>When a new network device is added, network manager will automatically configure it.  In most cases this will not work to your liking. Delete the automatic configuration created on the interface and create a new network connection.  Select your newly added network interface in the add connection page. </para><itemizedlist><listitem><para>Then set firewall zone to <code>internal</code> and <code>external</code> appropriately. </para></listitem><listitem><para>You can configure the interface to connect to a network or provide network configuration to whatever machine connects to it. </para></listitem><listitem><para>Similarly, if it is a Wi-Fi interface, you can configure it to become a Wi-FI access point or to connect to an existing access points in the network. </para></listitem></itemizedlist></section><section><title>Configuring a mesh network</title><para>FreedomBox has rudimentary support for participating in BATMAN-Adv based mesh networks.  It is possible to either join an existing network in your area or create a new mesh network and share your Internet connection with the rest of the nodes that join the network.  Currently, two connections have to be created and activated manually to join or create a mesh network. </para><section><title>Joining a mesh network</title><para>To join an existing mesh network in your area, first consult the organizers and get information about the mesh network. </para><orderedlist numeration="arabic"><listitem><para>Create a new connection, then select the connection type as <emphasis>Wi-Fi</emphasis>.  In the following dialog, provide the following values: </para><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Field Name</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Example Value</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Explanation</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Connection Name</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> Mesh Join - BATMAN </para></entry><entry colsep="1" rowsep="1"><para> The name must end with 'BATMAN' (uppercase) </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Physical Interface</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> wlan0 </para></entry><entry colsep="1" rowsep="1"><para> The Wi-Fi device you wish to use for joining the mesh network </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Firewall Zone</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> External </para></entry><entry colsep="1" rowsep="1"><para> Since you don't wish that participants in mesh network to use internal services of FreedomBox </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>SSID</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> ch1.freifunk.net </para></entry><entry colsep="1" rowsep="1"><para> As provided to you by the operators of the mesh network.  You should see this as a network in <emphasis>Nearby Wi-Fi Networks</emphasis> </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Mode</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> Ad-hoc </para></entry><entry colsep="1" rowsep="1"><para> Because this is a peer-to-peer network </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Frequency Band</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> 2.4Ghz </para></entry><entry colsep="1" rowsep="1"><para> As provided to you by the operators of the mesh network </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Channel</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> 1 </para></entry><entry colsep="1" rowsep="1"><para> As provided to you by the operators of the mesh network </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>BSSID</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> 12:CA:FF:EE:BA:BE </para></entry><entry colsep="1" rowsep="1"><para> As provided to you by the operators of the mesh network </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Authentication</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> Open </para></entry><entry colsep="1" rowsep="1"><para> Leave this as open, unless you know your mesh network needs it be otherwise </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Passphrase</emphasis> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para> Leave empty unless you know your mesh network requires one </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>IPv4 Addressing Method</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> Disabled </para></entry><entry colsep="1" rowsep="1"><para> We don't want to request IP configuration information yet </para></entry></row></tbody></tgroup></informaltable><para>Save the connection.  Join the mesh network by activating this newly created connection. </para></listitem><listitem><para>Create a second new connection, then select the connection type as <emphasis>Generic</emphasis>.  In the following dialog, provide this following values: </para><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Field Name</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Example Value</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Explanation</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Connection Name</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> Mesh Connect </para></entry><entry colsep="1" rowsep="1"><para> Any name to identify this connection </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Physical Interface</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> bat0 </para></entry><entry colsep="1" rowsep="1"><para> This interface will only show up after you successfully activate the connection in first step </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>Firewall Zone</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> External </para></entry><entry colsep="1" rowsep="1"><para> Since you don't wish that participants in mesh network to use internal services of FreedomBox </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para> <emphasis>IPv4 Addressing Method</emphasis> </para></entry><entry colsep="1" rowsep="1"><para> Auto </para></entry><entry colsep="1" rowsep="1"><para> Mesh networks usually have a DHCP server somewhere that provide your machine with IP configuration. If not, consult the operator and configure IP address setting accordingly with <emphasis>Manual</emphasis> method </para></entry></row></tbody></tgroup></informaltable><para>Save the connection.  Configure your machine for participation in the network by activating this connection.  Currently, this connection has to be manually activated every time you need to join the network.  In future, FreedomBox will do this automatically. You will now be able reach other nodes in the network.  You will also be able to connect to the Internet via the mesh network if there is an Internet connection point somewhere in mesh as setup by the operators. </para></listitem></orderedlist></section><section><title>Creating a mesh network</title><para>To create your own mesh network and share your Internet connection with the rest of the nodes in the network: </para><orderedlist numeration="arabic"><listitem><para>Follow the instructions as provided above in step 1 of <emphasis>Joining a mesh network</emphasis> but choose and fix upon your own valid values for <emphasis>SSID</emphasis> (a name for you mesh network), <emphasis>Frequency Band</emphasis> (usually 2.4Ghz), <emphasis>Channel</emphasis> (1 to 11 in 2.4Ghz band) and <emphasis>BSSID</emphasis> (a hex value like 12:CA:DE:AD:BE:EF).  Create this connection and activate it. </para></listitem><listitem><para>Follow the instructions as provided above in step 2 of <emphasis>Joining a mesh network</emphasis> but select <emphasis>IPv4 Addressing Method</emphasis> as <emphasis>Shared</emphasis>.  This will provide automatic IP configuration to other nodes in the network as well as share the Internet connection on your machine (achieved using a second Wi-Fi interface, using Ethernet, etc.) with other nodes in the mesh network. </para></listitem></orderedlist><para>Spread the word about your mesh network to your neighbors and let them know the parameters you have provided when creating the network.  When other nodes connect to this mesh network, they have to follow steps in <emphasis>Joining a mesh network</emphasis> but use the values for <emphasis>SSID</emphasis>, <emphasis>Frequency Band</emphasis> and <emphasis>Channel</emphasis> that you have chosen when you created the mesh network. </para></section></section></section><section><title>Manual Network Operation</title><para>FreedomBox automatically configures networks by default and provides a simplified interface to customize the configuration to specific needs.  In most cases, manual operation is not necessary.  The following steps describe how to manually operate network configuration in the event that a user finds FreedomBox interface to insufficient for task at hand or to diagnose a problem that FreedomBox does not identify. </para><para>On the command line interface: </para><para>For text based user interface for configuring network connections: </para><screen><![CDATA[nmtui]]></screen><para>To see the list of available network devices: </para><screen><![CDATA[nmcli device]]></screen><para>To see the list of configured connections: </para><screen><![CDATA[nmcli connection]]></screen><para>To see the current status of a connection: </para><screen><![CDATA[nmcli connection show '<connection_name>']]></screen><para>To see the current firewall zone assigned to a network interface: </para><screen><![CDATA[nmcli connection show '<connection_name>' | grep zone]]></screen><para>or </para><screen><![CDATA[firewall-cmd --zone=internal --list-all
 firewall-cmd --zone=external --list-all]]></screen><para>To create a new network connection: </para><screen><![CDATA[nmcli con add con-name "<connection_name>" ifname "<interface>" type ethernet
 nmcli con modify "<connection_name>" connection.autoconnect TRUE
-nmcli con modify "<connection_name>" connection.zone internal]]></screen><para>To change the firewall zone for a connection: </para><screen><![CDATA[nmcli con modify "<connection_name>" connection.zone "<internal|external>"]]></screen><para>For more information on how to use <code>nmcli</code> command, see its man page. Also for a full list of configuration settings and type of connections accepted by Network Manager see: </para><para><ulink url="https://developer.gnome.org/NetworkManager/stable/ref-settings.html"/> </para><para>To see the current status of the firewall and manually operate it, see the <ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Manual/Firewall#">Firewall</ulink> section. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+nmcli con modify "<connection_name>" connection.zone internal]]></screen><para>To change the firewall zone for a connection: </para><screen><![CDATA[nmcli con modify "<connection_name>" connection.zone "<internal|external>"]]></screen><para>For more information on how to use <code>nmcli</code> command, see its man page. Also for a full list of configuration settings and type of connections accepted by Network Manager see: </para><para><ulink url="https://developer.gnome.org/NetworkManager/stable/ref-settings.html"/> </para><para>To see the current status of the firewall and manually operate it, see the <ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Manual/Firewall#">Firewall</ulink> section. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Networks/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/OpenVPN.raw.xml b/doc/OpenVPN.raw.xml
index 8cec6f494..cc70af83d 100644
--- a/doc/OpenVPN.raw.xml
+++ b/doc/OpenVPN.raw.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/OpenVPN</title><revhistory><revision><revnumber>14</revnumber><date>2019-05-10 23:08:07</date><authorinitials>JamesValleroy</authorinitials><revremark>use standard text for port forwarding</revremark></revision><revision><revnumber>13</revnumber><date>2019-03-01 01:28:15</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add instructions for connecting using mobile client</revremark></revision><revision><revnumber>12</revnumber><date>2019-03-01 00:48:12</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about browsing Internet</revremark></revision><revision><revnumber>11</revnumber><date>2019-03-01 00:37:30</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about dealing with profile files</revremark></revision><revision><revnumber>10</revnumber><date>2019-02-28 09:38:45</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Update image and set width</revremark></revision><revision><revnumber>9</revnumber><date>2018-11-15 11:47:34</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add documentation on how to connect to VPN from Debian and check the connection. Update external link</revremark></revision><revision><revnumber>8</revnumber><date>2016-12-31 04:01:13</date><authorinitials>JamesValleroy</authorinitials><revremark>clarify install vs setup</revremark></revision><revision><revnumber>7</revnumber><date>2016-09-09 15:37:55</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor indentation fix with screenshot</revremark></revision><revision><revnumber>6</revnumber><date>2016-09-01 19:14:03</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>5</revnumber><date>2016-08-14 19:39:09</date><authorinitials>JanCostermans</authorinitials><revremark>added screenshot and setting up sections</revremark></revision><revision><revnumber>4</revnumber><date>2016-04-10 07:16:50</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-16 00:32:58</date><authorinitials>PhilippeBaret</authorinitials><revremark>Text finishing</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-16 00:28:34</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added definition for OpenVPN</revremark></revision><revision><revnumber>1</revnumber><date>2015-12-15 23:58:42</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added first content [OpenVPN page to Apps manual]</revremark></revision></revhistory></articleinfo><section><title>Virtual Private Network (OpenVPN)</title><section><title>What is OpenVPN?</title><para>OpenVPN provides to your FreedomBox a virtual private network service. You can use this software for remote access, site-to-site VPNs and Wi-Fi security. OpenVPN includes support for dynamic IP addresses and NAT. </para></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for OpenVPN: </para><itemizedlist><listitem><para>UDP 1194 </para></listitem></itemizedlist></section><section><title>Setting up</title><orderedlist numeration="arabic"><listitem><para>In Plinth apps menu, select <emphasis>Virtual Private Network (OpenVPN)</emphasis> and click Install. </para></listitem><listitem><para>After the module is installed, there is an additional setup step that may take a long time to complete. Click &quot;Start setup&quot; to begin. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=plinth_openvpn.png" width="800"/></imageobject><textobject><phrase>OpenVPN service page</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>Wait for the setup to finish. This could take a while. </para></listitem><listitem><para>Once the setup of the OpenVPN server is complete, you can download your profile. This will download a file called &lt;USER&gt;.ovpn, where &lt;USER&gt; is the name of a FreedomBox user. Each FreedomBox user will be able to download a different profile. Users who are not administrators can download the profile from home page after login. </para></listitem><listitem><para>The ovpn file contains all the information a vpn client needs to connect to the server. </para></listitem><listitem><para>The downloaded profile contains the domain name of the FreedomBox that the client should connect to. This is picked up from the domain configured in 'Config' section of 'System' page. In case your domain is not configured properly, you may need to change this value after downloading the profile. If your OpenVPN client allows it, you can do this after importing the OpenVPN profile. Otherwise, you can edit the .ovpn profile file in a text editor and change the 'remote' line to contain the WAN IP address or hostname of your FreedomBox as follows. </para></listitem></orderedlist><screen><![CDATA[client
+<article><articleinfo><title>FreedomBox/Manual/OpenVPN</title><revhistory><revision><revnumber>15</revnumber><date>2019-09-16 09:38:50</date><authorinitials>fioddor</authorinitials><revremark>Minor layout correction</revremark></revision><revision><revnumber>14</revnumber><date>2019-05-10 23:08:07</date><authorinitials>JamesValleroy</authorinitials><revremark>use standard text for port forwarding</revremark></revision><revision><revnumber>13</revnumber><date>2019-03-01 01:28:15</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add instructions for connecting using mobile client</revremark></revision><revision><revnumber>12</revnumber><date>2019-03-01 00:48:12</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about browsing Internet</revremark></revision><revision><revnumber>11</revnumber><date>2019-03-01 00:37:30</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update information about dealing with profile files</revremark></revision><revision><revnumber>10</revnumber><date>2019-02-28 09:38:45</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Update image and set width</revremark></revision><revision><revnumber>9</revnumber><date>2018-11-15 11:47:34</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add documentation on how to connect to VPN from Debian and check the connection. Update external link</revremark></revision><revision><revnumber>8</revnumber><date>2016-12-31 04:01:13</date><authorinitials>JamesValleroy</authorinitials><revremark>clarify install vs setup</revremark></revision><revision><revnumber>7</revnumber><date>2016-09-09 15:37:55</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor indentation fix with screenshot</revremark></revision><revision><revnumber>6</revnumber><date>2016-09-01 19:14:03</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>5</revnumber><date>2016-08-14 19:39:09</date><authorinitials>JanCostermans</authorinitials><revremark>added screenshot and setting up sections</revremark></revision><revision><revnumber>4</revnumber><date>2016-04-10 07:16:50</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-16 00:32:58</date><authorinitials>PhilippeBaret</authorinitials><revremark>Text finishing</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-16 00:28:34</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added definition for OpenVPN</revremark></revision><revision><revnumber>1</revnumber><date>2015-12-15 23:58:42</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added first content [OpenVPN page to Apps manual]</revremark></revision></revhistory></articleinfo><section><title>Virtual Private Network (OpenVPN)</title><section><title>What is OpenVPN?</title><para>OpenVPN provides to your FreedomBox a virtual private network service. You can use this software for remote access, site-to-site VPNs and Wi-Fi security. OpenVPN includes support for dynamic IP addresses and NAT. </para></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for OpenVPN: </para><itemizedlist><listitem><para>UDP 1194 </para></listitem></itemizedlist></section><section><title>Setting up</title><orderedlist numeration="arabic"><listitem><para>In Plinth apps menu, select <emphasis>Virtual Private Network (OpenVPN)</emphasis> and click Install. </para></listitem><listitem><para>After the module is installed, there is an additional setup step that may take a long time to complete. Click &quot;Start setup&quot; to begin. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=plinth_openvpn.png" width="800"/></imageobject><textobject><phrase>OpenVPN service page</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>Wait for the setup to finish. This could take a while. </para></listitem><listitem><para>Once the setup of the OpenVPN server is complete, you can download your profile. This will download a file called &lt;USER&gt;.ovpn, where &lt;USER&gt; is the name of a FreedomBox user. Each FreedomBox user will be able to download a different profile. Users who are not administrators can download the profile from home page after login. </para></listitem><listitem><para>The ovpn file contains all the information a vpn client needs to connect to the server. </para></listitem><listitem><para>The downloaded profile contains the domain name of the FreedomBox that the client should connect to. This is picked up from the domain configured in 'Config' section of 'System' page. In case your domain is not configured properly, you may need to change this value after downloading the profile. If your OpenVPN client allows it, you can do this after importing the OpenVPN profile. Otherwise, you can edit the .ovpn profile file in a text editor and change the 'remote' line to contain the WAN IP address or hostname of your FreedomBox as follows. </para><screen><![CDATA[client
 remote mybox.sds-ip.de 1194
-proto udp]]></screen></section><section><title>Browsing Internet after connecting to VPN</title><para>After connecting to the VPN, the client device will be able to browse the Internet without any further configuration. However, a pre-condition for this to work is that you need to have at least one Internet connected network interface which is part of the 'External' firewall zone. Use the networks configuration page to edit the firewall zone for the device's network interfaces. </para></section><section><title>Usage</title><section><title>On Android/LineageOS</title><orderedlist numeration="arabic"><listitem><para>Visit FreedomBox home page. Login with your user account. From home page, download the OpenVPN profile. The file will be named <emphasis>username</emphasis>.ovpn. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_download_profile.png" width="324"/></imageobject><textobject><phrase>OpenVPN Download Profile</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Download an OpenVPN client such as <emphasis>OpenVPN for Android</emphasis>. F-Droid repository is recommended. In the app, select import profile. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_install_app.png" width="324"/></imageobject><textobject><phrase>OpenVPN App</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In the select profile dialog, choose the <emphasis>username</emphasis>.opvn file you have just downloaded. Provide a name for the connection and save the profile. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_import_profile.png" width="324"/></imageobject><textobject><phrase>OpenVPN import profile</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Newly created profile will show up. If necessary, edit the profile and set the domain name of your FreedomBox as the server address. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_profile_created.png" width="324"/></imageobject><textobject><phrase>OpenVPN profile created</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_edit_domain_name.png" width="324"/></imageobject><textobject><phrase>OpenVPN edit domain name</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Connect by tapping on the profile. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_connect.png" width="324"/></imageobject><textobject><phrase>OpenVPN connect</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_connected.png" width="324"/></imageobject><textobject><phrase>OpenVPN connected</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>When done, disconnect by tapping on the profile. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_disconnect.png" width="324"/></imageobject><textobject><phrase>OpenVPN disconnect</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem></orderedlist></section><section><title>On Debian</title><para>Install an OpenVPN client for your system </para><screen><![CDATA[$ sudo apt install openvpn]]></screen><para>Open the ovpn file with the OpenVPN client. </para><screen><![CDATA[$ sudo openvpn --config /path/to/<USER>.ovpn]]></screen></section></section><section><title>Checking if you are connected</title><section><title>On Debian</title><orderedlist numeration="arabic"><listitem><para>Try to ping the FreedomBox or other devices on the local network. </para></listitem><listitem><para>Running the command <code>ip addr</code> should show a <code>tun0</code> connection. </para></listitem><listitem><para>The command <code>traceroute freedombox.org</code> should show you the ip address of the VPN server as the first hop. </para></listitem></orderedlist></section></section><section><title>External Links</title><para><ulink url="https://community.openvpn.net/openvpn"/> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+proto udp]]></screen></listitem></orderedlist></section><section><title>Browsing Internet after connecting to VPN</title><para>After connecting to the VPN, the client device will be able to browse the Internet without any further configuration. However, a pre-condition for this to work is that you need to have at least one Internet connected network interface which is part of the 'External' firewall zone. Use the networks configuration page to edit the firewall zone for the device's network interfaces. </para></section><section><title>Usage</title><section><title>On Android/LineageOS</title><orderedlist numeration="arabic"><listitem><para>Visit FreedomBox home page. Login with your user account. From home page, download the OpenVPN profile. The file will be named <emphasis>username</emphasis>.ovpn. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_download_profile.png" width="324"/></imageobject><textobject><phrase>OpenVPN Download Profile</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Download an OpenVPN client such as <emphasis>OpenVPN for Android</emphasis>. F-Droid repository is recommended. In the app, select import profile. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_install_app.png" width="324"/></imageobject><textobject><phrase>OpenVPN App</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In the select profile dialog, choose the <emphasis>username</emphasis>.opvn file you have just downloaded. Provide a name for the connection and save the profile. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_import_profile.png" width="324"/></imageobject><textobject><phrase>OpenVPN import profile</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Newly created profile will show up. If necessary, edit the profile and set the domain name of your FreedomBox as the server address. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_profile_created.png" width="324"/></imageobject><textobject><phrase>OpenVPN profile created</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_edit_domain_name.png" width="324"/></imageobject><textobject><phrase>OpenVPN edit domain name</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Connect by tapping on the profile. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_connect.png" width="324"/></imageobject><textobject><phrase>OpenVPN connect</phrase></textobject></inlinemediaobject> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_connected.png" width="324"/></imageobject><textobject><phrase>OpenVPN connected</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>When done, disconnect by tapping on the profile. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/OpenVPN?action=AttachFile&amp;do=get&amp;target=openvpn_disconnect.png" width="324"/></imageobject><textobject><phrase>OpenVPN disconnect</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem></orderedlist></section><section><title>On Debian</title><para>Install an OpenVPN client for your system </para><screen><![CDATA[$ sudo apt install openvpn]]></screen><para>Open the ovpn file with the OpenVPN client. </para><screen><![CDATA[$ sudo openvpn --config /path/to/<USER>.ovpn]]></screen></section></section><section><title>Checking if you are connected</title><section><title>On Debian</title><orderedlist numeration="arabic"><listitem><para>Try to ping the FreedomBox or other devices on the local network. </para></listitem><listitem><para>Running the command <code>ip addr</code> should show a <code>tun0</code> connection. </para></listitem><listitem><para>The command <code>traceroute freedombox.org</code> should show you the ip address of the VPN server as the first hop. </para></listitem></orderedlist></section></section><section><title>External Links</title><para><ulink url="https://community.openvpn.net/openvpn"/> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/OpenVPN/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/PageKite.raw.xml b/doc/PageKite.raw.xml
index f217b8ba2..13a87d9ae 100644
--- a/doc/PageKite.raw.xml
+++ b/doc/PageKite.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/PageKite</title><revhistory><revision><revnumber>12</revnumber><date>2017-01-07 20:37:22</date><authorinitials>JamesValleroy</authorinitials><revremark>add info on getting certificate</revremark></revision><revision><revnumber>11</revnumber><date>2017-01-07 20:21:47</date><authorinitials>JamesValleroy</authorinitials><revremark>add instructions</revremark></revision><revision><revnumber>10</revnumber><date>2017-01-07 20:14:44</date><authorinitials>JamesValleroy</authorinitials><revremark>clarify how pagekite works</revremark></revision><revision><revnumber>9</revnumber><date>2016-09-01 19:19:45</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>8</revnumber><date>2016-04-10 07:13:20</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added navigation link</revremark></revision><revision><revnumber>7</revnumber><date>2015-12-15 20:50:09</date><authorinitials>PhilippeBaret</authorinitials><revremark>Correction</revremark></revision><revision><revnumber>6</revnumber><date>2015-12-15 19:28:57</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added more definition</revremark></revision><revision><revnumber>5</revnumber><date>2015-12-15 19:19:27</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added pagekite extended definition</revremark></revision><revision><revnumber>4</revnumber><date>2015-09-13 14:58:24</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add headings for inclusion into manual</revremark></revision><revision><revnumber>3</revnumber><date>2015-09-13 13:18:15</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Move PageKite page to manual</revremark></revision><revision><revnumber>2</revnumber><date>2015-02-13 05:01:10</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Include FreedomBox portal in footer</revremark></revision><revision><revnumber>1</revnumber><date>2012-09-14 07:37:02</date><authorinitials>planetlarg</authorinitials></revision></revhistory></articleinfo><section><title>Public Visibility (PageKite)</title><section><title>What is PageKite?</title><para>PageKite makes local websites and services publicly accessible immediately without creating yourself a public IP address. It does this by tunneling protocols such as HTTPS or SSH through firewalls and NAT. Using PageKite requires an account on a PageKite relay service. One such service is <ulink url="https://pagekite.net"/>. </para><para>A PageKite relay service will allow you to create kites. Kites are similar to domain names, but with different advantages and drawbacks. A kite can have a number of configured services. PageKite is known to work with HTTP, HTTPS, and SSH, and may work with some other services, but not all. </para></section><section><title>Using PageKite</title><orderedlist numeration="arabic"><listitem><para>Create an account on a PageKite relay service. </para></listitem><listitem><para>Add a kite to your account. Note your kite name and kite secret. </para></listitem><listitem><para>In Plinth, go to the &quot;Configure PageKite&quot; tab on the Public Visibility (PageKite) page. </para></listitem><listitem><para>Check the &quot;Enable PageKite&quot; box, then enter your kite name and kite secret. Click &quot;Save settings&quot;. </para></listitem><listitem><para>On the &quot;Standard Services&quot; tab, you can enable HTTP and HTTPS (recommended) and SSH (optional). </para><itemizedlist><listitem><para>HTTP is needed to obtain the Let's Encrypt certificate. You can disable it later. </para></listitem></itemizedlist></listitem><listitem><para>On the <ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Manual/LetsEncrypt#">Certificates (Let's Encrypt)</ulink> page, you can obtain a Let's Encrypt certificate for your kite name. </para></listitem></orderedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/PageKite</title><revhistory><revision><revnumber>12</revnumber><date>2017-01-07 20:37:22</date><authorinitials>JamesValleroy</authorinitials><revremark>add info on getting certificate</revremark></revision><revision><revnumber>11</revnumber><date>2017-01-07 20:21:47</date><authorinitials>JamesValleroy</authorinitials><revremark>add instructions</revremark></revision><revision><revnumber>10</revnumber><date>2017-01-07 20:14:44</date><authorinitials>JamesValleroy</authorinitials><revremark>clarify how pagekite works</revremark></revision><revision><revnumber>9</revnumber><date>2016-09-01 19:19:45</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>8</revnumber><date>2016-04-10 07:13:20</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added navigation link</revremark></revision><revision><revnumber>7</revnumber><date>2015-12-15 20:50:09</date><authorinitials>PhilippeBaret</authorinitials><revremark>Correction</revremark></revision><revision><revnumber>6</revnumber><date>2015-12-15 19:28:57</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added more definition</revremark></revision><revision><revnumber>5</revnumber><date>2015-12-15 19:19:27</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added pagekite extended definition</revremark></revision><revision><revnumber>4</revnumber><date>2015-09-13 14:58:24</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add headings for inclusion into manual</revremark></revision><revision><revnumber>3</revnumber><date>2015-09-13 13:18:15</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Move PageKite page to manual</revremark></revision><revision><revnumber>2</revnumber><date>2015-02-13 05:01:10</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Include FreedomBox portal in footer</revremark></revision><revision><revnumber>1</revnumber><date>2012-09-14 07:37:02</date><authorinitials>planetlarg</authorinitials></revision></revhistory></articleinfo><section><title>Public Visibility (PageKite)</title><section><title>What is PageKite?</title><para>PageKite makes local websites and services publicly accessible immediately without creating yourself a public IP address. It does this by tunneling protocols such as HTTPS or SSH through firewalls and NAT. Using PageKite requires an account on a PageKite relay service. One such service is <ulink url="https://pagekite.net"/>. </para><para>A PageKite relay service will allow you to create kites. Kites are similar to domain names, but with different advantages and drawbacks. A kite can have a number of configured services. PageKite is known to work with HTTP, HTTPS, and SSH, and may work with some other services, but not all. </para></section><section><title>Using PageKite</title><orderedlist numeration="arabic"><listitem><para>Create an account on a PageKite relay service. </para></listitem><listitem><para>Add a kite to your account. Note your kite name and kite secret. </para></listitem><listitem><para>In Plinth, go to the &quot;Configure PageKite&quot; tab on the Public Visibility (PageKite) page. </para></listitem><listitem><para>Check the &quot;Enable PageKite&quot; box, then enter your kite name and kite secret. Click &quot;Save settings&quot;. </para></listitem><listitem><para>On the &quot;Standard Services&quot; tab, you can enable HTTP and HTTPS (recommended) and SSH (optional). </para><itemizedlist><listitem><para>HTTP is needed to obtain the Let's Encrypt certificate. You can disable it later. </para></listitem></itemizedlist></listitem><listitem><para>On the <ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Manual/LetsEncrypt#">Certificates (Let's Encrypt)</ulink> page, you can obtain a Let's Encrypt certificate for your kite name. </para></listitem></orderedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/PageKite/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Power.raw.xml b/doc/Power.raw.xml
index f96c678a4..cc0d1f4f2 100644
--- a/doc/Power.raw.xml
+++ b/doc/Power.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Power</title><revhistory><revision><revnumber>3</revnumber><date>2019-02-28 16:33:32</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Restart and shut down options in user menu</revremark></revision><revision><revnumber>2</revnumber><date>2017-01-07 20:38:36</date><authorinitials>JamesValleroy</authorinitials><revremark>note confirmation</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 09:29:59</date><authorinitials>Drahtseil</authorinitials><revremark>Created Power</revremark></revision></revhistory></articleinfo><section><title>Power</title><para>Power provides an easy way to restart or shut down FreedomBox. After you select &quot;Restart&quot; or &quot;Shut Down&quot;, you will be asked to confirm. </para><para>&quot;Restart&quot; and &quot;Shut Down&quot; options can also be reached from the user dropdown menu on the top right. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Power</title><revhistory><revision><revnumber>3</revnumber><date>2019-02-28 16:33:32</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Restart and shut down options in user menu</revremark></revision><revision><revnumber>2</revnumber><date>2017-01-07 20:38:36</date><authorinitials>JamesValleroy</authorinitials><revremark>note confirmation</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 09:29:59</date><authorinitials>Drahtseil</authorinitials><revremark>Created Power</revremark></revision></revhistory></articleinfo><section><title>Power</title><para>Power provides an easy way to restart or shut down FreedomBox. After you select &quot;Restart&quot; or &quot;Shut Down&quot;, you will be asked to confirm. </para><para>&quot;Restart&quot; and &quot;Shut Down&quot; options can also be reached from the user dropdown menu on the top right. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Power/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/Privoxy.raw.xml b/doc/Privoxy.raw.xml
index 84fe28614..4af94b288 100644
--- a/doc/Privoxy.raw.xml
+++ b/doc/Privoxy.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Privoxy</title><revhistory><revision><revnumber>10</revnumber><date>2018-03-11 03:09:16</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized images</revremark></revision><revision><revnumber>9</revnumber><date>2016-09-09 15:39:20</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor indentation fix with screenshots</revremark></revision><revision><revnumber>8</revnumber><date>2016-09-09 15:31:16</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Promote the visibility of the screencast</revremark></revision><revision><revnumber>7</revnumber><date>2016-08-09 19:09:55</date><authorinitials>Drahtseil</authorinitials><revremark>configuration for advanced users</revremark></revision><revision><revnumber>6</revnumber><date>2016-08-06 20:02:42</date><authorinitials>Drahtseil</authorinitials><revremark>Screencast of the setting up</revremark></revision><revision><revnumber>5</revnumber><date>2016-08-06 17:57:33</date><authorinitials>Drahtseil</authorinitials><revremark>screenshots</revremark></revision><revision><revnumber>4</revnumber><date>2016-08-01 19:38:35</date><authorinitials>Drahtseil</authorinitials><revremark>Very basic restructuring as preparation for more work to be done.</revremark></revision><revision><revnumber>3</revnumber><date>2016-04-10 07:24:20</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 20:54:14</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added link to Privoxy FAQ</revremark></revision><revision><revnumber>1</revnumber><date>2015-12-15 20:22:00</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Privoxy page and definition</revremark></revision></revhistory></articleinfo><section><title>Web Proxy (Privoxy)</title><para>A web proxy acts as a filter for incoming and outgoing internet traffic. Thus, you can instruct any computer in your network to pass internet traffic through the proxy to remove unwanted ads and tracking mechanisms. </para><para>Privoxy is a software for security, privacy, and accurate control over the web. It provides a much more powerful web proxy (and anonymity on the web) than what your browser can offer. Privoxy &quot;is a proxy that is primarily focused on privacy enhancement, ad and junk elimination and freeing the user from restrictions placed on his activities&quot; (source: <ulink url="http://www.privoxy.org/faq/index.html">Privoxy FAQ</ulink>). </para><section><title>Screencast</title><para>Watch the <ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Manual/Privoxy?action=AttachFile&amp;do=get&amp;target=Privoxy_Installation.webm">screencast</ulink> on how to setup and use Privoxy in FreedomBox. </para></section><section><title>Setting up</title><orderedlist numeration="arabic"><listitem><para>In Plinth install <emphasis>Web Proxy (Privoxy)</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Privoxy?action=AttachFile&amp;do=get&amp;target=Privoxy-Installation.png" width="800"/></imageobject><textobject><phrase>Privoxy Installation</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>Adapt your browser proxy settings to your FreedomBox hostname (or IP address) with port 8118. Please note that Privoxy can only proxy HTTP and HTTPS traffic. It will not work with FTP or other protocols.  </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Privoxy?action=AttachFile&amp;do=get&amp;target=Privoxy-BrowserSettings.png" width="800"/></imageobject><textobject><phrase>Privoxy Browser Settings</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>Go to page <ulink url="http://config.privoxy.org/"/> or <ulink url="http://p.p"/>. If Privoxy is installed properly, you will be able to configure it in detail; if not you will see an error message. </para></listitem><listitem><para>If you are using a laptop that occasionally has to connect through other routers than yours with the FreedomBox and Privoxy, you may want to install a proxy switch add-on that allows you to easily turn the proxy on or off.  </para></listitem></orderedlist></section><section><title>Advanced Users</title><orderedlist numeration="arabic"><listitem><para>The default installation should provide a reasonable starting point for most. There will undoubtedly be occasions where you will want to adjust the configuration, that can be dealt with as the need arises.  </para></listitem><listitem><para>While using Privoxy, you can see its configuration details and documentation at <ulink url="http://config.privoxy.org/"/> or <ulink url="http://p.p"/>. </para></listitem><listitem><para>To enable changing these configurations, you first have to change the value of <code>enable-edit-actions</code> in <code>/etc/privoxy/config</code> to <code>1</code>. Before doing so, read carefully the manual, especially:    </para><itemizedlist><listitem override="none"><para><emphasis>Access to the editor can not be controlled separately by &quot;ACLs&quot; or HTTP authentication, so that everybody who can access Privoxy can modify its configuration for all users. This option is not recommended for environments with untrusted users. Note that malicious client side code (e.g Java) is also capable of using the actions editor and you shouldn't enable this options unless you understand the consequences and are sure your browser is configured correctly.</emphasis> </para></listitem></itemizedlist></listitem><listitem><para>Now you find an <code>EDIT</code> button on the configuration screen in <code>http://config.privoxy.org/</code>. </para></listitem><listitem><para>The <ulink url="http://www.privoxy.org/user-manual/quickstart.html">Quickstart</ulink> is a good starting point to read on how to define own blocking and filtering rules. </para></listitem></orderedlist><!--rule (<hr>) is not applicable to DocBook--><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Privoxy</title><revhistory><revision><revnumber>11</revnumber><date>2019-09-16 12:07:52</date><authorinitials>fioddor</authorinitials><revremark>Minor correction</revremark></revision><revision><revnumber>10</revnumber><date>2018-03-11 03:09:16</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized images</revremark></revision><revision><revnumber>9</revnumber><date>2016-09-09 15:39:20</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor indentation fix with screenshots</revremark></revision><revision><revnumber>8</revnumber><date>2016-09-09 15:31:16</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Promote the visibility of the screencast</revremark></revision><revision><revnumber>7</revnumber><date>2016-08-09 19:09:55</date><authorinitials>Drahtseil</authorinitials><revremark>configuration for advanced users</revremark></revision><revision><revnumber>6</revnumber><date>2016-08-06 20:02:42</date><authorinitials>Drahtseil</authorinitials><revremark>Screencast of the setting up</revremark></revision><revision><revnumber>5</revnumber><date>2016-08-06 17:57:33</date><authorinitials>Drahtseil</authorinitials><revremark>screenshots</revremark></revision><revision><revnumber>4</revnumber><date>2016-08-01 19:38:35</date><authorinitials>Drahtseil</authorinitials><revremark>Very basic restructuring as preparation for more work to be done.</revremark></revision><revision><revnumber>3</revnumber><date>2016-04-10 07:24:20</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 20:54:14</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added link to Privoxy FAQ</revremark></revision><revision><revnumber>1</revnumber><date>2015-12-15 20:22:00</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Privoxy page and definition</revremark></revision></revhistory></articleinfo><section><title>Web Proxy (Privoxy)</title><para>A web proxy acts as a filter for incoming and outgoing web traffic. Thus, you can instruct any computer in your network to pass internet traffic through the proxy to remove unwanted ads and tracking mechanisms. </para><para>Privoxy is a software for security, privacy, and accurate control over the web. It provides a much more powerful web proxy (and anonymity on the web) than what your browser can offer. Privoxy &quot;is a proxy that is primarily focused on privacy enhancement, ad and junk elimination and freeing the user from restrictions placed on his activities&quot; (source: <ulink url="http://www.privoxy.org/faq/index.html">Privoxy FAQ</ulink>). </para><section><title>Screencast</title><para>Watch the <ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Manual/Privoxy?action=AttachFile&amp;do=get&amp;target=Privoxy_Installation.webm">screencast</ulink> on how to setup and use Privoxy in FreedomBox. </para></section><section><title>Setting up</title><orderedlist numeration="arabic"><listitem><para>In Plinth install <emphasis>Web Proxy (Privoxy)</emphasis> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Privoxy?action=AttachFile&amp;do=get&amp;target=Privoxy-Installation.png" width="800"/></imageobject><textobject><phrase>Privoxy Installation</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>Adapt your browser proxy settings to your FreedomBox hostname (or IP address) with port 8118. Please note that Privoxy can only proxy HTTP and HTTPS traffic. It will not work with FTP or other protocols.  </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Privoxy?action=AttachFile&amp;do=get&amp;target=Privoxy-BrowserSettings.png" width="800"/></imageobject><textobject><phrase>Privoxy Browser Settings</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>Go to page <ulink url="http://config.privoxy.org/"/> or <ulink url="http://p.p"/>. If Privoxy is installed properly, you will be able to configure it in detail; if not you will see an error message. </para></listitem><listitem><para>If you are using a laptop that occasionally has to connect through other routers than yours with the FreedomBox and Privoxy, you may want to install a proxy switch add-on that allows you to easily turn the proxy on or off.  </para></listitem></orderedlist></section><section><title>Advanced Users</title><orderedlist numeration="arabic"><listitem><para>The default installation should provide a reasonable starting point for most. There will undoubtedly be occasions where you will want to adjust the configuration, that can be dealt with as the need arises.  </para></listitem><listitem><para>While using Privoxy, you can see its configuration details and documentation at <ulink url="http://config.privoxy.org/"/> or <ulink url="http://p.p"/>. </para></listitem><listitem><para>To enable changing these configurations, you first have to change the value of <code>enable-edit-actions</code> in <code>/etc/privoxy/config</code> to <code>1</code>. Before doing so, read carefully the manual, especially:    </para><itemizedlist><listitem override="none"><para><emphasis>Access to the editor can not be controlled separately by &quot;ACLs&quot; or HTTP authentication, so that everybody who can access Privoxy can modify its configuration for all users. This option is not recommended for environments with untrusted users. Note that malicious client side code (e.g Java) is also capable of using the actions editor and you shouldn't enable this options unless you understand the consequences and are sure your browser is configured correctly.</emphasis> </para></listitem></itemizedlist></listitem><listitem><para>Now you find an <code>EDIT</code> button on the configuration screen in <code>http://config.privoxy.org/</code>. </para></listitem><listitem><para>The <ulink url="http://www.privoxy.org/user-manual/quickstart.html">Quickstart</ulink> is a good starting point to read on how to define own blocking and filtering rules. </para></listitem></orderedlist><!--rule (<hr>) is not applicable to DocBook--><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Privoxy/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Quassel.raw.xml b/doc/Quassel.raw.xml
index cd2ac990f..fb51e9b86 100644
--- a/doc/Quassel.raw.xml
+++ b/doc/Quassel.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Quassel</title><revhistory><revision><revnumber>7</revnumber><date>2019-05-10 23:05:32</date><authorinitials>JamesValleroy</authorinitials><revremark>use standard text for port forwarding</revremark></revision><revision><revnumber>6</revnumber><date>2019-02-27 21:34:38</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Grammar corrections and clarification about port forwarding</revremark></revision><revision><revnumber>5</revnumber><date>2018-10-04 02:01:15</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add screenshots to the Quassel Client section</revremark></revision><revision><revnumber>4</revnumber><date>2018-10-04 01:26:35</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Refactor information on how to connect to core using desktop client</revremark></revision><revision><revnumber>3</revnumber><date>2018-03-11 03:00:04</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized image</revremark></revision><revision><revnumber>2</revnumber><date>2016-08-18 17:30:28</date><authorinitials>Drahtseil</authorinitials><revremark>wording, screen-shots</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-17 20:09:38</date><authorinitials>Drahtseil</authorinitials><revremark>page creation; not sure about the configuration of quassel-client (too long ago); screenshots to follow</revremark></revision></revhistory></articleinfo><section><title>IRC Client (Quassel)</title><para><emphasis>Quassel</emphasis> is an IRC application that is split into two parts, a &quot;core&quot; and a &quot;client&quot;. This allows the core to remain connected to IRC servers, and to continue receiving messages, even when the client is disconnected. FreedomBox can run the Quassel core service keeping you always online and one or more Quassel clients from a desktop or a mobile device can be used to connect and disconnect from it. </para><section><title>Why run Quassel?</title><para>Many discussions about FreedomBox are being done on the IRC-Channel <code>irc://irc.debian.org/freedombox</code>. If your FreedomBox is running <emphasis>Quassel</emphasis>, it will collect all discussions while you are away, such as responses to your questions. Remember, the FreedomBox project is a worldwide project with people from nearly every time zone. You use your <emphasis>client</emphasis> to connect to the <emphasis>Quassel</emphasis> core to read and respond whenever you have time and are available. </para></section><section><title>How to setup Quassel?</title><itemizedlist><listitem><para>Within Plinth </para><orderedlist numeration="arabic"><listitem><para>select <emphasis>Applications</emphasis> </para></listitem><listitem><para>go to <emphasis>IRC Client (Quassel)</emphasis> and  </para></listitem><listitem><para>install the application and make sure it is enabled </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=Quassel_Installation.png" width="800"/></imageobject><textobject><phrase>Quassel Installation</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>now your Quassel core is running </para></listitem></orderedlist></listitem></itemizedlist></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for Quassel: </para><itemizedlist><listitem><para>TCP 4242 </para></listitem><listitem><para>Example configuration in router: </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=Quassel_PortForwarding.png"/></imageobject><textobject><phrase>Quassel_PortForwarding.png</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem></itemizedlist></section><section><title>Clients</title><para>Clients to connect to Quassel from your <ulink url="http://quassel-irc.org/downloads">desktop</ulink> and <ulink url="http://quasseldroid.iskrembilen.com/">mobile</ulink> devices are available. </para><section><title>Desktop</title><para>In a Debian system, you can e.g. use <ulink url="https://packages.debian.org/search?keywords=quassel-client">quassel-client</ulink>. The following steps describe how to connect Quassel Client with Quassel Core running on a FreedomBox. The first time you do this connection, Quassel Core will be initialized too. </para><orderedlist numeration="arabic"><listitem><para>Launch Quassel Client. You will be greeted with a wizard to <code>Connect to Core</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-1-connect-to-core.png" width="394"/></imageobject><textobject><phrase>Connect to Core</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Click the <code>Add</code> button to launch <code>Add Core Account</code> dialog. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-2-add-core-account.png" width="382"/></imageobject><textobject><phrase>Add Core Account</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Fill any value in the <code>Account Name</code> field. Fill proper DNS hostname of your FreedomBox in <code>Hostname</code> filed. <code>Port</code> field must have the value <code>4242</code>. Provide the username and password of the account you wish to create to connect to the Quassel Core in the <code>User</code> and <code>Password</code> fields. Choose <code>Remember</code> if don't wish to be prompted for a password every time you launch Quassel client. </para></listitem><listitem><para>After pressing <code>OK</code> in the <code>Add Core Account</code> dialog, you should see the core account in the <code>Connect to Core</code> dialog. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-3-connect-to-core.png" width="394"/></imageobject><textobject><phrase>Connect to Core</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Select the newly created core account and select <code>OK</code> to connect to it. </para></listitem><listitem><para>If this is the first time you are connecting to this core. You will see an <code>Untrusted Security Certificate</code> warning and need to accept the server certificate. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-4-untrusted-security-certficate.png" width="504"/></imageobject><textobject><phrase>Untrusted Security Certificate</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Select <code>Continue</code>. Then you will be asked if you wish to accept the certificate permanently. Select <code>Forever</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-5-untrusted-security-certificate.png" width="434"/></imageobject><textobject><phrase>Untrusted Security Certificate</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>If this Quassel Core has not been connected to before, you will then see a <code>Core Configuration Wizard</code>. Select <code>Next</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-6-core-configuration-wizard.png" width="504"/></imageobject><textobject><phrase>Core Configuration Wizard</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In the <code>Create Admin User</code> page, enter the username and password you have used earlier to create the core connection. Select <code>Remember password</code> to remember this password for future sessions. Click <code>Next</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-7-create-admin-user.png" width="504"/></imageobject><textobject><phrase>Create Admin User Page</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In the <code>Select Storage Backend</code> page, select <code>SQLite</code> and click <code>Commit</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-8-select-storage-backend.png" width="504"/></imageobject><textobject><phrase>Select Storage Backend</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>The core configuration is then complete and you will see a <code>Quassel IRC</code> wizard to configure your IRC connections. Click <code>Next</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-9-welcome-wizard.png" width="504"/></imageobject><textobject><phrase>Welcome Wizard</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In <code>Setup Identity</code> page next, provide a name and multiple nicknames. This is how you present yourself to other users on IRC. It is not necessary to give your real world name. Multiple nicknames are useful as fallback nicknames when the first nickname can't be used for some reason. After providing the information click <code>Next</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-10-setup-identity.png" width="504"/></imageobject><textobject><phrase>Setup Identity</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In <code>Setup Network Connection</code> page next, provide a network name of your choice. Next provide a list of servers to which Quassel Core should connect to in order to join this IRC network (such as irc.debian.org:6667). </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-11-setup-network-connection.png" width="504"/></imageobject><textobject><phrase>Setup Network Connection</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Select the server in the servers list and click <code>Edit</code>. In the <code>Server Info</code> dialog, set the port <code>6697</code> (consult your network's documentation for actual list of servers and their secure ports) and click <code>Use SSL</code>. Click <code>OK</code>. This is to ensure that communication between your FreedomBox and the IRC network server is encrypted. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-12-server-info.png" width="390"/></imageobject><textobject><phrase>Server Info</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-13-server-info-ssl.png" width="390"/></imageobject><textobject><phrase>Server Info SSL</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Back in the <code>Setup Network Connection</code> dialog, provide a list of IRC channels (such as #freedombox) to join upon connecting to the network. Click <code>Save &amp; Connect</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-14-setup-network-connection.png" width="504"/></imageobject><textobject><phrase>Setup Network Connection</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>You should connect to the network and see the list of channels you have joined on the <code>All Chats</code> pane on the left of the Quassel Client main window. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-15-quassel-main.png" width="644"/></imageobject><textobject><phrase>Quassel Main Window</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Select a channel and start seeing messages from others in the channel and send your own messages. </para></listitem></orderedlist></section><section><title>Android</title><para>For Android devices you may use e.g. <emphasis>Quasseldroid</emphasis> from <ulink url="https://f-droid.org/repository/browse/?fdfilter=quassel&amp;fdid=com.iskrembilen.quasseldroid">F-Droid</ulink> </para><itemizedlist><listitem><para>enter core, username etc. as above </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=Quasseldroid.png"/></imageobject><textobject><phrase>Quasseldroid.png</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem></itemizedlist><para>By the way, the German verb <emphasis>quasseln</emphasis> means <emphasis>talking a lot</emphasis>, to <emphasis>jabber</emphasis>. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Quassel</title><revhistory><revision><revnumber>7</revnumber><date>2019-05-10 23:05:32</date><authorinitials>JamesValleroy</authorinitials><revremark>use standard text for port forwarding</revremark></revision><revision><revnumber>6</revnumber><date>2019-02-27 21:34:38</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Grammar corrections and clarification about port forwarding</revremark></revision><revision><revnumber>5</revnumber><date>2018-10-04 02:01:15</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add screenshots to the Quassel Client section</revremark></revision><revision><revnumber>4</revnumber><date>2018-10-04 01:26:35</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Refactor information on how to connect to core using desktop client</revremark></revision><revision><revnumber>3</revnumber><date>2018-03-11 03:00:04</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized image</revremark></revision><revision><revnumber>2</revnumber><date>2016-08-18 17:30:28</date><authorinitials>Drahtseil</authorinitials><revremark>wording, screen-shots</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-17 20:09:38</date><authorinitials>Drahtseil</authorinitials><revremark>page creation; not sure about the configuration of quassel-client (too long ago); screenshots to follow</revremark></revision></revhistory></articleinfo><section><title>IRC Client (Quassel)</title><para><emphasis>Quassel</emphasis> is an IRC application that is split into two parts, a &quot;core&quot; and a &quot;client&quot;. This allows the core to remain connected to IRC servers, and to continue receiving messages, even when the client is disconnected. FreedomBox can run the Quassel core service keeping you always online and one or more Quassel clients from a desktop or a mobile device can be used to connect and disconnect from it. </para><section><title>Why run Quassel?</title><para>Many discussions about FreedomBox are being done on the IRC-Channel <code>irc://irc.debian.org/freedombox</code>. If your FreedomBox is running <emphasis>Quassel</emphasis>, it will collect all discussions while you are away, such as responses to your questions. Remember, the FreedomBox project is a worldwide project with people from nearly every time zone. You use your <emphasis>client</emphasis> to connect to the <emphasis>Quassel</emphasis> core to read and respond whenever you have time and are available. </para></section><section><title>How to setup Quassel?</title><itemizedlist><listitem><para>Within Plinth </para><orderedlist numeration="arabic"><listitem><para>select <emphasis>Applications</emphasis> </para></listitem><listitem><para>go to <emphasis>IRC Client (Quassel)</emphasis> and  </para></listitem><listitem><para>install the application and make sure it is enabled </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=Quassel_Installation.png" width="800"/></imageobject><textobject><phrase>Quassel Installation</phrase></textobject></inlinemediaobject> </para></listitem><listitem><para>now your Quassel core is running </para></listitem></orderedlist></listitem></itemizedlist></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for Quassel: </para><itemizedlist><listitem><para>TCP 4242 </para></listitem><listitem><para>Example configuration in router: </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=Quassel_PortForwarding.png"/></imageobject><textobject><phrase>Quassel_PortForwarding.png</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem></itemizedlist></section><section><title>Clients</title><para>Clients to connect to Quassel from your <ulink url="http://quassel-irc.org/downloads">desktop</ulink> and <ulink url="http://quasseldroid.iskrembilen.com/">mobile</ulink> devices are available. </para><section><title>Desktop</title><para>In a Debian system, you can e.g. use <ulink url="https://packages.debian.org/search?keywords=quassel-client">quassel-client</ulink>. The following steps describe how to connect Quassel Client with Quassel Core running on a FreedomBox. The first time you do this connection, Quassel Core will be initialized too. </para><orderedlist numeration="arabic"><listitem><para>Launch Quassel Client. You will be greeted with a wizard to <code>Connect to Core</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-1-connect-to-core.png" width="394"/></imageobject><textobject><phrase>Connect to Core</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Click the <code>Add</code> button to launch <code>Add Core Account</code> dialog. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-2-add-core-account.png" width="382"/></imageobject><textobject><phrase>Add Core Account</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Fill any value in the <code>Account Name</code> field. Fill proper DNS hostname of your FreedomBox in <code>Hostname</code> filed. <code>Port</code> field must have the value <code>4242</code>. Provide the username and password of the account you wish to create to connect to the Quassel Core in the <code>User</code> and <code>Password</code> fields. Choose <code>Remember</code> if don't wish to be prompted for a password every time you launch Quassel client. </para></listitem><listitem><para>After pressing <code>OK</code> in the <code>Add Core Account</code> dialog, you should see the core account in the <code>Connect to Core</code> dialog. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-3-connect-to-core.png" width="394"/></imageobject><textobject><phrase>Connect to Core</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Select the newly created core account and select <code>OK</code> to connect to it. </para></listitem><listitem><para>If this is the first time you are connecting to this core. You will see an <code>Untrusted Security Certificate</code> warning and need to accept the server certificate. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-4-untrusted-security-certficate.png" width="504"/></imageobject><textobject><phrase>Untrusted Security Certificate</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Select <code>Continue</code>. Then you will be asked if you wish to accept the certificate permanently. Select <code>Forever</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-5-untrusted-security-certificate.png" width="434"/></imageobject><textobject><phrase>Untrusted Security Certificate</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>If this Quassel Core has not been connected to before, you will then see a <code>Core Configuration Wizard</code>. Select <code>Next</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-6-core-configuration-wizard.png" width="504"/></imageobject><textobject><phrase>Core Configuration Wizard</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In the <code>Create Admin User</code> page, enter the username and password you have used earlier to create the core connection. Select <code>Remember password</code> to remember this password for future sessions. Click <code>Next</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-7-create-admin-user.png" width="504"/></imageobject><textobject><phrase>Create Admin User Page</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In the <code>Select Storage Backend</code> page, select <code>SQLite</code> and click <code>Commit</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-8-select-storage-backend.png" width="504"/></imageobject><textobject><phrase>Select Storage Backend</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>The core configuration is then complete and you will see a <code>Quassel IRC</code> wizard to configure your IRC connections. Click <code>Next</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-9-welcome-wizard.png" width="504"/></imageobject><textobject><phrase>Welcome Wizard</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In <code>Setup Identity</code> page next, provide a name and multiple nicknames. This is how you present yourself to other users on IRC. It is not necessary to give your real world name. Multiple nicknames are useful as fallback nicknames when the first nickname can't be used for some reason. After providing the information click <code>Next</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-10-setup-identity.png" width="504"/></imageobject><textobject><phrase>Setup Identity</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>In <code>Setup Network Connection</code> page next, provide a network name of your choice. Next provide a list of servers to which Quassel Core should connect to in order to join this IRC network (such as irc.debian.org:6667). </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-11-setup-network-connection.png" width="504"/></imageobject><textobject><phrase>Setup Network Connection</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Select the server in the servers list and click <code>Edit</code>. In the <code>Server Info</code> dialog, set the port <code>6697</code> (consult your network's documentation for actual list of servers and their secure ports) and click <code>Use SSL</code>. Click <code>OK</code>. This is to ensure that communication between your FreedomBox and the IRC network server is encrypted. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-12-server-info.png" width="390"/></imageobject><textobject><phrase>Server Info</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-13-server-info-ssl.png" width="390"/></imageobject><textobject><phrase>Server Info SSL</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Back in the <code>Setup Network Connection</code> dialog, provide a list of IRC channels (such as #freedombox) to join upon connecting to the network. Click <code>Save &amp; Connect</code>. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-14-setup-network-connection.png" width="504"/></imageobject><textobject><phrase>Setup Network Connection</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>You should connect to the network and see the list of channels you have joined on the <code>All Chats</code> pane on the left of the Quassel Client main window. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=quassel-client-15-quassel-main.png" width="644"/></imageobject><textobject><phrase>Quassel Main Window</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Select a channel and start seeing messages from others in the channel and send your own messages. </para></listitem></orderedlist></section><section><title>Android</title><para>For Android devices you may use e.g. <emphasis>Quasseldroid</emphasis> from <ulink url="https://f-droid.org/repository/browse/?fdfilter=quassel&amp;fdid=com.iskrembilen.quasseldroid">F-Droid</ulink> </para><itemizedlist><listitem><para>enter core, username etc. as above </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Quassel?action=AttachFile&amp;do=get&amp;target=Quasseldroid.png"/></imageobject><textobject><phrase>Quasseldroid.png</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem></itemizedlist><para>By the way, the German verb <emphasis>quasseln</emphasis> means <emphasis>talking a lot</emphasis>, to <emphasis>jabber</emphasis>. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Quassel/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></article>
\ No newline at end of file
diff --git a/doc/Radicale.raw.xml b/doc/Radicale.raw.xml
index 88ff1ebfc..84bf93dc1 100644
--- a/doc/Radicale.raw.xml
+++ b/doc/Radicale.raw.xml
@@ -26,4 +26,4 @@ chown -R radicale:radicale /var/lib/radicale/collections/collection-root/
 apt remove -y python-radicale
 if [ -f /etc/radicale/config.dpkg-dist ] ; then cp /etc/radicale/config.dpkg-dist /etc/radicale/config ; fi
 if [ -f /etc/default/radicale.dpkg-dist ] ; then cp /etc/default/radicale.dpkg-dist /etc/default/radicale ; fi
-(After FreedomBox 19.1 is available, goto FreedomBox web interface and set your preference for calendar sharing again, if it is not the default option, as it will have been lost.)]]></screen><para>Notes: </para><itemizedlist><listitem><para>python-radicale is an old package from radicale 1.x version that is still available in testing. This is a hack to use the <code>--export-storage</code> feature that is responsible for data migration. This feature is not available in radicale 2.x unfortunately. </para></listitem><listitem><para>Files ending with .dpkg-dist will exist only if you have chosen 'Keep your currently-installed version' when prompted for configuration file override during radicale 2.x upgrade. The above process will overwrite the old configuration with new fresh configuration. No changes are necessary to the two configuration files unless you have changed the setting for sharing calendars. </para></listitem><listitem><para>Note that during the migration, your data is safe in /var/lib/radicale/collections directory. New data will be created and used in /var/lib/radicale/collections/collections-root/ directory. </para></listitem><listitem><para>The tar command takes a backup your configuration and data in /root/radicale_backup.tgz in case you do something goes wrong and you want to undo the changes. </para></listitem></itemizedlist></section><section><title>Troubleshooting</title><para>1. If you are using FreedomBox Pioneer Edition or installing FreedomBox on Debian Buster, then radicale may not be usable immediately after installation. This is due to a bug which has been fixed later. To overcome the problem, upgrade FreedomBox by clicking on 'Manual Update' from 'Updates' app. Otherwise, simply wait a day or two and let FreedomBox upgrade itself. After that install radicale. If radicale is already installed, disable and re-enable it after the update is completed. This will fix the problem and get radicale working properly. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+(After FreedomBox 19.1 is available, goto FreedomBox web interface and set your preference for calendar sharing again, if it is not the default option, as it will have been lost.)]]></screen><para>Notes: </para><itemizedlist><listitem><para>python-radicale is an old package from radicale 1.x version that is still available in testing. This is a hack to use the <code>--export-storage</code> feature that is responsible for data migration. This feature is not available in radicale 2.x unfortunately. </para></listitem><listitem><para>Files ending with .dpkg-dist will exist only if you have chosen 'Keep your currently-installed version' when prompted for configuration file override during radicale 2.x upgrade. The above process will overwrite the old configuration with new fresh configuration. No changes are necessary to the two configuration files unless you have changed the setting for sharing calendars. </para></listitem><listitem><para>Note that during the migration, your data is safe in /var/lib/radicale/collections directory. New data will be created and used in /var/lib/radicale/collections/collections-root/ directory. </para></listitem><listitem><para>The tar command takes a backup your configuration and data in /root/radicale_backup.tgz in case you do something goes wrong and you want to undo the changes. </para></listitem></itemizedlist></section><section><title>Troubleshooting</title><para>1. If you are using FreedomBox Pioneer Edition or installing FreedomBox on Debian Buster, then radicale may not be usable immediately after installation. This is due to a bug which has been fixed later. To overcome the problem, upgrade FreedomBox by clicking on 'Manual Update' from 'Updates' app. Otherwise, simply wait a day or two and let FreedomBox upgrade itself. After that install radicale. If radicale is already installed, disable and re-enable it after the update is completed. This will fix the problem and get radicale working properly. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Radicale/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Repro.raw.xml b/doc/Repro.raw.xml
index 788cd6d29..65f188a72 100644
--- a/doc/Repro.raw.xml
+++ b/doc/Repro.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Repro</title><revhistory><revision><revnumber>8</revnumber><date>2019-02-26 23:26:49</date><authorinitials>JamesValleroy</authorinitials><revremark>remove content from manual</revremark></revision><revision><revnumber>7</revnumber><date>2019-02-26 23:25:03</date><authorinitials>JamesValleroy</authorinitials><revremark>add note about removal</revremark></revision><revision><revnumber>6</revnumber><date>2017-01-02 13:43:51</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>5</revnumber><date>2016-12-31 03:57:09</date><authorinitials>JamesValleroy</authorinitials><revremark>add basic info</revremark></revision><revision><revnumber>4</revnumber><date>2016-12-26 18:56:31</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshots</revremark></revision><revision><revnumber>3</revnumber><date>2016-05-27 17:24:23</date><authorinitials>JamesValleroy</authorinitials><revremark>add footer</revremark></revision><revision><revnumber>2</revnumber><date>2016-05-27 17:21:48</date><authorinitials>JamesValleroy</authorinitials><revremark>Renamed from 'FreedomBox/Manual/repro'.</revremark></revision><revision><revnumber>1</revnumber><date>2016-05-15 19:03:02</date><authorinitials>JamesValleroy</authorinitials><revremark>start page</revremark></revision></revhistory></articleinfo><section><title>SIP Server (repro)</title><caution><para><emphasis role="strong">App removed</emphasis> </para><para>repro has been removed from Debian 10 (Buster), and therefore is no longer available in FreedomBox. </para></caution><para>repro is a server for SIP, a standard that enables Voice-over-IP calls. A desktop or mobile SIP client is required to use repro. </para><section><title>How to set up the SIP server</title><orderedlist numeration="arabic"><listitem><para>Configure the domain at /repro/domains.html on the FreedomBox. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Repro?action=AttachFile&amp;do=get&amp;target=repro_domains.png" width="800"/></imageobject><textobject><phrase>Repro Domains</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Add users at /repro/addUser.html. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Repro?action=AttachFile&amp;do=get&amp;target=repro_users.png" width="800"/></imageobject><textobject><phrase>Repro Users</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Disable and re-enable the repro application in Plinth. </para></listitem></orderedlist></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for repro: </para><itemizedlist><listitem><para>TCP 5060 </para></listitem><listitem><para>TCP 5061 </para></listitem><listitem><para>UDP 5060 </para></listitem><listitem><para>UDP 5061 </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Repro</title><revhistory><revision><revnumber>8</revnumber><date>2019-02-26 23:26:49</date><authorinitials>JamesValleroy</authorinitials><revremark>remove content from manual</revremark></revision><revision><revnumber>7</revnumber><date>2019-02-26 23:25:03</date><authorinitials>JamesValleroy</authorinitials><revremark>add note about removal</revremark></revision><revision><revnumber>6</revnumber><date>2017-01-02 13:43:51</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>5</revnumber><date>2016-12-31 03:57:09</date><authorinitials>JamesValleroy</authorinitials><revremark>add basic info</revremark></revision><revision><revnumber>4</revnumber><date>2016-12-26 18:56:31</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshots</revremark></revision><revision><revnumber>3</revnumber><date>2016-05-27 17:24:23</date><authorinitials>JamesValleroy</authorinitials><revremark>add footer</revremark></revision><revision><revnumber>2</revnumber><date>2016-05-27 17:21:48</date><authorinitials>JamesValleroy</authorinitials><revremark>Renamed from 'FreedomBox/Manual/repro'.</revremark></revision><revision><revnumber>1</revnumber><date>2016-05-15 19:03:02</date><authorinitials>JamesValleroy</authorinitials><revremark>start page</revremark></revision></revhistory></articleinfo><section><title>SIP Server (repro)</title><caution><para><emphasis role="strong">App removed</emphasis> </para><para>repro has been removed from Debian 10 (Buster), and therefore is no longer available in FreedomBox. </para></caution><para>repro is a server for SIP, a standard that enables Voice-over-IP calls. A desktop or mobile SIP client is required to use repro. </para><section><title>How to set up the SIP server</title><orderedlist numeration="arabic"><listitem><para>Configure the domain at /repro/domains.html on the FreedomBox. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Repro?action=AttachFile&amp;do=get&amp;target=repro_domains.png" width="800"/></imageobject><textobject><phrase>Repro Domains</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Add users at /repro/addUser.html. </para><itemizedlist><listitem override="none"><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Repro?action=AttachFile&amp;do=get&amp;target=repro_users.png" width="800"/></imageobject><textobject><phrase>Repro Users</phrase></textobject></inlinemediaobject> </para></listitem></itemizedlist></listitem><listitem><para>Disable and re-enable the repro application in Plinth. </para></listitem></orderedlist></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for repro: </para><itemizedlist><listitem><para>TCP 5060 </para></listitem><listitem><para>TCP 5061 </para></listitem><listitem><para>UDP 5060 </para></listitem><listitem><para>UDP 5061 </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Repro/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Roundcube.raw.xml b/doc/Roundcube.raw.xml
index b922fafb1..d7f84b26c 100644
--- a/doc/Roundcube.raw.xml
+++ b/doc/Roundcube.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Roundcube</title><revhistory><revision><revnumber>8</revnumber><date>2019-03-13 21:13:00</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor formatting.</revremark></revision><revision><revnumber>7</revnumber><date>2019-03-13 21:11:10</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about how to login to Roundcube</revremark></revision><revision><revnumber>6</revnumber><date>2016-12-31 03:41:20</date><authorinitials>JamesValleroy</authorinitials><revremark>add link</revremark></revision><revision><revnumber>5</revnumber><date>2016-09-01 19:12:35</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>4</revnumber><date>2016-04-10 07:25:23</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-15 19:04:22</date><authorinitials>PhilippeBaret</authorinitials><revremark>Text finishing</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 19:03:29</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added ## END_INCLUDE</revremark></revision><revision><revnumber>1</revnumber><date>2015-12-15 19:02:17</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Rouncube page with definition</revremark></revision></revhistory></articleinfo><section><title>Email Client (Roundcube)</title><section><title>What is Roundcube?</title><para>Roundcube is a browser-based multilingual email client with an application-like user interface. Roundcube is using the Internet Message Access Protocol (IMAP) to access e-mail on a remote mail server. It supports MIME to send files, and provides particularly address book, folder management, message searching and spell checking. </para></section><section><title>Using Roundcube</title><para>After Roundcube is installed, it can be accessed at <code>https://&lt;your freedombox&gt;/roundcube</code>. Enter your username and password. The username for many mail services will be the full email address such as <emphasis><ulink url="mailto:exampleuser@example.org">exampleuser@example.org</ulink></emphasis> and not just the username like <emphasis>exampleuser</emphasis>. Enter the address of your email service's IMAP server address in the <emphasis>Server</emphasis> field. You can try providing your domain name here such as <emphasis>example.org</emphasis> for email address <emphasis><ulink url="mailto:exampleuser@example.org">exampleuser@example.org</ulink></emphasis> and if this does not work, consult your email provider's documentation for the address of the IMAP server. Using encrypted connection to your IMAP server is strongly recommended. To do this, prepend 'imaps://' at the beginning of your IMAP server address. For example, <emphasis>imaps://imap.example.org</emphasis>. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Roundcube?action=AttachFile&amp;do=get&amp;target=roundcube-riseup.png" width="606"/></imageobject><textobject><phrase>Logging into your IMAP server</phrase></textobject></inlinemediaobject> </para></section><section><title>Using Gmail with Roundcube</title><para>If you wish to use Roundcube with your Gmail account, you need to first enable support for password based login in your Google account preferences. This is because Gmail won't allow applications to login with a password by default. To do this, visit <ulink url="https://www.google.com/settings/security/lesssecureapps">Google Account preferences</ulink> and enable <emphasis>Less Secure Apps</emphasis>. After this, login to Roundcube by providing your Gmail address as <emphasis>Username</emphasis>, your password and in the server field use <emphasis>imaps://imap.gmail.com</emphasis>. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Roundcube?action=AttachFile&amp;do=get&amp;target=roundcube-gmail.png" width="606"/></imageobject><textobject><phrase>Logging into Gmail</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Roundcube</title><revhistory><revision><revnumber>8</revnumber><date>2019-03-13 21:13:00</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor formatting.</revremark></revision><revision><revnumber>7</revnumber><date>2019-03-13 21:11:10</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about how to login to Roundcube</revremark></revision><revision><revnumber>6</revnumber><date>2016-12-31 03:41:20</date><authorinitials>JamesValleroy</authorinitials><revremark>add link</revremark></revision><revision><revnumber>5</revnumber><date>2016-09-01 19:12:35</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>4</revnumber><date>2016-04-10 07:25:23</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-15 19:04:22</date><authorinitials>PhilippeBaret</authorinitials><revremark>Text finishing</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 19:03:29</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added ## END_INCLUDE</revremark></revision><revision><revnumber>1</revnumber><date>2015-12-15 19:02:17</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Rouncube page with definition</revremark></revision></revhistory></articleinfo><section><title>Email Client (Roundcube)</title><section><title>What is Roundcube?</title><para>Roundcube is a browser-based multilingual email client with an application-like user interface. Roundcube is using the Internet Message Access Protocol (IMAP) to access e-mail on a remote mail server. It supports MIME to send files, and provides particularly address book, folder management, message searching and spell checking. </para></section><section><title>Using Roundcube</title><para>After Roundcube is installed, it can be accessed at <code>https://&lt;your freedombox&gt;/roundcube</code>. Enter your username and password. The username for many mail services will be the full email address such as <emphasis><ulink url="mailto:exampleuser@example.org">exampleuser@example.org</ulink></emphasis> and not just the username like <emphasis>exampleuser</emphasis>. Enter the address of your email service's IMAP server address in the <emphasis>Server</emphasis> field. You can try providing your domain name here such as <emphasis>example.org</emphasis> for email address <emphasis><ulink url="mailto:exampleuser@example.org">exampleuser@example.org</ulink></emphasis> and if this does not work, consult your email provider's documentation for the address of the IMAP server. Using encrypted connection to your IMAP server is strongly recommended. To do this, prepend 'imaps://' at the beginning of your IMAP server address. For example, <emphasis>imaps://imap.example.org</emphasis>. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Roundcube?action=AttachFile&amp;do=get&amp;target=roundcube-riseup.png" width="606"/></imageobject><textobject><phrase>Logging into your IMAP server</phrase></textobject></inlinemediaobject> </para></section><section><title>Using Gmail with Roundcube</title><para>If you wish to use Roundcube with your Gmail account, you need to first enable support for password based login in your Google account preferences. This is because Gmail won't allow applications to login with a password by default. To do this, visit <ulink url="https://www.google.com/settings/security/lesssecureapps">Google Account preferences</ulink> and enable <emphasis>Less Secure Apps</emphasis>. After this, login to Roundcube by providing your Gmail address as <emphasis>Username</emphasis>, your password and in the server field use <emphasis>imaps://imap.gmail.com</emphasis>. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Roundcube?action=AttachFile&amp;do=get&amp;target=roundcube-gmail.png" width="606"/></imageobject><textobject><phrase>Logging into Gmail</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Roundcube/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Searx.raw.xml b/doc/Searx.raw.xml
index 23e6c6e98..a77e18d02 100644
--- a/doc/Searx.raw.xml
+++ b/doc/Searx.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Searx</title><revhistory><revision><revnumber>8</revnumber><date>2019-05-22 17:08:56</date><authorinitials>David Jones</authorinitials><revremark>Added information that SearX is accessible via Tor.</revremark></revision><revision><revnumber>7</revnumber><date>2018-11-01 09:17:25</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add ToC</revremark></revision><revision><revnumber>6</revnumber><date>2018-03-08 15:08:44</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add screenshot. Remove last 20 seconds from screencast to reduce size.</revremark></revision><revision><revnumber>5</revnumber><date>2018-03-08 14:23:24</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add query param to make the video play within the browser</revremark></revision><revision><revnumber>4</revnumber><date>2018-03-07 20:43:27</date><authorinitials>Drahtseil</authorinitials></revision><revision><revnumber>3</revnumber><date>2018-03-07 20:37:05</date><authorinitials>Drahtseil</authorinitials><revremark>Screencast of the installation and first steps</revremark></revision><revision><revnumber>2</revnumber><date>2018-02-26 17:15:26</date><authorinitials>JamesValleroy</authorinitials><revremark>included in 0.24</revremark></revision><revision><revnumber>1</revnumber><date>2018-02-22 12:12:50</date><authorinitials>JosephNuthalapati</authorinitials><revremark>searx: Initial draft</revremark></revision></revhistory></articleinfo><section><title>Web Search (Searx)</title><section><title>About Searx</title><para>Searx is a <ulink url="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</ulink>. A metasearch engine aggregates the results from various search engines and presents them in a unified interface. </para><para>Read more about Searx on their <ulink url="https://asciimoo.github.io/searx/">official website</ulink>. </para><para><emphasis role="strong">Available since:</emphasis>  version 0.24.0 </para></section><section><title>Screenshot</title><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Searx?action=AttachFile&amp;do=get&amp;target=searx-screenshot.png" width="800"/></imageobject><textobject><phrase>Searx Screenshot</phrase></textobject></inlinemediaobject> </para></section><section><title>Screencast</title><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Manual/Searx?action=AttachFile&amp;do=get&amp;target=Searx.webm">Searx installation and first steps</ulink> (14 MB) </para></section><section><title>Why use Searx?</title><section><title>Personalization and Filter Bubbles</title><para>Search engines have the ability to profile users and serve results most relevant to them, putting people into <ulink url="https://en.wikipedia.org/wiki/Filter_bubble">filter bubbles</ulink>, thus distorting people's view of the world. Search engines have a financial incentive to serve interesting advertisements to their users, increasing their chances of clicking on the advertisements. </para><para>A metasearch engine is a possible solution to this problem, as it aggregates results from multiple search engines thus bypassing personalization attempts by search engines.  </para><para>Searx avoids storing cookies from search engines as a means of preventing tracking and profiling by search engines. </para></section><section><title>Advertisement filtering</title><para>Searx filters out advertisements from the search results before serving the results, thus increasing relevance the of your search results and saving you from distractions. </para></section><section><title>Privacy</title><para>Searx uses HTTP POST instead of GET by default to send your search queries to the <ulink url="https://en.wikipedia.org/wiki/Web_search_engine">search engines</ulink>, so that anyone snooping your traffic wouldn't be able to read your queries. The search queries wouldn't stored in browser history either.  </para><para><emphasis role="strong">Note:</emphasis> Searx used from Chrome browser's omnibar would make GET requests instead of POST. </para></section></section><section><title>Searx on FreedomBox</title><itemizedlist><listitem><para>Searx on FreedomBox uses Single Sign On. This means that you should be logged in into your FreedomBox in the browser that you're using Searx.  </para></listitem><listitem><para>SearX is easily accessible via Tor. </para></listitem><listitem><para>Searx can be added as a search engine to the Firefox browser's search bar. See <ulink url="https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox">Firefox Help</ulink> on this topic. Once Searx is added, you can also set it as your default search engine. </para></listitem><listitem><para>Searx also offers search results in csv, json and rss formats, which can be used with scripts to automate some tasks. </para></listitem></itemizedlist><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Searx</title><revhistory><revision><revnumber>8</revnumber><date>2019-05-22 17:08:56</date><authorinitials>David Jones</authorinitials><revremark>Added information that SearX is accessible via Tor.</revremark></revision><revision><revnumber>7</revnumber><date>2018-11-01 09:17:25</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add ToC</revremark></revision><revision><revnumber>6</revnumber><date>2018-03-08 15:08:44</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add screenshot. Remove last 20 seconds from screencast to reduce size.</revremark></revision><revision><revnumber>5</revnumber><date>2018-03-08 14:23:24</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add query param to make the video play within the browser</revremark></revision><revision><revnumber>4</revnumber><date>2018-03-07 20:43:27</date><authorinitials>Drahtseil</authorinitials></revision><revision><revnumber>3</revnumber><date>2018-03-07 20:37:05</date><authorinitials>Drahtseil</authorinitials><revremark>Screencast of the installation and first steps</revremark></revision><revision><revnumber>2</revnumber><date>2018-02-26 17:15:26</date><authorinitials>JamesValleroy</authorinitials><revremark>included in 0.24</revremark></revision><revision><revnumber>1</revnumber><date>2018-02-22 12:12:50</date><authorinitials>JosephNuthalapati</authorinitials><revremark>searx: Initial draft</revremark></revision></revhistory></articleinfo><section><title>Web Search (Searx)</title><section><title>About Searx</title><para>Searx is a <ulink url="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</ulink>. A metasearch engine aggregates the results from various search engines and presents them in a unified interface. </para><para>Read more about Searx on their <ulink url="https://asciimoo.github.io/searx/">official website</ulink>. </para><para><emphasis role="strong">Available since:</emphasis>  version 0.24.0 </para></section><section><title>Screenshot</title><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Searx?action=AttachFile&amp;do=get&amp;target=searx-screenshot.png" width="800"/></imageobject><textobject><phrase>Searx Screenshot</phrase></textobject></inlinemediaobject> </para></section><section><title>Screencast</title><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Manual/Searx?action=AttachFile&amp;do=get&amp;target=Searx.webm">Searx installation and first steps</ulink> (14 MB) </para></section><section><title>Why use Searx?</title><section><title>Personalization and Filter Bubbles</title><para>Search engines have the ability to profile users and serve results most relevant to them, putting people into <ulink url="https://en.wikipedia.org/wiki/Filter_bubble">filter bubbles</ulink>, thus distorting people's view of the world. Search engines have a financial incentive to serve interesting advertisements to their users, increasing their chances of clicking on the advertisements. </para><para>A metasearch engine is a possible solution to this problem, as it aggregates results from multiple search engines thus bypassing personalization attempts by search engines.  </para><para>Searx avoids storing cookies from search engines as a means of preventing tracking and profiling by search engines. </para></section><section><title>Advertisement filtering</title><para>Searx filters out advertisements from the search results before serving the results, thus increasing relevance the of your search results and saving you from distractions. </para></section><section><title>Privacy</title><para>Searx uses HTTP POST instead of GET by default to send your search queries to the <ulink url="https://en.wikipedia.org/wiki/Web_search_engine">search engines</ulink>, so that anyone snooping your traffic wouldn't be able to read your queries. The search queries wouldn't stored in browser history either.  </para><para><emphasis role="strong">Note:</emphasis> Searx used from Chrome browser's omnibar would make GET requests instead of POST. </para></section></section><section><title>Searx on FreedomBox</title><itemizedlist><listitem><para>Searx on FreedomBox uses Single Sign On. This means that you should be logged in into your FreedomBox in the browser that you're using Searx.  </para></listitem><listitem><para>SearX is easily accessible via Tor. </para></listitem><listitem><para>Searx can be added as a search engine to the Firefox browser's search bar. See <ulink url="https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox">Firefox Help</ulink> on this topic. Once Searx is added, you can also set it as your default search engine. </para></listitem><listitem><para>Searx also offers search results in csv, json and rss formats, which can be used with scripts to automate some tasks. </para></listitem></itemizedlist><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Searx/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/SecureShell.raw.xml b/doc/SecureShell.raw.xml
index 9740d3da5..7ea6f22a1 100644
--- a/doc/SecureShell.raw.xml
+++ b/doc/SecureShell.raw.xml
@@ -5,4 +5,4 @@
 <article><articleinfo><title>FreedomBox/Manual/SecureShell</title><revhistory><revision><revnumber>12</revnumber><date>2019-02-26 03:46:55</date><authorinitials>JamesValleroy</authorinitials><revremark>remove wiki links</revremark></revision><revision><revnumber>11</revnumber><date>2018-01-30 07:55:33</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Update GitHub links with Salsa</revremark></revision><revision><revnumber>10</revnumber><date>2017-03-06 23:17:08</date><authorinitials>JamesValleroy</authorinitials><revremark>add note</revremark></revision><revision><revnumber>9</revnumber><date>2016-10-13 21:49:06</date><authorinitials>David Jones</authorinitials><revremark>Added infromation about connecting to the FBX using ssh over Tor</revremark></revision><revision><revnumber>8</revnumber><date>2016-10-13 21:09:31</date><authorinitials>David Jones</authorinitials><revremark>Added information about admin account for first log in to Plinth</revremark></revision><revision><revnumber>7</revnumber><date>2016-09-05 09:42:36</date><authorinitials>ElVirolo</authorinitials><revremark>Removing my previous contribution, as info already present in original version.</revremark></revision><revision><revnumber>6</revnumber><date>2016-09-05 09:39:05</date><authorinitials>ElVirolo</authorinitials></revision><revision><revnumber>5</revnumber><date>2016-09-05 09:26:15</date><authorinitials>ElVirolo</authorinitials><revremark>Added &quot;Users created via Plinth&quot; paragraph</revremark></revision><revision><revnumber>4</revnumber><date>2015-12-21 19:42:10</date><authorinitials>JamesValleroy</authorinitials><revremark>update default account</revremark></revision><revision><revnumber>3</revnumber><date>2015-12-21 19:33:56</date><authorinitials>JamesValleroy</authorinitials><revremark>fix outline level</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 19:31:18</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added definition title</revremark></revision><revision><revnumber>1</revnumber><date>2015-09-16 16:22:37</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>New manual page for secure shell access</revremark></revision></revhistory></articleinfo><section><title>Secure Shell</title><section><title>What is Secure Shell?</title><para>FreedomBox runs <code>openssh-server</code> server by default allowing remote logins from all interfaces.  If your hardware device is connected to a monitor and a keyboard, you may login directly as well.  Regular operation of FreedomBox does not require you to use the shell.  However, some tasks or identifying a problem may require you to login to a shell. </para></section><section><title>Setting Up A User Account</title><section><title>Plinth First Log In: Admin Account</title><para>When creating an account in Plinth for the first time, this user will automatically have administrator capabilities. <code>Admin</code> users are able to log in using ssh (see Logging In below) and have superuser privileges via sudo. </para></section><section><title>Default User Account</title><itemizedlist><listitem><para>Note: If you can access Plinth, then you don't need to do this. You can use the user account created in Plinth to connect to SSH. </para></listitem></itemizedlist><para>The pre-built FreedomBox images have a default user account called &quot;fbx&quot;. However the password is not set for this account, so it will not be possible to log in with this account by default. </para><para>There is a script included in the freedom-maker program, that will allow you to set the password for this account, if it is needed. To set a password for the &quot;fbx&quot; user: </para><para>1. Decompress the image file. </para><para>2. Get a copy of freedom-maker from <ulink url="https://salsa.debian.org/freedombox-team/freedom-maker/"/>. </para><para>3. Run <code>sudo ./bin/passwd-in-image &lt;image-file&gt; fbx</code>. </para><para>4. Copy the image file to SD card and boot device as normal. </para><para>The &quot;fbx&quot; user also has superuser privileges via sudo. </para></section></section><section><title>Logging In</title><section><title>Local</title><para>To login via SSH, to your FreedomBox: </para><screen><![CDATA[$ ssh fbx@freedombox]]></screen><para>Replace <code>fbx</code> with the name of the user you wish to login as.  <code>freedombox</code> should be replaced with the hostname or IP address of you FreedomBox device as found in the <ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Manual/QuickStart#">Quick Start</ulink> process. </para><para><code>fbx</code> is the default user present on FreedomBox with superuser privileges.  Any other user created using Plinth and belonging to the group <code>admin</code> will be able to login.  The <code>root</code> account has no password set and will not be able to login.  Access will be denied to all other users. </para><para><code>fbx</code> and users in <code>admin</code> group will also be able to login on the terminal directly.  Other users will be denied access. </para><para>If you repeatedly try to login as a user and fail, you will be blocked from logging in for some time.  This is due to <code>libpam-abl</code> package that FreedomBox installs by default.  To control this behavior consult <code>libpam-abl</code> documentation. </para></section><section><title>SSH over Tor</title><para>If in Plinth you have enabled hidden services via Tor, you can access your FreedomBox using ssh over Tor. On a GNU/Linux computer, install netcat-openbsd. </para><screen><![CDATA[$ sudo apt-get install netcat-openbsd]]></screen><para>Edit ~/.ssh/config to enable connections over Tor. </para><screen><![CDATA[$ nano ~/.ssh/config]]></screen><para>Add the following: </para><screen><![CDATA[Host *.onion
   user USERNAME
   port 22
-  ProxyCommand nc -X 5 -x 127.0.0.1:9050 %h %p]]></screen><para>Replace USERNAME with, e.g., an <code>admin</code> username (see above). </para><para>Note that in some cases you may need to replace 9050 with 9150. </para><para>Now to connect to the FreedomBox, open a terminal and type: </para><screen><![CDATA[$ ssh USERNAME@ADDRESS.onion]]></screen><para>Replace USERNAME with, e.g., an <code>admin</code> username, and ADDRESS with the hidden service address for your FreedomBox. </para></section></section><section><title>Becoming Superuser</title><para>After logging in, if you want to become the superuser for performing administrative activities: </para><screen><![CDATA[$ sudo su]]></screen><para>Make a habit of logging in as root <emphasis>only when you need to</emphasis>.  If you aren't logged in as root, you can't accidentally break everything. </para><para><anchor id="changingpassword"/> </para></section><section><title>Changing Password</title><para>To change the password of a user managed by Plinth, use the change password page.  However, the <code>fbx</code> default user is not managed by Plinth and its password cannot be changed in the web interface. </para><para>To change password on the terminal, log in to your FreedomBox as the user whose password you want to change. Then, run the following command: </para><screen><![CDATA[$ passwd]]></screen><para>This will ask you for your current password before giving you the opportunity to set a new one. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+  ProxyCommand nc -X 5 -x 127.0.0.1:9050 %h %p]]></screen><para>Replace USERNAME with, e.g., an <code>admin</code> username (see above). </para><para>Note that in some cases you may need to replace 9050 with 9150. </para><para>Now to connect to the FreedomBox, open a terminal and type: </para><screen><![CDATA[$ ssh USERNAME@ADDRESS.onion]]></screen><para>Replace USERNAME with, e.g., an <code>admin</code> username, and ADDRESS with the hidden service address for your FreedomBox. </para></section></section><section><title>Becoming Superuser</title><para>After logging in, if you want to become the superuser for performing administrative activities: </para><screen><![CDATA[$ sudo su]]></screen><para>Make a habit of logging in as root <emphasis>only when you need to</emphasis>.  If you aren't logged in as root, you can't accidentally break everything. </para><para><anchor id="changingpassword"/> </para></section><section><title>Changing Password</title><para>To change the password of a user managed by Plinth, use the change password page.  However, the <code>fbx</code> default user is not managed by Plinth and its password cannot be changed in the web interface. </para><para>To change password on the terminal, log in to your FreedomBox as the user whose password you want to change. Then, run the following command: </para><screen><![CDATA[$ passwd]]></screen><para>This will ask you for your current password before giving you the opportunity to set a new one. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/SecureShell/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Security.raw.xml b/doc/Security.raw.xml
index 5dc98343f..c4fb3f2e8 100644
--- a/doc/Security.raw.xml
+++ b/doc/Security.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Security</title><revhistory><revision><revnumber>2</revnumber><date>2016-08-31 17:40:56</date><authorinitials>Drahtseil</authorinitials><revremark>Screenshot</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-31 17:37:33</date><authorinitials>Drahtseil</authorinitials><revremark>creation</revremark></revision></revhistory></articleinfo><section><title>Security</title><para>When this option is enabled, only users in the &quot;admin&quot; group will be able to log in to console or via SSH. Console users may be able to access some services without further authorization.  </para><para>You can define the group of the users in the <ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Manual/Users#">Users</ulink> section. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Security?action=AttachFile&amp;do=get&amp;target=Security.png"/></imageobject><textobject><phrase>Security.png</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Security</title><revhistory><revision><revnumber>2</revnumber><date>2016-08-31 17:40:56</date><authorinitials>Drahtseil</authorinitials><revremark>Screenshot</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-31 17:37:33</date><authorinitials>Drahtseil</authorinitials><revremark>creation</revremark></revision></revhistory></articleinfo><section><title>Security</title><para>When this option is enabled, only users in the &quot;admin&quot; group will be able to log in to console or via SSH. Console users may be able to access some services without further authorization.  </para><para>You can define the group of the users in the <ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Manual/Users#">Users</ulink> section. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Security?action=AttachFile&amp;do=get&amp;target=Security.png"/></imageobject><textobject><phrase>Security.png</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Security/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/ServiceDiscovery.raw.xml b/doc/ServiceDiscovery.raw.xml
index 979442f48..b675abe13 100644
--- a/doc/ServiceDiscovery.raw.xml
+++ b/doc/ServiceDiscovery.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/ServiceDiscovery</title><revhistory><revision><revnumber>2</revnumber><date>2017-01-02 13:17:40</date><authorinitials>JamesValleroy</authorinitials><revremark>mention .local address</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 09:48:13</date><authorinitials>Drahtseil</authorinitials><revremark>Created Service Discovery</revremark></revision></revhistory></articleinfo><section><title>Service Discovery</title><para>Service discovery allows other devices on the network to discover your FreedomBox and services running on it. If a client on the local network supports mDNS, it can find your FreedomBox at &lt;hostname&gt;.local (for example: freedombox.local). </para><para>It also allows FreedomBox to discover other devices and services running on your local network.    </para><para>Service discovery is not essential and works only on internal networks. It may be disabled to improve security especially when connecting to a hostile local network. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/ServiceDiscovery</title><revhistory><revision><revnumber>2</revnumber><date>2017-01-02 13:17:40</date><authorinitials>JamesValleroy</authorinitials><revremark>mention .local address</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 09:48:13</date><authorinitials>Drahtseil</authorinitials><revremark>Created Service Discovery</revremark></revision></revhistory></articleinfo><section><title>Service Discovery</title><para>Service discovery allows other devices on the network to discover your FreedomBox and services running on it. If a client on the local network supports mDNS, it can find your FreedomBox at &lt;hostname&gt;.local (for example: freedombox.local). </para><para>It also allows FreedomBox to discover other devices and services running on your local network.    </para><para>Service discovery is not essential and works only on internal networks. It may be disabled to improve security especially when connecting to a hostile local network. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/ServiceDiscovery/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/Shadowsocks.raw.xml b/doc/Shadowsocks.raw.xml
index f815330fb..74cacecba 100644
--- a/doc/Shadowsocks.raw.xml
+++ b/doc/Shadowsocks.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Shadowsocks</title><revhistory><revision><revnumber>2</revnumber><date>2019-05-10 22:54:33</date><authorinitials>JamesValleroy</authorinitials><revremark>remove wiki links</revremark></revision><revision><revnumber>1</revnumber><date>2018-01-04 19:59:57</date><authorinitials>David Jones</authorinitials></revision></revhistory></articleinfo><section><title>SOCKS5 proxy (Shadowsocks)</title><section><title>What is Shadowsocks?</title><para><ulink url="https://shadowsocks.org/en/index.html">Shadowsocks</ulink> is a lightweight and secure SOCKS5 proxy, designed to protect your Internet traffic. It can be used to bypass Internet filtering and censorship. Your FreedomBox can run a Shadowsocks client which can connect to a Shadowsocks server. It will also run a SOCKS5 proxy. Local devices can connect to this proxy, and their data will be encrypted and proxied through the Shadowsocks server. </para><para><emphasis role="strong">Note:</emphasis> Shadowsocks is available in FreedomBox starting with Plinth version 0.18. </para></section><section><title>Using the Shadowsocks client?</title><para>The current implementation of Shadowsocks in FreedomBox only supports configuring FreedomBox as a Shadowsocks client. The current use case for Shadowsocks is as follows: </para><itemizedlist><listitem><para>Shadowsocks client (FreedomBox) is in a region where some parts of the Internet are blocked or censored. </para></listitem><listitem><para>Shadowsocks server is in a different region, which doesn't have these blocks. </para></listitem><listitem><para>The FreedomBox provides SOCKS proxy service on the local network for other devices to make use of its Shadowsocks connection. </para></listitem></itemizedlist><para>At a future date it will be possible to configure FreedomBox as Shadowsocks server. </para></section><section><title>Configuring your FreedomBox for the Shadowsocks client</title><para>To enable Shadowsocks, first navigate to the Socks5 Proxy (Shadowsocks) page and install it.  </para><para>Server: the Shadowsocks server is not the FreedomBox IP or URL; rather, it will be another server or VPS that has been configured as a Shadowsocks server. There are also some public Shadowsocks servers listed on the web, but be aware that whoever operates the server can see where requests are going, and any non-encrypted data will be visible to them. </para><para>To use Shadowsocks after setup, set the SOCKS5 proxy URL in your device, browser or application to <ulink url="http://freedombox_address:1080/"/> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Shadowsocks</title><revhistory><revision><revnumber>2</revnumber><date>2019-05-10 22:54:33</date><authorinitials>JamesValleroy</authorinitials><revremark>remove wiki links</revremark></revision><revision><revnumber>1</revnumber><date>2018-01-04 19:59:57</date><authorinitials>David Jones</authorinitials></revision></revhistory></articleinfo><section><title>SOCKS5 proxy (Shadowsocks)</title><section><title>What is Shadowsocks?</title><para><ulink url="https://shadowsocks.org/en/index.html">Shadowsocks</ulink> is a lightweight and secure SOCKS5 proxy, designed to protect your Internet traffic. It can be used to bypass Internet filtering and censorship. Your FreedomBox can run a Shadowsocks client which can connect to a Shadowsocks server. It will also run a SOCKS5 proxy. Local devices can connect to this proxy, and their data will be encrypted and proxied through the Shadowsocks server. </para><para><emphasis role="strong">Note:</emphasis> Shadowsocks is available in FreedomBox starting with Plinth version 0.18. </para></section><section><title>Using the Shadowsocks client?</title><para>The current implementation of Shadowsocks in FreedomBox only supports configuring FreedomBox as a Shadowsocks client. The current use case for Shadowsocks is as follows: </para><itemizedlist><listitem><para>Shadowsocks client (FreedomBox) is in a region where some parts of the Internet are blocked or censored. </para></listitem><listitem><para>Shadowsocks server is in a different region, which doesn't have these blocks. </para></listitem><listitem><para>The FreedomBox provides SOCKS proxy service on the local network for other devices to make use of its Shadowsocks connection. </para></listitem></itemizedlist><para>At a future date it will be possible to configure FreedomBox as Shadowsocks server. </para></section><section><title>Configuring your FreedomBox for the Shadowsocks client</title><para>To enable Shadowsocks, first navigate to the Socks5 Proxy (Shadowsocks) page and install it.  </para><para>Server: the Shadowsocks server is not the FreedomBox IP or URL; rather, it will be another server or VPS that has been configured as a Shadowsocks server. There are also some public Shadowsocks servers listed on the web, but be aware that whoever operates the server can see where requests are going, and any non-encrypted data will be visible to them. </para><para>To use Shadowsocks after setup, set the SOCKS5 proxy URL in your device, browser or application to <ulink url="http://freedombox_address:1080/"/> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Shadowsocks/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Snapshots.raw.xml b/doc/Snapshots.raw.xml
index dda641230..a3aa007d0 100644
--- a/doc/Snapshots.raw.xml
+++ b/doc/Snapshots.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Snapshots</title><revhistory><revision><revnumber>2</revnumber><date>2018-03-10 15:11:41</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized image</revremark></revision><revision><revnumber>1</revnumber><date>2017-11-14 02:24:01</date><authorinitials>JamesValleroy</authorinitials><revremark>new page for snapshots module</revremark></revision></revhistory></articleinfo><section><title>Snapshots</title><para><emphasis>Snapshots</emphasis> allows you to create filesystem snapshots, and rollback the system to a previous snapshot. </para><itemizedlist><listitem><para>Note: This feature requires a Btrfs filesystem. All of the FreedomBox stable disk images use Btrfs. </para></listitem></itemizedlist><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Snapshots?action=AttachFile&amp;do=get&amp;target=snapshots.png" width="800"/></imageobject><textobject><phrase>Snapshots</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Snapshots</title><revhistory><revision><revnumber>2</revnumber><date>2018-03-10 15:11:41</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized image</revremark></revision><revision><revnumber>1</revnumber><date>2017-11-14 02:24:01</date><authorinitials>JamesValleroy</authorinitials><revremark>new page for snapshots module</revremark></revision></revhistory></articleinfo><section><title>Snapshots</title><para><emphasis>Snapshots</emphasis> allows you to create filesystem snapshots, and rollback the system to a previous snapshot. </para><itemizedlist><listitem><para>Note: This feature requires a Btrfs filesystem. All of the FreedomBox stable disk images use Btrfs. </para></listitem></itemizedlist><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Snapshots?action=AttachFile&amp;do=get&amp;target=snapshots.png" width="800"/></imageobject><textobject><phrase>Snapshots</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Snapshots/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/Storage.raw.xml b/doc/Storage.raw.xml
index 317bf8345..81f3e6002 100644
--- a/doc/Storage.raw.xml
+++ b/doc/Storage.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Storage</title><revhistory><revision><revnumber>11</revnumber><date>2018-12-18 00:01:12</date><authorinitials>JamesValleroy</authorinitials><revremark>fix screenshot parameter</revremark></revision><revision><revnumber>10</revnumber><date>2018-12-04 06:20:20</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Restrict screenshot width to 800px</revremark></revision><revision><revnumber>9</revnumber><date>2018-09-25 06:01:56</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Update description to match current functionality</revremark></revision><revision><revnumber>8</revnumber><date>2018-09-25 05:51:15</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Replace screenshot with the latest version</revremark></revision><revision><revnumber>7</revnumber><date>2018-03-05 12:17:19</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Renamed from 'FreedomBox/Manual/Disks'.</revremark></revision><revision><revnumber>6</revnumber><date>2018-03-05 12:16:41</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Renaming Disks to Storage</revremark></revision><revision><revnumber>5</revnumber><date>2017-04-09 13:45:57</date><authorinitials>JamesValleroy</authorinitials><revremark>update note about issue</revremark></revision><revision><revnumber>4</revnumber><date>2017-03-31 20:16:25</date><authorinitials>Drahtseil</authorinitials><revremark>update screenshot with &quot;expand partition&quot;</revremark></revision><revision><revnumber>3</revnumber><date>2017-02-10 22:33:01</date><authorinitials>JamesValleroy</authorinitials><revremark>add warning about non-functional feature</revremark></revision><revision><revnumber>2</revnumber><date>2016-08-31 17:10:11</date><authorinitials>Drahtseil</authorinitials><revremark>screenshot</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-31 17:09:10</date><authorinitials>Drahtseil</authorinitials><revremark>Disks creation</revremark></revision></revhistory></articleinfo><section><title>Storage</title><para><emphasis>Storage</emphasis> allows you to see the storage devices attached to your FreedomBox and their disk space usage. </para><para>FreedomBox can automatically detect and mount removable media like USB flash drives. They are listed under the <emphasis>Removable Devices</emphasis> section along with an option to eject them. </para><para>If there is some free space left after the root partition, the option to expand the root partition is also available. This is typically not shown, since expanding the root partition happens automatically when the FreedomBox starts up for the first time. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Storage?action=AttachFile&amp;do=get&amp;target=Storage.png" width="800"/></imageobject><textobject><phrase>Storage.png</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Storage</title><revhistory><revision><revnumber>11</revnumber><date>2018-12-18 00:01:12</date><authorinitials>JamesValleroy</authorinitials><revremark>fix screenshot parameter</revremark></revision><revision><revnumber>10</revnumber><date>2018-12-04 06:20:20</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Restrict screenshot width to 800px</revremark></revision><revision><revnumber>9</revnumber><date>2018-09-25 06:01:56</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Update description to match current functionality</revremark></revision><revision><revnumber>8</revnumber><date>2018-09-25 05:51:15</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Replace screenshot with the latest version</revremark></revision><revision><revnumber>7</revnumber><date>2018-03-05 12:17:19</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Renamed from 'FreedomBox/Manual/Disks'.</revremark></revision><revision><revnumber>6</revnumber><date>2018-03-05 12:16:41</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Renaming Disks to Storage</revremark></revision><revision><revnumber>5</revnumber><date>2017-04-09 13:45:57</date><authorinitials>JamesValleroy</authorinitials><revremark>update note about issue</revremark></revision><revision><revnumber>4</revnumber><date>2017-03-31 20:16:25</date><authorinitials>Drahtseil</authorinitials><revremark>update screenshot with &quot;expand partition&quot;</revremark></revision><revision><revnumber>3</revnumber><date>2017-02-10 22:33:01</date><authorinitials>JamesValleroy</authorinitials><revremark>add warning about non-functional feature</revremark></revision><revision><revnumber>2</revnumber><date>2016-08-31 17:10:11</date><authorinitials>Drahtseil</authorinitials><revremark>screenshot</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-31 17:09:10</date><authorinitials>Drahtseil</authorinitials><revremark>Disks creation</revremark></revision></revhistory></articleinfo><section><title>Storage</title><para><emphasis>Storage</emphasis> allows you to see the storage devices attached to your FreedomBox and their disk space usage. </para><para>FreedomBox can automatically detect and mount removable media like USB flash drives. They are listed under the <emphasis>Removable Devices</emphasis> section along with an option to eject them. </para><para>If there is some free space left after the root partition, the option to expand the root partition is also available. This is typically not shown, since expanding the root partition happens automatically when the FreedomBox starts up for the first time. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Storage?action=AttachFile&amp;do=get&amp;target=Storage.png" width="800"/></imageobject><textobject><phrase>Storage.png</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Storage/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></article>
\ No newline at end of file
diff --git a/doc/Syncthing.raw.xml b/doc/Syncthing.raw.xml
index 92c0276fc..505c25d9e 100644
--- a/doc/Syncthing.raw.xml
+++ b/doc/Syncthing.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Syncthing</title><revhistory><revision><revnumber>12</revnumber><date>2019-06-09 11:07:46</date><authorinitials>David Jones</authorinitials></revision><revision><revnumber>11</revnumber><date>2019-06-09 11:00:48</date><authorinitials>David Jones</authorinitials><revremark>added information about syncthing and tor hidden service</revremark></revision><revision><revnumber>10</revnumber><date>2018-03-10 04:32:57</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized image</revremark></revision><revision><revnumber>9</revnumber><date>2017-10-22 14:57:58</date><authorinitials>Drahtseil</authorinitials></revision><revision><revnumber>8</revnumber><date>2017-10-22 14:57:09</date><authorinitials>Drahtseil</authorinitials><revremark>Syncthing GUI image</revremark></revision><revision><revnumber>7</revnumber><date>2017-10-22 14:54:54</date><authorinitials>Drahtseil</authorinitials><revremark>Some rewording etc.</revremark></revision><revision><revnumber>6</revnumber><date>2017-10-21 14:59:53</date><authorinitials>Drahtseil</authorinitials><revremark>Titel same as in Plinth GUI; standard footer; some basic restructuring before I will update the docu more in detail</revremark></revision><revision><revnumber>5</revnumber><date>2017-04-04 10:39:36</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>4</revnumber><date>2017-03-23 10:54:49</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Rewrote the section on Syncthing's role in FreedomBox</revremark></revision><revision><revnumber>3</revnumber><date>2017-03-23 05:12:13</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor formatting</revremark></revision><revision><revnumber>2</revnumber><date>2017-03-23 05:11:43</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add note about availability of Syncthing</revremark></revision><revision><revnumber>1</revnumber><date>2017-03-23 02:11:00</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Created wiki page for Syncthing</revremark></revision></revhistory></articleinfo><section><title>File Synchronization (Syncthing)</title><para>With <emphasis>Syncthing</emphasis> installed on your FreedomBox, you can synchronize content from other devices to your FreedomBox and vice-versa. For example, you can keep the photos taken on your mobile phone synchronized to your FreedomBox. </para><para><emphasis role="strong">Note:</emphasis> Syncthing is available in FreedomBox starting with Plinth version 0.14. </para><para>Users should keep in mind that Syncthing is a peer-to-peer synchronization solution, not a client-server one. This means that the FreedomBox isn't really the server and your other devices clients. They're all devices from Syncthing's perspective. You can use Syncthing to synchronize your files between any of your devices. The advantage that FreedomBox provides is that it is a server that's always running. Suppose you want your photos on your phone to be synchronized to your laptop, if you simply sync the photos to the FreedomBox, the laptop can get them from the FreedomBox whenever it comes online the next time. You don't have to be worried about your other devices being online for synchronization. If your FreedomBox is one of the devices set up with your Syncthing shared folder, you can rest assured that your other devices will eventually get the latest files once they come online. </para><para>After installation follow the instructions in the <ulink url="https://docs.syncthing.net/intro/getting-started.html">getting started of the Syncthing project</ulink>.  Syncthing allows individual folders to be selectively shared with other devices. Devices must be paired up before sharing by scanning QR codes or entering the device ids manually. Syncthing has a discovery service for easily identifying the other devices on the same network having Syncthing installed. </para><para>In order to access to the web client of the Syncthing instance running on your FreedomBox, use the path <emphasis>/syncthing</emphasis>. This web client is currently only accessible to the users of the FreedomBox that have administrator privileges, though it might be accessible to all FreedomBox users in a future release. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Syncthing?action=AttachFile&amp;do=get&amp;target=Syncthing_GUI.png" width="800"/></imageobject><textobject><phrase>Syncthing web interface</phrase></textobject></inlinemediaobject> </para><para>Syncthing has android apps available on the <ulink url="https://f-droid.org/repository/browse/?fdid=com.nutomic.syncthingandroid">F-Droid</ulink> and <ulink url="https://play.google.com/store/apps/details?id=com.nutomic.syncthingandroid">Google Play</ulink> app stores. Cross-platform desktop apps are also available. </para><para>To learn more about Syncthing, please visit their <ulink url="https://syncthing.net">official website</ulink> and <ulink url="https://docs.syncthing.net">documentation</ulink>.  </para><section><title>Synchronizing over Tor</title><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/SyncThing#">SyncThing</ulink> should automatically sync with your <ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox#">FreedomBox</ulink> even if it is only accessible as a Tor hidden service. </para><para>If you would like to proxy your Syncthing client over Tor, set the all_proxy environment variable: </para><para>$ all_proxy=socks5://localhost:9050 syncthing </para><para>For more information, see the Syncthing documentation on <ulink url="https://docs.syncthing.net/users/proxying.html">using proxies</ulink>. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Syncthing</title><revhistory><revision><revnumber>13</revnumber><date>2019-09-11 15:33:32</date><authorinitials>fioddor</authorinitials><revremark>Code decoration</revremark></revision><revision><revnumber>12</revnumber><date>2019-06-09 11:07:46</date><authorinitials>David Jones</authorinitials></revision><revision><revnumber>11</revnumber><date>2019-06-09 11:00:48</date><authorinitials>David Jones</authorinitials><revremark>added information about syncthing and tor hidden service</revremark></revision><revision><revnumber>10</revnumber><date>2018-03-10 04:32:57</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized image</revremark></revision><revision><revnumber>9</revnumber><date>2017-10-22 14:57:58</date><authorinitials>Drahtseil</authorinitials></revision><revision><revnumber>8</revnumber><date>2017-10-22 14:57:09</date><authorinitials>Drahtseil</authorinitials><revremark>Syncthing GUI image</revremark></revision><revision><revnumber>7</revnumber><date>2017-10-22 14:54:54</date><authorinitials>Drahtseil</authorinitials><revremark>Some rewording etc.</revremark></revision><revision><revnumber>6</revnumber><date>2017-10-21 14:59:53</date><authorinitials>Drahtseil</authorinitials><revremark>Titel same as in Plinth GUI; standard footer; some basic restructuring before I will update the docu more in detail</revremark></revision><revision><revnumber>5</revnumber><date>2017-04-04 10:39:36</date><authorinitials>JosephNuthalapati</authorinitials></revision><revision><revnumber>4</revnumber><date>2017-03-23 10:54:49</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Rewrote the section on Syncthing's role in FreedomBox</revremark></revision><revision><revnumber>3</revnumber><date>2017-03-23 05:12:13</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor formatting</revremark></revision><revision><revnumber>2</revnumber><date>2017-03-23 05:11:43</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add note about availability of Syncthing</revremark></revision><revision><revnumber>1</revnumber><date>2017-03-23 02:11:00</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Created wiki page for Syncthing</revremark></revision></revhistory></articleinfo><section><title>File Synchronization (Syncthing)</title><para>With <emphasis>Syncthing</emphasis> installed on your FreedomBox, you can synchronize content from other devices to your FreedomBox and vice-versa. For example, you can keep the photos taken on your mobile phone synchronized to your FreedomBox. </para><para><emphasis role="strong">Note:</emphasis> Syncthing is available in FreedomBox starting with Plinth version 0.14. </para><para>Users should keep in mind that Syncthing is a peer-to-peer synchronization solution, not a client-server one. This means that the FreedomBox isn't really the server and your other devices clients. They're all devices from Syncthing's perspective. You can use Syncthing to synchronize your files between any of your devices. The advantage that FreedomBox provides is that it is a server that's always running. Suppose you want your photos on your phone to be synchronized to your laptop, if you simply sync the photos to the FreedomBox, the laptop can get them from the FreedomBox whenever it comes online the next time. You don't have to be worried about your other devices being online for synchronization. If your FreedomBox is one of the devices set up with your Syncthing shared folder, you can rest assured that your other devices will eventually get the latest files once they come online. </para><para>After installation follow the instructions in the <ulink url="https://docs.syncthing.net/intro/getting-started.html">getting started of the Syncthing project</ulink>.  Syncthing allows individual folders to be selectively shared with other devices. Devices must be paired up before sharing by scanning QR codes or entering the device ids manually. Syncthing has a discovery service for easily identifying the other devices on the same network having Syncthing installed. </para><para>In order to access to the web client of the Syncthing instance running on your FreedomBox, use the path <emphasis>/syncthing</emphasis>. This web client is currently only accessible to the users of the FreedomBox that have administrator privileges, though it might be accessible to all FreedomBox users in a future release. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Syncthing?action=AttachFile&amp;do=get&amp;target=Syncthing_GUI.png" width="800"/></imageobject><textobject><phrase>Syncthing web interface</phrase></textobject></inlinemediaobject> </para><para>Syncthing has android apps available on the <ulink url="https://f-droid.org/repository/browse/?fdid=com.nutomic.syncthingandroid">F-Droid</ulink> and <ulink url="https://play.google.com/store/apps/details?id=com.nutomic.syncthingandroid">Google Play</ulink> app stores. Cross-platform desktop apps are also available. </para><para>To learn more about Syncthing, please visit their <ulink url="https://syncthing.net">official website</ulink> and <ulink url="https://docs.syncthing.net">documentation</ulink>.  </para><section><title>Synchronizing over Tor</title><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/SyncThing#">SyncThing</ulink> should automatically sync with your <ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox#">FreedomBox</ulink> even if it is only accessible as a Tor hidden service. </para><para>If you would like to proxy your Syncthing client over Tor, set the all_proxy environment variable: </para><screen><![CDATA[$ all_proxy=socks5://localhost:9050 syncthing]]></screen><para>For more information, see the Syncthing documentation on <ulink url="https://docs.syncthing.net/users/proxying.html">using proxies</ulink>. </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Syncthing/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/TinyTinyRSS.raw.xml b/doc/TinyTinyRSS.raw.xml
index 696f3a6c0..84c72da98 100644
--- a/doc/TinyTinyRSS.raw.xml
+++ b/doc/TinyTinyRSS.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/TinyTinyRSS</title><revhistory><revision><revnumber>10</revnumber><date>2018-03-11 03:05:29</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized images</revremark></revision><revision><revnumber>9</revnumber><date>2017-10-18 13:51:27</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Remove link to source code as this wiki seems to have banned anything that starts with git.tt</revremark></revision><revision><revnumber>8</revnumber><date>2017-10-18 13:47:46</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add importing OPML feeds and link to source code of TT-RSS Android App</revremark></revision><revision><revnumber>7</revnumber><date>2017-10-18 12:58:46</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add documentation for automatic detection of RSS feeds and the Unsubscribe option</revremark></revision><revision><revnumber>6</revnumber><date>2017-10-18 12:37:03</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add screenshots for subscribing to a new RSS feed</revremark></revision><revision><revnumber>5</revnumber><date>2017-10-16 12:11:52</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor styling</revremark></revision><revision><revnumber>4</revnumber><date>2017-10-16 12:08:36</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about mobile application</revremark></revision><revision><revnumber>3</revnumber><date>2016-12-31 03:49:54</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshot</revremark></revision><revision><revnumber>2</revnumber><date>2016-12-31 03:44:56</date><authorinitials>JamesValleroy</authorinitials><revremark>add user info</revremark></revision><revision><revnumber>1</revnumber><date>2016-09-04 10:18:59</date><authorinitials>Drahtseil</authorinitials><revremark>stub created</revremark></revision></revhistory></articleinfo><section><title>News Feed Reader (Tiny Tiny RSS)</title><para>Tiny Tiny RSS is a news feed (RSS/Atom) reader and aggregator, designed to allow reading news from any location, while feeling as close to a real desktop application as possible. </para><para>Any user created through FreedomBox web interface will be able to login and use this app.  Each user has their own feeds, state and preferences. </para><section><title>Using the Web Interface</title><para>When enabled, Tiny Tiny RSS will be available from <emphasis>/tt-rss</emphasis> path on the web server. Any user created through Plinth will be able to login and use this app.  </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrss.png" width="800"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> </para><section><title>Adding a new feed</title><para>1. Go to the website you want the RSS feed for and copy the RSS/Atom feed link from it. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=Select-RSS-feed.png" width="800"/></imageobject><textobject><phrase>Selecting feeds</phrase></textobject></inlinemediaobject> </para><para>2. Select &quot;Subscribe to feed..&quot; from the Actions dropdown. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=Subscribe-to-feed.png"/></imageobject><textobject><phrase>Subscribe to feed</phrase></textobject></inlinemediaobject> </para><para>3. In the dialog box that appears, paste the URL for copied in step 1 and click the <emphasis role="strong">Subscribe</emphasis> button. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=Subscribe-dialog.png" width="800"/></imageobject><textobject><phrase>Subscription dialog box</phrase></textobject></inlinemediaobject> </para><para>Give the application a minute to fetch the feeds after clicking Subscribe. </para><para>In some websites, the RSS feeds button isn't clearly visible. In that case, you can simply paste the website URL into the Subscribe dialog (step 3) and let TT-RSS automatically detect the RSS feeds on the page.  </para><para>You can try this now with the homepage of <ulink url="https://en.wikinews.org/wiki/Main_Page">WikiNews</ulink> </para><para>As you can see in the image below, TT-RSS detected and added the Atom feed of WikiNews to our list of feeds. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=WikiNews-feed.png"/></imageobject><textobject><phrase>WikiNews feed added</phrase></textobject></inlinemediaobject> </para><para>If you don't want to keep this feed, right click on the feed shown in the above image, select <emphasis role="strong">Edit feed</emphasis> and click <emphasis role="strong">Unsubscribe</emphasis> in the dialog box that appears. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=Unsubscribe.png" width="800"/></imageobject><textobject><phrase>Unsubscribe from a feed</phrase></textobject></inlinemediaobject> </para></section><section><title>Importing your feeds from another feed reader</title><para>In your existing feed reader, find an option to <emphasis>Export</emphasis> your feeds to a file. Prefer the OPML file format if you have to choose between multiple formats. Let's say your exported feeds file is called Subscriptions.opml </para><para>Click on the <emphasis>Actions</emphasis> menu at the top left corner and select <emphasis>Preferences</emphasis>. You will be taken to another page. </para><para>Select the second tab called <emphasis>Feeds</emphasis> in the top header. Feeds has several sections. The second one is called <emphasis>OPML</emphasis>. Select it. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=OPML.png" width="960"/></imageobject><textobject><phrase>OPML feeds page</phrase></textobject></inlinemediaobject> </para><para>To import your Subscriptions.opml file into TT-RSS, </para><orderedlist numeration="arabic"><listitem><para>Click <emphasis>Browse</emphasis> and select the file from your file system </para></listitem><listitem><para>Click <emphasis>Import my OPML</emphasis> </para></listitem></orderedlist><para>After importing, you'll be taken to the <emphasis role="strong">Feeds</emphasis> section that's above the OPML section in the page. You can see that the feeds from your earlier feed reader are now imported into Tiny Tiny RSS. You can now start using Tiny Tiny RSS as your primary feed reader.  </para><para>In the next section, we will discuss setting up the mobile app, which can let you read your feeds on the go. </para></section></section><section><title>Using the Mobile App</title><para>The official Android app from the Tiny Tiny RSS project works with FreedomBox's Tiny Tiny RSS Server. The older TTRSS-Reader application is known <emphasis role="strong">not</emphasis> to work.  </para><para>The official Android app is unfortunately only available on the Google Play Store and not on F-Droid. You can still obtain the source code and build the apk file yourself. </para><para>To configure, first install the application, then in the setting page, set URL as <emphasis><ulink url="https://&lt;your.freedombox.address&gt;/tt-rss-app/"/></emphasis>.  Set your user name and password in the Login details as well as HTTP Authentication details.  If your FreedomBox does not have a valid HTTPS certificate, then in settings request allowing any SSL certificate and any host. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp1.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp2.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp3.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp4.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp5.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/TinyTinyRSS</title><revhistory><revision><revnumber>10</revnumber><date>2018-03-11 03:05:29</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix oversized images</revremark></revision><revision><revnumber>9</revnumber><date>2017-10-18 13:51:27</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Remove link to source code as this wiki seems to have banned anything that starts with git.tt</revremark></revision><revision><revnumber>8</revnumber><date>2017-10-18 13:47:46</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add importing OPML feeds and link to source code of TT-RSS Android App</revremark></revision><revision><revnumber>7</revnumber><date>2017-10-18 12:58:46</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add documentation for automatic detection of RSS feeds and the Unsubscribe option</revremark></revision><revision><revnumber>6</revnumber><date>2017-10-18 12:37:03</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add screenshots for subscribing to a new RSS feed</revremark></revision><revision><revnumber>5</revnumber><date>2017-10-16 12:11:52</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Minor styling</revremark></revision><revision><revnumber>4</revnumber><date>2017-10-16 12:08:36</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add information about mobile application</revremark></revision><revision><revnumber>3</revnumber><date>2016-12-31 03:49:54</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshot</revremark></revision><revision><revnumber>2</revnumber><date>2016-12-31 03:44:56</date><authorinitials>JamesValleroy</authorinitials><revremark>add user info</revremark></revision><revision><revnumber>1</revnumber><date>2016-09-04 10:18:59</date><authorinitials>Drahtseil</authorinitials><revremark>stub created</revremark></revision></revhistory></articleinfo><section><title>News Feed Reader (Tiny Tiny RSS)</title><para>Tiny Tiny RSS is a news feed (RSS/Atom) reader and aggregator, designed to allow reading news from any location, while feeling as close to a real desktop application as possible. </para><para>Any user created through FreedomBox web interface will be able to login and use this app.  Each user has their own feeds, state and preferences. </para><section><title>Using the Web Interface</title><para>When enabled, Tiny Tiny RSS will be available from <emphasis>/tt-rss</emphasis> path on the web server. Any user created through Plinth will be able to login and use this app.  </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrss.png" width="800"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> </para><section><title>Adding a new feed</title><para>1. Go to the website you want the RSS feed for and copy the RSS/Atom feed link from it. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=Select-RSS-feed.png" width="800"/></imageobject><textobject><phrase>Selecting feeds</phrase></textobject></inlinemediaobject> </para><para>2. Select &quot;Subscribe to feed..&quot; from the Actions dropdown. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=Subscribe-to-feed.png"/></imageobject><textobject><phrase>Subscribe to feed</phrase></textobject></inlinemediaobject> </para><para>3. In the dialog box that appears, paste the URL for copied in step 1 and click the <emphasis role="strong">Subscribe</emphasis> button. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=Subscribe-dialog.png" width="800"/></imageobject><textobject><phrase>Subscription dialog box</phrase></textobject></inlinemediaobject> </para><para>Give the application a minute to fetch the feeds after clicking Subscribe. </para><para>In some websites, the RSS feeds button isn't clearly visible. In that case, you can simply paste the website URL into the Subscribe dialog (step 3) and let TT-RSS automatically detect the RSS feeds on the page.  </para><para>You can try this now with the homepage of <ulink url="https://en.wikinews.org/wiki/Main_Page">WikiNews</ulink> </para><para>As you can see in the image below, TT-RSS detected and added the Atom feed of WikiNews to our list of feeds. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=WikiNews-feed.png"/></imageobject><textobject><phrase>WikiNews feed added</phrase></textobject></inlinemediaobject> </para><para>If you don't want to keep this feed, right click on the feed shown in the above image, select <emphasis role="strong">Edit feed</emphasis> and click <emphasis role="strong">Unsubscribe</emphasis> in the dialog box that appears. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=Unsubscribe.png" width="800"/></imageobject><textobject><phrase>Unsubscribe from a feed</phrase></textobject></inlinemediaobject> </para></section><section><title>Importing your feeds from another feed reader</title><para>In your existing feed reader, find an option to <emphasis>Export</emphasis> your feeds to a file. Prefer the OPML file format if you have to choose between multiple formats. Let's say your exported feeds file is called Subscriptions.opml </para><para>Click on the <emphasis>Actions</emphasis> menu at the top left corner and select <emphasis>Preferences</emphasis>. You will be taken to another page. </para><para>Select the second tab called <emphasis>Feeds</emphasis> in the top header. Feeds has several sections. The second one is called <emphasis>OPML</emphasis>. Select it. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=OPML.png" width="960"/></imageobject><textobject><phrase>OPML feeds page</phrase></textobject></inlinemediaobject> </para><para>To import your Subscriptions.opml file into TT-RSS, </para><orderedlist numeration="arabic"><listitem><para>Click <emphasis>Browse</emphasis> and select the file from your file system </para></listitem><listitem><para>Click <emphasis>Import my OPML</emphasis> </para></listitem></orderedlist><para>After importing, you'll be taken to the <emphasis role="strong">Feeds</emphasis> section that's above the OPML section in the page. You can see that the feeds from your earlier feed reader are now imported into Tiny Tiny RSS. You can now start using Tiny Tiny RSS as your primary feed reader.  </para><para>In the next section, we will discuss setting up the mobile app, which can let you read your feeds on the go. </para></section></section><section><title>Using the Mobile App</title><para>The official Android app from the Tiny Tiny RSS project works with FreedomBox's Tiny Tiny RSS Server. The older TTRSS-Reader application is known <emphasis role="strong">not</emphasis> to work.  </para><para>The official Android app is unfortunately only available on the Google Play Store and not on F-Droid. You can still obtain the source code and build the apk file yourself. </para><para>To configure, first install the application, then in the setting page, set URL as <emphasis><ulink url="https://&lt;your.freedombox.address&gt;/tt-rss-app/"/></emphasis>.  Set your user name and password in the Login details as well as HTTP Authentication details.  If your FreedomBox does not have a valid HTTPS certificate, then in settings request allowing any SSL certificate and any host. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp1.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp2.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp3.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp4.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS?action=AttachFile&amp;do=get&amp;target=ttrssapp5.png" width="288"/></imageobject><textobject><phrase>Tiny Tiny RSS</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/TinyTinyRSS/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Tor.raw.xml b/doc/Tor.raw.xml
index 97e60ef91..fd7df3ac1 100644
--- a/doc/Tor.raw.xml
+++ b/doc/Tor.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Tor</title><revhistory><revision><revnumber>19</revnumber><date>2019-06-09 10:47:56</date><authorinitials>David Jones</authorinitials><revremark>added two more apps to list</revremark></revision><revision><revnumber>18</revnumber><date>2019-05-22 17:10:34</date><authorinitials>David Jones</authorinitials><revremark>Corrected formatting; added transition sentence.</revremark></revision><revision><revnumber>17</revnumber><date>2019-05-22 17:05:45</date><authorinitials>David Jones</authorinitials><revremark>Started a list of apps accessible via Tor</revremark></revision><revision><revnumber>16</revnumber><date>2018-12-30 19:13:56</date><authorinitials>Drahtseil</authorinitials><revremark>relay requirements</revremark></revision><revision><revnumber>15</revnumber><date>2018-03-19 06:27:56</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add section on circumventing tor censorship</revremark></revision><revision><revnumber>14</revnumber><date>2018-03-19 06:25:43</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add section on circumventing tor censorship</revremark></revision><revision><revnumber>13</revnumber><date>2017-01-07 16:00:24</date><authorinitials>JamesValleroy</authorinitials><revremark>add image</revremark></revision><revision><revnumber>12</revnumber><date>2017-01-07 15:21:27</date><authorinitials>JamesValleroy</authorinitials><revremark>plural</revremark></revision><revision><revnumber>11</revnumber><date>2016-12-31 02:19:46</date><authorinitials>JamesValleroy</authorinitials><revremark>mention ssh</revremark></revision><revision><revnumber>10</revnumber><date>2016-12-31 02:19:03</date><authorinitials>JamesValleroy</authorinitials><revremark>add relay info</revremark></revision><revision><revnumber>9</revnumber><date>2016-12-23 18:31:29</date><authorinitials>JamesValleroy</authorinitials><revremark>undo outline level change</revremark></revision><revision><revnumber>8</revnumber><date>2016-12-23 18:30:06</date><authorinitials>JamesValleroy</authorinitials><revremark>move down outline level</revremark></revision><revision><revnumber>7</revnumber><date>2016-04-10 07:14:17</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>6</revnumber><date>2015-12-15 16:54:58</date><authorinitials>PhilippeBaret</authorinitials><revremark>Text finishing</revremark></revision><revision><revnumber>5</revnumber><date>2015-12-15 16:40:11</date><authorinitials>PhilippeBaret</authorinitials></revision><revision><revnumber>4</revnumber><date>2015-12-15 16:34:38</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Tor definition</revremark></revision><revision><revnumber>3</revnumber><date>2015-09-13 14:54:59</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Demote headings one level for inclusion into manual</revremark></revision><revision><revnumber>2</revnumber><date>2015-09-13 14:53:54</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add FreedomBox category and portal</revremark></revision><revision><revnumber>1</revnumber><date>2015-09-12 15:55:05</date><authorinitials>JamesValleroy</authorinitials><revremark>create tor page</revremark></revision></revhistory></articleinfo><section><title>Anonymity Network (Tor)</title><section><title>What is Tor?</title><para>Tor is a network of servers operated by volunteers. It allows users of these servers to improve their privacy and security while surfing on the Internet. You and your friends are able to access to your FreedomBox via Tor network without revealing its IP address. Activating Tor application on your FreedomBox, you will be able to offer remote services (chat, wiki, file sharing, etc...) without showing your location. This application will give you a better protection than a public web server because you will be less exposed to intrusive people on the web. </para></section><section><title>Using Tor to browse anonymously</title><para>Tor Browser is the recommended way to browse the web using Tor. You can download the Tor Browser from <ulink url="https://www.torproject.org/projects/torbrowser.html"/> and follow the instructions on that site to install and run it. </para></section><section><title>Using Tor Hidden Service to access your FreedomBox</title><para>Tor Hidden Service provides a way to access your FreedomBox, even if it's behind a router, firewall, or carrier-grade NAT (i.e., your Internet Service Provider does not provide a public IPv4 address for your router). </para><para>To enable Tor Hidden Service, first navigate to the Anonymity Network (Tor) page. (If you don't see it, click on the FreedomBox logo at the top-left of the page, to go to the main Apps page.) On the Anonymity Network (Tor) page, under Configuration, check &quot;Enable Tor Hidden Service&quot;, then press the Update setup button. Tor will be reconfigured and restarted. </para><para>After a while, the page will refresh and under Status, you will see a table listing the Hidden Service .onion address. Copy the entire address (ending in .onion) and paste it into the Tor Browser's address field, and you should be able to access your FreedomBox. (You may see a certificate warning because FreedomBox has a self-signed certificate.) </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor_browser_plinth.png" width="800"/></imageobject><textobject><phrase>Tor Browser - Plinth</phrase></textobject></inlinemediaobject> </para><para>Currently only HTTP (port 80), HTTPS (port 443), and SSH (port 22) are accessible through the Tor Hidden Service configured on the FreedomBox. </para></section><section><title>Apps accessible via Tor</title><para>The following apps can be accessed over Tor. Note that this list is not exhaustive. </para><itemizedlist><listitem><para>Calendar and Addressbook (Radicale) </para></listitem><listitem><para>File Synchronization (Syncthing) </para></listitem><listitem><para>Web Search (Searx) </para></listitem><listitem><para>Wiki (<ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/MediaWiki#">MediaWiki</ulink>) </para></listitem><listitem><para>Wiki and Blog (Ikiwiki) </para></listitem></itemizedlist></section><section><title>Running a Tor relay</title><para>When Tor is installed, it is configured by default to run as a bridge relay. The relay or bridge option can be disabled through the Tor configuration page in Plinth. </para><para>At the bottom of the Tor page in Plinth, there is a list of ports used by the Tor relay. If your FreedomBox is behind a router, you will need to configure port forwarding on your router so that these ports can be reached from the public Internet. </para><para>The requirements to run a relay are listed in the <ulink url="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">Tor Relay Guide</ulink>. In short, it is   </para><itemizedlist><listitem><para>recommended that a relay has at least 16 Mbit/s (Mbps) upload and download bandwidth available for Tor. More is better. </para></listitem><listitem><para>required that a Tor relay be allowed to use a minimum of 100 GByte of outbound and of incoming traffic per month. </para></listitem><listitem><para>recommended that a &lt;40 Mbit/s non-exit relay should have at least 512 MB of RAM available; A relay faster than 40 Mbit/s should have at least 1 GB of RAM.  </para></listitem></itemizedlist></section><section><title>Using Tor SOCKS port (advanced)</title><para>FreedomBox provides a Tor SOCKS port that other applications can connect to, in order to route their traffic over the Tor network. This port is accessible on any interfaces configured in the internal firewall zone. To configure the application, set SOCKS Host to the internal network connection's IP address, and set the SOCKS Port to 9050. </para></section><section><title>Circumventing Tor censorship</title><para>If your ISP is trying to block Tor traffic, you can use tor bridge relays to connect to the tor network.  </para><para>1. Get the bridge configuration from the <ulink url="https://bridges.torproject.org/bridges">Tor BridgeDB</ulink> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor-bridge-db.png" width="800"/></imageobject><textobject><phrase>Tor BridgeDB</phrase></textobject></inlinemediaobject> </para><para>2. Add the lines to your FreedomBox Tor configuration as show below. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor-bridge-configuration.png" width="800"/></imageobject><textobject><phrase>Tor Configuration Page</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Tor</title><revhistory><revision><revnumber>19</revnumber><date>2019-06-09 10:47:56</date><authorinitials>David Jones</authorinitials><revremark>added two more apps to list</revremark></revision><revision><revnumber>18</revnumber><date>2019-05-22 17:10:34</date><authorinitials>David Jones</authorinitials><revremark>Corrected formatting; added transition sentence.</revremark></revision><revision><revnumber>17</revnumber><date>2019-05-22 17:05:45</date><authorinitials>David Jones</authorinitials><revremark>Started a list of apps accessible via Tor</revremark></revision><revision><revnumber>16</revnumber><date>2018-12-30 19:13:56</date><authorinitials>Drahtseil</authorinitials><revremark>relay requirements</revremark></revision><revision><revnumber>15</revnumber><date>2018-03-19 06:27:56</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add section on circumventing tor censorship</revremark></revision><revision><revnumber>14</revnumber><date>2018-03-19 06:25:43</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add section on circumventing tor censorship</revremark></revision><revision><revnumber>13</revnumber><date>2017-01-07 16:00:24</date><authorinitials>JamesValleroy</authorinitials><revremark>add image</revremark></revision><revision><revnumber>12</revnumber><date>2017-01-07 15:21:27</date><authorinitials>JamesValleroy</authorinitials><revremark>plural</revremark></revision><revision><revnumber>11</revnumber><date>2016-12-31 02:19:46</date><authorinitials>JamesValleroy</authorinitials><revremark>mention ssh</revremark></revision><revision><revnumber>10</revnumber><date>2016-12-31 02:19:03</date><authorinitials>JamesValleroy</authorinitials><revremark>add relay info</revremark></revision><revision><revnumber>9</revnumber><date>2016-12-23 18:31:29</date><authorinitials>JamesValleroy</authorinitials><revremark>undo outline level change</revremark></revision><revision><revnumber>8</revnumber><date>2016-12-23 18:30:06</date><authorinitials>JamesValleroy</authorinitials><revremark>move down outline level</revremark></revision><revision><revnumber>7</revnumber><date>2016-04-10 07:14:17</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>6</revnumber><date>2015-12-15 16:54:58</date><authorinitials>PhilippeBaret</authorinitials><revremark>Text finishing</revremark></revision><revision><revnumber>5</revnumber><date>2015-12-15 16:40:11</date><authorinitials>PhilippeBaret</authorinitials></revision><revision><revnumber>4</revnumber><date>2015-12-15 16:34:38</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Tor definition</revremark></revision><revision><revnumber>3</revnumber><date>2015-09-13 14:54:59</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Demote headings one level for inclusion into manual</revremark></revision><revision><revnumber>2</revnumber><date>2015-09-13 14:53:54</date><authorinitials>SunilMohanAdapa</authorinitials><revremark>Add FreedomBox category and portal</revremark></revision><revision><revnumber>1</revnumber><date>2015-09-12 15:55:05</date><authorinitials>JamesValleroy</authorinitials><revremark>create tor page</revremark></revision></revhistory></articleinfo><section><title>Anonymity Network (Tor)</title><section><title>What is Tor?</title><para>Tor is a network of servers operated by volunteers. It allows users of these servers to improve their privacy and security while surfing on the Internet. You and your friends are able to access to your FreedomBox via Tor network without revealing its IP address. Activating Tor application on your FreedomBox, you will be able to offer remote services (chat, wiki, file sharing, etc...) without showing your location. This application will give you a better protection than a public web server because you will be less exposed to intrusive people on the web. </para></section><section><title>Using Tor to browse anonymously</title><para>Tor Browser is the recommended way to browse the web using Tor. You can download the Tor Browser from <ulink url="https://www.torproject.org/projects/torbrowser.html"/> and follow the instructions on that site to install and run it. </para></section><section><title>Using Tor Hidden Service to access your FreedomBox</title><para>Tor Hidden Service provides a way to access your FreedomBox, even if it's behind a router, firewall, or carrier-grade NAT (i.e., your Internet Service Provider does not provide a public IPv4 address for your router). </para><para>To enable Tor Hidden Service, first navigate to the Anonymity Network (Tor) page. (If you don't see it, click on the FreedomBox logo at the top-left of the page, to go to the main Apps page.) On the Anonymity Network (Tor) page, under Configuration, check &quot;Enable Tor Hidden Service&quot;, then press the Update setup button. Tor will be reconfigured and restarted. </para><para>After a while, the page will refresh and under Status, you will see a table listing the Hidden Service .onion address. Copy the entire address (ending in .onion) and paste it into the Tor Browser's address field, and you should be able to access your FreedomBox. (You may see a certificate warning because FreedomBox has a self-signed certificate.) </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor_browser_plinth.png" width="800"/></imageobject><textobject><phrase>Tor Browser - Plinth</phrase></textobject></inlinemediaobject> </para><para>Currently only HTTP (port 80), HTTPS (port 443), and SSH (port 22) are accessible through the Tor Hidden Service configured on the FreedomBox. </para></section><section><title>Apps accessible via Tor</title><para>The following apps can be accessed over Tor. Note that this list is not exhaustive. </para><itemizedlist><listitem><para>Calendar and Addressbook (Radicale) </para></listitem><listitem><para>File Synchronization (Syncthing) </para></listitem><listitem><para>Web Search (Searx) </para></listitem><listitem><para>Wiki (<ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/MediaWiki#">MediaWiki</ulink>) </para></listitem><listitem><para>Wiki and Blog (Ikiwiki) </para></listitem></itemizedlist></section><section><title>Running a Tor relay</title><para>When Tor is installed, it is configured by default to run as a bridge relay. The relay or bridge option can be disabled through the Tor configuration page in Plinth. </para><para>At the bottom of the Tor page in Plinth, there is a list of ports used by the Tor relay. If your FreedomBox is behind a router, you will need to configure port forwarding on your router so that these ports can be reached from the public Internet. </para><para>The requirements to run a relay are listed in the <ulink url="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">Tor Relay Guide</ulink>. In short, it is   </para><itemizedlist><listitem><para>recommended that a relay has at least 16 Mbit/s (Mbps) upload and download bandwidth available for Tor. More is better. </para></listitem><listitem><para>required that a Tor relay be allowed to use a minimum of 100 GByte of outbound and of incoming traffic per month. </para></listitem><listitem><para>recommended that a &lt;40 Mbit/s non-exit relay should have at least 512 MB of RAM available; A relay faster than 40 Mbit/s should have at least 1 GB of RAM.  </para></listitem></itemizedlist></section><section><title>Using Tor SOCKS port (advanced)</title><para>FreedomBox provides a Tor SOCKS port that other applications can connect to, in order to route their traffic over the Tor network. This port is accessible on any interfaces configured in the internal firewall zone. To configure the application, set SOCKS Host to the internal network connection's IP address, and set the SOCKS Port to 9050. </para></section><section><title>Circumventing Tor censorship</title><para>If your ISP is trying to block Tor traffic, you can use tor bridge relays to connect to the tor network.  </para><para>1. Get the bridge configuration from the <ulink url="https://bridges.torproject.org/bridges">Tor BridgeDB</ulink> </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor-bridge-db.png" width="800"/></imageobject><textobject><phrase>Tor BridgeDB</phrase></textobject></inlinemediaobject> </para><para>2. Add the lines to your FreedomBox Tor configuration as show below. </para><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Tor?action=AttachFile&amp;do=get&amp;target=tor-bridge-configuration.png" width="800"/></imageobject><textobject><phrase>Tor Configuration Page</phrase></textobject></inlinemediaobject> </para><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Tor/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Transmission.raw.xml b/doc/Transmission.raw.xml
index 3762a0ec9..cb81eb757 100644
--- a/doc/Transmission.raw.xml
+++ b/doc/Transmission.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Transmission</title><revhistory><revision><revnumber>11</revnumber><date>2019-09-04 09:19:59</date><authorinitials>fioddor</authorinitials><revremark>Security recommendation</revremark></revision><revision><revnumber>10</revnumber><date>2019-03-22 07:08:45</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add tips on how to transfer downloads from FreedomBox to local PC</revremark></revision><revision><revnumber>9</revnumber><date>2016-12-31 02:07:57</date><authorinitials>JamesValleroy</authorinitials><revremark>add login info</revremark></revision><revision><revnumber>8</revnumber><date>2016-12-30 19:20:51</date><authorinitials>JamesValleroy</authorinitials><revremark>reword</revremark></revision><revision><revnumber>7</revnumber><date>2016-12-30 19:13:09</date><authorinitials>JamesValleroy</authorinitials><revremark>add intro paragraph</revremark></revision><revision><revnumber>6</revnumber><date>2016-12-30 18:59:46</date><authorinitials>JamesValleroy</authorinitials><revremark>no space in &quot;BitTorrent&quot;</revremark></revision><revision><revnumber>5</revnumber><date>2016-12-26 18:00:44</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshot</revremark></revision><revision><revnumber>4</revnumber><date>2016-09-01 19:04:35</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>3</revnumber><date>2016-04-10 07:27:22</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 20:42:02</date><authorinitials>PhilippeBaret</authorinitials></revision><revision><revnumber>1</revnumber><date>2015-12-15 18:23:33</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Transmission page and definition</revremark></revision></revhistory></articleinfo><section><title>BitTorrent (Transmission)</title><section><title>What is Transmission ?</title><para>BitTorrent is a communications protocol using peer-to-peer (P2P) file sharing. It is not anonymous; you should assume that others can see what files you are sharing. There are two BitTorrent web clients available in FreedomBox: Transmission and <ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Manual/Deluge#">Deluge</ulink>. They have similar features, but you may prefer one over the other. </para><para>Transmission is a lightweight BitTorrent client that is well known for its simplicity and a default configuration that &quot;Just Works&quot;. </para></section><section><title>Screenshot</title><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Transmission?action=AttachFile&amp;do=get&amp;target=transmission.png" width="800"/></imageobject><textobject><phrase>Transmission Web Interface</phrase></textobject></inlinemediaobject> </para></section><section><title>Using Transmission</title><para>After installing Transmission, it can be accessed at <code>https://&lt;your freedombox&gt;/transmission</code>. When you try to access this page, you will be required to login with a username and password. The default for both is &quot;transmission&quot;. You can and should change the username and password using the configuration form in Plinth. </para></section><section><title>Known Issues</title><itemizedlist><listitem><para>The initial password is shown in the Plinth configuration form in a hashed format. This prevents it from being read or copied. However, after the password is changed, it is shown directly, without hashing. </para></listitem></itemizedlist></section><section><title>Tips</title><section><title>Transferring Downloads from the FreedomBox</title><orderedlist numeration="arabic"><listitem><para>Transmission's downloads directory can be added as a shared folder in the &quot;Sharing&quot; app. You can then access your downloads from this shared folder using a web browser. </para></listitem><listitem><para>(Advanced) If you have the ssh access to your FreedomBox, you can use sftp to browse the downloads directory using a suitable file manager or web browser (e.g. dolphin or Konqueror). </para></listitem></orderedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Transmission</title><revhistory><revision><revnumber>11</revnumber><date>2019-09-04 09:19:59</date><authorinitials>fioddor</authorinitials><revremark>Security recommendation</revremark></revision><revision><revnumber>10</revnumber><date>2019-03-22 07:08:45</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Add tips on how to transfer downloads from FreedomBox to local PC</revremark></revision><revision><revnumber>9</revnumber><date>2016-12-31 02:07:57</date><authorinitials>JamesValleroy</authorinitials><revremark>add login info</revremark></revision><revision><revnumber>8</revnumber><date>2016-12-30 19:20:51</date><authorinitials>JamesValleroy</authorinitials><revremark>reword</revremark></revision><revision><revnumber>7</revnumber><date>2016-12-30 19:13:09</date><authorinitials>JamesValleroy</authorinitials><revremark>add intro paragraph</revremark></revision><revision><revnumber>6</revnumber><date>2016-12-30 18:59:46</date><authorinitials>JamesValleroy</authorinitials><revremark>no space in &quot;BitTorrent&quot;</revremark></revision><revision><revnumber>5</revnumber><date>2016-12-26 18:00:44</date><authorinitials>JamesValleroy</authorinitials><revremark>add screenshot</revremark></revision><revision><revnumber>4</revnumber><date>2016-09-01 19:04:35</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>3</revnumber><date>2016-04-10 07:27:22</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 20:42:02</date><authorinitials>PhilippeBaret</authorinitials></revision><revision><revnumber>1</revnumber><date>2015-12-15 18:23:33</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added Transmission page and definition</revremark></revision></revhistory></articleinfo><section><title>BitTorrent (Transmission)</title><section><title>What is Transmission ?</title><para>BitTorrent is a communications protocol using peer-to-peer (P2P) file sharing. It is not anonymous; you should assume that others can see what files you are sharing. There are two BitTorrent web clients available in FreedomBox: Transmission and <ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Manual/Deluge#">Deluge</ulink>. They have similar features, but you may prefer one over the other. </para><para>Transmission is a lightweight BitTorrent client that is well known for its simplicity and a default configuration that &quot;Just Works&quot;. </para></section><section><title>Screenshot</title><para><inlinemediaobject><imageobject><imagedata fileref="https://wiki.debian.org/FreedomBox/Manual/Transmission?action=AttachFile&amp;do=get&amp;target=transmission.png" width="800"/></imageobject><textobject><phrase>Transmission Web Interface</phrase></textobject></inlinemediaobject> </para></section><section><title>Using Transmission</title><para>After installing Transmission, it can be accessed at <code>https://&lt;your freedombox&gt;/transmission</code>. When you try to access this page, you will be required to login with a username and password. The default for both is &quot;transmission&quot;. You can and should change the username and password using the configuration form in Plinth. </para></section><section><title>Known Issues</title><itemizedlist><listitem><para>The initial password is shown in the Plinth configuration form in a hashed format. This prevents it from being read or copied. However, after the password is changed, it is shown directly, without hashing. </para></listitem></itemizedlist></section><section><title>Tips</title><section><title>Transferring Downloads from the FreedomBox</title><orderedlist numeration="arabic"><listitem><para>Transmission's downloads directory can be added as a shared folder in the &quot;Sharing&quot; app. You can then access your downloads from this shared folder using a web browser. </para></listitem><listitem><para>(Advanced) If you have the ssh access to your FreedomBox, you can use sftp to browse the downloads directory using a suitable file manager or web browser (e.g. dolphin or Konqueror). </para></listitem></orderedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Transmission/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></section></article>
\ No newline at end of file
diff --git a/doc/Upgrades.raw.xml b/doc/Upgrades.raw.xml
index 0d5577628..02e06adb8 100644
--- a/doc/Upgrades.raw.xml
+++ b/doc/Upgrades.raw.xml
@@ -9,4 +9,4 @@ Password: <enter user password here>
 # apt -f install
 # unattended-upgrade --debug
 # apt install freedombox
-# apt update]]></screen><para>If <code>apt-get update</code> asks for a confirmation to change <emphasis>Codename</emphasis> or other release information, confirm <emphasis>yes</emphasis>. If during update of <emphasis>freedombox</emphasis> package, if a question about overwriting configuration files is asked, answer to install new configuration files from the latest version of the package. This process will upgrade only packages that don't require configuration file questions (except for <emphasis>freedombox</emphasis> package). After this, let FreedomBox handle the upgrade of remaining packages. Be patient while new releases of FreedomBox are made to handle packages that require manual intervention. </para><para>If you want to go beyond the recommendation to upgrade all the packages on your FreedomBox and if you are really sure about handling the configuration changes for packages yourself, run the following command: </para><screen><![CDATA[$ apt dist-upgrade]]></screen><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+# apt update]]></screen><para>If <code>apt-get update</code> asks for a confirmation to change <emphasis>Codename</emphasis> or other release information, confirm <emphasis>yes</emphasis>. If during update of <emphasis>freedombox</emphasis> package, if a question about overwriting configuration files is asked, answer to install new configuration files from the latest version of the package. This process will upgrade only packages that don't require configuration file questions (except for <emphasis>freedombox</emphasis> package). After this, let FreedomBox handle the upgrade of remaining packages. Be patient while new releases of FreedomBox are made to handle packages that require manual intervention. </para><para>If you want to go beyond the recommendation to upgrade all the packages on your FreedomBox and if you are really sure about handling the configuration changes for packages yourself, run the following command: </para><screen><![CDATA[$ apt dist-upgrade]]></screen><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Upgrades/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/Users.raw.xml b/doc/Users.raw.xml
index 3418efddf..e8b27ce84 100644
--- a/doc/Users.raw.xml
+++ b/doc/Users.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/Users</title><revhistory><revision><revnumber>8</revnumber><date>2019-07-29 22:34:11</date><authorinitials>JamesValleroy</authorinitials><revremark>better wording</revremark></revision><revision><revnumber>7</revnumber><date>2019-07-29 22:22:17</date><authorinitials>JamesValleroy</authorinitials><revremark>remove &quot;Plinth&quot;</revremark></revision><revision><revnumber>6</revnumber><date>2019-07-29 22:10:39</date><authorinitials>JamesValleroy</authorinitials><revremark>mention which releases known issue applies to</revremark></revision><revision><revnumber>5</revnumber><date>2019-07-29 22:08:21</date><authorinitials>JamesValleroy</authorinitials><revremark>add more supported groups</revremark></revision><revision><revnumber>4</revnumber><date>2017-01-14 20:13:01</date><authorinitials>JamesValleroy</authorinitials><revremark>add known issue</revremark></revision><revision><revnumber>3</revnumber><date>2016-12-31 04:15:09</date><authorinitials>JamesValleroy</authorinitials><revremark>reword</revremark></revision><revision><revnumber>2</revnumber><date>2016-09-01 19:21:25</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 16:48:45</date><authorinitials>Drahtseil</authorinitials><revremark>Created Users</revremark></revision></revhistory></articleinfo><section><title>Users and Groups</title><para>You can grant access to your FreedomBox for other users. Provide the Username with a password and assign a group to it. Currently the groups </para><itemizedlist><listitem><para>admin </para></listitem><listitem><para>bit-torrent </para></listitem><listitem><para>ed2k </para></listitem><listitem><para>feed-reader </para></listitem><listitem><para>syncthing </para></listitem><listitem><para>web-search </para></listitem><listitem><para>wiki </para></listitem></itemizedlist><para>are supported.  </para><para>The user will be able to log in to services that support single sign-on through LDAP, if they are in the appropriate group. </para><para>Users in the admin group will be able to log in to all services. They can also log in to the system through SSH and have administrative privileges (sudo). </para><para>A user's groups can also be changed later-on.  </para><para>It is also possible to set an SSH public key which will allow this user to securely log in to the system without using a password. You may enter multiple keys, one on each line. Blank lines and lines starting with # will be ignored. </para><para>A user's account can be deactivated, which will temporarily disable the account. </para><section><title>Known Issues</title><itemizedlist><listitem><para>In Debian Stretch, the FreedomBox web interface does not distinguish between users and administrators. Every user added will have full access to the web interface. </para><itemizedlist><listitem><para>This issue is fixed in Debian Buster and later. </para></listitem></itemizedlist></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/Users</title><revhistory><revision><revnumber>8</revnumber><date>2019-07-29 22:34:11</date><authorinitials>JamesValleroy</authorinitials><revremark>better wording</revremark></revision><revision><revnumber>7</revnumber><date>2019-07-29 22:22:17</date><authorinitials>JamesValleroy</authorinitials><revremark>remove &quot;Plinth&quot;</revremark></revision><revision><revnumber>6</revnumber><date>2019-07-29 22:10:39</date><authorinitials>JamesValleroy</authorinitials><revremark>mention which releases known issue applies to</revremark></revision><revision><revnumber>5</revnumber><date>2019-07-29 22:08:21</date><authorinitials>JamesValleroy</authorinitials><revremark>add more supported groups</revremark></revision><revision><revnumber>4</revnumber><date>2017-01-14 20:13:01</date><authorinitials>JamesValleroy</authorinitials><revremark>add known issue</revremark></revision><revision><revnumber>3</revnumber><date>2016-12-31 04:15:09</date><authorinitials>JamesValleroy</authorinitials><revremark>reword</revremark></revision><revision><revnumber>2</revnumber><date>2016-09-01 19:21:25</date><authorinitials>Drahtseil</authorinitials><revremark>adapted title to Plinth wording</revremark></revision><revision><revnumber>1</revnumber><date>2016-08-21 16:48:45</date><authorinitials>Drahtseil</authorinitials><revremark>Created Users</revremark></revision></revhistory></articleinfo><section><title>Users and Groups</title><para>You can grant access to your FreedomBox for other users. Provide the Username with a password and assign a group to it. Currently the groups </para><itemizedlist><listitem><para>admin </para></listitem><listitem><para>bit-torrent </para></listitem><listitem><para>ed2k </para></listitem><listitem><para>feed-reader </para></listitem><listitem><para>syncthing </para></listitem><listitem><para>web-search </para></listitem><listitem><para>wiki </para></listitem></itemizedlist><para>are supported.  </para><para>The user will be able to log in to services that support single sign-on through LDAP, if they are in the appropriate group. </para><para>Users in the admin group will be able to log in to all services. They can also log in to the system through SSH and have administrative privileges (sudo). </para><para>A user's groups can also be changed later-on.  </para><para>It is also possible to set an SSH public key which will allow this user to securely log in to the system without using a password. You may enter multiple keys, one on each line. Blank lines and lines starting with # will be ignored. </para><para>A user's account can be deactivated, which will temporarily disable the account. </para><section><title>Known Issues</title><itemizedlist><listitem><para>In Debian Stretch, the FreedomBox web interface does not distinguish between users and administrators. Every user added will have full access to the web interface. </para><itemizedlist><listitem><para>This issue is fixed in Debian Buster and later. </para></listitem></itemizedlist></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/Users/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/ejabberd.raw.xml b/doc/ejabberd.raw.xml
index c25c0c007..d57da769f 100644
--- a/doc/ejabberd.raw.xml
+++ b/doc/ejabberd.raw.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE article
   PUBLIC '-//OASIS//DTD DocBook XML V4.4//EN'
   'http://www.docbook.org/xml/4.4/docbookx.dtd'>
-<article><articleinfo><title>FreedomBox/Manual/ejabberd</title><revhistory><revision><revnumber>12</revnumber><date>2019-03-01 17:43:12</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix PageKite url</revremark></revision><revision><revnumber>11</revnumber><date>2019-02-27 00:06:38</date><authorinitials>JamesValleroy</authorinitials><revremark>make title consistent with FreedomBox interface</revremark></revision><revision><revnumber>10</revnumber><date>2018-03-02 13:01:38</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Consistent naming conventions</revremark></revision><revision><revnumber>9</revnumber><date>2017-01-07 17:42:27</date><authorinitials>JamesValleroy</authorinitials><revremark>add note about service restart</revremark></revision><revision><revnumber>8</revnumber><date>2017-01-02 13:48:30</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>7</revnumber><date>2016-12-31 03:11:19</date><authorinitials>JamesValleroy</authorinitials><revremark>clarify</revremark></revision><revision><revnumber>6</revnumber><date>2016-12-31 03:10:19</date><authorinitials>JamesValleroy</authorinitials><revremark>mention web client</revremark></revision><revision><revnumber>5</revnumber><date>2016-12-31 02:35:52</date><authorinitials>JamesValleroy</authorinitials><revremark>add security info</revremark></revision><revision><revnumber>4</revnumber><date>2016-09-04 10:31:37</date><authorinitials>Drahtseil</authorinitials><revremark>added links</revremark></revision><revision><revnumber>3</revnumber><date>2016-04-10 07:18:35</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 18:37:29</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added definition to Chat server page</revremark></revision><revision><revnumber>1</revnumber><date>2015-09-20 23:52:11</date><authorinitials>JamesValleroy</authorinitials><revremark>add xmpp page</revremark></revision></revhistory></articleinfo><section><title>Chat Server (ejabberd)</title><section><title>What is XMPP?</title><para>XMPP is a federated protocol for Instant Messaging. This means that users who have accounts on one server, can talk to users that are on another server. XMPP can also be used for voice and video calls, if supported by the clients. </para><para>With XMPP, there are two ways that conversations can be secured: </para><orderedlist numeration="arabic"><listitem><para>TLS: This secures the connection between the client and server, or between two servers. This should be supported by all clients and is highly recommended. </para></listitem><listitem><para>End-to-end: This secures the messages sent from one client to another, so that even the server cannot see the contents. The latest and most convenient protocol is called OMEMO, but it is only supported by a few clients. There is another protocol called OTR that may be supported by some clients that lack OMEMO support. Both clients must support the same protocol for it to work. </para></listitem></orderedlist></section><section><title>Setting the Domain Name</title><para>For XMPP to work, your FreedomBox needs to have a Domain Name that can be accessed over the public Internet. You can read more about obtaining a Domain Name in the <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual/DynamicDNS#">Dynamic DNS section of this manual</ulink>. </para><para>Once you have a Domain Name, you can tell your FreedomBox to use it by setting the Domain Name in the System <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual/Configure#">Configuration</ulink>. </para><itemizedlist><listitem><para>Note: After changing your Domain Name, the Chat Server (XMPP) page may show that the service is not running. After a minute or so, it should be up and running again. </para></listitem></itemizedlist><para>Please note that <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual/PageKite#">PageKite</ulink> does not support the XMPP protocol at this time. </para></section><section><title>Registering XMPP users through SSO</title><para>Currently, all users created through Plinth will be able to login to the XMPP server. You can add new users through the System Users and Groups module. It does not matter which Groups are selected for the new user. </para></section><section><title>Using the web client</title><para>After the XMPP module install completes, the JSXC web client for XMPP can be accessed at <code>https://&lt;your freedombox&gt;/plinth/apps/xmpp/jsxc/</code>. It will automatically check the BOSH server connection to the configured domain name. </para></section><section><title>Using a desktop or mobile client</title><para><ulink url="https://xmpp.org/software/clients.html">XMPP clients</ulink> are available for various desktop and mobile platforms. </para></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for XMPP: </para><itemizedlist><listitem><para>TCP 5222 (client-to-server) </para></listitem><listitem><para>TCP 5269 (server-to-server) </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Blog#">Blog</ulink>     </para></entry></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, September 14th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
+<article><articleinfo><title>FreedomBox/Manual/ejabberd</title><revhistory><revision><revnumber>12</revnumber><date>2019-03-01 17:43:12</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Fix PageKite url</revremark></revision><revision><revnumber>11</revnumber><date>2019-02-27 00:06:38</date><authorinitials>JamesValleroy</authorinitials><revremark>make title consistent with FreedomBox interface</revremark></revision><revision><revnumber>10</revnumber><date>2018-03-02 13:01:38</date><authorinitials>JosephNuthalapati</authorinitials><revremark>Consistent naming conventions</revremark></revision><revision><revnumber>9</revnumber><date>2017-01-07 17:42:27</date><authorinitials>JamesValleroy</authorinitials><revremark>add note about service restart</revremark></revision><revision><revnumber>8</revnumber><date>2017-01-02 13:48:30</date><authorinitials>JamesValleroy</authorinitials><revremark>add port forwarding info</revremark></revision><revision><revnumber>7</revnumber><date>2016-12-31 03:11:19</date><authorinitials>JamesValleroy</authorinitials><revremark>clarify</revremark></revision><revision><revnumber>6</revnumber><date>2016-12-31 03:10:19</date><authorinitials>JamesValleroy</authorinitials><revremark>mention web client</revremark></revision><revision><revnumber>5</revnumber><date>2016-12-31 02:35:52</date><authorinitials>JamesValleroy</authorinitials><revremark>add security info</revremark></revision><revision><revnumber>4</revnumber><date>2016-09-04 10:31:37</date><authorinitials>Drahtseil</authorinitials><revremark>added links</revremark></revision><revision><revnumber>3</revnumber><date>2016-04-10 07:18:35</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added bottom navigation link</revremark></revision><revision><revnumber>2</revnumber><date>2015-12-15 18:37:29</date><authorinitials>PhilippeBaret</authorinitials><revremark>Added definition to Chat server page</revremark></revision><revision><revnumber>1</revnumber><date>2015-09-20 23:52:11</date><authorinitials>JamesValleroy</authorinitials><revremark>add xmpp page</revremark></revision></revhistory></articleinfo><section><title>Chat Server (ejabberd)</title><section><title>What is XMPP?</title><para>XMPP is a federated protocol for Instant Messaging. This means that users who have accounts on one server, can talk to users that are on another server. XMPP can also be used for voice and video calls, if supported by the clients. </para><para>With XMPP, there are two ways that conversations can be secured: </para><orderedlist numeration="arabic"><listitem><para>TLS: This secures the connection between the client and server, or between two servers. This should be supported by all clients and is highly recommended. </para></listitem><listitem><para>End-to-end: This secures the messages sent from one client to another, so that even the server cannot see the contents. The latest and most convenient protocol is called OMEMO, but it is only supported by a few clients. There is another protocol called OTR that may be supported by some clients that lack OMEMO support. Both clients must support the same protocol for it to work. </para></listitem></orderedlist></section><section><title>Setting the Domain Name</title><para>For XMPP to work, your FreedomBox needs to have a Domain Name that can be accessed over the public Internet. You can read more about obtaining a Domain Name in the <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual/DynamicDNS#">Dynamic DNS section of this manual</ulink>. </para><para>Once you have a Domain Name, you can tell your FreedomBox to use it by setting the Domain Name in the System <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual/Configure#">Configuration</ulink>. </para><itemizedlist><listitem><para>Note: After changing your Domain Name, the Chat Server (XMPP) page may show that the service is not running. After a minute or so, it should be up and running again. </para></listitem></itemizedlist><para>Please note that <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual/PageKite#">PageKite</ulink> does not support the XMPP protocol at this time. </para></section><section><title>Registering XMPP users through SSO</title><para>Currently, all users created through Plinth will be able to login to the XMPP server. You can add new users through the System Users and Groups module. It does not matter which Groups are selected for the new user. </para></section><section><title>Using the web client</title><para>After the XMPP module install completes, the JSXC web client for XMPP can be accessed at <code>https://&lt;your freedombox&gt;/plinth/apps/xmpp/jsxc/</code>. It will automatically check the BOSH server connection to the configured domain name. </para></section><section><title>Using a desktop or mobile client</title><para><ulink url="https://xmpp.org/software/clients.html">XMPP clients</ulink> are available for various desktop and mobile platforms. </para></section><section><title>Port Forwarding</title><para>If your FreedomBox is behind a router, you will need to set up port forwarding on your router. You should forward the following ports for XMPP: </para><itemizedlist><listitem><para>TCP 5222 (client-to-server) </para></listitem><listitem><para>TCP 5269 (server-to-server) </para></listitem></itemizedlist><para>Back to <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Features#">Features introduction</ulink> or <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual#">manual</ulink> pages. </para><!--rule (<hr>) is not applicable to DocBook--><informaltable><tgroup cols="8"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><colspec colname="col_3"/><colspec colname="col_4"/><colspec colname="col_5"/><colspec colname="col_6"/><colspec colname="col_7"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1"><para><emphasis role="strong">Information</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Support</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Contribute</emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><emphasis role="strong">Reports</emphasis></para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong">Promote</emphasis></para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Introduction#">Overview</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Hardware#">Hardware</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Support#">Live Help</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Contribute#">Where To Start</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Translate#">Translate</ulink>    </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/ProgressCalls#">Calls</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/TalksAndPresentations#">Talks</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Features#">Features</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Vision#">Vision</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/QuestionsAndAnswers#">Q&amp;A</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Design#">Design</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/TODO#">To Do</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/ReleaseNotes#">Releases</ulink>       </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Press#">Press</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Download#">Download</ulink>     </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Manual#">Manual</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><emphasis role="strong"> </emphasis></para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Contribute/Code#">Code</ulink>      </para></entry><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Contributors#">Contributors</ulink>      </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"><para><ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/FreedomBox/Blog#">Blog</ulink>     </para></entry></row><row rowsep="1"><entry colsep="1" nameend="col_1" namest="col_0" rowsep="1"><para> <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> </para></entry><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/><entry colsep="1" rowsep="1"/></row></tbody></tgroup></informaltable><para><!--"~-smaller-~" is not applicable to DocBook-->HELP &amp; DISCUSSIONS: <ulink url="https://discuss.freedombox.org">Discussion Forum</ulink> - <ulink url="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">Mailing List</ulink> - <ulink url="irc://irc.debian.org/freedombox">#freedombox irc.debian.org</ulink> | CONTACT <ulink url="https://freedomboxfoundation.org/">Foundation</ulink> | JOIN <ulink url="https://salsa.debian.org/freedombox-team/">Project</ulink>  </para><para><link linkend="">Next call</link>: Saturday, October 12th at 14:00 UTC </para><para><link linkend="">Latest news</link>: Announcing Pioneer FreedomBox Kits - 2019-03-26 </para><para>This page is copyright its contributors and is licensed under the <ulink url="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</ulink> license. </para><!--rule (<hr>) is not applicable to DocBook--><para> <ulink url="https://wiki.debian.org/FreedomBox/Manual/ejabberd/CategoryFreedomBox#">CategoryFreedomBox</ulink> </para></section></section></article>
\ No newline at end of file
diff --git a/doc/freedombox-manual.raw.xml b/doc/freedombox-manual.raw.xml
index c3d9cfefe..9d2172900 100644
--- a/doc/freedombox-manual.raw.xml
+++ b/doc/freedombox-manual.raw.xml
@@ -509,6 +509,11 @@
       <para>It can also be carried along with your laptop and used to connect to public networks at work, school or office to avail its services. </para>
       <para>It could be used in a village to make available digital communications throughout the village. In the future, FreedomBox intends to deliver support for alternative ways of connecting to the Internet such as Mesh networking. </para>
     </section>
+    <section>
+      <title>Advanced usage: For Communities</title>
+      <para>The primary design goal of FreedomBox is to be used as a personal server at home for use by a single family and their friends. However, at the core, it is a server software that can aid a non-technical user to setup services and maintain them with ease. Security is automatically managed and many of the technical choices in system administration are taken care by the software automatically thereby reducing complexity for a non-technical user. This nature of FreedomBox makes it well-suited for hosting services for small communities like villages or small firms. Communities can host their own services using FreedomBox with minimal effort. They can setup Wi-Fi networks that span the entire area of the community and draw Internet connections from long distances. Community members can enjoy previously unavailable Internet connectivity, ubiquitous Wi-Fi coverage, free VOIP services, offline education and entertainment content, etc. This will also boost privacy for individuals in the community, reduce dependence on centralized services provided by large companies and make them resistant to censorship. </para>
+      <para>The free e-book <ulink url="https://en.wikibooks.org/wiki/FreedomBox_for_Communities">FreedomBox for Communities</ulink> describes the motivation and provides detailed instructions to setup FreedomBox for this use case. Members of the FreedomBox project are involved in setting up Wi-Fi networks with free Internet connectivity in rural India. This e-book documents their knowledge and experiences. </para>
+    </section>
     <section>
       <title>FreedomBox Interface</title>
       <section>
@@ -1879,7 +1884,7 @@ if [ -f /etc/default/radicale.dpkg-dist ] ; then cp /etc/default/radicale.dpkg-d
         <title>Synchronizing over Tor</title>
         <para><ulink url="https://wiki.debian.org/FreedomBox/Manual/SyncThing#">SyncThing</ulink> should automatically sync with your <ulink url="https://wiki.debian.org/FreedomBox/Manual/FreedomBox#">FreedomBox</ulink> even if it is only accessible as a Tor hidden service. </para>
         <para>If you would like to proxy your Syncthing client over Tor, set the all_proxy environment variable: </para>
-        <para>$ all_proxy=socks5://localhost:9050 syncthing </para>
+        <screen><![CDATA[$ all_proxy=socks5://localhost:9050 syncthing]]></screen>
         <para>For more information, see the Syncthing documentation on <ulink url="https://docs.syncthing.net/users/proxying.html">using proxies</ulink>. </para>
       </section>
     </section>
@@ -2491,11 +2496,11 @@ if [ -f /etc/default/radicale.dpkg-dist ] ; then cp /etc/default/radicale.dpkg-d
           </listitem>
           <listitem>
             <para>The downloaded profile contains the domain name of the FreedomBox that the client should connect to. This is picked up from the domain configured in 'Config' section of 'System' page. In case your domain is not configured properly, you may need to change this value after downloading the profile. If your OpenVPN client allows it, you can do this after importing the OpenVPN profile. Otherwise, you can edit the .ovpn profile file in a text editor and change the 'remote' line to contain the WAN IP address or hostname of your FreedomBox as follows. </para>
-          </listitem>
-        </orderedlist>
-        <screen><![CDATA[client
+            <screen><![CDATA[client
 remote mybox.sds-ip.de 1194
 proto udp]]></screen>
+          </listitem>
+        </orderedlist>
       </section>
       <section>
         <title>Browsing Internet after connecting to VPN</title>
@@ -2687,7 +2692,7 @@ proto udp]]></screen>
     </section>
     <section>
       <title>Web Proxy (Privoxy)</title>
-      <para>A web proxy acts as a filter for incoming and outgoing internet traffic. Thus, you can instruct any computer in your network to pass internet traffic through the proxy to remove unwanted ads and tracking mechanisms. </para>
+      <para>A web proxy acts as a filter for incoming and outgoing web traffic. Thus, you can instruct any computer in your network to pass internet traffic through the proxy to remove unwanted ads and tracking mechanisms. </para>
       <para>Privoxy is a software for security, privacy, and accurate control over the web. It provides a much more powerful web proxy (and anonymity on the web) than what your browser can offer. Privoxy "is a proxy that is primarily focused on privacy enhancement, ad and junk elimination and freeing the user from restrictions placed on his activities" (source: <ulink url="http://www.privoxy.org/faq/index.html">Privoxy FAQ</ulink>). </para>
       <section>
         <title>Screencast</title>
@@ -9826,6 +9831,23 @@ wget https://www.thinkpenguin.com/files/ath9k_firmware_free-version/htc_7010.fw]
     <section>
       <title>Release Notes</title>
       <para>The following are the release notes for each FreedomBox version. </para>
+      <section>
+        <title>FreedomBox 19.17 (2019-09-23)</title>
+        <itemizedlist>
+          <listitem>
+            <para>firstboot: Add new help menu to firstboot navbar </para>
+          </listitem>
+          <listitem>
+            <para>firstboot: Hide left menu during first boot as intended </para>
+          </listitem>
+          <listitem>
+            <para>Update translations for Chinese (Simplified) and Czech </para>
+          </listitem>
+          <listitem>
+            <para>Fix tests for letsencrypt and tor </para>
+          </listitem>
+        </itemizedlist>
+      </section>
       <section>
         <title>FreedomBox 19.16 (2019-09-09)</title>
         <itemizedlist>

From aca0c65d68a2ae49620548aa8a24682b78f5ecb3 Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Mon, 23 Sep 2019 18:15:17 -0400
Subject: [PATCH 11/11] Release v19.17 to unstable

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
---
 debian/changelog   | 24 ++++++++++++++++++++++++
 plinth/__init__.py |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4f621bd6b..7e9cc6301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+plinth (19.17) unstable; urgency=medium
+
+  [ Pavel Borecki ]
+  * Translated using Weblate (Czech)
+  * Translated using Weblate (Czech)
+
+  [ Anxin YI ]
+  * Translated using Weblate (Chinese (Simplified))
+
+  [ Joseph Nuthalapati ]
+  * firstboot: network connections not used, cleanup
+  * firstboot: Add new help menu to firstboot navbar
+
+  [ Sunil Mohan Adapa ]
+  * letsencrypt: Update and fix tests involving domain changes
+  * tor: Fix test case for getting status
+  * firstboot: Hide left menu during first boot as intended
+
+  [ James Valleroy ]
+  * locale: Update translation strings
+  * doc: Fetch latest manual
+
+ -- James Valleroy <jvalleroy@mailbox.org>  Mon, 23 Sep 2019 18:14:40 -0400
+
 plinth (19.16) unstable; urgency=medium
 
   [ Joseph Nuthalapati ]
diff --git a/plinth/__init__.py b/plinth/__init__.py
index 32a402b3c..f16631a6a 100644
--- a/plinth/__init__.py
+++ b/plinth/__init__.py
@@ -18,4 +18,4 @@
 Package init file.
 """
 
-__version__ = '19.16'
+__version__ = '19.17'