[nongnu] main e1f5d2d 5/5: Merge branch 'readme-sync'

[Jonas Bernoulli]

branch: main
commit e1f5d2d28e34a7c5b388cbad5e10c80426fa60e3
Merge: e7a6b32 9450dc5
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Merge branch 'readme-sync'
---
 README.org | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.org b/README.org
index 715b9d2..b2f2a33 100644
--- a/README.org
+++ b/README.org
@@ -1,9 +1,16 @@
 #+TITLE: NonGNU ELPA README
-#+DATE: 2020-12-21
+#+DATE: 2021-10-19
 
 Copyright (C) 2020-2021 Free Software Foundation, Inc. \\
 See the end of the file for license conditions.
 
+#+BEGIN_COMMENT
+This file exists in two repositories, in the ~elpa-admin~ branch of
+the ~emacs/elpa.git~ repository and in the ~main~ branch of the
+~emacs/nongnu.git~ repository.  Please make sure you always update
+it in both locations.  This duplication will be removed eventually.
+#+END_COMMENT
+
 This repository contains the sources, deployment scripts, and auxiliary files
 for [[https://nongnu.elpa.org][NonGNU ELPA]] (=elpa.nongnu.org=).  NonGNU ELPA 
is a [[https://www.gnu.org/philosophy/free-sw.html][free software]] Emacs Lisp
 Package Archive (ELPA) with extensions to 
[[https://www.gnu.org/software/emacs/][GNU Emacs]].
@@ -68,7 +75,6 @@ to do:
     rm archive/[PKG]-[VERSION].tar; make build/[PKG]
 #+end_src
 
-
 * Using packages in-place
 
 The packages can be installed and used in-place.  First you need to make
@@ -88,7 +94,6 @@ packages with:
     make
 #+end_src
 
-
 * Guidance for accepting packages
 
 ** We don't ask for copyright assignments to include packages in NonGNU ELPA.
@@ -202,10 +207,10 @@ packages with:
    the package, and you can mention fan items that you sell directly to
    the users.
 
-
 * Adding a package
 
-Once it is decided we want to add a package =[PKG]=, here's what it takes:
+Once the NonGNU ELPA maintainers decides that we want to add a package =[PKG]=,
+here's what it takes:
 
 - Add a corresponding entry to the file =elpa-packages=, then
 
@@ -223,7 +228,7 @@ Once it is decided we want to add a package =[PKG]=, here's 
what it takes:
     make packages/<pkgname>
   #+end_src
 
-- Push the package's code to =nongnu.git=:
+- Push the package's code to the repository =nongnu.git=:
 
   #+begin_src sh
     make sync/<pkgname>
@@ -251,7 +256,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with NonGNU ELPA.  If not, see <http://www.gnu.org/licenses/>.
+along with NonGNU ELPA.  If not, see <https://www.gnu.org/licenses/>.
 
 
 #+STARTUP: showall