diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh
index 6bc5bfc1b5..04c2b3459b 100644
--- a/development/Win32/packaging/AltInstaller/Updated.nsh
+++ b/development/Win32/packaging/AltInstaller/Updated.nsh
@@ -27,9 +27,11 @@ Function UpdateModifiedFiles
  File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Math.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\de\UserGuide.lyx"
  SetOutPath "$INSTDIR\Resources\doc\es"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\es\Math.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\es\UserGuide.lyx"
  SetOutPath "$INSTDIR\Resources\doc\fr"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\EmbeddedObjects.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Math.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\UserGuide.lyx"
  SetOutPath "$INSTDIR\Resources\examples"
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index da4834d71b..f7f6f5f2f5 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -5254,7 +5254,7 @@ addtocounter{table}{-1}
 status collapsed
 
 \begin_layout Plain Layout
-See greyed-out note in section
+See the first greyed-out note in section
 \begin_inset space ~
 \end_inset
 
@@ -5687,6 +5687,40 @@ fill}
 \end_inset
 
 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+addtocounter{table}{-1}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+See the first greyed-out note in section
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sub:Longtable-Captions"
+
+\end_inset
+
+ for an explanation of this command.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection
@@ -6062,7 +6096,11 @@ status open
 \begin_layout Plain Layout
 
 \series bold
-Note:
+Note
+\begin_inset space ~
+\end_inset
+
+1:
 \series default
  The table number is increased for every longtable, also if you didn't set
  a caption for it.
@@ -6095,6 +6133,35 @@ Table
 addtocounter{table}{-1}
 \end_layout
 
+\begin_layout Plain Layout
+This is not needed when none of your longtables have a caption and you add
+ the following code to the document preamble:
+\end_layout
+
+\begin_layout Plain Layout
+
+\series bold
+
+\backslash
+let
+\backslash
+myEnd
+\backslash
+endlongtable
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+endlongtable}{
+\backslash
+myEnd
+\backslash
+addtocounter{table}{-1}}
+\end_layout
+
 \end_inset
 
 
@@ -6107,7 +6174,11 @@ status open
 \begin_layout Plain Layout
 
 \series bold
-Note:
+Note
+\begin_inset space ~
+\end_inset
+
+2:
 \series default
  If you are using
 \series bold
@@ -9421,7 +9492,7 @@ By default tables are only broken between rows.
 \begin_inset Quotes erd
 \end_inset
 
- as TeX-Code at this point of the cell where it should be broken.
+ as TeX-Code at this point of the cell where it can be broken.
  Before the 
 \series bold
 
@@ -9506,7 +9577,9 @@ Castelchiodato,
 \backslash
 
 \backslash
-
+ 
+\backslash
+newpage
 \begin_inset Newline newline
 \end_inset
 
@@ -9523,6 +9596,14 @@ The
 \end_inset
 
  in the third columns of the row was deleted.
+ 
+\series bold
+
+\backslash
+newpage
+\series default
+ is only needed when a page break should definitively occur at this position,
+ otherwise it is only a possibility to break.
  If your footer row of the longtable has for a certain reason no upper line
  but you would have a horizontal line where the cell is broken, use this
  command instead:
@@ -10542,7 +10623,9 @@ status open
 \backslash
 
 \backslash
-
+ 
+\backslash
+newpage
 \end_layout
 
 \begin_layout Plain Layout
@@ -10854,13 +10937,6 @@ Franz
 \end_inset
 
 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index b25b15bed5..3ec8cde0ff 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1455,8 +1455,8 @@ Outline
 
 \begin_layout Standard
 The outline window shows you the content of the document's table of contents
- (TOC) that is described in sec.
-\begin_inset space \thinspace{}
+ (TOC) that is described in section
+\begin_inset space ~
 \end_inset
 
 
@@ -1471,7 +1471,11 @@ reference "sub:Table-of-Contents"
  In the pull-down box at the top of the outline window, you can choose between
  different lists of document objects, like the list of footnotes.
  Some of them, the list of tables, figures, and algorithms can also be added
- to the document, see 
+ to the document, see section
+\begin_inset space ~
+\end_inset
+
+
 \begin_inset CommandInset ref
 LatexCommand ref
 reference "sub:List-of-Figures"
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index b943446296..d44c7e0c15 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -5283,7 +5283,7 @@ addtocounter{table}{-1}
 status collapsed
 
 \begin_layout Plain Layout
-Die Bedeutung diese Befehle finden Sie in der Bemerkung 1 von Abschnitt
+Die Bedeutung dieses Befehls finden Sie in der Bemerkung 1 von Abschnitt
 \begin_inset space ~
 \end_inset
 
@@ -5717,6 +5717,40 @@ fill}
 \end_inset
 
 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+addtocounter{table}{-1}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Die Bedeutung dieses Befehls finden Sie in der Bemerkung 1 von Abschnitt
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "uab:Beschriftungen-langer-Tabellen"
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection
@@ -6132,7 +6166,7 @@ Bemerkung
 \end_inset
 
 2.1 im Tabellenverzeichnis folgt, wenn dazwischen zwei lange Tabellen ohne
- Titel sind.
+ Beschriftung sind.
  Um das zu vermeiden, können Sie hinter jede lange Tabelle ohne Titel folgenden
  LaTeX-Befehl als TeX-Code einfügen:
 \end_layout
@@ -6145,6 +6179,35 @@ Bemerkung
 addtocounter{table}{-1}
 \end_layout
 
+\begin_layout Plain Layout
+Das ist nicht notwendig, wenn keine der langen Tabellen im Dokument eine
+ Beschriftung hat und Sie diesen Code zum LaTeX-Vorspann hinzufügen:
+\end_layout
+
+\begin_layout Plain Layout
+
+\series bold
+
+\backslash
+let
+\backslash
+myEnd
+\backslash
+endlongtable
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+endlongtable}{
+\backslash
+myEnd
+\backslash
+addtocounter{table}{-1}}
+\end_layout
+
 \end_inset
 
 
@@ -6199,10 +6262,6 @@ Tabelle
 \end_inset
 
 
-\begin_inset Newpage newpage
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsubsection
@@ -9584,7 +9643,7 @@ Standardmäßig werden Tabellen nur zwischen Zeilen umgebrochen.
 \end_inset
 
  für eine neue Zeile als TeX-Code an der Stelle in der Zelle ein, wo umgebrochen
- werden soll.
+ werden kann.
  Vor dem 
 \begin_inset Quotes gld
 \end_inset
@@ -9700,7 +9759,9 @@ folgendes eingefügt:
 \backslash
 
 \backslash
-
+ 
+\backslash
+newpage
 \begin_inset Newline newline
 \end_inset
 
@@ -9717,6 +9778,14 @@ Die
 \end_inset
 
  in der dritten Spalte wurde gelöscht.
+ 
+\series bold
+
+\backslash
+newpage
+\series default
+ ist nur erforderlich, wenn ein Seitenumbruch an der Stelle unbedingt erfolgen
+ soll, ansonsten ist es nur eine Möglichkeit zum Umbruch.
  Wenn die Fußzeile Ihrer 
 \family sans
 langen
@@ -10746,7 +10815,9 @@ status open
 \backslash
 
 \backslash
-
+ 
+\backslash
+newpage
 \end_layout
 
 \begin_layout Plain Layout
@@ -28427,7 +28498,7 @@ definecolor
 \series bold
 color
 \series default
- in der Präambel benötigt, siehe Abschnitt
+ im LaTeX-Vorspann benötigt, siehe Abschnitt
 \begin_inset space ~
 \end_inset
 
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 1512a1fc64..ef91dd55dc 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.0 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.1svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -180,6 +180,7 @@
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
 \paperfontsize 12
 \spacing single
@@ -218,8 +219,8 @@
 \bullet 3 2 7 -1
 \tracking_changes false
 \output_changes false
-\author ""
-\author ""
+\author "" 
+\author "" 
 \end_header
 
 \begin_body
@@ -5054,7 +5055,7 @@ fin
 
 
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -5501,6 +5502,41 @@ fill}
 \end_inset
 
 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+addtocounter{table}{-1}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Para comprender el uso de este comando, lee al final de la sección
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sub:Leyendas-en-Tablas"
+
+\end_inset
+
+ la primera nota resaltada en gris.
+ 
+\end_layout
+
+\end_inset
+
+
 \begin_inset Newpage newpage
 \end_inset
 
@@ -5881,8 +5917,12 @@ status open
 
 \series bold
 Nota
+\begin_inset space ~
+\end_inset
+
+1:
 \series default
-: El número de la tabla se incrementa para cada tabla larga, aunque no pongas
+ El número de la tabla se incrementa para cada tabla larga, aunque no pongas
  leyenda en alguna de ellas.
  Por esto podría suceder que, p.
 \begin_inset space \thinspace{}
@@ -5909,6 +5949,37 @@ e., la tabla
 addtocounter{table}{-1}
 \end_layout
 
+\begin_layout Plain Layout
+
+\lang english
+This is not needed when none of your longtables have a caption and you add
+ the following code to the document preamble:
+\end_layout
+
+\begin_layout Plain Layout
+
+\series bold
+
+\backslash
+let
+\backslash
+myEnd
+\backslash
+endlongtable
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+endlongtable}{
+\backslash
+myEnd
+\backslash
+addtocounter{table}{-1}}
+\end_layout
+
 \end_inset
 
 
@@ -5921,7 +5992,11 @@ status open
 \begin_layout Plain Layout
 
 \series bold
-Nota:
+Nota
+\begin_inset space ~
+\end_inset
+
+2:
 \series default
  Si utilizas 
 \series bold
@@ -9121,13 +9196,6 @@ Roberto
 \end_inset
 
 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -9287,7 +9355,9 @@ Castelchiodato,
 \backslash
 
 \backslash
-
+ 
+\backslash
+newpage
 \begin_inset Newline newline
 \end_inset
 
@@ -9296,6 +9366,17 @@ Castelchiodato,
 
 \begin_layout Standard
 El «111» en la tercera columna de la fila se ha borrado.
+ 
+\series bold
+\lang english
+
+\backslash
+newpage
+\series default
+ is only needed when a page break should definitively occur at this position,
+ otherwise it is only a possibility to break.
+
+\lang spanish
  Si la fila más baja de la tabla larga no tiene, por alguna razón, línea
  superior pero quisieras una línea horizontal donde se corta la celda, usa
  este comando alternativo:
@@ -10067,7 +10148,9 @@ status open
 \backslash
 
 \backslash
-
+ 
+\backslash
+newpage
 \end_layout
 
 \begin_layout Plain Layout
@@ -10627,10 +10710,6 @@ Franz
 \end_inset
 
 
-\begin_inset Newpage newpage
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index 67fe05e81d..bc2b8732f1 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -1,8 +1,7 @@
-#LyX 1.6.0 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.1svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
-\use_default_options false
 \textclass scrbook
 \begin_preamble
 % if pdflatex is used
@@ -166,6 +165,7 @@
 \StandardLayout
 \end_preamble
 \options fleqn,liststotoc,bibtotoc,idxtotoc,BCOR7.5mm,titlepage,tablecaptionabove
+\use_default_options false
 \language french
 \inputencoding auto
 \font_roman default
@@ -176,6 +176,7 @@
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
 \paperfontsize 12
 \spacing single
@@ -214,8 +215,8 @@
 \bullet 3 2 7 -1
 \tracking_changes false
 \output_changes false
-\author ""
-\author ""
+\author "" 
+\author "" 
 \end_header
 
 \begin_body
@@ -5372,7 +5373,7 @@ Fin
 
 
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -5385,10 +5386,10 @@ addtocounter{table}{-1}
 
 
 \begin_inset Note Note
-status open
+status collapsed
 
 \begin_layout Plain Layout
-Voyez la note grisée de la section
+Voyez la première note grisée de la section
 \begin_inset space ~
 \end_inset
 
@@ -5828,6 +5829,40 @@ fill}
 \end_inset
 
 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+addtocounter{table}{-1}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Voyez la première note grisée de la section
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sub:Tableaux-longs-légende"
+
+\end_inset
+
+ pour une explication de cette commande.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection
@@ -6204,7 +6239,11 @@ status open
 \begin_layout Plain Layout
 
 \series bold
-Note:
+Note
+\begin_inset space ~
+\end_inset
+
+1:
 \series default
  Le numéro de tableau est incrémenté à chaque tableau long, même si vous
  n'avez pas prévu de légende.
@@ -6230,6 +6269,37 @@ Note:
 addtocounter{table}{-1}
 \end_layout
 
+\begin_layout Plain Layout
+
+\lang english
+This is not needed when none of your longtables have a caption and you add
+ the following code to the document preamble:
+\end_layout
+
+\begin_layout Plain Layout
+
+\series bold
+
+\backslash
+let
+\backslash
+myEnd
+\backslash
+endlongtable
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+endlongtable}{
+\backslash
+myEnd
+\backslash
+addtocounter{table}{-1}}
+\end_layout
+
 \end_inset
 
 
@@ -6242,7 +6312,11 @@ status open
 \begin_layout Plain Layout
 
 \series bold
-Note:
+Note
+\begin_inset space ~
+\end_inset
+
+2:
 \series default
  Si vous utilisez 
 \series bold
@@ -9673,7 +9747,9 @@ Castelchiodato,
 \backslash
 
 \backslash
-
+ 
+\backslash
+newpage
 \begin_inset Newline newline
 \end_inset
 
@@ -9690,6 +9766,17 @@ Le
 \end_inset
 
  dans la troisième colonne de la ligne a été supprimé.
+ 
+\series bold
+\lang english
+
+\backslash
+newpage
+\series default
+ is only needed when a page break should definitively occur at this position,
+ otherwise it is only a possibility to break.
+
+\lang french
  Si votre ligne de pied de tableau n'a pas de bordure supérieure pour une
  raison ou une autre mais que vous voulez une ligne à l'endroit où la cellule
  est coupée, utilisez cette commande à la place de la précédente :
@@ -10695,7 +10782,10 @@ Rizzardi
 \begin_inset Text
 
 \begin_layout Plain Layout
-Fürst von Rossano, 5.
+Giancarlo, 11.
+ Fürst von Montecompatri, 11.
+ Fürst von Sulmona und Vivaro, 10.
+ Fürst von Rossano, 5.
  Herzog von Canemorte, 11.
  Herzog von Palombara, 5.
  Herzog von Castelchiodato,
@@ -10708,7 +10798,9 @@ status open
 \backslash
 
 \backslash
-
+ 
+\backslash
+newpage
 \end_layout
 
 \begin_layout Plain Layout
@@ -11020,29 +11112,6 @@ Franz
 \end_inset
 
 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-il semble qu'il y ait un problème avec cet exemple ...
- le saut de page ne se fait pas à l'endroit voulu ! 
-\end_layout
-
-\begin_layout Plain Layout
-en fait j'ai dû enlever quelques noms pour que le saut se fasse au bon endroit
- ! (NdT)
-\end_layout
-
-\end_inset
-
-
-\begin_inset Newpage newpage
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
diff --git a/status.16x b/status.16x
index 568f4d8bfa..5159ad9627 100644
--- a/status.16x
+++ b/status.16x
@@ -27,7 +27,8 @@ What's new
 - Updated localization of the user interface for German, Italian, Czech and
   Turkish.
 
-- Updated English, French, German, and Spanish User's Guide and Math manual.
+- Updated English, French, German, and Spanish User's Guide, Math,
+  and Embedded Objects manual.
 
 - Updated English and German Embedded Objects manual.