diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 0d1e6b485f..188a16dc6f 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -140,12 +140,11 @@ enumitem
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -1402925745 "Günter Milde"
 \end_header
 
 \begin_body
@@ -8337,14 +8336,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
 
@@ -8357,7 +8354,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8381,7 +8377,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 
@@ -12697,13 +12692,7 @@ status open
 Note:
 \series default
  In practice, some fonts might fail due to a legacy (non Unicode) font encoding,
- bad metrics, 
-\change_deleted -1402925745 1506439424
-and
-\change_inserted -1402925745 1506439424
-or
-\change_unchanged
- other font deficiencies; so you might have to experiment.
+ bad metrics, or other font deficiencies; so you might have to experiment.
 \end_layout
 
 \end_inset
@@ -16064,11 +16053,7 @@ Typography
 \end_layout
 
 \begin_layout Subsection
-Hyphens, Dashes
-\change_inserted -1402925745 1506496113
-,
-\change_unchanged
- and Minus Signs
+Hyphens, Dashes and Minus Signs
 \begin_inset Index idx
 status collapsed
 
@@ -16105,13 +16090,7 @@ In \SpecialChar LyX
 \begin_inset Quotes erd
 \end_inset
 
- 
-\change_deleted -1402925745 1506541644
-character
-\change_inserted -1402925745 1506541880
-symbol
-\change_unchanged
- comes in four variants: the 
+ symbol comes in four variants: the 
 \emph on
 hyphen
 \emph default
@@ -16174,13 +16153,7 @@ name
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506545222
 output
-\change_inserted -1402925745 1506614773
-glyph
-\change_unchanged
-
 \end_layout
 
 \end_inset
@@ -16258,8 +16231,6 @@ en dash
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506592215
 system key combination
 \begin_inset Foot
 status collapsed
@@ -16267,9 +16238,7 @@ status collapsed
 \begin_layout Plain Layout
 On Mac and Linux, the en dash is entered with 
 \family sans
-Opt
-\change_inserted -1402925745 1506589385
-+
+Opt+
 \begin_inset Quotes eld
 \end_inset
 
@@ -16278,16 +16247,10 @@ Opt
 \end_inset
 
 
-\change_deleted -1402925745 1506589369
-ion-hyphen
-\change_unchanged
-
 \family default
  and the em dash with 
 \family sans
-Shift-Opt
-\change_inserted -1402925745 1506589416
-+
+Shift-Opt+
 \begin_inset Quotes erd
 \end_inset
 
@@ -16296,18 +16259,10 @@ Shift-Opt
 \end_inset
 
 
-\change_deleted -1402925745 1506589408
-ion-hyphen
-\change_unchanged
-
 \family default
  (
 \family sans
 Opt
-\change_deleted -1402925745 1506589513
-ion
-\change_unchanged
-
 \family default
  is the Mac label for the right 
 \family sans
@@ -16337,28 +16292,12 @@ unicode-insert
 \end_inset
 
  \SpecialChar LyX
- function with the Unicode code
-\change_inserted -1402925745 1506441959
- point
-\change_unchanged
- as argument (2013 for the em dash and 2014 for the en dash).
+ function with the Unicode code point as argument (2013 for the em dash
+ and 2014 for the en dash).
 \end_layout
 
 \end_inset
 
-
-\change_inserted -1402925745 1506612124
-
-\begin_inset CommandInset href
-LatexCommand href
-name "system key combination"
-target "https://en.wikipedia.org/wiki/Dash#Encoding.2C_substitution.2C_and_keyboard_shortcuts"
-literal "false"
-
-\end_inset
-
-
-\change_unchanged
  or 
 \begin_inset Quotes eld
 \end_inset
@@ -16396,22 +16335,7 @@ em dash
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506612094
-system key combination
-\change_inserted -1402925745 1506592246
-
-\begin_inset CommandInset href
-LatexCommand href
-name "system key combination"
-target "https://en.wikipedia.org/wiki/Dash#Encoding_and_keyboard_shortcuts"
-literal "false"
-
-\end_inset
-
-
-\change_unchanged
- or 
+system key combination or 
 \begin_inset Quotes eld
 \end_inset
 
@@ -16485,8 +16409,6 @@ minus sign
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1506592362
 Dashes can also be inserted with 
 \family sans
 Insert\SpecialChar menuseparator
@@ -16528,19 +16450,11 @@ hyphen
 \end_layout
 
 \begin_layout Enumerate
-
-\change_deleted -1402925745 1506519699
-From 
-\change_unchanged
-A–Z; pages
+From A–Z; pages
 \begin_inset space ~
 \end_inset
 
 369–378
-\change_inserted -1402925745 1506594369
-; Oh – there's a dash.
-\change_unchanged
-
 \begin_inset space \hfill{}
 \end_inset
 
@@ -16552,27 +16466,7 @@ en dash
 \end_layout
 
 \begin_layout Enumerate
-
-\change_deleted -1402925745 1506594263
-Dashes indicate interruptions, performing a function related to – but subtly
- different from – parentheses.
-\begin_inset space \hfill{}
-\end_inset
-
-(
-\emph on
-en dash
-\emph default
-)
-\end_layout
-
-\begin_deeper
-\begin_layout Standard
-
-\change_deleted -1402925745 1506594328
-The em dash is used without spaces: 
-\change_unchanged
-Oh—there's a dash.
+The em dash is used without spaces: Oh—there's a dash.
 \begin_inset space \hfill{}
 \end_inset
 
@@ -16583,7 +16477,6 @@ em dash
 )
 \end_layout
 
-\end_deeper
 \begin_layout Enumerate
 \begin_inset Formula $x^{2}-y^{2}=z^{2}$
 \end_inset
@@ -16624,13 +16517,8 @@ name "subsec:Dashes-and-line-breaks"
 \end_layout
 
 \begin_layout Standard
-Whether line breaks 
-\change_deleted -1402925745 1506541984
-before or after
-\change_inserted -1402925745 1506541984
-around
-\change_unchanged
- dashes are allowed depends on the use case and locale:
+Whether line breaks around dashes are allowed depends on the use case and
+ locale:
 \end_layout
 
 \begin_layout Itemize
@@ -16638,32 +16526,13 @@ No line breaks are allowed in ranges of values like A–Z or 1975–1982.
 \end_layout
 
 \begin_layout Itemize
-In English, 
-\change_deleted -1402925745 1506542010
-lines may break after 
-\change_unchanged
-dashes used to set off parenthetical statements
-\change_inserted -1402925745 1506547201
- should not start a new line
-\change_unchanged
-.
+In English, dashes used to set off parenthetical statements should not start
+ a new line.
 \end_layout
 
 \begin_layout Itemize
 In French and Spanish, dashes around parenthetical statements are treated
- similar to 
-\change_deleted -1402925745 1506542045
-quote signs and
-\change_inserted -1402925745 1506614820
-brackets:
-\change_unchanged
- line breaks are not allowed on the 
-\change_deleted -1402925745 1506542045
-left
-\change_inserted -1402925745 1506436627
-inner
-\change_unchanged
- side.
+ similar to brackets: line breaks are not allowed on the inner side.
 \end_layout
 
 \begin_layout Standard
@@ -16675,15 +16544,7 @@ When using spaced en dashes
 \begin_inset space ~
 \end_inset
 
-- line breaks before the dash 
-\change_inserted -1402925745 1506432533
-can be prevented 
-\change_unchanged
-with protected spaces
-\change_deleted -1402925745 1506432538
- are not allowed
-\change_unchanged
-.
+- line breaks before the dash can be prevented with protected spaces.
 \end_layout
 
 \begin_layout Standard
@@ -16733,13 +16594,7 @@ This forces the output of dashes as
 \end_layout
 
 \begin_layout Standard
-
-\change_deleted -1402925745 1506436929
-Subtleties
-\change_inserted -1402925745 1506436930
-Caution
-\change_unchanged
-:
+Caution:
 \end_layout
 
 \begin_layout Enumerate
@@ -16777,12 +16632,8 @@ Objects
 nobreakdash
 \series default
  in \SpecialChar TeX
- code
-\change_inserted -1402925745 1506595187
-.
- Examples
-\change_unchanged
-:
+ code.
+ Examples:
 \end_layout
 
 \begin_deeper
@@ -16896,16 +16747,10 @@ An incorrect line break is easily overlooked because
 \begin_layout Enumerate
 The setting is ignored for documents using non-\SpecialChar TeX
  fonts.
-\change_inserted -1402925745 1506594733
-
-\lang ngerman
-
 \begin_inset Foot
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -1402925745 1506594830
 Xe\SpecialChar TeX
  provides the 
 \series bold
@@ -16930,38 +16775,8 @@ XeTeXdashbreakstate=0
 \end_inset
 
 
-\change_unchanged
-
 \end_layout
 
-\begin_deeper
-\begin_layout Standard
-
-\change_deleted -1402925745 1506594722
-Xe\SpecialChar TeX
- provides the 
-\series bold
-
-\backslash
-XeTeXdashbreakstate
-\series default
- setting.
- The default,
-\begin_inset Newline newline
-\end_inset
-
-
-\series bold
-
-\backslash
-XeTeXdashbreakstate=1
-\series default
- causes literal dashes to behave like ligature dashes.
-\change_unchanged
-
-\end_layout
-
-\end_deeper
 \begin_layout Enumerate
 Em dashes in 
 \family typewriter
@@ -16983,33 +16798,13 @@ Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
 \end_layout
 
 \begin_layout Standard
-
-\change_deleted -1402925745 1506433667
-In
-\change_inserted -1402925745 1506433670
-Since
-\change_unchanged
- \SpecialChar LyX
+Since \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.2
-\change_inserted -1402925745 1506433674
-,
-\change_unchanged
- -- and --- 
-\change_deleted -1402925745 1506433728
-were in \SpecialChar LyX
-
-\begin_inset space ~
-\end_inset
-
-2.3 output
-\change_inserted -1402925745 1506433733
-are exported to LaTeX
-\change_unchanged
- as -{}- and -{}-{}- to prevent ligation to dashes.
+2.2, -- and --- are exported to LaTeX as -{}- and -{}-{}- to prevent ligation
+ to dashes.
 \begin_inset Foot
 status collapsed
 
@@ -17019,65 +16814,21 @@ Up to \SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.1
-\change_inserted -1402925745 1506437858
-,
-\change_unchanged
- -- and --- 
-\change_deleted -1402925745 1506437892
-in \SpecialChar LyX
- 
-\change_unchanged
-was output unchanged which led to different look in
-\change_deleted -1402925745 1506429846
- the within
-\change_unchanged
- \SpecialChar LyX
-, text export, 
-\change_inserted -1402925745 1506429869
-and 
-\change_unchanged
-HTML export 
-\change_inserted -1402925745 1506429873
-vs.
-\change_deleted -1402925745 1506429876
-and the
-\change_unchanged
- PDF export.
+2.1, -- and --- was output unchanged which led to different look in \SpecialChar LyX
+, text
+ export, HTML export and the PDF export.
 \end_layout
 
 \end_inset
 
  Occurrences in older documents are converted to literal Unicode dashes.
- This le
-\change_deleted -1402925745 1506436302
-a
-\change_unchanged
-d to 
-\change_deleted -1402925745 1506436261
-problems like 
-\change_unchanged
-different line breaks
-\change_inserted -1402925745 1506436268
- in some documents
-\change_unchanged
-.
- 
-\change_deleted -1402925745 1506595735
-Since 
-\change_unchanged
-\SpecialChar LyX
+ This led to different line breaks in some documents.
+ \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.3 
-\change_deleted -1402925745 1506595740
-there is
-\change_inserted -1402925745 1506595742
-provides
-\change_unchanged
- the option 
+2.3 provides the option 
 \family sans
 Output en- and em-dashes as ligatures
 \family default
@@ -17097,12 +16848,8 @@ Fonts.
 \begin_inset Newline newline
 \end_inset
 
-Note the following side-effects of the 
-\change_inserted -1402925745 1506438339
-changes in 
-\change_unchanged
-\SpecialChar LyX
- dash handling:
+Note the following side-effects of the changes in \SpecialChar LyX
+'s dash handling:
 \end_layout
 
 \begin_layout Itemize
@@ -17112,24 +16859,14 @@ If you used literal em- and en dashes in pre-\SpecialChar LyX
 \end_inset
 
 2.2 documents, you must manually unselect 
-\change_deleted -1402925745 1506547512
-the option
-\change_inserted -1402925745 1506547512
-
 \family sans
 Output en- and em-dashes as ligatures
-\change_unchanged
-
 \family default
  to ensure unchanged behavior.
-
-\change_inserted -1402925745 1506596162
  
 \end_layout
 
 \begin_layout Itemize
-
-\change_inserted -1402925745 1506614938
 If you used both, literal and ligature dashes in pre-\SpecialChar LyX
 
 \begin_inset space ~
@@ -17154,13 +16891,7 @@ Zero-width space (ZWSP) characters in older \SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.3 or the optional line breaks will be lost
-\change_deleted -1402925745 1506596503
-!
-\change_inserted -1402925745 1506596503
-.
-\change_unchanged
-
+2.3 or the optional line breaks will be lost.
 \end_layout
 
 \begin_layout Subsection
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 63ef7b1ff1..5074ac12e1 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -149,12 +149,11 @@ enumitem
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes true
+\tracking_changes false
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\author -1402925745 "Günter Milde"
 \end_header
 
 \begin_body
@@ -8604,12 +8603,10 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim
-
 Dies ist Unformatiert.
 \end_layout
 
 \begin_layout Verbatim
-
 Die folgenden 2 Zeilen sind leer:
 \end_layout
 
@@ -8622,7 +8619,6 @@ Die folgenden 2 Zeilen sind leer:
 \end_layout
 
 \begin_layout Verbatim
-
 Fast alles ist in Unformatiert erlaubt:"%&$§#~'`
 \backslash
 }][{|
@@ -8646,7 +8642,6 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim*
-
 Dies ist Unformatiert*.
 \end_layout
 
@@ -11308,11 +11303,7 @@ reference "tab:Breite-der-verschiedenen"
 
 \end_inset
 
- listet die verschiedenen Breiten der Le
-\change_inserted -1402925745 1506444504
-e
-\change_unchanged
-rräume auf.
+ listet die verschiedenen Breiten der Leerräume auf.
 \end_layout
 
 \begin_layout Standard
@@ -12979,13 +12970,10 @@ PDF (LuaTeX)
 DVI (LuaTeX)
 \family default
  als Ausgabeformat verwenden.
- Das bedeutet daher auch, dass
-\change_deleted -1402925745 1506439963
- entweder
-\change_unchanged
- Xe\SpecialChar TeX
+ Das bedeutet daher auch, dass Xe\SpecialChar TeX
  oder Lua\SpecialChar TeX
- installiert sein müssen (siehe Abschnitt
+ installiert sein müssen (siehe
+ Abschnitt
 \begin_inset space ~
 \end_inset
 
@@ -13077,11 +13065,7 @@ European Computer Modern
 \family typewriter
 ec
 \family default
-)
-\change_deleted -1402925745 1506440093
- bekannt ist
-\change_unchanged
-.
+).
  Einige spezielle Klassen verwenden jedoch eine andere Schrift als Standard.
 \end_layout
 
@@ -13436,14 +13420,8 @@ reference "subsec:LaTeX-Einstellungen"
  Normalerweise müssen Sie nichts ändern (und diese Einstellung auch nicht
  verstehen).
  Verwenden Sie daher 
-\change_inserted -1402925745 1506440326
-
 \family sans
 Standard
-\change_deleted -1402925745 1506440329
-Benutzerdefiniert
-\change_unchanged
-
 \family default
 , es sei denn, Sie haben Ihre Gründe.
 \end_layout
@@ -13457,13 +13435,7 @@ Mediävalziffern verwenden
 \family sans
 Echte Kapitälchen verwenden
 \family default
- aktivier
-\change_deleted -1402925745 1506440350
-t
-\change_inserted -1402925745 1506440352
-bar
-\change_unchanged
-.
+ aktivierbar.
  Dies sind spezielle Features, die einige Schriften anbieten.
  Wenn Sie die Option 
 \family sans
@@ -16385,25 +16357,8 @@ Gedankenstriche
 \end_layout
 
 \begin_layout Standard
-
-\change_deleted -1402925745 1506614989
-In \SpecialChar LyX
- hat das '
-\family typewriter
--
-\family default
-'-Zeichen vier Varianten: 
-\emph on
-Bindestrich, Gedankenstrich
-\emph default
-, 
-\emph on
-langer Gedankenstrich
-\change_inserted -1402925745 1506614991
-
-\emph default
 \SpecialChar LyX
- unterscheidet  vier Varianten des 
+ unterscheidet vier Varianten des 
 \begin_inset Quotes gld
 \end_inset
 
@@ -16422,8 +16377,6 @@ Viertelgeviertstrich, Halbgeviertstrich
 , 
 \emph on
 Geviertstrich
-\change_unchanged
-
 \emph default
  und 
 \emph on
@@ -16476,13 +16429,7 @@ Name
 \begin_inset Text
 
 \begin_layout Plain Layout
-Aus
-\change_deleted -1402925745 1506516283
-gabe
-\change_inserted -1402925745 1506615023
-sehen
-\change_unchanged
-
+Aussehen
 \end_layout
 
 \end_inset
@@ -16491,13 +16438,7 @@ sehen
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506616491
-e
-\change_inserted -1402925745 1506616493
-E
-\change_unchanged
-ingefügt mit
+Eingefügt mit
 \end_layout
 
 \end_inset
@@ -16508,13 +16449,7 @@ ingefügt mit
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506517318
-Binde
-\change_inserted -1402925745 1506517321
-Viertelgeviert
-\change_unchanged
-strich
+Viertelgeviertstrich
 \end_layout
 
 \end_inset
@@ -16532,10 +16467,6 @@ strich
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506516980
-ein
-\change_unchanged
  
 \begin_inset Quotes gld
 \end_inset
@@ -16548,11 +16479,7 @@ ein
 \begin_inset Quotes eld
 \end_inset
 
-
-\change_inserted -1402925745 1506517026
  im Textmodus
-\change_unchanged
-
 \end_layout
 
 \end_inset
@@ -16563,13 +16490,7 @@ ein
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506443129
-Gedanken
-\change_inserted -1402925745 1506443132
-Halbgeviert
-\change_unchanged
-strich
+Halbgeviertstrich
 \end_layout
 
 \end_inset
@@ -16587,8 +16508,6 @@ strich
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_inserted -1402925745 1506591529
 \begin_inset CommandInset href
 LatexCommand href
 name "Tastenkombination"
@@ -16597,57 +16516,6 @@ literal "false"
 
 \end_inset
 
-
-\change_deleted -1402925745 1506591858
-Tastenkombination
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Auf Mac und Linux wird der Gedankenstrich mit 
-\family sans
-Option-hyphen
-\family default
- und der langer Gedankenstrich mit 
-\family sans
-Umschalt-Option-hyphen
-\family default
- eingefügt.
- (
-\family sans
-Option
-\family default
- ist die Mac-Bezeichnung für die rechte 
-\family sans
-Alt
-\family default
- 
-\family sans
-/ AltGr
-\family default
--Taste).
- Alternativ können Gedankenstriche mit 
-\family sans
-Einfügen\SpecialChar menuseparator
-Sonderzeichen\SpecialChar menuseparator
-Symbole
-\family default
- oder mit der LyX-Funktion 
-\begin_inset Quotes gld
-\end_inset
-
-unicode-insert
-\begin_inset Quotes grd
-\end_inset
-
- mit dem Unicode code als Argument (2013 für den langen Gedankenstrich und
- 2014 für den Gedankenstrich) eingefügt werden.
-\end_layout
-
-\end_inset
-
-
-\change_unchanged
  oder 
 \begin_inset Quotes gld
 \end_inset
@@ -16656,17 +16524,7 @@ unicode-insert
 \begin_inset Quotes grd
 \end_inset
 
- i
-\change_inserted -1402925745 1506428047
-m
-\change_deleted -1402925745 1506428045
-n
-\change_unchanged
- Text
-\change_inserted -1402925745 1506428051
-modus
-\change_unchanged
-
+ im Textmodus
 \end_layout
 
 \end_inset
@@ -16677,13 +16535,7 @@ modus
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506443148
-langer Gedanken
-\change_inserted -1402925745 1506443149
-Geviert
-\change_unchanged
-strich
+Geviertstrich
 \end_layout
 
 \end_inset
@@ -16701,8 +16553,6 @@ strich
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_inserted -1402925745 1506591786
 \begin_inset CommandInset href
 LatexCommand href
 name "Tastenkombination"
@@ -16711,10 +16561,6 @@ literal "false"
 
 \end_inset
 
-
-\change_deleted -1402925745 1506591729
-Tastenkombination
-\change_unchanged
  oder 
 \begin_inset Quotes gld
 \end_inset
@@ -16723,17 +16569,7 @@ Tastenkombination
 \begin_inset Quotes grd
 \end_inset
 
- i
-\change_inserted -1402925745 1506428055
-m
-\change_deleted -1402925745 1506428053
-n
-\change_unchanged
- Text
-\change_inserted -1402925745 1506428057
-modus
-\change_unchanged
-
+ im Textmodus
 \end_layout
 
 \end_inset
@@ -16765,11 +16601,6 @@ Minuszeichen
 \begin_inset Text
 
 \begin_layout Plain Layout
-
-\change_deleted -1402925745 1506516998
-ein 
-\change_unchanged
-
 \begin_inset Quotes gld
 \end_inset
 
@@ -16804,8 +16635,6 @@ ein
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1506591947
 Alternativ können die Symbole mit 
 \family sans
 Einfügen\SpecialChar menuseparator
@@ -16824,36 +16653,12 @@ unicode-insert
 \end_layout
 
 \begin_layout Standard
-Die 
-\change_deleted -1402925745 1506517202
-Strichtypen
-\change_inserted -1402925745 1506591946
-Textzeichen
-\change_unchanged
- unterscheiden sich vom Minuszeichen, das im Mathematikmodus erscheint und
- eine eigene Länge hat.
- Hier sind einige Beispiele für den Gebrauch
-\change_deleted -1402925745 1506630587
- von 
-\begin_inset Quotes gld
-\end_inset
-
-
-\family typewriter
--
-\family default
-
-\begin_inset Quotes eld
-\end_inset
-
-
-\change_unchanged
-:
+Die Textzeichen unterscheiden sich vom Minuszeichen, das im Mathematikmodus
+ erscheint und eine eigene Länge hat.
+ Hier sind einige Beispiele für den Gebrauch:
 \end_layout
 
 \begin_layout Enumerate
-
-\change_inserted -1402925745 1506590703
 i-Punkt (
 \emph on
 Bindestrich
@@ -16862,65 +16667,31 @@ Bindestrich
 \begin_inset Newline newline
 \end_inset
 
-
-\change_unchanged
 Zeilen- und Seitenumbrüche (
-\change_deleted -1402925745 1506426886
-
 \emph on
-Binde
-\change_inserted -1402925745 1506426902
-Ergänzungs
-\change_unchanged
-strich
+Ergänzungsstrich
 \emph default
 )
 \end_layout
 
 \begin_layout Enumerate
-
-\change_deleted -1402925745 1506426941
-Von
-\change_inserted -1402925745 1506590948
-Punkte
-\change_unchanged
- A
-\change_inserted -1402925745 1506427182
-
+Von A
 \begin_inset space \thinspace{}
 \end_inset
 
-
-\change_deleted -1402925745 1506426943
- 
-\change_unchanged
 –
-\change_inserted -1402925745 1506427192
-
 \begin_inset space \thinspace{}
 \end_inset
 
-
-\change_deleted -1402925745 1506426944
- 
-\change_unchanged
 Z; Seiten
 \begin_inset space ~
 \end_inset
 
 369–378 (
-\change_deleted -1402925745 1506443043
-
 \emph on
-Gedanken
-\change_inserted -1402925745 1506443310
-Bis-
-\change_unchanged
-strich
+Bis-strich
 \emph default
 )
-\change_inserted -1402925745 1506591013
-
 \begin_inset Newline newline
 \end_inset
 
@@ -16930,7 +16701,7 @@ Autobahn München
 
 – Salzburg (
 \emph on
-Steckenstrich
+Streckenstrich
 \emph default
 )
 \begin_inset Newline newline
@@ -16939,41 +16710,23 @@ Steckenstrich
 Oh – da ist ein 
 \emph on
 Gedankenstrich.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Enumerate
 
-\change_deleted -1402925745 1506590753
-Oh — da ist ein
-\change_inserted -1402925745 1506615129
-
 \lang english
 Oh—there's an em-dash.
 
-\change_unchanged
-
 \lang ngerman
- 
-\change_inserted -1402925745 1506615112
-(
-\change_unchanged
-
+ (
 \emph on
 langer Gedankenstrich
-\change_deleted -1402925745 1506590753
-.
-\change_inserted -1402925745 1506517643
-
 \emph default
 )
 \begin_inset Foot
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -1402925745 1506591206
 Der 
 \emph on
 lange Gedankenstrich 
@@ -16984,15 +16737,11 @@ ist im Deutschen nur im Satz mit gebrochenen
 \emph default
 Schriften üblich und wird – anders als im Englischen – mit Abstand zum umgebende
 n Text gesetzt.
-\change_unchanged
-
 \end_layout
 
 \end_inset
 
 
-\change_unchanged
-
 \end_layout
 
 \begin_layout Enumerate
@@ -17020,11 +16769,7 @@ literal "false"
 \end_layout
 
 \begin_layout Subsection
-Bindestriche
-\change_inserted -1402925745 1506515419
-, Gedankenstriche
-\change_unchanged
- und Zeilenumbrüche
+Bindestriche, Gedankenstriche und Zeilenumbrüche
 \begin_inset CommandInset label
 LatexCommand label
 name "subsec:Gedankenstriche-und-Zeilenumbrüche"
@@ -17035,8 +16780,6 @@ name "subsec:Gedankenstriche-und-Zeilenumbrüche"
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -1402925745 1506630104
 Zum Zeilenumbruch nach Binde- und Ergänzungsstrichen siehe Abschnitt
 \begin_inset space ~
 \end_inset
@@ -17052,113 +16795,40 @@ noprefix "false"
 \end_inset
 
 .
-\change_unchanged
-
 \end_layout
 
 \begin_layout Standard
-Ob Zeilenumbrüche vor oder nach 
-\change_deleted -1402925745 1506428470
-Binde
-\change_inserted -1402925745 1506428472
-Gedanken
-\change_unchanged
-striche
-\change_inserted -1402925745 1506428474
-n
-\change_unchanged
- erlaubt sind, hängt vom konkreten Fall und der Sprache ab
-\change_inserted -1402925745 1506443420
-.
- Im Deutschen gilt
-\change_unchanged
-:
+Ob Zeilenumbrüche vor oder nach Gedankenstrichen erlaubt sind, hängt vom
+ konkreten Fall und der Sprache ab.
+ Im Deutschen gilt:
 \end_layout
 
 \begin_layout Itemize
-Zeilenumbrüche sind nicht erlaubt 
-\change_deleted -1402925745 1506428380
-in Bereichen von Werten
-\change_inserted -1402925745 1506428385
-bei Intervallangaben
-\change_unchanged
- wie 
-\change_deleted -1402925745 1506629428
-A–Z oder
-\change_unchanged
- 1975–1982.
+Zeilenumbrüche sind nicht erlaubt bei Intervallangaben wie 1975–1982.
 \end_layout
 
 \begin_layout Itemize
-
-\change_deleted -1402925745 1506428964
-Im Englischen dürfen Zeilen nach Bindestrichen umgebrochen werden, um eingeschob
-ene Aussagen zu schreiben.
-\change_inserted -1402925745 1506616656
 Prinzipiell ist ein Zeilenumbruch sowohl vor als auch nach einem Gedankenstrich
  zulässig.
  Ein einzelner Gedankenstrich sowie der Abschließende eines Gedankenstrichpaares
  stehen jedoch aus Gründen der Lesbarkeit normalerweise nicht am Zeilenanfang.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Itemize
-Im Französischen und Spanischen werden 
-\change_deleted -1402925745 1506629501
-Bindestriche um eingeschobene Aussagen wie Anführungszeichen behandelt und
- Zeilenumbrüche sind nicht auf der linken Seite erlaubt.
-
-\change_inserted -1402925745 1506629510
- Gedankenstriche um eingeschobene Aussagen wie Klammern behandelt: Zeilenumbrüch
-e sind nur auf der äußeren Seite erlaubt.
-\change_unchanged
-
+Im Französischen und Spanischen werden Gedankenstriche um eingeschobene
+ Aussagen wie Klammern behandelt: Zeilenumbrüche sind nur auf der äußeren
+ Seite erlaubt.
 \end_layout
 
 \begin_layout Standard
-
-\change_deleted -1402925745 1506615220
-Bei Bindestrichen mit Leerzeichen
-\begin_inset space ~
-\end_inset
-
-- was üblich ist in Britisch Englisch
-\begin_inset space ~
-\end_inset
-
-- sind Zeilenumbrüche vor dem Bindestrich mit geschütztem Leerzeichen nicht
- zulässig.
-\change_inserted -1402925745 1506630308
 Zeilenumbrüche vor abgesetzten Gedankenstrichen können mit einem geschütztem
  Leerzeichen unterbunden werden.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Standard
-Bei 
-\change_inserted -1402925745 1506514786
-langen 
-\change_unchanged
-Gedankenstrichen ohne 
-\change_deleted -1402925745 1506447830
-Leerzeichen
-\change_inserted -1402925745 1506447844
-Abstand zum umgebenden Text
-\change_unchanged
-—\SpecialChar allowbreak
-
-\change_deleted -1402925745 1506428994
-was 
-\change_unchanged
-üblich 
-\change_deleted -1402925745 1506615273
-ist in Amerikanisch
-\change_inserted -1402925745 1506615275
-im amerikanischen
-\change_unchanged
- Englisch—\SpecialChar allowbreak
+Bei langen Gedankenstrichen ohne Abstand zum umgebenden Text—\SpecialChar allowbreak
+üblich im amerikani
+schen Englisch—\SpecialChar allowbreak
 kann man optionale Zeilenumbrüche mit dem Menü 
 \family sans
 Einfügen\SpecialChar menuseparator
@@ -17169,17 +16839,8 @@ Optionaler Zeilenumbruch
 \end_layout
 
 \begin_layout Standard
-
-\change_deleted -1402925745 1506615338
-In Dokumenten mit vielen Gedankenstrichen,
-\change_inserted -1402925745 1506615427
-In englischsprachigen Dokumenten mit langen Gedankenstrichen
-\change_unchanged
- kann man 
-\change_inserted -1402925745 1506615390
-alternativ 
-\change_unchanged
-die Option 
+In englischsprachigen Dokumenten mit langen Gedankenstrichen kann man alternativ
+ die Option 
 \family sans
 Dokument\SpecialChar menuseparator
 Einstellungen\SpecialChar menuseparator
@@ -17188,28 +16849,6 @@ Halbgeviert und Geviertstriche als Ligaturen
  ausgeben 
 \family default
 verwenden.
- 
-\change_deleted -1402925745 1506615338
-Dies gibt die Striche als 
-\begin_inset Quotes gld
-\end_inset
-
---
-\begin_inset Quotes grd
-\end_inset
-
- und 
-\begin_inset Quotes gld
-\end_inset
-
----
-\begin_inset Quotes grd
-\end_inset
-
- aus, wenn man nach \SpecialChar LaTeX
- exportiert.
-
-\change_inserted -1402925745 1506615342
  Die Striche werden dann als 
 \begin_inset Quotes gld
 \end_inset
@@ -17228,48 +16867,21 @@ Dies gibt die Striche als
 
  in die \SpecialChar LaTeX
  Quelldatei geschrieben.
-
-\change_unchanged
  Der \SpecialChar TeX
-
-\change_deleted -1402925745 1506615338
- Schrift
-\change_unchanged
--Ligaturmechanismus konvertiert sie zu 
-\change_deleted -1402925745 1506615338
-Strichzeichen
-\change_inserted -1402925745 1506630393
-(Halb-) Geviertstrichen
-\change_unchanged
-, auf die ein optionaler Zeilenumbruch folgt.
+-Ligaturmechanismus konvertiert sie zu (Halb-) Geviertstrichen, auf
+ die ein optionaler Zeilenumbruch folgt.
 \end_layout
 
 \begin_layout Standard
-
-\change_deleted -1402925745 1506432841
-Feinheiten
-\change_inserted -1402925745 1506450193
-Vorsicht
-\change_unchanged
-:
+Vorsicht:
 \end_layout
 
 \begin_layout Enumerate
-
-\change_deleted -1402925745 1506615505
-Dies führt zu einem optionalen Zeilenumbruch nach 
-\emph on
-allen
-\emph default
- Binde- und Gedankenstrichen .
-\change_inserted -1402925745 1506615507
 Die Einstellung erlaubt Zeilenumbrüche nach 
 \emph on
 allen
 \emph default
  Halbgeviert- und Geviertstrichen.
-
-\change_unchanged
  Inkorrekte Zeilenumbrüche müssen verhindert werden, indem man sie in eine
  Makebox packt
 \begin_inset Foot
@@ -17294,34 +16906,14 @@ Objekte
 \end_inset
 
  oder 
-\change_deleted -1402925745 1506615505
-davor
-\change_unchanged
- 
 \series bold
 
 \backslash
 nobreakdash
 \series default
- 
-\change_inserted -1402925745 1506517785
-(
-\change_unchanged
-als \SpecialChar TeX
--Code
-\change_inserted -1402925745 1506517790
-)
-\change_unchanged
- 
-\change_inserted -1402925745 1506517768
-davor
-\change_unchanged
-schreibt
-\change_inserted -1402925745 1506629725
-.
- Beispiele
-\change_unchanged
-:
+ (als \SpecialChar TeX
+-Code) davor schreibt.
+ Beispiele:
 \end_layout
 
 \begin_deeper
@@ -17427,42 +17019,18 @@ Ein inkorrekter Zeilenumbruch wird schnell übersehen, denn
 \begin_inset space ~
 \end_inset
 
-– führt 
-\change_deleted -1402925745 1506541045
-dies
-\change_inserted -1402925745 1506541045
-er
-\change_unchanged
- zu keiner Warnung im \SpecialChar LaTeX
+– führt er zu keiner Warnung im \SpecialChar LaTeX
 -Protokoll.
 \end_layout
 
 \end_deeper
 \begin_layout Enumerate
-
-\change_deleted -1402925745 1506450271
-Diese Einstellung wird ignoriert
-\change_unchanged
- 
-\change_deleted -1402925745 1506615558
-in 
-\change_inserted -1402925745 1506615559
-In 
-\change_unchanged
-Dokumenten, die keine \SpecialChar TeX
--Schriften verwenden
-\change_inserted -1402925745 1506450300
-, wird die Option ignoriert
-\change_unchanged
-.
-\change_inserted -1402925745 1506615723
-
+In Dokumenten, die keine \SpecialChar TeX
+-Schriften verwenden, wird die Option ignoriert.
 \begin_inset Foot
 status open
 
 \begin_layout Plain Layout
-
-\change_inserted -1402925745 1506631269
 Xe\SpecialChar TeX
  bietet die Einstellung 
 \series bold
@@ -17482,45 +17050,13 @@ XeTeXdashbreakstate=0
  im \SpecialChar LaTeX
 -Vorspann kann auf das Verhalten von normalen Halbgeviert- und Geviertstrich
 en umgestellt werden.
-\change_unchanged
-
 \end_layout
 
 \end_inset
 
 
-\change_unchanged
-
 \end_layout
 
-\begin_deeper
-\begin_layout Standard
-
-\change_deleted -1402925745 1506615717
-Xe\SpecialChar TeX
- bietet die Einstellung 
-\series bold
-
-\backslash
-XeTeXdashbreakstate
-\series default
-.
- Die Voreinstellung 
-\begin_inset Newline newline
-\end_inset
-
-
-\series bold
-
-\backslash
-XeTeXdashbreakstate=1
-\series default
- bewirkt, dass normale Striche als Ligaturstriche behandelt werden.
-\change_unchanged
-
-\end_layout
-
-\end_deeper
 \begin_layout Enumerate
 Gedankenstriche in 
 \family typewriter
@@ -17538,11 +17074,6 @@ Schreibmaschinenschrift
 \end_layout
 
 \begin_layout Enumerate
-
-\change_deleted -1402925745 1506616072
-Zeilentrennung wird bei Wörtern verhindert, die neben Bindestrichen und
- Ligaturstrichen stehen
-\change_inserted -1402925745 1506616073
 Bei Wörtern, die an Ligatur-Gedankenstriche grenzen, erfolgt – wie bei zusammeng
 esetzten Wörtern mit Bindestrich – keine automatische Worttrennung (vgl.
  Abschnitt
@@ -17559,51 +17090,21 @@ noprefix "false"
 
 \end_inset
 
-)
-\change_unchanged
-.
+).
 \end_layout
 
 \begin_layout Standard
-
-\change_deleted -1402925745 1506616191
--- und --- wurden in \SpecialChar LyX
-
-\begin_inset space ~
-\end_inset
-
-2.2 als -{}- und -{}-{}- ausgegeben um die Ligatur zu einem Bindestrich zu
- verhindern.
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Bis zu \SpecialChar LyX
-
-\begin_inset space ~
-\end_inset
-
-2.1 wurde -- und --- in \SpecialChar LyX
- unverändert ausgegeben, was zu unterschiedlichem
- Aussehen innerhalb von \SpecialChar LyX
-, dem Text-, HTML- und PDF-Export führte.
-\end_layout
-
-\end_inset
-
- Striche in älteren Dokumenten werden zu normalen Unicode-Strichen konvertiert.
- Dies führte zu Problemen, wie verschiedenen Zeilenumbrüche.
-\change_inserted -1402925745 1506630747
 Seit \SpecialChar LyX
--Version 2.2 werden beim LaTeX-Export -- und ---  als -{}- und -{}-{}-
- ausgegeben um die Ligatur zu einem Halbgeviert- oder Geviertstrich zu verhinder
-n.
+
+\begin_inset space ~
+\end_inset
+
+2.2 werden beim LaTeX-Export -- und --- als -{}- und -{}-{}- ausgegeben um
+ die Ligatur zu einem Halbgeviert- oder Geviertstrich zu verhindern.
 \begin_inset Foot
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -1402925745 1506616138
 Bis zu \SpecialChar LyX
 
 \begin_inset space ~
@@ -17612,17 +17113,15 @@ Bis zu \SpecialChar LyX
 2.1 wurde -- und --- in \SpecialChar LyX
  unverändert ausgegeben, was zu unterschiedlichem
  Aussehen in \SpecialChar LyX
-,  Text- und HTML-Export im Vergleich zu DVI-, PDF-, und Postscript
--Export führte.
+, Text- und HTML-Export im Vergleich zu DVI-, PDF-, und Postscript-
+Export führte.
 \end_layout
 
 \end_inset
 
  Vorkommen in älteren Dokumenten werden in die entsprechenden Unicode-Zeichen
  konvertiert.
- Dies führte in einigen Dokumenten zu  veränderten Zeilenumbrüchen.
-
-\change_unchanged
+ Dies führte in einigen Dokumenten zu veränderten Zeilenumbrüchen.
  Seit \SpecialChar LyX
 
 \begin_inset space ~
@@ -17630,11 +17129,7 @@ Bis zu \SpecialChar LyX
 
 2.3 gibt es die Option 
 \family sans
-Halbgeviert
-\change_inserted -1402925745 1506444134
--
-\change_unchanged
- und Geviertstriche als Ligaturen ausgeben
+Halbgeviert- und Geviertstriche als Ligaturen ausgeben
 \family default
  im Menü 
 \family sans
@@ -17653,95 +17148,49 @@ Schriften
 \begin_inset Newline newline
 \end_inset
 
-
-\change_deleted -1402925745 1506616231
-Beachten Sie die folgenden Effekte von \SpecialChar LyX
-'s Strich-Handhabung:
-\change_inserted -1402925745 1506630883
 Beachten Sie die folgenden Nebeneffekte der Änderungen:
-\change_unchanged
-
 \end_layout
 
 \begin_layout Itemize
-Falls Sie gewöhnliche 
-\change_deleted -1402925745 1506444186
-Binde- und
-\change_unchanged
- Gedankenstriche in Dokumenten älter als \SpecialChar LyX
+Falls Sie gewöhnliche Gedankenstriche in Dokumenten älter als \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.2 
-\change_inserted -1402925745 1506444170
-verwendet 
-\change_unchanged
-haben, müssen Sie die Option manuell ausschalten um sicherzustellen, dass
- diese 
-\change_deleted -1402925745 1506616259
-Striche nicht verändert
-\change_inserted -1402925745 1506616260
-Dokumente  unverändert ausgegeben
-\change_unchanged
- werden.
-\change_inserted -1402925745 1506596821
-
+2.2 verwendet haben, müssen Sie die Option manuell ausschalten um sicherzustellen
+, dass diese Dokumente unverändert ausgegeben werden.
 \end_layout
 
 \begin_layout Itemize
-
-\change_inserted -1402925745 1506597038
-Falls Sie gewöhliche und Ligatur-Gedankenstriche in älteren Dokumenten parallel
- verwendet haben, müssen möglicherweise einige Zeilenumbrüche individuell
- erlaubt oder unterdrückt werden um das korrekte Verhalten wiederherzustellen.
+Falls Sie gewöhnliche und Ligatur-Gedankenstriche in älteren Dokumenten
+ parallel verwendet haben, müssen möglicherweise einige Zeilenumbrüche individue
+ll erlaubt oder unterdrückt werden um das korrekte Verhalten wiederherzustellen.
 \end_layout
 
 \begin_layout Itemize
-
-\change_deleted -1402925745 1506616325
-Breitenlose Leerzeichen, die in älteren \SpecialChar LyX
--Dokumenten auf normale Binde- und
- Gedankenstriche folgen, werden während der Konversion in das Format von
- \SpecialChar LyX
-
-\begin_inset space ~
-\end_inset
-
-2.3 entfernt.
- Wenn Sie diese als optionale Zeilenumbrüche nach Strichen verwendet haben,
- sollten Sie diese in Leerzeichen 
-\change_inserted -1402925745 1506616365
-Wenn Sie  in älteren \SpecialChar LyX
--Dokumenten  breitenlose Leerzeichen (
+Wenn Sie in älteren \SpecialChar LyX
+-Dokumenten breitenlose Leerzeichen (
 \emph on
-zero width spaces,
+\lang english
+zero width spaces
+\lang ngerman
+,
 \emph default
  ZWSP) als optionale Zeilenumbrüche nach Gedankenstrichen verwendet haben,
- sollten Sie diese in benutzerdefinierte Abstände 
-\change_unchanged
-konvertieren, bevor Sie ihr Dokument mit \SpecialChar LyX
+ sollten Sie diese in benutzerdefinierte Abstände konvertieren, bevor Sie
+ ihr Dokument mit \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
 2.3 öffnen.
- Ansonsten werden die optionale
-\change_inserted -1402925745 1506447533
-n
-\change_unchanged
- Zeilenumbrüche 
-\change_deleted -1402925745 1506631007
-verloren gehen!
-\change_inserted -1402925745 1506631013
-bei der Konversion in das Format von \SpecialChar LyX
+ Ansonsten werden die optionalen Zeilenumbrüche bei der Konversion in das
+ Format von \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
 2.3 entfernt.
-\change_unchanged
-
 \end_layout
 
 \begin_layout Subsection
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 8b7b61ead8..1a32bff0c4 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -16435,7 +16435,11 @@ Rayas
 
 \begin_layout Standard
 En \SpecialChar LyX
-, el carácter 
+, el 
+\lang english
+symbol
+\lang spanish
+ 
 \begin_inset Quotes cld
 \end_inset
 
@@ -16599,15 +16603,31 @@ status collapsed
 \lang english
 On Mac and Linux, the en dash is entered with 
 \family sans
-Option-hyphen
+Opt+
+\begin_inset Quotes eld
+\end_inset
+
+-
+\begin_inset Quotes erd
+\end_inset
+
+
 \family default
  and the em dash with 
 \family sans
-Shift-Option-hyphen
+Shift-Opt+
+\begin_inset Quotes erd
+\end_inset
+
+-
+\begin_inset Quotes erd
+\end_inset
+
+
 \family default
  (
 \family sans
-Option
+Opt
 \family default
  is the Mac label for the right 
 \family sans
@@ -16635,8 +16655,8 @@ unicode-insert
 \end_inset
 
  \SpecialChar LyX
- function with the Unicode code as argument (2013 for the em dash and 2014
- for the en dash).
+ function with the Unicode code point as argument (2013 for the em dash
+ and 2014 for the en dash).
 \end_layout
 
 \end_inset
@@ -16734,6 +16754,31 @@ menos
 
 \end_layout
 
+\begin_layout Standard
+
+\lang english
+Dashes can also be inserted with 
+\family sans
+Insert\SpecialChar menuseparator
+Special
+\begin_inset space ~
+\end_inset
+
+Character\SpecialChar menuseparator
+Symbols
+\family default
+ or the 
+\begin_inset Quotes eld
+\end_inset
+
+unicode-insert
+\begin_inset Quotes erd
+\end_inset
+
+ \SpecialChar LyX
+ function.
+\end_layout
+
 \begin_layout Standard
 Los tipos de guión son distintos del signo menos, que se usa en modo matemático
  y tiene su propia longitud.
@@ -16839,8 +16884,8 @@ name "subsec:Dashes-and-line-breaks"
 \begin_layout Standard
 
 \lang english
-Whether line breaks before or after dashes are allowed depends on the use
- case and locale:
+Whether line breaks around dashes are allowed depends on the use case and
+ locale:
 \end_layout
 
 \begin_layout Itemize
@@ -16852,15 +16897,15 @@ No line breaks are allowed in ranges of values like A–Z or 1975–1982.
 \begin_layout Itemize
 
 \lang english
-In English, lines may break after dashes used to set off parenthetical statement
-s.
+In English, dashes used to set off parenthetical statements should not start
+ a new line.
 \end_layout
 
 \begin_layout Itemize
 
 \lang english
 In French and Spanish, dashes around parenthetical statements are treated
- similar to quote signs and line breaks are not allowed on the left side.
+ similar to brackets: line breaks are not allowed on the inner side.
 \end_layout
 
 \begin_layout Standard
@@ -16874,7 +16919,7 @@ When using spaced en dashes
 \begin_inset space ~
 \end_inset
 
-- line breaks before the dash with protected spaces are not allowed.
+- line breaks before the dash can be prevented with protected spaces.
 \end_layout
 
 \begin_layout Standard
@@ -16934,7 +16979,7 @@ This forces the output of dashes as
 \begin_layout Standard
 
 \lang english
-Subtleties:
+Caution:
 \end_layout
 
 \begin_layout Enumerate
@@ -16974,7 +17019,8 @@ or preceding with
 nobreakdash
 \series default
  in \SpecialChar TeX
- code:
+ code.
+ Examples:
 \end_layout
 
 \begin_deeper
@@ -17094,10 +17140,10 @@ An incorrect line break is easily overlooked because
 \lang english
 The setting is ignored for documents using non-\SpecialChar TeX
  fonts.
-\end_layout
+\begin_inset Foot
+status collapsed
 
-\begin_deeper
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \lang english
 Xe\SpecialChar TeX
@@ -17108,20 +17154,24 @@ Xe\SpecialChar TeX
 XeTeXdashbreakstate
 \series default
  setting.
- The default,
-\begin_inset Newline newline
-\end_inset
-
-
+ The default causes dashes to behave like ligature dashes.
+ The usual behaviour of literal dashes can be achieved by inserting 
+\family typewriter
 \series bold
 
 \backslash
-XeTeXdashbreakstate=1
+XeTeXdashbreakstate=0
+\family default
 \series default
- causes literal dashes to behave like ligature dashes.
+ into the \SpecialChar LaTeX
+ preamble.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
-\end_deeper
 \begin_layout Enumerate
 
 \lang english
@@ -17149,17 +17199,13 @@ Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
 \begin_layout Standard
 
 \lang english
-In \SpecialChar LyX
+Since \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.2 -- and --- were in \SpecialChar LyX
-
-\begin_inset space ~
-\end_inset
-
-2.3 output as -{}- and -{}-{}- to prevent ligation to dashes.
+2.2, -- and --- are exported to LaTeX as -{}- and -{}-{}- to prevent ligation
+ to dashes.
 \begin_inset Foot
 status collapsed
 
@@ -17171,22 +17217,21 @@ Up to \SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.1 -- and --- in \SpecialChar LyX
- was output unchanged which led to different look in the
- within \SpecialChar LyX
-, text export, HTML export and the PDF export.
+2.1, -- and --- was output unchanged which led to different look in \SpecialChar LyX
+, text
+ export, HTML export and the PDF export.
 \end_layout
 
 \end_inset
 
  Occurrences in older documents are converted to literal Unicode dashes.
- This lead to problems like different line breaks.
- Since \SpecialChar LyX
+ This led to different line breaks in some documents.
+ \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.3 there is the option 
+2.3 provides the option 
 \family sans
 Output en- and em-dashes as ligatures
 \family default
@@ -17206,8 +17251,8 @@ Fonts.
 \begin_inset Newline newline
 \end_inset
 
-Note the following side-effects of the \SpecialChar LyX
- dash handling:
+Note the following side-effects of the changes in \SpecialChar LyX
+'s dash handling:
 \end_layout
 
 \begin_layout Itemize
@@ -17218,8 +17263,24 @@ If you used literal em- and en dashes in pre-\SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.2 documents, you must manually unselect the option to ensure unchanged
- behavior.
+2.2 documents, you must manually unselect 
+\family sans
+Output en- and em-dashes as ligatures
+\family default
+ to ensure unchanged behavior.
+ 
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+If you used both, literal and ligature dashes in pre-\SpecialChar LyX
+
+\begin_inset space ~
+\end_inset
+
+2.2 documents, you may need to enable or prevent individual line breaks as
+ shown above to restore the correct line breaking behaviour.
 \end_layout
 
 \begin_layout Itemize
@@ -17239,7 +17300,7 @@ Zero-width space (ZWSP) characters in older \SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.3 or the optional line breaks will be lost!
+2.3 or the optional line breaks will be lost.
 \end_layout
 
 \begin_layout Subsection
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index a4945f95af..e0e315ad91 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -17323,7 +17323,11 @@ Tirets
 
 \begin_layout Standard
 Dans \SpecialChar LyX
-, le caractère 
+, le 
+\lang english
+symbol
+\lang french
+ 
 \begin_inset Quotes cld
 \end_inset
 
@@ -17521,15 +17525,31 @@ status collapsed
 \lang english
 On Mac and Linux, the en dash is entered with 
 \family sans
-Option-hyphen
+Opt+
+\begin_inset Quotes eld
+\end_inset
+
+-
+\begin_inset Quotes erd
+\end_inset
+
+
 \family default
  and the em dash with 
 \family sans
-Shift-Option-hyphen
+Shift-Opt+
+\begin_inset Quotes erd
+\end_inset
+
+-
+\begin_inset Quotes erd
+\end_inset
+
+
 \family default
  (
 \family sans
-Option
+Opt
 \family default
  is the Mac label for the right 
 \family sans
@@ -17561,8 +17581,8 @@ unicode-insert
 \end_inset
 
  \SpecialChar LyX
- function with the Unicode code as argument (2013 for the em dash and 2014
- for the en dash).
+ function with the Unicode code point as argument (2013 for the em dash
+ and 2014 for the en dash).
 \end_layout
 
 \end_inset
@@ -17683,6 +17703,31 @@ signe moins
 
 \end_layout
 
+\begin_layout Standard
+
+\lang english
+Dashes can also be inserted with 
+\family sans
+Insert\SpecialChar menuseparator
+Special
+\begin_inset space ~
+\end_inset
+
+Character\SpecialChar menuseparator
+Symbols
+\family default
+ or the 
+\begin_inset Quotes eld
+\end_inset
+
+unicode-insert
+\begin_inset Quotes erd
+\end_inset
+
+ \SpecialChar LyX
+ function.
+\end_layout
+
 \begin_layout Standard
 Les types de tiret sont distincts du signe moins, qui apparaît en mode math
  et a une longueur différente.
@@ -17775,8 +17820,8 @@ name "subsec:Dashes-and-line-breaks"
 \begin_layout Standard
 
 \lang english
-Whether line breaks before or after dashes are allowed depends on the use
- case and locale:
+Whether line breaks around dashes are allowed depends on the use case and
+ locale:
 \end_layout
 
 \begin_layout Itemize
@@ -17788,15 +17833,15 @@ No line breaks are allowed in ranges of values like A–Z or 1975–1982.
 \begin_layout Itemize
 
 \lang english
-In English, lines may break after dashes used to set off parenthetical statement
-s.
+In English, dashes used to set off parenthetical statements should not start
+ a new line.
 \end_layout
 
 \begin_layout Itemize
 
 \lang english
 In French and Spanish, dashes around parenthetical statements are treated
- similar to quote signs and line breaks are not allowed on the left side.
+ similar to brackets: line breaks are not allowed on the inner side.
 \end_layout
 
 \begin_layout Standard
@@ -17810,7 +17855,7 @@ When using spaced en dashes
 \begin_inset space ~
 \end_inset
 
-- line breaks before the dash with protected spaces are not allowed.
+- line breaks before the dash can be prevented with protected spaces.
 \end_layout
 
 \begin_layout Standard
@@ -17870,7 +17915,7 @@ This forces the output of dashes as
 \begin_layout Standard
 
 \lang english
-Subtleties:
+Caution:
 \end_layout
 
 \begin_layout Enumerate
@@ -17910,7 +17955,8 @@ or preceding with
 nobreakdash
 \series default
  in \SpecialChar TeX
- code:
+ code.
+ Examples:
 \end_layout
 
 \begin_deeper
@@ -18028,10 +18074,10 @@ An incorrect line break is easily overlooked because
 \lang english
 The setting is ignored for documents using non-\SpecialChar TeX
  fonts.
-\end_layout
+\begin_inset Foot
+status collapsed
 
-\begin_deeper
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \lang english
 Xe\SpecialChar TeX
@@ -18042,20 +18088,24 @@ Xe\SpecialChar TeX
 XeTeXdashbreakstate
 \series default
  setting.
- The default,
-\begin_inset Newline newline
-\end_inset
-
-
+ The default causes dashes to behave like ligature dashes.
+ The usual behaviour of literal dashes can be achieved by inserting 
+\family typewriter
 \series bold
 
 \backslash
-XeTeXdashbreakstate=1
+XeTeXdashbreakstate=0
+\family default
 \series default
- causes literal dashes to behave like ligature dashes.
+ into the \SpecialChar LaTeX
+ preamble.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
-\end_deeper
 \begin_layout Enumerate
 
 \lang english
@@ -18083,17 +18133,13 @@ Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
 \begin_layout Standard
 
 \lang english
-In \SpecialChar LyX
+Since \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.2 -- and --- were in \SpecialChar LyX
-
-\begin_inset space ~
-\end_inset
-
-2.3 output as -{}- and -{}-{}- to prevent ligation to dashes.
+2.2, -- and --- are exported to LaTeX as -{}- and -{}-{}- to prevent ligation
+ to dashes.
 \begin_inset Foot
 status collapsed
 
@@ -18105,22 +18151,21 @@ Up to \SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.1 -- and --- in \SpecialChar LyX
- was output unchanged which led to different look in the
- within \SpecialChar LyX
-, text export, HTML export and the PDF export.
+2.1, -- and --- was output unchanged which led to different look in \SpecialChar LyX
+, text
+ export, HTML export and the PDF export.
 \end_layout
 
 \end_inset
 
  Occurrences in older documents are converted to literal Unicode dashes.
- This lead to problems like different line breaks.
- Since \SpecialChar LyX
+ This led to different line breaks in some documents.
+ \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.3 there is the option 
+2.3 provides the option 
 \family sans
 Output en- and em-dashes as ligatures
 \family default
@@ -18140,8 +18185,8 @@ Fonts.
 \begin_inset Newline newline
 \end_inset
 
-Note the following side-effects of the \SpecialChar LyX
- dash handling:
+Note the following side-effects of the changes in \SpecialChar LyX
+'s dash handling:
 \end_layout
 
 \begin_layout Itemize
@@ -18152,8 +18197,24 @@ If you used literal em- and en dashes in pre-\SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.2 documents, you must manually unselect the option to ensure unchanged
- behavior.
+2.2 documents, you must manually unselect 
+\family sans
+Output en- and em-dashes as ligatures
+\family default
+ to ensure unchanged behavior.
+ 
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+If you used both, literal and ligature dashes in pre-\SpecialChar LyX
+
+\begin_inset space ~
+\end_inset
+
+2.2 documents, you may need to enable or prevent individual line breaks as
+ shown above to restore the correct line breaking behaviour.
 \end_layout
 
 \begin_layout Itemize
@@ -18173,7 +18234,7 @@ Zero-width space (ZWSP) characters in older \SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.3 or the optional line breaks will be lost!
+2.3 or the optional line breaks will be lost.
 \end_layout
 
 \begin_layout Subsection
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 0181513163..66ce688e07 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -13852,15 +13852,31 @@ status collapsed
 \lang english
 On Mac and Linux, the en dash is entered with 
 \family sans
-Option-hyphen
+Opt+
+\begin_inset Quotes eld
+\end_inset
+
+-
+\begin_inset Quotes erd
+\end_inset
+
+
 \family default
  and the em dash with 
 \family sans
-Shift-Option-hyphen
+Shift-Opt+
+\begin_inset Quotes erd
+\end_inset
+
+-
+\begin_inset Quotes erd
+\end_inset
+
+
 \family default
  (
 \family sans
-Option
+Opt
 \family default
  is the Mac label for the right 
 \family sans
@@ -13889,8 +13905,8 @@ unicode-insert
 \end_inset
 
  \SpecialChar LyX
- function with the Unicode code as argument (2013 for the em dash and 2014
- for the en dash).
+ function with the Unicode code point as argument (2013 for the em dash
+ and 2014 for the en dash).
 \end_layout
 
 \end_inset
@@ -14000,6 +14016,31 @@ system key combination or
 
 \end_layout
 
+\begin_layout Standard
+
+\lang english
+Dashes can also be inserted with 
+\family sans
+Insert\SpecialChar menuseparator
+Special
+\begin_inset space ~
+\end_inset
+
+Character\SpecialChar menuseparator
+Symbols
+\family default
+ or the 
+\begin_inset Quotes eld
+\end_inset
+
+unicode-insert
+\begin_inset Quotes erd
+\end_inset
+
+ \SpecialChar LyX
+ function.
+\end_layout
+
 \begin_layout Standard
 これらつのダッシュは，それ独自の長さを持つ，数式モードのマイナス記号とは異なります．「
 \family typewriter
@@ -14082,8 +14123,8 @@ name "subsec:Dashes-and-line-breaks"
 \begin_layout Standard
 
 \lang english
-Whether line breaks before or after dashes are allowed depends on the use
- case and locale:
+Whether line breaks around dashes are allowed depends on the use case and
+ locale:
 \end_layout
 
 \begin_layout Itemize
@@ -14095,15 +14136,15 @@ No line breaks are allowed in ranges of values like A–Z or 1975–1982.
 \begin_layout Itemize
 
 \lang english
-In English, lines may break after dashes used to set off parenthetical statement
-s.
+In English, dashes used to set off parenthetical statements should not start
+ a new line.
 \end_layout
 
 \begin_layout Itemize
 
 \lang english
 In French and Spanish, dashes around parenthetical statements are treated
- similar to quote signs and line breaks are not allowed on the left side.
+ similar to brackets: line breaks are not allowed on the inner side.
 \end_layout
 
 \begin_layout Standard
@@ -14117,7 +14158,7 @@ When using spaced en dashes
 \begin_inset space ~
 \end_inset
 
-- line breaks before the dash with protected spaces are not allowed.
+- line breaks before the dash can be prevented with protected spaces.
 \end_layout
 
 \begin_layout Standard
@@ -14173,7 +14214,7 @@ This forces the output of dashes as
 \begin_layout Standard
 
 \lang english
-Subtleties:
+Caution:
 \end_layout
 
 \begin_layout Enumerate
@@ -14215,7 +14256,8 @@ Objects
 nobreakdash
 \series default
  in \SpecialChar TeX
- code:
+ code.
+ Examples:
 \end_layout
 
 \begin_deeper
@@ -14337,10 +14379,10 @@ An incorrect line break is easily overlooked because
 \lang english
 The setting is ignored for documents using non-\SpecialChar TeX
  fonts.
-\end_layout
+\begin_inset Foot
+status collapsed
 
-\begin_deeper
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \lang english
 Xe\SpecialChar TeX
@@ -14351,20 +14393,24 @@ Xe\SpecialChar TeX
 XeTeXdashbreakstate
 \series default
  setting.
- The default,
-\begin_inset Newline newline
-\end_inset
-
-
+ The default causes dashes to behave like ligature dashes.
+ The usual behaviour of literal dashes can be achieved by inserting 
+\family typewriter
 \series bold
 
 \backslash
-XeTeXdashbreakstate=1
+XeTeXdashbreakstate=0
+\family default
 \series default
- causes literal dashes to behave like ligature dashes.
+ into the \SpecialChar LaTeX
+ preamble.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
-\end_deeper
 \begin_layout Enumerate
 
 \lang english
@@ -14392,17 +14438,13 @@ Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
 \begin_layout Standard
 
 \lang english
-In \SpecialChar LyX
+Since \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.2 -- and --- were in \SpecialChar LyX
-
-\begin_inset space ~
-\end_inset
-
-2.3 output as -{}- and -{}-{}- to prevent ligation to dashes.
+2.2, -- and --- are exported to LaTeX as -{}- and -{}-{}- to prevent ligation
+ to dashes.
 \begin_inset Foot
 status collapsed
 
@@ -14414,22 +14456,21 @@ Up to \SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.1 -- and --- in \SpecialChar LyX
- was output unchanged which led to different look in the
- within \SpecialChar LyX
-, text export, HTML export and the PDF export.
+2.1, -- and --- was output unchanged which led to different look in \SpecialChar LyX
+, text
+ export, HTML export and the PDF export.
 \end_layout
 
 \end_inset
 
  Occurrences in older documents are converted to literal Unicode dashes.
- This lead to problems like different line breaks.
- Since \SpecialChar LyX
+ This led to different line breaks in some documents.
+ \SpecialChar LyX
 
 \begin_inset space ~
 \end_inset
 
-2.3 there is the option 
+2.3 provides the option 
 \family sans
 Output en- and em-dashes as ligatures
 \family default
@@ -14449,8 +14490,8 @@ Fonts.
 \begin_inset Newline newline
 \end_inset
 
-Note the following side-effects of the \SpecialChar LyX
- dash handling:
+Note the following side-effects of the changes in \SpecialChar LyX
+'s dash handling:
 \end_layout
 
 \begin_layout Itemize
@@ -14461,8 +14502,24 @@ If you used literal em- and en dashes in pre-\SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.2 documents, you must manually unselect the option to ensure unchanged
- behavior.
+2.2 documents, you must manually unselect 
+\family sans
+Output en- and em-dashes as ligatures
+\family default
+ to ensure unchanged behavior.
+ 
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+If you used both, literal and ligature dashes in pre-\SpecialChar LyX
+
+\begin_inset space ~
+\end_inset
+
+2.2 documents, you may need to enable or prevent individual line breaks as
+ shown above to restore the correct line breaking behaviour.
 \end_layout
 
 \begin_layout Itemize
@@ -14482,7 +14539,7 @@ Zero-width space (ZWSP) characters in older \SpecialChar LyX
 \begin_inset space ~
 \end_inset
 
-2.3 or the optional line breaks will be lost!
+2.3 or the optional line breaks will be lost.
 \end_layout
 
 \begin_layout Subsection