diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-02-27 15:16:55 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-02-27 15:17:22 -0600 |
| commit | ddaa077b993f45171ae5fe7f10efe389ff41a547 (patch) | |
| tree | 20e8de280cc705caade57d9ccc77a63986e91b77 | |
| parent | ba18d28f69f9f37ec770499a6a2d0dda56691a96 (diff) | |
| download | packages-ddaa077b993f45171ae5fe7f10efe389ff41a547.tar.gz packages-ddaa077b993f45171ae5fe7f10efe389ff41a547.tar.bz2 packages-ddaa077b993f45171ae5fe7f10efe389ff41a547.tar.xz packages-ddaa077b993f45171ae5fe7f10efe389ff41a547.zip | |
Update documentation files
| -rw-r--r-- | CONTRIBUTING.rst | 5 | ||||
| -rw-r--r-- | README.rst | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index f3a399011..ef03a93a2 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -6,7 +6,7 @@ :Status: Draft :Copyright: - © 2017 Adélie Linux Team. NCSA open source licence. + © 2017-2018 Adélie Linux Team. NCSA open source licence. @@ -119,4 +119,5 @@ Mailing List if you have made three commits, you will use the command ``git format-patch HEAD^^^``. -#. Email the resulting patch to the packagers mailing list. +#. Email the resulting patch to the mailing list, using ``git send-email`` or + your mail client. The mailing list is adelie-pkg@lists.adelielinux.org. diff --git a/README.rst b/README.rst index ce31366dd..836e1ca05 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ :Status: Production :Copyright: - © 2017 Adélie Linux Team. NCSA open source licence. + © 2017-2018 Adélie Linux Team. NCSA open source licence. @@ -62,6 +62,14 @@ interested in installing. Desktop applications, server software (also known as *daemons*), and other useful packages can be found here. +``harmony``: Packages affected by Project Harmony +````````````````````````````````````````````````` +The ``harmony`` directory contains packages that are being discussed with +Alpine Linux for later merging. These packages may either end up in ``system`` +or Alpine's ``main`` depending on the outcome of discussions. (These packages +are always available in the ``system`` repo when built by Adélie.) + + Usage |