diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cca74ad40991e..db860e2e934c4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,7 +40,7 @@ cask :v1 => 'alfred' do url 'https://cachefly.alfredapp.com/Alfred_2.3_264.zip' name 'Alfred' homepage 'http://www.alfredapp.com/' - license :commercial + license :freemium app 'Alfred 2.app' app 'Alfred 2.app/Contents/Preferences/Alfred Preferences.app' diff --git a/doc/CASK_LANGUAGE_REFERENCE.md b/doc/CASK_LANGUAGE_REFERENCE.md index 2a18256c4d83d..e4d4ee689e323 100644 --- a/doc/CASK_LANGUAGE_REFERENCE.md +++ b/doc/CASK_LANGUAGE_REFERENCE.md @@ -44,7 +44,7 @@ cask :v1 => 'alfred' do url 'https://cachefly.alfredapp.com/Alfred_2.3_264.zip' name 'Alfred' homepage 'http://www.alfredapp.com/' - license :commercial + license :freemium app 'Alfred 2.app' app 'Alfred 2.app/Contents/Preferences/Alfred Preferences.app' @@ -362,27 +362,28 @@ open source. Chromium licensing is described by the generic category [`:oss`](h ### Valid Licenses -| symbol | generic category | meaning | URL | -| ---------------- | ---------------- | ----------------------------------------------- | ----------- | -| `:gratis` | `:closed` | free-to-use, closed source | -| `:commercial` | `:closed` | not free to use | -| `:affero` | `:oss` | Affero General Public License | -| `:apache` | `:oss` | Apache Public License | -| `:arphic` | `:oss` | Arphic Public License | -| `:artistic` | `:oss` | Artistic License | -| `:bsd` | `:oss` | BSD License | -| `:cc` | `:oss` | Creative Commons License | -| `:eclipse` | `:oss` | Eclipse Public License | -| `:gpl` | `:oss` | GNU Public License | -| `:isc` | `:oss` | Internet Systems Consortium License | -| `:lppl` | `:oss` | LaTeX Project Public License | -| `:ncsa` | `:oss` | University of Illinois/NCSA Open Source License | -| `:mit` | `:oss` | MIT License | -| `:mpl` | `:oss` | Mozilla Public License | -| `:ofl` | `:oss` | SIL Open Font License | -| `:public_domain` | `:oss` | not copyrighted | -| `:ubuntu_font` | `:oss` | Ubuntu Font License | -| `:x11` | `:oss` | X Consortium License | +| symbol | generic category | meaning | URL | +| ---------------- | ---------------- | ------------------------------------------------------------------ | ----------- | +| `:gratis` | `:closed` | free-to-use, closed source | +| `:commercial` | `:closed` | not free to use | +| `:freemium` | `:closed` | free-to-use, payment required for full or additional functionality | +| `:affero` | `:oss` | Affero General Public License | +| `:apache` | `:oss` | Apache Public License | +| `:arphic` | `:oss` | Arphic Public License | +| `:artistic` | `:oss` | Artistic License | +| `:bsd` | `:oss` | BSD License | +| `:cc` | `:oss` | Creative Commons License | +| `:eclipse` | `:oss` | Eclipse Public License | +| `:gpl` | `:oss` | GNU Public License | +| `:isc` | `:oss` | Internet Systems Consortium License | +| `:lppl` | `:oss` | LaTeX Project Public License | +| `:ncsa` | `:oss` | University of Illinois/NCSA Open Source License | +| `:mit` | `:oss` | MIT License | +| `:mpl` | `:oss` | Mozilla Public License | +| `:ofl` | `:oss` | SIL Open Font License | +| `:public_domain` | `:oss` | not copyrighted | +| `:ubuntu_font` | `:oss` | Ubuntu Font License | +| `:x11` | `:oss` | X Consortium License | ## Tags Stanza Details diff --git a/lib/cask/dsl/license.rb b/lib/cask/dsl/license.rb index 318c2e841b23f..418eb12de0e61 100644 --- a/lib/cask/dsl/license.rb +++ b/lib/cask/dsl/license.rb @@ -12,7 +12,7 @@ class Cask::DSL::License :commercial => :closed, :gratis => :closed, :abandoned => :closed, # undocumented, should not be used yet - :freemium => :closed, # undocumented, should not be used yet + :freemium => :closed, :trial => :closed, # undocumented, should not be used yet :oss => :oss,