[elpa] externals/org edadbb8: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit edadbb8bab0f04a19618fa13dbaf6980ed57d248
Merge: a9a95cb f6eca65
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 doc/org-guide.org  | 9 +++++----
 doc/org-manual.org | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/org-guide.org b/doc/org-guide.org
index ea3040b..3daf8d3 100644
--- a/doc/org-guide.org
+++ b/doc/org-guide.org
@@ -2334,12 +2334,13 @@ example:
 (setq org-publish-project-alist
       '(("org"
          :base-directory "~/org/"
+         :publishing-function org-html-publish-to-html
          :publishing-directory "~/public_html"
          :section-numbers nil
-         :table-of-contents nil
-         :style "<link rel=\"stylesheet\"
-                href=\"../other/mystyle.css\"
-                type=\"text/css\"/>")))
+         :with-toc nil
+         :html-head "<link rel=\"stylesheet\"
+                    href=\"../other/mystyle.css\"
+                    type=\"text/css\"/>")))
 #+end_src
 
 - {{{kbd(C-c C-e P x)}}} ::
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 914649f..b4eff22 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -16324,10 +16324,10 @@ directory on the local machine.
          :publishing-function org-html-publish-to-html
          :publishing-directory "~/public_html"
          :section-numbers nil
-         :table-of-contents nil
-         :style "<link rel=\"stylesheet\"
-                href=\"../other/mystyle.css\"
-                type=\"text/css\"/>")))
+         :with-toc nil
+         :html-head "<link rel=\"stylesheet\"
+                    href=\"../other/mystyle.css\"
+                    type=\"text/css\"/>")))
 #+end_src
 
 *** Example: complex publishing configuration