Chromium Code Reviews Chromium Code Reviews
Issue 1530343003:
fix license file formatting (Closed)
Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master| Index: LICENSE |
| diff --git a/LICENSE b/LICENSE |
| index cb47c2ced9716851974479087a20414e30779a09..2a2268d02b120e3b7ee401117ac1b3f6237360ab 100644 |
| --- a/LICENSE |
| +++ b/LICENSE |
| @@ -85,9 +85,7 @@ written authorization of the copyright holder. |
| 2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt) |
| - # The Google Chrome software developed by Google is licensed under the BSD li |
| -cense. Other software included in this distribution is provided under other licen |
| -ses, as set forth below. |
| + # The Google Chrome software developed by Google is licensed under the BSD license. Other software included in this distribution is provided under other licenses, as set forth below. |
| # |
| # The BSD License |
| # http://opensource.org/licenses/bsd-license.php |
| @@ -95,35 +93,18 @@ ses, as set forth below. |
| # |
| # All rights reserved. |
| # |
| - # Redistribution and use in source and binary forms, with or without modifi |
| -cation, are permitted provided that the following conditions are met: |
| - # |
| - # Redistributions of source code must retain the above copyright notice, th |
| -is list of conditions and the following disclaimer. |
| - # Redistributions in binary form must reproduce the above copyright notice, |
| - this list of conditions and the following disclaimer in the documentation and/or |
| - other materials provided with the distribution. |
| - # Neither the name of Google Inc. nor the names of its contributors may be |
| - used to endorse or promote products derived from this software without specific |
| -prior written permission. |
| - # |
| - # |
| - # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS I |
| -S" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPL |
| -IED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLA |
| -IMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIR |
| -ECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDIN |
| -G, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF L |
| -IABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED O |
| -F THE POSSIBILITY OF SUCH DAMAGE. |
| - # |
| - # |
| - # The word list in cjdict.txt are generated by combining three word lists l |
| -isted |
| - # below with further processing for compound word breaking. The frequency i |
| -s generated |
| + # Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: |
| + # |
| + # Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. |
| + # Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. |
| + # Neither the name of Google Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. |
| + # |
| + # |
| + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
jungshik at Google
2015/12/18 22:35:07
Wouldn't it be better to make this paragraph multi
Mostyn Bramley-Moore
2015/12/18 22:47:46
That would be better, since this is wrapped in <pr
|
| + # |
| + # |
| + # The word list in cjdict.txt are generated by combining three word lists listed |
| + # below with further processing for compound word breaking. The frequency is generated |
| # with an iterative training against Google web corpora. |
| # |
| # * Libtabe (Chinese) |
| @@ -206,12 +187,10 @@ s generated |
| # Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois |
| # c-tsai4@uiuc.edu http://casper.beckman.uiuc.edu/~c-tsai4 |
| # |
| - # ---------------COPYING.libtabe-----END----------------------------------- |
| -- |
| + # ---------------COPYING.libtabe-----END------------------------------------ |
| # |
| # |
| - # ---------------COPYING.ipadic-----BEGIN---------------------------------- |
| --- |
| + # ---------------COPYING.ipadic-----BEGIN------------------------------------ |
| # |
| # Copyright 2000, 2001, 2002, 2003 Nara Institute of Science |
| # and Technology. All Rights Reserved. |
| @@ -293,50 +272,34 @@ s generated |
| # |
| # Project: http://code.google.com/p/lao-dictionary/ |
| # Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt |
| - # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICEN |
| -SE.txt |
| + # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt |
| # (copied below) |
| # |
| - # This file is derived from the above dictionary, with slight modifications |
| -. |
| - # ------------------------------------------------------------------------- |
| -------- |
| + # This file is derived from the above dictionary, with slight modifications. |
| + # -------------------------------------------------------------------------------- |
| # Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell. |
| # All rights reserved. |
| # |
| - # Redistribution and use in source and binary forms, with or without modifi |
| -cation, |
| + # Redistribution and use in source and binary forms, with or without modification, |
| # are permitted provided that the following conditions are met: |
| # |
| - # Redistributions of source code must retain the above copyright no |
| -tice, this |
| - # list of conditions and the following disclaimer. Redistributions |
| -in binary |
| - # form must reproduce the above copyright notice, this list of cond |
| -itions and |
| - # the following disclaimer in the documentation and/or other materi |
| -als |
| + # Redistributions of source code must retain the above copyright notice, this |
| + # list of conditions and the following disclaimer. Redistributions in binary |
| + # form must reproduce the above copyright notice, this list of conditions and |
| + # the following disclaimer in the documentation and/or other materials |
| # provided with the distribution. |
| # |
| - # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS I |
| -S" AND |
| - # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMP |
| -LIED |
| + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND |
| + # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| - # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIA |
| -BLE FOR |
| - # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DA |
| -MAGES |
| - # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVIC |
| -ES; |
| - # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED A |
| -ND ON |
| + # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR |
| + # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| + # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| + # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON |
| # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| - # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| -THIS |
| + # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| - # ------------------------------------------------------------------------- |
| -------- |
| + # -------------------------------------------------------------------------------- |
| 4. Burmese Word Break Dictionary Data (burmesedict.txt) |
| @@ -346,48 +309,35 @@ THIS |
| # This list is part of a project hosted at: |
| # github.com/kanyawtech/myanmar-karen-word-lists |
| # |
| - # ------------------------------------------------------------------------- |
| -------- |
| + # -------------------------------------------------------------------------------- |
| # Copyright (c) 2013, LeRoy Benjamin Sharon |
| # All rights reserved. |
| # |
| - # Redistribution and use in source and binary forms, with or without modifi |
| -cation, |
| + # Redistribution and use in source and binary forms, with or without modification, |
| # are permitted provided that the following conditions are met: |
| # |
| - # Redistributions of source code must retain the above copyright notice, |
| -this |
| + # Redistributions of source code must retain the above copyright notice, this |
| # list of conditions and the following disclaimer. |
| # |
| - # Redistributions in binary form must reproduce the above copyright notic |
| -e, this |
| - # list of conditions and the following disclaimer in the documentation an |
| -d/or |
| + # Redistributions in binary form must reproduce the above copyright notice, this |
| + # list of conditions and the following disclaimer in the documentation an d/or |
| # other materials provided with the distribution. |
| # |
| # Neither the name Myanmar Karen Word Lists, nor the names of its |
| # contributors may be used to endorse or promote products derived from |
| # this software without specific prior written permission. |
| # |
| - # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS I |
| -S" AND |
| - # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMP |
| -LIED |
| + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND |
| + # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| - # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIA |
| -BLE FOR |
| - # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DA |
| -MAGES |
| - # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVIC |
| -ES; |
| - # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED A |
| -ND ON |
| + # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR |
| + # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| + # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| + # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON |
| # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| - # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| -THIS |
| + # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| - # ------------------------------------------------------------------------- |
| -------- |
| + # -------------------------------------------------------------------------------- |
| 5. Time Zone Database |
