templates update

Templates.md

@@ -5,16 +5,46 @@ permalink: /doc/Templates/
 redirect_from: /wiki/Templates/
 ---
 
-ITL Supported
+Templates
--------------
+=========
+
+Every AppVM in Qubes is based on some template, this is where all the software
+available for AppVMs is installed. Default template is based on Fedora, but
+there are additional templates based on other Linux distributions, or with some
+additional software installed by default. This concept is described
+[here](/doc/GettingStarted/#appvms-domains-and-templatevms).
+
+Some templates are available in ready to use binary form, but some of them are
+only as a source code, which can be built using [Qubes Builder](/doc/QubesBuilder/).
+Especially some templates "flavors" are available in source code form only.
+Take a look at [Qubes Builder
+documentation](https://github.com/QubesOS/qubes-builder/blob/master/README.md)
+how to compile them.
+
+ITL Supported templates
+-----------------------
+
+For those templates ITL is responsible for build and releasing updates,
+especially ITL guarantees that the binary updates are compiled from exactly
+the source code we publish.
 
 -   Fedora
 -   [Fedora - Minimal](/doc/Templates/FedoraMinimal)
-
-Community Supported
--------------------
-
 -   [Debian](/doc/Templates/Debian/)
+
+Community Supported templates
+-----------------------------
+
+Those templates are supported by Qubes Community. Some of them are available in
+ready to use binary package (built by ITL), some are only in source code form.
+In any case ITL does not provide updates for those templates, but such updates
+can be provided by template maintainer.
+
+In short - by installing those templates, you trust not only ITL and
+distribution maintainers, but also the template maintainer. It can also happen
+that those templates are somehow less stable, because we do not test them.
+
 -   [Whonix](/doc/Templates/Whonix/)
+-   [Ubuntu](/doc/Templates/Ubuntu/)
 -   [Archlinux](/doc/Templates/Archlinux/)
 

Templates/Archlinux.md

@@ -13,6 +13,13 @@ be considered experimental as Qubes developers team use mainly Fedora-based VMs
 to test new features/updates.
 
 Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr).
+He also provides binary updates for the template, which are signed using this
+key:
+
+    pub   2048R/C1833B9C 2014-03-27 [expires: 2016-03-26]
+          Key fingerprint = D85E E12F 9678 51CC F433  515A 2043 E7AC C183 3B9C
+    uid                  Olivier MEDOC (Qubes-OS signing key) <o_medoc@yahoo.fr>
+
 
 Install
 -------

Templates/Debian.md

@@ -8,7 +8,18 @@ redirect_from: /wiki/Templates/Debian/
 Debian template(s)
 ===============
 
-Debian template(s) are one of the templates made by Qubes community. It should be considered experimental as Qubes developers team use mainly Fedora-based VMs to test new features/updates.
+If you like to use Debian Linux distribution in your AppVMs, you can install one of available Debian templates.
+
+Updates for this template are provided by ITL and are signed by this key:
+
+    pub   4096R/47FD92FA 2014-07-27
+          Key fingerprint = 2D43 E932 54EE EA7C B31B  6A77 5E58 18AB 47FD 92FA
+    uid                  Qubes OS Debian Packages Signing Key
+
+The key is already installed when you install (signed) template package. You
+can also obtain the key from [git
+repository](https://github.com/QubesOS/qubes-core-agent-linux/blob/master/misc/qubes-archive-keyring.gpg),
+which is also integrity-protected using signed git tags.
 
 Install
 -------
@@ -17,13 +28,11 @@ It can be installed via the following command:
 
 Debian 7 (wheezy) - stable:
 
-    [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-debian-7
+    [user@dom0 ~]$ sudo qubes-dom0-update qubes-template-debian-7
 
 Debian 8 (jessie) - testing:
 
-    [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-debian-8
+    [user@dom0 ~]$ sudo qubes-dom0-update qubes-template-debian-8
-
-When installing on R2, add "-x64" suffix to the package name.
 
 Known issues
 ------------

Templates/Ubuntu.md

@@ -0,0 +1,29 @@
+---
+layout: doc
+title: Ubuntu
+permalink: /doc/Templates/Ubuntu/
+redirect_from: /wiki/Templates/Ubuntu/
+---
+
+Ubuntu template(s)
+==================
+
+If you like to use Ubuntu Linux distribution in your AppVMs, you can build and
+install one of available Ubuntu templates. Those template currently are not
+available in ready to use binary packages.
+
+Install
+-------
+
+It can built using [Qubes Builder](/doc/QubesBuilder/). You can also access its
+documentation in the [source code
+repository](https://github.com/QubesOS/qubes-builder/blob/master/README.md).
+
+To quickly prepare the builder configuration, you can use `setup` script
+available in the repository - it will interactively ask you which templates you
+want to build.
+
+Known issues
+------------
+
+If you want to help in improving the template, feel free to [contribute](/wiki/ContributingHowto).