doc files: port recent changes from branch

diff --git a/lib/doc/Changelog-Math-LyX_22.txt b/lib/doc/Changelog-Math-LyX_22.txt
index 758687400f22c26e25db3af87b57baa904125a41..daaf488efb0ab8f9b032b65a04e1022f51f16f79 100644 (file)
--- a/lib/doc/Changelog-Math-LyX_22.txt
+++ b/lib/doc/Changelog-Math-LyX_22.txt
@@ -1,5 +1,11 @@
+For LyX 2.2.3:
+
+- sec. 17: (not French) new sentence
+
+
 For LyX 2.2.1:
 
+- sec. 11: (Japanese only) new table row with shortcuts
 - sec. 23.1: new note
 
 

diff --git a/lib/doc/Changelog-UserGuide-LyX_22x.txt b/lib/doc/Changelog-UserGuide-LyX_22x.txt
index c3f4e7c174003a21cc9df1f6917c381fa467bdb7..c070400f433ad8b2af04fd9d68b416014d6c83cf 100644 (file)
--- a/lib/doc/Changelog-UserGuide-LyX_22x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_22x.txt
@@ -1,7 +1,9 @@
 For LyX 2.2.3:
 
-- sec. 2.5.1: new sentence
-- sec. B.20: section was renamed
+- sec. 2.5.1: (not French) new sentence
+- sec. 6.11.4: Japanese only: untranslated note
+- sec. 6.10.1: (not French) new footnote
+- sec. B.20: (not French) section was renamed
 
 
 For LyX 2.2.1:

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index ca10ed08d196bf0df915d2855c928931186892c5..9d6333bbfd39eb102bfd1e84d9d4d41f21499f21 100644 (file)
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -9014,14 +9014,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
 
@@ -9034,7 +9032,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -9067,7 +9064,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -32196,9 +32192,15 @@ Vous pouvez mettre une commande complète ou incomplète dans une boîte de
 status collapsed
 
 \begin_layout Plain Layout
+Avec LyX, il est possible d'utiliser une boîte avec l'option 
+\begin_inset Quotes fld
+\end_inset
 
-\lang english
-The LyX way would be to use a framed box.
+Cadre simple
+\begin_inset Quotes frd
+\end_inset
+
+.
 \end_layout
 
 \end_inset
@@ -33526,9 +33528,7 @@ pagestyle{headings}
 status collapsed
 
 \begin_layout Plain Layout
-
-\lang english
-switches back to page style with the default headings
+Revient à la mise en pages avec les en-têtes implicites
 \end_layout
 
 \end_inset