Skip to content

Commit

Permalink
update copyright blurbs for new company name
Browse files Browse the repository at this point in the history
  • Loading branch information
Dave Peterson committed Oct 22, 2014
1 parent 4a9bf69 commit a8a14c7
Show file tree
Hide file tree
Showing 441 changed files with 512 additions and 512 deletions.
2 changes: 1 addition & 1 deletion AUTHORS.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bruce's core implementation was written by
[Dave Peterson](https://github.com/dspeterson). Bruce also contains code
written by former Tagged employees who worked on the
written by former Tagged/if(we) employees who worked on the
[Stig Database Project](http://www.stigdb.org/). These contributors include
[Jason Lucas](https://github.com/jasonl9000),
[Joris Van Remoortere](https://github.com/jmlvanre),
Expand Down
20 changes: 10 additions & 10 deletions CLA-appendix.md
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
Tagged, Inc.
if(we), Inc.
Appendix to the Contributor License Agreement, v1.0
http://tagged.com
http://www.ifwe.co

The Tagged, Inc. ("Tagged") Contributor License Agreement ("CLA") is based upon that of [Numenta](http://numenta.org/licenses/cl/numenta-cl.txt).
The if(we), Inc. ("if(we)") Contributor License Agreement ("CLA") is based upon that of [Numenta](http://numenta.org/licenses/cl/numenta-cl.txt).

The Numenta CLA is itself based upon the [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.txt).

The purpose of this document is to explain some of the differences between the Tagged CLA and the Numenta CL.
The purpose of this document is to explain some of the differences between the if(we) CLA and the Numenta CL.

If you diff the Tagged CLA against the Numenta CL you'll find that most of the changes are nominative: We simply had to change the name of the organization to which people are contributing.
If you diff the if(we) CLA against the Numenta CL you'll find that most of the changes are nominative: We simply had to change the name of the organization to which people are contributing.

While there are several other minor changes to the Numenta CL, there are two places where the Tagged CLA diverges fairly significantly:
While there are several other minor changes to the Numenta CL, there are two places where the if(we) CLA diverges fairly significantly:

* The final sentence of the first paragraph of the Numenta CL has been struck from the Tagged CLA.
* The final sentence of section 3 of the Numenta CL has been struck from the Tagged CLA.
* The final sentence of the first paragraph of the Numenta CL has been struck from the if(we) CLA.
* The final sentence of section 3 of the Numenta CL has been struck from the if(we) CLA.

In both cases these sentences were removed on the advice of our lawyers. They advised that these sentences were either incorrect legally (in the case of the former) or were inadvisable (in the case of the latter).

Tagged welcomes feedback on the CLA document and the process surrounding it. Please raise all concerns by opening a GitHub issue on this project so the community may have a public discussion.
if(we) welcomes feedback on the CLA document and the process surrounding it. Please raise all concerns by opening a GitHub issue on this project so the community may have a public discussion.

-----

CLA-appendix.md: Copyright 2014 Tagged, Inc.
CLA-appendix.md: Copyright 2014 if(we), Inc.

CLA-appendix.md is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.

Expand Down
22 changes: 11 additions & 11 deletions CLA.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Tagged, Inc.
if(we), Inc.
Contributor License Agreement, v1.0
http://tagged.com
http://www.ifwe.co

Thank you for your interest in contributing to Tagged, Inc ("Tagged"). Tagged is very interested in receiving Your Contribution (defined below). In order to participate, we need to confirm how the rights in Your Contribution will be handled. Following the practices of other open source communities, Tagged requests that you grant Tagged a license, as indicated below, to the intellectual property rights in Your Contributions. Tagged requires that you have an executed Agreement on file prior to using any of Your Contributions. This helps us ensure that the intellectual property embodied within Tagged products remains unencumbered for use by the whole community.
Thank you for your interest in contributing to if(we), Inc ("if(we)"). if(we) is very interested in receiving Your Contribution (defined below). In order to participate, we need to confirm how the rights in Your Contribution will be handled. Following the practices of other open source communities, if(we) requests that you grant if(we) a license, as indicated below, to the intellectual property rights in Your Contributions. if(we) requires that you have an executed Agreement on file prior to using any of Your Contributions. This helps us ensure that the intellectual property embodied within if(we) products remains unencumbered for use by the whole community.

Please review and submit this Agreement per [the instructions](./CLA_Process.md).

Expand Down Expand Up @@ -33,31 +33,31 @@ Please read the following document carefully before signing and keep a copy for

## Terms and Conditions

You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Tagged, in consideration for the potential inclusion of Your Contributions in Tagged products. Except for the license and rights granted herein to Tagged and recipients of software distributed or otherwise made available by Tagged, You reserve all right, title, and interest in and to Your Contributions.
You accept and agree to the following terms and conditions for Your present and future Contributions submitted to if(we), in consideration for the potential inclusion of Your Contributions in if(we) products. Except for the license and rights granted herein to if(we) and recipients of software distributed or otherwise made available by if(we), You reserve all right, title, and interest in and to Your Contributions.

## 1. Definitions

### 1.1

"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Tagged. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares, or (c) beneficial ownership of such entity.
"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with if(we). For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares, or (c) beneficial ownership of such entity.

### 1.2

"Contribution" means any original work of authorship (including software, documentation, or other material), including any modifications or additions to an existing work, that is intentionally submitted by You to Tagged for inclusion in, or documentation of, any of the products owned or managed by Tagged (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Tagged or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Tagged for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
"Contribution" means any original work of authorship (including software, documentation, or other material), including any modifications or additions to an existing work, that is intentionally submitted by You to if(we) for inclusion in, or documentation of, any of the products owned or managed by if(we) (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to if(we) or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, if(we) for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."

## 2. Grant of Copyright License.

Subject to the terms and conditions of this Agreement, You hereby grant to Tagged and to recipients of software distributed by Tagged a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
Subject to the terms and conditions of this Agreement, You hereby grant to if(we) and to recipients of software distributed by if(we) a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.

## 3. Grant of Patent License.

Subject to the terms and conditions of this Agreement, You hereby grant to Tagged and to recipients of software distributed by Tagged a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted.
Subject to the terms and conditions of this Agreement, You hereby grant to if(we) and to recipients of software distributed by if(we) a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted.

## 4. Representations

### 4.1

You represent that you are legally entitled to grant the above licenses under this Agreement, whether on behalf of Yourself (if you are an individual person) or on behalf of the entity that You represent (if You are an entity). If You are an individual and Your employer(s) has rights to intellectual property that You create that includes Your Contributions, You represent that You have received permission to make Contributions on behalf of that employer, that Your employer has waived such rights for Your Contributions to Tagged, or that Your employer has executed a separate Agreement with Tagged.
You represent that you are legally entitled to grant the above licenses under this Agreement, whether on behalf of Yourself (if you are an individual person) or on behalf of the entity that You represent (if You are an entity). If You are an individual and Your employer(s) has rights to intellectual property that You create that includes Your Contributions, You represent that You have received permission to make Contributions on behalf of that employer, that Your employer has waived such rights for Your Contributions to if(we), or that Your employer has executed a separate Agreement with if(we).

### 4.2

Expand All @@ -69,11 +69,11 @@ You are not expected to provide support for Your Contributions, except to the ex

## 6. Work from Others

Should You wish to submit work that is not Your original creation, You may submit it to Tagged separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
Should You wish to submit work that is not Your original creation, You may submit it to if(we) separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".

## 7. Changes

You agree to notify Tagged promptly of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.
You agree to notify if(we) promptly of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.

```
Please sign: ________________________________________________________
Expand Down
44 changes: 22 additions & 22 deletions CLA.txt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Tagged, Inc.
if(we), Inc.
Contributor License Agreement, v1.0
http://tagged.com
http://www.ifwe.co

Thank you for your interest in contributing to Tagged, Inc. ("Tagged").
Tagged is very interested in receiving Your Contribution (defined
Thank you for your interest in contributing to if(we), Inc. ("if(we)").
if(we) is very interested in receiving Your Contribution (defined
below). In order to participate, we need to confirm how the rights
in Your Contribution will be handled. Following the practices of
other open source communities, Tagged requests that you grant Tagged a
other open source communities, if(we) requests that you grant if(we) a
license, as indicated below, to the intellectual property rights in
Your Contributions. Tagged requires that you have an executed Agreement
Your Contributions. if(we) requires that you have an executed Agreement
on file prior to using any of Your Contributions. This helps us
ensure that the intellectual property embodied within Tagged products
ensure that the intellectual property embodied within if(we) products
remains unencumbered for use by the whole community.

Please review and submit this Agreement per the instructions:
Expand Down Expand Up @@ -39,18 +39,18 @@ a copy for your records.
Terms and Conditions

You accept and agree to the following terms and conditions for Your
present and future Contributions submitted to Tagged, in consideration
for the potential inclusion of Your Contributions in Tagged products.
Except for the license and rights granted herein to Tagged and
present and future Contributions submitted to if(we), in consideration
for the potential inclusion of Your Contributions in if(we) products.
Except for the license and rights granted herein to if(we) and
recipients of software distributed or otherwise made available by
Tagged, You reserve all right, title, and interest in and to Your
if(we), You reserve all right, title, and interest in and to Your
Contributions.

1. Definitions

1.1 "You" (or "Your") shall mean the copyright owner or legal
entity authorized by the copyright owner that is making this
Agreement with Tagged. For legal entities, the entity making a
Agreement with if(we). For legal entities, the entity making a
Contribution and all other entities that control, are controlled by,
or are under common control with that entity are considered to be a
single Contributor. For the purposes of this definition, "control"
Expand All @@ -62,21 +62,21 @@ or (c) beneficial ownership of such entity.
1.2 "Contribution" means any original work of authorship
(including software, documentation, or other material), including
any modifications or additions to an existing work, that is
intentionally submitted by You to Tagged for inclusion in, or
documentation of, any of the products owned or managed by Tagged (the
intentionally submitted by You to if(we) for inclusion in, or
documentation of, any of the products owned or managed by if(we) (the
"Work"). For the purposes of this definition, "submitted" means any
form of electronic, verbal, or written communication sent to Tagged or
form of electronic, verbal, or written communication sent to if(we) or
its representatives, including but not limited to communication on
electronic mailing lists, source code control systems, and issue
tracking systems that are managed by, or on behalf of, Tagged for the
tracking systems that are managed by, or on behalf of, if(we) for the
purpose of discussing and improving the Work, but excluding
communication that is conspicuously marked or otherwise designated in
writing by You as "Not a Contribution."

2. Grant of Copyright License.

Subject to the terms and conditions of this Agreement, You hereby
grant to Tagged and to recipients of software distributed by Tagged a
grant to if(we) and to recipients of software distributed by if(we) a
perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare derivative works
of, publicly display, publicly perform, sublicense, and distribute
Expand All @@ -85,7 +85,7 @@ Your Contributions and such derivative works.
3. Grant of Patent License.

Subject to the terms and conditions of this Agreement, You hereby
grant to Tagged and to recipients of software distributed by Tagged a
grant to if(we) and to recipients of software distributed by if(we) a
perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable patent license to make, have made, use, offer to sell,
sell, import, and otherwise transfer the Work, where such license
Expand All @@ -103,8 +103,8 @@ represent (if You are an entity). If You are an individual and Your
employer(s) has rights to intellectual property that You create that
includes Your Contributions, You represent that You have received
permission to make Contributions on behalf of that employer, that
Your employer has waived such rights for Your Contributions to Tagged,
or that Your employer has executed a separate Agreement with Tagged.
Your employer has waived such rights for Your Contributions to if(we),
or that Your employer has executed a separate Agreement with if(we).

4.2 You represent that each of Your Contributions is Your
original creation (see section 6 for submissions on behalf of
Expand All @@ -129,7 +129,7 @@ FOR A PARTICULAR PURPOSE.
6. Work from Others

Should You wish to submit work that is not Your original creation,
You may submit it to Tagged separately from any Contribution,
You may submit it to if(we) separately from any Contribution,
identifying the complete details of its source and of any license or
other restriction (including, but not limited to, related patents,
trademarks, and license agreements) of which you are personally
Expand All @@ -138,7 +138,7 @@ a third-party: [named here]".

7. Changes

You agree to notify Tagged promptly of any facts or circumstances of
You agree to notify if(we) promptly of any facts or circumstances of
which you become aware that would make these representations
inaccurate in any respect.

Expand Down
Loading

0 comments on commit a8a14c7

Please sign in to comment.