diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 3fa1afc853..eab89684f0 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -19,15 +19,14 @@
 % not to its caption
 \usepackage[figure]{hypcap}
 
-% the pages of the TOC are numbered roman
+% the pages of the TOC is numbered roman
 % and a PDF-bookmark for the TOC is added
-\pagenumbering{roman}
 \let\myTOC\tableofcontents
-\renewcommand{\tableofcontents}{%
- \pdfbookmark[1]{\contentsname}{}
- \myTOC
- \cleardoublepage
- \pagenumbering{arabic}}
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % provides caption formatting
 \usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16]
diff --git a/lib/doc/Intro.lyx b/lib/doc/Intro.lyx
index c444767b32..72014c8a93 100644
--- a/lib/doc/Intro.lyx
+++ b/lib/doc/Intro.lyx
@@ -21,15 +21,15 @@
 
 \fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\pagenumbering{roman}
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \cleardoublepage
+  \pagenumbering{arabic} }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 71a7a1716d..fce85c264c 100644
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -54,7 +54,7 @@
 
 % the pages of the TOC are numbered roman
 % and a PDF-bookmark for the TOC is added
-\pagenumbering{Roman}
+\pagenumbering{roman}
 \let\myTOC\tableofcontents
 \renewcommand{\tableofcontents}{%
  \vspace{1cm}
diff --git a/lib/doc/Tutorial.lyx b/lib/doc/Tutorial.lyx
index a0aaf57bfe..132f45bf83 100644
--- a/lib/doc/Tutorial.lyx
+++ b/lib/doc/Tutorial.lyx
@@ -21,15 +21,14 @@
 
 \fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 11c418b497..738d69d79f 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -24,15 +24,14 @@
 % for correct jump positions whe clicking on a link to a float
 \usepackage[figure]{hypcap}
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 16601ec1fb..9ee6b8e6e5 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -20,13 +20,12 @@
 
 % Die Seiten des Inhaltsverzeichnisses werden römisch numeriert,
 % ein PDF-Lesezeichen für das Inhaltsverzeichnis wird hinzugefügt
-\pagenumbering{roman}
 \let\myTOC\tableofcontents
-\renewcommand{\tableofcontents}{%
- \pdfbookmark[1]{\contentsname}{}
- \myTOC
- \cleardoublepage
- \pagenumbering{arabic}}
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % Formatierung von Legenden
 \usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16]
diff --git a/lib/doc/de/Intro.lyx b/lib/doc/de/Intro.lyx
index a7128245c7..9a869b6ac2 100644
--- a/lib/doc/de/Intro.lyx
+++ b/lib/doc/de/Intro.lyx
@@ -21,15 +21,15 @@
 
  \fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% Die Seiten des Inhaltsverzeichnisses werden römisch numeriert,
+% ein PDF-Lesezeichen für das Inhaltsverzeichnis wird hinzugefügt
+\pagenumbering{roman}
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \cleardoublepage
+  \pagenumbering{arabic} }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
@@ -114,7 +114,7 @@ Das Einmaleins der LyX-Dokumentation
 \begin_layout Author
 vom LyX Team
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Plain Layout
 Deutsche Übersetzung: 
@@ -142,7 +142,7 @@ Peter Sütterlin
 \end_layout
 
 \begin_layout Date
-letzte Änderung: 5.
+letzte Änderung: 21.
  Juni 2008
 \end_layout
 
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index 22ebbfc43b..ca1e2fb6a2 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -52,10 +52,9 @@
 % siehe erste Fußnote in Kap. 9.3
 \@ifundefined{textcolor}{\usepackage{color}}{}
 
-% damit die Seiten des Inhaltsverzeichnisses römisch
-% nummeriert werden und damit das Inhaltsverzeichnis
-% ein eigenes pdf-Lesezeichen erhält
-\pagenumbering{Roman}
+% Die Seiten des Inhaltsverzeichnisses werden römisch numeriert,
+% ein PDF-Lesezeichen für das Inhaltsverzeichnis wird hinzugefügt
+\pagenumbering{roman}
 \let\myTOC\tableofcontents
 \renewcommand{\tableofcontents}{%
  \vspace{1cm}
diff --git a/lib/doc/de/Tutorial.lyx b/lib/doc/de/Tutorial.lyx
index 46319174eb..5a1516709e 100644
--- a/lib/doc/de/Tutorial.lyx
+++ b/lib/doc/de/Tutorial.lyx
@@ -21,15 +21,14 @@
 
 \fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% Die Seiten des Inhaltsverzeichnisses werden römisch numeriert,
+% ein PDF-Lesezeichen für das Inhaltsverzeichnis wird hinzugefügt
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
@@ -149,7 +148,7 @@ type "mailto:"
 \end_layout
 
 \begin_layout Date
-letzte Änderung: 5.
+letzte Änderung: 21.
  Juni 2008
 \end_layout
 
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 9ac228cff5..766cbcc841 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -25,12 +25,11 @@
 % auf den Anfang des Gelitobjekts und nicht aufs Ende
 \usepackage[figure]{hypcap}
 
-% Ein PDF-Lesezeichen üer das Inhaltsverzeichnis wird hinzugefügt
+% Ein PDF-Lesezeichen für das Inhaltsverzeichnis wird hinzugefügt
 \let\myTOC\tableofcontents
 \renewcommand{\tableofcontents}{%
  \pdfbookmark[1]{\contentsname}{}
- \myTOC
- \cleardoublepage}
+ \myTOC }
 
 % Damit der Index den Namen "Stichwortverzeichnis" erhält
 \addto\captionsngerman{\renewcommand{\indexname}{Stichwortverzeichnis}}
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 18953e90d1..9ad75bd4ad 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -105,15 +105,14 @@
 \newcolumntype{W}{!{\color{green}\vline}}
 % ---
 
-% the pages of the TOC are numbered roman
-% and a PDF-bookmark for the TOC is added
-\pagenumbering{Roman}
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
 \let\myTOC\tableofcontents
-\renewcommand{\tableofcontents}{%
- \pdfbookmark[1]{\contentsname}{}
- \myTOC
- \cleardoublepage
- \pagenumbering{arabic}}
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % insert additional vertical space of
 % 1.5 mm between footnotes
diff --git a/lib/doc/es/Intro.lyx b/lib/doc/es/Intro.lyx
index d9630982d0..87dd39bf2d 100644
--- a/lib/doc/es/Intro.lyx
+++ b/lib/doc/es/Intro.lyx
@@ -21,15 +21,15 @@
 
 \fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{Roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \clearpage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\pagenumbering{Roman}
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \clearpage
+  \pagenumbering{arabic} }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx
index 2127d9017a..c62a5c47e1 100644
--- a/lib/doc/es/Math.lyx
+++ b/lib/doc/es/Math.lyx
@@ -52,7 +52,7 @@
 % see first footnote in sec. 9.3
 \@ifundefined{textcolor}{\usepackage{color}}{}
 
-% the pages of the TOC are numbered roman
+% the pages of the TOC is numbered roman
 % and a PDF-bookmark for the TOC is added
 \pagenumbering{Roman}
 \let\myTOC\tableofcontents
diff --git a/lib/doc/es/Tutorial.lyx b/lib/doc/es/Tutorial.lyx
index 745c003db3..fc007df1c3 100644
--- a/lib/doc/es/Tutorial.lyx
+++ b/lib/doc/es/Tutorial.lyx
@@ -21,15 +21,14 @@
 
 \fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{Roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 1202b9f748..abc68b258d 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -24,15 +24,14 @@
 % for correct jump positions whe clicking on a link to a float
 \usepackage[figure]{hypcap}
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{Roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index df7f82a3f8..5c3394c406 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -19,15 +19,14 @@
 % not to its caption
 \usepackage[figure]{hypcap}
 
-% the pages of the TOC are numbered roman
-% and a PDF-bookmark for the TOC is added
-\pagenumbering{roman}
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
 \let\myTOC\tableofcontents
-\renewcommand{\tableofcontents}{%
- \pdfbookmark[1]{\contentsname}{}
- \myTOC
- \cleardoublepage
- \pagenumbering{arabic}}
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % provides caption formatting
 \usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16]
diff --git a/lib/doc/fr/Intro.lyx b/lib/doc/fr/Intro.lyx
index ec249c25fb..12e68cc101 100644
--- a/lib/doc/fr/Intro.lyx
+++ b/lib/doc/fr/Intro.lyx
@@ -21,15 +21,15 @@
 
 \fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\pagenumbering{roman}
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \cleardoublepage
+  \pagenumbering{arabic} }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 012512dae5..3c1baec9be 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -52,9 +52,9 @@
 % see first footnote in sec. 9.3
 \@ifundefined{textcolor}{\usepackage{color}}{}
 
-% the pages of the TOC are numbered roman
+% the pages of the TOC is numbered roman
 % and a PDF-bookmark for the TOC is added
-\pagenumbering{Roman}
+\pagenumbering{roman}
 \let\myTOC\tableofcontents
 \renewcommand{\tableofcontents}{%
  \vspace{1cm}
diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx
index a10f723b7e..4f76eeb203 100644
--- a/lib/doc/fr/Tutorial.lyx
+++ b/lib/doc/fr/Tutorial.lyx
@@ -21,15 +21,14 @@
 
  \fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index ce298e048b..ab2733a0b0 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -24,15 +24,14 @@
 % for correct jump positions whe clicking on a link to a float
 \usepackage[figure]{hypcap}
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{\contentsname}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} } 
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \frontmatter
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \mainmatter }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
diff --git a/lib/doc/it/Intro.lyx b/lib/doc/it/Intro.lyx
index 509b93c278..d5bfb43730 100644
--- a/lib/doc/it/Intro.lyx
+++ b/lib/doc/it/Intro.lyx
@@ -1,5 +1,5 @@
 #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 331
+\lyxformat 337
 \begin_document
 \begin_header
 \textclass article
@@ -19,17 +19,17 @@
  % set fonts for nicer pdf view
  \IfFileExists{lmodern.sty}{\usepackage{lmodern}}{}
 
- \fi % end if pdflatex is used
+\fi % end if pdflatex is used
 
- % the pages of the TOC are numbered roman
- % and a pdf-bookmark for the TOC is added
- \pagenumbering{roman}
- \let\myTOC\tableofcontents
- \renewcommand\tableofcontents{%
-   \pdfbookmark[1]{Contents}{}
-   \myTOC
-   \cleardoublepage
-   \pagenumbering{arabic} }
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\pagenumbering{roman}
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+  \pdfbookmark[1]{\contentsname}{}
+  \myTOC
+  \cleardoublepage
+  \pagenumbering{arabic} }
 
 % redefine the \LyX macro for PDF bookmarks
 \def\LyX{\texorpdfstring{%
@@ -46,6 +46,7 @@
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
 \paperfontsize 12
 \spacing single
@@ -296,11 +297,11 @@ Introduzione
 \end_inset
 
 1.
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 Introduzione
@@ -790,7 +791,7 @@ vero lavoro
 , famiglie, piatti da lavare, spazzatura da vuotare, e così via.
  Se volete rendervi utili alla causa, assicuratevi di aver letto prima la
  Sezione
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 
@@ -899,7 +900,7 @@ sec:Contrib
  destro del mouse sul box, oppure sul bottone 
 \family sans
 Vai
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 all'etichetta
@@ -1366,7 +1367,7 @@ Unità di misura utilizzate nei Manuali
 
 \begin_layout Standard
 La tabella
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 
@@ -1935,7 +1936,7 @@ LyX per utilizzatori di LaTeX
 
 \begin_layout Description
 Guida
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 utente E' la documentazione principale.
@@ -1950,7 +1951,7 @@ Tutorial
 
 \begin_layout Description
 Oggetti
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 incorporati Si tratta di un'estensione della
@@ -1972,7 +1973,7 @@ guru
 
 \begin_layout Description
 Caratteristiche
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 estese Altra estensione della 
@@ -2001,7 +2002,7 @@ nali, ed i files di configurazione.
 
 \begin_layout Description
 Configurazione
-\begin_inset Space ~
+\begin_inset space ~
 \end_inset
 
 LaTeX Durante l'installazione, LyX controlla il vostro sistema.