Merge pull request #4863 from ocaml/doc-custom-license

Document custom licenses
ocaml · Nov 19, 2021 · d6bedef · d6bedef
2 parents 8dc565d + 9974973
commit d6bedef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/doc/pages/Manual.md b/doc/pages/Manual.md
@@ -802,8 +802,9 @@ files.
   a list of strings listing the original authors of the software.
 
 - <a id="opamfield-license">`license: [ <string> ... ]`</a>:
-  The SPDX ID of the license(s) under which the source software is available
-  (see http://spdx.org/licenses/).
+  The SPDX expression of the license(s) under which the source software is available
+  (see http://spdx.org/licenses/). The [SPDX standard](https://spdx.github.io/spdx-spec/SPDX-license-expressions/) allows to define custom licenses if necessary using the `LicenseRef-your-custom-name` syntax (e.g. `license: "LicenseRef-My-Custom-Non-Commercial-License"`).
+  When several licenses are defined, the combination of them is equivalent to a single license expression separated by `AND`. For instance: `license: ["MIT" "ISC"]` is equivalent to `license: "MIT AND ISC"`. 
 
 - <a id="opamfield-homepage">`homepage: [ <string> ... ]`</a>,
   <a id="opamfield-doc">`doc: [ <string> ... ]`</a>,

diff --git a/master_changes.md b/master_changes.md
@@ -172,6 +172,7 @@ users)
   * Standardise `macOS` use [#4782 @kit-ty-kate]
   * Fix `span` tag in mannual [#4855 @rjbou - fix #4848]
   * Add `avoid-version` doc [#4896 @AltGR - fix #4864]
+  * Document custom licenses [#4863 @kit-ty-kate - fix #4862]
 
 ## Security fixes
   *