update packages

lisp/org/doc/orgguide.texi

@@ -13,7 +13,7 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2004--2020  Free Software Foundation, Inc.
+Copyright @copyright{} 2004--2021  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -39,7 +39,7 @@ modify this GNU manual.''
 @finalout
 @titlepage
 @title Org Mode Compact Guide
-@subtitle Release 9.4
+@subtitle Release 9.5
 @author The Org Mode Developers
 @page
 @vskip 0pt plus 1filll
@@ -171,7 +171,6 @@ line to your Emacs init file:
 
 @example
 (add-to-list 'load-path "~/path/to/orgdir/lisp")
-(add-to-list 'load-path "~/path/to/orgdir/contrib/lisp" t)
 @end example
 
 
@@ -191,9 +190,9 @@ keys for three commands that are useful in any Emacs buffer, not just
 Org buffers.  Please choose suitable keys yourself.
 
 @lisp
-(global-set-key (kbd "C-c l") 'org-store-link)
-(global-set-key (kbd "C-c a") 'org-agenda)
-(global-set-key (kbd "C-c c") 'org-capture)
+(global-set-key (kbd "C-c l") #'org-store-link)
+(global-set-key (kbd "C-c a") #'org-agenda)
+(global-set-key (kbd "C-c c") #'org-capture)
 @end lisp
 
 Files with extension @samp{.org} will be put into Org mode automatically.
@@ -289,8 +288,8 @@ Show all, including drawers.
 When Emacs first visits an Org file, the global state is set to
 OVERVIEW, i.e., only the top level headlines are visible.  This can be
 configured through the variable @code{org-startup-folded}, or on a per-file
-basis by adding a @samp{STARTUP} keyword to @samp{overview}, @samp{content}, or
-@samp{showall}, like this:
+basis by adding a @samp{STARTUP} keyword to @samp{overview}, @samp{content},
+@samp{showall}, @samp{showeverything} or @samp{show<n>levels} (n = 2..5) like this:
 
 @example
 #+STARTUP: content
@@ -2302,8 +2301,7 @@ compatible with XHTML 1.0 strict standard.
 @table @asis
 @item @kbd{C-c C-e h h}
 Export as HTML file with a @samp{.html} extension.  For @samp{myfile.org}, Org
-exports to @samp{myfile.html}, overwriting without warning.  @{@{@{kbd@{C-c
-C-e h o)@}@}@} exports to HTML and opens it in a web browser.
+exports to @samp{myfile.html}, overwriting without warning.  @kbd{C-c C-e h o} exports to HTML and opens it in a web browser.
 @end table
 
 The HTML export back-end transforms @samp{<} and @samp{>} to @samp{&lt;} and @samp{&gt;}.
@@ -2418,12 +2416,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 lisp
 
 @table @asis