X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fdoc%2FUserGuide.lyx;h=c278f6957b48f9de890ad721735154cc841e8fbd;hb=8be71ab8e20c7299c9ff4e986184d7d32abeb2a3;hp=e57d1e7f865291ccd27e50e61ba951140780a0dd;hpb=bf21947af25156d74c4d10d665384cbb6c93b305;p=lyx.git

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index e57d1e7f86..c278f6957b 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -833,8 +833,8 @@ name "sec:Basic-Editing-Features"
 
 \begin_layout Standard
 Like most modern word processors, LyX can perform cut and paste operations
- on blocks of text, can move by character, word, or screenful of text, and
- can delete whole words as well as individual characters.
+ on blocks of text, can move by character, word, or page of text, and can
+ delete whole words as well as individual characters.
  The next four sections cover the basic LyX editing features and how to
  access them.
  We'll start with cut and paste.
@@ -1239,7 +1239,7 @@ Undo
 Edit\SpecialChar \menuseparator
 Redo
 \family default
- ot the toolbar button 
+ or the toolbar button 
 \begin_inset Graphics
 	filename ../images/redo.png
 	BoundingBox 0bp 5bp 20bp 20bp
@@ -2002,7 +2002,7 @@ LyX Basics
 status collapsed
 
 \begin_layout Plain Layout
-Lyx@LyX ! Basics
+LyX ! Basics
 \end_layout
 
 \end_inset
@@ -2172,7 +2172,7 @@ broadway Layout for writing plays.
 \end_layout
 
 \begin_layout Description
-curiculum
+curriculum
 \begin_inset space ~
 \end_inset
 
@@ -3046,7 +3046,7 @@ fancyhdr
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! fancyhdr
+LaTeX-packages ! fancyhdr
 \end_layout
 
 \end_inset
@@ -3552,7 +3552,7 @@ setspace
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! setspace
+LaTeX-packages ! setspace
 \end_layout
 
 \end_inset
@@ -4426,7 +4426,7 @@ You can use labels and cross-references to refer to their numbers.
 \end_layout
 
 \begin_layout Subsection
-Quotes and Poetryline spacing
+Quotes and Poetry line spacing
 \end_layout
 
 \begin_layout Standard
@@ -4780,7 +4780,7 @@ not
 Standard
 \family default
  but keeps the current environment and creates a new list item.
- The nesting depth is herby kept.
+ The nesting depth is hereby kept.
  If you want to keep the paragraph environment but reset the current nesting
  depth, you can use 
 \family sans
@@ -5366,7 +5366,7 @@ List
 status collapsed
 
 \begin_layout Plain Layout
-Lists ! Lyx@LyX list
+Lists ! LyX list
 \end_layout
 
 \end_inset
@@ -9462,7 +9462,7 @@ hphantom
 \series bold
 vphantom
 \series default
-, but this too special for the LyX Userguide.
+, but this too special for the LyX User Guide.
  If you are interested in knowing more about this, have a look at 
 \begin_inset CommandInset citation
 LatexCommand cite
@@ -10438,7 +10438,7 @@ aeguill
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! aeguill
+LaTeX-packages ! aeguill
 \end_layout
 
 \end_inset
@@ -10542,16 +10542,14 @@ serif
 \end_inset
 
 : 
-\family sans
-Times
-\begin_inset space ~
-\end_inset
-
-Roman
+\family typewriter
+Times Roman
 \family default
  as roman font,
 \family sans
- Helvetica
+ 
+\family typewriter
+Helvetica
 \family default
  scaled to 92 or 95
 \begin_inset space \thinspace{}
@@ -10562,7 +10560,7 @@ Roman
 \end_inset
 
 serif font, and 
-\family sans
+\family typewriter
 courier
 \family default
  as typewriter font.
@@ -10597,23 +10595,15 @@ reference "sub:Fine-Tuning-with-the"
 \end_inset
 
 The font 
-\family sans
-Times
-\begin_inset space ~
-\end_inset
-
-Roman
+\family typewriter
+Times Roman
 \family default
  was originally designed for newspapers.
  That means its glyphs are smaller than the one from other fonts to fit
  into the small newspaper columns.
  Therefore 
-\family sans
-Times
-\begin_inset space ~
-\end_inset
-
-Roman
+\family typewriter
+Times Roman
 \family default
  is not the optimal choice for larger documents like books.
 \end_layout
@@ -10661,7 +10651,7 @@ cm
 \family default
  and 
 \family typewriter
-ce
+ec
 \family default
 .
 \end_layout
@@ -12759,7 +12749,7 @@ LaTeX
 status collapsed
 
 \begin_layout Plain Layout
-File formats ! Latex@LaTeX
+File formats ! LaTeX
 \end_layout
 
 \end_inset
@@ -12942,7 +12932,7 @@ pstricks
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! pstricks
+LaTeX-packages ! pstricks
 \end_layout
 
 \end_inset
@@ -13710,7 +13700,7 @@ babel
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! babel
+LaTeX-packages ! babel
 \end_layout
 
 \end_inset
@@ -14570,7 +14560,7 @@ LyX's Proper Names
 status collapsed
 
 \begin_layout Plain Layout
-Lyx@LyX ! Proper names
+LyX ! Proper names
 \end_layout
 
 \end_inset
@@ -15552,7 +15542,7 @@ export
 \family default
  is explained in the 
 \emph on
-EmbeddedObjects
+Embedded Objects
 \emph default
  manual in section 
 \emph on
@@ -19174,6 +19164,17 @@ This is a multiline entry in a table.
 \begin_layout Standard
 Cutting and pasting between tables and table cells works reasonably well.
  You can cut and paste even more than one row.
+\begin_inset Foot
+status open
+
+\begin_layout Plain Layout
+Note, that you cannot paste into a multicell selection because it would
+ not be clear what to do when pasting a single word in a selected 2×3.
+ 
+\end_layout
+
+\end_inset
+
  Selection with the mouse or with 
 \family sans
 Shift
@@ -20165,7 +20166,7 @@ wrapfig
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! wrapfig
+LaTeX-packages ! wrapfig
 \end_layout
 
 \end_inset
@@ -24092,7 +24093,7 @@ Note:
 \series default
  that you can only print capital letters in the typefaces 
 \family sans
-Blackbold
+Blackboard
 \family default
  and 
 \family sans
@@ -24125,7 +24126,7 @@ N
 
  in 
 \family sans
-Blackbold
+Blackboard
 \family default
  denotes the set of numbers:
 \begin_inset Formula \[
@@ -24884,7 +24885,7 @@ prettyref
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! prettyref
+LaTeX-packages ! prettyref
 \end_layout
 
 \end_inset
@@ -26771,7 +26772,7 @@ nomencl
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! nomencl
+LaTeX-packages ! nomencl
 \end_layout
 
 \end_inset
@@ -27827,7 +27828,7 @@ hyperref
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! hyperref
+LaTeX-packages ! hyperref
 \end_layout
 
 \end_inset
@@ -28093,7 +28094,7 @@ The LaTeX Syntax
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX Syntax
+LaTeX Syntax
 \end_layout
 
 \end_inset
@@ -28156,7 +28157,7 @@ caption
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! caption
+LaTeX-packages ! caption
 \end_layout
 
 \end_inset
@@ -28343,7 +28344,7 @@ preview-latex
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! preview-latex
+LaTeX-packages ! preview-latex
 \end_layout
 
 \end_inset
@@ -29383,7 +29384,7 @@ dvipost
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! dvipost
+LaTeX-packages ! dvipost
 \end_layout
 
 \end_inset
@@ -35363,7 +35364,7 @@ tipa
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! tipa
+LaTeX-packages ! tipa
 \end_layout
 
 \end_inset
@@ -36146,7 +36147,7 @@ Date
 
 \begin_layout Standard
 Inserts the actual date.
- The format dependends on the date format of the language that is used for
+ The format depends on the date format of the language that is used for
  LyX's menus.
  LyX offers another ways to insert a date which is explained in section
  
@@ -36625,7 +36626,7 @@ LyX also supports Unicode output, which is particularly useful if you need
 use language's default encoding
 \family default
  (when LyX uses it's list of known LaTeX-commands), but does not work with
- a fixed utf8 encoding (when the list of known LaTeX-commands is ot used,
+ a fixed utf8 encoding (when the list of known LaTeX-commands is not used,
  because all unicode symbols can be encoded in utf8).
 \end_layout
 
@@ -36651,7 +36652,7 @@ inputenc
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! inputenc
+LaTeX-packages ! inputenc
 \end_layout
 
 \end_inset
@@ -36776,7 +36777,7 @@ inputenc
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! inputenc
+LaTeX-packages ! inputenc
 \end_layout
 
 \end_inset
@@ -36796,7 +36797,7 @@ ucs
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! ucs
+LaTeX-packages ! ucs
 \end_layout
 
 \end_inset
@@ -36814,7 +36815,7 @@ CJK
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! CJK
+LaTeX-packages ! CJK
 \end_layout
 
 \end_inset
@@ -36876,7 +36877,7 @@ Bibliography
 \end_layout
 
 \begin_layout Standard
-You can specify here a citation style using the Latex@LaTeX-packages 
+You can specify here a citation style using the LaTeX-packages 
 \series bold
 natbib
 \series default
@@ -36885,7 +36886,7 @@ natbib
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! natbib
+LaTeX-packages ! natbib
 \end_layout
 
 \end_inset
@@ -36899,7 +36900,7 @@ jurabib
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! jurabib
+LaTeX-packages ! jurabib
 \end_layout
 
 \end_inset
@@ -36924,7 +36925,7 @@ Math Options
 \end_layout
 
 \begin_layout Standard
-These options will force LyX to use the Latex@LaTeX-packages 
+These options will force LyX to use the LaTeX-packages 
 \series bold
 amsmath
 \series default
@@ -36933,7 +36934,7 @@ amsmath
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! amsmath
+LaTeX-packages ! amsmath
 \end_layout
 
 \end_inset
@@ -36947,7 +36948,7 @@ esint
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! esint
+LaTeX-packages ! esint
 \end_layout
 
 \end_inset
@@ -37163,7 +37164,7 @@ Reconfigure
 status collapsed
 
 \begin_layout Plain Layout
-Lyx@LyX ! Reconfigure|see
+LyX ! Reconfigure|see
 \begin_inset ERT
 status collapsed
 
@@ -40327,7 +40328,7 @@ babel
 \begin_layout Description
 Global When this option is set, the languages used in the document will
  be added as options to the document class options, so that they can be
- used by all Latex@LaTeX-packages.
+ used by all LaTeX-packages.
  Otherwise they will only be used as options for the 
 \series bold
 babel
@@ -40702,7 +40703,7 @@ name "sub:LaTeX-settings"
 status collapsed
 
 \begin_layout Plain Layout
-Settings ! Latex@LaTeX
+Settings ! LaTeX
 \end_layout
 
 \end_inset
@@ -42104,7 +42105,7 @@ caption
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! caption
+LaTeX-packages ! caption
 \end_layout
 
 \end_inset
@@ -42151,7 +42152,7 @@ fancyhdr
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! fancyhdr
+LaTeX-packages ! fancyhdr
 \end_layout
 
 \end_inset
@@ -42202,7 +42203,7 @@ hyperref
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! hyperref
+LaTeX-packages ! hyperref
 \end_layout
 
 \end_inset
@@ -42249,7 +42250,7 @@ nomencl
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! nomencl
+LaTeX-packages ! nomencl
 \end_layout
 
 \end_inset
@@ -42296,7 +42297,7 @@ tipa
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! tipa
+LaTeX-packages ! tipa
 \end_layout
 
 \end_inset
@@ -42343,7 +42344,7 @@ wrapfig
 status collapsed
 
 \begin_layout Plain Layout
-Latex@LaTeX-packages ! wrapfig
+LaTeX-packages ! wrapfig
 \end_layout
 
 \end_inset