diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 2becbfef07..b099acae11 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -331,7 +331,7 @@ The latest PDF-version of this document can be found here:
 
 
 \series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#EmbeddedObjects
+http://wiki.lyx.org/LyX/Manuals#EmbeddedObjects
 \end_layout
 
 \end_inset
diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 9b09d014f2..dbb03f10a3 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -311,7 +311,7 @@ The latest PDF-version of this document can be found here:
 
 
 \series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#Math
+http://wiki.lyx.org/LyX/Manuals#Math
 \end_layout
 
 \end_inset
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ce52895b94..1397923457 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -134,12 +134,11 @@ enumitem
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author 2047637253 "Guillaume Munch"
 \end_header
 
 \begin_body
@@ -8311,14 +8310,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8331,7 +8328,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8355,7 +8351,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -42749,13 +42744,7 @@ reference "sec:Branches"
 \end_layout
 
 \begin_layout Section
-
-\change_deleted 2047637253 1472399758
-Output
-\change_inserted 2047637253 1472400015
 Formats
-\change_unchanged
-
 \begin_inset CommandInset label
 LatexCommand label
 name "sec:Doc-Formats"
@@ -42948,28 +42937,16 @@ Save transient properties
 \family default
  controls whether document settings that are frequently switched or that
  are specific to the user are saved with the document.
- The properties that are affected by option are currently
-\change_inserted 2047637253 1472400492
-:
-\change_unchanged
-
+ The properties that are affected by option are currently:
 \end_layout
 
 \begin_deeper
 \begin_layout Itemize
 the activation of change tracking
-\change_inserted 2047637253 1472400062
-,
-\change_unchanged
-
 \end_layout
 
 \begin_layout Itemize
 the output of tracked changes
-\change_inserted 2047637253 1472400062
-,
-\change_unchanged
-
 \end_layout
 
 \begin_layout Itemize
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 36e437034d..3b4e175bb2 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -354,7 +354,7 @@ Wenn es Ihnen trotzdem nicht gelingen sollte, können Sie die neueste PDF-Versio
 
 \series bold
 http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#EmbeddedObjects
+/Manuals#EmbeddedObjects
 \end_layout
 
 \end_inset
@@ -37968,8 +37968,6 @@ white
 {
 \backslash
 usepackage{color}}{}
-\series default
-
 \end_layout
 
 \begin_deeper
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index fa1198985b..1ef8627b2c 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -324,7 +324,7 @@ Die neueste PDF-Version dieses Dokuments ist hier zu finden:
 
 
 \series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#Math
+http://wiki.lyx.org/LyX/Manuals#Math
 \end_layout
 
 \end_inset
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 5120bbde3c..37db3f9452 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -16372,7 +16372,7 @@ reference "sec:Dateiformate"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Dokument-Ausgabe"
+reference "sec:Dokument-Formate"
 
 \end_inset
 
@@ -36551,7 +36551,7 @@ Ausgabeformat
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Dokument-Ausgabe"
+reference "sec:Dokument-Formate"
 
 \end_inset
 
@@ -36787,7 +36787,7 @@ Ausgabeformat
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Dokument-Ausgabe"
+reference "sec:Dokument-Formate"
 
 \end_inset
 
@@ -36865,7 +36865,7 @@ Ausgabeformat
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Dokument-Ausgabe"
+reference "sec:Dokument-Formate"
 
 \end_inset
 
@@ -41523,10 +41523,10 @@ reference "sec:Zweige"
 \end_layout
 
 \begin_layout Section
-Ausgabe
+Formate
 \begin_inset CommandInset label
 LatexCommand label
-name "sec:Dokument-Ausgabe"
+name "sec:Dokument-Formate"
 
 \end_inset
 
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 16c2d14d3a..a0df79624c 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -348,7 +348,7 @@ La última versión en PDF de este documento puede encontrarse aquí:
 \end_inset
 
 http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#EmbeddedObjects
+/Manuals#EmbeddedObjects
 \end_layout
 
 \end_inset
@@ -37469,8 +37469,6 @@ white
 {
 \backslash
 usepackage{color}}{}
-\series default
-
 \end_layout
 
 \begin_deeper
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index 8e6236773b..4e050f309c 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -316,7 +316,7 @@ La última versión PDF de este documento está disponible en:
 
 \series bold
 http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#Math
+/Manuals#Math
 \end_layout
 
 \end_inset
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 27f118babb..0288a07458 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8537,12 +8537,14 @@ Literal
 \end_layout
 
 \begin_layout Verbatim
+
 Esto es entorno Literal.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 Las dos  líneas siguientes están vacías:
 \end_layout
 
@@ -8555,6 +8557,7 @@ Las dos  líneas siguientes están vacías:
 \end_layout
 
 \begin_layout Verbatim
+
 Casi todo está permitido en entorno Literal:"%&$§#~'`
 \backslash
 }][{|
@@ -8579,6 +8582,7 @@ con la diferencia de que los espacios aparecen en la salida como el carácter
 \end_layout
 
 \begin_layout Verbatim*
+
 Esto es entorno Literal*.
 \end_layout
 
@@ -16447,7 +16451,7 @@ reference "sec:Formatos-de-archivo"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Salidas"
+reference "sec:Formatos"
 
 \end_inset
 
@@ -37780,7 +37784,7 @@ predeterminado
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Salidas"
+reference "sec:Formatos"
 
 \end_inset
 
@@ -38067,7 +38071,7 @@ predeterminado
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Salidas"
+reference "sec:Formatos"
 
 \end_inset
 
@@ -38176,7 +38180,7 @@ predeterminado
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Salidas"
+reference "sec:Formatos"
 
 \end_inset
 
@@ -42832,10 +42836,10 @@ reference "sec:Ramas"
 \end_layout
 
 \begin_layout Section
-Salidas
+Formatos
 \begin_inset CommandInset label
 LatexCommand label
-name "sec:Salidas"
+name "sec:Formatos"
 
 \end_inset
 
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index a65b9a1bc9..42e28c14b4 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -362,7 +362,7 @@ Vous pouvez trouver la dernière version au format PDF de ce manuel ici :
 
 \series bold
 http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#EmbeddedObjects
+/Manuals#EmbeddedObjects
 \end_layout
 
 \end_inset
@@ -38534,8 +38534,6 @@ white
 {
 \backslash
 usepackage{color}}{}
-\series default
-
 \end_layout
 
 \begin_deeper
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 2940cb5662..659f689dde 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -345,7 +345,7 @@ On peut trouver la dernière version de ce document ici:
 
 \series bold
 http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#Math
+/Manuals#Math
 \end_layout
 
 \end_inset
diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx
index 573b5ab026..98c85de81e 100644
--- a/lib/doc/fr/Tutorial.lyx
+++ b/lib/doc/fr/Tutorial.lyx
@@ -163,7 +163,7 @@ type "mailto:"
 
 
 \begin_inset Note Note
-status open
+status collapsed
 
 \begin_layout Plain Layout
 Information sur l'état de la traduction:
@@ -200,10 +200,21 @@ Mise à jour section 5.4, JPC 28/01/16
 Mise à jour générale pour 2.2, JPC 25/07/16 - Normalisation typo de l'insertion
  des notes de bas de page, corrections typographiques mineures et quelques
  ajouts traduits
+\begin_inset Newline newline
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
+Vous pouvez trouver la dernière version au format PDF de ce manuel ici :
+\begin_inset Newline newline
+\end_inset
 
+
+\family typewriter
+\series bold
+http://wiki.lyx.org/LyX/Manuals#Tutorial
 \end_layout
 
 \end_inset
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 2ae672f746..8b0cae4805 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -299,50 +299,7 @@ LatexCommand tableofcontents
 
 \begin_layout Standard
 \begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-Si votre distribution \SpecialChar LaTeX
- est un peu ancienne , 
-\begin_inset Quotes fld
-\end_inset
-
-Affichage
-\begin_inset Quotes frd
-\end_inset
-
- ou 
-\begin_inset Quotes fld
-\end_inset
-
-Exporter
-\begin_inset Quotes frd
-\end_inset
-
- en PDF ne fonctionnera pas du fait d'un conflit entre 
-\family typewriter
-varioref/hyperref
-\family default
- et le caractère 
-\begin_inset Quotes fld
-\end_inset
-
-:
-\begin_inset Quotes frd
-\end_inset
-
- apparaissant dans certaines étiquettes.
- Frank Mittelbach a corrigé complètement ce bogue de 
-\family typewriter
-varioref
-\family default
-, la correction est intégrée à partir de \SpecialChar TeX
-Live 2011.
-\end_layout
-
-\begin_layout Plain Layout
-Pour résoudre ce problème, vous pouvez mettre à jour votre distribution.
-\end_layout
+status open
 
 \begin_layout Plain Layout
 Vous pouvez trouver la dernière version au format PDF de ce manuel ici :
@@ -352,8 +309,7 @@ Vous pouvez trouver la dernière version au format PDF de ce manuel ici :
 
 \family typewriter
 \series bold
-http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#UserGuide
+http://wiki.lyx.org/LyX/Manuals#UserGuide
 \end_layout
 
 \end_inset
@@ -9053,12 +9009,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 The following 2 lines are empty:
 \end_layout
 
@@ -9071,6 +9029,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -9103,6 +9062,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -17374,7 +17334,7 @@ reference "sec:Formats-de-Fichiers"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -39370,7 +39330,7 @@ Format de sortie implicite
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -39600,7 +39560,7 @@ voir section
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -39678,7 +39638,7 @@ voir section
 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sec:Doc-Output"
+reference "sec:Doc-Formats"
 
 \end_inset
 
@@ -44439,10 +44399,10 @@ reference "sec:Branches"
 \end_layout
 
 \begin_layout Section
-Sortie
+Formats
 \begin_inset CommandInset label
 LatexCommand label
-name "sec:Doc-Output"
+name "sec:Doc-Formats"
 
 \end_inset
 
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 27e215c81d..cc8f7ee3c6 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -390,7 +390,7 @@ sidecap
 
 \series bold
 http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#EmbeddedObjects
+/Manuals#EmbeddedObjects
 \series default
 
 \begin_inset Newline newline
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index 120c18e3f0..c8570e121b 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -366,7 +366,7 @@ mhchem
 
 \series bold
 http://wiki.lyx.org/\SpecialChar LyX
-/DocumentationDevelopment#Math
+/Manuals#Math
 \begin_inset Newline newline
 \end_inset
 
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 20b1577735..668dbcac27 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -35914,7 +35914,11 @@ reference "sec:派生枝"
 \end_layout
 
 \begin_layout Section
-出力
+
+\lang english
+Formats
+\lang japanese
+
 \begin_inset CommandInset label
 LatexCommand label
 name "sec:出力"