summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-04-14 15:52:13 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-04-14 15:52:13 +0200
commit2db83c67a81f54e8c28b35c048df474280345d8a (patch)
tree1646c945b54d6340de3c8edae8be91075aabd3ba
parent12e73e58af9881faf5aba52db68798c16cff22c0 (diff)
downloadorg-mode-2db83c67a81f54e8c28b35c048df474280345d8a.tar.gz
Update README file
-rw-r--r--README_GIT28
1 files changed, 12 insertions, 16 deletions
diff --git a/README_GIT b/README_GIT
index 1b64653..6e0d03f 100644
--- a/README_GIT
+++ b/README_GIT
@@ -35,14 +35,15 @@ development.
By requesting push access, you acknowledge that you have read
and agreed with the following rules:
- - Org-mode is part of Emacs. Therefore we need to be very
+ - Org-mode is part of Emacs. Therefore, we need to be very
conscious about changes moving into the Org-mode core.
These can originate only from people who have signed the
appropriate papers with the Free Software Foundation. The
files to which this applies are:
- - all *.el files in the root directory of the repository
- - org.texi, orgcard.tex, and ChangeLog.
+ - all *.el files in the lisp directory of the repository
+ - org.texi, orgcard.tex in the doc directory
+ - the corresponding ChangeLog files
- Before making any significant changes, please explain and
discuss them on the mailing list emacs-orgmode@gnu.org.
@@ -58,32 +59,27 @@ development.
the change you made in the ChangeLog buffer/file.
- Among other things, Org-mode is widely appreciated because
- if its simplicity, cleanness and consistency. We should try
+ of its simplicity, cleanness and consistency. We should try
hard to preserve this and I would like to ask everyone to
keep this in mind when developing changes.
-* The CONTRIB directory
+* The contrib directory
-The git repository contains a CONTRIB directory. This directory
+The git repository contains a contrib directory. This directory
is the playing field for any developer, also people who have not
(yet) signed the papers with the FSF. You are free to add files
to this directory, implementing extensions, new link types etc.
Also non-Lisp extensions like scripts to process Org-mode files
in different ways are welcome in this directory. You should
provide documentation with your extensions, at least in the form
-of commentary in the file. Please discuss your extensions on
-emacs-orgmode@gnu.org.
+of commentary in the file, better on worg. Please discuss your
+extensions on emacs-orgmode@gnu.org.
-The CONTRIB directory will be part of the Org-mode distribution
-starting with version 5.21. When that happens, people who want
-to use extensions will have to make sure their search path
-(executable or Lisp) includes the relevant directories.
-
-After files have been tested in CONTRIB and found to be generally
+After files have been tested in contrib and found to be generally
useful, we may decide to clarify copyright questions and then
move the file into the Org-mode core. This means they will be
moved up to the root directory and will also eventually be added
-to Emacs CVS tree. The final decision about this rests with the
-maintainer.
+to Emacs bzr repository. The final decision about this rests
+with the maintainer.