-Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2006-2011
+ Free Software Foundation, Inc.
See end for license conditions.
* Coding Standards
-Contributed code should follow the GNU Coding Standard.
+Contributed code should follow the GNU Coding Standards.
If it doesn't, we'll need to find someone to fix the code before we
can use it.
Emacs has certain additional style and coding conventions.
-Ref: http://www.gnu.org/prep/standards_toc.html
+Ref: http://www.gnu.org/prep/standards/
Ref: GNU Coding Standards Info Manual
Ref: The "Tips" Appendix in the Emacs Lisp Reference.
* Copyright Assignment
-We can accept small changes without legal papers, and for medium-size
-changes a copyright disclaimer is ok too. To accept substantial
-contributions from you, we need a copyright assignment form filled out
-and filed with the FSF.
-
-Contact us at emacs-devel@gnu.org to obtain the relevant forms.
+We can accept small changes (roughly, fewer than 15 lines) without
+legal papers. Anything more substantial requires a copyright
+disclaimer or assignment (the latter is preferred, especially for
+larger changes). Both of these involved filling out a short form and
+filing it with the FSF. The process is straightforward -- contact us
+at emacs-devel@gnu.org to obtain the relevant forms.
* Getting the Source Code
-The latest version of Emacs can be downloaded using CVS or Arch from
-the Savannah web site. It is important to write your patch based on
-this version; if you start from an older version, your patch may be
-outdated when you write it, and maintainers will have a hard time
-applying it.
+The latest version of Emacs can be downloaded using Bazaar from the
+Savannah web site. It is important to write your patch based on the
+latest version. If you start from an older version, your patch may be
+outdated (so that maintainers will have a hard time applying it), or
+changes in Emacs may have made your patch unnecessary.
-After you have downloaded the CVS source, you should read the file
-INSTALL.CVS for build instructions (they differ to some extent from a
+After you have downloaded the Bazaar source, you should read the file
+INSTALL.BZR for build instructions (they differ to some extent from a
normal build).
Ref: http://savannah.gnu.org/projects/emacs
can properly evaluate it.
When you have all these pieces, bundle them up in a mail message and
-send it to emacs-pretest-bug@gnu.org or emacs-devel@gnu.org.
+send it to bug-gnu-emacs@gnu.org or emacs-devel@gnu.org.
-All subsequent discussion should also be sent to the mailing list.
+All subsequent discussion should be sent to the same mailing list.
** Description
A ChangeLog entry as plaintext (separate from the patch).
-See the various ChangeLog files for format and content. Note that,
+See the various ChangeLog files for format and content. Note that,
unlike some other projects, we do require ChangeLogs also for
documentation, i.e. Texinfo files.
Please use "Context Diff" format.
-If you are accessing the CVS repository use
- cvs update; cvs diff -cp
-else, use
+If you are accessing the Bazaar repository, make sure your copy is
+up-to-date (e.g. with `bzr pull'), then use
+ bzr diff --no-aliases --diff-options=-cp
+Else, use
diff -cp OLD NEW
If your version of diff does not support these options, then get the
If you send several unrelated changes together, we will ask you to
separate them so we can consider each of the changes by itself.
+** Do not make formatting changes.
+
+Making cosmetic formatting changes (indentation, etc) makes it harder
+to see what you have really changed.
+
* Coding style and conventions.
* Supplemental information for Emacs Developers.
-** Write access to Emacs' CVS repository.
+** Write access to the Emacs repository.
Once you become a frequent contributor to Emacs, we can consider
-giving you write access to the CVS repository.
+giving you write access to the Bazaar repository.
** Emacs Mailing lists.
Discussion about Emacs development takes place on emacs-devel@gnu.org.
-Bug reports for released versions are sent to bug-gnu-emacs@gnu.org.
-
-Bug reports for development versions are sent to emacs-pretest-bug@gnu.org.
+Bug reports and feature requests are sent to bug-gnu-emacs@gnu.org.
You can subscribe to the mailing lists at savannah.gnu.org/projects/emacs.
\f
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
\f
Local variables:
mode: outline
HCoop / bpt / emacs.git / blobdiff