summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-09-06 07:47:57 +0200
committerBastien Guerry <bzg@altern.org>2013-09-06 07:47:57 +0200
commitd16465b082ec5324fe4958ed19969310a1760ded (patch)
tree06637e633eec94f83636ebee7f07de1f57f3ce54
parentfd763c229a4e3c5dc2a11146548f36329e00ede7 (diff)
downloadorg-mode-d16465b082ec5324fe4958ed19969310a1760ded.tar.gz
README_maintainer: add a new "Updating etc/ORG-NEWS" section
-rw-r--r--README_maintainer14
1 files changed, 13 insertions, 1 deletions
diff --git a/README_maintainer b/README_maintainer
index cfa2544..fed9867 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.