Merge branch '2.2.x' into 2.2.2-staging

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

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index dd5e87830a5e0f6e5d3d075b3e1aeca8760c7cd8..ca7b29aa2064e2a5e99bc3c88238282af75580c8 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -139,7 +139,7 @@ enumitem
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author 2047637253 "Guillaume Munch"
+\author 1414654397 "Richard Heck"
 \end_header
 
 \begin_body
@@ -6681,7 +6681,7 @@ The default numbering of numbered lists can be changed by adding an optional
  argument (menu 
 \family sans
 Insert\SpecialChar menuseparator
-Short Title
+Enumerate Options
 \family default
 ) to the first item of each level in the list.
  There you add the command
@@ -6729,7 +6729,13 @@ reference "sec:TeX-Code"
 \emph on
  enumi
 \emph default
- is hereby the first level counter of the enumeration.
+ is 
+\change_inserted 1414654397 1468603336
+the LaTeX name of 
+\change_deleted 1414654397 1468603338
+hereby 
+\change_unchanged
+the first level counter of the enumeration.
  The command 
 \series bold
 
@@ -8311,12 +8317,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
+
 The following 2 lines are empty:
 \end_layout
 
@@ -8329,6 +8337,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8352,6 +8361,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -19333,7 +19343,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 ~
@@ -42925,32 +42935,41 @@ image
 scaling
 \family default
  is used for the size of equations in the output.
-\change_inserted 2047637253 1468428759
-
 \end_layout
 
 \begin_layout Description
-
-\change_inserted 2047637253 1468429852
-Save
+LyX
 \begin_inset space ~
 \end_inset
 
-transient
-\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
 
-properties controls whether document settings that are frequently switched
- or that are specific to the user must be saved with the document.
- Disabling this option can prevent issues in collaborative settings or when
- using version control systems (for instance unnecessary merge conflicts).
- The properties that are affected by this switch include for now: the activation
- of change tracking, the output of tracked changes, and the recording of
- the document directory path.
-\change_unchanged
+\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