Merge ~yoboy-leguesh/ubuntu-fr-guide:maj1704 into ubuntu-fr-guide:master

[YoBoY]

Mise à jour des guides pour les versions supportées (16.04 et 17.04).
Modification du README suite passage à git pour le code source.
Suppression des fichiers obsolètes.

Mise à jour des guides pour les versions supportées (16.04 et 17.04).
Modification du README suite passage à git pour le code source.
Suppression des fichiers obsolètes.

diff --git a/README.txt b/README.txt
index ec68e3f..7544723 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
---------------------------------------------------
+---------------------------------------------------
 +          Organisation des Dossiers             +
 --------------------------------------------------
 [htdocs] contient les fichiers html à mettre sur le web
@@ -11,15 +11,16 @@
 1 - Installer les paquets nécessaires
 Pour générer les guides ci-dessous il y a quelques paquets indispensables.
 Pour tous les installer, taper la commande suivante dans un terminal :
-  sudo apt-get install bzr gnome-common yelp-tools gnome-doc-utils 
+  sudo apt-get install bzr git gnome-common yelp-tools gnome-doc-utils 
 
 
 2 - Récupérer le code sur launchpad des guides
 On suppose que vous venez de télécharger la dernière version de notre site guides…
 Si ce n'est pas le cas :
-  bzr branch lp:ubuntu-fr-guides
+  git clone lp:ubuntu-fr-guide
 ou pour mettre à jour :
-  bzr pull lp:ubuntu-fr-guides
+  git checkout master
+  git pull
 
 Télécharger (ou mettre à jour) les branches du projet source.
 /!\ la dernière version est peut être encore dans la branche principale (lp:ubuntu-docs)
@@ -75,6 +76,9 @@ Se placer dans le dossier de travail
 Une fois que tout est généré, il faut encore recopier tous ces fichiers html dans 
 le dossier [htdocs] de notre projet, ce sont ces fichiers que nous allons versionner.
 
+Commencez tout d'abord par créer votre branche de travail
+  git checkout -b [nomdelupdate]
+
 Pour les guides systèmes ces fichiers sont dans [desktop/*/html/build/fr]. Il suffit
 de recopier l'intégralité du contenu de ce dossier dans le dossier adéquat.
   cp -R desktop/precise/html/build/fr/* htdocs/12.04/desktop/
@@ -83,7 +87,7 @@ Pour les guides serveur ces fichiers sont dans [server/*/build/serverguide/fr]. 
 de recopier l'intégralité du contenu de ce dossier dans le dossier adéquat, ainsi
 que quelques dossiers complémentaires.
   cp -R server/precise/build/serverguide/fr/* htdocs/12.04/server/
-  cp -R server/precise/build/img htdocs/12/04/server/
+  cp -R server/precise/build/img htdocs/12.04/server/
   cp -R server/precise/build/serverguide/sample htdocs/12.04/server/
 
 Pour finir, dans le cas où une nouvelle version des guides est mise en place, il
@@ -91,23 +95,21 @@ faut créer les liens dans le fichiers index.html, modifier quelques liens exist
 pour pointer sur les bonnes versions, et pour finir créer quelques liens symboliques
 vers les dossiers.
 
-Dans les nouveaux dossiers des guides (exemple pour la 13.10) :
-  ln -s ./../redirect.html htdocs/13.10/index.html
+Dans les nouveaux dossiers des guides (exemple pour la 18.04) :
+  ln -s ./../redirect.html htdocs/18.04/index.html
 
-À la racine du site (exemple pour la 13.10) pour permettre de toujours pointer sur
+À la racine du site (exemple pour la 18.04) pour permettre de toujours pointer sur
 la dernière version :
-  ln -s ./13.10/desktop htdocs/desktop
-  ln -s ./13.10/server htdocs/server
+  ln -s ./18.04/desktop htdocs/desktop
+  ln -s ./18.04/server htdocs/server
 
 Ne pas oublier d'ajouter dans les fichier ignorer les nouveaux dossiers des branches
-des documentations, pour cela éditer le fichier .bzrignore
+des documentations, pour cela éditer le fichier .gitignore
 
 Il ne reste plus qu'à versionner le tout et à le ré-uploader sur Launchpad dans 
 votre espace personnel, et à le proposer en "merge" sur la branche principale.
-  bzr add
-  bzr remove
-  bzr commit -m
-  bzr push lp:~[launchpad-id]/ubuntu-fr-guide/[nomdelupdate]
-  bzr lp-merge-proposal lp:ubuntu-fr-guide
+  git add .
+  git commit -m
+  git push origin [nomdelupdate]
 
 Merci d'aider à la mise à jour des guides systèmes.
diff --git a/desktop/Makefile1210 b/desktop/Makefile1210
deleted file mode 100644
index 6961b83..0000000
--- a/desktop/Makefile1210
+++ /dev/null
@@ -1,111 +0,0 @@
-####################################################################################           
-# Makefile for the GNOME Ubuntu Documentation
-# Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#    On Debian based systems a copy of the GPL can be found 
-#    at /usr/share/common-licenses/GPL
-#
-####################################################################################
-
-MAKECMD=make
-HTMLDESTDIR=build
-SRCDIR=../ubuntu-help
-SED=/bin/sed
-INSTALLDIR=/var/www/12.10/
-URLFIXER=fix-urls.sed
-
-# Space-separated list of language codes for documents. HTML will only be
-# built for those codes in the list
-# Ex. HELP_LINGUAS=ja it for Japanese and Italian
-# Note that the corresponding .page files for the locales must have been built
-# for the HTML to be built in turn. This means all the locales for which
-# HTML output is needed will have to have been specified in the main
-# HELP_LINGUAS variable in the ubuntu-help Makefile
-# HELP_LINGUAS = ast az bs ca cs da de el en_AU en_CA en_GB es fi fo fr gl hi hr hu id it ja kk kn ko lt lv mg ms my nb nl oc pl pt pt_BR ru sk sl sq sr sv ta te tr ug uk uz zh_CN zh_TW
-HELP_LINGUAS = fr
-
-index_file_exists = $(wildcard $(SRCDIR)/$(lingua)/index.page)
-linguas := $(HELP_LINGUAS)
-help_linguas := \
-    $(foreach lingua, $(linguas), \
-        $(if $(index_file_exists), \
-            $(lingua), \
-            $(warning Cannot find source index page for locale: $(lingua), \
-                skipping. You will probably have to build it adding it to \
-                the HELP_LINGUAS variable in the Makefile at $(SRCDIR) \
-                and rebuild)))
-
-# Ubuntu Mallard Customization Layer
-# UBUNTUXSL=ubuntu.xsl
-UBUNTUXSL=../../ubuntu-1210-fr.xsl
-
-# Builds the HTML files for all specified language codes, specifiying the
-# language in the final documents and performing some other necessary
-# text replacements not handled by yelp-build.
-# Language codes are normalized to IETF format, as opposed to glibc format
-ubuntu-help: clean style
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		yelp-build html -o "$(HTMLDESTDIR)/$$lang/" -x $(UBUNTUXSL) \
-			"$(SRCDIR)/$$lc/"; \
-		$(SED) -i \
-			-e '1s/^/<!DOCTYPE html\>\n/' \
-			-e "s/<html>/<html lang="$$lang">/" \
-			-e 's|/usr/share/icons/.*/\(.*\.svg\)|img/\1|'\
-			"$(HTMLDESTDIR)/$$lang/"*.html; \
-		$(SED) -i -f "$(URLFIXER)" "$(HTMLDESTDIR)/$$lang/"*.html; \
-		echo "\nSearching for unfixed ghelp links:"; \
-		grep "href=\"ghelp:" "$(HTMLDESTDIR)/$$lang/"*.html; \
-		rm -rf "$(HTMLDESTDIR)/$$lang/usr"; \
-	done
-
-clean:
-	rm -rf build
-
-# Copy style sheet and common images to build directory
-# TODO: copy C/figures to destination only for those cases where there are
-# no localized figures
-style:
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		mkdir -p "$(HTMLDESTDIR)/$$lang/img"; \
-		mkdir -p "$(HTMLDESTDIR)/$$lang/figures"; \
-		cp img/* "$(HTMLDESTDIR)/$$lang/img"; \
-		cp "$(SRCDIR)/C/figures/"* "$(HTMLDESTDIR)/$$lang/figures"; \
-	done
-
-# Installs all HTML files to a multilingual site (e.g. run with Apache and
-# MultiViews enabled)
-install:
-	rm -Rf "$(INSTALLDIR)"/*; \
-	cp -R "$(HTMLDESTDIR)/"* "$(INSTALLDIR)"; \
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		find "$(INSTALLDIR)/$$lang" -type f -exec mv {} {}.$$lang \; ; \
-		cp -af "$(INSTALLDIR)/$$lang"/* "$(INSTALLDIR)"; \
-		rm -Rf "$(INSTALLDIR)/$$lang" ; \
-	done
diff --git a/desktop/Makefile1304 b/desktop/Makefile1304
deleted file mode 100644
index eceb5ee..0000000
--- a/desktop/Makefile1304
+++ /dev/null
@@ -1,110 +0,0 @@
-####################################################################################           
-# Makefile for the GNOME Ubuntu Documentation
-# Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#    On Debian based systems a copy of the GPL can be found 
-#    at /usr/share/common-licenses/GPL
-#
-####################################################################################
-
-MAKECMD=make
-HTMLDESTDIR=build
-SRCDIR=../ubuntu-help
-SED=/bin/sed
-INSTALLDIR=/var/www/13.04/
-URLFIXER=fix-urls.sed
-
-# Space-separated list of language codes for documents. HTML will only be
-# built for those codes in the list
-# Ex. HELP_LINGUAS=ja it for Japanese and Italian
-# Note that the corresponding .page files for the locales must have been built
-# for the HTML to be built in turn. This means all the locales for which
-# HTML output is needed will have to have been specified in the main
-# HELP_LINGUAS variable in the ubuntu-help Makefile
-# HELP_LINGUAS = ast az bs ca cs da de el en_AU en_CA en_GB es fi fo fr gl hi hr hu id it ja kk kn ko lt lv mg ms my nb nl oc pl pt pt_BR ru sk sl sq sr sv ta te tr ug uk uz zh_CN zh_TW
-HELP_LINGUAS = fr
-
-index_file_exists = $(wildcard $(SRCDIR)/$(lingua)/index.page)
-linguas := $(HELP_LINGUAS)
-help_linguas := \
-    $(foreach lingua, $(linguas), \
-        $(if $(index_file_exists), \
-            $(lingua), \
-            $(warning Cannot find source index page for locale: $(lingua), \
-                skipping. You will probably have to build it adding it to \
-                the HELP_LINGUAS variable in the Makefile at $(SRCDIR) \
-                and rebuild)))
-
-# Ubuntu Mallard Customization Layer
-UBUNTUXSL=../../ubuntu-1304-fr.xsl
-
-# Builds the HTML files for all specified language codes, specifiying the
-# language in the final documents and performing some other necessary
-# text replacements not handled by yelp-build.
-# Language codes are normalized to IETF format, as opposed to glibc format
-ubuntu-help: clean style
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		yelp-build html -o "$(HTMLDESTDIR)/$$lang/" -x $(UBUNTUXSL) \
-			"$(SRCDIR)/$$lc/"; \
-		$(SED) -i \
-			-e '1s/^/<!DOCTYPE html\>\n/' \
-			-e "s/<html>/<html lang="$$lang">/" \
-			-e 's|/usr/share/icons/.*/\(.*\.svg\)|img/\1|'\
-			"$(HTMLDESTDIR)/$$lang/"*.html; \
-		$(SED) -i -f "$(URLFIXER)" "$(HTMLDESTDIR)/$$lang/"*.html; \
-		echo "\nSearching for unfixed ghelp links:"; \
-		grep "href=\"ghelp:" "$(HTMLDESTDIR)/$$lang/"*.html; \
-		rm -rf "$(HTMLDESTDIR)/$$lang/usr"; \
-	done
-
-clean:
-	rm -rf build
-
-# Copy style sheet and common images to build directory
-# TODO: copy C/figures to destination only for those cases where there are
-# no localized figures
-style:
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		mkdir -p "$(HTMLDESTDIR)/$$lang/img"; \
-		mkdir -p "$(HTMLDESTDIR)/$$lang/figures"; \
-		cp img/* "$(HTMLDESTDIR)/$$lang/img"; \
-		cp "$(SRCDIR)/C/figures/"* "$(HTMLDESTDIR)/$$lang/figures"; \
-	done
-
-# Installs all HTML files to a multilingual site (e.g. run with Apache and
-# MultiViews enabled)
-install:
-	rm -Rf "$(INSTALLDIR)"/*; \
-	cp -R "$(HTMLDESTDIR)/"* "$(INSTALLDIR)"; \
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		find "$(INSTALLDIR)/$$lang" -type f -exec mv {} {}.$$lang \; ; \
-		cp -af "$(INSTALLDIR)/$$lang"/* "$(INSTALLDIR)"; \
-		rm -Rf "$(INSTALLDIR)/$$lang" ; \
-	done
diff --git a/desktop/Makefile1310 b/desktop/Makefile1310
deleted file mode 100644
index 8a38d72..0000000
--- a/desktop/Makefile1310
+++ /dev/null
@@ -1,110 +0,0 @@
-####################################################################################           
-# Makefile for the GNOME Ubuntu Documentation
-# Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#    On Debian based systems a copy of the GPL can be found 
-#    at /usr/share/common-licenses/GPL
-#
-####################################################################################
-
-MAKECMD=make
-HTMLDESTDIR=build
-SRCDIR=../ubuntu-help
-SED=/bin/sed
-INSTALLDIR=/var/www/13.10/
-URLFIXER=fix-urls.sed
-
-# Space-separated list of language codes for documents. HTML will only be
-# built for those codes in the list
-# Ex. HELP_LINGUAS=ja it for Japanese and Italian
-# Note that the corresponding .page files for the locales must have been built
-# for the HTML to be built in turn. This means all the locales for which
-# HTML output is needed will have to have been specified in the main
-# HELP_LINGUAS variable in the ubuntu-help Makefile
-# HELP_LINGUAS = ast az bs ca cs da de el en_AU en_CA en_GB es fi fo fr gl hi hr hu id it ja kk kn ko lt lv mg ms my nb nl oc pl pt pt_BR ru sk sl sq sr sv ta te tr ug uk uz zh_CN zh_TW
-HELP_LINGUAS = fr
-
-index_file_exists = $(wildcard $(SRCDIR)/$(lingua)/index.page)
-linguas := $(HELP_LINGUAS)
-help_linguas := \
-    $(foreach lingua, $(linguas), \
-        $(if $(index_file_exists), \
-            $(lingua), \
-            $(warning Cannot find source index page for locale: $(lingua), \
-                skipping. You will probably have to build it adding it to \
-                the HELP_LINGUAS variable in the Makefile at $(SRCDIR) \
-                and rebuild)))
-
-# Ubuntu Mallard Customization Layer
-UBUNTUXSL=../../ubuntu-1310-fr.xsl
-
-# Builds the HTML files for all specified language codes, specifiying the
-# language in the final documents and performing some other necessary
-# text replacements not handled by yelp-build.
-# Language codes are normalized to IETF format, as opposed to glibc format
-ubuntu-help: clean style
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		yelp-build html -o "$(HTMLDESTDIR)/$$lang/" -x $(UBUNTUXSL) \
-			"$(SRCDIR)/$$lc/"; \
-		$(SED) -i \
-			-e '1s/^/<!DOCTYPE html\>\n/' \
-			-e "s/<html>/<html lang="$$lang">/" \
-			-e 's|/usr/share/icons/.*/\(.*\.svg\)|img/\1|'\
-			"$(HTMLDESTDIR)/$$lang/"*.html; \
-		$(SED) -i -f "$(URLFIXER)" "$(HTMLDESTDIR)/$$lang/"*.html; \
-		echo "\nSearching for unfixed ghelp links:"; \
-		grep "href=\"ghelp:" "$(HTMLDESTDIR)/$$lang/"*.html; \
-		rm -rf "$(HTMLDESTDIR)/$$lang/usr"; \
-	done
-
-clean:
-	rm -rf build
-
-# Copy style sheet and common images to build directory
-# TODO: copy C/figures to destination only for those cases where there are
-# no localized figures
-style:
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		mkdir -p "$(HTMLDESTDIR)/$$lang/img"; \
-		mkdir -p "$(HTMLDESTDIR)/$$lang/figures"; \
-		cp img/* "$(HTMLDESTDIR)/$$lang/img"; \
-		cp "$(SRCDIR)/C/figures/"* "$(HTMLDESTDIR)/$$lang/figures"; \
-	done
-
-# Installs all HTML files to a multilingual site (e.g. run with Apache and
-# MultiViews enabled)
-install:
-	rm -Rf "$(INSTALLDIR)"/*; \
-	cp -R "$(HTMLDESTDIR)/"* "$(INSTALLDIR)"; \
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		find "$(INSTALLDIR)/$$lang" -type f -exec mv {} {}.$$lang \; ; \
-		cp -af "$(INSTALLDIR)/$$lang"/* "$(INSTALLDIR)"; \
-		rm -Rf "$(INSTALLDIR)/$$lang" ; \
-	done
diff --git a/desktop/Makefile1404 b/desktop/Makefile1404
index b89d6ab..402001e 100644
--- a/desktop/Makefile1404
+++ b/desktop/Makefile1404
@@ -23,7 +23,7 @@ MAKECMD=make
 HTMLDESTDIR=build
 SRCDIR=../ubuntu-help
 SED=/bin/sed
-INSTALLDIR=/var/www/14.04/
+INSTALLDIR=14.04
 URLFIXER=fix-urls.sed
 
 # Space-separated list of language codes for documents. HTML will only be
@@ -98,6 +98,7 @@ style:
 # MultiViews enabled)
 install:
 	rm -Rf "$(INSTALLDIR)"/*; \
+	mkdir -p "$(INSTALLDIR)"; \
 	cp -R "$(HTMLDESTDIR)/"* "$(INSTALLDIR)"; \
 	for lc in C $(help_linguas); do \
 		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
diff --git a/desktop/Makefile1410 b/desktop/Makefile1410
deleted file mode 100644
index 5fd4794..0000000
--- a/desktop/Makefile1410
+++ /dev/null
@@ -1,113 +0,0 @@
-####################################################################################           
-# Makefile for the GNOME Ubuntu Documentation
-# Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#    On Debian based systems a copy of the GPL can be found 
-#    at /usr/share/common-licenses/GPL
-#
-####################################################################################
-
-MAKECMD=make
-HTMLDESTDIR=build
-SRCDIR=../ubuntu-help
-SED=/bin/sed
-INSTALLDIR=/var/www/14.10/
-URLFIXER=fix-urls.sed
-
-# Space-separated list of language codes for documents. HTML will only be
-# built for those codes in the list
-# Ex. HELP_LINGUAS=ja it for Japanese and Italian
-# Note that the corresponding .page files for the locales must have been built
-# for the HTML to be built in turn. This means all the locales for which
-# HTML output is needed will have to have been specified in the main
-# HELP_LINGUAS variable in the ubuntu-help Makefile
-# HELP_LINGUAS = ast az bs ca cs da de el en_AU en_CA en_GB es et eu fi fo fr gl hi hr hu id it ja kk kn ko lt lv mg ms my nb nl oc pl pt pt_BR ru sk sl sq sr sv ta te tg th tr ug uk uz zh_CN zh_TW
-HELP_LINGUAS = fr
-
-index_file_exists = $(wildcard $(SRCDIR)/$(lingua)/index.page)
-linguas := $(HELP_LINGUAS)
-help_linguas := \
-    $(foreach lingua, $(linguas), \
-        $(if $(index_file_exists), \
-            $(lingua), \
-            $(warning Cannot find source index page for locale: $(lingua), \
-                skipping. You will probably have to build it adding it to \
-                the HELP_LINGUAS variable in the Makefile at $(SRCDIR) \
-                and rebuild)))
-
-# Ubuntu Mallard Customization Layer
-UBUNTUXSL=../../ubuntu-1410-fr.xsl
-
-# Builds the HTML files for all specified language codes, specifiying the
-# language in the final documents and performing some other necessary
-# text replacements not handled by yelp-build.
-# Language codes are normalized to IETF format, as opposed to glibc format
-ubuntu-help: clean style
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		yelp-build html -o "$(HTMLDESTDIR)/$$lang/" -x $(UBUNTUXSL) \
-			"$(SRCDIR)/$$lc/"; \
-		$(SED) -i \
-			-e '1s/^/<!DOCTYPE html\>\n/' \
-			-e "s/<html>/<html lang="$$lang">/" \
-			-e 's|/usr/share/icons/.*/\(.*\.svg\)|img/\1|'\
-			"$(HTMLDESTDIR)/$$lang/"*.html; \
-		$(SED) -i -f "$(URLFIXER)" "$(HTMLDESTDIR)/$$lang/"*.html; \
-		echo "\nSearching for yelp help system internal links and either changing them to equivalent or related external links or deleting them:"; \
-		$(SED) -i -e '/help:language-selector/d' "$(HTMLDESTDIR)/$$lang/"session*.html; \
-		grep "href=\"ghelp:" "$(HTMLDESTDIR)/$$lang/"*.html; \
-		rm -rf "$(HTMLDESTDIR)/$$lang/usr"; \
-	done
-
-clean:
-	rm -rf build
-
-# Copy style sheet and common images to build directory
-# TODO: copy C/figures to destination only for those cases where there are
-# no localized figures
-style:
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		mkdir -p "$(HTMLDESTDIR)/$$lang/img"; \
-		mkdir -p "$(HTMLDESTDIR)/$$lang/figures"; \
-		cp img/* "$(HTMLDESTDIR)/$$lang/img"; \
-		cp "$(SRCDIR)/C/figures/"* "$(HTMLDESTDIR)/$$lang/figures"; \
-	done
-
-# Installs all HTML files to a multilingual site (e.g. run with Apache and
-# MultiViews enabled)
-install:
-	rm -Rf "$(INSTALLDIR)"/*; \
-	cp -R "$(HTMLDESTDIR)/"* "$(INSTALLDIR)"; \
-	for lc in C $(help_linguas); do \
-		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
-		if test "$$lang" = "C"; then lang=en; fi; \
-		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
-		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
-		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
-		cp -af "$(INSTALLDIR)/$$lang"/*.css "$(INSTALLDIR)"; \
-		rm -Rf "$(INSTALLDIR)/$$lang"/*.css ; \
-		find "$(INSTALLDIR)/$$lang" -type f -exec mv {} {}.$$lang \; ; \
-		cp -af "$(INSTALLDIR)/$$lang"/* "$(INSTALLDIR)"; \
-		rm -Rf "$(INSTALLDIR)/$$lang" ; \
-	done
diff --git a/desktop/Makefile1604 b/desktop/Makefile1604
new file mode 100644
index 0000000..e301baa
--- /dev/null
+++ b/desktop/Makefile1604
@@ -0,0 +1,114 @@
+####################################################################################           
+# Makefile for the GNOME Ubuntu Documentation
+# Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#    On Debian based systems a copy of the GPL can be found 
+#    at /usr/share/common-licenses/GPL
+#
+####################################################################################
+
+MAKECMD=make
+HTMLDESTDIR=build
+SRCDIR=../ubuntu-help
+SED=/bin/sed
+INSTALLDIR=16.04
+URLFIXER=fix-urls.sed
+
+# Space-separated list of language codes for documents. HTML will only be
+# built for those codes in the list
+# Ex. HELP_LINGUAS=ja it for Japanese and Italian
+# Note that the corresponding .page files for the locales must have been built
+# for the HTML to be built in turn. This means all the locales for which
+# HTML output is needed will have to have been specified in the main
+# HELP_LINGUAS variable in the ubuntu-help Makefile
+#HELP_LINGUAS = am ar ast az bg bo br bs ca ce cs da de el en_AU en_CA en_GB eo es et eu fi fo fr gl he hi hr hu id it ja kab kk kn ko lt lv mg ms my nb ne nl oc pl pt_BR pt ro ru si sk sl sq sr sv ta te tg th tl tr ug uk ur uz zh_CN zh_HK zh_TW
+HELP_LINGUAS = fr
+
+index_file_exists = $(wildcard $(SRCDIR)/$(lingua)/index.page)
+linguas := $(HELP_LINGUAS)
+help_linguas := \
+    $(foreach lingua, $(linguas), \
+        $(if $(index_file_exists), \
+            $(lingua), \
+            $(warning Cannot find source index page for locale: $(lingua), \
+                skipping. You will probably have to build it adding it to \
+                the HELP_LINGUAS variable in the Makefile at $(SRCDIR) \
+                and rebuild)))
+
+# Ubuntu Mallard Customization Layer
+UBUNTUXSL=../../ubuntu-1604-fr.xsl
+
+# Builds the HTML files for all specified language codes, specifiying the
+# language in the final documents and performing some other necessary
+# text replacements not handled by yelp-build.
+# Language codes are normalized to IETF format, as opposed to glibc format
+ubuntu-help: clean style
+	for lc in C $(help_linguas); do \
+		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
+		if test "$$lang" = "C"; then lang=en; fi; \
+		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
+		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
+		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
+		yelp-build html -o "$(HTMLDESTDIR)/$$lang/" -x $(UBUNTUXSL) \
+			"$(SRCDIR)/$$lc/"; \
+		$(SED) -i \
+			-e '1s/^/<!DOCTYPE html\>\n/' \
+			-e "s/<html>/<html lang="$$lang">/" \
+			"$(HTMLDESTDIR)/$$lang/"*.html; \
+		$(SED) -i -f "$(URLFIXER)" "$(HTMLDESTDIR)/$$lang/"*.html; \
+		sed -i -r -e \
+			's|(<div class="region"><div class="contents">)|<div class="title" style="margin-bottom: 1.5em"><span>Ubuntu 16.04</span></div>\1|' \
+			"$(HTMLDESTDIR)/$$lang/index.html"; \
+		echo "\nSearching for yelp help system internal links and either changing them to equivalent or related external links or deleting them:"; \
+		$(SED) -i -e '/help:language-selector/d' "$(HTMLDESTDIR)/$$lang/"session*.html; \
+		grep "href=\"ghelp:" "$(HTMLDESTDIR)/$$lang/"*.html; \
+		rm -rf "$(HTMLDESTDIR)/$$lang/usr"; \
+	done
+
+clean:
+	rm -rf build
+
+# Copy style sheet and common images to build directory
+style:
+	for lc in C $(help_linguas); do \
+		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
+		if test "$$lang" = "C"; then lang=en; fi; \
+		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
+		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
+		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
+		mkdir -p "$(HTMLDESTDIR)/$$lang/img"; \
+		mkdir -p "$(HTMLDESTDIR)/$$lang/figures"; \
+		cp -n img/* "$(HTMLDESTDIR)/$$lang/img"; \
+		cp -n "$(SRCDIR)/C/figures/"* "$(HTMLDESTDIR)/$$lang/figures"; \
+	done
+
+# Installs all HTML files to a single multilingual directory for subsequent copying to
+# the web server document structure (e.g. to run with Apache and MultiViews enabled)
+install:
+	rm -Rf "$(INSTALLDIR)"/*; \
+	mkdir -p "$(INSTALLDIR)"; \
+	cp -R "$(HTMLDESTDIR)/"* "$(INSTALLDIR)"; \
+	for lc in C $(help_linguas); do \
+		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
+		if test "$$lang" = "C"; then lang=en; fi; \
+		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
+		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
+		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
+		cp -af "$(INSTALLDIR)/$$lang"/*.css "$(INSTALLDIR)"; \
+		rm -Rf "$(INSTALLDIR)/$$lang"/*.css ; \
+		find "$(INSTALLDIR)/$$lang" -type f -exec mv {} {}.$$lang \; ; \
+		cp -af "$(INSTALLDIR)/$$lang"/* "$(INSTALLDIR)"; \
+		rm -Rf "$(INSTALLDIR)/$$lang" ; \
+	done
diff --git a/desktop/Makefile1704 b/desktop/Makefile1704
new file mode 100644
index 0000000..7ae55c2
--- /dev/null
+++ b/desktop/Makefile1704
@@ -0,0 +1,114 @@
+####################################################################################           
+# Makefile for the GNOME Ubuntu Documentation
+# Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#    On Debian based systems a copy of the GPL can be found 
+#    at /usr/share/common-licenses/GPL
+#
+####################################################################################
+
+MAKECMD=make
+HTMLDESTDIR=build
+SRCDIR=../ubuntu-help
+SED=/bin/sed
+INSTALLDIR=17.04
+URLFIXER=fix-urls.sed
+
+# Space-separated list of language codes for documents. HTML will only be
+# built for those codes in the list
+# Ex. HELP_LINGUAS=ja it for Japanese and Italian
+# Note that the corresponding .page files for the locales must have been built
+# for the HTML to be built in turn. This means all the locales for which
+# HTML output is needed will have to have been specified in the main
+# HELP_LINGUAS variable in the ubuntu-help Makefile
+#HELP_LINGUAS = am ar ast az bg bo br bs ca ce cs da de el en_AU en_CA en_GB eo es et eu fi fo fr gl he hi hr hu id it ja kab kk kn ko lt lv mg ms my nb ne nl oc pl pt_BR pt ro ru si sk sl sq sr sv ta te tg th tl tr ug uk ur uz zh_CN zh_HK zh_TW
+HELP_LINGUAS = fr
+
+index_file_exists = $(wildcard $(SRCDIR)/$(lingua)/index.page)
+linguas := $(HELP_LINGUAS)
+help_linguas := \
+    $(foreach lingua, $(linguas), \
+        $(if $(index_file_exists), \
+            $(lingua), \
+            $(warning Cannot find source index page for locale: $(lingua), \
+                skipping. You will probably have to build it adding it to \
+                the HELP_LINGUAS variable in the Makefile at $(SRCDIR) \
+                and rebuild)))
+
+# Ubuntu Mallard Customization Layer
+UBUNTUXSL=../../ubuntu-1704-fr.xsl
+
+# Builds the HTML files for all specified language codes, specifiying the
+# language in the final documents and performing some other necessary
+# text replacements not handled by yelp-build.
+# Language codes are normalized to IETF format, as opposed to glibc format
+ubuntu-help: clean style
+	for lc in C $(help_linguas); do \
+		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
+		if test "$$lang" = "C"; then lang=en; fi; \
+		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
+		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
+		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
+		yelp-build html -o "$(HTMLDESTDIR)/$$lang/" -x $(UBUNTUXSL) \
+			"$(SRCDIR)/$$lc/"; \
+		$(SED) -i \
+			-e '1s/^/<!DOCTYPE html\>\n/' \
+			-e "s/<html>/<html lang="$$lang">/" \
+			"$(HTMLDESTDIR)/$$lang/"*.html; \
+		$(SED) -i -f "$(URLFIXER)" "$(HTMLDESTDIR)/$$lang/"*.html; \
+		sed -i -r -e \
+			's|(<div class="region"><div class="contents">)|<div class="title" style="margin-bottom: 1.5em"><span>Ubuntu 17.04</span></div>\1|' \
+			"$(HTMLDESTDIR)/$$lang/index.html"; \
+		echo "\nSearching for yelp help system internal links and either changing them to equivalent or related external links or deleting them:"; \
+		$(SED) -i -e '/help:language-selector/d' "$(HTMLDESTDIR)/$$lang/"session*.html; \
+		grep "href=\"ghelp:" "$(HTMLDESTDIR)/$$lang/"*.html; \
+		rm -rf "$(HTMLDESTDIR)/$$lang/usr"; \
+	done
+
+clean:
+	rm -rf build
+
+# Copy style sheet and common images to build directory
+style:
+	for lc in C $(help_linguas); do \
+		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
+		if test "$$lang" = "C"; then lang=en; fi; \
+		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
+		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
+		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
+		mkdir -p "$(HTMLDESTDIR)/$$lang/img"; \
+		mkdir -p "$(HTMLDESTDIR)/$$lang/figures"; \
+		cp -n img/* "$(HTMLDESTDIR)/$$lang/img"; \
+		cp -n "$(SRCDIR)/C/figures/"* "$(HTMLDESTDIR)/$$lang/figures"; \
+	done
+
+# Installs all HTML files to a single multilingual directory for subsequent copying to
+# the web server document structure (e.g. to run with Apache and MultiViews enabled)
+install:
+	rm -Rf "$(INSTALLDIR)"/*; \
+	mkdir -p "$(INSTALLDIR)"; \
+	cp -R "$(HTMLDESTDIR)/"* "$(INSTALLDIR)"; \
+	for lc in C $(help_linguas); do \
+		lang=`echo $$lc | $(SED) -e 's/[@_]/-/'`; \
+		if test "$$lang" = "C"; then lang=en; fi; \
+		if test "$$lang" = "gl"; then lang=gl-GL; fi; \
+		if test "$$lang" = "ms"; then lang=ms-MS; fi; \
+		if test "$$lang" = "pl"; then lang=pl-PL; fi; \
+		cp -af "$(INSTALLDIR)/$$lang"/*.css "$(INSTALLDIR)"; \
+		rm -Rf "$(INSTALLDIR)/$$lang"/*.css ; \
+		find "$(INSTALLDIR)/$$lang" -type f -exec mv {} {}.$$lang \; ; \
+		cp -af "$(INSTALLDIR)/$$lang"/* "$(INSTALLDIR)"; \
+		rm -Rf "$(INSTALLDIR)/$$lang" ; \
+	done
diff --git a/desktop/ubuntu-1210-fr.xsl b/desktop/ubuntu-1210-fr.xsl
deleted file mode 100644
index 817423b..0000000
--- a/desktop/ubuntu-1210-fr.xsl
+++ /dev/null
@@ -1,751 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:set="http://exslt.org/sets"
-                xmlns="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="html set"
-                extension-element-prefixes="exsl"
-                version="1.0">
-
-<xsl:param name="color.gray_background" select="'#f7f6f5'"/>
-<xsl:param name="color.gray_border" select="'#ccc1c1'"/>
-<xsl:param name="color.blue_background" select="'#f7f6f5'"/>
-<xsl:param name="color.blue_border" select="'#ccc1c1'"/>
-<xsl:param name="color.yellow_background" select="'#f7f6f5'"/>
-<xsl:param name="color.yellow_border" select="'#ccc1c1'"/>
-<xsl:param name="color.red_background" select="'#f7f6f5'"/>
-<xsl:param name="color.red_border" select="'#ccc1c1'"/>
-
-<xsl:param name="color.text" select="'#333333'"/>
-<xsl:param name="color.text_light" select="'#333'"/>
-<xsl:param name="color.link" select="'#dd4814'"/>
-<xsl:param name="color.link_visited" select="'#dd4814'"/>
-
-<xsl:template name="html.css.custom">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="direction">
-    <xsl:call-template name="l10n.direction"/>
-  </xsl:param>
-  <xsl:param name="left">
-    <xsl:call-template name="l10n.align.start">
-      <xsl:with-param name="direction" select="$direction"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:param name="right">
-    <xsl:call-template name="l10n.align.end">
-      <xsl:with-param name="direction" select="$direction"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:text>
-
-/* Based on light-moin-theme from https://code.launchpad.net/ubuntu-website/light-moin-theme 
-   Some tweaks and adaptation for xsl by Matthew East for Ubuntu Documentation Team
-   [e-mail] */
-
-/* Don't forget to set a foreground and background color
- on the 'html' or 'body' element! */
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-weight: inherit;
-    font-style: inherit;
-    font-size: 100%;
-    line-height: 1.5;
-    font-family: inherit;
-    text-align: left;
-    vertical-align: baseline;
-}
-
-a img, :link img, :visited img {
-    border: 0;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-
-ol, ul {
-    list-style: none;
-}
-
-q:before, q:after, blockquote:before, blockquote:after {
-    content: "";
-}
-
-/* moin specific overrides go below */
-.clear { clear: both; }
-#fullsearch { display: none; }
-
-body {
-    background-image: url("img/bg_dotted.png");
-}
-
-#main-menu a {
-    padding: 24px 8px;
-}
-
-#search-box {
-    margin-left: 650px;
-    -moz-border-radius: 0px 0px 4px 4px;
-    -webkit-border-bottom-left-radius: 4px;
-    -webkit-border-bottom-right-radius: 4px;
-    -moz-box-shadow: #bbb 0px 0px 2px;
-    -webkit-box-shadow: #bbb 0px 0px 2px;
-    background-color: #F2F2F2;
-    width: 290px;
-    height: 33px;
-    padding: 7px 0 0 10px;
-}
-
-#search-box #searchinput {
-    float: left;
-    width: 172px;
-    height: 20px;
-    margin: 8px 0 0 8px;
-    padding: 3px 0 1px 4px;
-    font-size: 11px;
-    border: 1px solid #ccc;
-}
-#search-box #titlesearch {
-    float: left;
-    background: url("img/search_button_sprite.png") transparent;
-    width: 24px;
-    height: 24px;
-    margin: 8px 0 0 8px;
-    padding: 0;
-    border: none;
-    cursor: pointer;
-	text-indent: 50px;
-}
-
-#search-box button span {
-    position: absolute;
-    overflow: hidden;
-    text-indent: -9999px;
-}
-
-#subheader ul {
-	display: inline;
-	float: left;
-}
-#title span {
-	color: #333;
-}
-
-/* fix TOC styles */
-#cwt-content table li {
-    margin-left: 1.5em;
-    line-height: 18px;
-}
-#cwt-content table ol {
-    list-style-type: decimal;
-}
-
-/* fix wiki styles */
-#cwt-content pre {
-    line-height: 16px;
-    margin-bottom: 8px;
-}
-#cwt-content h1 {
-    margin-bottom: 8px;
-}
-
-#cwt-content dt {
-    font-weight: bold;
-    margin-top: 10px;
-}
-#cwt-content dt, #cwt-content dd {
-    line-height: 18px;
-    font-size: 14px;
-}
-
-#footer {
-	margin: 0;
-	font-size: 90%;
-	color: #444;
-}
-
-/* edit form */
-#editor-textarea {
-    width: 100%;
-    font-size: 14px;
-    padding: 4px;
-}
-#cwt-content input[type=text] {
-    width: 100%;
-}
-
-/* moin's msg dialog */
-#message {
-    padding: 16px;
-    margin: 8px 0;
-    border: 20px #F1F1ED solid;
-    font-size: 14px;
-    background-color: white;
-}
-#message p {
-    font-size: 14px;
-    font-weight: bold;
-}
-
-/* tables need a little spacing */
-#cwt-content td, #cwt-content th {
-    margin: 1px;
-    padding: 4px;
-}
-#cwt-content td, #cwt-content th {
-    border: 1px solid #E9E9E9;
-}
-#cwt-content ol, #cwt-content ul, #cwt-content dl {
-    margin-bottom: 8px;
-    list-style-type: decimal;
-}
-#cwt-content li, #cwt-content dd, #cwt-content dt {
-    line-height: 14px;
-}
-#cwt-content ol li {
-    margin-left: 18px;
-}
-#cwt-content tt {
-    font-family: monospace;
-}
-
-body {
-    font-family: "Ubuntu", "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif;
-    color: #333;
-    background: white url(img/bg_dotted.png);
-    font-size: 13px;
-    line-height: 1.5;
-    margin: 0px;
-    padding: 0px;
-}
-#container {
-    background: #f7f6f5;
-    margin: 0px auto 20px;
-    padding: 0px;
-    width: 976px;
-}
-#container-inner {
-    background-color: #fff;
-}
-#header, #container-inner {
-    -moz-border-radius: 0px 0px 5px 5px;
-    -webkit-border-bottom-left-radius: 5px;
-    -webkit-border-bottom-right-radius: 5px;
-    -moz-box-shadow: #bbb 0px 0px 5px;
-    -webkit-box-shadow: #bbb 0px 0px 5px;
-}
-#header {
-    background: #dd4814 url(img/header_bg.png) top left repeat-x;
-    height: 64px;
-    margin: 0px;
-    padding: 0px;
-    position: relative;
-}
-
-#mothership ul {
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    height: 20px;
-}
-
-#mothership li {
-    float: right;
-    padding: 3px 0;
-    margin: 0 16px 0 0;
-    font-size: 10px;
-    line-height: 14px;
-}
-
-#mothership a {
-    color: #333;
-}
-
-#menu-search {
-    height: 40px;
-    margin: 0 16px;
-}
-
-#cwt-content {
-    width: 850px;
-    padding: 16px 40px 16px 40px;
-    margin: 0 16px 16px;
-    background-color: #ffffff;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-
-#end-content {
-    clear: both;
-}
-
-.box-944 {
-    background: #ffffff;
-    width: 944px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-.box-304 {
-    background: #ffffff;
-    width: 304px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-.box-624 {
-    background: #ffffff;
-    width: 304px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-
-.content-box {
-    width: 912px;
-    padding: 16px;
-}
-
-#ubuntu-header {
-    background-image: url(img/header_logo.png);
-    background-repeat: no-repeat;
-    height: 32px;
-    right: 16px;
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    top: 16px;
-    width: 292px;
-    overflow: hidden;
-    text-indent: -9999px;
-}
-
-#ubuntu-header a {
-    display: block;
-    height: 100%;
-    width: 100%;
-}
-
-#footer {
-    padding-top: 16px;
-}
-
-#footer p {
-    margin: 0;
-    padding-bottom: 16px;
-    border-bottom: 1px dotted #aea79f;
-    text-align: center;
-}
-
-#main-menu {
-    list-style: none;
-    margin: 0;
-    margin-left: 16px;
-    padding: 0;
-    height: 100%;
-    background: url(img/topnav_divider.png) no-repeat scroll left top transparent !important;
-}
-#main-menu li {
-    float: left;
-    margin: 0;
-    padding: 0;
-    height: 64px;
-    font-size: 14px;
-    line-height: 16px;
-    background: url(img/topnav_divider.png) no-repeat scroll right top transparent !important;
-}
-#main-menu a {
-    display: block;
-    float: left;
-    margin: 0;
-    padding: 24px 8px;
-    text-decoration: none;
-    color: #fff;
-    text-shadow: #000 0px 1px;
-}
-
-.main-menu-item.current,
-#main-menu a:hover, #main-menu a.active {
-    background: url(img/topnav_active_bg.png) no-repeat right top transparent !important;
-}
-
-h1, h2, h3, h4, h5 {
-    color: #333;
-    padding: 0;
-    margin: 0;
-    font-weight: normal;
-    margin-top: 1em;
-}
-h1 {
-    font-size: 28px;
-    line-height: 32px;
-    margin-top: 0em;
-}
-h2 {
-    font-size: 24px;
-    line-height: 28px;
-    margin-bottom: 8px;
-}
-h3 {
-    font-size: 16px;
-    line-height: 20px;
-    margin-bottom: 8px;
-}
-h3.link-other {
-    color: #333;
-}
-h3.link-services {
-    color: #fff;
-}
-h4 {
-    font-size: 12px;
-    line-height: 14px;
-}
-h4.link-news {
-    color: #ef5a29;
-}
-h4.link-ubuntu {
-    color: #dd4814;
-}
-h4.partners {
-    color: #333;
-    font-size: 16px;
-    line-height: 20px;
-}
-h5 {
-    color: #333;
-    font-size: 10px;
-    line-height: 14px;
-}
-p {
-    font-size: 13px;
-    line-height: 1.5;
-    margin-bottom: 8px;
-}
-pre {
-    background-color:#F3F3F3;
-    border:1px dashed #C1B496;
-    font-family:UbuntuMono,courier,monospace;
-    padding:4pt;
-    white-space:pre-wrap;
-    word-wrap:break-word;
-}
-tt {
-    font-family:UbuntuMono,courier,monospace;
-}
-
-strong {
-    font-weight: bold;
-}
-
-a {
-    color: #DD4814;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-ul {
-    margin-bottom: 16px;
-}
-ul li {
-    margin-left: 2.4em;
-    margin-bottom: 8px;
-    line-height: 14px;
-}
-ul li:last-child {
-    margin-bottom: 0px;
-}
-
-p.call-to-action {
-    color: #333;
-}
-p.case-study {
-    color: #333;
-}
-p.highlight {
-    font-size: 16px;
-    line-height: 20px;
-}
-p.introduction {
-    color: #333;
-    font-size: 16px;
-    line-height: 20px;
-}
-p.services {
-    color: #fff;
-}
-#pageinfo {
-    font-size: 70%;
-    padding: 0 16px 12px;
-    text-align: right;
-}
-p.small-text {
-    color: #333;
-    font-size: 10px;
-}
-
-.newsfeed {
-    background: url(img/news_feed_bg.png) no-repeat scroll right top transparent;
-    padding: 0 20px 0 0;
-}
-
-/* Clearing floats without extra markup
-Based on How To Clear Floats Without Structural Markup by PiE
-[http://www.positioniseverything.net/easyclearing.html] */
-.clearfix:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.clearfix {
-    display: inline-block;
-}  /* for IE/Mac */
-
-div.trail {
-  font-size: 100%;
-  text-indent: -1em;
-  color: #aea79f;
-}
-
-/* Form related styling */
-input, select {
-    /* Override mozilla's default form css inherited from the system */
-    font-size: 100%;
-}
-.wForm form label {
-    display: block;
-    padding-bottom: 3px;
-    color: black;
-}
-.wForm form input[type=text],
-.wForm form input[type=password],
-.wForm form textarea {
-    border: 1px solid #c7c7c7;
-    padding: 2px;
-    color: black;
-    background: #fff;
-}
-.wForm form input[type=text]:focus,
-.wForm form input[type=password]:focus,
-.wForm form textarea:focus {
-    border: 1px solid #dd4814;
-    outline: 1px solid #dd4814;
-}
-/* Override FormAssembly formatting */
-.wFormContainer {
-    padding: 0;
-    width: 100%;
-}
-.wForm form {
-    margin: 0;
-}
-.wForm form .actions {
-    text-align: right;
-}
-.wForm form .actions .primaryAction {
-    background-color: #dd4814;
-    color: #fff;
-    border: 0;
-    cursor: pointer;
-    font-weight: normal;
-    font-size: 16px;
-    padding: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    text-shadow: #333 0px 1px;
-    margin: 10px 8px 10px 8px;
-}
-.wForm form input[type=text].errFld {
-    border: 2px solid #dd4814;
-}
-.wForm form .errMsg {
-    color: #dd4814 !important;
-}
-.wForm form .oneChoice {
-    display: block;
-}
-.wForm form .oneField {
-    padding: 0 8px;
-    margin-bottom: 8px;
-}
-.wForm form span.reqMark {
-    color: #dd4814 !important;
-    font-weight: bold !important;
-}
-.wForm fieldset {
-    border: none;
-    padding: 0;
-    background: #dfdcd9;
-}
-.wForm input[type=text],
-.wForm input[type=password],
-.wForm select,
-.wForm textarea {
-    width: 290px;
-}
-.wForm legend {
-    padding: 8px;
-    font-size: 16px;
-    font-weight: normal !important;
-    background: #aea79f;
-    width: 100%;
-    color: #fff;
-    margin-bottom: 8px;
-}
-.wForm label.preField,
-.wForm .labelsLeftAligned label.preField,
-.wForm .labelsRightAligned label.preField  {
-    float: none;
-    padding-bottom: 4px;
-}
-.wForm label.postField {
-    display: inline;
-}
-/* Hack for WebKit based browsers to display the fieldset properly */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-    .wForm fieldset {
-        padding: 8px 8px .1px 0px;
-    }
-    .wForm legend {
-        padding: 8px 0px 8px 8px;
-    }
-}
-
-</xsl:text>
-</xsl:template>
-
-<xsl:template name="html.page">
-  <xsl:param name="node" select="."/>
-    <html>
-        <head>
-            <title><xsl:apply-templates mode="html.title.mode" select="$node"/></title>
-            <xsl:call-template name="html.css"/>
-            <xsl:call-template name="html.js"/>
-            <xsl:call-template name="html.head.custom"/>
-            <link rel="shortcut icon" href="//www.ubuntu-fr.org/sites/all/themes/ubuntu2010/favicon.ico" type="image/vnd.microsoft.icon" />
-        </head>
-        <body id="home">
-            <xsl:apply-templates mode="html.body.attr.mode" select="$node"/>
-            <script src="https://ssl.google-analytics.com/urchin.js"
-                    type="text/javascript"></script>
-            <script type="text/javascript">
-               _uacct = "UA-1018242-8";
-               urchinTracker();
-            </script>
-
-            <div id="leftbanner"></div>
-            <div id="rightbanner"></div>
-            <div id="container">
-                <div id="container-inner">
-            	    <div id="mothership">
-                		<ul>
-	                        <li><a href="//ubuntu-fr.org/telechargement">Obtenir Ubuntu</a></li>
-                    	    <li><a href="//forum.ubuntu-fr.org/">Forum</a></li>
-                    	    <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
-                    	    <li><a href="//ubuntu-fr.org/">ubuntu-fr.org</a></li>
-            	        </ul>
-            	    </div>
-                    <div id="header">
-                        <h1 id="ubuntu-header"><a href="//guide.ubuntu-fr.org/">Guides Ubuntu</a></h1>
-                        <ul id="main-menu">
-                            <li><a class="main-menu-item current" href="//guide.ubuntu-fr.org/">Guides</a></li>
-                            <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
-                            <li><a href="http://ubuntu-manual.org/">Manuel Ubuntu</a></li>
-                            <!--li><a href="//guide.ubuntu-fr.org/participer.html">Participer</a></li-->
-                            <!--li><a href="//guide.ubuntu.com/telecharger.html">Télécharger</a></li-->
-                        </ul>
-                    </div>
-                    <!--div id="menu-search" -->
-                        <!--div id="subheader"> 
-                            <div class="subheader-menu"></div>
-                        </div>
-                        <div id="search-box">
-		                    <noscript>
-		                    <form action="https://www.google.com/cse" id="cse-search-box">
-		                        <div>
-		                        <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />
-                     		    <input type="hidden" name="ie" value="UTF-8" />
-                     		    <input type="text" name="q" size="21" />
-                     		    <input type="submit" name="sa" value="Search" />
-                     		    </div>
-		                    </form>
-		                    </noscript>
-
-		                    <script>
-		                     document.write('<form action="//guide.ubuntu-fr.org/search.html" id="cse-search-box">');
-		                     document.write('  <div>');
-		                     document.write('    <input type="hidden" name="cof" value="FORID:9" />');
-		                     document.write('    <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />');
-		                     document.write('    <input type="hidden" name="ie" value="UTF-8" />');
-		                     document.write('    <input type="text" name="q" size="21" />');
-		                     document.write('    <input type="submit" name="sa" value="Search" />');
-		                     document.write('  </div>');
-		                     document.write('</form>');
-		                    </script>
-                		</div--><!-- end search-box -->
-                    <!--/div--><!-- end menu-search -->
-                    <xsl:apply-templates mode="html.header.mode" select="$node"/>
-                    <div id="cwt-content" class="clearfix content-area">
-                	    <div id="page">
-                	        <div id="content">
-                    		    <xsl:apply-templates mode="html.body.mode" select="$node"/>
-                    		</div>
-                    		<div id="pagebottom"></div>
-                	    </div>
-                    </div>
-                </div><!-- end container-inner -->
-                <div id="footer">
-                    <p>Le contenu de ce document est disponible sous licence libre, voir <a href="/legal.html">Légal</a> pour plus de détails.<br /> Pour savoir comment contribuer, reportez-vous à la <a href="https://wiki.ubuntu.com/DocumentationTeam">page du wiki anglais de l'Equipe de Documentation Ubuntu</a> ainsi que la <a href="//doc.ubuntu-fr.org/ubuntu-l10n-fr">page de l'équipe de traduction francophone</a>. Pour signaler un problème sur cette documentation, visitez la <a href="https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs">page des bogues de la Documentation Ubuntu</a>.</p>
-                </div>
-            </div><!-- end container -->
-            <img src="http://piwik.infra.ubuntu-fr.org/piwik.php?idsite=4&amp;rec=1" style="border:0" alt="" />
-            <!-- IE6 hacks -->
-            <!--[if IE 6 ]>
-                    <script src="js/pngFix.js"></script>
-                    <script> DD_belatedPNG.fix('.png'); </script>
-            <![endif]-->
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template name="mal2html.page.linktrails.trail">
-  <xsl:param name="node" select="."/>
-  <div class="trail">
-    <a href="//guide.ubuntu-fr.org/12.10/" class="trail">Ubuntu 12.10</a>
-  <xsl:variable name="direction">
-    <xsl:call-template name="l10n.direction"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$direction = 'rtl'">
-      <xsl:choose>
-        <xsl:when test="$node/@child = 'section'">
-          <xsl:text>&#x00A0;‹ </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#x00A0;« </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$node/@child = 'section'">
-          <xsl:text>&#x00A0;› </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#x00A0;» </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-    <xsl:call-template name="mal2html.page.linktrails.link">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/desktop/ubuntu-1304-fr.xsl b/desktop/ubuntu-1304-fr.xsl
deleted file mode 100644
index b5bf0a1..0000000
--- a/desktop/ubuntu-1304-fr.xsl
+++ /dev/null
@@ -1,751 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:set="http://exslt.org/sets"
-                xmlns="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="html set"
-                extension-element-prefixes="exsl"
-                version="1.0">
-
-<xsl:param name="color.gray_background" select="'#f7f6f5'"/>
-<xsl:param name="color.gray_border" select="'#ccc1c1'"/>
-<xsl:param name="color.blue_background" select="'#f7f6f5'"/>
-<xsl:param name="color.blue_border" select="'#ccc1c1'"/>
-<xsl:param name="color.yellow_background" select="'#f7f6f5'"/>
-<xsl:param name="color.yellow_border" select="'#ccc1c1'"/>
-<xsl:param name="color.red_background" select="'#f7f6f5'"/>
-<xsl:param name="color.red_border" select="'#ccc1c1'"/>
-
-<xsl:param name="color.text" select="'#333333'"/>
-<xsl:param name="color.text_light" select="'#333'"/>
-<xsl:param name="color.link" select="'#dd4814'"/>
-<xsl:param name="color.link_visited" select="'#dd4814'"/>
-
-<xsl:template name="html.css.custom">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="direction">
-    <xsl:call-template name="l10n.direction"/>
-  </xsl:param>
-  <xsl:param name="left">
-    <xsl:call-template name="l10n.align.start">
-      <xsl:with-param name="direction" select="$direction"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:param name="right">
-    <xsl:call-template name="l10n.align.end">
-      <xsl:with-param name="direction" select="$direction"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:text>
-
-/* Based on light-moin-theme from https://code.launchpad.net/ubuntu-website/light-moin-theme 
-   Some tweaks and adaptation for xsl by Matthew East for Ubuntu Documentation Team
-   [e-mail] */
-
-/* Don't forget to set a foreground and background color
- on the 'html' or 'body' element! */
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-weight: inherit;
-    font-style: inherit;
-    font-size: 100%;
-    line-height: 1.5;
-    font-family: inherit;
-    text-align: left;
-    vertical-align: baseline;
-}
-
-a img, :link img, :visited img {
-    border: 0;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-
-ol, ul {
-    list-style: none;
-}
-
-q:before, q:after, blockquote:before, blockquote:after {
-    content: "";
-}
-
-/* moin specific overrides go below */
-.clear { clear: both; }
-#fullsearch { display: none; }
-
-body {
-    background-image: url("img/bg_dotted.png");
-}
-
-#main-menu a {
-    padding: 24px 8px;
-}
-
-#search-box {
-    margin-left: 650px;
-    -moz-border-radius: 0px 0px 4px 4px;
-    -webkit-border-bottom-left-radius: 4px;
-    -webkit-border-bottom-right-radius: 4px;
-    -moz-box-shadow: #bbb 0px 0px 2px;
-    -webkit-box-shadow: #bbb 0px 0px 2px;
-    background-color: #F2F2F2;
-    width: 290px;
-    height: 33px;
-    padding: 7px 0 0 10px;
-}
-
-#search-box #searchinput {
-    float: left;
-    width: 172px;
-    height: 20px;
-    margin: 8px 0 0 8px;
-    padding: 3px 0 1px 4px;
-    font-size: 11px;
-    border: 1px solid #ccc;
-}
-#search-box #titlesearch {
-    float: left;
-    background: url("img/search_button_sprite.png") transparent;
-    width: 24px;
-    height: 24px;
-    margin: 8px 0 0 8px;
-    padding: 0;
-    border: none;
-    cursor: pointer;
-	text-indent: 50px;
-}
-
-#search-box button span {
-    position: absolute;
-    overflow: hidden;
-    text-indent: -9999px;
-}
-
-#subheader ul {
-	display: inline;
-	float: left;
-}
-#title span {
-	color: #333;
-}
-
-/* fix TOC styles */
-#cwt-content table li {
-    margin-left: 1.5em;
-    line-height: 18px;
-}
-#cwt-content table ol {
-    list-style-type: decimal;
-}
-
-/* fix wiki styles */
-#cwt-content pre {
-    line-height: 16px;
-    margin-bottom: 8px;
-}
-#cwt-content h1 {
-    margin-bottom: 8px;
-}
-
-#cwt-content dt {
-    font-weight: bold;
-    margin-top: 10px;
-}
-#cwt-content dt, #cwt-content dd {
-    line-height: 18px;
-    font-size: 14px;
-}
-
-#footer {
-	margin: 0;
-	font-size: 90%;
-	color: #444;
-}
-
-/* edit form */
-#editor-textarea {
-    width: 100%;
-    font-size: 14px;
-    padding: 4px;
-}
-#cwt-content input[type=text] {
-    width: 100%;
-}
-
-/* moin's msg dialog */
-#message {
-    padding: 16px;
-    margin: 8px 0;
-    border: 20px #F1F1ED solid;
-    font-size: 14px;
-    background-color: white;
-}
-#message p {
-    font-size: 14px;
-    font-weight: bold;
-}
-
-/* tables need a little spacing */
-#cwt-content td, #cwt-content th {
-    margin: 1px;
-    padding: 4px;
-}
-#cwt-content td, #cwt-content th {
-    border: 1px solid #E9E9E9;
-}
-#cwt-content ol, #cwt-content ul, #cwt-content dl {
-    margin-bottom: 8px;
-    list-style-type: decimal;
-}
-#cwt-content li, #cwt-content dd, #cwt-content dt {
-    line-height: 14px;
-}
-#cwt-content ol li {
-    margin-left: 18px;
-}
-#cwt-content tt {
-    font-family: monospace;
-}
-
-body {
-    font-family: "Ubuntu", "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif;
-    color: #333;
-    background: white url(img/bg_dotted.png);
-    font-size: 13px;
-    line-height: 1.5;
-    margin: 0px;
-    padding: 0px;
-}
-#container {
-    background: #f7f6f5;
-    margin: 0px auto 20px;
-    padding: 0px;
-    width: 976px;
-}
-#container-inner {
-    background-color: #fff;
-}
-#header, #container-inner {
-    -moz-border-radius: 0px 0px 5px 5px;
-    -webkit-border-bottom-left-radius: 5px;
-    -webkit-border-bottom-right-radius: 5px;
-    -moz-box-shadow: #bbb 0px 0px 5px;
-    -webkit-box-shadow: #bbb 0px 0px 5px;
-}
-#header {
-    background: #dd4814 url(img/header_bg.png) top left repeat-x;
-    height: 64px;
-    margin: 0px;
-    padding: 0px;
-    position: relative;
-}
-
-#mothership ul {
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    height: 20px;
-}
-
-#mothership li {
-    float: right;
-    padding: 3px 0;
-    margin: 0 16px 0 0;
-    font-size: 10px;
-    line-height: 14px;
-}
-
-#mothership a {
-    color: #333;
-}
-
-#menu-search {
-    height: 40px;
-    margin: 0 16px;
-}
-
-#cwt-content {
-    width: 850px;
-    padding: 16px 40px 16px 40px;
-    margin: 0 16px 16px;
-    background-color: #ffffff;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-
-#end-content {
-    clear: both;
-}
-
-.box-944 {
-    background: #ffffff;
-    width: 944px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-.box-304 {
-    background: #ffffff;
-    width: 304px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-.box-624 {
-    background: #ffffff;
-    width: 304px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-
-.content-box {
-    width: 912px;
-    padding: 16px;
-}
-
-#ubuntu-header {
-    background-image: url(img/header_logo.png);
-    background-repeat: no-repeat;
-    height: 32px;
-    right: 16px;
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    top: 16px;
-    width: 292px;
-    overflow: hidden;
-    text-indent: -9999px;
-}
-
-#ubuntu-header a {
-    display: block;
-    height: 100%;
-    width: 100%;
-}
-
-#footer {
-    padding-top: 16px;
-}
-
-#footer p {
-    margin: 0;
-    padding-bottom: 16px;
-    border-bottom: 1px dotted #aea79f;
-    text-align: center;
-}
-
-#main-menu {
-    list-style: none;
-    margin: 0;
-    margin-left: 16px;
-    padding: 0;
-    height: 100%;
-    background: url(img/topnav_divider.png) no-repeat scroll left top transparent !important;
-}
-#main-menu li {
-    float: left;
-    margin: 0;
-    padding: 0;
-    height: 64px;
-    font-size: 14px;
-    line-height: 16px;
-    background: url(img/topnav_divider.png) no-repeat scroll right top transparent !important;
-}
-#main-menu a {
-    display: block;
-    float: left;
-    margin: 0;
-    padding: 24px 8px;
-    text-decoration: none;
-    color: #fff;
-    text-shadow: #000 0px 1px;
-}
-
-.main-menu-item.current,
-#main-menu a:hover, #main-menu a.active {
-    background: url(img/topnav_active_bg.png) no-repeat right top transparent !important;
-}
-
-h1, h2, h3, h4, h5 {
-    color: #333;
-    padding: 0;
-    margin: 0;
-    font-weight: normal;
-    margin-top: 1em;
-}
-h1 {
-    font-size: 28px;
-    line-height: 32px;
-    margin-top: 0em;
-}
-h2 {
-    font-size: 24px;
-    line-height: 28px;
-    margin-bottom: 8px;
-}
-h3 {
-    font-size: 16px;
-    line-height: 20px;
-    margin-bottom: 8px;
-}
-h3.link-other {
-    color: #333;
-}
-h3.link-services {
-    color: #fff;
-}
-h4 {
-    font-size: 12px;
-    line-height: 14px;
-}
-h4.link-news {
-    color: #ef5a29;
-}
-h4.link-ubuntu {
-    color: #dd4814;
-}
-h4.partners {
-    color: #333;
-    font-size: 16px;
-    line-height: 20px;
-}
-h5 {
-    color: #333;
-    font-size: 10px;
-    line-height: 14px;
-}
-p {
-    font-size: 13px;
-    line-height: 1.5;
-    margin-bottom: 8px;
-}
-pre {
-    background-color:#F3F3F3;
-    border:1px dashed #C1B496;
-    font-family:UbuntuMono,courier,monospace;
-    padding:4pt;
-    white-space:pre-wrap;
-    word-wrap:break-word;
-}
-tt {
-    font-family:UbuntuMono,courier,monospace;
-}
-
-strong {
-    font-weight: bold;
-}
-
-a {
-    color: #DD4814;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-ul {
-    margin-bottom: 16px;
-}
-ul li {
-    margin-left: 2.4em;
-    margin-bottom: 8px;
-    line-height: 14px;
-}
-ul li:last-child {
-    margin-bottom: 0px;
-}
-
-p.call-to-action {
-    color: #333;
-}
-p.case-study {
-    color: #333;
-}
-p.highlight {
-    font-size: 16px;
-    line-height: 20px;
-}
-p.introduction {
-    color: #333;
-    font-size: 16px;
-    line-height: 20px;
-}
-p.services {
-    color: #fff;
-}
-#pageinfo {
-    font-size: 70%;
-    padding: 0 16px 12px;
-    text-align: right;
-}
-p.small-text {
-    color: #333;
-    font-size: 10px;
-}
-
-.newsfeed {
-    background: url(img/news_feed_bg.png) no-repeat scroll right top transparent;
-    padding: 0 20px 0 0;
-}
-
-/* Clearing floats without extra markup
-Based on How To Clear Floats Without Structural Markup by PiE
-[http://www.positioniseverything.net/easyclearing.html] */
-.clearfix:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.clearfix {
-    display: inline-block;
-}  /* for IE/Mac */
-
-div.trail {
-  font-size: 100%;
-  text-indent: -1em;
-  color: #aea79f;
-}
-
-/* Form related styling */
-input, select {
-    /* Override mozilla's default form css inherited from the system */
-    font-size: 100%;
-}
-.wForm form label {
-    display: block;
-    padding-bottom: 3px;
-    color: black;
-}
-.wForm form input[type=text],
-.wForm form input[type=password],
-.wForm form textarea {
-    border: 1px solid #c7c7c7;
-    padding: 2px;
-    color: black;
-    background: #fff;
-}
-.wForm form input[type=text]:focus,
-.wForm form input[type=password]:focus,
-.wForm form textarea:focus {
-    border: 1px solid #dd4814;
-    outline: 1px solid #dd4814;
-}
-/* Override FormAssembly formatting */
-.wFormContainer {
-    padding: 0;
-    width: 100%;
-}
-.wForm form {
-    margin: 0;
-}
-.wForm form .actions {
-    text-align: right;
-}
-.wForm form .actions .primaryAction {
-    background-color: #dd4814;
-    color: #fff;
-    border: 0;
-    cursor: pointer;
-    font-weight: normal;
-    font-size: 16px;
-    padding: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    text-shadow: #333 0px 1px;
-    margin: 10px 8px 10px 8px;
-}
-.wForm form input[type=text].errFld {
-    border: 2px solid #dd4814;
-}
-.wForm form .errMsg {
-    color: #dd4814 !important;
-}
-.wForm form .oneChoice {
-    display: block;
-}
-.wForm form .oneField {
-    padding: 0 8px;
-    margin-bottom: 8px;
-}
-.wForm form span.reqMark {
-    color: #dd4814 !important;
-    font-weight: bold !important;
-}
-.wForm fieldset {
-    border: none;
-    padding: 0;
-    background: #dfdcd9;
-}
-.wForm input[type=text],
-.wForm input[type=password],
-.wForm select,
-.wForm textarea {
-    width: 290px;
-}
-.wForm legend {
-    padding: 8px;
-    font-size: 16px;
-    font-weight: normal !important;
-    background: #aea79f;
-    width: 100%;
-    color: #fff;
-    margin-bottom: 8px;
-}
-.wForm label.preField,
-.wForm .labelsLeftAligned label.preField,
-.wForm .labelsRightAligned label.preField  {
-    float: none;
-    padding-bottom: 4px;
-}
-.wForm label.postField {
-    display: inline;
-}
-/* Hack for WebKit based browsers to display the fieldset properly */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-    .wForm fieldset {
-        padding: 8px 8px .1px 0px;
-    }
-    .wForm legend {
-        padding: 8px 0px 8px 8px;
-    }
-}
-
-</xsl:text>
-</xsl:template>
-
-<xsl:template name="html.page">
-  <xsl:param name="node" select="."/>
-    <html>
-        <head>
-            <title><xsl:apply-templates mode="html.title.mode" select="$node"/></title>
-            <xsl:call-template name="html.css"/>
-            <xsl:call-template name="html.js"/>
-            <xsl:call-template name="html.head.custom"/>
-            <link rel="shortcut icon" href="//www.ubuntu-fr.org/sites/all/themes/ubuntu2010/favicon.ico" type="image/vnd.microsoft.icon" />
-        </head>
-        <body id="home">
-            <xsl:apply-templates mode="html.body.attr.mode" select="$node"/>
-            <script src="https://ssl.google-analytics.com/urchin.js"
-                    type="text/javascript"></script>
-            <script type="text/javascript">
-               _uacct = "UA-1018242-8";
-               urchinTracker();
-            </script>
-
-            <div id="leftbanner"></div>
-            <div id="rightbanner"></div>
-            <div id="container">
-                <div id="container-inner">
-            	    <div id="mothership">
-                		<ul>
-	                        <li><a href="//ubuntu-fr.org/telechargement">Obtenir Ubuntu</a></li>
-                    	    <li><a href="//forum.ubuntu-fr.org/">Forum</a></li>
-                    	    <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
-                    	    <li><a href="//ubuntu-fr.org/">ubuntu-fr.org</a></li>
-            	        </ul>
-            	    </div>
-                    <div id="header">
-                        <h1 id="ubuntu-header"><a href="//guide.ubuntu-fr.org/">Guides Ubuntu</a></h1>
-                        <ul id="main-menu">
-                            <li><a class="main-menu-item current" href="//guide.ubuntu-fr.org/">Guides</a></li>
-                            <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
-                            <li><a href="http://ubuntu-manual.org/">Manuel Ubuntu</a></li>
-                            <!--li><a href="//guide.ubuntu-fr.org/participer.html">Participer</a></li-->
-                            <!--li><a href="//guide.ubuntu.com/telecharger.html">Télécharger</a></li-->
-                        </ul>
-                    </div>
-                    <!--div id="menu-search" -->
-                        <!--div id="subheader"> 
-                            <div class="subheader-menu"></div>
-                        </div>
-                        <div id="search-box">
-		                    <noscript>
-		                    <form action="https://www.google.com/cse" id="cse-search-box">
-		                        <div>
-		                        <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />
-                     		    <input type="hidden" name="ie" value="UTF-8" />
-                     		    <input type="text" name="q" size="21" />
-                     		    <input type="submit" name="sa" value="Search" />
-                     		    </div>
-		                    </form>
-		                    </noscript>
-
-		                    <script>
-		                     document.write('<form action="//guide.ubuntu-fr.org/search.html" id="cse-search-box">');
-		                     document.write('  <div>');
-		                     document.write('    <input type="hidden" name="cof" value="FORID:9" />');
-		                     document.write('    <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />');
-		                     document.write('    <input type="hidden" name="ie" value="UTF-8" />');
-		                     document.write('    <input type="text" name="q" size="21" />');
-		                     document.write('    <input type="submit" name="sa" value="Search" />');
-		                     document.write('  </div>');
-		                     document.write('</form>');
-		                    </script>
-                		</div--><!-- end search-box -->
-                    <!--/div--><!-- end menu-search -->
-                    <xsl:apply-templates mode="html.header.mode" select="$node"/>
-                    <div id="cwt-content" class="clearfix content-area">
-                	    <div id="page">
-                	        <div id="content">
-                    		    <xsl:apply-templates mode="html.body.mode" select="$node"/>
-                    		</div>
-                    		<div id="pagebottom"></div>
-                	    </div>
-                    </div>
-                </div><!-- end container-inner -->
-                <div id="footer">
-                    <p>Le contenu de ce document est disponible sous licence libre, voir <a href="/legal.html">Légal</a> pour plus de détails.<br /> Pour savoir comment contribuer, reportez-vous à la <a href="https://wiki.ubuntu.com/DocumentationTeam">page du wiki anglais de l'Equipe de Documentation Ubuntu</a> ainsi que la <a href="//doc.ubuntu-fr.org/ubuntu-l10n-fr">page de l'équipe de traduction francophone</a>. Pour signaler un problème sur cette documentation, visitez la <a href="https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs">page des bogues de la Documentation Ubuntu</a>.</p>
-                </div>
-            </div><!-- end container -->
-            <img src="http://piwik.infra.ubuntu-fr.org/piwik.php?idsite=4&amp;rec=1" style="border:0" alt="" />
-            <!-- IE6 hacks -->
-            <!--[if IE 6 ]>
-                    <script src="js/pngFix.js"></script>
-                    <script> DD_belatedPNG.fix('.png'); </script>
-            <![endif]-->
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template name="mal2html.page.linktrails.trail">
-  <xsl:param name="node" select="."/>
-  <div class="trail">
-    <a href="//guide.ubuntu-fr.org/13.04/" class="trail">Ubuntu 13.04</a>
-  <xsl:variable name="direction">
-    <xsl:call-template name="l10n.direction"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$direction = 'rtl'">
-      <xsl:choose>
-        <xsl:when test="$node/@child = 'section'">
-          <xsl:text>&#x00A0;‹ </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#x00A0;« </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$node/@child = 'section'">
-          <xsl:text>&#x00A0;› </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#x00A0;» </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-    <xsl:call-template name="mal2html.page.linktrails.link">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/desktop/ubuntu-1310-fr.xsl b/desktop/ubuntu-1310-fr.xsl
deleted file mode 100644
index 07bfb81..0000000
--- a/desktop/ubuntu-1310-fr.xsl
+++ /dev/null
@@ -1,791 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:set="http://exslt.org/sets"
-                xmlns="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="html set"
-                extension-element-prefixes="exsl"
-                version="1.0">
-
-<xsl:param name="color.gray_background" select="'#f7f6f5'"/>
-<xsl:param name="color.gray_border" select="'#ccc1c1'"/>
-<xsl:param name="color.blue_background" select="'#f7f6f5'"/>
-<xsl:param name="color.blue_border" select="'#ccc1c1'"/>
-<xsl:param name="color.yellow_background" select="'#f7f6f5'"/>
-<xsl:param name="color.yellow_border" select="'#ccc1c1'"/>
-<xsl:param name="color.red_background" select="'#f7f6f5'"/>
-<xsl:param name="color.red_border" select="'#ccc1c1'"/>
-
-<xsl:param name="color.text" select="'#333333'"/>
-<xsl:param name="color.text_light" select="'#333333'"/>
-<xsl:param name="color.link" select="'#dd4814'"/>
-<xsl:param name="color.link_visited" select="'#dd4814'"/>
-
-<!--  It seems that many color definitions above were done to force the resulting html to mimic
-      the light-moin-theme, but they also broke some other things.
-      So also added back, below, some realistic color definitions for possible override use in some cases.
-      (Note: These defintions are the same as the Ubuntu ServerGuide and any changes should be
-      made to both, for consistency. -->
-
-<xsl:param name="color.gray_background_actually" select="'#e5e5e5'"/>
-<xsl:param name="color.gray_border_actually" select="'#aaaaaa'"/>
-<xsl:param name="color.blue_background_actually" select="'#bebeff'"/>
-<xsl:param name="color.blue_border_actually" select="'#5050ff'"/>
-<xsl:param name="color.yellow_background_actually" select="'#ffff6e'"/>
-<xsl:param name="color.yellow_border_actually" select="'#ffff00'"/>
-<xsl:param name="color.red_background_actually" select="'#ffbebe'"/>
-<xsl:param name="color.red_border_actually" select="'#ff5050'"/>
-
-<xsl:param name="color.text_light_actually" select="'#808080'"/>
-
-<xsl:template name="html.css.custom">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="direction">
-    <xsl:call-template name="l10n.direction"/>
-  </xsl:param>
-  <xsl:param name="left">
-    <xsl:call-template name="l10n.align.start">
-      <xsl:with-param name="direction" select="$direction"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:param name="right">
-    <xsl:call-template name="l10n.align.end">
-      <xsl:with-param name="direction" select="$direction"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:text>
-
-/* Based on light-moin-theme from https://code.launchpad.net/ubuntu-website/light-moin-theme 
-   Some tweaks and adaptation for xsl by Matthew East for Ubuntu Documentation Team
-   [e-mail] */
-
-/* Don't forget to set a foreground and background color
- on the 'html' or 'body' element! */
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-weight: inherit;
-    font-style: inherit;
-    font-size: 100%;
-    line-height: 1.5;
-    font-family: inherit;
-    text-align: left;
-    vertical-align: baseline;
-}
-
-/* span.key is not defined in the yelp html.xsl, but it should be. Define it here because it is required. */
-span.key {
-  font-weight: bold;
-}
- 
-/* overide the yelp html.xsl here. Why? Because the definition of text_light is wrong above, but fixing it breaks a multitude of other things. */
-span.gui, span.guiseq { color: </xsl:text>
-  <xsl:value-of select="$color.text_light_actually"/><xsl:text>; }
- 
-/* overide some of the yelp html.xsl here. Why? Because the definition of gray stuff wrong above, but fixing it breaks a multitude of other things. */
-kbd {
-  background-color: </xsl:text>
-    <xsl:value-of select="$color.gray_background_actually"/><xsl:text>;
-  border: solid 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
-  -moz-box-shadow: 1px 1px 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
-  -webkit-box-shadow: 1px 1px 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
-  box-shadow: 1px 1px 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
-}
-
-a img, :link img, :visited img {
-    border: 0;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-
-ol, ul {
-    list-style: none;
-}
-
-q:before, q:after, blockquote:before, blockquote:after {
-    content: "";
-}
-
-/* moin specific overrides go below */
-.clear { clear: both; }
-#fullsearch { display: none; }
-
-body {
-    background-image: url("img/bg_dotted.png");
-}
-
-#main-menu a {
-    padding: 24px 8px;
-}
-
-#search-box {
-    margin-left: 650px;
-    -moz-border-radius: 0px 0px 4px 4px;
-    -webkit-border-bottom-left-radius: 4px;
-    -webkit-border-bottom-right-radius: 4px;
-    -moz-box-shadow: #bbb 0px 0px 2px;
-    -webkit-box-shadow: #bbb 0px 0px 2px;
-    background-color: #F2F2F2;
-    width: 290px;
-    height: 33px;
-    padding: 7px 0 0 10px;
-}
-
-#search-box #searchinput {
-    float: left;
-    width: 172px;
-    height: 20px;
-    margin: 8px 0 0 8px;
-    padding: 3px 0 1px 4px;
-    font-size: 11px;
-    border: 1px solid #ccc;
-}
-#search-box #titlesearch {
-    float: left;
-    background: url("img/search_button_sprite.png") transparent;
-    width: 24px;
-    height: 24px;
-    margin: 8px 0 0 8px;
-    padding: 0;
-    border: none;
-    cursor: pointer;
-	text-indent: 50px;
-}
-
-#search-box button span {
-    position: absolute;
-    overflow: hidden;
-    text-indent: -9999px;
-}
-
-#subheader ul {
-	display: inline;
-	float: left;
-}
-#title span {
-	color: #333;
-}
-
-/* fix TOC styles */
-#cwt-content table li {
-    margin-left: 1.5em;
-    line-height: 18px;
-}
-#cwt-content table ol {
-    list-style-type: decimal;
-}
-
-/* fix wiki styles */
-#cwt-content pre {
-    line-height: 16px;
-    margin-bottom: 8px;
-}
-#cwt-content h1 {
-    margin-bottom: 8px;
-}
-
-#cwt-content dt {
-    font-weight: bold;
-    margin-top: 10px;
-}
-#cwt-content dt, #cwt-content dd {
-    line-height: 18px;
-    font-size: 14px;
-}
-
-#footer {
-	margin: 0;
-	font-size: 90%;
-	color: #444;
-}
-
-/* edit form */
-#editor-textarea {
-    width: 100%;
-    font-size: 14px;
-    padding: 4px;
-}
-#cwt-content input[type=text] {
-    width: 100%;
-}
-
-/* moin's msg dialog */
-#message {
-    padding: 16px;
-    margin: 8px 0;
-    border: 20px #F1F1ED solid;
-    font-size: 14px;
-    background-color: white;
-}
-#message p {
-    font-size: 14px;
-    font-weight: bold;
-}
-
-/* tables need a little spacing */
-#cwt-content td, #cwt-content th {
-    margin: 1px;
-    padding: 4px;
-}
-#cwt-content td, #cwt-content th {
-    border: 1px solid #E9E9E9;
-}
-#cwt-content ol, #cwt-content ul, #cwt-content dl {
-    margin-bottom: 8px;
-    list-style-type: decimal;
-}
-#cwt-content li, #cwt-content dd, #cwt-content dt {
-    line-height: 14px;
-}
-#cwt-content ol li {
-    margin-left: 18px;
-}
-#cwt-content tt {
-    font-family: monospace;
-}
-
-body {
-    font-family: "Ubuntu", "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif;
-    color: #333;
-    background: white url(img/bg_dotted.png);
-    font-size: 13px;
-    line-height: 1.5;
-    margin: 0px;
-    padding: 0px;
-}
-#container {
-    background: #f7f6f5;
-    margin: 0px auto 20px;
-    padding: 0px;
-    width: 976px;
-}
-#container-inner {
-    background-color: #fff;
-}
-#header, #container-inner {
-    -moz-border-radius: 0px 0px 5px 5px;
-    -webkit-border-bottom-left-radius: 5px;
-    -webkit-border-bottom-right-radius: 5px;
-    -moz-box-shadow: #bbb 0px 0px 5px;
-    -webkit-box-shadow: #bbb 0px 0px 5px;
-}
-#header {
-    background: #dd4814 url(img/header_bg.png) top left repeat-x;
-    height: 64px;
-    margin: 0px;
-    padding: 0px;
-    position: relative;
-}
-
-#mothership ul {
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    height: 20px;
-}
-
-#mothership li {
-    float: right;
-    padding: 3px 0;
-    margin: 0 16px 0 0;
-    font-size: 10px;
-    line-height: 14px;
-}
-
-#mothership a {
-    color: #333;
-}
-
-#menu-search {
-    height: 40px;
-    margin: 0 16px;
-}
-
-#cwt-content {
-    width: 850px;
-    padding: 16px 40px 16px 40px;
-    margin: 0 16px 16px;
-    background-color: #ffffff;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-
-#end-content {
-    clear: both;
-}
-
-.box-944 {
-    background: #ffffff;
-    width: 944px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-.box-304 {
-    background: #ffffff;
-    width: 304px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-.box-624 {
-    background: #ffffff;
-    width: 304px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-
-.content-box {
-    width: 912px;
-    padding: 16px;
-}
-
-#ubuntu-header {
-    background-image: url(img/header_logo.png);
-    background-repeat: no-repeat;
-    height: 32px;
-    right: 16px;
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    top: 16px;
-    width: 292px;
-    overflow: hidden;
-    text-indent: -9999px;
-}
-
-#ubuntu-header a {
-    display: block;
-    height: 100%;
-    width: 100%;
-}
-
-#footer {
-    padding-top: 16px;
-}
-
-#footer p {
-    margin: 0;
-    padding-bottom: 16px;
-    border-bottom: 1px dotted #aea79f;
-    text-align: center;
-}
-
-#main-menu {
-    list-style: none;
-    margin: 0;
-    margin-left: 16px;
-    padding: 0;
-    height: 100%;
-    background: url(img/topnav_divider.png) no-repeat scroll left top transparent !important;
-}
-#main-menu li {
-    float: left;
-    margin: 0;
-    padding: 0;
-    height: 64px;
-    font-size: 14px;
-    line-height: 16px;
-    background: url(img/topnav_divider.png) no-repeat scroll right top transparent !important;
-}
-#main-menu a {
-    display: block;
-    float: left;
-    margin: 0;
-    padding: 24px 8px;
-    text-decoration: none;
-    color: #fff;
-    text-shadow: #000 0px 1px;
-}
-
-.main-menu-item.current,
-#main-menu a:hover, #main-menu a.active {
-    background: url(img/topnav_active_bg.png) no-repeat right top transparent !important;
-}
-
-h1, h2, h3, h4, h5 {
-    color: #333;
-    padding: 0;
-    margin: 0;
-    font-weight: normal;
-    margin-top: 1em;
-}
-h1 {
-    font-size: 28px;
-    line-height: 32px;
-    margin-top: 0em;
-}
-h2 {
-    font-size: 24px;
-    line-height: 28px;
-    margin-bottom: 8px;
-}
-h3 {
-    font-size: 16px;
-    line-height: 20px;
-    margin-bottom: 8px;
-}
-h3.link-other {
-    color: #333;
-}
-h3.link-services {
-    color: #fff;
-}
-h4 {
-    font-size: 12px;
-    line-height: 14px;
-}
-h4.link-news {
-    color: #ef5a29;
-}
-h4.link-ubuntu {
-    color: #dd4814;
-}
-h4.partners {
-    color: #333;
-    font-size: 16px;
-    line-height: 20px;
-}
-h5 {
-    color: #333;
-    font-size: 10px;
-    line-height: 14px;
-}
-p {
-    font-size: 13px;
-    line-height: 1.5;
-    margin-bottom: 8px;
-}
-pre {
-    background-color:#F3F3F3;
-    border:1px dashed #C1B496;
-    font-family:UbuntuMono,courier,monospace;
-    padding:4pt;
-    white-space:pre-wrap;
-    word-wrap:break-word;
-}
-tt {
-    font-family:UbuntuMono,courier,monospace;
-}
-
-strong {
-    font-weight: bold;
-}
-
-a {
-    color: #DD4814;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-ul {
-    margin-bottom: 16px;
-}
-ul li {
-    margin-left: 2.4em;
-    margin-bottom: 8px;
-    line-height: 14px;
-}
-ul li:last-child {
-    margin-bottom: 0px;
-}
-
-p.call-to-action {
-    color: #333;
-}
-p.case-study {
-    color: #333;
-}
-p.highlight {
-    font-size: 16px;
-    line-height: 20px;
-}
-p.introduction {
-    color: #333;
-    font-size: 16px;
-    line-height: 20px;
-}
-p.services {
-    color: #fff;
-}
-#pageinfo {
-    font-size: 70%;
-    padding: 0 16px 12px;
-    text-align: right;
-}
-p.small-text {
-    color: #333;
-    font-size: 10px;
-}
-
-.newsfeed {
-    background: url(img/news_feed_bg.png) no-repeat scroll right top transparent;
-    padding: 0 20px 0 0;
-}
-
-/* Clearing floats without extra markup
-Based on How To Clear Floats Without Structural Markup by PiE
-[http://www.positioniseverything.net/easyclearing.html] */
-.clearfix:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.clearfix {
-    display: inline-block;
-}  /* for IE/Mac */
-
-div.trail {
-  font-size: 100%;
-  text-indent: -1em;
-  color: #aea79f;
-}
-
-/* Form related styling */
-input, select {
-    /* Override mozilla's default form css inherited from the system */
-    font-size: 100%;
-}
-.wForm form label {
-    display: block;
-    padding-bottom: 3px;
-    color: black;
-}
-.wForm form input[type=text],
-.wForm form input[type=password],
-.wForm form textarea {
-    border: 1px solid #c7c7c7;
-    padding: 2px;
-    color: black;
-    background: #fff;
-}
-.wForm form input[type=text]:focus,
-.wForm form input[type=password]:focus,
-.wForm form textarea:focus {
-    border: 1px solid #dd4814;
-    outline: 1px solid #dd4814;
-}
-/* Override FormAssembly formatting */
-.wFormContainer {
-    padding: 0;
-    width: 100%;
-}
-.wForm form {
-    margin: 0;
-}
-.wForm form .actions {
-    text-align: right;
-}
-.wForm form .actions .primaryAction {
-    background-color: #dd4814;
-    color: #fff;
-    border: 0;
-    cursor: pointer;
-    font-weight: normal;
-    font-size: 16px;
-    padding: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    text-shadow: #333 0px 1px;
-    margin: 10px 8px 10px 8px;
-}
-.wForm form input[type=text].errFld {
-    border: 2px solid #dd4814;
-}
-.wForm form .errMsg {
-    color: #dd4814 !important;
-}
-.wForm form .oneChoice {
-    display: block;
-}
-.wForm form .oneField {
-    padding: 0 8px;
-    margin-bottom: 8px;
-}
-.wForm form span.reqMark {
-    color: #dd4814 !important;
-    font-weight: bold !important;
-}
-.wForm fieldset {
-    border: none;
-    padding: 0;
-    background: #dfdcd9;
-}
-.wForm input[type=text],
-.wForm input[type=password],
-.wForm select,
-.wForm textarea {
-    width: 290px;
-}
-.wForm legend {
-    padding: 8px;
-    font-size: 16px;
-    font-weight: normal !important;
-    background: #aea79f;
-    width: 100%;
-    color: #fff;
-    margin-bottom: 8px;
-}
-.wForm label.preField,
-.wForm .labelsLeftAligned label.preField,
-.wForm .labelsRightAligned label.preField  {
-    float: none;
-    padding-bottom: 4px;
-}
-.wForm label.postField {
-    display: inline;
-}
-/* Hack for WebKit based browsers to display the fieldset properly */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-    .wForm fieldset {
-        padding: 8px 8px .1px 0px;
-    }
-    .wForm legend {
-        padding: 8px 0px 8px 8px;
-    }
-}
-
-</xsl:text>
-</xsl:template>
-
-<xsl:template name="html.page">
-  <xsl:param name="node" select="."/>
-    <html>
-        <head>
-            <title><xsl:apply-templates mode="html.title.mode" select="$node"/></title>
-            <xsl:call-template name="html.css"/>
-            <xsl:call-template name="html.js"/>
-            <xsl:call-template name="html.head.custom"/>
-            <link rel="shortcut icon" href="//www.ubuntu-fr.org/sites/all/themes/ubuntu2010/favicon.ico" type="image/vnd.microsoft.icon" />
-        </head>
-        <body id="home">
-            <xsl:apply-templates mode="html.body.attr.mode" select="$node"/>
-            <script src="https://ssl.google-analytics.com/urchin.js"
-                    type="text/javascript"></script>
-            <script type="text/javascript">
-               _uacct = "UA-1018242-8";
-               urchinTracker();
-            </script>
-
-            <div id="leftbanner"></div>
-            <div id="rightbanner"></div>
-            <div id="container">
-                <div id="container-inner">
-            	    <div id="mothership">
-                		<ul>
-	                        <li><a href="//ubuntu-fr.org/telechargement">Obtenir Ubuntu</a></li>
-                    	    <li><a href="//forum.ubuntu-fr.org/">Forum</a></li>
-                    	    <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
-                    	    <li><a href="//ubuntu-fr.org/">ubuntu-fr.org</a></li>
-            	        </ul>
-            	    </div>
-                    <div id="header">
-                        <h1 id="ubuntu-header"><a href="//guide.ubuntu-fr.org/">Guides Ubuntu</a></h1>
-                        <ul id="main-menu">
-                            <li><a class="main-menu-item current" href="//guide.ubuntu-fr.org/">Guides</a></li>
-                            <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
-                            <li><a href="http://ubuntu-manual.org/">Manuel Ubuntu</a></li>
-                            <!--li><a href="//guide.ubuntu-fr.org/participer.html">Participer</a></li-->
-                            <!--li><a href="//guide.ubuntu.com/telecharger.html">Télécharger</a></li-->
-                        </ul>
-                    </div>
-                    <!--div id="menu-search" -->
-                        <!--div id="subheader"> 
-                            <div class="subheader-menu"></div>
-                        </div>
-                        <div id="search-box">
-		                    <noscript>
-		                    <form action="https://www.google.com/cse" id="cse-search-box">
-		                        <div>
-		                        <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />
-                     		    <input type="hidden" name="ie" value="UTF-8" />
-                     		    <input type="text" name="q" size="21" />
-                     		    <input type="submit" name="sa" value="Search" />
-                     		    </div>
-		                    </form>
-		                    </noscript>
-
-		                    <script>
-		                     document.write('<form action="//guide.ubuntu-fr.org/search.html" id="cse-search-box">');
-		                     document.write('  <div>');
-		                     document.write('    <input type="hidden" name="cof" value="FORID:9" />');
-		                     document.write('    <input type="hidden" name="cx" value="004599128559784038176:vj_p0xo-nng" />');
-		                     document.write('    <input type="hidden" name="ie" value="UTF-8" />');
-		                     document.write('    <input type="text" name="q" size="21" />');
-		                     document.write('    <input type="submit" name="sa" value="Search" />');
-		                     document.write('  </div>');
-		                     document.write('</form>');
-		                    </script>
-                		</div--><!-- end search-box -->
-                    <!--/div--><!-- end menu-search -->
-                    <xsl:apply-templates mode="html.header.mode" select="$node"/>
-                    <div id="cwt-content" class="clearfix content-area">
-                	    <div id="page">
-                	        <div id="content">
-                    		    <xsl:apply-templates mode="html.body.mode" select="$node"/>
-                    		</div>
-                    		<div id="pagebottom"></div>
-                	    </div>
-                    </div>
-                </div><!-- end container-inner -->
-                <div id="footer">
-                    <p>Le contenu de ce document est disponible sous licence libre, voir <a href="/legal.html">Légal</a> pour plus de détails.<br /> Pour savoir comment contribuer, reportez-vous à la <a href="https://wiki.ubuntu.com/DocumentationTeam">page du wiki anglais de l'Equipe de Documentation Ubuntu</a> ainsi que la <a href="//doc.ubuntu-fr.org/ubuntu-l10n-fr">page de l'équipe de traduction francophone</a>. Pour signaler un problème sur cette documentation, visitez la <a href="https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs">page des bogues de la Documentation Ubuntu</a>.</p>
-                </div>
-            </div><!-- end container -->
-            <img src="http://piwik.infra.ubuntu-fr.org/piwik.php?idsite=4&amp;rec=1" style="border:0" alt="" />
-            <!-- IE6 hacks -->
-            <!--[if IE 6 ]>
-                    <script src="js/pngFix.js"></script>
-                    <script> DD_belatedPNG.fix('.png'); </script>
-            <![endif]-->
-        </body>
-    </html>
-</xsl:template>
-
-<xsl:template name="mal2html.page.linktrails.trail">
-  <xsl:param name="node" select="."/>
-  <div class="trail">
-    <a href="//guide.ubuntu-fr.org/13.10/" class="trail">Ubuntu 13.10</a>
-  <xsl:variable name="direction">
-    <xsl:call-template name="l10n.direction"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$direction = 'rtl'">
-      <xsl:choose>
-        <xsl:when test="$node/@child = 'section'">
-          <xsl:text>&#x00A0;‹ </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#x00A0;« </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$node/@child = 'section'">
-          <xsl:text>&#x00A0;› </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#x00A0;» </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-    <xsl:call-template name="mal2html.page.linktrails.link">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/desktop/ubuntu-1410-fr.xsl b/desktop/ubuntu-1410-fr.xsl
deleted file mode 100644
index eb444e9..0000000
--- a/desktop/ubuntu-1410-fr.xsl
+++ /dev/null
@@ -1,788 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:set="http://exslt.org/sets"
-                xmlns="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="html set"
-                extension-element-prefixes="exsl"
-                version="1.0">
-
-<xsl:param name="mal.if.platform" select="'platform:unity'"/>
-
-<xsl:param name="color.gray_background" select="'#f7f6f5'"/>
-<xsl:param name="color.gray_border" select="'#ccc1c1'"/>
-<xsl:param name="color.blue_background" select="'#f7f6f5'"/>
-<xsl:param name="color.blue_border" select="'#ccc1c1'"/>
-<xsl:param name="color.yellow_background" select="'#f7f6f5'"/>
-<xsl:param name="color.yellow_border" select="'#ccc1c1'"/>
-<xsl:param name="color.red_background" select="'#f7f6f5'"/>
-<xsl:param name="color.red_border" select="'#ccc1c1'"/>
-
-<xsl:param name="color.text" select="'#333333'"/>
-<xsl:param name="color.text_light" select="'#333333'"/>
-<xsl:param name="color.link" select="'#dd4814'"/>
-<xsl:param name="color.link_visited" select="'#dd4814'"/>
-
-<!--  It seems that many color definitions above were done to force the resulting html to mimic
-      the light-moin-theme, but they also broke some other things.
-      So also added back, below, some realistic color definitions for possible override use in some cases.
-      (Note: These defintions are the same as the Ubuntu ServerGuide and any changes should be
-      made to both, for consistency. -->
-
-<xsl:param name="color.gray_background_actually" select="'#e5e5e5'"/>
-<xsl:param name="color.gray_border_actually" select="'#aaaaaa'"/>
-<xsl:param name="color.blue_background_actually" select="'#bebeff'"/>
-<xsl:param name="color.blue_border_actually" select="'#5050ff'"/>
-<xsl:param name="color.yellow_background_actually" select="'#ffff6e'"/>
-<xsl:param name="color.yellow_border_actually" select="'#ffff00'"/>
-<xsl:param name="color.red_background_actually" select="'#ffbebe'"/>
-<xsl:param name="color.red_border_actually" select="'#ff5050'"/>
-
-<xsl:param name="color.text_light_actually" select="'#808080'"/>
-
-<xsl:template name="html.css.custom">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="direction">
-    <xsl:call-template name="l10n.direction"/>
-  </xsl:param>
-  <xsl:param name="left">
-    <xsl:call-template name="l10n.align.start">
-      <xsl:with-param name="direction" select="$direction"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:param name="right">
-    <xsl:call-template name="l10n.align.end">
-      <xsl:with-param name="direction" select="$direction"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:text>
-
-/* Based on light-moin-theme from https://code.launchpad.net/ubuntu-website/light-moin-theme 
-   Some tweaks and adaptation for xsl by Matthew East for Ubuntu Documentation Team
-   [e-mail] */
-
-/* Don't forget to set a foreground and background color
- on the 'html' or 'body' element! */
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-weight: inherit;
-    font-style: inherit;
-    font-size: 100%;
-    line-height: 1.5;
-    font-family: inherit;
-    text-align: left;
-    vertical-align: baseline;
-}
-
-/* span.key is not defined in the yelp html.xsl, but it should be. Define it here because it is required. */
-span.key {
-  font-weight: bold;
-}
-
-/* overide the yelp html.xsl here. Why? Because the definition of text_light is wrong above, but fixing it breaks a multitude of other things. */
-span.gui, span.guiseq { color: </xsl:text>
-  <xsl:value-of select="$color.text_light_actually"/><xsl:text>; }
-
-/* overide some of the yelp html.xsl here. Why? Because the definition of gray stuff wrong above, but fixing it breaks a multitude of other things. */
-kbd {
-  background-color: </xsl:text>
-    <xsl:value-of select="$color.gray_background_actually"/><xsl:text>;
-  border: solid 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
-  -moz-box-shadow: 1px 1px 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
-  -webkit-box-shadow: 1px 1px 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
-  box-shadow: 1px 1px 1px </xsl:text>
-    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
-}
-
-/* insert some space above the links groups on the front page */
-div.links-grid-link {
-    margin: 0.8em 0 0 0;
-}
-
-a img, :link img, :visited img {
-    border: 0;
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-
-ol, ul {
-    list-style: none;
-}
-
-q:before, q:after, blockquote:before, blockquote:after {
-    content: "";
-}
-
-/* moin specific overrides go below */
-.clear { clear: both; }
-#fullsearch { display: none; }
-
-body {
-    background-image: url("img/bg_dotted.png");
-}
-
-#main-menu a {
-    padding: 24px 8px;
-}
-
-#search-box {
-    margin-left: 650px;
-    -moz-border-radius: 0px 0px 4px 4px;
-    -webkit-border-bottom-left-radius: 4px;
-    -webkit-border-bottom-right-radius: 4px;
-    -moz-box-shadow: #bbb 0px 0px 2px;
-    -webkit-box-shadow: #bbb 0px 0px 2px;
-    background-color: #F2F2F2;
-    width: 290px;
-    height: 33px;
-    padding: 7px 0 0 10px;
-}
-
-#search-box #searchinput {
-    float: left;
-    width: 172px;
-    height: 20px;
-    margin: 8px 0 0 8px;
-    padding: 3px 0 1px 4px;
-    font-size: 11px;
-    border: 1px solid #ccc;
-}
-#search-box #titlesearch {
-    float: left;
-    background: url("img/search_button_sprite.png") transparent;
-    width: 24px;
-    height: 24px;
-    margin: 8px 0 0 8px;
-    padding: 0;
-    border: none;
-    cursor: pointer;
-	text-indent: 50px;
-}
-
-#search-box button span {
-    position: absolute;
-    overflow: hidden;
-    text-indent: -9999px;
-}
-
-#subheader ul {
-	display: inline;
-	float: left;
-}
-#title span {
-	color: #333;
-}
-
-/* fix TOC styles */
-#cwt-content table li {
-    margin-left: 1.5em;
-    line-height: 18px;
-}
-#cwt-content table ol {
-    list-style-type: decimal;
-}
-
-/* fix wiki styles */
-#cwt-content pre {
-    line-height: 16px;
-    margin-bottom: 8px;
-}
-#cwt-content h1 {
-    margin-bottom: 8px;
-}
-
-#cwt-content dt {
-    font-weight: bold;
-    margin-top: 10px;
-}
-#cwt-content dt, #cwt-content dd {
-    line-height: 18px;
-    font-size: 14px;
-}
-
-#footer {
-	margin: 0;
-	font-size: 90%;
-	color: #444;
-}
-
-/* edit form */
-#editor-textarea {
-    width: 100%;
-    font-size: 14px;
-    padding: 4px;
-}
-#cwt-content input[type=text] {
-    width: 100%;
-}
-
-/* moin's msg dialog */
-#message {
-    padding: 16px;
-    margin: 8px 0;
-    border: 20px #F1F1ED solid;
-    font-size: 14px;
-    background-color: white;
-}
-#message p {
-    font-size: 14px;
-    font-weight: bold;
-}
-
-/* tables need a little spacing */
-#cwt-content td, #cwt-content th {
-    margin: 1px;
-    padding: 4px;
-}
-#cwt-content td, #cwt-content th {
-    border: 1px solid #E9E9E9;
-}
-#cwt-content ol, #cwt-content ul, #cwt-content dl {
-    margin-bottom: 8px;
-    list-style-type: decimal;
-}
-#cwt-content li, #cwt-content dd, #cwt-content dt {
-    line-height: 14px;
-}
-#cwt-content ol li {
-    margin-left: 18px;
-}
-#cwt-content tt {
-    font-family: monospace;
-}
-
-body {
-    font-family: "Ubuntu", "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif;
-    color: #333;
-    background: white url(img/bg_dotted.png);
-    font-size: 13px;
-    line-height: 1.5;
-    margin: 0px;
-    padding: 0px;
-}
-#container {
-    background: #f7f6f5;
-    margin: 0px auto 20px;
-    padding: 0px;
-    width: 976px;
-}
-#container-inner {
-    background-color: #fff;
-}
-#header, #container-inner {
-    -moz-border-radius: 0px 0px 5px 5px;
-    -webkit-border-bottom-left-radius: 5px;
-    -webkit-border-bottom-right-radius: 5px;
-    -moz-box-shadow: #bbb 0px 0px 5px;
-    -webkit-box-shadow: #bbb 0px 0px 5px;
-}
-#header {
-    background: #dd4814 url(img/header_bg.png) top left repeat-x;
-    height: 64px;
-    margin: 0px;
-    padding: 0px;
-    position: relative;
-}
-
-#mothership ul {
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    height: 20px;
-}
-
-#mothership li {
-    float: right;
-    padding: 3px 0;
-    margin: 0 16px 0 0;
-    font-size: 10px;
-    line-height: 14px;
-}
-
-#mothership a {
-    color: #333;
-}
-
-#menu-search {
-    height: 40px;
-    margin: 0 16px;
-}
-
-#cwt-content {
-    width: 850px;
-    padding: 16px 40px 16px 40px;
-    margin: 0 16px 16px;
-    background-color: #ffffff;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-
-#end-content {
-    clear: both;
-}
-
-.box-944 {
-    background: #ffffff;
-    width: 944px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-.box-304 {
-    background: #ffffff;
-    width: 304px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-.box-624 {
-    background: #ffffff;
-    width: 304px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-}
-
-.content-box {
-    width: 912px;
-    padding: 16px;
-}
-
-#ubuntu-header {
-    background-image: url(img/header_logo.png);
-    background-repeat: no-repeat;
-    height: 32px;
-    right: 16px;
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    top: 16px;
-    width: 292px;
-    overflow: hidden;
-    text-indent: -9999px;
-}
-
-#ubuntu-header a {
-    display: block;
-    height: 100%;
-    width: 100%;
-}
-
-#footer {
-    padding-top: 16px;
-}
-
-#footer p {
-    margin: 0;
-    padding-bottom: 16px;
-    border-bottom: 1px dotted #aea79f;
-    text-align: center;
-}
-
-#main-menu {
-    list-style: none;
-    margin: 0;
-    margin-left: 16px;
-    padding: 0;
-    height: 100%;
-    background: url(img/topnav_divider.png) no-repeat scroll left top transparent !important;
-}
-#main-menu li {
-    float: left;
-    margin: 0;
-    padding: 0;
-    height: 64px;
-    font-size: 14px;
-    line-height: 16px;
-    background: url(img/topnav_divider.png) no-repeat scroll right top transparent !important;
-}
-#main-menu a {
-    display: block;
-    float: left;
-    margin: 0;
-    padding: 24px 8px;
-    text-decoration: none;
-    color: #fff;
-    text-shadow: #000 0px 1px;
-}
-
-.main-menu-item.current,
-#main-menu a:hover, #main-menu a.active {
-    background: url(img/topnav_active_bg.png) no-repeat right top transparent !important;
-}
-
-h1, h2, h3, h4, h5 {
-    color: #333;
-    padding: 0;
-    margin: 0;
-    font-weight: normal;
-    margin-top: 1em;
-}
-h1 {
-    font-size: 28px;
-    line-height: 32px;
-    margin-top: 0em;
-}
-h2 {
-    font-size: 24px;
-    line-height: 28px;
-    margin-bottom: 8px;
-}
-h3 {
-    font-size: 16px;
-    line-height: 20px;
-    margin-bottom: 8px;
-}
-h3.link-other {
-    color: #333;
-}
-h3.link-services {
-    color: #fff;
-}
-h4 {
-    font-size: 12px;
-    line-height: 14px;
-}
-h4.link-news {
-    color: #ef5a29;
-}
-h4.link-ubuntu {
-    color: #dd4814;
-}
-h4.partners {
-    color: #333;
-    font-size: 16px;
-    line-height: 20px;
-}
-h5 {
-    color: #333;
-    font-size: 10px;
-    line-height: 14px;
-}
-p {
-    font-size: 13px;
-    line-height: 1.5;
-    margin-bottom: 8px;
-}
-pre {
-    background-color:#F3F3F3;
-    border:1px dashed #C1B496;
-    font-family:UbuntuMono,courier,monospace;
-    padding:4pt;
-    white-space:pre-wrap;
-    word-wrap:break-word;
-}
-tt {
-    font-family:UbuntuMono,courier,monospace;
-}
-
-strong {
-    font-weight: bold;
-}
-
-a {
-    color: #DD4814;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-ul {
-    margin-bottom: 16px;
-}
-ul li {
-    margin-left: 2.4em;
-    margin-bottom: 8px;
-    line-height: 14px;
-}
-ul li:last-child {
-    margin-bottom: 0px;
-}
-
-p.call-to-action {
-    color: #333;
-}
-p.case-study {
-    color: #333;
-}
-p.highlight {
-    font-size: 16px;
-    line-height: 20px;
-}
-p.introduction {
-    color: #333;
-    font-size: 16px;
-    line-height: 20px;
-}
-p.services {
-    color: #fff;
-}
-#pageinfo {
-    font-size: 70%;
-    padding: 0 16px 12px;
-    text-align: right;
-}
-p.small-text {
-    color: #333;
-    font-size: 10px;
-}
-
-.newsfeed {
-    background: url(img/news_feed_bg.png) no-repeat scroll right top transparent;
-    padding: 0 20px 0 0;
-}
-
-/* Clearing floats without extra markup
-Based on How To Clear Floats Without Structural Markup by PiE
-[http://www.positioniseverything.net/easyclearing.html] */
-.clearfix:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.clearfix {
-    display: inline-block;
-}  /* for IE/Mac */
-
-div.trail {
-  font-size: 100%;
-  text-indent: -1em;
-  color: #aea79f;
-}
-
-/* Form related styling */
-input, select {
-    /* Override mozilla's default form css inherited from the system */
-    font-size: 100%;
-}
-.wForm form label {
-    display: block;
-    padding-bottom: 3px;
-    color: black;
-}
-.wForm form input[type=text],
-.wForm form input[type=password],
-.wForm form textarea {
-    border: 1px solid #c7c7c7;
-    padding: 2px;
-    color: black;
-    background: #fff;
-}
-.wForm form input[type=text]:focus,
-.wForm form input[type=password]:focus,
-.wForm form textarea:focus {
-    border: 1px solid #dd4814;
-    outline: 1px solid #dd4814;
-}
-/* Override FormAssembly formatting */
-.wFormContainer {
-    padding: 0;
-    width: 100%;
-}
-.wForm form {
-    margin: 0;
-}
-.wForm form .actions {
-    text-align: right;
-}
-.wForm form .actions .primaryAction {
-    background-color: #dd4814;
-    color: #fff;
-    border: 0;
-    cursor: pointer;
-    font-weight: normal;
-    font-size: 16px;
-    padding: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    text-shadow: #333 0px 1px;
-    margin: 10px 8px 10px 8px;
-}
-.wForm form input[type=text].errFld {
-    border: 2px solid #dd4814;
-}
-.wForm form .errMsg {
-    color: #dd4814 !important;
-}
-.wForm form .oneChoice {
-    display: block;
-}
-.wForm form .oneField {
-    padding: 0 8px;
-    margin-bottom: 8px;
-}
-.wForm form span.reqMark {
-    color: #dd4814 !important;
-    font-weight: bold !important;
-}
-.wForm fieldset {
-    border: none;
-    padding: 0;
-    background: #dfdcd9;
-}
-.wForm input[type=text],
-.wForm input[type=password],
-.wForm select,
-.wForm textarea {
-    width: 290px;
-}
-.wForm legend {
-    padding: 8px;
-    font-size: 16px;
-    font-weight: normal !important;
-    background: #aea79f;
-    width: 100%;
-    color: #fff;
-    margin-bottom: 8px;
-}
-.wForm label.preField,
-.wForm .labelsLeftAligned label.preField,
-.wForm .labelsRightAligned label.preField  {
-    float: none;
-    padding-bottom: 4px;
-}
-.wForm label.postField {
-    display: inline;
-}
-/* Hack for WebKit based browsers to display the fieldset properly */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-    .wForm fieldset {
-        padding: 8px 8px .1px 0px;
-    }
-    .wForm legend {
-        padding: 8px 0px 8px 8px;
-    }
-}
-
-</xsl:text>
-</xsl:template>
-
-<xsl:template name="html.page">
-  <xsl:param name="node" select="."/>
-  <html>
-    <head>
-      <title>
-        <xsl:apply-templates mode="html.title.mode" select="$node"/>
-      </title>
-      <xsl:call-template name="html.css"/>
-      <xsl:call-template name="html.js"/>
-      <xsl:call-template name="html.head.custom"/>
-    </head>
-    <body id="home">
-
-      <xsl:apply-templates mode="html.body.attr.mode" select="$node"/>
-      <script src="https://ssl.google-analytics.com/urchin.js"
-      type="text/javascript"></script>
-      <script type="text/javascript">
-      _uacct = "UA-1018242-8";
-      urchinTracker();
-      </script>
-
-
-    <div id="leftbanner">
-    </div>
-    <div id="rightbanner">
-    </div>
-    <div id="container">
-        <div id="container-inner">
-	    <div id="mothership">
-		    <ul>
-                <li><a href="//ubuntu-fr.org/telechargement">Obtenir Ubuntu</a></li>
-        	    <li><a href="//forum.ubuntu-fr.org/">Forum</a></li>
-        	    <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
-        	    <li><a href="//ubuntu-fr.org/">ubuntu-fr.org</a></li>
-            </ul>
-	    </div>
-            <div id="header">
-                        <h1 id="ubuntu-header"><a href="//guide.ubuntu-fr.org/">Guides Ubuntu</a></h1>
-                <ul id="main-menu">
-                            <li><a class="main-menu-item current" href="//guide.ubuntu-fr.org/">Guides</a></li>
-                            <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
-                            <li><a href="http://ubuntu-manual.org/">Manuel Ubuntu</a></li>
-                            <!--li><a href="//guide.ubuntu-fr.org/participer.html">Participer</a></li-->
-                            <!--li><a href="//guide.ubuntu.com/telecharger.html">Télécharger</a></li-->
-                </ul>
-            </div>
-            <!--<div id="menu-search">
-                <div id="subheader"> 
-                    <div class="subheader-menu"> 
-                    </div> 
-                </div>
-                <div id="search-box">
-		<noscript>
-		<form action="https://www.google.com/cse" id="cse-search-box">
-		    <div>
-		     <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />
- 		    <input type="hidden" name="ie" value="UTF-8" />
- 		    <input type="text" name="q" size="21" />
- 		    <input type="submit" name="sa" value="Search" />
- 		    </div>
-		</form>
-		</noscript>
-
-		<script>
-		 document.write('<form action="https://help.ubuntu.com/search.html" id="cse-search-box">');
-		 document.write('  <div>');
-		 document.write('    <input type="hidden" name="cof" value="FORID:9" />');
-		 document.write('    <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />');
-		 document.write('    <input type="hidden" name="ie" value="UTF-8" />');
-		 document.write('    <input type="text" name="q" size="21" />');
-		 document.write('    <input type="submit" name="sa" value="Search" />');
-		 document.write('  </div>');
-		 document.write('</form>');
-		</script>
-		</div>
-            </div>-->
-        <xsl:apply-templates mode="html.header.mode" select="$node"/>
-        <div id="cwt-content" class="clearfix content-area">
-	    <div id="page">
-	        <div id="content">
-		    <xsl:apply-templates mode="html.body.mode" select="$node"/>
-		</div>
-		<div id="pagebottom">
-		</div>
-	    </div>
-        </div>
-    </div>
-    <div id="footer">
-                    <p>Le contenu de ce document est disponible sous licence libre, voir <a href="//legal.html">Légal</a> pour plus de détails.<br /> Pour savoir comment contribuer, reportez-vous à la <a href="https://wiki.ubuntu.com/DocumentationTeam">page du wiki anglais de l'Equipe de Documentation Ubuntu</a> ainsi que la <a href="//doc.ubuntu-fr.org/ubuntu-l10n-fr">page de l'équipe de traduction francophone</a>. Pour signaler un problème sur cette documentation, visitez la <a href="https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs">page des bogues de la Documentation Ubuntu</a>.</p>
-    </div>
-    </div>
-            <img src="//piwik.infra.ubuntu-fr.org/piwik.php?idsite=4&amp;rec=1" style="border:0" alt="" />
-
-  <!-- IE6 hacks -->
-  <!--[if IE 6 ]>
-          <script src="js/pngFix.js"></script>
-          <script> DD_belatedPNG.fix('.png'); </script>
-  <![endif]-->
-</body>
-</html>
-
-</xsl:template>
-
-<xsl:template name="mal2html.page.linktrails.trail.prefix">
-  <xsl:param name="node" select="."/>
-  <a href="//guide.ubuntu-fr.org/14.10/" class="trail">Ubuntu 14.10</a>
-  <xsl:variable name="direction">
-    <xsl:call-template name="l10n.direction"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$direction = 'rtl'">
-      <xsl:text>&#x00A0;« </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>&#x00A0;» </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/desktop/ubuntu-1604-fr.xsl b/desktop/ubuntu-1604-fr.xsl
new file mode 100644
index 0000000..67a28b5
--- /dev/null
+++ b/desktop/ubuntu-1604-fr.xsl
@@ -0,0 +1,788 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:html="http://www.w3.org/1999/xhtml"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:set="http://exslt.org/sets"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="html set"
+                extension-element-prefixes="exsl"
+                version="1.0">
+
+<xsl:param name="mal.if.platform" select="'platform:unity'"/>
+
+<xsl:param name="color.gray_background" select="'#f7f6f5'"/>
+<xsl:param name="color.gray_border" select="'#ccc1c1'"/>
+<xsl:param name="color.blue_background" select="'#f7f6f5'"/>
+<xsl:param name="color.blue_border" select="'#ccc1c1'"/>
+<xsl:param name="color.yellow_background" select="'#f7f6f5'"/>
+<xsl:param name="color.yellow_border" select="'#ccc1c1'"/>
+<xsl:param name="color.red_background" select="'#f7f6f5'"/>
+<xsl:param name="color.red_border" select="'#ccc1c1'"/>
+
+<xsl:param name="color.text" select="'#333333'"/>
+<xsl:param name="color.text_light" select="'#333333'"/>
+<xsl:param name="color.link" select="'#dd4814'"/>
+<xsl:param name="color.link_visited" select="'#dd4814'"/>
+
+<!--  It seems that many color definitions above were done to force the resulting html to mimic
+      the light-moin-theme, but they also broke some other things.
+      So also added back, below, some realistic color definitions for possible override use in some cases.
+      (Note: These defintions are the same as the Ubuntu ServerGuide and any changes should be
+      made to both, for consistency. -->
+
+<xsl:param name="color.gray_background_actually" select="'#e5e5e5'"/>
+<xsl:param name="color.gray_border_actually" select="'#aaaaaa'"/>
+<xsl:param name="color.blue_background_actually" select="'#bebeff'"/>
+<xsl:param name="color.blue_border_actually" select="'#5050ff'"/>
+<xsl:param name="color.yellow_background_actually" select="'#ffff6e'"/>
+<xsl:param name="color.yellow_border_actually" select="'#ffff00'"/>
+<xsl:param name="color.red_background_actually" select="'#ffbebe'"/>
+<xsl:param name="color.red_border_actually" select="'#ff5050'"/>
+
+<xsl:param name="color.text_light_actually" select="'#808080'"/>
+
+<xsl:template name="html.css.custom">
+  <xsl:param name="node" select="."/>
+  <xsl:param name="direction">
+    <xsl:call-template name="l10n.direction"/>
+  </xsl:param>
+  <xsl:param name="left">
+    <xsl:call-template name="l10n.align.start">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:param>
+  <xsl:param name="right">
+    <xsl:call-template name="l10n.align.end">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:param>
+  <xsl:text>
+
+/* Based on light-moin-theme from https://code.launchpad.net/ubuntu-website/light-moin-theme 
+   Some tweaks and adaptation for xsl by Matthew East for Ubuntu Documentation Team
+   [e-mail] */
+
+/* Don't forget to set a foreground and background color
+ on the 'html' or 'body' element! */
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-weight: inherit;
+    font-style: inherit;
+    font-size: 100%;
+    line-height: 1.5;
+    font-family: inherit;
+    text-align: left;
+    vertical-align: baseline;
+}
+
+/* span.key is not defined in the yelp html.xsl, but it should be. Define it here because it is required. */
+span.key {
+  font-weight: bold;
+}
+
+/* overide the yelp html.xsl here. Why? Because the definition of text_light is wrong above, but fixing it breaks a multitude of other things. */
+span.gui, span.guiseq { color: </xsl:text>
+  <xsl:value-of select="$color.text_light_actually"/><xsl:text>; }
+
+/* overide some of the yelp html.xsl here. Why? Because the definition of gray stuff wrong above, but fixing it breaks a multitude of other things. */
+kbd {
+  background-color: </xsl:text>
+    <xsl:value-of select="$color.gray_background_actually"/><xsl:text>;
+  border: solid 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
+  -moz-box-shadow: 1px 1px 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
+  -webkit-box-shadow: 1px 1px 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
+  box-shadow: 1px 1px 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
+}
+
+/* insert some space above the links groups on the front page */
+div.links-grid-link {
+    margin: 0.8em 0 0 0;
+}
+
+a img, :link img, :visited img {
+    border: 0;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+ol, ul {
+    list-style: none;
+}
+
+q:before, q:after, blockquote:before, blockquote:after {
+    content: "";
+}
+
+/* moin specific overrides go below */
+.clear { clear: both; }
+#fullsearch { display: none; }
+
+body {
+    background-image: url("img/bg_dotted.png");
+}
+
+#main-menu a {
+    padding: 24px 8px;
+}
+
+#search-box {
+    margin-left: 650px;
+    -moz-border-radius: 0px 0px 4px 4px;
+    -webkit-border-bottom-left-radius: 4px;
+    -webkit-border-bottom-right-radius: 4px;
+    -moz-box-shadow: #bbb 0px 0px 2px;
+    -webkit-box-shadow: #bbb 0px 0px 2px;
+    background-color: #F2F2F2;
+    width: 290px;
+    height: 33px;
+    padding: 7px 0 0 10px;
+}
+
+#search-box #searchinput {
+    float: left;
+    width: 172px;
+    height: 20px;
+    margin: 8px 0 0 8px;
+    padding: 3px 0 1px 4px;
+    font-size: 11px;
+    border: 1px solid #ccc;
+}
+#search-box #titlesearch {
+    float: left;
+    background: url("img/search_button_sprite.png") transparent;
+    width: 24px;
+    height: 24px;
+    margin: 8px 0 0 8px;
+    padding: 0;
+    border: none;
+    cursor: pointer;
+	text-indent: 50px;
+}
+
+#search-box button span {
+    position: absolute;
+    overflow: hidden;
+    text-indent: -9999px;
+}
+
+#subheader ul {
+	display: inline;
+	float: left;
+}
+#title span {
+	color: #333;
+}
+
+/* fix TOC styles */
+#cwt-content table li {
+    margin-left: 1.5em;
+    line-height: 18px;
+}
+#cwt-content table ol {
+    list-style-type: decimal;
+}
+
+/* fix wiki styles */
+#cwt-content pre {
+    line-height: 16px;
+    margin-bottom: 8px;
+}
+#cwt-content h1 {
+    margin-bottom: 8px;
+}
+
+#cwt-content dt {
+    font-weight: bold;
+    margin-top: 10px;
+}
+#cwt-content dt, #cwt-content dd {
+    line-height: 18px;
+    font-size: 14px;
+}
+
+#footer {
+	margin: 0;
+	font-size: 90%;
+	color: #444;
+}
+
+/* edit form */
+#editor-textarea {
+    width: 100%;
+    font-size: 14px;
+    padding: 4px;
+}
+#cwt-content input[type=text] {
+    width: 100%;
+}
+
+/* moin's msg dialog */
+#message {
+    padding: 16px;
+    margin: 8px 0;
+    border: 20px #F1F1ED solid;
+    font-size: 14px;
+    background-color: white;
+}
+#message p {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+/* tables need a little spacing */
+#cwt-content td, #cwt-content th {
+    margin: 1px;
+    padding: 4px;
+}
+#cwt-content td, #cwt-content th {
+    border: 1px solid #E9E9E9;
+}
+#cwt-content ol, #cwt-content ul, #cwt-content dl {
+    margin-bottom: 8px;
+    list-style-type: decimal;
+}
+#cwt-content li, #cwt-content dd, #cwt-content dt {
+    line-height: 14px;
+}
+#cwt-content ol li {
+    margin-left: 18px;
+}
+#cwt-content tt {
+    font-family: monospace;
+}
+
+body {
+    font-family: "Ubuntu", "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif;
+    color: #333;
+    background: white url(img/bg_dotted.png);
+    font-size: 13px;
+    line-height: 1.5;
+    margin: 0px;
+    padding: 0px;
+}
+#container {
+    background: #f7f6f5;
+    margin: 0px auto 20px;
+    padding: 0px;
+    width: 976px;
+}
+#container-inner {
+    background-color: #fff;
+}
+#header, #container-inner {
+    -moz-border-radius: 0px 0px 5px 5px;
+    -webkit-border-bottom-left-radius: 5px;
+    -webkit-border-bottom-right-radius: 5px;
+    -moz-box-shadow: #bbb 0px 0px 5px;
+    -webkit-box-shadow: #bbb 0px 0px 5px;
+}
+#header {
+    background: #dd4814 url(img/header_bg.png) top left repeat-x;
+    height: 64px;
+    margin: 0px;
+    padding: 0px;
+    position: relative;
+}
+
+#mothership ul {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+    height: 20px;
+}
+
+#mothership li {
+    float: right;
+    padding: 3px 0;
+    margin: 0 16px 0 0;
+    font-size: 10px;
+    line-height: 14px;
+}
+
+#mothership a {
+    color: #333;
+}
+
+#menu-search {
+    height: 40px;
+    margin: 0 16px;
+}
+
+#cwt-content {
+    width: 850px;
+    padding: 16px 40px 16px 40px;
+    margin: 0 16px 16px;
+    background-color: #ffffff;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+}
+
+#end-content {
+    clear: both;
+}
+
+.box-944 {
+    background: #ffffff;
+    width: 944px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+}
+.box-304 {
+    background: #ffffff;
+    width: 304px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+}
+.box-624 {
+    background: #ffffff;
+    width: 304px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+}
+
+.content-box {
+    width: 912px;
+    padding: 16px;
+}
+
+#ubuntu-header {
+    background-image: url(img/header_logo.png);
+    background-repeat: no-repeat;
+    height: 32px;
+    right: 16px;
+    margin: 0;
+    padding: 0;
+    position: absolute;
+    top: 16px;
+    width: 292px;
+    overflow: hidden;
+    text-indent: -9999px;
+}
+
+#ubuntu-header a {
+    display: block;
+    height: 100%;
+    width: 100%;
+}
+
+#footer {
+    padding-top: 16px;
+}
+
+#footer p {
+    margin: 0;
+    padding-bottom: 16px;
+    border-bottom: 1px dotted #aea79f;
+    text-align: center;
+}
+
+#main-menu {
+    list-style: none;
+    margin: 0;
+    margin-left: 16px;
+    padding: 0;
+    height: 100%;
+    background: url(img/topnav_divider.png) no-repeat scroll left top transparent !important;
+}
+#main-menu li {
+    float: left;
+    margin: 0;
+    padding: 0;
+    height: 64px;
+    font-size: 14px;
+    line-height: 16px;
+    background: url(img/topnav_divider.png) no-repeat scroll right top transparent !important;
+}
+#main-menu a {
+    display: block;
+    float: left;
+    margin: 0;
+    padding: 24px 8px;
+    text-decoration: none;
+    color: #fff;
+    text-shadow: #000 0px 1px;
+}
+
+.main-menu-item.current,
+#main-menu a:hover, #main-menu a.active {
+    background: url(img/topnav_active_bg.png) no-repeat right top transparent !important;
+}
+
+h1, h2, h3, h4, h5 {
+    color: #333;
+    padding: 0;
+    margin: 0;
+    font-weight: normal;
+    margin-top: 1em;
+}
+h1 {
+    font-size: 28px;
+    line-height: 32px;
+    margin-top: 0em;
+}
+h2 {
+    font-size: 24px;
+    line-height: 28px;
+    margin-bottom: 8px;
+}
+h3 {
+    font-size: 16px;
+    line-height: 20px;
+    margin-bottom: 8px;
+}
+h3.link-other {
+    color: #333;
+}
+h3.link-services {
+    color: #fff;
+}
+h4 {
+    font-size: 12px;
+    line-height: 14px;
+}
+h4.link-news {
+    color: #ef5a29;
+}
+h4.link-ubuntu {
+    color: #dd4814;
+}
+h4.partners {
+    color: #333;
+    font-size: 16px;
+    line-height: 20px;
+}
+h5 {
+    color: #333;
+    font-size: 10px;
+    line-height: 14px;
+}
+p {
+    font-size: 13px;
+    line-height: 1.5;
+    margin-bottom: 8px;
+}
+pre {
+    background-color:#F3F3F3;
+    border:1px dashed #C1B496;
+    font-family:UbuntuMono,courier,monospace;
+    padding:4pt;
+    white-space:pre-wrap;
+    word-wrap:break-word;
+}
+tt {
+    font-family:UbuntuMono,courier,monospace;
+}
+
+strong {
+    font-weight: bold;
+}
+
+a {
+    color: #DD4814;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+ul {
+    margin-bottom: 16px;
+}
+ul li {
+    margin-left: 2.4em;
+    margin-bottom: 8px;
+    line-height: 14px;
+}
+ul li:last-child {
+    margin-bottom: 0px;
+}
+
+p.call-to-action {
+    color: #333;
+}
+p.case-study {
+    color: #333;
+}
+p.highlight {
+    font-size: 16px;
+    line-height: 20px;
+}
+p.introduction {
+    color: #333;
+    font-size: 16px;
+    line-height: 20px;
+}
+p.services {
+    color: #fff;
+}
+#pageinfo {
+    font-size: 70%;
+    padding: 0 16px 12px;
+    text-align: right;
+}
+p.small-text {
+    color: #333;
+    font-size: 10px;
+}
+
+.newsfeed {
+    background: url(img/news_feed_bg.png) no-repeat scroll right top transparent;
+    padding: 0 20px 0 0;
+}
+
+/* Clearing floats without extra markup
+Based on How To Clear Floats Without Structural Markup by PiE
+[http://www.positioniseverything.net/easyclearing.html] */
+.clearfix:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+.clearfix {
+    display: inline-block;
+}  /* for IE/Mac */
+
+div.trail {
+  font-size: 100%;
+  text-indent: -1em;
+  color: #aea79f;
+}
+
+/* Form related styling */
+input, select {
+    /* Override mozilla's default form css inherited from the system */
+    font-size: 100%;
+}
+.wForm form label {
+    display: block;
+    padding-bottom: 3px;
+    color: black;
+}
+.wForm form input[type=text],
+.wForm form input[type=password],
+.wForm form textarea {
+    border: 1px solid #c7c7c7;
+    padding: 2px;
+    color: black;
+    background: #fff;
+}
+.wForm form input[type=text]:focus,
+.wForm form input[type=password]:focus,
+.wForm form textarea:focus {
+    border: 1px solid #dd4814;
+    outline: 1px solid #dd4814;
+}
+/* Override FormAssembly formatting */
+.wFormContainer {
+    padding: 0;
+    width: 100%;
+}
+.wForm form {
+    margin: 0;
+}
+.wForm form .actions {
+    text-align: right;
+}
+.wForm form .actions .primaryAction {
+    background-color: #dd4814;
+    color: #fff;
+    border: 0;
+    cursor: pointer;
+    font-weight: normal;
+    font-size: 16px;
+    padding: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    text-shadow: #333 0px 1px;
+    margin: 10px 8px 10px 8px;
+}
+.wForm form input[type=text].errFld {
+    border: 2px solid #dd4814;
+}
+.wForm form .errMsg {
+    color: #dd4814 !important;
+}
+.wForm form .oneChoice {
+    display: block;
+}
+.wForm form .oneField {
+    padding: 0 8px;
+    margin-bottom: 8px;
+}
+.wForm form span.reqMark {
+    color: #dd4814 !important;
+    font-weight: bold !important;
+}
+.wForm fieldset {
+    border: none;
+    padding: 0;
+    background: #dfdcd9;
+}
+.wForm input[type=text],
+.wForm input[type=password],
+.wForm select,
+.wForm textarea {
+    width: 290px;
+}
+.wForm legend {
+    padding: 8px;
+    font-size: 16px;
+    font-weight: normal !important;
+    background: #aea79f;
+    width: 100%;
+    color: #fff;
+    margin-bottom: 8px;
+}
+.wForm label.preField,
+.wForm .labelsLeftAligned label.preField,
+.wForm .labelsRightAligned label.preField  {
+    float: none;
+    padding-bottom: 4px;
+}
+.wForm label.postField {
+    display: inline;
+}
+/* Hack for WebKit based browsers to display the fieldset properly */
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .wForm fieldset {
+        padding: 8px 8px .1px 0px;
+    }
+    .wForm legend {
+        padding: 8px 0px 8px 8px;
+    }
+}
+
+</xsl:text>
+</xsl:template>
+
+<xsl:template name="html.page">
+  <xsl:param name="node" select="."/>
+  <html>
+    <head>
+      <title>
+        <xsl:apply-templates mode="html.title.mode" select="$node"/>
+      </title>
+      <xsl:call-template name="html.css"/>
+      <xsl:call-template name="html.js"/>
+      <xsl:call-template name="html.head.custom"/>
+    </head>
+    <body id="home">
+
+      <xsl:apply-templates mode="html.body.attr.mode" select="$node"/>
+      <script src="https://ssl.google-analytics.com/urchin.js"
+      type="text/javascript"></script>
+      <script type="text/javascript">
+      _uacct = "UA-1018242-8";
+      urchinTracker();
+      </script>
+
+
+    <div id="leftbanner">
+    </div>
+    <div id="rightbanner">
+    </div>
+    <div id="container">
+        <div id="container-inner">
+	    <div id="mothership">
+		    <ul>
+                <li><a href="//ubuntu-fr.org/telechargement">Obtenir Ubuntu</a></li>
+        	    <li><a href="//forum.ubuntu-fr.org/">Forum</a></li>
+        	    <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
+        	    <li><a href="//ubuntu-fr.org/">ubuntu-fr.org</a></li>
+            </ul>
+	    </div>
+            <div id="header">
+                        <h1 id="ubuntu-header"><a href="//guide.ubuntu-fr.org/">Guides Ubuntu</a></h1>
+                <ul id="main-menu">
+                            <li><a class="main-menu-item current" href="//guide.ubuntu-fr.org/">Guides</a></li>
+                            <li><a href="//doc.ubuntu-fr.org/">Documentation</a></li>
+                            <li><a href="http://ubuntu-manual.org/">Manuel Ubuntu</a></li>
+                            <!--li><a href="//guide.ubuntu-fr.org/participer.html">Participer</a></li-->
+                            <!--li><a href="//guide.ubuntu.com/telecharger.html">Télécharger</a></li-->
+                </ul>
+            </div>
+            <!--<div id="menu-search">
+                <div id="subheader"> 
+                    <div class="subheader-menu"> 
+                    </div> 
+                </div>
+                <div id="search-box">
+		<noscript>
+		<form action="https://www.google.com/cse" id="cse-search-box">
+		    <div>
+		     <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />
+ 		    <input type="hidden" name="ie" value="UTF-8" />
+ 		    <input type="text" name="q" size="21" />
+ 		    <input type="submit" name="sa" value="Search" />
+ 		    </div>
+		</form>
+		</noscript>
+
+		<script>
+		 document.write('<form action="https://help.ubuntu.com/search.html" id="cse-search-box">');
+		 document.write('  <div>');
+		 document.write('    <input type="hidden" name="cof" value="FORID:9" />');
+		 document.write('    <input type="hidden" name="cx" value="003883529982892832976:e2vwumte3fq" />');
+		 document.write('    <input type="hidden" name="ie" value="UTF-8" />');
+		 document.write('    <input type="text" name="q" size="21" />');
+		 document.write('    <input type="submit" name="sa" value="Search" />');
+		 document.write('  </div>');
+		 document.write('</form>');
+		</script>
+		</div>
+            </div>-->
+        <xsl:apply-templates mode="html.header.mode" select="$node"/>
+        <div id="cwt-content" class="clearfix content-area">
+	    <div id="page">
+	        <div id="content">
+		    <xsl:apply-templates mode="html.body.mode" select="$node"/>
+		</div>
+		<div id="pagebottom">
+		</div>
+	    </div>
+        </div>
+    </div>
+    <div id="footer">
+                    <p>Le contenu de ce document est disponible sous licence libre, voir <a href="//legal.html">Légal</a> pour plus de détails.<br /> Pour savoir comment contribuer, reportez-vous à la <a href="https://wiki.ubuntu.com/DocumentationTeam">page du wiki anglais de l'Equipe de Documentation Ubuntu</a> ainsi que la <a href="//doc.ubuntu-fr.org/ubuntu-l10n-fr">page de l'équipe de traduction francophone</a>. Pour signaler un problème sur cette documentation, visitez la <a href="https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs">page des bogues de la Documentation Ubuntu</a>.</p>
+    </div>
+    </div>
+            <img src="//piwik.infra.ubuntu-fr.org/piwik.php?idsite=4&amp;rec=1" style="border:0" alt="" />
+
+  <!-- IE6 hacks -->
+  <!--[if IE 6 ]>
+          <script src="js/pngFix.js"></script>
+          <script> DD_belatedPNG.fix('.png'); </script>
+  <![endif]-->
+</body>
+</html>
+
+</xsl:template>
+
+<xsl:template name="mal2html.page.linktrails.trail.prefix">
+  <xsl:param name="node" select="."/>
+  <a href="//guide.ubuntu-fr.org/16.04/" class="trail">Ubuntu 16.04 LTS</a>
+  <xsl:variable name="direction">
+    <xsl:call-template name="l10n.direction"/>
+  </xsl:variable>
+  <xsl:choose>
+    <xsl:when test="$direction = 'rtl'">
+      <xsl:text>&#x00A0;« </xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>&#x00A0;» </xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/desktop/ubuntu-1704-fr.xsl b/desktop/ubuntu-1704-fr.xsl
new file mode 100644
index 0000000..89932ff
--- /dev/null
+++ b/desktop/ubuntu-1704-fr.xsl
@@ -0,0 +1,792 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:html="http://www.w3.org/1999/xhtml"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:set="http://exslt.org/sets"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="html set"
+                extension-element-prefixes="exsl"
+                version="1.0">
+
+<xsl:param name="mal.if.platform" select="'platform:unity'"/>
+
+<xsl:param name="color.gray_background" select="'#f7f6f5'"/>
+<xsl:param name="color.gray_border" select="'#ccc1c1'"/>
+<xsl:param name="color.blue_background" select="'#f7f6f5'"/>
+<xsl:param name="color.blue_border" select="'#ccc1c1'"/>
+<xsl:param name="color.yellow_background" select="'#f7f6f5'"/>
+<xsl:param name="color.yellow_border" select="'#ccc1c1'"/>
+<xsl:param name="color.red_background" select="'#f7f6f5'"/>
+<xsl:param name="color.red_border" select="'#ccc1c1'"/>
+
+<xsl:param name="color.text" select="'#333333'"/>
+<xsl:param name="color.text_light" select="'#333333'"/>
+<xsl:param name="color.link" select="'#dd4814'"/>
+<xsl:param name="color.link_visited" select="'#dd4814'"/>
+
+<!--  It seems that many color definitions above were done to force the resulting html to mimic
+      the light-moin-theme, but they also broke some other things.
+      So also added back, below, some realistic color definitions for possible override use in some cases.
+      (Note: These defintions are the same as the Ubuntu ServerGuide and any changes should be
+      made to both, for consistency. -->
+
+<xsl:param name="color.gray_background_actually" select="'#e5e5e5'"/>
+<xsl:param name="color.gray_border_actually" select="'#aaaaaa'"/>
+<xsl:param name="color.blue_background_actually" select="'#bebeff'"/>
+<xsl:param name="color.blue_border_actually" select="'#5050ff'"/>
+<xsl:param name="color.yellow_background_actually" select="'#ffff6e'"/>
+<xsl:param name="color.yellow_border_actually" select="'#ffff00'"/>
+<xsl:param name="color.red_background_actually" select="'#ffbebe'"/>
+<xsl:param name="color.red_border_actually" select="'#ff5050'"/>
+
+<xsl:param name="color.text_light_actually" select="'#808080'"/>
+
+<xsl:template name="html.css.custom">
+  <xsl:param name="node" select="."/>
+  <xsl:param name="direction">
+    <xsl:call-template name="l10n.direction"/>
+  </xsl:param>
+  <xsl:param name="left">
+    <xsl:call-template name="l10n.align.start">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:param>
+  <xsl:param name="right">
+    <xsl:call-template name="l10n.align.end">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:param>
+  <xsl:text>
+
+/* Based on light-moin-theme from https://code.launchpad.net/ubuntu-website/light-moin-theme 
+   Some tweaks and adaptation for xsl by Matthew East for Ubuntu Documentation Team
+   [e-mail] */
+
+/* Don't forget to set a foreground and background color
+ on the 'html' or 'body' element! */
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-weight: inherit;
+    font-style: inherit;
+    font-size: 100%;
+    line-height: 1.5;
+    font-family: inherit;
+    text-align: left;
+    vertical-align: baseline;
+}
+
+/* span.key is not defined in the yelp html.xsl, but it should be. Define it here because it is required. */
+span.key {
+  font-weight: bold;
+}
+
+/* overide the yelp html.xsl here. Why? Because the definition of text_light is wrong above, but fixing it breaks a multitude of other things. */
+span.gui, span.guiseq { color: </xsl:text>
+  <xsl:value-of select="$color.text_light_actually"/><xsl:text>; }
+
+/* overide some of the yelp html.xsl here. Why? Because the definition of gray stuff wrong above, but fixing it breaks a multitude of other things. */
+kbd {
+  background-color: </xsl:text>
+    <xsl:value-of select="$color.gray_background_actually"/><xsl:text>;
+  border: solid 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
+  -moz-box-shadow: 1px 1px 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
+  -webkit-box-shadow: 1px 1px 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
+  box-shadow: 1px 1px 1px </xsl:text>
+    <xsl:value-of select="$color.gray_border_actually"/><xsl:text>;
+}
+
+/* insert some space above the links groups on the front page */
+div.links-grid-link {
+    margin: 0.8em 0 0 0;
+}
+
+a img, :link img, :visited img {
+    border: 0;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+ol, ul {
+    list-style: none;
+}
+
+q:before, q:after, blockquote:before, blockquote:after {
+    content: "";
+}
+
+/* moin specific overrides go below */
+.clear { clear: both; }
+#fullsearch { display: none; }
+
+body {
+    background-image: url("img/bg_dotted.png");
+}
+
+#main-menu a {
+    padding: 24px 8px;
+}
+
+#search-box {
+    margin-left: 650px;
+    -moz-border-radius: 0px 0px 4px 4px;
+    -webkit-border-bottom-left-radius: 4px;
+    -webkit-border-bottom-right-radius: 4px;
+    -moz-box-shadow: #bbb 0px 0px 2px;
+    -webkit-box-shadow: #bbb 0px 0px 2px;
+    background-color: #F2F2F2;
+    width: 290px;
+    height: 33px;
+    padding: 7px 0 0 10px;
+}
+
+#search-box #searchinput {
+    float: left;
+    width: 172px;
+    height: 20px;
+    margin: 8px 0 0 8px;
+    padding: 3px 0 1px 4px;
+    font-size: 11px;
+    border: 1px solid #ccc;
+}
+#search-box #titlesearch {
+    float: left;
+    background: url("img/search_button_sprite.png") transparent;
+    width: 24px;
+    height: 24px;
+    margin: 8px 0 0 8px;
+    padding: 0;
+    border: none;
+    cursor: pointer;
+	text-indent: 50px;
+}
+
+#search-box button span {
+    position: absolute;
+    overflow: hidden;
+    text-indent: -9999px;
+}
+
+#subheader ul {
+	display: inline;
+	float: left;
+}
+#title span {
+	color: #333;
+}
+
+/* fix TOC styles */
+#cwt-content table li {
+    margin-left: 1.5em;
+    line-height: 18px;
+}
+#cwt-content table ol {
+    list-style-type: decimal;
+}
+
+/* fix wiki styles */
+#cwt-content pre {
+    line-height: 16px;
+    margin-bottom: 8px;
+}
+#cwt-content h1 {
+    margin-bottom: 8px;
+}
+
+#cwt-content dt {
+    font-weight: bold;
+    margin-top: 10px;
+}
+#cwt-content dt, #cwt-content dd {
+    line-height: 18px;
+    font-size: 14px;
+}
+
+#footer {
+	margin: 0;
+	font-size: 90%;
+	color: #444;
+}
+
+/* edit form */
+#editor-textarea {
+    width: 100%;
+    font-size: 14px;
+    padding: 4px;
+}
+#cwt-content input[type=text] {
+    width: 100%;
+}
+
+/* moin's msg dialog */
+#message {
+    padding: 16px;
+    margin: 8px 0;
+    border: 20px #F1F1ED solid;
+    font-size: 14px;
+    background-color: white;
+}
+#message p {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+/* tables need a little spacing */
+#cwt-content td, #cwt-content th {
+    margin: 1px;
+    padding: 4px;
+}
+#cwt-content td, #cwt-content th {
+    border: 1px solid #E9E9E9;
+}
+#cwt-content ol, #cwt-content dl {
+    margin-bottom: 8px;
+    list-style-type: decimal;
+}
+#cwt-content ul {
+    margin-bottom: 8px;
+    list-style-type: disc;
+}
+#cwt-content li, #cwt-content dd, #cwt-content dt {
+    line-height: 14px;
+}
+#cwt-content ol li {
+    margin-left: 18px;
+}
+#cwt-content tt {
+    font-family: monospace;
+}
+
+body {
+    font-family: "Ubuntu", "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif;
+    color: #333;
+    background: white url(img/bg_dotted.png);
+    font-size: 13px;
+    line-height: 1.5;
+    margin: 0px;
+    padding: 0px;
+}
+#container {
+    background: #f7f6f5;
+    margin: 0px auto 20px;
+    padding: 0px;
+    width: 976px;
+}
+#container-inner {
+    background-color: #fff;
+}
+#header, #container-inner {