renamed 'scala*2' to 'scala*' and updated copyr...

renamed 'scala*2' to 'scala*' and updated copyright in man pages

2 files changed, 26 insertions, 28 deletions

diff --git a/docs/man/man1/scala2.1 b/docs/man/man1/scala2.1
index 9adcf45ab6..a6836a3602 100644
--- a/docs/man/man1/scala2.1
+++ b/docs/man/man1/scala2.1
@@ -1,25 +1,25 @@
 .\" ##########################################################################
 .\" #                      __                                                #
-.\" #      ________ ___   / /  ___     Scala On-line Manual Pages            #
-.\" #     / __/ __// _ | / /  / _ |    (c) 2002-2005, LAMP/EPFL              #
+.\" #      ________ ___   / /  ___     Scala 2 On-line Manual Pages          #
+.\" #     / __/ __// _ | / /  / _ |    (c) 2002-2006, LAMP/EPFL              #
 .\" #   __\ \/ /__/ __ |/ /__/ __ |                                          #
 .\" #  /____/\___/_/ |_/____/_/ | |    http://scala.epfl.ch/                 #
 .\" #                           |/                                           #
 .\" ##########################################################################
 .\"
-.\" Process this file with nroff -man scala2.1
+.\" Process this file with nroff -man scala.1
 .\"
 .TH scala 1  "April 29, 2005" "version 0.1" "USER COMMANDS"
 .\"
 .\" ################################# NAME ###################################
 .\"
 .SH NAME
-scala2 \- Launcher for the Scala language
+scala \- Launcher for the Scala 2 language
 .\"
 .\" ############################### SYNOPSIS #################################
 .\"
 .SH SYNOPSIS
-\fBscala2\fR [ <\fIoptions\fR> ] <\fIclass file\fR> [ <\fIargs\fR> ]
+\fBscala\fR [ <\fIoptions\fR> ] <\fIclass file\fR> [ <\fIargs\fR> ]
 .\"
 .\" ############################### PARAMETERS ###############################
 .\"
@@ -37,7 +37,7 @@ Program arguments passed to the main function.
 .\" ############################## DESCRIPTION ###############################
 .\"
 .SH DESCRIPTION
-The \fBscala2\fR utility launches a Scala application. It does this by starting
+The \fBscala\fR utility launches a Scala application. It does this by starting
 a Java runtime environment, loading a specified class, and invoking that
 class’s \fBmain\fR method. The method must have the following signature:
 .PP
@@ -89,18 +89,18 @@ Same options as the \fBjava\fR command.
 .TP
 Execute a Scala program generated in the current directory
 .BR
-\fBscala2\fR HelloWorld
+\fBscala\fR HelloWorld
 .PP
 .TP
 Execute a Scala program generated in a user-defined directory \fBclasses\fR
 .BR
-\fBscala2\fR \-classpath classes hello.HelloWorld
+\fBscala\fR \-classpath classes hello.HelloWorld
 .PP
 .\"
 .\" ############################# EXIT STATUS ################################
 .\"
 .SH "EXIT STATUS"
-\fBscala2\fR returns a zero exit status if it succeeds. Non zero is returned
+\fBscala\fR returns a zero exit status if it succeeds. Non zero is returned
 in case of failure.
 .\"
 .\" ############################## AUTHOR(S) #################################
@@ -116,7 +116,7 @@ Report bugs to <scala@lists.epfl.ch>.
 .\" ############################# COPYRIGHT ##################################
 .\"
 .SH COPYRIGHT
-Copyright \(co 2002-2005 LAMP/EPFL
+Copyright \(co 2002-2006 LAMP/EPFL
 .PP
 This is free software; see the distribution for copying conditions.  There is
 NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -124,10 +124,9 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .\" ############################### SEE ALSO #################################
 .\"
 .SH "SEE ALSO"
-.BR scalac2(1)
+.BR scalac(1)
 .\" .BR scaladoc(1),
-.\" .BR scalaint(1),
-.\" .BR scalarun(1)
+.\" .BR scalai(1)
 .\"
 .\" ##########################################################################
 .\" $Id$
diff --git a/docs/man/man1/scalac2.1 b/docs/man/man1/scalac2.1
index 631c6a4b55..209924e3af 100644
--- a/docs/man/man1/scalac2.1
+++ b/docs/man/man1/scalac2.1
@@ -1,25 +1,25 @@
 .\" ##########################################################################
 .\" #                      __                                                #
-.\" #      ________ ___   / /  ___     Scala On-line Manual Pages            #
-.\" #     / __/ __// _ | / /  / _ |    (c) 2002-2005, LAMP/EPFL              #
+.\" #      ________ ___   / /  ___     Scala 2 On-line Manual Pages          #
+.\" #     / __/ __// _ | / /  / _ |    (c) 2002-2006, LAMP/EPFL              #
 .\" #   __\ \/ /__/ __ |/ /__/ __ |                                          #
 .\" #  /____/\___/_/ |_/____/_/ | |    http://scala.epfl.ch/                 #
 .\" #                           |/                                           #
 .\" ##########################################################################
 .\"
-.\" Process this file with nroff -man scalac2.1
+.\" Process this file with nroff -man scalac.1
 .\"
-.TH scalac2 1  "April 29, 2005" "version 0.1" "USER COMMANDS"
+.TH scalac 1  "April 29, 2005" "version 0.1" "USER COMMANDS"
 .\"
 .\" ################################# NAME ###################################
 .\"
 .SH NAME
-scalac2 \- Compiler for the Scala language
+scalac \- Compiler for the Scala 2 language
 .\"
 .\" ############################### SYNOPSIS #################################
 .\"
 .SH SYNOPSIS
-\fBscalac2\fR [ <\fIoptions\fR> ] <\fIsource files\fR>
+\fBscalac\fR [ <\fIoptions\fR> ] <\fIsource files\fR>
 .\"
 .\" ############################### PARAMETERS ###############################
 .\"
@@ -34,7 +34,7 @@ One or more source files to be compiled (such as MyClass.scala).
 .\" ############################## DESCRIPTION ###############################
 .\"
 .SH DESCRIPTION
-The \fBscalac2\fR tool reads class and object definitions, written in the
+The \fBscalac\fR tool reads class and object definitions, written in the
 Scala programming language, and compiles them into bytecode class files.
 .PP
 By default, the compiler puts each class file in the same directory as its
@@ -252,21 +252,21 @@ matches all phases
 .TP
 Compile a Scala program
 .BR
-\fBscalac2\fR HelloWorld
+\fBscalac\fR HelloWorld
 .TP
 Compile a Scala program to the destination directory \fBclasses\fR
 .BR
-\fBscalac2\fR \-d classes HelloWorld.scala
+\fBscalac\fR \-d classes HelloWorld.scala
 .TP
 Compile all Scala files found in the source directory \fBsrc\fR to the
 destination directory \fBclasses\fR
 .BR
-\fBscalac2\fR \-d classes src/*.scala 
+\fBscalac\fR \-d classes src/*.scala 
 .\"
 .\" ############################# EXIT STATUS ################################
 .\"
 .SH "EXIT STATUS"
-\fBscalac2\fR returns a zero exist status if it succeeds to compile the
+\fBscalac\fR returns a zero exist status if it succeeds to compile the
 specified input files. Non zero is returned in case of failure.
 .\"
 .\" ############################## AUTHOR(S) #################################
@@ -282,7 +282,7 @@ Report bugs to <scala@lists.epfl.ch>.
 .\" ############################# COPYRIGHT ##################################
 .\"
 .SH COPYRIGHT
-Copyright \(co 2002-2005 LAMP/EPFL
+Copyright \(co 2002-2006 LAMP/EPFL
 .PP
 This is free software; see the distribution for copying conditions.  There is
 NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -290,11 +290,10 @@ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .\" ############################## SEE ALSO ##################################
 .\"
 .SH "SEE ALSO"
-.BR scala2(1)
+.BR scala(1)
 .\" ,
 .\" .BR scaladoc(1),
-.\" .BR scalaint(1),
-.\" .BR scalarun(1)
+.\" .BR scalai(1)
 .\"
 .\" ##########################################################################
 .\" $Id$