From d16465b082ec5324fe4958ed19969310a1760ded Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 07:47:57 +0200 Subject: [PATCH] README_maintainer: add a new "Updating etc/ORG-NEWS" section --- README_maintainer | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README_maintainer b/README_maintainer index cfa2544ef..fed9867b6 100644 --- a/README_maintainer +++ b/README_maintainer @@ -87,7 +87,19 @@ Org and contributed libraries. org-latest* snapshots are built from the *master* branch. -* Synchonization with Emacs +* Synchronization with Emacs + +** Updating etc/ORG-NEWS + +Latest changes in Emacs are described in Emacs =etc/NEWS=, and latest +changes in major Emacs packages are described in =etc/ORG-NEWS=. + +If a major release is meant to be merged with the Emacs trunk (as it +always should), you need to update Org's =etc/ORG-NEWS= file so that +you can merge it with that of Emacs. There is one top-level section +for each release that is merged with Emacs. + +** Merging with Emacs trunk branch This is still a significant headache. Some hand work is needed here.