Merge branch 'maint'

contrib/lisp/ox-s5.el

@@ -174,8 +174,8 @@ or an empty string."
 (defcustom org-s5-title-slide-template
   "<h1>%t</h1>
 <h2>%a</h2>
-<h2>%e</h2>
-<h2>%d</h2>"
+<h3>%e</h3>
+<h4>%d</h4>"
   "Format template to specify title page section.
 See `org-html-postamble-format' for the valid elements which
 can be included.

lisp/ox-beamer.el

@@ -36,10 +36,7 @@
 (unless (assoc "beamer" org-latex-classes)
   (add-to-list 'org-latex-classes
 	       '("beamer"
-		 "\\documentclass[presentation]{beamer}
-\[DEFAULT-PACKAGES]
-\[PACKAGES]
-\[EXTRA]"
+		 "\\documentclass[presentation]{beamer}"
 		 ("\\section{%s}" . "\\section*{%s}")
 		 ("\\subsection{%s}" . "\\subsection*{%s}")
 		 ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))))