Skip to content

Commit

Permalink
Tweaks to Licence, Copyright and Readme for clarity.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdtoy committed Dec 9, 2013
1 parent ea2447a commit ffcf891
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 219 deletions.
27 changes: 0 additions & 27 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,30 +174,3 @@ http://www.apache.org/licenses/
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
189 changes: 0 additions & 189 deletions LICENSE.txt

This file was deleted.

10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,13 @@ Thanks!

## Copyright and License

Copyright 2013 Cloudsoft Corporation, ltd.
© 2011 - 2013 Cloudsoft Corporation Limited.

Licensed under the Apache License, Version 2.0:
You may obtain a copy of the License in the LICENSE file, or at: [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. The licence is provided in LICENSE.md, and you may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

brooklyn is a registered trademark of Cloudsoft Corporation.

0 comments on commit ffcf891

Please sign in to comment.