* lib/Makefile.am : fix r38245

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

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 43ba7989162bfb46ee25c7b9c07eb6d602f9b1ea..2dfa8e865edc0f91928fbafb657046b2d3dc35a3 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -124,7 +124,7 @@
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes false
+\tracking_changes true
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
@@ -1595,15 +1595,19 @@ With the buttons
 2.4.
  LyX will then automatically renumber the sections to the new order.
  With the buttons 
-\begin_inset Info
-type  "icon"
-arg   "depth-decrement"
+\begin_inset Graphics
+       filename ../images/promote.png
+       scale 85
+       groupId toolbarbuttons
+
 \end_inset
 
  and 
-\begin_inset Info
-type  "icon"
-arg   "depth-increment"
+\begin_inset Graphics
+       filename ../images/demote.png
+       scale 85
+       groupId toolbarbuttons
+
 \end_inset
 
  or the corresponding key bindings 
@@ -13845,14 +13849,74 @@ To get a look at the final version of your document, with all of the page
 \family sans
 View
 \family default
- and choose a file type.
- A viewing program will pop up showing the output.
- For 
+ and choose 
+\change_deleted -712698321 1301225765
+a file type
+\change_inserted -712698321 1301225910
+
+\family sans
+View
+\family default
+ or the toolbar button 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
+\end_inset
+
+
+\change_unchanged
+.
+ A viewing program will pop up showing the output
+\change_inserted -712698321 1301226025
+ in the defined default output format, which is globally set in the preferences
+ (see sec.
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:File-Formats"
+
+\end_inset
+
+) and can also be altered for single documents in the document settings
+ (see sec.
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Doc-Output"
+
+\end_inset
+
+)
+\change_unchanged
+.
+ 
+\change_deleted -712698321 1301226035
+For
+\change_inserted -712698321 1301226047
+Further output formats can be selected via 
+\change_deleted -712698321 1301226049
+ 
+\change_unchanged
+
 \family sans
 View\SpecialChar \menuseparator
+
+\change_deleted -712698321 1301226053
 DVI
+\change_inserted -712698321 1301226055
+Other Formats
+\change_unchanged
+
 \family default
- you can use the toolbar button 
+ 
+\change_deleted -712698321 1301226064
+you can use the toolbar button 
 \begin_inset Graphics
        filename ../images/buffer-view_dvi.png
        scale 85
@@ -13902,7 +13966,19 @@ type  "shortcut"
 arg   "buffer-view ps"
 \end_inset
 
-).
+)
+\change_inserted -712698321 1301226110
+or the toolbar button 
+\begin_inset Graphics
+       filename ../images/view-others.png
+       scale 85
+       groupId toolbarbuttons
+
+\end_inset
+
+
+\change_unchanged
+.
 \end_layout
 
 \begin_layout Standard
@@ -13911,7 +13987,16 @@ If you have changed your document, you can refresh the output in the same
 \family sans
 View\SpecialChar \menuseparator
 Update
+\change_inserted -712698321 1301226188
+
 \family default
+ or 
+\family sans
+View\SpecialChar \menuseparator
+Update (Other Formats)
+\family default
+, respectively
+\change_unchanged
 .
 \end_layout
 
@@ -16765,11 +16850,9 @@ name "sec:Tables"
 
 \begin_layout Standard
 You can insert a table using either the toolbar button 
-\begin_inset Graphics
-       filename ../images/tabular-insert.png
-       scale 85
-       groupId toolbarbuttons
-
+\begin_inset Info
+type  "icon"
+arg   "tabular-insert"
 \end_inset
 
  or the menu 
@@ -39660,11 +39743,9 @@ Graphics
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/tabular-insert.png
-       scale 85
-       groupId toolbarbuttons
-
+\begin_inset Info
+type  "icon"
+arg   "tabular-insert"
 \end_inset
 
 
@@ -40877,7 +40958,7 @@ Synchronize with Output
 
 \change_inserted -712698321 1301219584
 \begin_inset Graphics
-       filename /usr/local/share/lyx/images/view-others.png
+       filename ../images/view-others.png
        scale 85
        groupId toolbarbuttons
 
@@ -40931,7 +41012,7 @@ View (Other Formats)
 
 \change_inserted -712698321 1301219587
 \begin_inset Graphics
-       filename /usr/local/share/lyx/images/update-others.png
+       filename ../images/update-others.png
        scale 85
        groupId toolbarbuttons