summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2021-03-25 00:53:11 -0400
committerKyle Meyer <kyle@kyleam.com>2021-03-25 00:53:11 -0400
commit68db6fc064f1ddf9a8a1da537d662dbf3ba55977 (patch)
tree74c4d9ff191f38212fc1c4095663016491ab8cac
parentc5538d58c48ff54cf303d64d5bf9d79ff5a834b4 (diff)
parent478929ae61178346f65a838970aec6fcbe1b51d4 (diff)
downloadorg-mode-68db6fc064f1ddf9a8a1da537d662dbf3ba55977.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org-manual.org4
-rw-r--r--lisp/ox-html.el3
2 files changed, 2 insertions, 5 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 0dbc5e2..258576b 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -15845,12 +15845,12 @@ and possibly transformed in the process. The default transformation
is to export Org files as HTML files, and this is done by the function
~org-html-publish-to-html~ which calls the HTML exporter (see [[*HTML
Export]]). But you can also publish your content as PDF files using
-~org-publish-org-to-pdf~, or as ASCII, Texinfo, etc., using the
+~org-latex-publish-to-pdf~, or as ASCII, Texinfo, etc., using the
corresponding functions.
If you want to publish the Org file as an =.org= file but with
/archived/, /commented/, and /tag-excluded/ trees removed, use
-~org-publish-org-to-org~. This produces =file.org= and put it in the
+~org-org-publish-to-org~. This produces =file.org= and puts it in the
publishing directory. If you want a htmlized version of this file,
set the parameter ~:htmlized-source~ to ~t~. It produces
=file.org.html= in the publishing directory[fn:140].
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 80ad95c..89da823 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -653,9 +653,6 @@ The function must accept two parameters:
The function should return the string to be exported.
-For example, the variable could be set to the following function
-in order to mimic default behavior:
-
The default value simply returns the value of CONTENTS."
:group 'org-export-html
:version "24.4"