X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fdoc%2FMergedManuals.lyx;h=b385169c5c49e1e76f238e58a1bc74bda750482d;hb=ecf2b9f0919a1526c04db67f0039e162964aeac8;hp=f2a189402ad7f845833074fd4891f704fab87f5b;hpb=2050166a1839b726d417e7924ef9b1fb777faffa;p=lyx.git

diff --git a/lib/doc/MergedManuals.lyx b/lib/doc/MergedManuals.lyx
index f2a189402a..b385169c5c 100644
--- a/lib/doc/MergedManuals.lyx
+++ b/lib/doc/MergedManuals.lyx
@@ -1,25 +1,37 @@
-#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 382
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 474
 \begin_document
 \begin_header
-\textclass article
+\textclass book
 \use_default_options false
+\begin_modules
+theorems-ams
+theorems-ams-extended
+logicalmkup
+customHeadersFooters
+enumitem
+multicol
+shapepar
+initials
+\end_modules
 \maintain_unincluded_children false
 \language english
+\language_package default
 \inputencoding auto
 \fontencoding global
 \font_roman lmodern
 \font_sans default
 \font_typewriter default
+\font_math auto
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
-
 \graphics default
-\default_output_format default
+\default_output_format xhtml
+\output_sync 0
 \bibtex_command default
 \index_command default
 \paperfontsize default
@@ -27,14 +39,25 @@
 \use_hyperref false
 \papersize default
 \use_geometry false
-\use_amsmath 1
-\use_esint 1
-\use_mhchem 1
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 0
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
 \cite_engine basic
+\cite_engine_type default
+\biblio_style plain
 \use_bibtopic false
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\justification true
+\use_refstyle 0
 \index Index
 \shortcut idx
 \color #008000
@@ -49,7 +72,8 @@
 \paperpagestyle default
 \tracking_changes false
 \output_changes false
-\html_math_output 0
+\html_math_output 2
+\html_css_as_file 0
 \html_be_strict true
 \end_header
 
@@ -68,6 +92,19 @@ This template is just to get full html version of our manuals to the web.
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset CommandInset toc
+LatexCommand tableofcontents
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Part
+Intro Manual
+\end_layout
+
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
@@ -78,6 +115,10 @@ filename "Intro.lyx"
 
 \end_layout
 
+\begin_layout Part
+Tutorial Manual
+\end_layout
+
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
@@ -88,6 +129,10 @@ filename "Tutorial.lyx"
 
 \end_layout
 
+\begin_layout Part
+User Guide
+\end_layout
+
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
@@ -98,6 +143,10 @@ filename "UserGuide.lyx"
 
 \end_layout
 
+\begin_layout Part
+Additional Features Manual
+\end_layout
+
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
@@ -108,6 +157,10 @@ filename "Additional.lyx"
 
 \end_layout
 
+\begin_layout Part
+Embeddeded Features Manual
+\end_layout
+
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
@@ -118,6 +171,10 @@ filename "EmbeddedObjects.lyx"
 
 \end_layout
 
+\begin_layout Part
+Math Manual
+\end_layout
+
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
@@ -128,6 +185,10 @@ filename "Math.lyx"
 
 \end_layout
 
+\begin_layout Part
+Customization Manual
+\end_layout
+
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
@@ -138,6 +199,10 @@ filename "Customization.lyx"
 
 \end_layout
 
+\begin_layout Part
+LyX Functions Manual
+\end_layout
+
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
@@ -149,6 +214,10 @@ filename "LFUNs.lyx"
 \end_layout
 
 \begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand include
 filename "../examples/linguistics.lyx"
@@ -158,7 +227,7 @@ filename "../examples/linguistics.lyx"
 
 \end_layout
 
-\begin_layout Standard
+\begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand include
 filename "../lib/examples/xypic.lyx"
@@ -166,6 +235,11 @@ filename "../lib/examples/xypic.lyx"
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \end_body