Update hard-coded versions for sync with Emacs

The upcoming 9.5.1 release is the target for Emacs 28.1, but the plan
is to regularly sync with the emacs-28 branch in the meantime.

.gitignore

@@ -32,7 +32,6 @@ orgcard.txt
 org
 orgguide
 org-loaddefs.el
-org-version.el
 doc/org.texi
 doc/orgguide.texi
 doc/org-version.inc

doc/org-setup.org

@@ -45,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{...}.

doc/org.org

@@ -21564,7 +21564,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:
@@ -21617,7 +21617,7 @@ modify this GNU manual."
 
 * Export Setup                                                          :noexport:
 
-#+setupfile: doc-setup.org
+#+setupfile: org-setup.org
 
 #+export_file_name: org.texi
 

doc/orgcard.tex

@@ -1,5 +1,7 @@
 % Reference Card for Org Mode
-\input org-version.tex
+\def\orgversionnumber{9.5.4}
+\def\versionyear{2021}          % latest update
+\input emacsver.tex
 
 %**start of header
 \newcount\columnsperpage
@@ -77,6 +79,9 @@
 \centerline{Released under the terms of the GNU General Public License}
 \centerline{version 3 or later.}
 
+\centerline{For more Emacs documentation, and the \TeX{} source for this card, see}
+\centerline{the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}}
+
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below

etc/schema/schemas.xml

@@ -1,12 +1,69 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2003-2004, 2007-2022 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/>. -->
+
 <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
+  <transformURI fromPattern="*.xml" toPattern="*.rnc"/>
+
+  <uri pattern="*.xsl" typeId="XSLT"/>
+  <uri pattern="*.html" typeId="XHTML"/>
+  <uri pattern="*.rng" typeId="RELAX NG"/>
+  <uri pattern="*.rdf" typeId="RDF"/>
+  <uri pattern="*.dbk" typeId="DocBook"/>
+
+  <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
+  <namespace ns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" typeId="RDF"/>
+  <namespace ns="http://www.w3.org/1999/xhtml" typeId="XHTML"/>
+  <namespace ns="http://relaxng.org/ns/structure/1.0" typeId="RELAX NG"/>
+  <namespace ns="http://thaiopensource.com/ns/locating-rules/1.0"
+	     uri="locate.rnc"/>
   <namespace ns="urn:oasis:names:tc:opendocument:xmlns:office:1.0" typeId="LibreOffice"/>
   <namespace ns="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" typeId="LibreOffice"/>
   <namespace ns="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" typeId="LibreOffice"/>
   <namespace ns="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" typeId="OpenDocument Manifest"/>
 
+  <documentElement localName="stylesheet" typeId="XSLT"/>
+  <documentElement prefix="xsl" localName="transform" typeId="XSLT"/>
+
+  <documentElement localName="html" typeId="XHTML"/>
+
+  <documentElement localName="grammar" typeId="RELAX NG"/>
+
+  <documentElement prefix="" localName="article" typeId="DocBook"/>
+  <documentElement prefix="" localName="book" typeId="DocBook"/>
+  <documentElement prefix="" localName="chapter" typeId="DocBook"/>
+  <documentElement prefix="" localName="part" typeId="DocBook"/>
+  <documentElement prefix="" localName="refentry" typeId="DocBook"/>
+  <documentElement prefix="" localName="section" typeId="DocBook"/>
+
+  <documentElement localName="RDF" typeId="RDF"/>
+  <documentElement prefix="rdf" typeId="RDF"/>
+
+  <documentElement localName="locatingRules" uri="locate.rnc"/>
+
+  <typeId id="XSLT" uri="xslt.rnc"/>
+  <typeId id="RELAX NG" uri="relaxng.rnc"/>
+  <typeId id="XHTML" uri="xhtml.rnc"/>
+  <typeId id="DocBook" uri="docbook.rnc"/>
+  <typeId id="RDF" uri="rdfxml.rnc"/>
+
   <documentElement prefix="office" typeId="OpenDocument"/>
   <documentElement prefix="manifest" localName="manifest" typeId="OpenDocument Manifest"/>
   <typeId id="LibreOffice" uri="OpenDocument-schema-v1.3+libreoffice.rnc"/>
   <typeId id="OpenDocument Manifest" uri="od-manifest-schema-v1.2-os.rnc"/>
+
 </locatingRules>

lisp/org-version.el

@@ -0,0 +1,24 @@
+;;; org-version.el --- autogenerated file, do not edit  -*- lexical-binding: t -*-
+;;
+;;; Code:
+;;;###autoload
+(defun org-release ()
+  "The release version of Org.
+Inserted by installing Org mode or when a release is made."
+   (let ((org-release "9.5.4"))
+     org-release))
+;;;###autoload
+(defun org-git-version ()
+  "The Git version of Org mode.
+Inserted by installing Org or when a release is made."
+   (let ((org-git-version "release_9.5.4-19-g4dff42"))
+     org-git-version))
+
+(provide 'org-version)
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; coding: utf-8
+;; End:
+;;; org-version.el ends here