commit 6a1d8ef917361574251ff596b08cdcc3cc09e2b1
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sun May 12 09:26:53 2019 +0200

    Doc updates
---
 lib/RELEASE-NOTES        |    5 +-
 lib/doc/UserGuide.lyx    |  100 ++++++++++++++++++++++++++--------------------
 lib/doc/de/UserGuide.lyx |   91 ++++++++++++++++++++---------------------
 3 files changed, 103 insertions(+), 93 deletions(-)

diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES
index bc677ac..837bc6d 100644
--- a/lib/RELEASE-NOTES
+++ b/lib/RELEASE-NOTES
@@ -11,10 +11,11 @@
 !!Documents compilation process and images conversion
 
 * LyX now uses utf8 encoding per default for all languages. This does not 
affect
-  existing documents. Note that LyX also does not touch personal defaults.
+  existing documents. Note that LyX also does not touch personal defaults and 
templates.
   That is to say, if you still see traditional encoding preset for new 
documents,
   you can change that by selecting "Unicode (utf8) [default]" and hitting "Save
-  as Documents Defaults" afterwards.
+  as Documents Defaults" afterwards. Your personal templates need to be 
changed manually
+  if desired.
 
 * LyX defaults to the "HE8" LaTeX font encoding with Hebrew if the
   "Culmus" LaTeX fonts are installed. 
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 47e300e..3fcb051 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -45424,7 +45424,7 @@ ASCII
 
 \begin_layout Standard
 
-\change_inserted -712698321 1557596040
+\change_inserted -712698321 1557645585
 Finally, you can also select 
 \family sans
 Custom
@@ -45435,9 +45435,54 @@ Custom
 any
 \emph default
  language.
- The custom list (which is spelled out below) consists of traditional 
encodings,
- some special cases of Unicode as well as some other special cases for specific
- purposes (see explanation below).
+ The custom list (which is spelled out below) consists of traditional encodings
+ and some special cases of Unicode for specific purposes (see explanation
+ below).
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1557645268
+The 
+\family sans
+Do not load inputenc
+\family default
+ checkbox does what it states: It prevents \SpecialChar LyX
+ from automatically loading the
+ \SpecialChar LaTeX
+-package 
+\series bold
+inputenc
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1557645185
+\SpecialChar LaTeX
+ packages ! inputenc
+\end_layout
+
+\end_inset
+
+.
+ This option might be useful if you use a class or package that pre-loads
+ inputenc or if inputenc must not be used for some reason.
+ When using this, you probably need to load some additional packages manually
+ in the preamble and specify the used encoding for text parts in foreign
+ languages in \SpecialChar TeX
+ code.
+ Note that this option is only available for the standard 
+\family sans
+Unicode
+\family default
+ and 
+\family sans
+Traditional (auto-selected)
+\family default
+ encodings.
 \change_unchanged
 
 \end_layout
@@ -45649,44 +45694,22 @@ Here is a list with the important encodings:
 
 \begin_layout Description
 
-\change_deleted -712698321 1557595809
+\change_deleted -712698321 1557645284
 Language
 \begin_inset space ~
 \end_inset
 
 Default
-\change_inserted -712698321 1557595810
-Traditional
-\change_unchanged
-
 \begin_inset space ~
 \end_inset
 
-(
-\change_deleted -712698321 1557595824
-no
+(no
 \begin_inset space ~
 \end_inset
 
-
-\change_unchanged
-inputenc
-\change_inserted -712698321 1557595828
- 
-\family sans
-not loaded
-\change_unchanged
-
-\family default
-) Same as 
-\change_deleted -712698321 1557595854
-
+inputenc) Same as 
 \family sans
 Language Default
-\change_inserted -712698321 1557595854
-Traditional (auto-selected)
-\change_unchanged
-
 \family default
 , but the \SpecialChar LaTeX
 -package 
@@ -45704,24 +45727,13 @@ status collapsed
 
 \end_inset
 
- is not 
-\change_deleted -712698321 1557595861
-used
-\change_inserted -712698321 1557595879
-loaded by \SpecialChar LyX
-
-\change_unchanged
-.
- 
-\change_inserted -712698321 1557595897
-This selection might be useful if you use a class or package that pre-loads
- inputenc or if inputenc must not be used for some reason.
- 
-\change_unchanged
-When using this, you probably need to load some additional packages manually
+ is not used.
+ When using this, you probably need to load some additional packages manually
  in the preamble and specify the used encoding for text parts in foreign
  languages in \SpecialChar TeX
  code.
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 72dd29f..b5a4c58 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -43254,12 +43254,54 @@ alle
 \emph default
  Sprachen verwendet wird.
  Die Liste mit den benutzerdefinierten Optionen (die weiter unten genauer
- erläutert wird) besteht aus traditionellen Kodierungen, einigen Spezialfällen
- für Unicode sowie anderen Spezialfällen für bestimmte Zwecke (vgl.
+ erläutert wird) besteht aus traditionellen Kodierungen und einigen 
Unicode-Sond
+erformen für bestimmte Zwecke (vgl.
  die Erläuterungen unten).
 \end_layout
 
 \begin_layout Standard
+Die Option 
+\family sans
+Inputenc nicht laden
+\family default
+ macht genau das, was sie sagt: Sie hindert \SpecialChar LyX
+ daran, das \SpecialChar LaTeX
+-Paket 
+\series bold
+inputenc
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+\SpecialChar LaTeX
+-Paket ! inputenc
+\end_layout
+
+\end_inset
+
+ automatisch zu laden.
+ Diese Option kann nützlich sein, wenn Sie eine Klasse oder ein Paket 
verwenden,
+ welches inputenc selbst lädt, oder wenn inputenc aus irgend einem Grund
+ nicht verwendet werden kann.
+ Wenn Sie diese Option aktivieren, müssen Sie wahrscheinlich zusätzliche
+ Pakete im \SpecialChar LaTeX
+-Vorspann manuell laden und auch die Kodierung für fremdsprachige
+ Texte durch \SpecialChar TeX
+-Code selbst angeben.
+ Beachten Sie, dass diese Option nur für die Standard-
+\family sans
+Unicode
+\family default
+-Kodierung und für 
+\family sans
+Traditionell (automatisch gewählt)
+\family default
+ zur Verfügung steht.
+\end_layout
+
+\begin_layout Standard
 Das 
 \family sans
 Sprachpaket
@@ -43378,51 +43420,6 @@ Hier ist eine Liste mit den wichtigen Kodierungen:
 \end_layout
 
 \begin_layout Description
-Traditionell,
-\begin_inset space ~
-\end_inset
-
-lade
-\begin_inset space ~
-\end_inset
-
-inputenc
-\begin_inset space ~
-\end_inset
-
-nicht Dasselbe wie 
-\family sans
-Traditionell (automatisch gewählt)
-\family default
-, das \SpecialChar LaTeX
--Paket 
-\series bold
-inputenc
-\series default
-
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-\SpecialChar LaTeX
--Paket ! inputenc
-\end_layout
-
-\end_inset
-
- wird jedoch nicht von \SpecialChar LyX
- geladen.
- Diese Option kann nützlich sein, wenn Sie eine Klasse oder ein Paket 
verwenden,
- welches inputenc selbst lädt, oder wenn inputenc aus irgend einem Grund
- nicht verwendet werden kann.
- Wenn Sie dies verwenden, müssen Sie wahrscheinlich zusätzliche Pakete im
- \SpecialChar LaTeX
--Vorspann manuell laden und auch die Kodierung für fremdsprachige Texte
- durch \SpecialChar TeX
--Code selbst angeben.
-\end_layout
-
-\begin_layout Description
 ASCII die ASCII-Kodierung umfasst nur die im Standard-Englischen gebrauchten
  Zeichen ab (7-bit ASCII).
  \SpecialChar LyX

Reply via email to