summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiteaBot <teabot@gitea.io>2021-10-31 00:25:12 +0000
committerGiteaBot <teabot@gitea.io>2021-10-31 00:25:12 +0000
commit1ff944f6982b939e81b8da2425e8680f6fd8fc77 (patch)
tree36761954a7f1b442cdcb54617d239e1fa39c70cc
parent40c8451b7d68614cc5d971cd148df503e7c00647 (diff)
downloadgitea-1ff944f6982b939e81b8da2425e8680f6fd8fc77.tar.gz
gitea-1ff944f6982b939e81b8da2425e8680f6fd8fc77.zip
[skip ci] Updated licenses and gitignores
-rw-r--r--options/gitignore/VisualStudio2
-rw-r--r--options/license/BSD-1-Clause7
-rw-r--r--options/license/Linux-man-pages-copyleft21
3 files changed, 26 insertions, 4 deletions
diff --git a/options/gitignore/VisualStudio b/options/gitignore/VisualStudio
index 34c8dee453..26ab8f45b9 100644
--- a/options/gitignore/VisualStudio
+++ b/options/gitignore/VisualStudio
@@ -207,7 +207,7 @@ PublishScripts/
*.nuget.targets
# Nuget personal access tokens and Credentials
-nuget.config
+# nuget.config
# Microsoft Azure Build Output
csx/
diff --git a/options/license/BSD-1-Clause b/options/license/BSD-1-Clause
index 3b3c4e814b..8f8d606c65 100644
--- a/options/license/BSD-1-Clause
+++ b/options/license/BSD-1-Clause
@@ -1,4 +1,5 @@
-Copyright (c) 1995, 1999 Berkeley Software Design, Inc. All rights reserved.
+Copyright (c) [Year]
+[Name of Organization]. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -6,10 +7,10 @@ are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
+THIS SOFTWARE IS PROVIDED BY [Name of Organization] ``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 Berkeley Software Design, Inc. BE LIABLE
+ARE DISCLAIMED. IN NO EVENT SHALL [Name of Organization] 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)
diff --git a/options/license/Linux-man-pages-copyleft b/options/license/Linux-man-pages-copyleft
new file mode 100644
index 0000000000..8a10d8e684
--- /dev/null
+++ b/options/license/Linux-man-pages-copyleft
@@ -0,0 +1,21 @@
+Copyright (c) 0000, Obelix the Gaul <obelix@galia.org>.
+
+Permission is granted to make and distribute verbatim copies of this
+manual provided the copyright notice and this permission notice are
+preserved on all copies.
+
+Permission is granted to copy and distribute modified versions of
+this manual under the conditions for verbatim copying, provided that
+the entire resulting derived work is distributed under the terms of
+a permission notice identical to this one.
+
+Since the Linux kernel and libraries are constantly changing, this
+manual page may be incorrect or out-of-date. The author(s) assume
+no responsibility for errors or omissions, or for damages resulting
+from the use of the information contained herein. The author(s) may
+not have taken the same level of care in the production of this
+manual, which is licensed free of charge, as they might when working
+professionally.
+
+Formatted or processed versions of this manual, if unaccompanied by
+the source, must acknowledge the copyright and authors of this work.