From a094bf3c2e43d8d29aa676f301a5dff99b0355a2 Mon Sep 17 00:00:00 2001
From: michelou <michelou@epfl.ch>
Date: Wed, 11 Oct 2006 20:08:10 +0000
Subject: corrected copyright notice in script templates

---
 build.xml                                                   |  2 +-
 src/actors/scala/actors/Actor.scala                         | 12 ++----------
 src/compiler/scala/tools/ant/templates/generic-unix.tmpl    |  1 +
 src/compiler/scala/tools/ant/templates/generic-windows.tmpl |  4 +++-
 src/compiler/scala/tools/ant/templates/tool-unix.tmpl       |  1 +
 src/compiler/scala/tools/ant/templates/tool-windows.tmpl    |  4 +++-
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/build.xml b/build.xml
index 88fbccfe79..3cdba8834b 100644
--- a/build.xml
+++ b/build.xml
@@ -29,7 +29,7 @@ PROPERTIES
   <property file="${properties.file}"/>
   <!-- Defines the product being built -->
   <property name="vendor.name" value="LAMP/EPFL"/>
-  <property name="copyright.string" value="copyright 2002-2006 ${vendor.name}"/>
+  <property name="copyright.string" value="Copyright 2002-2006 ${vendor.name}"/>
   <property name="number.file" value="${basedir}/build.number"/>
   <!-- Configuring how the compiler is run -->
   <property name="nsc.log-files" value="no"/>
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index c3f2f2d409..319f1d4bbd 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -491,16 +491,8 @@ case class Exit(from: Actor, reason: String)
 
 
 /**
- * <p>
- *   This class is used by our efficient message queue
- *   implementation.
- * </p>
- * <dl class="subclasses">
- *   <dt><b>Direct Known Subclasses:</b></dt>
- *   <dd>
- *     <a href="MessageQueue.html" target="contentFrame">MessageQueue</a>
- *   </dd>
- * </dl>
+ * This class is used by our efficient message queue
+ * implementation.
  */
 private[actors] abstract class MessageQueueResult[Msg] {
   def msg: Msg
diff --git a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
index 2c6148fdf5..008036c858 100644
--- a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
@@ -4,6 +4,7 @@
 # Scala runtime @version@
 ##############################################################################
 # @copyright@
+#
 # This is free software; see the distribution for copying conditions.
 # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
diff --git a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl
index acf3685129..22fb9faf38 100644
--- a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl
+++ b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl
@@ -1,7 +1,9 @@
 @@echo off
 
 rem ##########################################################################
-rem # Copyright @copyright@
+rem # Scala runtime @version@
+rem ##########################################################################
+rem # @copyright@
 rem #
 rem # This is free software; see the distribution for copying conditions.
 rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index a60295aa2a..3e38b89705 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -4,6 +4,7 @@
 # @name@ @version@
 ##############################################################################
 # @copyright@
+#
 # This is free software; see the distribution for copying conditions.
 # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
index e558c34bf8..b86aa851c1 100644
--- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
@@ -1,7 +1,9 @@
 @@echo off
 
 rem ##########################################################################
-rem # Copyright @copyright@
+rem # @name@ @version@
+rem ##########################################################################
+rem # @copyright@
 rem #
 rem # This is free software; see the distribution for copying conditions.
 rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-- 
cgit v1.2.3