131 files changed, 759 insertions, 759 deletions

diff --git a/cpp/demo/Freeze/Makefile b/cpp/demo/Freeze/Makefile
index d00a42d54e4..5ed12a2038d 100644
--- a/cpp/demo/Freeze/Makefile
+++ b/cpp/demo/Freeze/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/Freeze/backup/Client.cpp b/cpp/demo/Freeze/backup/Client.cpp
index aa50d7b2ba6..8e927eda27f 100644
--- a/cpp/demo/Freeze/backup/Client.cpp
+++ b/cpp/demo/Freeze/backup/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <IntLongMap.h>
 #include <IceUtil/Time.h>
 #include <Freeze/Freeze.h>
diff --git a/cpp/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile
index 40e5045b292..faee7ad17a3 100644
--- a/cpp/demo/Freeze/backup/Makefile
+++ b/cpp/demo/Freeze/backup/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 5eafd95583e..3fdab602785 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <Freeze/Freeze.h>
 #include <BenchTypes.h>
diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile
index cbcef82cab9..44da66ee36b 100644
--- a/cpp/demo/Freeze/bench/Makefile
+++ b/cpp/demo/Freeze/bench/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Freeze/bench/Test.ice b/cpp/demo/Freeze/bench/Test.ice
index ce2087e1eae..d32b95cb2f9 100644
--- a/cpp/demo/Freeze/bench/Test.ice
+++ b/cpp/demo/Freeze/bench/Test.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 struct Struct1
 {
     long l;
diff --git a/cpp/demo/Freeze/library/BookFactory.cpp b/cpp/demo/Freeze/library/BookFactory.cpp
index 389e6848d2a..55db8e07182 100644
--- a/cpp/demo/Freeze/library/BookFactory.cpp
+++ b/cpp/demo/Freeze/library/BookFactory.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <BookFactory.h>
 
 using namespace std;
diff --git a/cpp/demo/Freeze/library/BookFactory.h b/cpp/demo/Freeze/library/BookFactory.h
index 2a6452be8e7..1730ab61862 100644
--- a/cpp/demo/Freeze/library/BookFactory.h
+++ b/cpp/demo/Freeze/library/BookFactory.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef BOOK_FACTORY_H
 #define BOOK_FACTORY_H
 
diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp
index 855ac30f2d3..c70e171dcc5 100644
--- a/cpp/demo/Freeze/library/Client.cpp
+++ b/cpp/demo/Freeze/library/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <Parser.h>
 
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index 1cf79be8ec0..06b7745156f 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <BookFactory.h>
 #include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Grammar.y b/cpp/demo/Freeze/library/Grammar.y
index 5e586120fd2..e3c9346149f 100644
--- a/cpp/demo/Freeze/library/Grammar.y
+++ b/cpp/demo/Freeze/library/Grammar.y
@@ -2,18 +2,18 @@
 
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Parser.h>
 
diff --git a/cpp/demo/Freeze/library/Library.ice b/cpp/demo/Freeze/library/Library.ice
index d25784bc1c5..e437c235493 100644
--- a/cpp/demo/Freeze/library/Library.ice
+++ b/cpp/demo/Freeze/library/Library.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef LIBRARY_ICE
 #define LIBRARY_ICE
 
diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp
index 19d9276f24f..1ed4bce7d9c 100644
--- a/cpp/demo/Freeze/library/LibraryI.cpp
+++ b/cpp/demo/Freeze/library/LibraryI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Freeze/Freeze.h>
 #include <LibraryI.h>
 
diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h
index b3f4c065528..2a51f77c168 100644
--- a/cpp/demo/Freeze/library/LibraryI.h
+++ b/cpp/demo/Freeze/library/LibraryI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef LIBRARY_I_H
 #define LIBRARY_I_H
 
diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile
index beed209438a..96ad95996ed 100644
--- a/cpp/demo/Freeze/library/Makefile
+++ b/cpp/demo/Freeze/library/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp
index 3f5211f5f42..8028e306a52 100644
--- a/cpp/demo/Freeze/library/Parser.cpp
+++ b/cpp/demo/Freeze/library/Parser.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Parser.h>
 
diff --git a/cpp/demo/Freeze/library/Parser.h b/cpp/demo/Freeze/library/Parser.h
index 3e9d4646e7b..a3650b9cd51 100644
--- a/cpp/demo/Freeze/library/Parser.h
+++ b/cpp/demo/Freeze/library/Parser.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef PARSER_H
 #define PARSER_H
 
diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp
index e234320ad28..f7d1bbd5d55 100644
--- a/cpp/demo/Freeze/library/RunParser.cpp
+++ b/cpp/demo/Freeze/library/RunParser.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Parser.h>
 
diff --git a/cpp/demo/Freeze/library/Scanner.l b/cpp/demo/Freeze/library/Scanner.l
index a63cc2bb733..96cbb62a4b3 100644
--- a/cpp/demo/Freeze/library/Scanner.l
+++ b/cpp/demo/Freeze/library/Scanner.l
@@ -2,18 +2,18 @@
 
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Parser.h>
 #include <Grammar.h>
diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp
index 758be5b11eb..9d496a4c56a 100644
--- a/cpp/demo/Freeze/library/Server.cpp
+++ b/cpp/demo/Freeze/library/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <BookFactory.h>
 #include <Freeze/Freeze.h>
diff --git a/cpp/demo/Freeze/phonebook/Client.cpp b/cpp/demo/Freeze/phonebook/Client.cpp
index 68288c0ad55..7b21c8a07f0 100644
--- a/cpp/demo/Freeze/phonebook/Client.cpp
+++ b/cpp/demo/Freeze/phonebook/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <Parser.h>
 
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 0f210a234d6..1f98f3a1509 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <ContactFactory.h>
 #include <NameIndex.h>
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.cpp b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
index 112f4364485..a596a7872b2 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.cpp
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <ContactFactory.h>
 #include <PhoneBookI.h>
 
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.h b/cpp/demo/Freeze/phonebook/ContactFactory.h
index c1d3f03c4b3..f980052673a 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.h
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef CONTACT_FACTORY_H
 #define CONTACT_FACTORY_H
 
diff --git a/cpp/demo/Freeze/phonebook/Grammar.y b/cpp/demo/Freeze/phonebook/Grammar.y
index b9d5f092b14..7cbb21d2773 100644
--- a/cpp/demo/Freeze/phonebook/Grammar.y
+++ b/cpp/demo/Freeze/phonebook/Grammar.y
@@ -2,18 +2,18 @@
 
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Parser.h>
 
diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile
index 2ec4d4629a8..23c805b7794 100644
--- a/cpp/demo/Freeze/phonebook/Makefile
+++ b/cpp/demo/Freeze/phonebook/Makefile
@@ -1,18 +1,18 @@
 
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Freeze/phonebook/Parser.cpp b/cpp/demo/Freeze/phonebook/Parser.cpp
index b77be8751e7..8bffb61f96f 100644
--- a/cpp/demo/Freeze/phonebook/Parser.cpp
+++ b/cpp/demo/Freeze/phonebook/Parser.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Parser.h>
 
diff --git a/cpp/demo/Freeze/phonebook/Parser.h b/cpp/demo/Freeze/phonebook/Parser.h
index 43c0028046e..34890d7f5f5 100644
--- a/cpp/demo/Freeze/phonebook/Parser.h
+++ b/cpp/demo/Freeze/phonebook/Parser.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef PARSER_H
 #define PARSER_H
 
diff --git a/cpp/demo/Freeze/phonebook/PhoneBook.ice b/cpp/demo/Freeze/phonebook/PhoneBook.ice
index 2dedc1b90a0..ddbe5fafb7b 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBook.ice
+++ b/cpp/demo/Freeze/phonebook/PhoneBook.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef PHONE_BOOK_ICE
 #define PHONE_BOOK_ICE
 
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
index ea6fda416f4..23f62f2fcc7 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <PhoneBookI.h>
 #include <IceUtil/UUID.h>
 
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h
index 90595856546..4bae446e71e 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.h
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef PHONE_BOOK_I_H
 #define PHONE_BOOK_I_H
 
diff --git a/cpp/demo/Freeze/phonebook/RunParser.cpp b/cpp/demo/Freeze/phonebook/RunParser.cpp
index 537ec8b9057..5e5823194fe 100644
--- a/cpp/demo/Freeze/phonebook/RunParser.cpp
+++ b/cpp/demo/Freeze/phonebook/RunParser.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Parser.h>
 
diff --git a/cpp/demo/Freeze/phonebook/Scanner.l b/cpp/demo/Freeze/phonebook/Scanner.l
index 158bd36c831..de99029de14 100644
--- a/cpp/demo/Freeze/phonebook/Scanner.l
+++ b/cpp/demo/Freeze/phonebook/Scanner.l
@@ -2,18 +2,18 @@
 
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Parser.h>
 #include <Grammar.h>
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index 9dcac3c1980..c65b1789a15 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <ContactFactory.h>
 #include <NameIndex.h>
diff --git a/cpp/demo/Glacier/Makefile b/cpp/demo/Glacier/Makefile
index e8512368672..3bf586c1cbf 100644
--- a/cpp/demo/Glacier/Makefile
+++ b/cpp/demo/Glacier/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp
index 5a0eacee54c..dfd4d86fccd 100644
--- a/cpp/demo/Glacier/session/Client.cpp
+++ b/cpp/demo/Glacier/session/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Glacier/Glacier.h>
 #include <Glacier/Router.h>
diff --git a/cpp/demo/Glacier/session/HelloSession.ice b/cpp/demo/Glacier/session/HelloSession.ice
index 2542290ef8f..32f111b0783 100644
--- a/cpp/demo/Glacier/session/HelloSession.ice
+++ b/cpp/demo/Glacier/session/HelloSession.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/Glacier/session/HelloSessionI.cpp b/cpp/demo/Glacier/session/HelloSessionI.cpp
index d05d9d142cd..87adad827dc 100644
--- a/cpp/demo/Glacier/session/HelloSessionI.cpp
+++ b/cpp/demo/Glacier/session/HelloSessionI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloSessionI.h>
 
diff --git a/cpp/demo/Glacier/session/HelloSessionI.h b/cpp/demo/Glacier/session/HelloSessionI.h
index dd805ac3fe9..6365bf13e29 100644
--- a/cpp/demo/Glacier/session/HelloSessionI.h
+++ b/cpp/demo/Glacier/session/HelloSessionI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_SESSION_I_H
 #define HELLO_SESSION_I_H
 
diff --git a/cpp/demo/Glacier/session/Makefile b/cpp/demo/Glacier/session/Makefile
index df5b0301870..4268b607751 100644
--- a/cpp/demo/Glacier/session/Makefile
+++ b/cpp/demo/Glacier/session/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Glacier/session/Server.cpp b/cpp/demo/Glacier/session/Server.cpp
index dca4f02dc52..283d9a33af4 100644
--- a/cpp/demo/Glacier/session/Server.cpp
+++ b/cpp/demo/Glacier/session/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Glacier/Glacier.h>
 #include <HelloSessionI.h>
diff --git a/cpp/demo/Ice/MFC/client/Hello.ice b/cpp/demo/Ice/MFC/client/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/MFC/client/Hello.ice
+++ b/cpp/demo/Ice/MFC/client/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.cpp b/cpp/demo/Ice/MFC/client/HelloClient.cpp
index ceb2bdbe2c6..cc7e46308c0 100644
--- a/cpp/demo/Ice/MFC/client/HelloClient.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClient.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #include "stdafx.h"

 #include "HelloClient.h"

diff --git a/cpp/demo/Ice/MFC/client/HelloClient.h b/cpp/demo/Ice/MFC/client/HelloClient.h
index b234ca6063e..46cac8a9d4e 100644
--- a/cpp/demo/Ice/MFC/client/HelloClient.h
+++ b/cpp/demo/Ice/MFC/client/HelloClient.h
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #ifndef HELLO_CLIENT_H

 #define HELLO_CLIENT_H

diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
index f2873e6e1a6..b08986a3f3d 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #include "stdafx.h"

 #include "HelloClient.h"

diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
index e61f8a286c7..75bc633b0c7 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #ifndef HELLO_CLIENT_DLG_H

 #define HELLO_CLIENT_DLG_H

diff --git a/cpp/demo/Ice/MFC/client/stdafx.cpp b/cpp/demo/Ice/MFC/client/stdafx.cpp
index 01112a78de2..0f0125b30f8 100644
--- a/cpp/demo/Ice/MFC/client/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/client/stdafx.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 // stdafx.cpp : source file that includes just the standard includes

 // HelloClient.pch will be the pre-compiled header

diff --git a/cpp/demo/Ice/MFC/client/stdafx.h b/cpp/demo/Ice/MFC/client/stdafx.h
index ca0dd089a3d..22c4a5ecac9 100644
--- a/cpp/demo/Ice/MFC/client/stdafx.h
+++ b/cpp/demo/Ice/MFC/client/stdafx.h
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 // stdafx.h : include file for standard system include files,

 // or project specific include files that are used frequently,

diff --git a/cpp/demo/Ice/MFC/server/Hello.ice b/cpp/demo/Ice/MFC/server/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/MFC/server/Hello.ice
+++ b/cpp/demo/Ice/MFC/server/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/Ice/MFC/server/HelloI.cpp b/cpp/demo/Ice/MFC/server/HelloI.cpp
index eff20bbc173..2e43f383d68 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include "stdafx.h"
 #include <HelloI.h>
 
diff --git a/cpp/demo/Ice/MFC/server/HelloI.h b/cpp/demo/Ice/MFC/server/HelloI.h
index a8423d91f08..1361d688faf 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.h
+++ b/cpp/demo/Ice/MFC/server/HelloI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_I_H
 #define HELLO_I_H
 
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.cpp b/cpp/demo/Ice/MFC/server/HelloServer.cpp
index 6899eb18b47..148d2538a57 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloServer.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #include "stdafx.h"

 #include "HelloServer.h"

diff --git a/cpp/demo/Ice/MFC/server/HelloServer.h b/cpp/demo/Ice/MFC/server/HelloServer.h
index ef7b4c511b5..8451e9dc382 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.h
+++ b/cpp/demo/Ice/MFC/server/HelloServer.h
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #ifndef HELLO_SERVER_H

 #define HELLO_SERVER_H

diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
index cb0ecd67682..2414737df43 100644
--- a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #include "stdafx.h"

 #include "HelloServer.h"

diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.h b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
index 253a2f30431..5072d4efc04 100644
--- a/cpp/demo/Ice/MFC/server/HelloServerDlg.h
+++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #ifndef HELLO_SERVER_DLG_H

 #define HELLO_SERVER_DLG_H

diff --git a/cpp/demo/Ice/MFC/server/LogI.cpp b/cpp/demo/Ice/MFC/server/LogI.cpp
index 58b6f3b7265..ace1b31db96 100644
--- a/cpp/demo/Ice/MFC/server/LogI.cpp
+++ b/cpp/demo/Ice/MFC/server/LogI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include "stdafx.h"
 #include "LogI.h"
 
diff --git a/cpp/demo/Ice/MFC/server/LogI.h b/cpp/demo/Ice/MFC/server/LogI.h
index 59f75de5c3d..e769da7cb22 100644
--- a/cpp/demo/Ice/MFC/server/LogI.h
+++ b/cpp/demo/Ice/MFC/server/LogI.h
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 #ifndef LOG_I_H

 #define LOG_I_H

diff --git a/cpp/demo/Ice/MFC/server/stdafx.cpp b/cpp/demo/Ice/MFC/server/stdafx.cpp
index 4222b45616b..dd3111c0bce 100644
--- a/cpp/demo/Ice/MFC/server/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/server/stdafx.cpp
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 // stdafx.cpp : source file that includes just the standard includes

 // HelloServer.pch will be the pre-compiled header

diff --git a/cpp/demo/Ice/MFC/server/stdafx.h b/cpp/demo/Ice/MFC/server/stdafx.h
index ca0dd089a3d..22c4a5ecac9 100644
--- a/cpp/demo/Ice/MFC/server/stdafx.h
+++ b/cpp/demo/Ice/MFC/server/stdafx.h
@@ -1,16 +1,16 @@
-// **********************************************************************

-//

-// Copyright (c) 2003

-// ZeroC, Inc.

-// Billerica, MA, USA

-//

-// All Rights Reserved.

-//

-// Ice is free software; you can redistribute it and/or modify it under

-// the terms of the GNU General Public License version 2 as published by

-// the Free Software Foundation.

-//

-// **********************************************************************

+// **********************************************************************
+//
+// Copyright (c) 2003 - 2004
+// ZeroC, Inc.
+// North Palm Beach, FL, USA
+//
+// All Rights Reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 

 // stdafx.h : include file for standard system include files,

 // or project specific include files that are used frequently,

diff --git a/cpp/demo/Ice/Makefile b/cpp/demo/Ice/Makefile
index 7cd2a3c101b..cfe6268bbcd 100644
--- a/cpp/demo/Ice/Makefile
+++ b/cpp/demo/Ice/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice
index 2686a46dc84..da64c2948e3 100644
--- a/cpp/demo/Ice/callback/Callback.ice
+++ b/cpp/demo/Ice/callback/Callback.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
diff --git a/cpp/demo/Ice/callback/CallbackI.cpp b/cpp/demo/Ice/callback/CallbackI.cpp
index 935eee32c50..b9bdf2032bc 100644
--- a/cpp/demo/Ice/callback/CallbackI.cpp
+++ b/cpp/demo/Ice/callback/CallbackI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <CallbackI.h>
 
diff --git a/cpp/demo/Ice/callback/CallbackI.h b/cpp/demo/Ice/callback/CallbackI.h
index 15abb3a04e3..1b3167c75e8 100644
--- a/cpp/demo/Ice/callback/CallbackI.h
+++ b/cpp/demo/Ice/callback/CallbackI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef CALLBACK_I_H
 #define CALLBACK_I_H
 
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index e0b6c667465..0c1cc916cc0 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <CallbackI.h>
 
diff --git a/cpp/demo/Ice/callback/Makefile b/cpp/demo/Ice/callback/Makefile
index 07aa1f7046b..6df65ae3589 100644
--- a/cpp/demo/Ice/callback/Makefile
+++ b/cpp/demo/Ice/callback/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp
index c76636468c8..74be3ab32d2 100644
--- a/cpp/demo/Ice/callback/Server.cpp
+++ b/cpp/demo/Ice/callback/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <CallbackI.h>
 
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index 1f63bf78ab0..1eddb644749 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Hello.h>
 
diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/Ice/hello/Hello.ice
+++ b/cpp/demo/Ice/hello/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/Ice/hello/HelloI.cpp b/cpp/demo/Ice/hello/HelloI.cpp
index 880603c5f46..6f29d3b5332 100644
--- a/cpp/demo/Ice/hello/HelloI.cpp
+++ b/cpp/demo/Ice/hello/HelloI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloI.h>
 
diff --git a/cpp/demo/Ice/hello/HelloI.h b/cpp/demo/Ice/hello/HelloI.h
index e57da289476..12ed5ba1f9b 100644
--- a/cpp/demo/Ice/hello/HelloI.h
+++ b/cpp/demo/Ice/hello/HelloI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_I_H
 #define HELLO_I_H
 
diff --git a/cpp/demo/Ice/hello/Makefile b/cpp/demo/Ice/hello/Makefile
index 7e7f62ec26f..33ce7dc9504 100644
--- a/cpp/demo/Ice/hello/Makefile
+++ b/cpp/demo/Ice/hello/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp
index 6d50c4ed612..de0870dd26c 100644
--- a/cpp/demo/Ice/hello/Server.cpp
+++ b/cpp/demo/Ice/hello/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloI.h>
 
diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp
index bfd75f4debb..97ba57bb900 100644
--- a/cpp/demo/Ice/latency/Client.cpp
+++ b/cpp/demo/Ice/latency/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Latency.h>
 
diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice
index 3bd70571733..b11e6cf4e94 100644
--- a/cpp/demo/Ice/latency/Latency.ice
+++ b/cpp/demo/Ice/latency/Latency.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef LATENCY_ICE
 #define LATENCY_ICE
 
diff --git a/cpp/demo/Ice/latency/Makefile b/cpp/demo/Ice/latency/Makefile
index ad9ce94abc8..d615fc43246 100644
--- a/cpp/demo/Ice/latency/Makefile
+++ b/cpp/demo/Ice/latency/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp
index ade737b0ee4..1c3495ce1f9 100644
--- a/cpp/demo/Ice/latency/Server.cpp
+++ b/cpp/demo/Ice/latency/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Latency.h>
 
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index 2ea1f26cac9..bc9f3d6e4ae 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <NestedI.h>
 
diff --git a/cpp/demo/Ice/nested/Makefile b/cpp/demo/Ice/nested/Makefile
index 775dc25d3b7..d6d3ce4c05b 100644
--- a/cpp/demo/Ice/nested/Makefile
+++ b/cpp/demo/Ice/nested/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice
index ba810a21d41..e629bbe88d2 100644
--- a/cpp/demo/Ice/nested/Nested.ice
+++ b/cpp/demo/Ice/nested/Nested.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef NESTED_ICE
 #define NESTED_ICE
 
diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp
index 58cc395d7de..a8c094e2f6c 100644
--- a/cpp/demo/Ice/nested/NestedI.cpp
+++ b/cpp/demo/Ice/nested/NestedI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <NestedI.h>
 
diff --git a/cpp/demo/Ice/nested/NestedI.h b/cpp/demo/Ice/nested/NestedI.h
index cf61f6fa5d4..c2c91b4a4af 100644
--- a/cpp/demo/Ice/nested/NestedI.h
+++ b/cpp/demo/Ice/nested/NestedI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef NESTED_I_H
 #define NESTED_I_H
 
diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp
index 2ab208d715b..67b4f2f2b53 100644
--- a/cpp/demo/Ice/nested/Server.cpp
+++ b/cpp/demo/Ice/nested/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <NestedI.h>
 
diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index c807e409300..fda3b586a58 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Throughput.h>
 
diff --git a/cpp/demo/Ice/throughput/Makefile b/cpp/demo/Ice/throughput/Makefile
index 5edade485fc..26dbf057250 100644
--- a/cpp/demo/Ice/throughput/Makefile
+++ b/cpp/demo/Ice/throughput/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp
index 46f1d63d72c..3b1e23f1fe4 100644
--- a/cpp/demo/Ice/throughput/Server.cpp
+++ b/cpp/demo/Ice/throughput/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <ThroughputI.h>
 
 using namespace std;
diff --git a/cpp/demo/Ice/throughput/Throughput.ice b/cpp/demo/Ice/throughput/Throughput.ice
index e28cef29cf4..3b02a3861d9 100644
--- a/cpp/demo/Ice/throughput/Throughput.ice
+++ b/cpp/demo/Ice/throughput/Throughput.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef THROUGHPUT_ICE
 #define THROUGHPUT_ICE
 
diff --git a/cpp/demo/Ice/throughput/ThroughputI.h b/cpp/demo/Ice/throughput/ThroughputI.h
index 3326f6979b1..f7d34ca5ee1 100644
--- a/cpp/demo/Ice/throughput/ThroughputI.h
+++ b/cpp/demo/Ice/throughput/ThroughputI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef THROUGHPUT_I_H
 #define THROUGHPUT_I_H
 
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index 9c875cb9eb3..e300c3933ca 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Value.h>
 #include <ObjectFactory.h>
diff --git a/cpp/demo/Ice/value/Makefile b/cpp/demo/Ice/value/Makefile
index d6b3aff023c..05bf1c2f0a8 100644
--- a/cpp/demo/Ice/value/Makefile
+++ b/cpp/demo/Ice/value/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/Ice/value/ObjectFactory.cpp b/cpp/demo/Ice/value/ObjectFactory.cpp
index cf6f501dcac..462cc1f0a39 100644
--- a/cpp/demo/Ice/value/ObjectFactory.cpp
+++ b/cpp/demo/Ice/value/ObjectFactory.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <ObjectFactory.h>
 #include <ValueI.h>
diff --git a/cpp/demo/Ice/value/ObjectFactory.h b/cpp/demo/Ice/value/ObjectFactory.h
index a19f8efcaf5..9cd2b21686d 100644
--- a/cpp/demo/Ice/value/ObjectFactory.h
+++ b/cpp/demo/Ice/value/ObjectFactory.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef SERVANT_FACTORY_H
 #define SERVANT_FACTORY_H
 
diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp
index d03ccef1126..62feea2ca91 100644
--- a/cpp/demo/Ice/value/Server.cpp
+++ b/cpp/demo/Ice/value/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <ValueI.h>
 
diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice
index 4a69d6b6a7d..b4196a7bee3 100644
--- a/cpp/demo/Ice/value/Value.ice
+++ b/cpp/demo/Ice/value/Value.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef VALUE_ICE
 #define VALUE_ICE
 
diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp
index 20c986db61f..782318aeb1c 100644
--- a/cpp/demo/Ice/value/ValueI.cpp
+++ b/cpp/demo/Ice/value/ValueI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <ValueI.h>
 
diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h
index 6dea83ec19b..03007466407 100644
--- a/cpp/demo/Ice/value/ValueI.h
+++ b/cpp/demo/Ice/value/ValueI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef VALUE_I_H
 #define VALUE_I_H
 
diff --git a/cpp/demo/IceBox/Makefile b/cpp/demo/IceBox/Makefile
index 70ab1b3ede2..1f9de301f04 100644
--- a/cpp/demo/IceBox/Makefile
+++ b/cpp/demo/IceBox/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp
index 365267b0799..bac947faae7 100644
--- a/cpp/demo/IceBox/hello/Client.cpp
+++ b/cpp/demo/IceBox/hello/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <Hello.h>
 
diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice
index c9ccce18906..7fc2c380953 100644
--- a/cpp/demo/IceBox/hello/Hello.ice
+++ b/cpp/demo/IceBox/hello/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/IceBox/hello/HelloI.cpp b/cpp/demo/IceBox/hello/HelloI.cpp
index ac5499dd37c..59b519fa825 100644
--- a/cpp/demo/IceBox/hello/HelloI.cpp
+++ b/cpp/demo/IceBox/hello/HelloI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloI.h>
 
diff --git a/cpp/demo/IceBox/hello/HelloI.h b/cpp/demo/IceBox/hello/HelloI.h
index b8f82d21c1a..cbcb981cd84 100644
--- a/cpp/demo/IceBox/hello/HelloI.h
+++ b/cpp/demo/IceBox/hello/HelloI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_I_H
 #define HELLO_I_H
 
diff --git a/cpp/demo/IceBox/hello/HelloServiceI.cpp b/cpp/demo/IceBox/hello/HelloServiceI.cpp
index c4f93d562f7..491e6333007 100644
--- a/cpp/demo/IceBox/hello/HelloServiceI.cpp
+++ b/cpp/demo/IceBox/hello/HelloServiceI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloServiceI.h>
 #include <HelloI.h>
diff --git a/cpp/demo/IceBox/hello/HelloServiceI.h b/cpp/demo/IceBox/hello/HelloServiceI.h
index f6f0c816d9c..4a1773b497c 100644
--- a/cpp/demo/IceBox/hello/HelloServiceI.h
+++ b/cpp/demo/IceBox/hello/HelloServiceI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_SERVICE_I_H
 #define HELLO_SERVICE_I_H
 
diff --git a/cpp/demo/IceBox/hello/Makefile b/cpp/demo/IceBox/hello/Makefile
index c241f01ca86..5801d7731d2 100644
--- a/cpp/demo/IceBox/hello/Makefile
+++ b/cpp/demo/IceBox/hello/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/IcePack/Makefile b/cpp/demo/IcePack/Makefile
index 687a0d06c24..2845533b65c 100644
--- a/cpp/demo/IcePack/Makefile
+++ b/cpp/demo/IcePack/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/IcePack/hello/Client.cpp b/cpp/demo/IcePack/hello/Client.cpp
index 173d113d40f..53477355ddf 100644
--- a/cpp/demo/IcePack/hello/Client.cpp
+++ b/cpp/demo/IcePack/hello/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <IcePack/Query.h>
 #include <Hello.h>
diff --git a/cpp/demo/IcePack/hello/Hello.ice b/cpp/demo/IcePack/hello/Hello.ice
index c071142f40d..97af57216f4 100644
--- a/cpp/demo/IcePack/hello/Hello.ice
+++ b/cpp/demo/IcePack/hello/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/IcePack/hello/HelloI.cpp b/cpp/demo/IcePack/hello/HelloI.cpp
index 3885e64c6db..3a159ec3257 100644
--- a/cpp/demo/IcePack/hello/HelloI.cpp
+++ b/cpp/demo/IcePack/hello/HelloI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <IcePack/Admin.h>
 #include <HelloI.h>
diff --git a/cpp/demo/IcePack/hello/HelloI.h b/cpp/demo/IcePack/hello/HelloI.h
index a5ad2807b9f..da4fbb0da0b 100644
--- a/cpp/demo/IcePack/hello/HelloI.h
+++ b/cpp/demo/IcePack/hello/HelloI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_I_H
 #define HELLO_I_H
 
diff --git a/cpp/demo/IcePack/hello/HelloServiceI.cpp b/cpp/demo/IcePack/hello/HelloServiceI.cpp
index a09d4e8aca3..05ceca015d2 100644
--- a/cpp/demo/IcePack/hello/HelloServiceI.cpp
+++ b/cpp/demo/IcePack/hello/HelloServiceI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloServiceI.h>
 #include <HelloI.h>
diff --git a/cpp/demo/IcePack/hello/HelloServiceI.h b/cpp/demo/IcePack/hello/HelloServiceI.h
index ce4fa871165..f7ac55fe62a 100644
--- a/cpp/demo/IcePack/hello/HelloServiceI.h
+++ b/cpp/demo/IcePack/hello/HelloServiceI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_SERVICE_I_H
 #define HELLO_SERVICE_I_H
 
diff --git a/cpp/demo/IcePack/hello/Makefile b/cpp/demo/IcePack/hello/Makefile
index b9e0342f0a2..f16e86f46ed 100644
--- a/cpp/demo/IcePack/hello/Makefile
+++ b/cpp/demo/IcePack/hello/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/IcePack/hello/Server.cpp b/cpp/demo/IcePack/hello/Server.cpp
index 2e2a0089fa7..715d2ebec46 100644
--- a/cpp/demo/IcePack/hello/Server.cpp
+++ b/cpp/demo/IcePack/hello/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloI.h>
 
diff --git a/cpp/demo/IcePack/simple/Client.cpp b/cpp/demo/IcePack/simple/Client.cpp
index 4e6ab941b42..0fbb8ce7a54 100644
--- a/cpp/demo/IcePack/simple/Client.cpp
+++ b/cpp/demo/IcePack/simple/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <IcePack/Query.h>
 #include <Hello.h>
diff --git a/cpp/demo/IcePack/simple/Hello.ice b/cpp/demo/IcePack/simple/Hello.ice
index 84604c30680..882e96b8a55 100644
--- a/cpp/demo/IcePack/simple/Hello.ice
+++ b/cpp/demo/IcePack/simple/Hello.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
diff --git a/cpp/demo/IcePack/simple/HelloI.cpp b/cpp/demo/IcePack/simple/HelloI.cpp
index 880603c5f46..6f29d3b5332 100644
--- a/cpp/demo/IcePack/simple/HelloI.cpp
+++ b/cpp/demo/IcePack/simple/HelloI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloI.h>
 
diff --git a/cpp/demo/IcePack/simple/HelloI.h b/cpp/demo/IcePack/simple/HelloI.h
index e57da289476..12ed5ba1f9b 100644
--- a/cpp/demo/IcePack/simple/HelloI.h
+++ b/cpp/demo/IcePack/simple/HelloI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_I_H
 #define HELLO_I_H
 
diff --git a/cpp/demo/IcePack/simple/HelloServiceI.cpp b/cpp/demo/IcePack/simple/HelloServiceI.cpp
index bdaa3193fbd..7ce780a3009 100644
--- a/cpp/demo/IcePack/simple/HelloServiceI.cpp
+++ b/cpp/demo/IcePack/simple/HelloServiceI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Huntsville, AL, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloServiceI.h>
 #include <HelloI.h>
diff --git a/cpp/demo/IcePack/simple/HelloServiceI.h b/cpp/demo/IcePack/simple/HelloServiceI.h
index f6f0c816d9c..4a1773b497c 100644
--- a/cpp/demo/IcePack/simple/HelloServiceI.h
+++ b/cpp/demo/IcePack/simple/HelloServiceI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef HELLO_SERVICE_I_H
 #define HELLO_SERVICE_I_H
 
diff --git a/cpp/demo/IcePack/simple/Makefile b/cpp/demo/IcePack/simple/Makefile
index 4b979b68c93..dae4fc28851 100644
--- a/cpp/demo/IcePack/simple/Makefile
+++ b/cpp/demo/IcePack/simple/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/demo/IcePack/simple/Server.cpp b/cpp/demo/IcePack/simple/Server.cpp
index ab9d956d157..dffcf6c4e77 100644
--- a/cpp/demo/IcePack/simple/Server.cpp
+++ b/cpp/demo/IcePack/simple/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <HelloI.h>
 
diff --git a/cpp/demo/IceStorm/Makefile b/cpp/demo/IceStorm/Makefile
index 86cf8854d60..20a6ef3fc3a 100644
--- a/cpp/demo/IceStorm/Makefile
+++ b/cpp/demo/IceStorm/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/IceStorm/clock/Clock.ice b/cpp/demo/IceStorm/clock/Clock.ice
index 1b1f7144e82..706a254640f 100644
--- a/cpp/demo/IceStorm/clock/Clock.ice
+++ b/cpp/demo/IceStorm/clock/Clock.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef CLOCK_ICE
 #define CLOCK_ICE
 
diff --git a/cpp/demo/IceStorm/clock/ClockI.cpp b/cpp/demo/IceStorm/clock/ClockI.cpp
index 5f73e795a2e..815b156788a 100644
--- a/cpp/demo/IceStorm/clock/ClockI.cpp
+++ b/cpp/demo/IceStorm/clock/ClockI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 
 #include <ClockI.h>
diff --git a/cpp/demo/IceStorm/clock/ClockI.h b/cpp/demo/IceStorm/clock/ClockI.h
index 94274653b1b..8b835daa8ec 100644
--- a/cpp/demo/IceStorm/clock/ClockI.h
+++ b/cpp/demo/IceStorm/clock/ClockI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef CLOCK_I_H
 #define CLOCK_I_H
 
diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile
index 41681abe769..d32f13231af 100644
--- a/cpp/demo/IceStorm/clock/Makefile
+++ b/cpp/demo/IceStorm/clock/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 PUBLISHER	= publisher
diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp
index a98491ae54c..e942acc7528 100644
--- a/cpp/demo/IceStorm/clock/Publisher.cpp
+++ b/cpp/demo/IceStorm/clock/Publisher.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <IceStorm/IceStorm.h>
 
diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp
index 04f934a532c..855881f6534 100644
--- a/cpp/demo/IceStorm/clock/Subscriber.cpp
+++ b/cpp/demo/IceStorm/clock/Subscriber.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Application.h>
 #include <IceStorm/IceStorm.h>
 #include <IceUtil/UUID.h>
diff --git a/cpp/demo/IceUtil/Makefile b/cpp/demo/IceUtil/Makefile
index 89d9370b435..f48d73d749b 100644
--- a/cpp/demo/IceUtil/Makefile
+++ b/cpp/demo/IceUtil/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
diff --git a/cpp/demo/IceUtil/workqueue/Makefile b/cpp/demo/IceUtil/workqueue/Makefile
index a04203e3ff2..306f78ec33d 100644
--- a/cpp/demo/IceUtil/workqueue/Makefile
+++ b/cpp/demo/IceUtil/workqueue/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ../../..
 
 CLIENT		= workqueue
diff --git a/cpp/demo/IceUtil/workqueue/WorkQueue.cpp b/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
index 9c0e4b9dea6..2f0a0ac49c3 100644
--- a/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
+++ b/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <IceUtil/Thread.h>
 #include <IceUtil/Exception.h>
 #include <IceUtil/Monitor.h>
diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile
index 1a95bbeef1f..41c10fc7ce9 100644
--- a/cpp/demo/Makefile
+++ b/cpp/demo/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 top_srcdir	= ..
 
 include $(top_srcdir)/config/Make.rules