diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 2fb3a436b8..cffb4ba776 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 410
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
+\lyxformat 413
\begin_document
\begin_header
\textclass scrbook
@@ -54,6 +54,7 @@
\use_default_options false
\maintain_unincluded_children false
\language english
+\language_package default
\inputencoding auto
\fontencoding global
\font_roman default
@@ -126,7 +127,9 @@
\tracking_changes true
\output_changes false
\html_math_output 0
+\html_css_as_file 0
\html_be_strict true
+\author 5863208 "ab"
\author 1607599024 "Richard Heck" rgheck@comcast.net
\end_header
@@ -21783,7 +21786,8 @@ This is a line with an inline formula
\begin_layout Standard
Displayed formulas appear outside the text like if they were in an own paragraph
, like this one:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
A=B
\]
@@ -22001,7 +22005,8 @@ spce
\begin_layout Standard
You can leave many parts of a formula, like this matrix, partially filled
in, such as:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
\left(\begin{array}{ccc}
\lambda_{1}\\
& \ddots\\
@@ -22234,7 +22239,8 @@ Up
\family default
.
Any math structure can be placed in a fraction, as this example shows:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
\left[\frac{1}{\left(\begin{array}{cc}
2 & 3\\
4 & 5
@@ -22363,7 +22369,8 @@ limits
\end_inset
, versus
-\begin_inset Formula \[
+\begin_inset Formula
+\[
\sum_{n=0}^{\infty}\frac{1}{n!}=e
\]
@@ -22420,7 +22427,8 @@ Math ! Limits
\end_inset
-\begin_inset Formula \[
+\begin_inset Formula
+\[
\lim_{x\rightarrow\infty}f(x),
\]
@@ -23471,7 +23479,8 @@ There are several brackets available through LyX.
.
For example, that's how you would construct the brackets around a standard
matrix such as:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
\left[\begin{array}{cc}
1 & 2\\
3 & 4
@@ -23481,7 +23490,8 @@ There are several brackets available through LyX.
\end_inset
and to make it easier to see the layers of parentheses as in:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
\frac{1}{\left(1+\left(\frac{1}{1+\left(\frac{1}{1+x}\right)}\right)\right)}
\]
@@ -23578,7 +23588,8 @@ Panel
.
It will open a dialog for you to choose the number of rows/columns.
Here is an example:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
\left(\begin{array}{ccc}
1 & 2 & 3\\
4 & 5 & 6\\
@@ -23672,7 +23683,8 @@ lcr
centered, and the third column will be right-justified, because each letter
corresponds to the relevant column.
The result will look like this:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
\begin{array}{lcr}
this & this\, column & this\, column\\
column & has & has\, right\\
@@ -23721,7 +23733,8 @@ cases
\series default
.
Here is an example:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
f(x)=\begin{cases}
-1 & x<0\\
0 & x=0\\
@@ -23772,7 +23785,8 @@ arg "newline-insert newline"
.
Multi-line formulas are always displayed formulas.
Here is an example:
-\begin_inset Formula \begin{eqnarray}
+\begin_inset Formula
+\begin{eqnarray}
a^{2} & = & (b^{2}+c^{2})(b^{2}-c^{2})\nonumber \\
a & = & \sqrt{b^{4}-c^{4}}\label{eq:asquared}
\end{eqnarray}
@@ -23789,7 +23803,8 @@ Ctrl-Tab.
position to the next column.
Note that the middle column is designed for relation signs, structures
within this column will be printed in a smaller size:
-\begin_inset Formula \begin{eqnarray*}
+\begin_inset Formula
+\begin{eqnarray*}
\frac{A}{B} & \frac{A}{B} & \frac{A}{B}
\end{eqnarray*}
@@ -23901,7 +23916,8 @@ arg "math-number-toggle"
the document class.
In this document the number is printed together with the chapter number,
separated by a dot:
-\begin_inset Formula \begin{equation}
+\begin_inset Formula
+\begin{equation}
1+1=2
\end{equation}
@@ -23943,7 +23959,8 @@ arg "math-number-line-toggle"
\end_inset
will only toggle the numbering of the line where the cursor is:
-\begin_inset Formula \begin{eqnarray}
+\begin_inset Formula
+\begin{eqnarray}
1 & = & 3-2\\
2 & = & 4-2\nonumber \\
4 & \leq & 7
@@ -23995,7 +24012,8 @@ eq:tanhExp
\end_inset
in the second line:
-\begin_inset Formula \begin{eqnarray}
+\begin_inset Formula
+\begin{eqnarray}
\tanh(x) & = & \frac{\sinh(x)}{\cosh(x)}\nonumber \\
& = & \frac{\mathrm{e}^{2x}-1}{\mathrm{e}^{2x}+1}\label{eq:tanhExp}
\end{eqnarray}
@@ -24498,7 +24516,8 @@ N
Blackboard
\family default
denotes the set of numbers:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
f(x)=\sqrt{x}\:;\: x\in\mathbb{N}
\]
@@ -24638,7 +24657,8 @@ arg "font-default"
Math text appears in LyX in black instead of blue.
You can use spaces and accents in math text like in normal text.
Here is an example:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
f(x)=\begin{cases}
x & \textrm{if I say so}\\
-x & \textrm{unter Umständen}
@@ -28756,7 +28776,8 @@ answer{\SpecialChar \ldots{}
question
\series default
part appears:
-\begin_inset Formula \[
+\begin_inset Formula
+\[
x^{2}-2x-2\Rightarrow\question{x_{1}}\answer{x_{2}}=1\question{+\sqrt{3}}\answer{-\sqrt{3}}.
\]
@@ -29687,8 +29708,14 @@ Style-aware search
\begin_layout Standard
It is also possible to search for text with specific styles.
This is done by switching to the
+\change_inserted 5863208 1297987029
+
\family sans
+Settings
+\change_deleted 5863208 1297987031
Advanced
+\change_unchanged
+
\family default
tab of the dialog and unchecking the
\family sans
@@ -29839,8 +29866,14 @@ Case sensitive
Ignore format
\family default
option in the
+\change_inserted 5863208 1297987051
+
\family sans
+Settings
+\change_deleted 5863208 1297987053
Advanced
+\change_unchanged
+
\family default
tab, in order to avoid replacing all
\begin_inset Quotes eld
@@ -29903,13 +29936,17 @@ Find
Insert\SpecialChar \menuseparator
Insert Regular Expression
\family default
- (shortcut
+
+\change_deleted 5863208 1297986810
+(shortcut
\begin_inset Info
type "shortcut"
arg "regexp-mode"
\end_inset
-) while the cursor is in the
+)
+\change_unchanged
+while the cursor is in the
\family sans
Find
\family default
@@ -29966,8 +30003,14 @@ Searching for all text with a given style: for example, after unchecking
Ignore format
\family default
option from the
+\change_inserted 5863208 1297987063
+
\family sans
+Settings
+\change_deleted 5863208 1297987065
Advanced
+\change_unchanged
+
\family default
tab, entering a
\series bold
diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui b/src/frontends/qt4/ui/FindAndReplaceUi.ui
index caa08e16c6..a57a17bc82 100644
--- a/src/frontends/qt4/ui/FindAndReplaceUi.ui
+++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui
@@ -17,7 +17,7 @@
- Basi&c
+ Sear&ch
-
@@ -160,7 +160,7 @@
- Ad&vanced
+ S&ettings
-