tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

doc: Port Emacs's b3d310fa9 

Command:

  $ git -C ../emacs format-patch \
    --stdout b3d310fa9694807fc0e9c54f7ec4f6e3407402e1^- \
    -- 'doc/misc/org*.org' | \
    git am -p3 --directory=doc

Everything here looks okay to keep specific to the emacs-sync branch
(i.e. not apply to bugfix/main), at least for now:

  * the modification-time change is already covered by 140df469e
    (manual: Remove date keyword, 2021-04-19) on Org's side

  * the macro change to doc/org-setup.org isn't appropriate for the
    Org repo, so that should stay in the emacs-sync branch

  * the change to the included license file isn't appropriate for the
    Org repo (which has fdl.org instead), so this should stay in the
    emacs-sync branch

  * the comment to doc/org-setup.org should probably eventually be
    applied to doc/doc-setup.org in bugfix/main
This commit is contained in:
Kyle Meyer 2021-09-29 23:01:43 -04:00
parent bc8e7159ef
commit b91b9050cb
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
doc/org-setup.org
View File

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

7
doc/org.org
View File

@ -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