From 56a4461a48d5803fbc979924475da4b3621ea0f5 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Wed, 19 Apr 2017 21:43:05 -0400 Subject: [PATCH] ; Move stray item from admin/notes/repo to CONTRIBUTE * admin/notes/repo: Remove stray item. * CONTRIBUTE: Move it here, fix incorrect references to "branch". --- CONTRIBUTE | 6 ++++++ admin/notes/repo | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTE b/CONTRIBUTE index b522c247f71..7fdb2d7cf1d 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -209,6 +209,12 @@ reasons. These should be marked by including something like "Do not merge to master" or anything that matches gitmerge-skip-regexp (see admin/gitmerge.el) in the commit message. +** GNU ELPA + +This repository does not contain the Emacs Lisp package archive +(elpa.gnu.org). See admin/notes/elpa for how to access the GNU ELPA +repository. + ** Emacs Mailing lists. Discussion about Emacs development takes place on emacs-devel@gnu.org. diff --git a/admin/notes/repo b/admin/notes/repo index 3ab3da78071..0da1e1e227a 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -1,12 +1,5 @@ NOTES ON COMMITTING TO EMACS'S REPOSITORY -*- outline -*- -** elpa - -This branch does not contain a copy of Emacs, but of the Emacs Lisp -package archive (elpa.gnu.org). See admin/notes/elpa for further -explanation, and the README file in the branch for usage -instructions. - * Install changes only on one branch, let them get merged elsewhere if needed. In particular, install bug-fixes only on the release branch (if there -- 2.39.5