UserGuide.lyx: port today's changes

[features.git] / lib / doc / UserGuide.lyx

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