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.1 | |
| parent | 4b7d85bfa5d593bb911a331a1d8daa67689bfa62 (diff) | |
| download | gitea-e35a2b65bcc01b3fd88f8764664eee7f958b9812.tar.gz gitea-e35a2b65bcc01b3fd88f8764664eee7f958b9812.zip | |
[skip ci] Updated licenses and gitignores
Diffstat (limited to 'options/license/Apache-1.1')
| -rw-r--r-- | options/license/Apache-1.1 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/options/license/Apache-1.1 b/options/license/Apache-1.1 index 6736b34d5a..c4cb049f33 100644 --- a/options/license/Apache-1.1 +++ b/options/license/Apache-1.1 @@ -1,5 +1,6 @@ -Apache License 1.1 Copyright (c) 2000 The Apache Software Foundation. All -rights reserved. +Apache License 1.1 + +Copyright (c) 2000 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -13,16 +14,14 @@ and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: - "This product includes software developed by the Apache Software Foundation -(http://www.apache.org/) ." - +(http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. -4. The name "Apache" and "Apache Software Foundation" must not be used to +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 . +permission. For written permission, please contact apache@apache.org. 5. Products derived from this software may not be called "Apache" [ex. "Jakarta," "Apache," or "Apache Commons,"] nor may "Apache" [ex. the names] appear in |