Skip to content

Commit

Permalink
Merge pull request #18265 from Homebrew/spdx-license-expr-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
carlocab committed Sep 6, 2024
2 parents b511436 + b03e0e4 commit 9feb56b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Library/Homebrew/formula.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3356,7 +3356,7 @@ def freeze
#
# @!attribute [w] license
# @see https://docs.brew.sh/License-Guidelines Homebrew License Guidelines
# @see https://spdx.github.io/spdx-spec/appendix-IV-SPDX-license-expressions/ SPDX license expression guide
# @see https://spdx.github.io/spdx-spec/latest/annexes/spdx-license-expressions/ SPDX license expression guide
# @api public
def license(args = nil)
if args.nil?
Expand Down
2 changes: 1 addition & 1 deletion docs/License-Guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ license :cannot_represent

## Complex SPDX License Expressions

Some formulae have multiple licenses that need to be combined in different ways. In these cases, a more complex license expression can be used. These expressions are based on the [SPDX License Expression Guidelines](https://spdx.github.io/spdx-spec/latest/SPDX-license-expressions/).
Some formulae have multiple licenses that need to be combined in different ways. In these cases, a more complex license expression can be used. These expressions are based on the [SPDX License Expression Guidelines](https://spdx.github.io/spdx-spec/latest/annexes/spdx-license-expressions/).

Add a `+` to indicate that the user can choose a later version of the same license:

Expand Down

0 comments on commit 9feb56b

Please sign in to comment.