Merge branch 'master' of git.lyx.org:lyx

RELEASE-NOTES

@@ -182,6 +182,11 @@ The following LyX key bindings have been changed:
 - sciword.bind was changed significantly (see #8364). The most important
   change is that "math-delim" commands now work under Windows.
 
+The following LyX documents have been moved:
+
+- 'AEA', 'JASA', 'springer', and 'thesis' have been moved from templates
+  to examples (see #8643).
+
 
 Changes with respect to external programs and libraries:
 --------------------------------------------------------

lib/Makefile.am

@@ -203,6 +203,34 @@ dist_slexamples_DATA = \
 	examples/sl/primer_surov.lyx \
 	examples/sl/splash.lyx
 
+springerexamplesdir = $(pkgdatadir)/examples/springer
+dist_springerexamples_DATA = \
+	examples/springer/svjour3.lyx \
+	examples/springer/svmono_acknow.lyx \
+	examples/springer/svmono_acronym.lyx \
+	examples/springer/svmono_appendix.lyx \
+	examples/springer/svmono_book-master.lyx \
+	examples/springer/svmono_chapter.lyx \
+	examples/springer/svmono_dedication.lyx \
+	examples/springer/svmono_foreword.lyx \
+	examples/springer/svmono_glossary.lyx \
+	examples/springer/svmono_part.lyx \
+	examples/springer/svmono_preface.lyx
+	examples/springer/svmono_referenc.lyx \
+	examples/springer/svmono_solutions.lyx \
+	examples/springer/svmult_acknow.lyx \
+	examples/springer/svmult_acronym.lyx \
+	examples/springer/svmult_appendix.lyx \
+	examples/springer/svmult_author.lyx \
+	examples/springer/svmult_cblist.lyx \
+	examples/springer/svmult_dedication.lyx \
+	examples/springer/svmult_editor-master.lyx \
+	examples/springer/svmult_foreword.lyx \
+	examples/springer/svmult_glossary.lyx \
+	examples/springer/svmult_part.lyx \
+	examples/springer/svmult_preface.lyx \
+	examples/springer/svmult_referenc.lyx
+
 skexamplesdir = $(pkgdatadir)/examples/sk
 dist_skexamples_DATA = \
 	examples/sk/splash.lyx
@@ -216,17 +244,30 @@ svexamplesdir = $(pkgdatadir)/examples/sv
 dist_svexamples_DATA = \
 	examples/sv/splash.lyx
 
+thesisexamplesdir = $(pkgdatadir)/examples/thesis
+dist_thesisexamples_DATA = \
+	examples/thesis/Acknowledgments.lyx \
+	examples/thesis/alpha.bst \
+	examples/thesis/Appendix.lyx \
+	examples/thesis/chapter-1.lyx \
+	examples/thesis/chapter-2.lyx \
+	examples/thesis/Summary.lyx \
+	examples/thesis/thesis.lyx \
+	examples/thesis/thesisExample.bib
+
 ukexamplesdir = $(pkgdatadir)/examples/uk
 dist_ukexamples_DATA = \
 	examples/uk/splash.lyx
 
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = \
+	examples/AEA.lyx \
 	examples/Braille.lyx \
 	examples/CV-image.eps \
 	examples/CV-image.png \
 	examples/Foils.lyx \
 	examples/ItemizeBullets.lyx \
+	examples/JASA.lyx \
 	examples/Literate.lyx \
 	examples/aa_sample.lyx \
 	examples/aas_sample.lyx \
@@ -2069,7 +2110,6 @@ dist_templates_DATA = \
 	templates/aastex.lyx \
 	templates/ACM-siggraph.lyx \
 	templates/ACM-sigplan.lyx \
-	templates/AEA.lyx \
 	templates/AGUTeX.lyx \
 	templates/AGU_article.lyx \
 	templates/APA.lyx \
@@ -2095,7 +2135,6 @@ dist_templates_DATA = \
 	templates/IJMPC.lyx \
 	templates/IJMPD.lyx \
 	templates/IOP-article.lyx \
-	templates/JASA.lyx \
 	templates/JSS-article.lyx \
 	templates/kluwer.lyx \
 	templates/koma-letter2.lyx \
@@ -2107,45 +2146,6 @@ dist_templates_DATA = \
 	templates/revtex4-1.lyx \
 	templates/slides.lyx
 
-springertemplatesdir = $(pkgdatadir)/templates/springer
-dist_springertemplates_DATA = \
-	templates/springer/svjour3.lyx \
-	templates/springer/svmono_acknow.lyx \
-	templates/springer/svmono_acronym.lyx \
-	templates/springer/svmono_appendix.lyx \
-	templates/springer/svmono_book-master.lyx \
-	templates/springer/svmono_chapter.lyx \
-	templates/springer/svmono_dedication.lyx \
-	templates/springer/svmono_foreword.lyx \
-	templates/springer/svmono_glossary.lyx \
-	templates/springer/svmono_part.lyx \
-	templates/springer/svmono_preface.lyx
-	templates/springer/svmono_referenc.lyx \
-	templates/springer/svmono_solutions.lyx \
-	templates/springer/svmult_acknow.lyx \
-	templates/springer/svmult_acronym.lyx \
-	templates/springer/svmult_appendix.lyx \
-	templates/springer/svmult_author.lyx \
-	templates/springer/svmult_cblist.lyx \
-	templates/springer/svmult_dedication.lyx \
-	templates/springer/svmult_editor-master.lyx \
-	templates/springer/svmult_foreword.lyx \
-	templates/springer/svmult_glossary.lyx \
-	templates/springer/svmult_part.lyx \
-	templates/springer/svmult_preface.lyx \
-	templates/springer/svmult_referenc.lyx
-
-thesistemplatesdir = $(pkgdatadir)/templates/thesis
-dist_thesistemplates_DATA = \
-	templates/thesis/Acknowledgments.lyx \
-	templates/thesis/alpha.bst \
-	templates/thesis/Appendix.lyx \
-	templates/thesis/chapter-1.lyx \
-	templates/thesis/chapter-2.lyx \
-	templates/thesis/Summary.lyx \
-	templates/thesis/thesis.lyx \
-	templates/thesis/thesisExample.bib
-
 texdir = $(pkgdatadir)/tex
 dist_tex_DATA = \
 	tex/broadway.cls \