From 2d73d3d1d4b0997c3d89dd84cbe99e83f989a2a6 Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Tue, 14 Nov 2017 12:21:05 -0800 Subject: [PATCH] docs: Move license declaration from README.md to LICENSE. --- LICENSE | 46 +++++++++++++++++++++------------------------- README.md | 23 ++--------------------- 2 files changed, 23 insertions(+), 46 deletions(-) diff --git a/LICENSE b/LICENSE index d645695673..06f2a127cc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,24 @@ +Copyright 2011-2017 Dropbox, Inc., Kandra Labs, Inc., and contributors + +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. + +The software includes some works released by third parties under other +free and open source licenses. Those works are redistributed under the +license terms under which the works were received. For more details, +see the ``docs/THIRDPARTY`` file included with this distribution. + + +-------------------------------------------------------------------------------- Apache License Version 2.0, January 2004 @@ -175,28 +196,3 @@ 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. diff --git a/README.md b/README.md index 391f26584c..4f369af6dd 100644 --- a/README.md +++ b/README.md @@ -73,24 +73,5 @@ I am interested in: You may also be interested in reading our [blog](http://blog.zulip.org/) or following us on [twitter](https://twitter.com/zulip). - -## License - -Copyright 2011-2017 Dropbox, Inc., Kandra Labs, Inc., and contributors - -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. - -The software includes some works released by third parties under other -free and open source licenses. Those works are redistributed under the -license terms under which the works were received. For more details, -see the ``docs/THIRDPARTY`` file included with this distribution. +Zulip is distributed under the +[Apache 2.0](https://github.com/zulip/zulip/blob/master/LICENSE) license.