UserGuide.lyx: port today's changes

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index bc8771f3fd907ebdb9c1ca5476bb8dd8900e1816..5db649a76889e9e9bea4234bf818fb03211155fb 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -140,7 +140,6 @@ enumitem
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author 274215730 "scott"
 \author 424524441 "rgheck"
 \end_header
 
@@ -19335,7 +19334,7 @@ Header
 \family default
 : The current row and all rows above, that don't have any special options
  defined, are defined to be the header rows of all pages of the longtable.
- except for the first page, if 
+ Except for the first page, if 
 \family sans
 First
 \begin_inset space ~
@@ -29915,7 +29914,7 @@ inverted
 \end_inset
 
 
-\change_inserted 274215730 1468376116
+\change_unchanged
 Invert Inset
 \change_inserted 424524441 1468297080
 
@@ -42993,6 +42992,39 @@ scaling
  is used for the size of equations in the output.
 \end_layout
 
+\begin_layout Description
+LyX
+\begin_inset space ~
+\end_inset
+
+Format The option 
+\family sans
+Save transient properties
+\family default
+ controls whether document settings that are frequently switched or that
+ are specific to the user are saved with the document.
+ The properties that are affected by option are currently
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+the activation of change tracking
+\end_layout
+
+\begin_layout Itemize
+the output of tracked changes
+\end_layout
+
+\begin_layout Itemize
+the recording of the document directory path.
+\end_layout
+
+\begin_layout Standard
+Disabling the option can prevent issues in collaborative work and/or when
+ using a version control system (for instance unnecessary merge conflicts).
+\end_layout
+
+\end_deeper
 \begin_layout Section
 La
 \family sans

diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 0bfc1aae8bf70276933bd2e3c17520913f8ee7d4..0ab5c39576c7b8458de5f05910fe91f5da29162e 100644 (file)
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -41878,6 +41878,36 @@ Handbuchergänzungen
  Die Skalierung wird für die Größe von Gleichungen in der Ausgabe verwendet.
 \end_layout
 
+\begin_layout Description
+LyX-Format Die Option 
+\family sans
+Vorübergehende Eigenschaften speichern
+\family default
+ legt fest, ob auch Einstellungen in die Datei gespeichert werden, die oft
+ geändert werden oder die benutzerspezifisch sind.
+ Die Eigenschaften, die von der Option betroffen sind, sind momentan
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+die Aktivierung der Änderungsverfolgung
+\end_layout
+
+\begin_layout Itemize
+die Ausgabe verfolgter Änderungen
+\end_layout
+
+\begin_layout Itemize
+die Speicherung des Dateipfads zum Dokument
+\end_layout
+
+\begin_layout Standard
+Die Deaktivierung der Option kann Probleme verhindern, die auftreten wenn
+ ein Dokument von mehreren Personen geändert wird und/oder wenn ein Versionskont
+rollsystem verwendet wird.
+\end_layout
+
+\end_deeper
 \begin_layout Section
 \SpecialChar LaTeX
 -Vorspann

diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 20a9e833ba6ac2a7aff989f811dbd55c74a7c961..adf4529beaff0752480279786149b52cf39d8819 100644 (file)
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -43234,6 +43234,49 @@ Características adicionales
  La escala permite ajustar el tamaño de las ecuaciones en la salida.
 \end_layout
 
+\begin_layout Description
+
+\lang english
+LyX
+\begin_inset space ~
+\end_inset
+
+Format The option 
+\family sans
+Save transient properties
+\family default
+ controls whether document settings that are frequently switched or that
+ are specific to the user are saved with the document.
+ The properties that are affected by option are currently
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+
+\lang english
+the activation of change tracking
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+the output of tracked changes
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+the recording of the document directory path.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Disabling the option can prevent issues in collaborative work and/or when
+ using a version control system (for instance unnecessary merge conflicts).
+\end_layout
+
+\end_deeper
 \begin_layout Section
 Preámbulo LaTeX
 \end_layout

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index e6c66a0a3f5fa06bba7279b4af554b60c12027f0..740e7f8af0875f41510bfa5d94f6a910129a4ae1 100644 (file)
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -44890,6 +44890,49 @@ Options avancées
  le résultat.
 \end_layout
 
+\begin_layout Description
+
+\lang english
+LyX
+\begin_inset space ~
+\end_inset
+
+Format The option 
+\family sans
+Save transient properties
+\family default
+ controls whether document settings that are frequently switched or that
+ are specific to the user are saved with the document.
+ The properties that are affected by option are currently
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+
+\lang english
+the activation of change tracking
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+the output of tracked changes
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+the recording of the document directory path.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Disabling the option can prevent issues in collaborative work and/or when
+ using a version control system (for instance unnecessary merge conflicts).
+\end_layout
+
+\end_deeper
 \begin_layout Section
 Préambule LaTeX
 \end_layout

diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index ce5e441acbd97fc312844e1bc86064d0b69fa66c..004da89756c008c8658c94f2a89894afb3d715c1 100644 (file)
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -36232,6 +36232,49 @@ XHTMLでの数式出力
 」の節に詳細な解説があります．伸縮は，出力における数式の大きさを調整するのに用いられます．
 \end_layout
 
+\begin_layout Description
+
+\lang english
+LyX
+\begin_inset space ~
+\end_inset
+
+Format The option 
+\family sans
+Save transient properties
+\family default
+ controls whether document settings that are frequently switched or that
+ are specific to the user are saved with the document.
+ The properties that are affected by option are currently
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+
+\lang english
+the activation of change tracking
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+the output of tracked changes
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+the recording of the document directory path.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Disabling the option can prevent issues in collaborative work and/or when
+ using a version control system (for instance unnecessary merge conflicts).
+\end_layout
+
+\end_deeper
 \begin_layout Section
 LaTeXプリアンブル
 \end_layout