Hi Nicolas, Org mode developers,
* Nicolas Goaziou <m...@nicolasgoaziou.fr> [2018-05-09; 02:30]:
> Bastien <b...@gnu.org> writes:
>
>> it would be nice to make the switch to org-manual.org for Org 9.2,
>> and to delete org.texi entirely from the master branch.
>
> Done.
>
>> I guess we need to add some Makefile rules so that "make pdf" first
>> exports .org => .texi then exports .texi to .pdf... is that so?
>
> Done (or so I think).
Hurray!
I found that org-float instead of diary-float is documented in
org-manual.org although ORG-NEWS says to use diary-float instead:
~/src/org-mode$ rgrep org-float
etc/ORG-NEWS:** =org-float= is now obsolete, use =diary-float= instead
Binary file lisp/org-compat.elc matches
lisp/org-compat.el:(define-obsolete-function-alias 'org-float-time 'float-time
"Org 9.0")
testing/lisp/test-org.el: (org-test-with-temp-text "<%%(org-float t 4 2)>"
testing/lisp/test-org.el: (equal "<%%(org-float t 4 2)>"
testing/lisp/test-org.el: (org-test-with-temp-text "<%%(org-float t 4
2)>"
doc/org.texi: <%%(org-float t 4 2)>
doc/org.texi:<%%(org-float t 42)>
doc/org-manual.org: <%%(org-float t 4 2)>
doc/org-manual.org:: <%%(org-float t 42)>
doc/org: <%%(org-float t 4 2)>
doc/org: <%%(org-float t 42)>
doc/org.html: <%%(org-float t 4 2)>
doc/org.html:<pre class="example"><%%(org-float t 42)>
~/src/org-mode$ rgrep diary-float
etc/ORG-NEWS:** =org-float= is now obsolete, use =diary-float= instead
testing/lisp/test-org-element.el: (should (equal (org-test-parse-and-interpret
"<%%diary-float t 4 2>")
testing/lisp/test-org-element.el: "<%%diary-float t 4 2>\n"))
doc/orgguide.texi: <%%(diary-float t 4 2)>
org-guide.texi is already up to date with respect to
diary-float.
I made a very simple patch for org-manual.org but none for
test-org.el or test-org-element.el since I do not understand
them. When reading about documentation standards I found that
Org manuals filename and directory wasn't up to date, so I fixed
this. I assume that the parts of doc/Documentation_Standards.org
which deal with texinfo formatting are also out of date but do
not know how to rewrite them.
>From b45739a23b093e1ee54ae09be8172720fa611628 Mon Sep 17 00:00:00 2001
From: Gregor Zattler <telegr...@gmx.net>
Date: Wed, 9 May 2018 19:51:51 +0200
Subject: [PATCH] ; Tiny doc fixes
* doc/org-manual.org (Dates and Times) (Timestamps, Deadlines and
Scheduling): Document "diary-float" instead of obsolete "org-float".
* doc/Documentation_Standards.org (org-manual.org specific
conventions): Fix file name and directory of Org manual.
Copyright-paperwork-exempt: yes
TINYCHANGE
---
doc/Documentation_Standards.org | 4 ++--
doc/org-manual.org | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/Documentation_Standards.org b/doc/Documentation_Standards.org
index 9d8f19fe6..c4dd862db 100644
--- a/doc/Documentation_Standards.org
+++ b/doc/Documentation_Standards.org
@@ -94,10 +94,10 @@ I have made them up of course).
- Entries in the concept index are normally all lower case unless some
other rule dictates otherwise.
-* orgmanual.org specific conventions
+* org-manual.org specific conventions
Org git repository comes with an .org version of the manual in the
-=contrib/= directory. Here are indications that are specific to this
+=doc/= directory. Here are indications that are specific to this
version of the manual.
- Five of the standard Texinfo indexes are used in the Org manual:
diff --git a/doc/org-manual.org b/doc/org-manual.org
index eb6c96fb2..d9e95b1ee 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -5779,7 +5779,7 @@ the agenda (see [[*Weekly/daily agenda]]). We distinguish:
#+begin_example
,* 22:00-23:00 The nerd meeting on every 2nd Thursday of the month
- <%%(org-float t 4 2)>
+ <%%(diary-float t 4 2)>
#+end_example
- Time/Date range ::
@@ -6158,7 +6158,7 @@ entries. Org mode issues early and late warnings based on the
assumption that the timestamp represents the /nearest instance/ of the
repeater. However, the use of diary S-exp entries like
-: <%%(org-float t 42)>
+: <%%(diary-float t 42)>
#+texinfo: @noindent
in scheduling and deadline timestamps is limited. Org mode does not
--
2.11.0
I'm not sure if "org-float" is the right way to quote this kind
of symbol in a commit message. Please fix if not.
HTH a tiny bit, Gregor
