prepare Qt 5.6 builds

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

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index f0bb7dde72384f4e37374c756d54c6f67d471c03..d47ddc5b09e95e8b9f69f38eff9faa85416c996a 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1,5 +1,5 @@
 #LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 505
+\lyxformat 506
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -8310,12 +8310,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
 
@@ -8328,6 +8330,7 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
+
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8351,6 +8354,7 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
+
 This is Verbatim*.
 \end_layout
 
@@ -19006,7 +19010,7 @@ C
 \end_layout
 
 \begin_layout Subsection
-The Table dialog
+Table Dialog
 \end_layout
 
 \begin_layout Standard
@@ -19285,12 +19289,12 @@ Default
 \end_layout
 
 \begin_layout Subsection
-Longtables
+Multi-page Tables
 \begin_inset Index idx
 status collapsed
 
 \begin_layout Plain Layout
-Tables ! Longtables
+Tables ! Multi-page
 \end_layout
 
 \end_inset
@@ -19300,7 +19304,7 @@ Tables ! Longtables
 status collapsed
 
 \begin_layout Plain Layout
-Longtables
+Multi-page tables
 \end_layout
 
 \end_inset
@@ -19315,7 +19319,7 @@ Use
 \begin_inset space ~
 \end_inset
 
-long
+multi-page
 \begin_inset space ~
 \end_inset
 
@@ -19323,7 +19327,11 @@ table
 \family default
  in the tab 
 \family sans
-Longtable
+Multi-page
+\begin_inset space ~
+\end_inset
+
+table
 \family default
  of the table dialog to split the table automatically over more pages.
  Doing this enables some check boxes and you can now define:
@@ -19399,7 +19407,7 @@ Insert\SpecialChar menuseparator
 Caption
 \family default
 .
- More about longtable captions can be found in the 
+ More about multi-page table captions can be found in the 
 \emph on
 Embedded
 \begin_inset space ~
@@ -35557,43 +35565,33 @@ Layout
 \end_layout
 
 \begin_layout Subsection
-Table
+Table and Rows & Columns
 \end_layout
 
 \begin_layout Standard
-This menu only appears if the cursor is inside a table.
+These menus only appear if the cursor is inside a table.
  It allows you to create multicolumn and multirow cells, add or remove borders
- of a cell and to set the vertical alignment of the cell.Table Settings and
- Math
+ of a cell and to set the alignment of the cell.
 \end_layout
 
-\begin_layout Standard
-These two menus are only fully active if the cursor is inside a table or
- a formula.
- Here you can change the properties of tables and formulas.
- The properties of tables are described in section
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:Tables"
-
-\end_inset
-
-, the properties of formulas in chapter
-\begin_inset space ~
-\end_inset
-
+\begin_layout Subsection
+Dissolve Inset
+\end_layout
 
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "chap:Mathematical-Formulas"
+\begin_layout Standard
+This menu only appears if the cursor is inside an inset.
+ It will dissolve this inset.
+ This means that the inset is deleted and its content is left as normal
+ text.
+\end_layout
 
-\end_inset
+\begin_layout Subsection
+Settings or Math
+\end_layout
 
-.
+\begin_layout Standard
+This menu is only active if the cursor is inside an inset or a formula.
+ Here you can change the properties of the inset or the formula.
 \end_layout
 
 \begin_layout Subsection
@@ -36957,7 +36955,7 @@ Captions
 status collapsed
 
 \begin_layout Plain Layout
-Longtables ! Caption
+Tables ! Multi-page ! Caption
 \end_layout
 
 \end_inset
@@ -36966,7 +36964,7 @@ Longtables ! Caption
 \end_layout
 
 \begin_layout Standard
-Inserts a caption in a float or longtable.
+Inserts a caption in a float or multi-page table.
  Floats are described in section
 \begin_inset space ~
 \end_inset
@@ -36978,9 +36976,9 @@ reference "sec:Floats"
 
 \end_inset
 
-; captions in longtables are described in the section 
+; captions in multi-page tables are described in the section 
 \emph on
-Longtable Captions
+Multi-page Captions
 \emph default
  of the 
 \emph on
@@ -45249,36 +45247,6 @@ export Setting what \SpecialChar LyX
  is allowed to overwrite on export.
 \end_layout
 
-\begin_layout Description
-Forward
-\begin_inset space ~
-\end_inset
-
-search Commands that will be used for the menu 
-\family sans
-Navigate\SpecialChar menuseparator
-Forward
-\begin_inset space ~
-\end_inset
-
-search
-\family default
-.
- For a detailed description see section 
-\emph on
-Reverse DVI/PDF search
-\emph default
- of the 
-\emph on
-Additional
-\begin_inset space ~
-\end_inset
-
-Features
-\emph default
- manual.
-\end_layout
-
 \begin_layout Subsection
 La
 \family sans