소스 검색

Remove duplicated copyright explanation

This is also explained in the 'CONTRIBUTING.md'.

Signed-off-by: Tim Krüger <t@timkrueger.me>
Tim Krüger 2 년 전
부모
커밋
65d2425d65
2개의 변경된 파일2개의 추가작업 그리고 44개의 파일을 삭제
  1. 2 2
      CONTRIBUTING.md
  2. 0 42
      contribute/HowToApplyALicense.md

+ 2 - 2
CONTRIBUTING.md

@@ -120,10 +120,10 @@ The copyright belongs to all the individual contributors.
 Therefore we recommend that every contributor adds following line to the header of a file, if they changed it substantially:
 
 ```
-@copyright Copyright (c) <year>, <your name> (<your email address>)
+Copyright (c) <year> <your name> <your email address>
 ```
 
-For further information on how to add or update the license header correctly please have a look at [our licensing HowTo][applyalicense].
+See section [Adding new files](#adding-new-files) for templates which can be used in new files.
 
 ### Sign your work
 

+ 0 - 42
contribute/HowToApplyALicense.md

@@ -1,42 +0,0 @@
-# How to apply a license
-
-This application is licenced under the GNU GPLv3 or any later version.
-
-Nextcloud doesn't require a CLA (Contributor License Agreement).
-The copyright belongs to all the individual contributors.
-
-If you modify an existing file, please keep the existing license header as
-it is and just add your copyright notice:
-
-````
-@copyright Copyright (c) <year> <your name> (<your email address>)
-````
-
-If you create a new file please use this license header:
-
-````
-/*
- * Nextcloud Talk application
- *
- * @author <your name>
- * Copyright (C) <year> <your name> (<your email address>)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- ````
-
-Additionally we require a Developer Certificate of Origin (DCO), look
-at [CONTRIBUTING.md][contributing] to learn more how to sign your commits.
-
-[contributing]: https://github.com/nextcloud/talk-android/blob/master/CONTRIBUTING.md#sign-your-work