Diff
checker
テキスト
テキスト
画像
ドキュメント
Excel
フォルダ
Legal
Enterprise
デスクトップ
料金
ログイン
Diffchecker デスクトップのダウンロード
テキスト比較
2 つのテキスト ファイルの違いを見つける
ツール
履歴
表示
レイアウト
分割
統合
ライブエディター
空白の変更を非表示
未変更行を折りたたむ
折り返しなし
比較精度
スマート
構文
なし
外観を変更
処理
無視
テキスト変換
最初の差分へ移動
入力を編集
Diffchecker Desktop
Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手:あなたの差分はコンピューターから出ることはありません!
Desktopを入手
Untitled diff
作成日
12 年前
差分は期限切れになりません
クリア
エクスポート
共有
説明
200 削除
行
合計
削除
文字
合計
削除
この機能を引き続き使用するには、アップグレードしてください
Diff
checker
Pro
価格を見る
139 行
すべてコピー
186 追加
行
合計
追加
文字
合計
追加
この機能を引き続き使用するには、アップグレードしてください
Diff
checker
Pro
価格を見る
154 行
すべてコピー
コピー
コピー済み
コピー
コピー済み
The Apache Software Foundation
Numenta, Inc.
Individual
Contributor License
Agreement ("Agreement
")
V2
.0
Contributor License
("CL
")
V1
.0
http://
www.apache
.org/licenses/
http://
numenta
.org/licenses/
コピー
コピー済み
コピー
コピー済み
Thank you for your interest in
The Apache Software Foundation (the
Thank you for your interest in
contributing to Numenta, Inc.
"Foundation"). In order to clarify the intellectual property license
("Numenta"). Numenta is very interested in receiving Your Contribution
granted with Contributions from any person or entity, the Foundation
(defined below). In order to participate, we need to confirm how the
must have a Contributor License Agreement ("CLA") on file that has
rights in Your Contribution will be handled. Following the practices
been signed by each Contributor, indicating agreement to the license
of other open source communities, Numenta requests that you grant
terms below
. This license is for your protection as a
Contributor as
Numenta a license, as indicated below, to the intellectual property
well as the protection of
the Foundation
and its users; it does
not
rights in Your Contributions. Numenta requires that you have a
change your rights to use
y
our
own
Contributions for any other purpose.
Contributor License ("CL") on file prior to using any of Your
If you have not already done so, please complete and sign, then scan
Contributions. This helps us ensure that the intellectual property
and email a pdf file of this Agreement to secretary@apache.org.
embodied within Numenta Products remains unencumbered for use by the
Alternatively, you may send it by facsimile to the Foundation at
whole of the community
. This license is for your protection as a
+1-919-573-9199. If necessary, send an original signed Agreement to
Contributor as
well as the protection of
Numenta
and its users; it does
The Apache Software Foundation, Dept. 9660, Los Angeles,
not
change your rights to use
Y
our
Contributions for any other purpose.
CA 90084-9660, U.S.A. Please read this
document carefully before
signing and keep a
copy for your records.
Please review and submit this CL online at
http://numenta.org/licenses/cl/
Please read the following
document carefully before
signing and keep a
copy for your records.
Full name: ______________________________________________________
Full name: ______________________________________________________
(optional) Public name: _________________________________________
(optional) Public name: _________________________________________
Mailing Address: ________________________________________________
Mailing Address: ________________________________________________
________________________________________________
________________________________________________
Country: ______________________________________________________
Country: ______________________________________________________
Telephone: ______________________________________________________
Telephone: ______________________________________________________
E-Mail: ______________________________________________________
E-Mail: ______________________________________________________
コピー
コピー済み
コピー
コピー済み
(optional) preferred Apache id(s): ______________________________
(optional) notify project: ______________________________________
(optional) notify project: ______________________________________
コピー
コピー済み
コピー
コピー済み
 
Terms and Conditions
You accept and agree to the following terms and conditions for Your
You accept and agree to the following terms and conditions for Your
コピー
コピー済み
コピー
コピー済み
present and future Contributions submitted to
the Found
ation
. In
present and future Contributions submitted to
Numenta, in consider
ation
return,
the
Foundation shall not use
Your Contributions in
a way that
for
the
potential inclusion of
Your Contributions in
Numenta Products.
is contrary to the public benefit or inconsistent with its nonprofit
Except for the license and rights granted herein to Numenta and
status and bylaws in effect at the time of the Contribution. Except
recipients of software distributed or otherwise made available by
for the license granted herein to the Foundation and recipients of
Numenta
, You reserve all right, title,
and interest in and to Your
software distributed by the Foundation
, You reserve all right, title,
Contributions.
and interest in and to Your
Contributions.
1. Definitions.
1. Definitions.
コピー
コピー済み
コピー
コピー済み
"You" (or "Your") shall mean the copyright owner or legal entity
1.1
"You" (or "Your") shall mean the copyright owner or legal entity
authorized by the copyright owner that is making this Agreement
authorized by the copyright owner that is making this Agreement
with
with
the Foundation
. For legal entities, the entity making a
Numenta
. For legal entities, the entity making a
Contribution and all
Contribution and all
other entities that control, are controlled
other entities that control, are controlled
by, or are under common
by, or are under common
control with that entity are considered to
control with that entity are considered to
be a single Contributor. For
be a single Contributor. For
the purposes of this definition,
the purposes of this definition,
"control" means (
a
) the power, direct
"control" means (
i
) the power, direct
or indirect, to cause the
or indirect, to cause the
direction or management of such entity,
direction or management of such entity,
whether by contract or
whether by contract or
otherwise, or (
b
) ownership of fifty percent
otherwise, or (
ii
) ownership of fifty percent
(50%) or more of the
(50%) or more of the
outstanding shares, or (
c
) beneficial ownership of
outstanding shares, or (
iii
) beneficial ownership of
such entity.
such entity.
コピー
コピー済み
コピー
コピー済み
"Contribution"
shall
mean
any original work of authorship
,
1.2
"Contribution"
mean
s
any original work of authorship
(including
including any
modifications or additions to an existing work, that
software, documentation, or other material),
including any
is intentionally
submitted by You to
the Foundation
for inclusion
modifications or additions to an existing work, that
is intentionally
in, or documentation of, any
of the products owned or managed by
submitted by You to
Numenta
for inclusion
in, or documentation of, any
the Foundation
(the "Work").
For the
purposes of this definition,
of the products owned or managed by
Numenta
(the "Work").
For the
"submitted" means any form of electronic,
verbal, or written
purposes of this definition,
"submitted" means any form of electronic,
communication sent to
the Foundation
or its
representatives,
verbal, or written
communication sent to
Numenta
or its
including but not limited to communication on
electronic mailing
representatives,
including but not limited to communication on
lists, source code control systems, and issue
tracking systems that
electronic mailing
lists, source code control systems, and issue
are managed by, or on behalf of,
the Foundation
for the
purpose of
tracking systems that
are managed by, or on behalf of,
Numenta
for the
discussing and improving the Work, but excluding
communication that
purpose of
discussing and improving the Work, but excluding
is conspicuously marked or otherwise designated in
writing by You
communication that
is conspicuously marked or otherwise designated in
as "Not a Contribution."
writing by You
as "Not a Contribution."
コピー
コピー済み
コピー
コピー済み
2. Grant of Copyright License.
Subject to the terms and conditions of
2. Grant of Copyright License.
this Agreement, You hereby grant
to
the Foundation
and to
recipients of software distributed by
the Foundation a
perpetual,
Subject to the terms and conditions of
this Agreement, You hereby grant
worldwide, non-exclusive, no-charge, royalty-free,
irrevocable
to
Numenta
and to
recipients of software distributed by
Numenta a
copyright license to reproduce, prepare derivative works
of,
perpetual,
worldwide, non-exclusive, no-charge, royalty-free,
publicly display, publicly perform, sublicense, and distribute Your
irrevocable
copyright license to reproduce, prepare derivative works
of,
publicly display, publicly perform, sublicense, and distribute Your
Contributions and such derivative works.
Contributions and such derivative works.
コピー
コピー済み
コピー
コピー済み
3. Grant of Patent License.
Subject to the terms and conditions of
3. Grant of Patent License.
this Agreement, You hereby grant to the Foundation and to
recipients of software distributed by the Foundation a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) 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. If any
entity institutes patent litigation against You or any other entity
(including a cross-claim or counterclaim in a lawsuit) alleging
that your Contribution, or the Work to which you have contributed,
constitutes direct or contributory patent infringement, then any
patent licenses granted to that entity under this Agreement for
that Contribution or Work shall terminate as of the date such
litigation is filed.
コピー
コピー済み
コピー
コピー済み
4. You represent that you are legally entitled to grant the above
Subject to the terms and conditions of this Agreement, You hereby grant
license. If your employer(s) has rights to intellectual property
to Numenta and to recipients of software distributed by Numenta a
that you create that includes your Contributions, you represent
perpetual, worldwide, non-exclusive, no-charge, royalty-free,
that you have received permission to make Contributions on behalf
irrevocable (except as stated in this section) patent license to make,
of that employer, that your employer has waived such rights for
have made, use, offer to sell, sell, import, and otherwise transfer the
your Contributions to the Foundation, or that your employer has
Work, where such license applies only to those patent claims licensable
executed a separate Corporate CLA with the Foundation.
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. If any entity institutes patent
litigation against You or any other entity (including a cross-claim or
counterclaim in a lawsuit) alleging that your Contribution, or the Work
to which you have contributed, constitutes direct or contributory
patent infringement, then any patent licenses granted to that entity
under this Agreement for that Contribution or Work shall terminate as
of the date such litigation is filed.
コピー
コピー済み
コピー
コピー済み
5. You represent that each of Your Contributions is Your original
4. Representations
creation (see section 7 for submissions on behalf of others). You
represent that Your Contribution submissions include complete
details of any third-party license or other restriction (including,
but not limited to, related patents and trademarks) of which you
are personally aware and which are associated with any part of Your
Contributions.
コピー
コピー済み
コピー
コピー済み
6. You are not expected to provide support for Your Contributions,
4.1 You represent that you are legally entitled to grant the above
except to the extent You desire to provide support. You may provide
license under this CL, whether on behalf of Yourself (if you are an
support for free, for a fee, or not at all. Unless required by
individual person) or on behalf of the entity that You represent (if
applicable law or agreed to in writing, You provide Your
You are an entity). If You are an individual and Your employer(s) has
Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
rights to intellectual property that You create that includes Your
OF ANY KIND, either express or implied, including, without
Contributions, You represent that You have received permission to make
limitation, any warranties or conditions of TITLE, NON-
Contributions on behalf of that employer, that Your employer has waived
INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
such rights for Your Contributions to Numenta, or that Your employer
has executed a separate CL with Numenta.
コピー
コピー済み
コピー
コピー済み
7. Should
You
wish to submit work
that
is not
Your original
creation
,
4.2
You
represent
that
each of Your Contributions is
Your original
You may submit it to
the
Foundation separately from any
creation
(see section 6 for submissions on behalf of o
the
rs). You
Contribution
, identifying the
complete details
of
its source and of
represent that Your
Contribution
submissions include
complete details
any
license or other restriction (including, but not
limited to,
of
any
third-party
license or other restriction (including, but not
related patents
,
trademarks
, and license agreements
) of which you
limited to,
related patents
and
trademarks
) of which you
are personally
are personally
aware
,
and
conspicuously marking the work as
aware
and
which are associated with any
part
of Your Contributions
.
"Submitted on behalf of a third-
part
y: [named here]"
.
コピー
コピー済み
コピー
コピー済み
8.
You agree to notify
the Foundation
of any facts or circumstances of
5. Support
which you
become aware that would make these representations
inaccurate in any
respect.
You are not expected to provide support for Your Contributions, except
to the extent You desire to provide support. You may provide support
for free, for a fee, or not at all. Unless required by applicable law
or agreed to in writing, You provide Your Contributions on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions of
TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS 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 Numenta 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
Numenta
of any facts or circumstances of
which you
become aware that would make these representations
inaccurate in any
respect.
コピー
コピー済み
コピー
コピー済み
Please sign: __________________________________ Date: ________________
Please sign: __________________________________ Date: ________________
コピー
コピー済み
コピー
コピー済み
保存された差分
原文
ファイルを開く
The Apache Software Foundation Individual Contributor License Agreement ("Agreement") V2.0 http://www.apache.org/licenses/ Thank you for your interest in The Apache Software Foundation (the "Foundation"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Foundation must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the Foundation and its users; it does not change your rights to use your own Contributions for any other purpose. If you have not already done so, please complete and sign, then scan and email a pdf file of this Agreement to secretary@apache.org. Alternatively, you may send it by facsimile to the Foundation at +1-919-573-9199. If necessary, send an original signed Agreement to The Apache Software Foundation, Dept. 9660, Los Angeles, CA 90084-9660, U.S.A. Please read this document carefully before signing and keep a copy for your records. Full name: ______________________________________________________ (optional) Public name: _________________________________________ Mailing Address: ________________________________________________ ________________________________________________ Country: ______________________________________________________ Telephone: ______________________________________________________ E-Mail: ______________________________________________________ (optional) preferred Apache id(s): ______________________________ (optional) notify project: ______________________________________ You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Foundation. In return, the Foundation shall not use Your Contributions in a way that is contrary to the public benefit or inconsistent with its nonprofit status and bylaws in effect at the time of the Contribution. Except for the license granted herein to the Foundation and recipients of software distributed by the Foundation, You reserve all right, title, and interest in and to Your Contributions. 1. Definitions. "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with the Foundation. 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 (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the Foundation for inclusion in, or documentation of, any of the products owned or managed by the Foundation (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Foundation 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, the Foundation 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 the Foundation and to recipients of software distributed by the Foundation 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 the Foundation and to recipients of software distributed by the Foundation a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) 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. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. 4. You represent that you are legally entitled to grant the above license. If 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 the Foundation, or that your employer has executed a separate Corporate CLA with the Foundation. 5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions. 6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. 7. Should You wish to submit work that is not Your original creation, You may submit it to the Foundation 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]". 8. You agree to notify the Foundation of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect. Please sign: __________________________________ Date: ________________
変更されたテキスト
ファイルを開く
Numenta, Inc. Contributor License ("CL") V1.0 http://numenta.org/licenses/ Thank you for your interest in contributing to Numenta, Inc. ("Numenta"). Numenta 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, Numenta requests that you grant Numenta a license, as indicated below, to the intellectual property rights in Your Contributions. Numenta requires that you have a Contributor License ("CL") on file prior to using any of Your Contributions. This helps us ensure that the intellectual property embodied within Numenta Products remains unencumbered for use by the whole of the community. This license is for your protection as a Contributor as well as the protection of Numenta and its users; it does not change your rights to use Your Contributions for any other purpose. Please review and submit this CL online at http://numenta.org/licenses/cl/ Please read the following document carefully before signing and keep a copy for your records. Full name: ______________________________________________________ (optional) Public name: _________________________________________ Mailing Address: ________________________________________________ ________________________________________________ Country: ______________________________________________________ Telephone: ______________________________________________________ E-Mail: ______________________________________________________ (optional) notify project: ______________________________________   Terms and Conditions You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Numenta, in consideration for the potential inclusion of Your Contributions in Numenta Products. Except for the license and rights granted herein to Numenta and recipients of software distributed or otherwise made available by Numenta, 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 Numenta. 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 Numenta for inclusion in, or documentation of, any of the products owned or managed by Numenta (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Numenta 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, Numenta 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 Numenta and to recipients of software distributed by Numenta 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 Numenta and to recipients of software distributed by Numenta a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) 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. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. 4. Representations 4.1 You represent that you are legally entitled to grant the above license under this CL, 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 Numenta, or that Your employer has executed a separate CL with Numenta. 4.2 You represent that each of Your Contributions is Your original creation (see section 6 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions. 5. Support You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS 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 Numenta 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 Numenta of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect. Please sign: __________________________________ Date: ________________
違いを見つける