Merge branch 'maint'

contrib/lisp/ol-man.el

@@ -24,7 +24,6 @@
 ;;; Commentary:
 
 (require 'ol)
-(require 'org)
 
 (org-link-set-parameters "man"
 			 :follow #'org-man-open
@@ -48,7 +47,7 @@ PATH should be a topic that can be thrown at the man command."
     (let* ((page (org-man-get-page-name))
            (link (concat "man:" page))
            (description (format "Manpage for %s" page)))
-      (org-store-link-props
+      (org-link-store-props
        :type "man"
        :link link
        :description description))))

doc/org-manual.org

@@ -19707,11 +19707,11 @@ process of adding Org links to Unix man pages, which look like this
 : [[man:printf][The printf manual]]
 
 #+texinfo: @noindent
-The following =org-man.el= file implements it
+The following =ol-man.el= file implements it
 
 #+begin_src emacs-lisp
-;;; org-man.el - Support for links to man pages in Org mode
-(require 'org)
+;;; ol-man.el - Support for links to man pages in Org mode
+(require 'ol)
 
 (org-link-set-parameters "man"
                          :follow org-man-command
@@ -19730,7 +19730,7 @@ The following =org-man.el= file implements it
     (let* ((page (org-man-get-page-name))
            (link (concat "man:" page))
            (description (format "Man page for %s" page)))
-      (org-store-link-props
+      (org-link-store-props
        :type "man"
        :link link
        :description description))))
@@ -19753,8 +19753,8 @@ The following =org-man.el= file implements it
       (`ascii (format "%s (%s)" desc path))
       (t path))))
 
-(provide 'org-man)
-;;; org-man.el ends here
+(provide ol-man)
+;;; ol-man.el ends here
 #+end_src
 
 #+texinfo: @noindent
@@ -19762,13 +19762,13 @@ To activate links to man pages in Org, enter this in the Emacs init
 file:
 
 #+begin_src emacs-lisp
-(require 'org-man)
+(require 'ol-man)
 #+end_src
 
 #+texinfo: @noindent
-A review of =org-man.el=:
+A review of =ol-man.el=:
 
-1. First, =(require 'org)= ensures =org.el= is loaded.
+1. First, =(require 'ol)= ensures that =ol.el= is loaded.
 
 2.