summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-20 14:49:42 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-20 14:49:42 +0200
commit197c581620419ffd5e93fa9459d9f2adbc8c647e (patch)
treef71df22d2b271b02654cb3f2a918a8e0216f1e85
parent7973ec105774e97639502c85b9e914cbbab8d517 (diff)
parent251f88340acf586c761513e9e53a9e778d6b2dc7 (diff)
downloadorg-mode-197c581620419ffd5e93fa9459d9f2adbc8c647e.tar.gz
Merge branch 'maint'
-rw-r--r--README_contribute28
1 files changed, 14 insertions, 14 deletions
diff --git a/README_contribute b/README_contribute
index 2dc62e6..bc1324c 100644
--- a/README_contribute
+++ b/README_contribute
@@ -1,9 +1,9 @@
-*- mode: org; fill-column:65 -*-
-This is the GIT repository for the development of Org-mode, an
+This is the GIT repository for the development of Org mode, an
Emacs mode for organizing your life.
-The text below explains the rules for participating in Org-mode
+The text below explains the rules for participating in Org mode
development.
* Main rules
@@ -23,14 +23,14 @@ development.
git clone git://repo.or.cz/org-mode.git
-3. People who are interested to participate in the Org-mode
- development can to so by sending patches to this address:
+3. People who are interested to participate in the Org mode
+ development can do so by sending patches to this address:
[[mailto:emacs-orgmode@gnu.org][emacs-orgmode@gnu.org]]
4. An interested developer can also request push access to the
central repository by sending her/his user-info to the
- maintainer of Org-mode or the webmaster of orgmode.org.
+ maintainer of Org mode or the webmaster of orgmode.org.
After you have been added as a user with push privileges,
clone the repository through ssh using
@@ -40,8 +40,8 @@ development.
By requesting push access, you acknowledge that you have read
and agreed with the following rules:
- - Org-mode is part of GNU Emacs. Therefore, we need to be
- very conscious about changes moving into the Org-mode core.
+ - Org mode is part of GNU 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:
@@ -54,7 +54,7 @@ development.
discuss them on the mailing list emacs-orgmode@gnu.org.
This does obviously not apply to people who are maintaining
- their own contributions to Org-mode. Please, just use the
+ their own contributions to Org mode. Please, just use the
new mechanism to make sure all changes end up in the right
place.
@@ -63,7 +63,7 @@ development.
described in the `CONTRIBUTE' file in the main Emacs
repository.
- - Among other things, Org-mode is widely appreciated because
+ - Among other things, Org mode is widely appreciated because
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.
@@ -74,15 +74,15 @@ 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, better on worg. Please discuss your
+Also non-Lisp extensions like scripts to process Org 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, better on worg. Please discuss your
extensions on [[mailto:emacs-orgmode@gnu.org][emacs-orgmode@gnu.org]].
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
+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 GNU Emacs bzr repository. The final decision about this rests
with the maintainer.