summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2019-08-21 08:22:43 -0400
committerMichael R Sweet <michael.r.sweet@gmail.com>2019-08-21 08:22:43 -0400
commit69e37fbf52993a47e450201ed9b7e65a0b28f294 (patch)
treea95e58dd91790c36b8218f2e7b4388580d061695 /CONTRIBUTING.md
parent05690fddfa8729fefaffff41ed0ea6abf432ccd0 (diff)
downloadcups-69e37fbf52993a47e450201ed9b7e65a0b28f294.tar.gz
Update top-level documentation files in preparation for the 2.3.0 release.
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md11
1 files changed, 6 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be2ab40d5..2421d0d9c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,13 +2,14 @@ Contributing to CUPS
====================
CUPS is developed by Apple Inc. and distributed as open source software under
-the Apache License, Version 2.0. Significant contributions to CUPS must be
-licensed to Apple using the Apple Contributor Agreement:
+the Apache License, Version 2.0 with exceptions to allow linking to GPL2/LGPL2
+code. Significant contributions to CUPS must be licensed to Apple using the
+Apple Contributor Agreement:
https://www.cups.org/AppleContributorAgreement_2011-03-10.pdf
-Contributions should be submitted as attachments to bug reports on the CUPS web
-site. Changes to existing source files should be submitted as unified diffs
-(both Subversion and Git produce this format by default) while new source files
+Contributions should be submitted as attachments to bug reports on the
+[CUPS Github project](https://github.com/apple/cups). Changes to existing
+source files should be submitted as unified diffs while new source files
should be provided as-is or in an archive. Github pull requests can also be
used to submit changes.