UserGuide.lyx: - apply the new version from trunk also to branch, except of Appendix B that follows later, when it is ready.

- for the complete changelog, see my announcement message:
               http://www.mail-archive.com/lyx-docs@lists.lyx.org/msg02847.html

I'm doing this now as I only got boring "well done", "amazing", I like it" etc. messages ;-)
I'm sure some misspellings and typos remains but they could never be avoided. Report me some, and I'll fix them immediately.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19814 a592a061-630c-0410-9148-cb99ea01b6c8

development/Win32/packaging/AltInstaller/Updated.nsh

@@ -9,14 +9,22 @@ Function UpdateModifiedFiles
  File "${PRODUCT_SOURCEDIR}\Resources\CREDITS"
  File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here
  SetOutPath "$INSTDIR\Resources\doc"
+ File /r "${PRODUCT_SOURCEDIR}\Resources\doc\biblio"
+ File /r "${PRODUCT_SOURCEDIR}\Resources\doc\clipart"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\DummyDocument1.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\DummyDocument2.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\TOC.lyx" # must be here when another \doc file has been changed
  File "${PRODUCT_SOURCEDIR}\Resources\doc\UserGuide.lyx"
  SetOutPath "$INSTDIR\Resources\doc\de"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\de\DummyDocument1.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\de\DummyDocument2.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\de\EmbeddedObjects.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Extended.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\de\TOC.lyx" # must be here when another \doc file has been changed
  SetOutPath "$INSTDIR\Resources\doc\es"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\es\DummyDocument1.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\es\DummyDocument2.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\es\TOC.lyx" # must be here when another \doc file has been changed
  SetOutPath "$INSTDIR\Resources\examples\de"

development/scons/SConstruct

@@ -2238,6 +2238,7 @@ if build_install:
             ('bind/pt', lib_bind_pt_files),
             ('bind/sv', lib_bind_sv_files),
             ('doc', lib_doc_files),
+            ('doc/biblio', lib_doc_biblio_files),
             ('doc/clipart', lib_doc_clipart_files),
             ('doc/cs', lib_doc_cs_files),
             ('doc/da', lib_doc_da_files),

development/scons/scons_manifest.py

@@ -2218,23 +2218,41 @@ lib_doc_files = Split('''
 ''')
 
 
+lib_doc_biblio_files = Split('''
+    alphadin.bst
+    LyXDocs.bib
+''')
+
+
 lib_doc_clipart_files = Split('''
+    Abstract.pdf
     BoxInsetDefaultQt4.png
+    ChangesToolbar.png
     ChildDocumentQt4.png
     CommentNoteImageQt4.png
+    ERT.png
     ExternalMaterialQt4.png
+    ExtraToolbar.png
     FramedNoteImageQt4.png
     GreyedOutNoteImageQt4.png
+    LaTeX.png
     LyXNoteImageQt4.png
     ShadedNoteImageQt4.png
+    SpaceMarker.png
+    StandardToolbar.png
+    ToolbarEnvBox.png
     endnotes.pdf
     escher-lsd.eps
     floatQt4.png
     footnoteQt4.png
     labelQt4.png
+    macrobox.png
+    macrouse.png
+    mbox.png
     mobius.eps
     platypus.eps
     referenceQt4.png
+    ViewToolbar.png
     with_fntright.pdf
     without_fntright.pdf
 ''')

lib/doc/Makefile.am

@@ -4,24 +4,41 @@ DISTCLEANFILES += $(tocfiles)
 
 EXTRA_DIST = depend.py doc_toc.py README.Documentation $(DEPENDFILE) $(docfiles)
 
+bibliodocdir = $(pkgdatadir)/doc/biblio
+dist_bibliodoc_DATA = \
+	biblio/alphadin.bst \
+	biblio/LyXDocs.bib
+
 clipartdocdir = $(pkgdatadir)/doc/clipart
 dist_clipartdoc_DATA = \
 	clipart/escher-lsd.eps \
 	clipart/mobius.eps \
 	clipart/platypus.eps \
+	clipart/Abstract.pdf \
 	clipart/BoxInsetDefaultQt4.png \
+	clipart/ChangesToolbar.png \
 	clipart/ChildDocumentQt4.png \
 	clipart/CommentNoteImageQt4.png \
 	clipart/endnotes.pdf \
+	clipart/ERT.png \
 	clipart/ExternalMaterialQt4.png \
+	clipart/ExtraToolbar.png \
 	clipart/floatQt4.png \
 	clipart/footnoteQt4.png \
 	clipart/FramedNoteImageQt4.png \
 	clipart/GreyedOutNoteImageQt4.png \
 	clipart/labelQt4.png \
+	clipart/LaTeX.png \
 	clipart/LyXNoteImageQt4.png \
+	clipart/macrobox.png \
+	clipart/macrouse.png \
+	clipart/mbox.png \
 	clipart/referenceQt4.png \
 	clipart/ShadedNoteImageQt4.png \
+	clipart/SpaceMarker.png \
+	clipart/StandardToolbar.png \
+	clipart/ToolbarEnvBox.png \
+	clipart/ViewToolbar.png \
 	clipart/without_fntright.pdf \
 	clipart/with_fntright.pdf
 

lib/doc/biblio/LyXDocs.bib

@@ -0,0 +1,47 @@
+This file was created with JabRef 2.2.
+Encoding: Cp1252
+
+@MISC{Catalogue,
+  author = {Fenn, Jürgen and Williams, Graham},
+  title = {The TeX Catalogue},
+  howpublished = { \newline Internet: \url{http://www.ctan.org/tex-archive/help/Catalogue/bytopic.html}}
+}
+
+@BOOK{Knuth,
+  title = {The TeXbook},
+  publisher = {Addison-Wesley},
+  year = {1984},
+  author = {Knuth, Donald E.}
+}
+
+@BOOK{Kopka,
+  title = {A Guide to LaTeX Fourth Edition},
+  publisher = {Addison-Wesley},
+  year = {2003},
+  author = {Kopka, Helmut and Daly, Patrick W.}
+}
+
+@BOOK{Lamport,
+  title = {LaTeX: A Document Preparation System},
+  publisher = {Addison-Wesley},
+  year = {1994},
+  author = {Lamport, Leslie}
+}
+
+@BOOK{Mittelbach,
+  title = {The LaTeX Companion Second Edition},
+  publisher = {Addison-Wesley},
+  year = {2004},
+  author = {Mittelbach, Frank and Goossens, Michael}
+}
+
+@MISC{Credits,
+  title = {{The LyX Team}},
+  howpublished = {Internet: \href{http://www.lyx.org/cgi-bin/viewcvs.cgi/*checkout*/lyx-devel/lib/CREDITS?rev=HEAD\&content-type=text/plain}{Credits}}
+}
+
+@MISC{FAQ,
+  title = {LaTeX FAQ},
+  howpublished = {Internet: \url{http://www.tex.ac.uk/cgi-bin/texfaq2html}}
+}
+

status.15x

@@ -22,6 +22,11 @@ What's new
 
 * DOCUMENTATION AND LOCALIZATION
 
+- Completely revised user guide manual
+  The user guide is now up to date and describes all basic features
+  LyX 1.5 offers. For a detailed changelog, see
+  http://wiki.lyx.org/LyX/DocumentationDevelopment#Status
+
 - Many improvements to interface translation on the Mac. In
   particular, LyX automatically uses the language of the interface for
   all of its menus and for help files. Documents strings like