summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeather Miller <heather.miller@epfl.ch>2012-11-02 18:13:57 +0100
committerHeather Miller <heather.miller@epfl.ch>2012-11-02 18:13:57 +0100
commita47c2a34953f9eb42ca04f58ccaaa65d3de75253 (patch)
tree03e1ba6c722f4c5aed5daae63dbcf3cdce28b9ba
parent807dbe557a47b6944a7d352c0316bcd78733f473 (diff)
downloadscala-a47c2a34953f9eb42ca04f58ccaaa65d3de75253.tar.gz
scala-a47c2a34953f9eb42ca04f58ccaaa65d3de75253.tar.bz2
scala-a47c2a34953f9eb42ca04f58ccaaa65d3de75253.zip
Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013
-rw-r--r--src/compiler/scala/tools/nsc/doc/html/page/Template.scala2
-rw-r--r--src/manual/scala/tools/docutil/EmitManPage.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
index 3604b95c1d..008999e09f 100644
--- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
@@ -273,7 +273,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
{
if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value))
- <div id="footer">Scala programming documentation. Copyright (c) 2003-2012 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://typesafe.com" target="_top">Typesafe</a>.</div>
+ <div id="footer">Scala programming documentation. Copyright (c) 2003-2013 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://typesafe.com" target="_top">Typesafe</a>.</div>
else
<div id="footer"> { tpl.universe.settings.docfooter.value } </div>
}
diff --git a/src/manual/scala/tools/docutil/EmitManPage.scala b/src/manual/scala/tools/docutil/EmitManPage.scala
index b24a897a4e..c30e847fee 100644
--- a/src/manual/scala/tools/docutil/EmitManPage.scala
+++ b/src/manual/scala/tools/docutil/EmitManPage.scala
@@ -148,7 +148,7 @@ object EmitManPage {
out println ".\\\" ##########################################################################"
out println ".\\\" # __ #"
out println ".\\\" # ________ ___ / / ___ Scala 2 On-line Manual Pages #"
- out println ".\\\" # / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL #"
+ out println ".\\\" # / __/ __// _ | / / / _ | (c) 2002-2013, LAMP/EPFL #"
out println ".\\\" # __\\ \\/ /__/ __ |/ /__/ __ | #"
out println ".\\\" # /____/\\___/_/ |_/____/_/ | | http://scala-lang.org/ #"
out println ".\\\" # |/ #"