aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2022-11-21 09:11:01 -0800
committerMark Otto <[email protected]>2022-12-20 14:24:43 -0800
commitcf3c1535e63affb87cb905c33979e814fa484778 (patch)
tree7757c82f43bca10d64a5008b48c267b0c86970d9
parentefce82977789898a875cfb2b824bc99ac52b18d0 (diff)
downloadbootstrap-cf3c1535e63affb87cb905c33979e814fa484778.tar.xz
bootstrap-cf3c1535e63affb87cb905c33979e814fa484778.zip
Update docs and package information to clarify license
-rw-r--r--LICENSE1
-rw-r--r--README.md2
-rw-r--r--build/build-plugins.js1
-rw-r--r--build/change-version.js1
-rw-r--r--build/generate-sri.js1
-rw-r--r--build/vnu-jar.js1
-rw-r--r--dist/css/bootstrap-grid.css1
-rw-r--r--package.json3
-rw-r--r--site/content/docs/5.2/about/license.md6
9 files changed, 4 insertions, 13 deletions
diff --git a/LICENSE b/LICENSE
index dda75ca9a..c11d10ff8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,5 @@
The MIT License (MIT)
-Copyright (c) 2011-2022 Twitter, Inc.
Copyright (c) 2011-2022 The Bootstrap Authors
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/README.md b/README.md
index c6709b170..996de0f48 100644
--- a/README.md
+++ b/README.md
@@ -244,4 +244,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
## Copyright and license
-Code and documentation copyright 2011–2022 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
+Code and documentation copyright 2011–2022 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
diff --git a/build/build-plugins.js b/build/build-plugins.js
index b6ce58df8..a29e83d83 100644
--- a/build/build-plugins.js
+++ b/build/build-plugins.js
@@ -3,7 +3,6 @@
/*!
* Script to build our plugins to use them separately.
* Copyright 2020-2022 The Bootstrap Authors
- * Copyright 2020-2022 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
diff --git a/build/change-version.js b/build/change-version.js
index 57c5fdec8..0de927d77 100644
--- a/build/change-version.js
+++ b/build/change-version.js
@@ -3,7 +3,6 @@
/*!
* Script to update version number references in the project.
* Copyright 2017-2022 The Bootstrap Authors
- * Copyright 2017-2022 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
diff --git a/build/generate-sri.js b/build/generate-sri.js
index ef1b39f97..652955721 100644
--- a/build/generate-sri.js
+++ b/build/generate-sri.js
@@ -6,7 +6,6 @@
* otherwise the hashes won't match!
*
* Copyright 2017-2022 The Bootstrap Authors
- * Copyright 2017-2022 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
diff --git a/build/vnu-jar.js b/build/vnu-jar.js
index f29eeb722..4da9b53c8 100644
--- a/build/vnu-jar.js
+++ b/build/vnu-jar.js
@@ -3,7 +3,6 @@
/*!
* Script to run vnu-jar if Java is available.
* Copyright 2017-2022 The Bootstrap Authors
- * Copyright 2017-2022 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
diff --git a/dist/css/bootstrap-grid.css b/dist/css/bootstrap-grid.css
index 4691f7927..56063b774 100644
--- a/dist/css/bootstrap-grid.css
+++ b/dist/css/bootstrap-grid.css
@@ -1,7 +1,6 @@
/*!
* Bootstrap Grid v5.2.3 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
:root {
diff --git a/package.json b/package.json
index db6ee774b..d5daaf491 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,6 @@
],
"homepage": "https://getbootstrap.com/",
"author": "The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)",
- "contributors": [
- "Twitter, Inc."
- ],
"license": "MIT",
"repository": {
"type": "git",
diff --git a/site/content/docs/5.2/about/license.md b/site/content/docs/5.2/about/license.md
index 07e60e00a..8698b1a3b 100644
--- a/site/content/docs/5.2/about/license.md
+++ b/site/content/docs/5.2/about/license.md
@@ -5,7 +5,7 @@ description: Commonly asked questions about Bootstrap's open source license.
group: about
---
-Bootstrap is released under the MIT license and is copyright {{< year >}} Twitter. Boiled down to smaller chunks, it can be described with the following conditions.
+Bootstrap is released under the MIT license and is copyright {{< year >}}. Boiled down to smaller chunks, it can be described with the following conditions.
## It requires you to:
@@ -23,8 +23,8 @@ Bootstrap is released under the MIT license and is copyright {{< year >}} Twitte
- Hold the authors and license owners liable for damages as Bootstrap is provided without warranty
- Hold the creators or copyright holders of Bootstrap liable
- Redistribute any piece of Bootstrap without proper attribution
-- Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution
-- Use any marks owned by Twitter in any way that might state or imply that you created the Twitter software in question
+- Use any marks owned by Bootstrap in any way that might state or imply that Bootstrap endorses your distribution
+- Use any marks owned by Bootstrap in any way that might state or imply that you created the Bootstrap software in question
## It does not require you to: