aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThéo Zimmermann2019-06-06 11:22:09 +0200
committerThéo Zimmermann2019-06-17 18:08:33 +0200
commitffd9b12fe9e279fa896fc7e89d4f4d26c260ddfc (patch)
treeb1a999a1ad46f97b870dfa14bd9d978369e54e8c
parent2ec2affa73720746bef37e8b1f0ce98f257cb302 (diff)
Update copyright years outside of headers.
These were found with the following command: $ git grep "1999-" | grep -v "2019"
-rw-r--r--doc/LICENSE30
-rw-r--r--doc/common/styles/html/coqremote/cover.html2
-rw-r--r--doc/common/styles/html/simple/cover.html2
-rw-r--r--doc/common/title.tex4
-rwxr-xr-xdoc/sphinx/conf.py2
-rw-r--r--ide/MacOS/Info.plist.template2
6 files changed, 20 insertions, 22 deletions
diff --git a/doc/LICENSE b/doc/LICENSE
index 3789d91040..9f3a6b3f4c 100644
--- a/doc/LICENSE
+++ b/doc/LICENSE
@@ -2,25 +2,25 @@ The Coq Reference Manual is a collective work from the Coq Development
Team whose members are listed in the file CREDITS of the Coq source
package. All related documents (the LaTeX and BibTeX sources, the
embedded png files, and the PostScript, PDF and html outputs) are
-copyright (c) INRIA 1999-2018, with the exception of the Ubuntu font
-file UbuntuMono-B.ttf, which is
-Copyright 2010,2011 Canonical Ltd and licensed under the Ubuntu font
-license, version 1.0
-(https://www.ubuntu.com/legal/terms-and-policies/font-licence), and its
-derivative CoqNotations.ttf distributed under the same license. The
-material connected to the Reference Manual may be distributed only
-subject to the terms and conditions set forth in the Open Publication
-License, v1.0 or later (the latest version is presently available at
-http://www.opencontent.org/openpub/). Options A and B are *not*
-elected.
+copyright (c) 1999-2019, Inria, CNRS and contributors, with the
+exception of the Ubuntu font file UbuntuMono-B.ttf, which is Copyright
+2010,2011 Canonical Ltd and licensed under the Ubuntu font license,
+version 1.0
+(https://www.ubuntu.com/legal/terms-and-policies/font-licence), and
+its derivative CoqNotations.ttf distributed under the same
+license. The material connected to the Reference Manual may be
+distributed only subject to the terms and conditions set forth in the
+Open Publication License, v1.0 or later (the latest version is
+presently available at http://www.opencontent.org/openpub/). Options
+A and B are *not* elected.
The Coq Standard Library is a collective work from the Coq Development
Team whose members are listed in the file CREDITS of the Coq source
package. All related documents (the Coq vernacular source files and
-the PostScript, PDF and html outputs) are copyright (c) INRIA
-1999-2018. The material connected to the Standard Library is
-distributed under the terms of the Lesser General Public License
-version 2.1 or later.
+the PostScript, PDF and html outputs) are copyright (c) 1999-2019,
+Inria, CNRS and contributors. The material connected to the Standard
+Library is distributed under the terms of the Lesser General Public
+License version 2.1 or later.
----------------------------------------------------------------------
diff --git a/doc/common/styles/html/coqremote/cover.html b/doc/common/styles/html/coqremote/cover.html
index 5d151381ff..b7c83bd2f9 100644
--- a/doc/common/styles/html/coqremote/cover.html
+++ b/doc/common/styles/html/coqremote/cover.html
@@ -52,7 +52,7 @@
<h2 style="text-align:center; font-size: 150%">The Coq Development Team</h2>
<br /><br /><br />
-<p style="text-indent:0pt">Copyright © INRIA 1999-2017</p>
+<p style="text-indent:0pt">Copyright © 1999-2019, Inria, CNRS and contributors</p>
<p style="text-indent:0pt">This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0 or later (the latest version is presently available at <a href="http://www.opencontent.org/openpub">http://www.opencontent.org/openpub</a>). Options A and B are not elected.</p>
diff --git a/doc/common/styles/html/simple/cover.html b/doc/common/styles/html/simple/cover.html
index 6053131045..28ce2eb087 100644
--- a/doc/common/styles/html/simple/cover.html
+++ b/doc/common/styles/html/simple/cover.html
@@ -30,7 +30,7 @@
<br /><br /><br />
-<p style="text-indent:0pt">Copyright © INRIA 1999-2017</p>
+<p style="text-indent:0pt">Copyright © 1999-2019, Inria, CNRS and contributors</p>
<p style="text-indent: 0pt">This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0 or later (the latest version is presently available at <a href="http://www.opencontent.org/openpub">http://www.opencontent.org/openpub</a>). Options A and B are not elected.</p>
diff --git a/doc/common/title.tex b/doc/common/title.tex
index 76e50f65d2..2a104a87e6 100644
--- a/doc/common/title.tex
+++ b/doc/common/title.tex
@@ -43,9 +43,7 @@ $\pi r^2$ Project (formerly LogiCal, then TypiCal)
V\coqversion, \today
\par\vspace{20pt}
%END LATEX
-\copyright INRIA 1999-2004 ({\Coq} versions 7.x)
-
-\copyright INRIA 2004-2017 ({\Coq} versions 8.x)
+\copyright 1999-2019, Inria, CNRS and contributors
#3
\end{flushleft}
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index 5aeaba9f3a..867a19efe5 100755
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -108,7 +108,7 @@ master_doc = "index"
# General information about the project.
project = 'Coq'
-copyright = '1999-2018, Inria'
+copyright = '1999-2019, Inria, CNRS and contributors'
author = 'The Coq Development Team'
# The version info for the project you're documenting, acts as replacement for
diff --git a/ide/MacOS/Info.plist.template b/ide/MacOS/Info.plist.template
index fbe7773dd4..e4fb0e5980 100644
--- a/ide/MacOS/Info.plist.template
+++ b/ide/MacOS/Info.plist.template
@@ -66,7 +66,7 @@
<key>CFBundleGetInfoString</key>
<string>Coq_vVERSION</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 1999-2016, The Coq Development Team INRIA - CNRS - LIX - LRI - PPS</string>
+ <string>Copyright 1999-2019, Inria, CNRS and contributors</string>
<key>CFBundleHelpBookFolder</key>
<string>share/doc/coq/html/</string>
<key>CFAppleHelpAnchor</key>