Fixes for doc/misc org source files

* doc/misc/org-setup.org: Fix "version" file lookup.  Add copyright.
* doc/misc/modus-themes.org: Fix up doclicense include.
* doc/misc/org.org: Remove non-working and unused "modification-time".
Fix up doclicense include.  Adjust setupfile inclusion.

3 files changed, 24 insertions, 8 deletions

diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index db15db46b5e..03cce5bf335 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -17,7 +17,7 @@ released on {{{release-date}}}.  Any reference to a newer feature which does
 not yet form part of the latest tagged commit, is explicitly marked as
 such.
 
-Copyright (C) 2020 Free Software Foundation, Inc.
+Copyright (C) 2020--2021 Free Software Foundation, Inc.
 
 #+begin_quote
 Permission is granted to copy, distribute and/or modify this
@@ -1952,4 +1952,4 @@ to produce such a port, feel welcome [[https://protesilaos.com/contact][to conta
 :CUSTOM_ID: h:3077c3d2-7f90-4228-8f0a-73124f4026f6
 :END:
 
-#+INCLUDE: fdl-1.3.txt src txt
+#+texinfo: @include doclicense.texi
diff --git a/doc/misc/org-setup.org b/doc/misc/org-setup.org
index b83d16e7e58..d0392f10a20 100644
--- a/doc/misc/org-setup.org
+++ b/doc/misc/org-setup.org
@@ -1,4 +1,21 @@
-# SETUPFILE for manuals
+# SETUPFILE for Org manual
+
+# Copyright (C) 2021 Free Software Foundation, Inc.
+#
+# This file is part of GNU Emacs.
+#
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # XXX: We cannot use TODO keyword as a node starts with "TODO".
 #+todo: REVIEW FIXME | DONE
@@ -28,7 +45,7 @@
 # returns major.minor version number.  This is sufficient since bugfix
 # releases are not expected to add features and therefore imply manual
 # modifications.
-#+macro: version (eval (with-current-buffer (find-file-noselect "../lisp/org.el") (org-with-point-at 1 (if (re-search-forward "Version: +\\([0-9.]+\\)" nil t) (mapconcat #'identity (cl-subseq (split-string (match-string-no-properties 1) "\\.") 0 2) ".") (error "Missing \"Version\" keyword in \"org.el\"")))))
+#+macro: version (eval (with-current-buffer (find-file-noselect "../../lisp/org/org.el") (org-with-point-at 1 (if (re-search-forward "Version: +\\([0-9.]+\\)" nil t) (mapconcat #'identity (cl-subseq (split-string (match-string-no-properties 1) "\\.") 0 2) ".") (error "Missing \"Version\" keyword in \"org.el\"")))))
 
 # The "kbd" macro turns KBD into @kbd{KBD}.  Additionally, it
 # encloses case-sensitive special keys (SPC, RET...) within @key{...}.
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 5d4e3f26fa5..f072b5e00e0 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -1,7 +1,6 @@
 #+title: The Org Manual
 #+subtitle:  Release {{{version}}}
 #+author:    The Org Mode Developers
-#+date:      {{{modification-time}}}
 #+language:  en
 
 
@@ -3244,7 +3243,7 @@ A link should be enclosed in double brackets and may contain
 descriptive text to be displayed instead of the URL (see [[*Link
 Format]]), for example:
 
-: [[http://www.gnu.org/software/emacs/][GNU Emacs]]
+: [[https://www.gnu.org/software/emacs/][GNU Emacs]]
 
 If the description is a file name or URL that points to an image, HTML
 export (see [[*HTML Export]]) inlines the image as a clickable button.  If
@@ -21233,7 +21232,7 @@ be complete if the ones above were not mentioned in this manual.
 :DESCRIPTION: The license for this documentation.
 :END:
 
-#+include: fdl.org
+#+texinfo: @include doclicense.texi
 
 * Main Index
 :PROPERTIES:
@@ -21286,7 +21285,7 @@ modify this GNU manual."
 
 * Export Setup                                                          :noexport:
 
-#+setupfile: doc-setup.org
+#+setupfile: org-setup.org
 
 #+export_file_name: org.texi