diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 706b34ee84..23c2fdabaa 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -18998,7 +18998,7 @@ Alt+M
 \series default
  
 \series bold
-m 
+M 
 \backslash
 tiny
 \begin_inset ERT
@@ -31943,7 +31943,7 @@ Macro
 
 
 \begin_inset FormulaMacro
-\renewcommand{\qG}[4][1,\,2]{#2_{#1}=-\frac{#3}{2}\pm\sqrt{\frac{#3^{2}}{4}-#4}}
+\newcommand{\qG}[4][1,\,2]{#2_{#1}=-\frac{#3}{2}\pm\sqrt{\frac{#3^{2}}{4}-#4}}
 \end_inset
 
 
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 655f00c5c3..7e31a4a5b0 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -2601,7 +2601,7 @@ Modules load additional features to a document that are not by default available
  This is of course not available in any document class, so you have to load
  the corresponding module in the 
 \family sans
-Document Class
+Modules
 \family default
  section of the 
 \family sans
@@ -5682,7 +5682,32 @@ The
 List
 \family default
  environment is a LyX extension to LaTeX.
- 
+\end_layout
+
+\begin_layout Standard
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ When you are using a KOMA-Script document class, like in this document,
+ the 
+\family sans
+List
+\family default
+ environment is named 
+\family sans
+Labeling
+\family default
+.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -5923,6 +5948,10 @@ reference "sub:Horizontal-Space"
 
 .
  Here are some examples:
+\begin_inset Newpage pagebreak
+\end_inset
+
+
 \end_layout
 
 \begin_layout Labeling
@@ -6589,7 +6618,7 @@ arg   "newline-insert newline"
 \end_inset
 
 g.
-\begin_inset space ~
+\begin_inset space \space{}
 \end_inset
 
 you can't follow 
@@ -16107,7 +16136,7 @@ You can alter a table by clicking on it with the right mouse button, which
 \end_layout
 
 \begin_layout Standard
-Additionally to the table dialog the 
+Additionally to the table dialog, the 
 \family sans
 table
 \begin_inset space ~
@@ -16115,17 +16144,8 @@ table
 
 toolbar
 \family default
-, that appears when the cursor is inside a table, helps you in setting table
- properties.
- It is for example currently only possible to add
-\begin_inset space \thinspace{}
-\end_inset
-
-/
-\begin_inset space \thinspace{}
-\end_inset
-
-delete lines via the table toolbar.
+ helps you in setting table properties.
+ It appears when the cursor is inside a table.
 \end_layout
 
 \begin_layout Standard
@@ -23719,11 +23739,11 @@ Panel
 
  (shortcut 
 \family sans
-Alt+m
+Alt+M
 \begin_inset space ~
 \end_inset
 
-m
+M
 \family default
 ).
  Math text appears in LyX in black instead of blue.
@@ -26844,15 +26864,11 @@ Document\SpecialChar \menuseparator
 Settings
 \family default
  dialog.
- In this document the options 
+ In this document the option 
 \series bold
 intoc
 \series default
- and 
-\series bold
-refpage
-\series default
- are used.
+ is used.
 \end_layout
 
 \begin_layout Standard
@@ -27189,7 +27205,7 @@ Question: Who was the first physics Nobel prize winner?
 
 \begin_layout Standard
 \begin_inset Branch Answer
-status open
+status collapsed
 
 \begin_layout Standard
 Answer: Wilhelm Conrad Röntgen
@@ -28117,7 +28133,7 @@ ispell
 hspell
 \family default
 , or 
-\family sans
+\family typewriter
 pspell
 \family default
  as backend.
@@ -28133,7 +28149,7 @@ ispell
 \family default
 , so that it is recommended to use aspell.
  
-\family sans
+\family typewriter
 hspell
 \family default
  is a Hebrew spell-checker.
@@ -28148,7 +28164,7 @@ Language Settings
 \begin_layout Standard
 For LyX on Windows, the selection box for the spell checking program is
  greyed out in the preferences dialog because only 
-\family sans
+\family typewriter
 aspell
 \family default
  can be used.
@@ -28160,6 +28176,13 @@ The menu
  Tools\SpecialChar \menuseparator
 Spellchecker
 \family default
+ or the toolbar button 
+\begin_inset Graphics
+	filename ../images/dialog-show_spellchecker.png
+	BoundingBox 0bp 5bp 20bp 20bp
+
+\end_inset
+
  starts the spell checking beginning from the current cursor position.
  A dialog window will appear showing any incorrect (or unknown) word found,
  allowing you to edit and replace it in a second line.
@@ -29120,15 +29143,14 @@ English
 \end_layout
 
 \begin_layout Standard
-The 
+Under 
 \family sans
 Encoding
 \family default
- box lets you choose the character encoding map you want to use for LaTeX
- export.
+ you can choose the character encoding map you want to use for LaTeX export.
  The option 
 \family sans
-use language's default encoding
+Language Default
 \family default
  is the preferred choice and works well in most cases.
  For details about the different encoding options see section
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index acffbf64eb..264f4a0306 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -32403,7 +32403,7 @@ Macro
 
 
 \begin_inset FormulaMacro
-\renewcommand{\qG}[4][1,\,2]{#2_{#1}=-\frac{#3}{2}\pm\sqrt{\frac{#3^{2}}{4}-#4}}
+\newcommand{\qG}[4][1,\,2]{#2_{#1}=-\frac{#3}{2}\pm\sqrt{\frac{#3^{2}}{4}-#4}}
 \end_inset
 
 
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 6315726d2a..258f786d1c 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.1svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.2svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -24887,11 +24887,11 @@ matemáticas
 \family default
  (o bien el atajo 
 \family sans
-Alt-m
+Alt+M
 \begin_inset space ~
 \end_inset
 
-m
+M
 \family default
 ).
  En LyX, el texto normal dentro de una ecuación aparece en negro, no en
@@ -27959,13 +27959,9 @@ Documento\SpecialChar \menuseparator
 Configuración
 \family default
 .
- En este documento se han puesto las opciones 
+ En este documento se han puesto la opcion 
 \series bold
 intoc
-\series default
- y 
-\series bold
-refpage
 \series default
 .
 \end_layout
@@ -29181,7 +29177,7 @@ ispell
 \family default
 .
  
-\family sans
+\family typewriter
 hspell
 \family default
  es un corrector de hebreo.
@@ -29226,6 +29222,17 @@ Corrector
 
 ortográfico
 \family default
+ 
+\lang english
+or the toolbar button
+\lang spanish
+ 
+\begin_inset Graphics
+	filename ../../images/dialog-show_spellchecker.png
+	BoundingBox 0bp 5bp 20bp 20bp
+
+\end_inset
+
  inicia la revisión a partir de la posición del cursor.
  Se muestra una ventana en la que aparece un cuadro con cualquier palabra
  incorrecta o desconocida, que puedes reemplazar en el cuadro siguiente.
@@ -37350,7 +37357,7 @@ name "sub:Configuración"
 
 
 \begin_inset Index
-status open
+status collapsed
 
 \begin_layout Plain Layout
 Documentos ! Configuración
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 190325a666..7d36e7d6b6 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.1svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.2svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -28391,13 +28391,9 @@ Document ! Paramètres
 
 
 \family default
- Dans ce document, nous avons utilisé les options 
+ Dans ce document, nous avons utilisé l'option 
 \series bold
 intoc
-\series default
- et 
-\series bold
-refpage
 \series default
 .
 \end_layout