Merge pull request #21 from Merck/copyright-line

Update copyright line
Merck · Aug 31, 2022 · 7538aac · 7538aac
2 parents 69dd1f4 + bf620a1
commit 7538aac
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 25 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -12,7 +12,7 @@ Authors@R: c(
     person("Xin Tong", "Li", email = "xin.tong.li@merck.com", role = c("ctb")), 
     person("Yalin", "Zhu", email = "yalin.zhu@merck.com", role = c("ctb")),
     person("Nan", "Xiao", email = "nan.xiao1@merck.com", role = c("ctb")),
-    person("Merck Sharp & Dohme Corp", role = "cph")
+    person("Merck & Co., Inc., Rahway, NJ, USA and its affiliates", role = "cph")
     )
 Maintainer: Yilong Zhang <yilong.zhang@merck.com>
 Description: Compute sample size under non-proportional hazards.
@@ -40,7 +40,7 @@ Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
 Rmarkdown: echo = TRUE
-RoxygenNote: 7.1.1
+RoxygenNote: 7.2.1
 VignetteBuilder: knitr
 Config/testthat/edition: 3
 Remotes:

diff --git a/LICENSE b/LICENSE
@@ -631,7 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    Copyright© 2020 Merck Sharp & Dohme Corp. a subsidiary of Merck & Co., Inc., Kenilworth, NJ, USA.
+    gsDesign2: Group Sequential Design Under Non-Proportional Hazards
+    Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 
     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
@@ -651,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    {project}  Copyright (C) {year}  {fullname}
+    gsDesign2  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

diff --git a/R/AHR.R b/R/AHR.R
@@ -1,5 +1,4 @@
-#  Copyright (c) 2021 Merck Sharp & Dohme Corp., a subsidiary of
-#  Merck & Co., Inc., Kenilworth, NJ, USA.
+#  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 #
 #  This file is part of the gsDesign2 program.
 #

diff --git a/R/eAccrual.R b/R/eAccrual.R
@@ -1,5 +1,4 @@
-#  Copyright (c) 2021 Merck Sharp & Dohme Corp., a subsidiary of
-#  Merck & Co., Inc., Kenilworth, NJ, USA.
+#  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 #
 #  This file is part of the gsDesign2 program.
 #

diff --git a/R/eEvents_df.R b/R/eEvents_df.R
@@ -1,5 +1,4 @@
-#  Copyright (c) 2021 Merck Sharp & Dohme Corp., a subsidiary of
-#  Merck & Co., Inc., Kenilworth, NJ, USA.
+#  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 #
 #  This file is part of the gsDesign2 program.
 #

diff --git a/R/global.R b/R/global.R
@@ -1,5 +1,4 @@
-#  Copyright (c) 2021 Merck Sharp & Dohme Corp., a subsidiary of
-#  Merck & Co., Inc., Kenilworth, NJ, USA.
+#  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 #
 #  This file is part of the gsDesign2 program.
 #

diff --git a/R/gsDesign2-package.R b/R/gsDesign2-package.R
@@ -1,5 +1,4 @@
-#  Copyright (c) 2021 Merck Sharp & Dohme Corp., a subsidiary of
-#  Merck & Co., Inc., Kenilworth, NJ, USA.
+#  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 #
 #  This file is part of the gsDesign2 program.
 #

diff --git a/R/ppwe.R b/R/ppwe.R
@@ -1,5 +1,4 @@
-#  Copyright (c) 2021 Merck Sharp & Dohme Corp., a subsidiary of
-#  Merck & Co., Inc., Kenilworth, NJ, USA.
+#  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 #
 #  This file is part of the gsDesign2 program.
 #

diff --git a/R/s2pwe.R b/R/s2pwe.R
@@ -1,5 +1,4 @@
-#  Copyright (c) 2021 Merck Sharp & Dohme Corp., a subsidiary of
-#  Merck & Co., Inc., Kenilworth, NJ, USA.
+#  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 #
 #  This file is part of the gsDesign2 program.
 #

diff --git a/R/tEvents.R b/R/tEvents.R
@@ -1,5 +1,4 @@
-#  Copyright (c) 2021 Merck Sharp & Dohme Corp., a subsidiary of
-#  Merck & Co., Inc., Kenilworth, NJ, USA.
+#  Copyright (c) 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved.
 #
 #  This file is part of the gsDesign2 program.
 #

diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -19,5 +19,5 @@ footer:
     left: [developed_by, built_with, legal]
     right: [blank]
   components:
-    legal: "<br>Copyright &copy; Merck Sharp & Dohme Corp., a subsidiary of Merck & Co., Inc., Kenilworth, NJ, USA."
+    legal: "<br>Copyright &copy; 2022 Merck & Co., Inc., Rahway, NJ, USA and its affiliates. All rights reserved."
     blank: "<span></span>"
diff --git a/man/gsDesign2-package.Rd b/man/gsDesign2-package.Rd
diff --git a/man/tEvents.Rd b/man/tEvents.Rd