Merge branch 'gh-pages' into gh-pages

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2021 GitHub, Inc. and contributors
+Copyright (c) 2013-2022 GitHub, Inc. and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

_licenses/bsd-2-clause.txt

@@ -31,7 +31,6 @@ limitations:
 BSD 2-Clause License
 
 Copyright (c) [year], [fullname]
-All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

_licenses/bsd-3-clause.txt

@@ -30,7 +30,6 @@ limitations:
 BSD 3-Clause License
 
 Copyright (c) [year], [fullname]
-All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

_licenses/cc-by-sa-4.0.txt

@@ -335,8 +335,8 @@ apply to Your use of the Licensed Material:
      contents in a database in which You have Sui Generis Database
      Rights, then the database in which You have Sui Generis Database
      Rights (but not its individual contents) is Adapted Material,
-
      including for purposes of Section 3(b); and
+
   c. You must comply with the conditions in Section 3(a) if You Share
      all or a substantial portion of the contents of the database.
 

_licenses/upl-1.0.txt

@@ -9,7 +9,7 @@ how: Insert the license or a link to it along with a copyright notice into your
 note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/.
 
 using:
-  Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE
+  Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/main/LICENSE.txt
   Skater: https://github.com/oracle/Skater/blob/master/LICENSE
   Soufflé: https://github.com/souffle-lang/souffle/blob/master/LICENSE
 

community.md

@@ -16,7 +16,7 @@ Some communities have strong preferences for particular licenses. If you want to
 * [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/)
 * [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/master/process/project_proposals.adoc) dictates [Apache License 2.0](/licenses/apache-2.0/) by default
 * [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs
-* [NPM packages](https://libraries.io/search?platforms=NPM) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses
+* [npm packages](https://libraries.io/search?platforms=npm) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses
 * [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/)
 * [Rust](https://rust-lang.github.io/api-guidelines/necessities.html#crate-and-its-dependencies-have-a-permissive-license-c-permissive) crates are overwhelmingly licensed under both [MIT](/licenses/mit/) and [Apache License 2.0](/licenses/apache-2.0/)
 * [WordPress](https://wordpress.org/about/license/) plugins and themes must be [GNU GPLv2](/licenses/gpl-2.0/) (or later)

script/check-approval

@@ -11,7 +11,7 @@ require 'colored'
 require 'fuzzy_match'
 
 # Display usage instructions
-puts File.open(__FILE__).read.scan(/^# .*/)[0...3].join("\n").gsub(/^# /, '') if ARGV.count != 1
+puts File.read(__FILE__).scan(/^# .*/)[0...3].join("\n").gsub(/^# /, '') if ARGV.count != 1
 
 class TrueClass
   def to_s

spec/license_bom_spec.rb

@@ -6,7 +6,7 @@ describe 'byte order marks' do
   Dir["#{licenses_path}/*.txt"].each do |file|
     context "the #{File.basename(file, '.txt')} license" do
       it 'does not begin with a byte order mark' do
-        bom = File.open(file).read.start_with?("\u0000EF\u0000BB\u0000BF")
+        bom = File.read(file).start_with?("\u0000EF\u0000BB\u0000BF")
         msg = 'License file begins with a Byte Order Mark. See https://stackoverflow.com/a/1068700.'
         expect(bom).to eql(false), msg
       end