Backport changes to user guide from Pavel

lib/doc/UserGuide.lyx

@@ -148,7 +148,7 @@ logicalmkup
 \papersides 2
 \paperpagestyle default
 \tablestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \change_bars false
 \postpone_fragile_content false
@@ -157,7 +157,6 @@ logicalmkup
 \html_be_strict true
 \docbook_table_output 0
 \docbook_mathml_prefix 1
-\author -584632292 "Richard Kimberly Heck"
 \end_header
 
 \begin_body
@@ -1837,7 +1836,6 @@ test
 \end_inset
 
 .
- 
 \end_layout
 
 \begin_layout Itemize
@@ -1878,7 +1876,6 @@ starlet
 \end_inset
 
 .
- 
 \end_layout
 
 \begin_layout Itemize
@@ -8272,7 +8269,6 @@ To resume an enumeration,
 Enumerate-Resume
 \family default
 .
- 
 \end_layout
 
 \begin_layout Standard
@@ -9444,10 +9440,6 @@ Here is an example:
 #include <stdio.h>
 \end_layout
 
-\begin_layout LyX-Code
- 
-\end_layout
-
 \begin_layout LyX-Code
 int main(void)
 \end_layout
@@ -9611,14 +9603,12 @@ 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
 
@@ -9631,7 +9621,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -9655,7 +9644,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -15324,7 +15312,6 @@ microtype
 \end_inset
 
 .
- 
 \end_layout
 
 \begin_layout Standard
@@ -17469,7 +17456,6 @@ arg   "textstyle-apply"
 \end_inset
 
 .
- 
 \end_layout
 
 \begin_layout Standard
@@ -30993,11 +30979,16 @@ name "sec:Cross-References"
 \begin_layout Standard
 One of \SpecialChar LyX
 's strengths is cross-references.
- You can reference every section,
+ You can reference everything in the document that has a counter (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.,
+ section,
  float,
  footnote,
  formula,
- and list in the document.
+ and list).
  To reference a document part,
  you have to insert a label into it.
  The label is used as an anchor and a name for the reference.
@@ -31136,13 +31127,45 @@ enu:Second-item
 \end_layout
 
 \begin_layout Standard
-As an alternative to 
+For section headings,
+ footnotes,
+ table and figure floats,
+ this procedure can be simplified by using the outliner (see section
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:The-Outliner"
+
+\end_inset
+
+).
+ To insert a reference,
+ simply right-click on the item you want to refer to,
+ select 
+\family sans
+Insert Cross-Reference to this Item
+\family default
+ and the desired cross-reference format (see below for those) in the context menu.
+ \SpecialChar LyX
+ will check if the item already has a label and if not,
+ creates one before inserting the reference.
+ So all of the above boils down to two clicks!
+\end_layout
+
+\begin_layout Standard
+Other alternatives to 
 \family sans
 Insert\SpecialChar menuseparator
 Cross-Reference
 \family default
-,
+ which work for all item types (but require a label to exist already) are the following:
- you can right-click on a label and in the popup menu select 
+\end_layout
+
+\begin_layout Itemize
+Right-click on a label and in the popup menu select 
 \family sans
 Copy as Reference
 \family default
@@ -31161,8 +31184,23 @@ arg   "paste"
 ).
 \end_layout
 
+\begin_layout Itemize
+In the outliner,
+ section 
+\family sans
+Labels and Cross-References
+\family default
+,
+ right-click on the label you want to refer to and select 
+\family sans
+Insert Reference at Cursor Position
+\family default
+ from the context menu.
+\end_layout
+
 \begin_layout Standard
-Here is our cross-reference:
+Whatever approach you take,
+ here is how our cross-reference ultimately comes out:
  Item
 \begin_inset space ~
 \end_inset
@@ -34115,7 +34153,6 @@ et al.
 \end_inset
 
 ).
- 
 \end_layout
 
 \begin_layout Standard
@@ -34901,7 +34938,6 @@ nolink "false"
 \end_inset
 
  for details.
- 
 \end_layout
 
 \begin_layout Subsection
@@ -35271,7 +35307,6 @@ Bananas
 \series default
 ,
  will be listed separately.
- 
 \end_layout
 
 \begin_layout Standard
@@ -44572,8 +44607,6 @@ nolink "false"
 \end_layout
 
 \begin_layout Description
-
-\change_inserted -584632292 1712109674
 Plain
 \begin_inset space ~
 \end_inset
@@ -44582,25 +44615,11 @@ Double
 \begin_inset space ~
 \end_inset
 
-
+Quotation
-\change_deleted -584632292 1712109675
-Ordinary
 \begin_inset space ~
 \end_inset
 
-
+Mark Inserts this quote:
-\change_unchanged
-Quot
-\change_inserted -584632292 1712109680
-ation
-\begin_inset space ~
-\end_inset
-
-Mark
-\change_deleted -584632292 1712109681
-e
-\change_unchanged
- Inserts this quote:
  ",
  no matter what quote style you selected in the 
 \family sans
@@ -44612,8 +44631,6 @@ Language
 \end_layout
 
 \begin_layout Description
-
-\change_inserted -584632292 1712109701
 Plain
 \begin_inset space ~
 \end_inset
@@ -44636,39 +44653,15 @@ Mark Inserts this quote:
 \end_layout
 
 \begin_layout Description
-
-\change_deleted -584632292 1712109722
-Single
-\change_inserted -584632292 1712109720
 Inner
-\change_unchanged
-
 \begin_inset space ~
 \end_inset
 
-Quot
+Quotation
-\change_inserted -584632292 1712109726
-ation
 \begin_inset space ~
 \end_inset
 
-Mark
+Mark Inserts an inner quote (usually a single quote) in the quotation marks style selected in the 
-\change_deleted -584632292 1712109727
-e
-\change_unchanged
- Inserts a
-\change_inserted -584632292 1712109731
-n inner
-\change_unchanged
- 
-\change_deleted -584632292 1712109733
-single 
-\change_unchanged
-quote 
-\change_inserted -584632292 1712109738
-(usually a single quote) 
-\change_unchanged
-in the quotation marks style selected in the 
 \family sans
 Document\SpecialChar menuseparator
 Settings\SpecialChar menuseparator
@@ -50031,7 +50024,6 @@ Encodings
  \SpecialChar LyX
  automatically selects the appropriate traditional encoding for the given language(s).If the document contains text in more than one language you thus may get more than one encoding in the \SpecialChar LaTeX
  file.
- 
 \end_layout
 
 \begin_layout Standard
@@ -55298,7 +55290,6 @@ cursor
 movement Here you can define how cursor movement (with the arrow keys) behaves when writing scripts with right-to-left direction (e.g.,
  Arabic,
  Hebrew or Farsi).
- 
 \end_layout
 
 \begin_deeper