1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-16 09:50:25 +00:00
Commit Graph

100 Commits

Author SHA1 Message Date
John Wiegley
91917dd58e Merge branch 'emacs-25-merge' 2016-01-02 23:31:52 -08:00
Andrew Hyatt
222796697a Add notes on bug triage procedure
* CONTRIBUTE: In section on the issue tracker, point to new triage file.
* admin/notes/triage: New file explaining triage procedure.
2016-01-01 15:07:53 -05:00
John Wiegley
9f2f14a072 Merge emacs-25 into master (using imerge) 2015-12-29 21:40:28 -08:00
Phillip Lord
22bbf7ca22 Rename all test files to reflect source layout.
* CONTRIBUTE,Makefile.in,configure.ac: Update to reflect
   test directory moves.
 * test/file-organisation.org: New file.
 * test/automated/Makefile.in
   test/automated/data/decompress/foo.gz
   test/automated/data/epg/pubkey.asc
   test/automated/data/epg/seckey.asc
   test/automated/data/files-bug18141.el.gz
   test/automated/data/flymake/test.c
   test/automated/data/flymake/test.pl
   test/automated/data/package/archive-contents
   test/automated/data/package/key.pub
   test/automated/data/package/key.sec
   test/automated/data/package/multi-file-0.2.3.tar
   test/automated/data/package/multi-file-readme.txt
   test/automated/data/package/newer-versions/archive-contents
   test/automated/data/package/newer-versions/new-pkg-1.0.el
   test/automated/data/package/newer-versions/simple-single-1.4.el
   test/automated/data/package/package-test-server.py
   test/automated/data/package/signed/archive-contents
   test/automated/data/package/signed/archive-contents.sig
   test/automated/data/package/signed/signed-bad-1.0.el
   test/automated/data/package/signed/signed-bad-1.0.el.sig
   test/automated/data/package/signed/signed-good-1.0.el
   test/automated/data/package/signed/signed-good-1.0.el.sig
   test/automated/data/package/simple-depend-1.0.el
   test/automated/data/package/simple-single-1.3.el
   test/automated/data/package/simple-single-readme.txt
   test/automated/data/package/simple-two-depend-1.1.el
   test/automated/abbrev-tests.el
   test/automated/auto-revert-tests.el
   test/automated/calc-tests.el
   test/automated/icalendar-tests.el
   test/automated/character-fold-tests.el
   test/automated/comint-testsuite.el
   test/automated/descr-text-test.el
   test/automated/electric-tests.el
   test/automated/cl-generic-tests.el
   test/automated/cl-lib-tests.el
   test/automated/eieio-test-methodinvoke.el
   test/automated/eieio-test-persist.el
   test/automated/eieio-tests.el
   test/automated/ert-tests.el
   test/automated/ert-x-tests.el
   test/automated/generator-tests.el
   test/automated/let-alist.el
   test/automated/map-tests.el
   test/automated/advice-tests.el
   test/automated/package-test.el
   test/automated/pcase-tests.el
   test/automated/regexp-tests.el
   test/automated/seq-tests.el
   test/automated/subr-x-tests.el
   test/automated/tabulated-list-test.el
   test/automated/thunk-tests.el
   test/automated/timer-tests.el
   test/automated/epg-tests.el
   test/automated/eshell.el
   test/automated/faces-tests.el
   test/automated/file-notify-tests.el
   test/automated/auth-source-tests.el
   test/automated/gnus-tests.el
   test/automated/message-mode-tests.el
   test/automated/help-fns.el
   test/automated/imenu-test.el
   test/automated/info-xref.el
   test/automated/mule-util.el
   test/automated/isearch-tests.el
   test/automated/json-tests.el
   test/automated/bytecomp-tests.el
   test/automated/coding-tests.el
   test/automated/core-elisp-tests.el
   test/automated/decoder-tests.el
   test/automated/files.el
   test/automated/font-parse-tests.el
   test/automated/lexbind-tests.el
   test/automated/occur-tests.el
   test/automated/process-tests.el
   test/automated/syntax-tests.el
   test/automated/textprop-tests.el
   test/automated/undo-tests.el
   test/automated/man-tests.el
   test/automated/completion-tests.el
   test/automated/dbus-tests.el
   test/automated/newsticker-tests.el
   test/automated/sasl-scram-rfc-tests.el
   test/automated/tramp-tests.el
   test/automated/obarray-tests.el
   test/automated/compile-tests.el
   test/automated/elisp-mode-tests.el
   test/automated/f90.el
   test/automated/flymake-tests.el
   test/automated/python-tests.el
   test/automated/ruby-mode-tests.el
   test/automated/subword-tests.el
   test/automated/replace-tests.el
   test/automated/simple-test.el
   test/automated/sort-tests.el
   test/automated/subr-tests.el
   test/automated/reftex-tests.el
   test/automated/sgml-mode-tests.el
   test/automated/tildify-tests.el
   test/automated/thingatpt.el
   test/automated/url-future-tests.el
   test/automated/url-util-tests.el
   test/automated/add-log-tests.el
   test/automated/vc-bzr.el
   test/automated/vc-tests.el
   test/automated/xml-parse-tests.el
   test/BidiCharacterTest.txt
   test/biditest.el
   test/cedet/cedet-utests.el
   test/cedet/ede-tests.el
   test/cedet/semantic-ia-utest.el
   test/cedet/semantic-tests.el
   test/cedet/semantic-utest-c.el
   test/cedet/semantic-utest.el
   test/cedet/srecode-tests.el
   test/cedet/tests/test.c
   test/cedet/tests/test.el
   test/cedet/tests/test.make
   test/cedet/tests/testdoublens.cpp
   test/cedet/tests/testdoublens.hpp
   test/cedet/tests/testfriends.cpp
   test/cedet/tests/testjavacomp.java
   test/cedet/tests/testnsp.cpp
   test/cedet/tests/testpolymorph.cpp
   test/cedet/tests/testspp.c
   test/cedet/tests/testsppcomplete.c
   test/cedet/tests/testsppreplace.c
   test/cedet/tests/testsppreplaced.c
   test/cedet/tests/testsubclass.cpp
   test/cedet/tests/testsubclass.hh
   test/cedet/tests/testtypedefs.cpp
   test/cedet/tests/testvarnames.c
   test/etags/CTAGS.good
   test/etags/ETAGS.good_1
   test/etags/ETAGS.good_2
   test/etags/ETAGS.good_3
   test/etags/ETAGS.good_4
   test/etags/ETAGS.good_5
   test/etags/ETAGS.good_6
   test/etags/a-src/empty.zz
   test/etags/a-src/empty.zz.gz
   test/etags/ada-src/2ataspri.adb
   test/etags/ada-src/2ataspri.ads
   test/etags/ada-src/etags-test-for.ada
   test/etags/ada-src/waroquiers.ada
   test/etags/c-src/a/b/b.c
   test/etags/c-src/abbrev.c
   test/etags/c-src/c.c
   test/etags/c-src/dostorture.c
   test/etags/c-src/emacs/src/gmalloc.c
   test/etags/c-src/emacs/src/keyboard.c
   test/etags/c-src/emacs/src/lisp.h
   test/etags/c-src/emacs/src/regex.h
   test/etags/c-src/etags.c
   test/etags/c-src/exit.c
   test/etags/c-src/exit.strange_suffix
   test/etags/c-src/fail.c
   test/etags/c-src/getopt.h
   test/etags/c-src/h.h
   test/etags/c-src/machsyscalls.c
   test/etags/c-src/machsyscalls.h
   test/etags/c-src/sysdep.h
   test/etags/c-src/tab.c
   test/etags/c-src/torture.c
   test/etags/cp-src/MDiagArray2.h
   test/etags/cp-src/Range.h
   test/etags/cp-src/burton.cpp
   test/etags/cp-src/c.C
   test/etags/cp-src/clheir.cpp.gz
   test/etags/cp-src/clheir.hpp
   test/etags/cp-src/conway.cpp
   test/etags/cp-src/conway.hpp
   test/etags/cp-src/fail.C
   test/etags/cp-src/functions.cpp
   test/etags/cp-src/screen.cpp
   test/etags/cp-src/screen.hpp
   test/etags/cp-src/x.cc
   test/etags/el-src/TAGTEST.EL
   test/etags/el-src/emacs/lisp/progmodes/etags.el
   test/etags/erl-src/gs_dialog.erl
   test/etags/f-src/entry.for
   test/etags/f-src/entry.strange.gz
   test/etags/f-src/entry.strange_suffix
   test/etags/forth-src/test-forth.fth
   test/etags/html-src/algrthms.html
   test/etags/html-src/index.shtml
   test/etags/html-src/software.html
   test/etags/html-src/softwarelibero.html
   test/etags/lua-src/allegro.lua
   test/etags/objc-src/PackInsp.h
   test/etags/objc-src/PackInsp.m
   test/etags/objc-src/Subprocess.h
   test/etags/objc-src/Subprocess.m
   test/etags/objcpp-src/SimpleCalc.H
   test/etags/objcpp-src/SimpleCalc.M
   test/etags/pas-src/common.pas
   test/etags/perl-src/htlmify-cystic
   test/etags/perl-src/kai-test.pl
   test/etags/perl-src/yagrip.pl
   test/etags/php-src/lce_functions.php
   test/etags/php-src/ptest.php
   test/etags/php-src/sendmail.php
   test/etags/prol-src/natded.prolog
   test/etags/prol-src/ordsets.prolog
   test/etags/ps-src/rfc1245.ps
   test/etags/pyt-src/server.py
   test/etags/tex-src/gzip.texi
   test/etags/tex-src/nonewline.tex
   test/etags/tex-src/testenv.tex
   test/etags/tex-src/texinfo.tex
   test/etags/y-src/atest.y
   test/etags/y-src/cccp.c
   test/etags/y-src/cccp.y
   test/etags/y-src/parse.c
   test/etags/y-src/parse.y
   test/indent/css-mode.css
   test/indent/js-indent-init-dynamic.js
   test/indent/js-indent-init-t.js
   test/indent/js-jsx.js
   test/indent/js.js
   test/indent/latex-mode.tex
   test/indent/modula2.mod
   test/indent/nxml.xml
   test/indent/octave.m
   test/indent/pascal.pas
   test/indent/perl.perl
   test/indent/prolog.prolog
   test/indent/ps-mode.ps
   test/indent/ruby.rb
   test/indent/scheme.scm
   test/indent/scss-mode.scss
   test/indent/sgml-mode-attribute.html
   test/indent/shell.rc
   test/indent/shell.sh
   test/redisplay-testsuite.el
   test/rmailmm.el
   test/automated/buffer-tests.el
   test/automated/cmds-tests.el
   test/automated/data-tests.el
   test/automated/finalizer-tests.el
   test/automated/fns-tests.el
   test/automated/inotify-test.el
   test/automated/keymap-tests.el
   test/automated/print-tests.el
   test/automated/libxml-tests.el
   test/automated/zlib-tests.el: Files Moved.
2015-11-24 17:04:22 +00:00
Xue Fuqiao
883a4d2aa0 Backport: * CONTRIBUTE: Remove information about feature freeze.
(cherry picked from commit ae0653b5ab)
2015-11-18 08:42:35 +08:00
Xue Fuqiao
0b7d791d27 Backport: Document the release process
* admin/notes/versioning: Add information about RC releases.
* admin/release-process: Document the release process.
* admin/authors.el (authors-ignored-files):
* admin/README: Change FOR-RELEASE to release-process.
* CONTRIBUTE:
* admin/notes/bugtracker: Don't mention FOR-RELEASE.

(cherry picked from commit 9a4aa0f594)
2015-11-18 08:42:02 +08:00
Xue Fuqiao
ae0653b5ab * CONTRIBUTE: Remove information about feature freeze. 2015-11-15 10:05:17 +08:00
Xue Fuqiao
9459456b50 Merge branch 'release-process-lowercase'
; Rename admin/FOR-RELEASE to admin/release-process and document the
; release process
2015-11-15 09:52:05 +08:00
Xue Fuqiao
9a4aa0f594 Document the release process
* admin/notes/versioning: Add information about RC releases.
* admin/release-process: Document the release process.
* admin/authors.el (authors-ignored-files):
* admin/README: Change FOR-RELEASE to release-process.
* CONTRIBUTE:
* admin/notes/bugtracker: Don't mention FOR-RELEASE.
2015-11-15 09:35:50 +08:00
Eli Zaretskii
ca947054e2 * CONTRIBUTE (Branches): Improve wording for back-ported commits. 2015-11-14 13:52:34 +02:00
Karl Fogel
25775a12c5 * CONTRIBUTE: Encourage adding tests.
Based on this post from John Wiegley:

  From: "John Wiegley" <johnw@newartisans.com>
  Subject: Re: [Emacs-diffs] master 1f02cbe: Fix bug#21766 and add test
  To: Juanma Barranquero <lekktu@gmail.com>
  Cc: emacs-diffs@gnu.org, bruce.connor.am@gmail.com,
      emacs-devel <emacs-devel@gnu.org>
  Date: Wed, 28 Oct 2015 18:45:29 -0700
  Message-ID: <m2y4emqwg6.fsf@newartisans.com>

  https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02372.html
2015-11-10 15:28:46 -06:00
Eli Zaretskii
2b316c0581 ; * CONTRIBUTE: Add section about the bug tracker
* CONTRIBUTE: Move less important sections after the more
important ones.  Add section about the bug tracker.
2015-11-06 10:56:59 +02:00
Dmitry Gutov
e809c39a82 ; * CONTRIBUTE: Tweak the "Non-ASCII characters in Emacs files" section 2015-09-29 01:39:45 +03:00
Eli Zaretskii
f49e3a2603 ; Mention non-ASCII encoding issues in CONTRIBUTE
* CONTRIBUTE: Document recommendations for encoding non-ASCII
characters in Emacs sources.
2015-09-27 11:30:35 +03:00
Eli Zaretskii
3fb5fcb186 ; * CONTRIBUTE: Mention admin/MAINTAINERS. 2015-09-27 10:56:30 +03:00
Paul Eggert
279303adfc * CONTRIBUTE: Move send-email here from git-workflow. 2015-09-11 08:34:46 -07:00
Glenn Morris
18e4eb6bd6 ; * CONTRIBUTE: Fix typo in previous. 2015-05-18 21:43:01 -04:00
Glenn Morris
314244aac4 Add option to ignore commit lines matching a pattern in ChangeLog.
* build-aux/gitlog-to-changelog: Add --ignore-line option.
* build-aux/gitlog-to-emacslog: Ignore lines matching '^; '.
; * CONTRIBUTE: Mention this.
2015-05-18 21:41:03 -04:00
Eli Zaretskii
422f15d9d6 Clarify "co-authored" some more 2015-04-24 18:00:02 +03:00
Eli Zaretskii
b201654076 * CONTRIBUTE: Clarify "co-authored-by". (Bug#20400) 2015-04-24 17:47:23 +03:00
Eli Zaretskii
c4e0ba5155 Minor edits in CONTRIBUTE
* CONTRIBUTE: Rearrange instructions about log messages.
Use "Git" capitalized all over.
Use 2 spaces between sentences.
2015-04-22 14:25:34 +03:00
Paul Eggert
9099d45df7 Quote 'like this' in top-level files
* CONTRIBUTE, INSTALL, Makefile.in, README, configure.ac, make-dist:
Prefer to single-quote 'like this' (instead of the older style
`like this').
* configure.ac: Fix some space-before-tab problems that 'git commit'
complained about.
2015-04-19 14:44:50 -07:00
Paul Eggert
f2da220b5f Prefer "Bug#1234" in commit messages
* .dir-locals.el (log-edit-mode): Don't rewrite Bug#,
as this isn't useful for Git.
* CONTRIBUTE: Suggest "Bug#1234" instead of "Fixes: debbugs:1234".
2015-04-18 19:48:23 -07:00
Dmitry Gutov
6f0b4d81b9 ; CONTRIBUTE: Further updates
* Better explanation of commit message vs ChangeLog distinction.

* Fix the name of the ChangeLog make task.

* Make instructions WRT NEWS, etc, ChangeLog entries clearer.

Fixes: debbugs:20328
2015-04-16 17:48:32 +03:00
Dmitry Gutov
4191e54fc6 ; CONTRIBUTE: Update the "make the ChangeLog entry in their name" bit
Fixes: debbugs:20328
2015-04-15 02:21:55 +03:00
Dmitry Gutov
2b714275e3 ; CONTRIBUTE: Remove the "relax this rule for commit messages" bit
Fixes: debbugs:20328
2015-04-15 02:15:07 +03:00
Dmitry Gutov
a61b0c8912 CONTRIBUTE: Mention log-edit-insert-changelog 2015-04-09 03:36:30 +03:00
Dmitry Gutov
e970f6f02e CONTRIBUTE: Emphasize creating the top-level ChangeLog file manually 2015-04-09 03:30:42 +03:00
Paul Eggert
2346856168 Generate a ChangeLog file from commit logs
* .gitignore: Add 'ChangeLog'.
* build-aux/gitlog-to-changelog: New file, from Gnulib.
* build-aux/gitlog-to-emacslog: New file.
* CONTRIBUTE: Document the revised workflow.
* Makefile.in (clean): Remove *.tmp and etc/*.tmp*
instead of just special cases.
(CHANGELOG_HISTORY_INDEX_MAX, CHANGELOG_N, gen_origin): New vars.
(ChangeLog, unchanged-history-files, change-history)
(change-history-commit): New rules.
* admin/admin.el (make-manuals-dist--1):
Don't worry about doc/ChangeLog.
* admin/authors.el: Add a FIXME.
* admin/make-tarball.txt:
* lisp/calendar/icalendar.el:
* lisp/gnus/deuglify.el:
* lisp/obsolete/gulp.el:
* lwlib/README:
Adjust to renamed ChangeLog history files.
* admin/merge-gnulib (GNULIB_MODULES): Add gitlog-to-changelog.
* admin/notes/repo: Call it 'master' a la Git, not 'trunk' a la Bzr.
Remove obsolete discussion of merging ChangeLog files.
New section "Maintaining ChangeLog history".
* build-aux/git-hooks/pre-commit:
Reject attempts to commit files named 'ChangeLog'.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* make-dist: Make and distribute top-level ChangeLog if there's a
.git directory.  Distribute the new ChangeLog history files
instead of scattered ChangeLog files.  Distribute the new files
gitlog-to-changelog and gitlog-to-emacslog.
Fixes: bug#19113
2015-04-07 00:00:55 -07:00
Paul Eggert
4a70043698 Spelling fix 2015-03-29 14:00:09 -07:00
Paul Eggert
6b7dd51e12 Fix 'commit-msg' to cite 'CONTRIBUTE'
As suggested in:
http://lists.gnu.org/archive/html/emacs-devel/2015-03/msg00947.html
Also, have the two files match better.
* CONTRIBUTE: Match what's in build-aux/git-hooks/commit-msg.
* build-aux/git-hooks/commit-msg: Mention 'CONTRIBUTE'.
2015-03-29 13:07:21 -07:00
Samer Masterson
70565a2176 Documentation and testing tips for CONTRIBUTE
CONTRIBUTE (Test your changes.): New section.
 (Document your changes.): Add doc tips.
2015-03-21 12:09:30 +02:00
Filipp Gunbin
f588156cbc Use prefix argument in `info-display-manual'
* lisp/info.el (info-display-manual): Limit the completion alternatives
to currently visited manuals if prefix argument is non-nil.
2014-12-31 17:15:36 +03:00
Ulrich Müller
d7e858bcc6 CONTRIBUTE: Use consistent spelling for 'ChangeLog'. 2014-12-29 11:20:50 +01:00
Stephen Leake
b4161ac70e * CONTRIBUTE: add Savannah url, cleanup announcing freeze. 2014-12-23 17:38:57 -06:00
Stephen Leake
fcb978e240 Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi
Fixes bug#19299

* CONTRIBUTE: Move user-level information to doc/emacs/trouble.texi
  (commit messages): new, gathered from comments on emacs-devel
  (Changelog notes): add reference to GNU coding standards section 5.2;
  doc 'present tense', bug fix format
  (branches): freeze announcements are made on info-gnu-emacs mailing
  list
  (git vs rename): new

* doc/emacs/trouble.texi: Move user-level information from CONTRIBUTE here

* lisp/startup.el (fancy-about-text): change buttons for etc/CONTRIBUTE
  to (info "(emacs)Contributing")
2014-12-23 13:11:45 -06:00
Stephen Leake
952c6c8f00 * CONTRIBUTE: minor improvements
* ChangeLog: cleanup entries for my recent commits
2014-12-06 02:38:35 -06:00
Stephen Leake
06264b3d24 Improve CONTRIBUTE and related files.
* CONTRIBUTE: improve; add explicit web references, move some info from
  admin/notes/* here.

* INSTALL.REPO: You can't "just run make" after a clean checkout.

* admin/notes/commits: deleted; merged into ./CONTRIBUTE

* admin/notes/repo: move commit, branch info into ./CONTRIBUTE
2014-12-06 02:38:34 -06:00
Stephen Leake
7409a79b1b preparing for further changes/cleanup to developers/contributors docs
* etc/CONTRIBUTE: renamed to ./CONTRIBUTE,

(my first commit to emacs trunk ever :)
2014-12-05 14:43:47 -06:00
Juri Linkov
f273780aa6 Move to etc. 2007-09-09 11:47:47 +00:00
Glenn Morris
fca4a5de17 Switch license to GPLv3 or later. 2007-07-25 06:48:19 +00:00
Glenn Morris
7f6d64f85a Switch to standard GPL text for license. 2007-02-11 00:15:39 +00:00
Glenn Morris
c2e309f269 Add copyright and permissions notices. 2007-02-01 03:10:42 +00:00
Juri Linkov
f41adf5089 Replace emacs-bugs@gnu.org with bug-gnu-emacs@gnu.org.
Replace mail.gnu.org with lists.gnu.org.
2006-09-02 23:43:49 +00:00
Kim F. Storm
0523005748 Use outline format.
Add section on copyright years (from admin/notes/years).
2006-07-09 00:22:37 +00:00
Eli Zaretskii
014a250c24 Slight formatting changes and typo fixes. Add description of NEWS markings. 2006-07-07 11:20:50 +00:00
Kim F. Storm
ccda8b9259 Mention INSTALL.CVS. 2006-07-07 08:22:04 +00:00
Richard M. Stallman
27e8e7104c Much rewrite. 2006-07-05 00:43:21 +00:00
Nick Roberts
6f82a6d0b7 *** empty log message *** 2006-07-04 11:23:36 +00:00
Nick Roberts
d1208b8bfa New file. 2006-07-04 01:16:51 +00:00