summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-09-02 13:16:18 +0200
committerBastien Guerry <bzg@altern.org>2013-09-02 13:16:18 +0200
commit3726464268c2fc65ab3f39f7a229fc533f0cfdae (patch)
tree829f53380b10106818c3f48c2bd594e76b986f5e
parent15ae89b3949f52db1b5579e383c2d9f6c9173992 (diff)
parente492bce3c16668d554707955f64be2211cf2b03c (diff)
downloadorg-mode-3726464268c2fc65ab3f39f7a229fc533f0cfdae.tar.gz
Merge branch 'maint'
-rw-r--r--README_maintainer11
1 files changed, 11 insertions, 0 deletions
diff --git a/README_maintainer b/README_maintainer
index f70d230..cfa2544 100644
--- a/README_maintainer
+++ b/README_maintainer
@@ -76,6 +76,17 @@ From there do
to create the .tar.gz and .zip files, the documentation, and to
upload everything at the right place.
+* Available Org's builds on the server
+
+There are two cron tasks on the server: one that builds the ELPA
+packages and one that builds org-latest.tar.gz and org-latest.zip.
+
+ELPA packages are built from the *maint* branch. One ELPA package
+contains Org's core, another one called "org-plus-contrib" contains
+Org and contributed libraries.
+
+org-latest* snapshots are built from the *master* branch.
+
* Synchonization with Emacs
This is still a significant headache. Some hand work is needed here.