From: Uwe Stöhr <uwestoehr@web.de>
Date: Wed, 20 Jul 2011 02:58:40 +0000 (+0000)
Subject: UserGuide.lyx: describe how to compare LyX files
X-Git-Tag: 2.1.0beta1~2893
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0849110a7b097d25cc33910d97d371b71920b6fb;p=features.git

UserGuide.lyx: describe how to compare LyX files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39358 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 3d4e4893fe..e55e4c3fb3 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -33035,6 +33035,94 @@ key "TeXCatalogue"
  or in the package manager of your LaTeX-system.
 \end_layout
 
+\begin_layout Section
+Comparison of Documents
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Comparison of documents
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+You can compare two different LyX files via the menu 
+\family sans
+Tools\SpecialChar \menuseparator
+Compare
+\family default
+.
+ The comparison result is a LyX file with change tracking enabled showing
+ the differences.
+ In the comparison dialog you can select with the option 
+\family sans
+Copy
+\begin_inset space ~
+\end_inset
+
+Document
+\begin_inset space ~
+\end_inset
+
+Settings
+\begin_inset space ~
+\end_inset
+
+from
+\family default
+ from which document LyX should take the document settings for the the resulting
+ difference file.
+ The option 
+\family sans
+Enable
+\begin_inset space ~
+\end_inset
+
+change
+\begin_inset space ~
+\end_inset
+
+tracking
+\begin_inset space ~
+\end_inset
+
+features
+\begin_inset space ~
+\end_inset
+
+in
+\begin_inset space ~
+\end_inset
+
+the
+\begin_inset space ~
+\end_inset
+
+output
+\family default
+ enables the change tracking option 
+\family sans
+Show
+\begin_inset space ~
+\end_inset
+
+Changes
+\begin_inset space ~
+\end_inset
+
+in
+\begin_inset space ~
+\end_inset
+
+Output
+\family default
+ to visualize the differences also in the PDF output of the difference file.
+\end_layout
+
 \begin_layout Section
 International Support
 \begin_inset Index idx
@@ -33173,10 +33261,18 @@ name "sub:Keyboard-mapping"
 \end_layout
 
 \begin_layout Standard
-If you have for example a U.S.-style keyboard and want to write in a language
- other than English, you can use an alternate keymap.
- For example, if you have a U.S.-style keyboard but want to write in Italian,
- you can configure LyX to use an Italian keymap.
+If you have for example a U.
+\begin_inset space \thinspace{}
+\end_inset
+
+S.-style keyboard and want to write in a language other than English, you
+ can use an alternate keymap.
+ For example, if you have a U.
+\begin_inset space \thinspace{}
+\end_inset
+
+S.-style keyboard but want to write in Italian, you can configure LyX to
+ use an Italian keymap.
  The preferences dialog allows you to choose up to two keyboard mappings,
  see section
 \begin_inset space ~
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 9dc9c1ffdc..57c9bb4d3c 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -37184,6 +37184,78 @@ key "TeXCatalogue"
 , oder im Paket-Manager Ihres LaTeX-Systems.
 \end_layout
 
+\begin_layout Section
+Vergleich von Dokumenten
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Vergleich von Dokumenten
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Sie können zwei verschiedene LyX-Dokumente über das Menü 
+\family sans
+Werkzeuge\SpecialChar \menuseparator
+Vergleichen
+\family default
+ miteinander vergleichen.
+ Das Ergebnis des Vergleichs ist eine LyX-Datei mit eingeschalteter Änderungsver
+folgung um die Unterschiede anzuzeigen.
+ Im Vergleichen-Dialog können Sie mit der Option 
+\family sans
+Kopiere
+\begin_inset space \space{}
+\end_inset
+
+Dokument-Einstellungen
+\begin_inset space \space{}
+\end_inset
+
+von
+\family default
+ festlegen, von welcher Datei LyX die Dokumenteinstellungen für die Ergebnisdate
+i verwenden soll.
+ Die Option 
+\family sans
+Änderungsverfolgung
+\begin_inset space \space{}
+\end_inset
+
+in
+\begin_inset space \space{}
+\end_inset
+
+der
+\begin_inset space \space{}
+\end_inset
+
+Ausgabe
+\family default
+ verwendet die Änderungsverfolgungsoption 
+\family sans
+In
+\begin_inset space \space{}
+\end_inset
+
+der
+\begin_inset space \space{}
+\end_inset
+
+Ausgabe
+\begin_inset space \space{}
+\end_inset
+
+anzeigen
+\family default
+ um die Unterschiede auch in der PDF-Ausgabe der Ergebnisdatei zu visualisieren.
+\end_layout
+
 \begin_layout Section
 Internationale Unterstützung
 \begin_inset Index idx
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 26fa72c875..d58e73e304 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -33751,6 +33751,100 @@ key "TeXCatalogue"
  o en el administrador de paquetes de tu sistema LaTeX.
 \end_layout
 
+\begin_layout Section
+
+\lang english
+Comparison of Documents
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+Comparison of documents
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+You can compare two different LyX files via the menu 
+\family sans
+Tools\SpecialChar \menuseparator
+Compare
+\family default
+.
+ The comparison result is a LyX file with change tracking enabled showing
+ the differences.
+ In the comparison dialog you can select with the option 
+\family sans
+Copy
+\begin_inset space ~
+\end_inset
+
+Document
+\begin_inset space ~
+\end_inset
+
+Settings
+\begin_inset space ~
+\end_inset
+
+from
+\family default
+ from which document LyX should take the document settings for the the resulting
+ difference file.
+ The option 
+\family sans
+Enable
+\begin_inset space ~
+\end_inset
+
+change
+\begin_inset space ~
+\end_inset
+
+tracking
+\begin_inset space ~
+\end_inset
+
+features
+\begin_inset space ~
+\end_inset
+
+in
+\begin_inset space ~
+\end_inset
+
+the
+\begin_inset space ~
+\end_inset
+
+output
+\family default
+ enables the change tracking option 
+\family sans
+Show
+\begin_inset space ~
+\end_inset
+
+Changes
+\begin_inset space ~
+\end_inset
+
+in
+\begin_inset space ~
+\end_inset
+
+Output
+\family default
+ to visualize the differences also in the PDF output of the difference file.
+\end_layout
+
 \begin_layout Section
 Soporte internacional
 \begin_inset Index idx
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 7c72ca62b8..f7da966725 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -34447,6 +34447,100 @@ key "TeXCatalogue"
  ou avec le gestionnaire de paquetages de votre installation LaTeX.
 \end_layout
 
+\begin_layout Section
+
+\lang english
+Comparison of Documents
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+Comparison of documents
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+You can compare two different LyX files via the menu 
+\family sans
+Tools\SpecialChar \menuseparator
+Compare
+\family default
+.
+ The comparison result is a LyX file with change tracking enabled showing
+ the differences.
+ In the comparison dialog you can select with the option 
+\family sans
+Copy
+\begin_inset space ~
+\end_inset
+
+Document
+\begin_inset space ~
+\end_inset
+
+Settings
+\begin_inset space ~
+\end_inset
+
+from
+\family default
+ from which document LyX should take the document settings for the the resulting
+ difference file.
+ The option 
+\family sans
+Enable
+\begin_inset space ~
+\end_inset
+
+change
+\begin_inset space ~
+\end_inset
+
+tracking
+\begin_inset space ~
+\end_inset
+
+features
+\begin_inset space ~
+\end_inset
+
+in
+\begin_inset space ~
+\end_inset
+
+the
+\begin_inset space ~
+\end_inset
+
+output
+\family default
+ enables the change tracking option 
+\family sans
+Show
+\begin_inset space ~
+\end_inset
+
+Changes
+\begin_inset space ~
+\end_inset
+
+in
+\begin_inset space ~
+\end_inset
+
+Output
+\family default
+ to visualize the differences also in the PDF output of the difference file.
+\end_layout
+
 \begin_layout Section
 Internationalisation
 \begin_inset Index idx
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 3e2d971818..e4d9029530 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -40197,6 +40197,100 @@ key "TeXCatalogue"
 またはお使いのLaTeXシステムのパッケージマネージャから見つけることができます。
 \end_layout
 
+\begin_layout Section
+
+\lang english
+Comparison of Documents
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+Comparison of documents
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+You can compare two different LyX files via the menu 
+\family sans
+Tools\SpecialChar \menuseparator
+Compare
+\family default
+.
+ The comparison result is a LyX file with change tracking enabled showing
+ the differences.
+ In the comparison dialog you can select with the option 
+\family sans
+Copy
+\begin_inset space ~
+\end_inset
+
+Document
+\begin_inset space ~
+\end_inset
+
+Settings
+\begin_inset space ~
+\end_inset
+
+from
+\family default
+ from which document LyX should take the document settings for the the resulting
+ difference file.
+ The option 
+\family sans
+Enable
+\begin_inset space ~
+\end_inset
+
+change
+\begin_inset space ~
+\end_inset
+
+tracking
+\begin_inset space ~
+\end_inset
+
+features
+\begin_inset space ~
+\end_inset
+
+in
+\begin_inset space ~
+\end_inset
+
+the
+\begin_inset space ~
+\end_inset
+
+output
+\family default
+ enables the change tracking option 
+\family sans
+Show
+\begin_inset space ~
+\end_inset
+
+Changes
+\begin_inset space ~
+\end_inset
+
+in
+\begin_inset space ~
+\end_inset
+
+Output
+\family default
+ to visualize the differences also in the PDF output of the difference file.
+\end_layout
+
 \begin_layout Section
 国際化サポート
 \begin_inset Index idx