Skip to content

Commit f9caf29

Browse files
forkiforki
committed
fix LICENSE
1 parent 79e6bf1 commit f9caf29

3 files changed

Lines changed: 215 additions & 36 deletions

File tree

‎FSharpx.Async.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60
1616
ProjectSection(SolutionItems) = preProject
1717
build.fsx = build.fsx
1818
nuget\FSharpx.Async.nuspec = nuget\FSharpx.Async.nuspec
19+
LICENSE.txt = LICENSE.txt
1920
README.md = README.md
2021
RELEASE_NOTES.md = RELEASE_NOTES.md
2122
EndProjectSection
@@ -28,7 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{83F16175
2829
EndProject
2930
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D5255-776D-4B61-85F9-73C37AA1FB9A}"
3031
ProjectSection(SolutionItems) = preProject
31-
docs\content\index.fsx = docs\content\index.fsx
32+
docs\content\index.md = docs\content\index.md
3233
EndProjectSection
3334
EndProject
3435
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"

‎LICENSE.txt‎

Lines changed: 209 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,209 @@
1-
This is free and unencumbered software released into the public domain.
2-
3-
Anyone is free to copy, modify, publish, use, compile, sell, or
4-
distribute this software, either in source code form or as a compiled
5-
binary, for any purpose, commercial or non-commercial, and by any
6-
means.
7-
8-
In jurisdictions that recognize copyright laws, the author or authors
9-
of this software dedicate any and all copyright interest in the
10-
software to the public domain. We make this dedication for the benefit
11-
of the public at large and to the detriment of our heirs and
12-
successors. We intend this dedication to be an overt act of
13-
relinquishment in perpetuity of all present and future rights to this
14-
software under copyright law.
15-
16-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19-
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22-
OTHER DEALINGS IN THE SOFTWARE.
23-
24-
For more information, please refer to <http://unlicense.org/>
1+
Copyright 2010-2015
2+
3+
Steffen Forkmann (http://navision-blog.de/)
4+
Tomas Petricek (http://tomasp.net/)
5+
Ryan Riley (http://panesofglass.org/)
6+
Mauricio Scheffer (http://bugsquash.blogspot.com/)
7+
Jack Fox (http://jackfoxy.com/)
8+
9+
Licensed under the Apache License, Version 2.0 (the "License");
10+
you may not use this file except in compliance with the License.
11+
You may obtain a copy of the License at
12+
13+
http://www.apache.org/licenses/LICENSE-2.0
14+
15+
Unless required by applicable law or agreed to in writing, software
16+
distributed under the License is distributed on an "AS IS" BASIS,
17+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
See the License for the specific language governing permissions and
19+
limitations under the License.
20+
21+
22+
Apache License, Version 2.0
23+
===========================
24+
25+
Apache License
26+
Version 2.0, January 2004
27+
http://www.apache.org/licenses/
28+
29+
------------------------------------------------------------
30+
31+
### TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
32+
33+
34+
**1. Definitions.**
35+
36+
- "License" shall mean the terms and conditions for use, reproduction,
37+
and distribution as defined by Sections 1 through 9 of this document.
38+
39+
- "Licensor" shall mean the copyright owner or entity authorized by
40+
the copyright owner that is granting the License.
41+
42+
- "Legal Entity" shall mean the union of the acting entity and all
43+
other entities that control, are controlled by, or are under common
44+
control with that entity. For the purposes of this definition,
45+
"control" means (i) the power, direct or indirect, to cause the
46+
direction or management of such entity, whether by contract or
47+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
48+
outstanding shares, or (iii) beneficial ownership of such entity.
49+
50+
- "You" (or "Your") shall mean an individual or Legal Entity
51+
exercising permissions granted by this License.
52+
53+
- "Source" form shall mean the preferred form for making modifications,
54+
including but not limited to software source code, documentation
55+
source, and configuration files.
56+
57+
- "Object" form shall mean any form resulting from mechanical
58+
transformation or translation of a Source form, including but
59+
not limited to compiled object code, generated documentation,
60+
and conversions to other media types.
61+
62+
- "Work" shall mean the work of authorship, whether in Source or
63+
Object form, made available under the License, as indicated by a
64+
copyright notice that is included in or attached to the work
65+
(an example is provided in the Appendix below).
66+
67+
- "Derivative Works" shall mean any work, whether in Source or Object
68+
form, that is based on (or derived from) the Work and for which the
69+
editorial revisions, annotations, elaborations, or other modifications
70+
represent, as a whole, an original work of authorship. For the purposes
71+
of this License, Derivative Works shall not include works that remain
72+
separable from, or merely link (or bind by name) to the interfaces of,
73+
the Work and Derivative Works thereof.
74+
75+
- "Contribution" shall mean any work of authorship, including
76+
the original version of the Work and any modifications or additions
77+
to that Work or Derivative Works thereof, that is intentionally
78+
submitted to Licensor for inclusion in the Work by the copyright owner
79+
or by an individual or Legal Entity authorized to submit on behalf of
80+
the copyright owner. For the purposes of this definition, "submitted"
81+
means any form of electronic, verbal, or written communication sent
82+
to the Licensor or its representatives, including but not limited to
83+
communication on electronic mailing lists, source code control systems,
84+
and issue tracking systems that are managed by, or on behalf of, the
85+
Licensor for the purpose of discussing and improving the Work, but
86+
excluding communication that is conspicuously marked or otherwise
87+
designated in writing by the copyright owner as "Not a Contribution."
88+
89+
- "Contributor" shall mean Licensor and any individual or Legal Entity
90+
on behalf of whom a Contribution has been received by Licensor and
91+
subsequently incorporated within the Work.
92+
93+
**2. Grant of Copyright License.**
94+
Subject to the terms and conditions of
95+
this License, each Contributor hereby grants to You a perpetual,
96+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
97+
copyright license to reproduce, prepare Derivative Works of,
98+
publicly display, publicly perform, sublicense, and distribute the
99+
Work and such Derivative Works in Source or Object form.
100+
101+
**3. Grant of Patent License.**
102+
Subject to the terms and conditions of
103+
this License, each Contributor hereby grants to You a perpetual,
104+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
105+
(except as stated in this section) patent license to make, have made,
106+
use, offer to sell, sell, import, and otherwise transfer the Work,
107+
where such license applies only to those patent claims licensable
108+
by such Contributor that are necessarily infringed by their
109+
Contribution(s) alone or by combination of their Contribution(s)
110+
with the Work to which such Contribution(s) was submitted. If You
111+
institute patent litigation against any entity (including a
112+
cross-claim or counterclaim in a lawsuit) alleging that the Work
113+
or a Contribution incorporated within the Work constitutes direct
114+
or contributory patent infringement, then any patent licenses
115+
granted to You under this License for that Work shall terminate
116+
as of the date such litigation is filed.
117+
118+
**4. Redistribution.**
119+
You may reproduce and distribute copies of the
120+
Work or Derivative Works thereof in any medium, with or without
121+
modifications, and in Source or Object form, provided that You
122+
meet the following conditions:
123+
124+
- You must give any other recipients of the Work or
125+
Derivative Works a copy of this License; and
126+
127+
- You must cause any modified files to carry prominent notices
128+
stating that You changed the files; and
129+
130+
- You must retain, in the Source form of any Derivative Works
131+
that You distribute, all copyright, patent, trademark, and
132+
attribution notices from the Source form of the Work,
133+
excluding those notices that do not pertain to any part of
134+
the Derivative Works; and
135+
136+
- If the Work includes a "NOTICE" text file as part of its
137+
distribution, then any Derivative Works that You distribute must
138+
include a readable copy of the attribution notices contained
139+
within such NOTICE file, excluding those notices that do not
140+
pertain to any part of the Derivative Works, in at least one
141+
of the following places: within a NOTICE text file distributed
142+
as part of the Derivative Works; within the Source form or
143+
documentation, if provided along with the Derivative Works; or,
144+
within a display generated by the Derivative Works, if and
145+
wherever such third-party notices normally appear. The contents
146+
of the NOTICE file are for informational purposes only and
147+
do not modify the License. You may add Your own attribution
148+
notices within Derivative Works that You distribute, alongside
149+
or as an addendum to the NOTICE text from the Work, provided
150+
that such additional attribution notices cannot be construed
151+
as modifying the License.
152+
153+
You may add Your own copyright statement to Your modifications and
154+
may provide additional or different license terms and conditions
155+
for use, reproduction, or distribution of Your modifications, or
156+
for any such Derivative Works as a whole, provided Your use,
157+
reproduction, and distribution of the Work otherwise complies with
158+
the conditions stated in this License.
159+
160+
**5. Submission of Contributions.**
161+
Unless You explicitly state otherwise,
162+
any Contribution intentionally submitted for inclusion in the Work
163+
by You to the Licensor shall be under the terms and conditions of
164+
this License, without any additional terms or conditions.
165+
Notwithstanding the above, nothing herein shall supersede or modify
166+
the terms of any separate license agreement you may have executed
167+
with Licensor regarding such Contributions.
168+
169+
**6. Trademarks.**
170+
This License does not grant permission to use the trade
171+
names, trademarks, service marks, or product names of the Licensor,
172+
except as required for reasonable and customary use in describing the
173+
origin of the Work and reproducing the content of the NOTICE file.
174+
175+
**7. Disclaimer of Warranty.**
176+
Unless required by applicable law or
177+
agreed to in writing, Licensor provides the Work (and each
178+
Contributor provides its Contributions) on an "AS IS" BASIS,
179+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
180+
implied, including, without limitation, any warranties or conditions
181+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
182+
PARTICULAR PURPOSE. You are solely responsible for determining the
183+
appropriateness of using or redistributing the Work and assume any
184+
risks associated with Your exercise of permissions under this License.
185+
186+
**8. Limitation of Liability.**
187+
In no event and under no legal theory,
188+
whether in tort (including negligence), contract, or otherwise,
189+
unless required by applicable law (such as deliberate and grossly
190+
negligent acts) or agreed to in writing, shall any Contributor be
191+
liable to You for damages, including any direct, indirect, special,
192+
incidental, or consequential damages of any character arising as a
193+
result of this License or out of the use or inability to use the
194+
Work (including but not limited to damages for loss of goodwill,
195+
work stoppage, computer failure or malfunction, or any and all
196+
other commercial damages or losses), even if such Contributor
197+
has been advised of the possibility of such damages.
198+
199+
**9. Accepting Warranty or Additional Liability.**
200+
While redistributing
201+
the Work or Derivative Works thereof, You may choose to offer,
202+
and charge a fee for, acceptance of support, warranty, indemnity,
203+
or other liability obligations and/or rights consistent with this
204+
License. However, in accepting such obligations, You may act only
205+
on Your own behalf and on Your sole responsibility, not on behalf
206+
of any other Contributor, and only if You agree to indemnify,
207+
defend, and hold each Contributor harmless for any liability
208+
incurred by, or claims asserted against, such Contributor by reason
209+
of your accepting any such warranty or additional liability.

docs/content/index.fsx renamed to docs/content/index.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
(*** hide ***)
2-
// This block of code is omitted in the generated HTML documentation. Use
3-
// it to define helpers that you do not want to show in the documentation.
4-
#I "../../bin"
5-
6-
(**
71
FSharpx.Async
82
=============
93

10-
Documentation
4+
FSharpx.Async is a collection of asynchronous programming utilities for F#.
115

126
<div class="row">
137
<div class="span1"></div>
148
<div class="span6">
159
<div class="well well-small" id="nuget">
16-
The F# ProjectTemplate library can be <a href="https://nuget.org/packages/FSharpx.Async">installed from NuGet</a>:
10+
The FSharpx.Async library can be <a href="https://nuget.org/packages/FSharpx.Async">installed from NuGet</a>:
1711
<pre>PM> Install-Package FSharpx.Async</pre>
1812
</div>
1913
</div>
@@ -34,13 +28,12 @@ the project and submit pull requests. If you're adding a new public API, please
3428
consider adding [samples][content] that can be turned into a documentation. You might
3529
also want to read the [library design notes][readme] to understand how it works.
3630

37-
The library is available under Public Domain license, which allows modification and
31+
The library is available under Apache 2.0 license, which allows modification and
3832
redistribution for both commercial and non-commercial purposes. For more information see the
3933
[License file][license] in the GitHub repository.
4034

4135
[content]: https://github.com/fsprojects/FSharpx.Async/tree/master/docs/content
4236
[gh]: https://github.com/fsprojects/FSharpx.Async
4337
[issues]: https://github.com/fsprojects/FSharpx.Async/issues
4438
[readme]: https://github.com/fsprojects/FSharpx.Async/blob/master/README.md
45-
[license]: https://github.com/fsprojects/FSharpx.Async/blob/master/LICENSE.txt
46-
*)
39+
[license]: https://github.com/fsprojects/FSharpx.Async/blob/master/LICENSE.txt

0 commit comments

Comments
 (0)