Copyright fixes

7 files changed, 20 insertions, 51 deletions

diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile
index 7f621304e96..cbca16159dd 100644
--- a/cpp/src/Glacier/Makefile
+++ b/cpp/src/Glacier/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mklibfilename,Glacier,$(VERSION))
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index b7385aa21ba..933db49c224 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mklibfilename,IcePack,$(VERSION))
diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile
index a6c63e3d1e5..b34b7f1559e 100644
--- a/cpp/src/IcePatch/Makefile
+++ b/cpp/src/IcePatch/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mklibfilename,IcePatch,$(VERSION))
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index a503f0532b5..d933f820c9e 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -59,21 +59,16 @@ Slice::changeInclude(const string& orig, const vector<string>& includePaths)
 void
 Slice::printHeader(Output& out)
 {
-    static const char* header = 
+    static const char* header =
 "// **********************************************************************\n"
 "//\n"
-"// Copyright (c) 2003\n"
-"// ZeroC, Inc.\n"
-"// Billerica, MA, USA\n"
+"// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// All Rights Reserved.\n"
-"//\n"
-"// Ice is free software; you can redistribute it and/or modify it under\n"
-"// the terms of the GNU General Public License version 2 as published by\n"
-"// the Free Software Foundation.\n"
+"// This copy of Ice is licensed to you under the terms described in the\n"
+"// ICE_LICENSE file included in this distribution.\n"
 "//\n"
 "// **********************************************************************\n"
-	;
+        ;
 
     out << header;
     out << "\n// Ice version " << ICE_STRING_VERSION;
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 9daefd0b2c0..cc9b3072e70 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -1303,15 +1303,10 @@ Slice::JavaGenerator::printHeader()
     static const char* header =
 "// **********************************************************************\n"
 "//\n"
-"// Copyright (c) 2003\n"
-"// ZeroC, Inc.\n"
-"// Billerica, MA, USA\n"
+"// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// All Rights Reserved.\n"
-"//\n"
-"// Ice is free software; you can redistribute it and/or modify it under\n"
-"// the terms of the GNU General Public License version 2 as published by\n"
-"// the Free Software Foundation.\n"
+"// This copy of Ice is licensed to you under the terms described in the\n"
+"// ICE_LICENSE file included in this distribution.\n"
 "//\n"
 "// **********************************************************************\n"
         ;
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 4e18b7abc86..9767f577f1e 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -609,15 +609,10 @@ Slice::Gen::printHeader()
     static const char* header =
 "// **********************************************************************\n"
 "//\n"
-"// Copyright (c) 2003\n"
-"// ZeroC, Inc.\n"
-"// Billerica, MA, USA\n"
+"// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// All Rights Reserved.\n"
-"//\n"
-"// Ice is free software; you can redistribute it and/or modify it under\n"
-"// the terms of the GNU General Public License version 2 as published by\n"
-"// the Free Software Foundation.\n"
+"// This copy of Ice is licensed to you under the terms described in the\n"
+"// ICE_LICENSE file included in this distribution.\n"
 "//\n"
 "// **********************************************************************\n"
         ;
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index 14357189587..032f402b2e8 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -725,15 +725,14 @@ Slice::Gen::printHeader()
 {
     static const char* header =
 "<!--\n"
-"**********************************************************************\n"
-"Copyright (c) 2003\n"
-"ZeroC, Inc.\n"
-"Billerica, MA, USA\n"
+" **********************************************************************\n"
 "\n"
-"All Rights Reserved\n"
+" Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n"
 "\n"
-"Generated by the `slice2docbook' converter\n"
-"**********************************************************************\n"
+" This copy of Ice is licensed to you under the terms described in the\n"
+" ICE_LICENSE file included in this distribution.\n"
+"\n"
+" **********************************************************************\n"
 "-->";
     
     O.zeroIndent();