diff options
| author | GiteaBot <teabot@gitea.io> | 2021-01-24 00:19:18 +0000 |
|---|---|---|
| committer | GiteaBot <teabot@gitea.io> | 2021-01-24 00:19:18 +0000 |
| commit | e35a2b65bcc01b3fd88f8764664eee7f958b9812 (patch) | |
| tree | eb0c5de3c7841c207c9bc86d54483b20bf4edc95 /options/license/Apache-1.0 | |
| parent | 4b7d85bfa5d593bb911a331a1d8daa67689bfa62 (diff) | |
| download | gitea-e35a2b65bcc01b3fd88f8764664eee7f958b9812.tar.gz gitea-e35a2b65bcc01b3fd88f8764664eee7f958b9812.zip | |
[skip ci] Updated licenses and gitignores
Diffstat (limited to 'options/license/Apache-1.0')
| -rw-r--r-- | options/license/Apache-1.0 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/options/license/Apache-1.0 b/options/license/Apache-1.0 index 923c623b3f..7bc81ab83b 100644 --- a/options/license/Apache-1.0 +++ b/options/license/Apache-1.0 @@ -12,21 +12,19 @@ and/or other materials provided with the distribution. 3. All advertising materials mentioning features or use of this software must display the following acknowledgment: "This product includes software developed -by the Apache Group for use in the Apache HTTP server project (http://www.apache.org/) -." +by the Apache Group for use in the Apache HTTP server project (http://www.apache.org/)." -4. The name "Apache Server" and "Apache Group" must not be used to endorse -or promote products derived from this software without prior written permission. -For written permission, please contact apache@apache.org . +4. The names "Apache" and "Apache Software Foundation" must not be used to +endorse or promote products derived from this software without prior written +permission. For written permission, please contact apache@apache.org. 5. Products derived from this software may not be called "Apache" nor may "Apache" appear in their name, without prior written permission of the Apache -Group . +Group. 6. Redistributions of any form whatsoever must retain the following acknowledgment: - "This product includes software developed by the Apache Group for use in the -Apache HTTP server project (http://www.apache.org/) ." +Apache HTTP server project (http://www.apache.org/)." THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |