summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/Makefile8
-rwxr-xr-xcpp/allTests.py8
-rwxr-xr-xcpp/bin/gencerts8
-rw-r--r--cpp/config/IcePackAdmin.py8
-rw-r--r--cpp/config/Make.rules8
-rw-r--r--cpp/config/TestUtil.py8
-rwxr-xr-xcpp/config/makedepend.py8
-rw-r--r--cpp/demo/Freeze/Makefile8
-rw-r--r--cpp/demo/Freeze/bench/Client.cpp8
-rw-r--r--cpp/demo/Freeze/bench/Makefile8
-rw-r--r--cpp/demo/Freeze/bench/Test.ice8
-rw-r--r--cpp/demo/Freeze/library/BookFactory.cpp8
-rw-r--r--cpp/demo/Freeze/library/BookFactory.h8
-rw-r--r--cpp/demo/Freeze/library/Client.cpp8
-rw-r--r--cpp/demo/Freeze/library/Collocated.cpp8
-rw-r--r--cpp/demo/Freeze/library/Grammar.y8
-rw-r--r--cpp/demo/Freeze/library/Library.ice8
-rw-r--r--cpp/demo/Freeze/library/LibraryI.cpp8
-rw-r--r--cpp/demo/Freeze/library/LibraryI.h8
-rw-r--r--cpp/demo/Freeze/library/Makefile8
-rw-r--r--cpp/demo/Freeze/library/Parser.cpp8
-rw-r--r--cpp/demo/Freeze/library/Parser.h8
-rw-r--r--cpp/demo/Freeze/library/RunParser.cpp8
-rw-r--r--cpp/demo/Freeze/library/Scanner.l8
-rw-r--r--cpp/demo/Freeze/library/Server.cpp8
-rw-r--r--cpp/demo/Freeze/phonebook/Client.cpp8
-rw-r--r--cpp/demo/Freeze/phonebook/Collocated.cpp8
-rw-r--r--cpp/demo/Freeze/phonebook/ContactFactory.cpp8
-rw-r--r--cpp/demo/Freeze/phonebook/ContactFactory.h8
-rw-r--r--cpp/demo/Freeze/phonebook/Grammar.y8
-rw-r--r--cpp/demo/Freeze/phonebook/Makefile8
-rw-r--r--cpp/demo/Freeze/phonebook/Parser.cpp8
-rw-r--r--cpp/demo/Freeze/phonebook/Parser.h8
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBook.ice8
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBookI.cpp8
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBookI.h8
-rw-r--r--cpp/demo/Freeze/phonebook/RunParser.cpp8
-rw-r--r--cpp/demo/Freeze/phonebook/Scanner.l8
-rw-r--r--cpp/demo/Freeze/phonebook/Server.cpp8
-rw-r--r--cpp/demo/Freeze/phonebook/contacts8
-rw-r--r--cpp/demo/Glacier/Makefile8
-rw-r--r--cpp/demo/Glacier/session/Client.cpp8
-rw-r--r--cpp/demo/Glacier/session/HelloSession.ice8
-rw-r--r--cpp/demo/Glacier/session/HelloSessionI.cpp8
-rw-r--r--cpp/demo/Glacier/session/HelloSessionI.h8
-rw-r--r--cpp/demo/Glacier/session/Makefile8
-rw-r--r--cpp/demo/Glacier/session/Server.cpp8
-rw-r--r--cpp/demo/Ice/Makefile8
-rw-r--r--cpp/demo/Ice/callback/Callback.ice8
-rw-r--r--cpp/demo/Ice/callback/CallbackI.cpp8
-rw-r--r--cpp/demo/Ice/callback/CallbackI.h8
-rw-r--r--cpp/demo/Ice/callback/Client.cpp8
-rw-r--r--cpp/demo/Ice/callback/Makefile8
-rw-r--r--cpp/demo/Ice/callback/Server.cpp8
-rw-r--r--cpp/demo/Ice/hello/Client.cpp8
-rw-r--r--cpp/demo/Ice/hello/Hello.ice8
-rw-r--r--cpp/demo/Ice/hello/HelloI.cpp8
-rw-r--r--cpp/demo/Ice/hello/HelloI.h8
-rw-r--r--cpp/demo/Ice/hello/Makefile8
-rw-r--r--cpp/demo/Ice/hello/Server.cpp8
-rw-r--r--cpp/demo/Ice/latency/Client.cpp8
-rw-r--r--cpp/demo/Ice/latency/Latency.ice8
-rw-r--r--cpp/demo/Ice/latency/Makefile8
-rw-r--r--cpp/demo/Ice/latency/Server.cpp8
-rw-r--r--cpp/demo/Ice/nested/Client.cpp8
-rw-r--r--cpp/demo/Ice/nested/Makefile8
-rw-r--r--cpp/demo/Ice/nested/Nested.ice8
-rw-r--r--cpp/demo/Ice/nested/NestedI.cpp8
-rw-r--r--cpp/demo/Ice/nested/NestedI.h8
-rw-r--r--cpp/demo/Ice/nested/Server.cpp8
-rw-r--r--cpp/demo/Ice/value/Client.cpp8
-rw-r--r--cpp/demo/Ice/value/Makefile8
-rw-r--r--cpp/demo/Ice/value/ObjectFactory.cpp8
-rw-r--r--cpp/demo/Ice/value/ObjectFactory.h8
-rw-r--r--cpp/demo/Ice/value/Server.cpp8
-rw-r--r--cpp/demo/Ice/value/Value.ice8
-rw-r--r--cpp/demo/Ice/value/ValueI.cpp8
-rw-r--r--cpp/demo/Ice/value/ValueI.h8
-rw-r--r--cpp/demo/IceBox/Makefile8
-rw-r--r--cpp/demo/IceBox/hello/Client.cpp8
-rw-r--r--cpp/demo/IceBox/hello/Hello.ice8
-rw-r--r--cpp/demo/IceBox/hello/HelloI.cpp8
-rw-r--r--cpp/demo/IceBox/hello/HelloI.h8
-rw-r--r--cpp/demo/IceBox/hello/HelloServiceI.cpp14
-rw-r--r--cpp/demo/IceBox/hello/HelloServiceI.h8
-rw-r--r--cpp/demo/IceBox/hello/Makefile8
-rw-r--r--cpp/demo/IceStorm/Makefile8
-rw-r--r--cpp/demo/IceStorm/clock/Clock.ice8
-rw-r--r--cpp/demo/IceStorm/clock/ClockI.cpp8
-rw-r--r--cpp/demo/IceStorm/clock/ClockI.h8
-rw-r--r--cpp/demo/IceStorm/clock/Makefile8
-rw-r--r--cpp/demo/IceStorm/clock/Publisher.cpp8
-rw-r--r--cpp/demo/IceStorm/clock/Subscriber.cpp8
-rw-r--r--cpp/demo/IceUtil/Makefile8
-rw-r--r--cpp/demo/IceUtil/workqueue/Makefile8
-rw-r--r--cpp/demo/IceUtil/workqueue/WorkQueue.cpp8
-rw-r--r--cpp/demo/Makefile8
-rw-r--r--cpp/doc/Makefile8
-rw-r--r--cpp/doc/Properties.sgml2
-rw-r--r--cpp/doc/ProxiesEndpoints.sgml2
-rw-r--r--cpp/doc/manual.sgml6
-rw-r--r--cpp/include/Freeze/Application.h8
-rw-r--r--cpp/include/Freeze/Freeze.h8
-rw-r--r--cpp/include/Freeze/Initialize.h8
-rw-r--r--cpp/include/Freeze/Map.h8
-rw-r--r--cpp/include/Glacier/Glacier.h8
-rw-r--r--cpp/include/Ice/Application.h8
-rw-r--r--cpp/include/Ice/BasicStream.h8
-rw-r--r--cpp/include/Ice/Buffer.h8
-rw-r--r--cpp/include/Ice/Config.h8
-rw-r--r--cpp/include/Ice/ConnectionF.h8
-rw-r--r--cpp/include/Ice/ConnectionFactoryF.h8
-rw-r--r--cpp/include/Ice/Const.h8
-rw-r--r--cpp/include/Ice/Direct.h8
-rw-r--r--cpp/include/Ice/DynamicLibrary.h8
-rw-r--r--cpp/include/Ice/DynamicLibraryF.h8
-rw-r--r--cpp/include/Ice/EndpointF.h8
-rw-r--r--cpp/include/Ice/EndpointFactory.h8
-rw-r--r--cpp/include/Ice/EndpointFactoryF.h8
-rw-r--r--cpp/include/Ice/Exception.h8
-rw-r--r--cpp/include/Ice/Functional.h8
-rw-r--r--cpp/include/Ice/Handle.h8
-rw-r--r--cpp/include/Ice/Ice.h8
-rw-r--r--cpp/include/Ice/IdentityUtil.h8
-rw-r--r--cpp/include/Ice/Incoming.h8
-rw-r--r--cpp/include/Ice/Initialize.h8
-rw-r--r--cpp/include/Ice/InstanceF.h8
-rw-r--r--cpp/include/Ice/LocalObject.h8
-rw-r--r--cpp/include/Ice/LocalObjectF.h8
-rw-r--r--cpp/include/Ice/LoggerUtil.h8
-rw-r--r--cpp/include/Ice/Object.h8
-rw-r--r--cpp/include/Ice/ObjectAdapterFactoryF.h8
-rw-r--r--cpp/include/Ice/ObjectF.h8
-rw-r--r--cpp/include/Ice/Outgoing.h8
-rw-r--r--cpp/include/Ice/ProtocolPluginFacade.h8
-rw-r--r--cpp/include/Ice/ProtocolPluginFacadeF.h8
-rw-r--r--cpp/include/Ice/Proxy.h8
-rw-r--r--cpp/include/Ice/ProxyF.h8
-rw-r--r--cpp/include/Ice/ProxyFactoryF.h8
-rw-r--r--cpp/include/Ice/ProxyHandle.h8
-rw-r--r--cpp/include/Ice/ReferenceF.h8
-rw-r--r--cpp/include/Ice/RoutingTable.h8
-rw-r--r--cpp/include/Ice/RoutingTableF.h8
-rw-r--r--cpp/include/IcePatch/ClientUtil.h8
-rw-r--r--cpp/include/IcePatch/FileDescFactory.h8
-rw-r--r--cpp/include/IcePatch/Util.h8
-rw-r--r--cpp/include/IceSSL/CertificateVerifierOpenSSL.h8
-rw-r--r--cpp/include/IceSSL/RSACertificateGen.h8
-rw-r--r--cpp/include/IceSSL/RSACertificateGenF.h8
-rw-r--r--cpp/include/IceSSL/RSAKeyPair.h8
-rw-r--r--cpp/include/IceSSL/RSAKeyPairF.h8
-rw-r--r--cpp/include/IceSSL/RSAPrivateKey.h8
-rw-r--r--cpp/include/IceSSL/RSAPrivateKeyF.h8
-rw-r--r--cpp/include/IceSSL/RSAPublicKey.h8
-rw-r--r--cpp/include/IceSSL/RSAPublicKeyF.h8
-rw-r--r--cpp/include/IceUtil/Base64.h8
-rw-r--r--cpp/include/IceUtil/Cond.h8
-rw-r--r--cpp/include/IceUtil/Config.h8
-rw-r--r--cpp/include/IceUtil/Exception.h8
-rw-r--r--cpp/include/IceUtil/Functional.h8
-rw-r--r--cpp/include/IceUtil/Handle.h8
-rw-r--r--cpp/include/IceUtil/IceUtil.h8
-rw-r--r--cpp/include/IceUtil/InputUtil.h8
-rw-r--r--cpp/include/IceUtil/Lock.h8
-rw-r--r--cpp/include/IceUtil/Monitor.h8
-rw-r--r--cpp/include/IceUtil/Mutex.h8
-rw-r--r--cpp/include/IceUtil/OutputUtil.h8
-rw-r--r--cpp/include/IceUtil/RWRecMutex.h8
-rw-r--r--cpp/include/IceUtil/RecMutex.h8
-rw-r--r--cpp/include/IceUtil/Shared.h8
-rw-r--r--cpp/include/IceUtil/Thread.h8
-rw-r--r--cpp/include/IceUtil/ThreadException.h8
-rw-r--r--cpp/include/IceUtil/Time.h8
-rw-r--r--cpp/include/IceUtil/UUID.h8
-rw-r--r--cpp/include/IceUtil/Unicode.h8
-rw-r--r--cpp/include/IceXML/StreamI.h8
-rw-r--r--cpp/include/Slice/CPlusPlusUtil.h8
-rw-r--r--cpp/include/Slice/JavaUtil.h8
-rw-r--r--cpp/include/Slice/Parser.h8
-rw-r--r--cpp/include/XMLTransform/XMLTransform.h8
-rw-r--r--cpp/schema/ice.xsd2
-rw-r--r--cpp/slice/Freeze/DB.ice8
-rw-r--r--cpp/slice/Freeze/DBException.ice8
-rw-r--r--cpp/slice/Freeze/DBF.ice8
-rw-r--r--cpp/slice/Freeze/Evictor.ice8
-rw-r--r--cpp/slice/Freeze/EvictorF.ice8
-rw-r--r--cpp/slice/Glacier/Router.ice8
-rw-r--r--cpp/slice/Glacier/Session.ice8
-rw-r--r--cpp/slice/Glacier/SessionF.ice8
-rw-r--r--cpp/slice/Glacier/SessionManager.ice8
-rw-r--r--cpp/slice/Glacier/SessionManagerF.ice8
-rw-r--r--cpp/slice/Glacier/Starter.ice8
-rw-r--r--cpp/slice/Ice/BuiltinSequences.ice8
-rw-r--r--cpp/slice/Ice/Communicator.ice8
-rw-r--r--cpp/slice/Ice/CommunicatorF.ice8
-rw-r--r--cpp/slice/Ice/Current.ice8
-rw-r--r--cpp/slice/Ice/Facet.ice8
-rw-r--r--cpp/slice/Ice/Identity.ice8
-rw-r--r--cpp/slice/Ice/LocalException.ice8
-rw-r--r--cpp/slice/Ice/Locator.ice8
-rw-r--r--cpp/slice/Ice/LocatorF.ice8
-rw-r--r--cpp/slice/Ice/Logger.ice8
-rw-r--r--cpp/slice/Ice/LoggerF.ice8
-rw-r--r--cpp/slice/Ice/ObjectAdapter.ice8
-rw-r--r--cpp/slice/Ice/ObjectAdapterF.ice8
-rw-r--r--cpp/slice/Ice/ObjectFactory.ice8
-rw-r--r--cpp/slice/Ice/ObjectFactoryF.ice8
-rw-r--r--cpp/slice/Ice/Plugin.ice8
-rw-r--r--cpp/slice/Ice/PluginF.ice8
-rw-r--r--cpp/slice/Ice/Properties.ice8
-rw-r--r--cpp/slice/Ice/PropertiesF.ice8
-rw-r--r--cpp/slice/Ice/Router.ice8
-rw-r--r--cpp/slice/Ice/RouterF.ice8
-rw-r--r--cpp/slice/Ice/ServantLocator.ice8
-rw-r--r--cpp/slice/Ice/ServantLocatorF.ice8
-rw-r--r--cpp/slice/Ice/Stream.ice8
-rw-r--r--cpp/slice/Ice/StreamF.ice8
-rw-r--r--cpp/slice/Ice/UserExceptionFactory.ice8
-rw-r--r--cpp/slice/Ice/UserExceptionFactoryF.ice8
-rw-r--r--cpp/slice/IceBox/IceBox.ice8
-rw-r--r--cpp/slice/IcePack/Admin.ice8
-rw-r--r--cpp/slice/IcePack/AdminF.ice8
-rw-r--r--cpp/slice/IcePatch/IcePatch.ice8
-rw-r--r--cpp/slice/IceSSL/CertificateVerifier.ice8
-rw-r--r--cpp/slice/IceSSL/CertificateVerifierF.ice8
-rw-r--r--cpp/slice/IceSSL/Exception.ice8
-rw-r--r--cpp/slice/IceSSL/Plugin.ice8
-rw-r--r--cpp/slice/IceSSL/PluginF.ice8
-rw-r--r--cpp/slice/IceStorm/IceStorm.ice8
-rw-r--r--cpp/slice/Yellow/Yellow.ice8
-rw-r--r--cpp/src/Freeze/Application.cpp8
-rw-r--r--cpp/src/Freeze/DBI.cpp8
-rw-r--r--cpp/src/Freeze/DBI.h8
-rw-r--r--cpp/src/Freeze/EvictorI.cpp8
-rw-r--r--cpp/src/Freeze/EvictorI.h8
-rw-r--r--cpp/src/Freeze/Makefile8
-rw-r--r--cpp/src/Glacier/Blobject.cpp8
-rw-r--r--cpp/src/Glacier/Blobject.h8
-rw-r--r--cpp/src/Glacier/ClientBlobject.cpp8
-rw-r--r--cpp/src/Glacier/ClientBlobject.h8
-rw-r--r--cpp/src/Glacier/GlacierRouter.cpp8
-rw-r--r--cpp/src/Glacier/GlacierStarter.cpp8
-rw-r--r--cpp/src/Glacier/Makefile8
-rw-r--r--cpp/src/Glacier/Missive.cpp8
-rw-r--r--cpp/src/Glacier/Missive.h8
-rw-r--r--cpp/src/Glacier/RouterI.cpp8
-rw-r--r--cpp/src/Glacier/RouterI.h8
-rw-r--r--cpp/src/Glacier/ServerBlobject.cpp8
-rw-r--r--cpp/src/Glacier/ServerBlobject.h8
-rw-r--r--cpp/src/Glacier/StarterI.cpp8
-rw-r--r--cpp/src/Glacier/StarterI.h8
-rw-r--r--cpp/src/Ice/Acceptor.cpp8
-rw-r--r--cpp/src/Ice/Acceptor.h8
-rw-r--r--cpp/src/Ice/AcceptorF.h8
-rw-r--r--cpp/src/Ice/Application.cpp8
-rw-r--r--cpp/src/Ice/BasicStream.cpp8
-rw-r--r--cpp/src/Ice/CommunicatorI.cpp8
-rw-r--r--cpp/src/Ice/CommunicatorI.h8
-rw-r--r--cpp/src/Ice/Connection.cpp8
-rw-r--r--cpp/src/Ice/Connection.h8
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp8
-rw-r--r--cpp/src/Ice/ConnectionFactory.h8
-rw-r--r--cpp/src/Ice/Connector.cpp8
-rw-r--r--cpp/src/Ice/Connector.h8
-rw-r--r--cpp/src/Ice/ConnectorF.h8
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.cpp8
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.h8
-rw-r--r--cpp/src/Ice/DefaultsAndOverridesF.h8
-rw-r--r--cpp/src/Ice/Direct.cpp8
-rw-r--r--cpp/src/Ice/DynamicLibrary.cpp8
-rw-r--r--cpp/src/Ice/Endpoint.cpp8
-rw-r--r--cpp/src/Ice/Endpoint.h8
-rw-r--r--cpp/src/Ice/EndpointFactory.cpp8
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.cpp8
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.h8
-rw-r--r--cpp/src/Ice/EndpointFactoryManagerF.h8
-rw-r--r--cpp/src/Ice/EventHandler.cpp8
-rw-r--r--cpp/src/Ice/EventHandler.h8
-rw-r--r--cpp/src/Ice/EventHandlerF.h8
-rw-r--r--cpp/src/Ice/Exception.cpp8
-rw-r--r--cpp/src/Ice/IdentityUtil.cpp8
-rw-r--r--cpp/src/Ice/Incoming.cpp8
-rw-r--r--cpp/src/Ice/Initialize.cpp8
-rw-r--r--cpp/src/Ice/Instance.cpp8
-rw-r--r--cpp/src/Ice/Instance.h8
-rw-r--r--cpp/src/Ice/LocalObject.cpp8
-rw-r--r--cpp/src/Ice/LocatorInfo.cpp8
-rw-r--r--cpp/src/Ice/LocatorInfo.h8
-rw-r--r--cpp/src/Ice/LocatorInfoF.h8
-rw-r--r--cpp/src/Ice/LoggerI.cpp8
-rw-r--r--cpp/src/Ice/LoggerI.h8
-rw-r--r--cpp/src/Ice/LoggerUtil.cpp8
-rw-r--r--cpp/src/Ice/Makefile8
-rw-r--r--cpp/src/Ice/Network.cpp8
-rw-r--r--cpp/src/Ice/Network.h8
-rw-r--r--cpp/src/Ice/Object.cpp8
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp8
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.h8
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp8
-rw-r--r--cpp/src/Ice/ObjectAdapterI.h8
-rw-r--r--cpp/src/Ice/ObjectFactoryManager.cpp8
-rw-r--r--cpp/src/Ice/ObjectFactoryManager.h8
-rw-r--r--cpp/src/Ice/ObjectFactoryManagerF.h8
-rw-r--r--cpp/src/Ice/Outgoing.cpp8
-rw-r--r--cpp/src/Ice/PicklerI.h8
-rw-r--r--cpp/src/Ice/PluginManagerI.cpp8
-rw-r--r--cpp/src/Ice/PluginManagerI.h8
-rw-r--r--cpp/src/Ice/PropertiesI.cpp8
-rw-r--r--cpp/src/Ice/PropertiesI.h8
-rw-r--r--cpp/src/Ice/Protocol.h8
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.cpp8
-rw-r--r--cpp/src/Ice/Proxy.cpp8
-rw-r--r--cpp/src/Ice/ProxyFactory.cpp8
-rw-r--r--cpp/src/Ice/ProxyFactory.h8
-rw-r--r--cpp/src/Ice/Reference.cpp8
-rw-r--r--cpp/src/Ice/Reference.h8
-rw-r--r--cpp/src/Ice/ReferenceFactory.cpp8
-rw-r--r--cpp/src/Ice/ReferenceFactory.h8
-rw-r--r--cpp/src/Ice/ReferenceFactoryF.h8
-rw-r--r--cpp/src/Ice/RouterInfo.cpp8
-rw-r--r--cpp/src/Ice/RouterInfo.h8
-rw-r--r--cpp/src/Ice/RouterInfoF.h8
-rw-r--r--cpp/src/Ice/RoutingTable.cpp8
-rw-r--r--cpp/src/Ice/StringUtil.cpp8
-rw-r--r--cpp/src/Ice/StringUtil.h8
-rw-r--r--cpp/src/Ice/SysLoggerI.cpp8
-rw-r--r--cpp/src/Ice/SysLoggerI.h8
-rw-r--r--cpp/src/Ice/TcpAcceptor.cpp8
-rw-r--r--cpp/src/Ice/TcpAcceptor.h8
-rw-r--r--cpp/src/Ice/TcpConnector.cpp8
-rw-r--r--cpp/src/Ice/TcpConnector.h8
-rw-r--r--cpp/src/Ice/TcpEndpoint.cpp8
-rw-r--r--cpp/src/Ice/TcpEndpoint.h8
-rw-r--r--cpp/src/Ice/TcpTransceiver.cpp8
-rw-r--r--cpp/src/Ice/TcpTransceiver.h8
-rw-r--r--cpp/src/Ice/ThreadPool.cpp8
-rw-r--r--cpp/src/Ice/ThreadPool.h8
-rw-r--r--cpp/src/Ice/ThreadPoolF.h8
-rw-r--r--cpp/src/Ice/TraceLevels.cpp8
-rw-r--r--cpp/src/Ice/TraceLevels.h8
-rw-r--r--cpp/src/Ice/TraceLevelsF.h8
-rw-r--r--cpp/src/Ice/TraceUtil.cpp8
-rw-r--r--cpp/src/Ice/TraceUtil.h8
-rw-r--r--cpp/src/Ice/Transceiver.cpp8
-rw-r--r--cpp/src/Ice/Transceiver.h8
-rw-r--r--cpp/src/Ice/TransceiverF.h8
-rw-r--r--cpp/src/Ice/UdpEndpoint.cpp8
-rw-r--r--cpp/src/Ice/UdpEndpoint.h8
-rw-r--r--cpp/src/Ice/UdpTransceiver.cpp8
-rw-r--r--cpp/src/Ice/UdpTransceiver.h8
-rw-r--r--cpp/src/Ice/UnknownEndpoint.cpp8
-rw-r--r--cpp/src/Ice/UnknownEndpoint.h8
-rw-r--r--cpp/src/Ice/UserExceptionFactoryManager.cpp8
-rw-r--r--cpp/src/Ice/UserExceptionFactoryManager.h8
-rw-r--r--cpp/src/Ice/UserExceptionFactoryManagerF.h8
-rw-r--r--cpp/src/IceBox/Admin.cpp8
-rw-r--r--cpp/src/IceBox/Exception.cpp8
-rw-r--r--cpp/src/IceBox/Makefile8
-rw-r--r--cpp/src/IceBox/Server.cpp8
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp8
-rw-r--r--cpp/src/IceBox/ServiceManagerI.h8
-rw-r--r--cpp/src/IcePack/Activator.ice8
-rw-r--r--cpp/src/IcePack/ActivatorI.cpp8
-rw-r--r--cpp/src/IcePack/ActivatorI.h8
-rw-r--r--cpp/src/IcePack/AdapterFactory.cpp8
-rw-r--r--cpp/src/IcePack/AdapterFactory.h8
-rw-r--r--cpp/src/IcePack/AdapterI.cpp8
-rw-r--r--cpp/src/IcePack/AdapterI.h8
-rw-r--r--cpp/src/IcePack/AdapterRegistryI.cpp8
-rw-r--r--cpp/src/IcePack/AdapterRegistryI.h8
-rw-r--r--cpp/src/IcePack/AdminI.cpp8
-rw-r--r--cpp/src/IcePack/AdminI.h8
-rw-r--r--cpp/src/IcePack/ApplicationBuilder.cpp8
-rw-r--r--cpp/src/IcePack/ApplicationBuilder.h8
-rw-r--r--cpp/src/IcePack/Client.cpp8
-rw-r--r--cpp/src/IcePack/ComponentBuilder.cpp8
-rw-r--r--cpp/src/IcePack/ComponentBuilder.h8
-rw-r--r--cpp/src/IcePack/ExceptionFactory.cpp8
-rw-r--r--cpp/src/IcePack/ExceptionFactory.h8
-rw-r--r--cpp/src/IcePack/Grammar.y8
-rw-r--r--cpp/src/IcePack/IcePackNode.cpp8
-rw-r--r--cpp/src/IcePack/IcePackRegistry.cpp8
-rw-r--r--cpp/src/IcePack/Internal.ice8
-rw-r--r--cpp/src/IcePack/LocatorI.cpp8
-rw-r--r--cpp/src/IcePack/LocatorI.h8
-rw-r--r--cpp/src/IcePack/LocatorRegistryI.cpp8
-rw-r--r--cpp/src/IcePack/LocatorRegistryI.h8
-rw-r--r--cpp/src/IcePack/Makefile8
-rw-r--r--cpp/src/IcePack/NodeI.cpp8
-rw-r--r--cpp/src/IcePack/NodeI.h8
-rw-r--r--cpp/src/IcePack/NodeInfo.cpp8
-rw-r--r--cpp/src/IcePack/NodeInfo.h8
-rw-r--r--cpp/src/IcePack/NodeRegistryI.cpp8
-rw-r--r--cpp/src/IcePack/NodeRegistryI.h8
-rw-r--r--cpp/src/IcePack/Parser.cpp8
-rw-r--r--cpp/src/IcePack/Parser.h8
-rw-r--r--cpp/src/IcePack/Registry.cpp8
-rw-r--r--cpp/src/IcePack/Registry.h8
-rw-r--r--cpp/src/IcePack/Scanner.l8
-rw-r--r--cpp/src/IcePack/ServerAdapterI.cpp8
-rw-r--r--cpp/src/IcePack/ServerAdapterI.h8
-rw-r--r--cpp/src/IcePack/ServerBuilder.cpp8
-rw-r--r--cpp/src/IcePack/ServerBuilder.h8
-rw-r--r--cpp/src/IcePack/ServerDeployerI.cpp8
-rw-r--r--cpp/src/IcePack/ServerDeployerI.h8
-rw-r--r--cpp/src/IcePack/ServerFactory.cpp8
-rw-r--r--cpp/src/IcePack/ServerFactory.h8
-rw-r--r--cpp/src/IcePack/ServerI.cpp8
-rw-r--r--cpp/src/IcePack/ServerI.h8
-rw-r--r--cpp/src/IcePack/ServerRegistryI.cpp8
-rw-r--r--cpp/src/IcePack/ServerRegistryI.h8
-rw-r--r--cpp/src/IcePack/ServiceBuilder.cpp8
-rw-r--r--cpp/src/IcePack/ServiceBuilder.h8
-rw-r--r--cpp/src/IcePack/TraceLevels.cpp8
-rw-r--r--cpp/src/IcePack/TraceLevels.h8
-rw-r--r--cpp/src/IcePatch/Client.cpp8
-rw-r--r--cpp/src/IcePatch/ClientUtil.cpp8
-rw-r--r--cpp/src/IcePatch/FileDescFactory.cpp8
-rw-r--r--cpp/src/IcePatch/FileLocator.cpp8
-rw-r--r--cpp/src/IcePatch/FileLocator.h8
-rw-r--r--cpp/src/IcePatch/IcePatchI.cpp8
-rw-r--r--cpp/src/IcePatch/IcePatchI.h8
-rw-r--r--cpp/src/IcePatch/Makefile8
-rw-r--r--cpp/src/IcePatch/Server.cpp8
-rw-r--r--cpp/src/IcePatch/Util.cpp8
-rw-r--r--cpp/src/IceSSL/BaseCerts.cpp8
-rw-r--r--cpp/src/IceSSL/BaseCerts.h8
-rw-r--r--cpp/src/IceSSL/CertificateAuthority.cpp8
-rw-r--r--cpp/src/IceSSL/CertificateAuthority.h8
-rw-r--r--cpp/src/IceSSL/CertificateDesc.cpp8
-rw-r--r--cpp/src/IceSSL/CertificateDesc.h8
-rw-r--r--cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp8
-rw-r--r--cpp/src/IceSSL/ClientContext.cpp8
-rw-r--r--cpp/src/IceSSL/ClientContext.h8
-rw-r--r--cpp/src/IceSSL/ConfigParser.cpp8
-rw-r--r--cpp/src/IceSSL/ConfigParser.h8
-rw-r--r--cpp/src/IceSSL/ConfigParserErrorReporter.cpp8
-rw-r--r--cpp/src/IceSSL/ConfigParserErrorReporter.h8
-rw-r--r--cpp/src/IceSSL/Context.cpp8
-rw-r--r--cpp/src/IceSSL/Context.h8
-rw-r--r--cpp/src/IceSSL/ContextF.h8
-rw-r--r--cpp/src/IceSSL/Convert.cpp8
-rw-r--r--cpp/src/IceSSL/Convert.h8
-rw-r--r--cpp/src/IceSSL/DHParams.cpp8
-rw-r--r--cpp/src/IceSSL/DHParams.h8
-rw-r--r--cpp/src/IceSSL/DHParamsF.h8
-rw-r--r--cpp/src/IceSSL/DefaultCertificateVerifier.cpp8
-rw-r--r--cpp/src/IceSSL/DefaultCertificateVerifier.h8
-rw-r--r--cpp/src/IceSSL/GeneralConfig.cpp8
-rw-r--r--cpp/src/IceSSL/GeneralConfig.h8
-rw-r--r--cpp/src/IceSSL/Makefile8
-rw-r--r--cpp/src/IceSSL/OpenSSL.h8
-rw-r--r--cpp/src/IceSSL/OpenSSLJanitors.cpp8
-rw-r--r--cpp/src/IceSSL/OpenSSLJanitors.h8
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp8
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.h8
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginIF.h8
-rw-r--r--cpp/src/IceSSL/OpenSSLUtils.cpp8
-rw-r--r--cpp/src/IceSSL/OpenSSLUtils.h8
-rw-r--r--cpp/src/IceSSL/RSACertificateGen.cpp8
-rw-r--r--cpp/src/IceSSL/RSAKeyPair.cpp8
-rw-r--r--cpp/src/IceSSL/RSAPrivateKey.cpp8
-rw-r--r--cpp/src/IceSSL/RSAPublicKey.cpp8
-rw-r--r--cpp/src/IceSSL/ServerContext.cpp8
-rw-r--r--cpp/src/IceSSL/ServerContext.h8
-rw-r--r--cpp/src/IceSSL/SingleCertificateVerifier.cpp8
-rw-r--r--cpp/src/IceSSL/SingleCertificateVerifier.h8
-rw-r--r--cpp/src/IceSSL/SslAcceptor.cpp8
-rw-r--r--cpp/src/IceSSL/SslAcceptor.h8
-rw-r--r--cpp/src/IceSSL/SslClientTransceiver.cpp8
-rw-r--r--cpp/src/IceSSL/SslClientTransceiver.h8
-rw-r--r--cpp/src/IceSSL/SslConnector.cpp8
-rw-r--r--cpp/src/IceSSL/SslConnector.h8
-rw-r--r--cpp/src/IceSSL/SslEndpoint.cpp8
-rw-r--r--cpp/src/IceSSL/SslEndpoint.h8
-rw-r--r--cpp/src/IceSSL/SslException.cpp8
-rw-r--r--cpp/src/IceSSL/SslServerTransceiver.cpp8
-rw-r--r--cpp/src/IceSSL/SslServerTransceiver.h8
-rw-r--r--cpp/src/IceSSL/SslTransceiver.cpp8
-rw-r--r--cpp/src/IceSSL/SslTransceiver.h8
-rw-r--r--cpp/src/IceSSL/SslTransceiverF.h8
-rw-r--r--cpp/src/IceSSL/TempCerts.cpp8
-rw-r--r--cpp/src/IceSSL/TempCerts.h8
-rw-r--r--cpp/src/IceSSL/TraceLevels.cpp8
-rw-r--r--cpp/src/IceSSL/TraceLevels.h8
-rw-r--r--cpp/src/IceSSL/TraceLevelsF.h8
-rw-r--r--cpp/src/IceStorm/Admin.cpp8
-rw-r--r--cpp/src/IceStorm/Flushable.h8
-rw-r--r--cpp/src/IceStorm/Flusher.cpp8
-rw-r--r--cpp/src/IceStorm/Flusher.h8
-rw-r--r--cpp/src/IceStorm/Grammar.y8
-rw-r--r--cpp/src/IceStorm/IceStormInternal.ice8
-rw-r--r--cpp/src/IceStorm/LinkDB.ice8
-rw-r--r--cpp/src/IceStorm/LinkSubscriber.cpp8
-rw-r--r--cpp/src/IceStorm/LinkSubscriber.h8
-rw-r--r--cpp/src/IceStorm/Makefile8
-rw-r--r--cpp/src/IceStorm/OnewayBatchSubscriber.cpp8
-rw-r--r--cpp/src/IceStorm/OnewayBatchSubscriber.h8
-rw-r--r--cpp/src/IceStorm/OnewaySubscriber.cpp8
-rw-r--r--cpp/src/IceStorm/OnewaySubscriber.h8
-rw-r--r--cpp/src/IceStorm/Parser.cpp8
-rw-r--r--cpp/src/IceStorm/Parser.h8
-rw-r--r--cpp/src/IceStorm/Scanner.l8
-rw-r--r--cpp/src/IceStorm/Service.cpp8
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp8
-rw-r--r--cpp/src/IceStorm/Subscriber.h8
-rw-r--r--cpp/src/IceStorm/SubscriberFactory.cpp8
-rw-r--r--cpp/src/IceStorm/SubscriberFactory.h8
-rw-r--r--cpp/src/IceStorm/TopicI.cpp8
-rw-r--r--cpp/src/IceStorm/TopicI.h8
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp8
-rw-r--r--cpp/src/IceStorm/TopicManagerI.h8
-rw-r--r--cpp/src/IceStorm/TraceLevels.cpp8
-rw-r--r--cpp/src/IceStorm/TraceLevels.h8
-rw-r--r--cpp/src/IceStorm/WeightedGraph.cpp8
-rw-r--r--cpp/src/IceStorm/WeightedGraph.h8
-rw-r--r--cpp/src/IceUtil/Base64.cpp8
-rw-r--r--cpp/src/IceUtil/Cond.cpp8
-rw-r--r--cpp/src/IceUtil/Exception.cpp8
-rw-r--r--cpp/src/IceUtil/InputUtil.cpp8
-rw-r--r--cpp/src/IceUtil/Makefile8
-rw-r--r--cpp/src/IceUtil/OutputUtil.cpp8
-rw-r--r--cpp/src/IceUtil/RWRecMutex.cpp8
-rw-r--r--cpp/src/IceUtil/RecMutex.cpp8
-rw-r--r--cpp/src/IceUtil/Thread.cpp8
-rw-r--r--cpp/src/IceUtil/ThreadException.cpp8
-rw-r--r--cpp/src/IceUtil/Time.cpp8
-rw-r--r--cpp/src/IceUtil/UUID.cpp8
-rw-r--r--cpp/src/IceUtil/Unicode.cpp8
-rw-r--r--cpp/src/IceXML/Makefile8
-rw-r--r--cpp/src/IceXML/StreamI.cpp8
-rw-r--r--cpp/src/Makefile8
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp18
-rw-r--r--cpp/src/Slice/Grammar.y8
-rw-r--r--cpp/src/Slice/GrammarUtil.h8
-rw-r--r--cpp/src/Slice/JavaUtil.cpp17
-rw-r--r--cpp/src/Slice/Makefile8
-rw-r--r--cpp/src/Slice/Parser.cpp8
-rw-r--r--cpp/src/Slice/Scanner.l8
-rw-r--r--cpp/src/XMLTransform/ErrorReporter.cpp8
-rw-r--r--cpp/src/XMLTransform/ErrorReporter.h8
-rw-r--r--cpp/src/XMLTransform/Makefile8
-rw-r--r--cpp/src/XMLTransform/TransformDB.cpp8
-rw-r--r--cpp/src/XMLTransform/XMLTransform.cpp8
-rw-r--r--cpp/src/Yellow/Admin.cpp8
-rw-r--r--cpp/src/Yellow/AdminI.cpp8
-rw-r--r--cpp/src/Yellow/AdminI.h8
-rw-r--r--cpp/src/Yellow/Grammar.y8
-rw-r--r--cpp/src/Yellow/Makefile8
-rw-r--r--cpp/src/Yellow/Parser.cpp8
-rw-r--r--cpp/src/Yellow/Parser.h8
-rw-r--r--cpp/src/Yellow/QueryI.cpp8
-rw-r--r--cpp/src/Yellow/QueryI.h8
-rw-r--r--cpp/src/Yellow/Scanner.l8
-rw-r--r--cpp/src/Yellow/Service.cpp8
-rw-r--r--cpp/src/slice2cpp/Gen.cpp8
-rw-r--r--cpp/src/slice2cpp/Gen.h8
-rw-r--r--cpp/src/slice2cpp/Main.cpp8
-rw-r--r--cpp/src/slice2cpp/Makefile8
-rw-r--r--cpp/src/slice2docbook/Gen.cpp10
-rw-r--r--cpp/src/slice2docbook/Gen.h8
-rw-r--r--cpp/src/slice2docbook/Main.cpp8
-rw-r--r--cpp/src/slice2docbook/Makefile8
-rw-r--r--cpp/src/slice2freeze/Main.cpp8
-rw-r--r--cpp/src/slice2freeze/Makefile8
-rw-r--r--cpp/src/slice2freezej/Main.cpp8
-rw-r--r--cpp/src/slice2freezej/Makefile8
-rw-r--r--cpp/src/slice2java/Gen.cpp8
-rw-r--r--cpp/src/slice2java/Gen.h8
-rw-r--r--cpp/src/slice2java/Main.cpp8
-rw-r--r--cpp/src/slice2java/Makefile8
-rw-r--r--cpp/src/slice2wsdl/Gen.cpp18
-rw-r--r--cpp/src/slice2wsdl/Gen.h8
-rw-r--r--cpp/src/slice2wsdl/Main.cpp8
-rw-r--r--cpp/src/slice2wsdl/Makefile8
-rw-r--r--cpp/src/slice2xsd/Gen.cpp18
-rw-r--r--cpp/src/slice2xsd/Gen.h8
-rw-r--r--cpp/src/slice2xsd/Main.cpp8
-rw-r--r--cpp/src/slice2xsd/Makefile8
-rw-r--r--cpp/src/slice2xsd/Validate.cpp8
-rw-r--r--cpp/test/Freeze/Makefile8
-rw-r--r--cpp/test/Freeze/complex/Client.cpp8
-rw-r--r--cpp/test/Freeze/complex/Complex.ice8
-rw-r--r--cpp/test/Freeze/complex/Grammar.y8
-rw-r--r--cpp/test/Freeze/complex/Makefile8
-rw-r--r--cpp/test/Freeze/complex/NodeI.h8
-rw-r--r--cpp/test/Freeze/complex/Parser.cpp8
-rw-r--r--cpp/test/Freeze/complex/Parser.h8
-rw-r--r--cpp/test/Freeze/complex/Scanner.l8
-rwxr-xr-xcpp/test/Freeze/complex/run.py8
-rw-r--r--cpp/test/Freeze/cursor/Client.cpp8
-rw-r--r--cpp/test/Freeze/cursor/Makefile8
-rwxr-xr-xcpp/test/Freeze/cursor/run.py8
-rw-r--r--cpp/test/Freeze/dbmap/Client.cpp8
-rw-r--r--cpp/test/Freeze/dbmap/Makefile8
-rwxr-xr-xcpp/test/Freeze/dbmap/run.py8
-rw-r--r--cpp/test/Freeze/evictor/Client.cpp8
-rw-r--r--cpp/test/Freeze/evictor/Makefile8
-rw-r--r--cpp/test/Freeze/evictor/Server.cpp8
-rw-r--r--cpp/test/Freeze/evictor/Test.ice8
-rw-r--r--cpp/test/Freeze/evictor/TestI.cpp8
-rw-r--r--cpp/test/Freeze/evictor/TestI.h8
-rwxr-xr-xcpp/test/Freeze/evictor/run.py8
-rw-r--r--cpp/test/Glacier/Makefile8
-rw-r--r--cpp/test/Glacier/starter/Callback.ice8
-rw-r--r--cpp/test/Glacier/starter/CallbackI.cpp8
-rw-r--r--cpp/test/Glacier/starter/CallbackI.h8
-rw-r--r--cpp/test/Glacier/starter/Client.cpp8
-rw-r--r--cpp/test/Glacier/starter/Makefile8
-rw-r--r--cpp/test/Glacier/starter/Server.cpp8
-rwxr-xr-xcpp/test/Glacier/starter/run.py8
-rw-r--r--cpp/test/Ice/Makefile8
-rw-r--r--cpp/test/Ice/adapterDeactivation/AllTests.cpp8
-rw-r--r--cpp/test/Ice/adapterDeactivation/Client.cpp8
-rw-r--r--cpp/test/Ice/adapterDeactivation/Collocated.cpp8
-rw-r--r--cpp/test/Ice/adapterDeactivation/Makefile8
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp8
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.h8
-rw-r--r--cpp/test/Ice/adapterDeactivation/Server.cpp8
-rw-r--r--cpp/test/Ice/adapterDeactivation/Test.ice8
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.cpp8
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.h8
-rwxr-xr-xcpp/test/Ice/adapterDeactivation/run.py8
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp8
-rw-r--r--cpp/test/Ice/exceptions/Client.cpp8
-rw-r--r--cpp/test/Ice/exceptions/Collocated.cpp8
-rw-r--r--cpp/test/Ice/exceptions/Makefile8
-rw-r--r--cpp/test/Ice/exceptions/Server.cpp8
-rw-r--r--cpp/test/Ice/exceptions/Test.ice8
-rw-r--r--cpp/test/Ice/exceptions/TestI.cpp8
-rw-r--r--cpp/test/Ice/exceptions/TestI.h8
-rwxr-xr-xcpp/test/Ice/exceptions/run.py8
-rw-r--r--cpp/test/Ice/facets/AllTests.cpp8
-rw-r--r--cpp/test/Ice/facets/Client.cpp8
-rw-r--r--cpp/test/Ice/facets/Collocated.cpp8
-rw-r--r--cpp/test/Ice/facets/Makefile8
-rw-r--r--cpp/test/Ice/facets/Server.cpp8
-rw-r--r--cpp/test/Ice/facets/Test.ice8
-rw-r--r--cpp/test/Ice/facets/TestI.cpp8
-rw-r--r--cpp/test/Ice/facets/TestI.h8
-rwxr-xr-xcpp/test/Ice/facets/run.py8
-rw-r--r--cpp/test/Ice/faultTolerance/AllTests.cpp8
-rw-r--r--cpp/test/Ice/faultTolerance/Client.cpp8
-rw-r--r--cpp/test/Ice/faultTolerance/Makefile8
-rw-r--r--cpp/test/Ice/faultTolerance/Server.cpp8
-rw-r--r--cpp/test/Ice/faultTolerance/Test.ice8
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.cpp8
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.h8
-rwxr-xr-xcpp/test/Ice/faultTolerance/run.py8
-rw-r--r--cpp/test/Ice/inheritance/AllTests.cpp8
-rw-r--r--cpp/test/Ice/inheritance/Client.cpp8
-rw-r--r--cpp/test/Ice/inheritance/Collocated.cpp8
-rw-r--r--cpp/test/Ice/inheritance/Makefile8
-rw-r--r--cpp/test/Ice/inheritance/Server.cpp8
-rw-r--r--cpp/test/Ice/inheritance/Test.ice8
-rw-r--r--cpp/test/Ice/inheritance/TestI.cpp8
-rw-r--r--cpp/test/Ice/inheritance/TestI.h8
-rwxr-xr-xcpp/test/Ice/inheritance/run.py8
-rw-r--r--cpp/test/Ice/location/AllTests.cpp8
-rw-r--r--cpp/test/Ice/location/Client.cpp8
-rw-r--r--cpp/test/Ice/location/Collocated.cpp8
-rw-r--r--cpp/test/Ice/location/Makefile8
-rw-r--r--cpp/test/Ice/location/Server.cpp8
-rw-r--r--cpp/test/Ice/location/ServerLocator.cpp8
-rw-r--r--cpp/test/Ice/location/ServerLocator.h8
-rw-r--r--cpp/test/Ice/location/Test.ice8
-rw-r--r--cpp/test/Ice/location/TestI.cpp8
-rw-r--r--cpp/test/Ice/location/TestI.h8
-rwxr-xr-xcpp/test/Ice/location/run.py8
-rw-r--r--cpp/test/Ice/locationForward/AllTests.cpp8
-rw-r--r--cpp/test/Ice/locationForward/Client.cpp8
-rw-r--r--cpp/test/Ice/locationForward/Makefile8
-rw-r--r--cpp/test/Ice/locationForward/Server.cpp8
-rw-r--r--cpp/test/Ice/locationForward/Test.ice8
-rw-r--r--cpp/test/Ice/locationForward/TestI.cpp8
-rw-r--r--cpp/test/Ice/locationForward/TestI.h8
-rwxr-xr-xcpp/test/Ice/locationForward/run.py8
-rw-r--r--cpp/test/Ice/objects/AllTests.cpp8
-rw-r--r--cpp/test/Ice/objects/Client.cpp8
-rw-r--r--cpp/test/Ice/objects/Collocated.cpp8
-rw-r--r--cpp/test/Ice/objects/Makefile8
-rw-r--r--cpp/test/Ice/objects/Server.cpp8
-rw-r--r--cpp/test/Ice/objects/Test.ice8
-rw-r--r--cpp/test/Ice/objects/TestI.cpp8
-rw-r--r--cpp/test/Ice/objects/TestI.h8
-rwxr-xr-xcpp/test/Ice/objects/run.py8
-rw-r--r--cpp/test/Ice/operations/AllTests.cpp8
-rw-r--r--cpp/test/Ice/operations/Client.cpp8
-rw-r--r--cpp/test/Ice/operations/Collocated.cpp8
-rw-r--r--cpp/test/Ice/operations/Makefile8
-rw-r--r--cpp/test/Ice/operations/Server.cpp8
-rw-r--r--cpp/test/Ice/operations/Test.ice8
-rw-r--r--cpp/test/Ice/operations/TestI.cpp8
-rw-r--r--cpp/test/Ice/operations/TestI.h8
-rw-r--r--cpp/test/Ice/operations/Twoways.cpp8
-rwxr-xr-xcpp/test/Ice/operations/run.py8
-rw-r--r--cpp/test/IcePack/Makefile8
-rw-r--r--cpp/test/IcePack/deployer/AllTests.cpp8
-rw-r--r--cpp/test/IcePack/deployer/Client.cpp8
-rw-r--r--cpp/test/IcePack/deployer/Makefile8
-rw-r--r--cpp/test/IcePack/deployer/Server.cpp8
-rw-r--r--cpp/test/IcePack/deployer/Service.cpp8
-rw-r--r--cpp/test/IcePack/deployer/Test.ice8
-rw-r--r--cpp/test/IcePack/deployer/TestI.cpp8
-rw-r--r--cpp/test/IcePack/deployer/TestI.h8
-rwxr-xr-xcpp/test/IcePack/deployer/run.py8
-rw-r--r--cpp/test/IcePack/simple/AllTests.cpp8
-rw-r--r--cpp/test/IcePack/simple/Client.cpp8
-rw-r--r--cpp/test/IcePack/simple/Makefile8
-rw-r--r--cpp/test/IcePack/simple/Server.cpp8
-rw-r--r--cpp/test/IcePack/simple/Test.ice8
-rw-r--r--cpp/test/IcePack/simple/TestI.cpp8
-rw-r--r--cpp/test/IcePack/simple/TestI.h8
-rwxr-xr-xcpp/test/IcePack/simple/icepackadmin.py8
-rwxr-xr-xcpp/test/IcePack/simple/run.py8
-rw-r--r--cpp/test/IceSSL/Makefile8
-rw-r--r--cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp8
-rw-r--r--cpp/test/IceSSL/certificateAndKeyParsing/Makefile8
-rwxr-xr-xcpp/test/IceSSL/certificateAndKeyParsing/run.py8
-rw-r--r--cpp/test/IceSSL/certificateVerification/Client.cpp8
-rw-r--r--cpp/test/IceSSL/certificateVerification/Makefile8
-rw-r--r--cpp/test/IceSSL/certificateVerification/Pinger.ice8
-rw-r--r--cpp/test/IceSSL/certificateVerification/Server.cpp8
-rwxr-xr-xcpp/test/IceSSL/certificateVerification/run.py8
-rw-r--r--cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp8
-rw-r--r--cpp/test/IceSSL/certificateVerifier/Makefile8
-rwxr-xr-xcpp/test/IceSSL/certificateVerifier/run.py8
-rw-r--r--cpp/test/IceSSL/configuration/Configuration.cpp8
-rw-r--r--cpp/test/IceSSL/configuration/Makefile8
-rwxr-xr-xcpp/test/IceSSL/configuration/run.py8
-rw-r--r--cpp/test/IceSSL/loadPEM/LoadPEM.cpp8
-rw-r--r--cpp/test/IceSSL/loadPEM/Makefile8
-rwxr-xr-xcpp/test/IceSSL/loadPEM/run.py8
-rw-r--r--cpp/test/IceStorm/Makefile8
-rw-r--r--cpp/test/IceStorm/federation/Event.ice8
-rw-r--r--cpp/test/IceStorm/federation/Makefile8
-rw-r--r--cpp/test/IceStorm/federation/Publisher.cpp8
-rw-r--r--cpp/test/IceStorm/federation/Subscriber.cpp8
-rwxr-xr-xcpp/test/IceStorm/federation/run.py8
-rwxr-xr-xcpp/test/IceStorm/federation2/run.py8
-rw-r--r--cpp/test/IceStorm/single/Makefile8
-rw-r--r--cpp/test/IceStorm/single/Publisher.cpp8
-rw-r--r--cpp/test/IceStorm/single/Single.ice8
-rw-r--r--cpp/test/IceStorm/single/Subscriber.cpp8
-rwxr-xr-xcpp/test/IceStorm/single/run.py8
-rw-r--r--cpp/test/IceUtil/Makefile8
-rw-r--r--cpp/test/IceUtil/inputUtil/Client.cpp8
-rw-r--r--cpp/test/IceUtil/inputUtil/Makefile8
-rwxr-xr-xcpp/test/IceUtil/inputUtil/run.py8
-rw-r--r--cpp/test/IceUtil/thread/Client.cpp8
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.cpp8
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.h8
-rw-r--r--cpp/test/IceUtil/thread/Makefile8
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.cpp8
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.h8
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp8
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.h8
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.cpp8
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.h8
-rw-r--r--cpp/test/IceUtil/thread/RWRecMutexTest.cpp8
-rw-r--r--cpp/test/IceUtil/thread/RWRecMutexTest.h8
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.cpp8
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.h8
-rw-r--r--cpp/test/IceUtil/thread/TestBase.cpp8
-rw-r--r--cpp/test/IceUtil/thread/TestBase.h8
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.cpp8
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.h8
-rwxr-xr-xcpp/test/IceUtil/thread/run.py8
-rw-r--r--cpp/test/IceUtil/unicode/Client.cpp8
-rw-r--r--cpp/test/IceUtil/unicode/Makefile8
-rwxr-xr-xcpp/test/IceUtil/unicode/run.py8
-rw-r--r--cpp/test/IceXML/Makefile8
-rw-r--r--cpp/test/IceXML/encoding/Client.cpp8
-rw-r--r--cpp/test/IceXML/encoding/Makefile8
-rw-r--r--cpp/test/IceXML/encoding/Test.ice8
-rw-r--r--cpp/test/IceXML/encoding/ice.xsd2
-rwxr-xr-xcpp/test/IceXML/encoding/run.py8
-rw-r--r--cpp/test/Makefile8
-rw-r--r--cpp/test/Slice/errorDetection/CaseInsensitive.err140
-rw-r--r--cpp/test/Slice/errorDetection/CaseInsensitive.ice8
-rw-r--r--cpp/test/Slice/errorDetection/CaseSensitive.err6
-rw-r--r--cpp/test/Slice/errorDetection/CaseSensitive.ice14
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.err32
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.ice14
-rw-r--r--cpp/test/Slice/errorDetection/ClassRedefinition.err6
-rw-r--r--cpp/test/Slice/errorDetection/ClassRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.err42
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.ice14
-rw-r--r--cpp/test/Slice/errorDetection/DataMemberRedefinition.err2
-rw-r--r--cpp/test/Slice/errorDetection/DataMemberRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/DeclaratorMissing.err8
-rw-r--r--cpp/test/Slice/errorDetection/DeclaratorMissing.ice8
-rw-r--r--cpp/test/Slice/errorDetection/DerivedRedefinition.err12
-rw-r--r--cpp/test/Slice/errorDetection/DerivedRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/DictionaryRedefinition.err12
-rw-r--r--cpp/test/Slice/errorDetection/DictionaryRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateParameter.err16
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateParameter.ice8
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateThrows.err8
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateThrows.ice14
-rw-r--r--cpp/test/Slice/errorDetection/EnumEmpty.err2
-rw-r--r--cpp/test/Slice/errorDetection/EnumEmpty.ice14
-rw-r--r--cpp/test/Slice/errorDetection/EnumRedefinition.err2
-rw-r--r--cpp/test/Slice/errorDetection/EnumRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorRedefinition.err4
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeyword.err178
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeyword.ice8
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDeclaration.err4
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDeclaration.ice8
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDictionary.err18
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDictionary.ice14
-rw-r--r--cpp/test/Slice/errorDetection/IllegalLocal.err40
-rw-r--r--cpp/test/Slice/errorDetection/IllegalLocal.ice14
-rw-r--r--cpp/test/Slice/errorDetection/IllegalMI.err52
-rw-r--r--cpp/test/Slice/errorDetection/IllegalMI.ice8
-rw-r--r--cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err52
-rw-r--r--cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice8
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceMismatch.err16
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceMismatch.ice8
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceRedefinition.err6
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/LocalMismatch.err32
-rw-r--r--cpp/test/Slice/errorDetection/LocalMismatch.ice8
-rw-r--r--cpp/test/Slice/errorDetection/NameCanNotBeUsed.err12
-rw-r--r--cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice8
-rw-r--r--cpp/test/Slice/errorDetection/NotClassOrInterface.err18
-rw-r--r--cpp/test/Slice/errorDetection/NotClassOrInterface.ice8
-rw-r--r--cpp/test/Slice/errorDetection/NotException.err8
-rw-r--r--cpp/test/Slice/errorDetection/NotException.ice8
-rw-r--r--cpp/test/Slice/errorDetection/NotType.err28
-rw-r--r--cpp/test/Slice/errorDetection/NotType.ice8
-rw-r--r--cpp/test/Slice/errorDetection/OperationRedefinition.err2
-rw-r--r--cpp/test/Slice/errorDetection/OperationRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/ParamsOutOfOrder.err4
-rw-r--r--cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsClass.err4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsClass.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err2
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err2
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnum.err4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsInterface.err4
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsModule.err2
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsModule.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsOperation.err2
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice8
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsSequence.err2
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice8
-rw-r--r--cpp/test/Slice/errorDetection/Reserved.err42
-rw-r--r--cpp/test/Slice/errorDetection/Reserved.ice8
-rw-r--r--cpp/test/Slice/errorDetection/SelfContainment.err2
-rw-r--r--cpp/test/Slice/errorDetection/SelfContainment.ice14
-rw-r--r--cpp/test/Slice/errorDetection/SequenceRedefinition.err2
-rw-r--r--cpp/test/Slice/errorDetection/SequenceRedefinition.ice8
-rw-r--r--cpp/test/Slice/errorDetection/StructMembers.err12
-rw-r--r--cpp/test/Slice/errorDetection/StructMembers.ice8
-rw-r--r--cpp/test/Slice/errorDetection/Undefined.err20
-rw-r--r--cpp/test/Slice/errorDetection/Undefined.ice8
-rw-r--r--cpp/test/Slice/errorDetection/WrongProxyType.err12
-rw-r--r--cpp/test/Slice/errorDetection/WrongProxyType.ice8
-rw-r--r--cpp/test/Slice/errorDetection/include/IcePrefix.ice8
-rwxr-xr-xcpp/test/Slice/errorDetection/run.py8
-rw-r--r--cpp/test/XMLTransform/Makefile8
-rw-r--r--cpp/test/XMLTransform/transform/Makefile8
-rw-r--r--cpp/test/XMLTransform/transform/Populate.cpp8
-rw-r--r--cpp/test/XMLTransform/transform/Validate.cpp8
-rwxr-xr-xcpp/test/XMLTransform/transform/run.py8
-rw-r--r--cpp/test/Yellow/Makefile8
-rw-r--r--cpp/test/Yellow/basicYellow/Client.cpp8
-rw-r--r--cpp/test/Yellow/basicYellow/Makefile8
-rwxr-xr-xcpp/test/Yellow/basicYellow/run.py8
-rw-r--r--cpp/test/include/TestCommon.h8
878 files changed, 5521 insertions, 2098 deletions
diff --git a/cpp/Makefile b/cpp/Makefile
index 2d71c254bf8..e2c8d65ce7c 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 1eb6041edb4..6458fe957c5 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/bin/gencerts b/cpp/bin/gencerts
index bdaed8ff542..a79bc06636a 100755
--- a/cpp/bin/gencerts
+++ b/cpp/bin/gencerts
@@ -3,9 +3,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/config/IcePackAdmin.py b/cpp/config/IcePackAdmin.py
index 86c05f3526d..bdba1d89ecc 100644
--- a/cpp/config/IcePackAdmin.py
+++ b/cpp/config/IcePackAdmin.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 1acf8ed067b..322e5abd728 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index f648a12f7b9..4cc254924da 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/config/makedepend.py b/cpp/config/makedepend.py
index 1c9316f1c69..178bbc678fb 100755
--- a/cpp/config/makedepend.py
+++ b/cpp/config/makedepend.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Freeze/Makefile b/cpp/demo/Freeze/Makefile
index 35802c12843..793cdb68a1d 100644
--- a/cpp/demo/Freeze/Makefile
+++ b/cpp/demo/Freeze/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 08da6945c03..d001e5e78c2 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile
index 73a36116b18..5900955b4c3 100644
--- a/cpp/demo/Freeze/bench/Makefile
+++ b/cpp/demo/Freeze/bench/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Freeze/bench/Test.ice b/cpp/demo/Freeze/bench/Test.ice
index b24bc25610c..8555e67c641 100644
--- a/cpp/demo/Freeze/bench/Test.ice
+++ b/cpp/demo/Freeze/bench/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/BookFactory.cpp b/cpp/demo/Freeze/library/BookFactory.cpp
index 123d3776905..276df457f9d 100644
--- a/cpp/demo/Freeze/library/BookFactory.cpp
+++ b/cpp/demo/Freeze/library/BookFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/BookFactory.h b/cpp/demo/Freeze/library/BookFactory.h
index a998ab23c6c..d15d1b29533 100644
--- a/cpp/demo/Freeze/library/BookFactory.h
+++ b/cpp/demo/Freeze/library/BookFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp
index 9e0ca3a9b1e..6e05a41880c 100644
--- a/cpp/demo/Freeze/library/Client.cpp
+++ b/cpp/demo/Freeze/library/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index 9cfaf2a3796..af80616d1c4 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/Grammar.y b/cpp/demo/Freeze/library/Grammar.y
index c1970e7affb..af253cb92e4 100644
--- a/cpp/demo/Freeze/library/Grammar.y
+++ b/cpp/demo/Freeze/library/Grammar.y
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/Library.ice b/cpp/demo/Freeze/library/Library.ice
index 74a313f7a59..512a6b4efe5 100644
--- a/cpp/demo/Freeze/library/Library.ice
+++ b/cpp/demo/Freeze/library/Library.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp
index e51dfd0d574..05f7539ac66 100644
--- a/cpp/demo/Freeze/library/LibraryI.cpp
+++ b/cpp/demo/Freeze/library/LibraryI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h
index 91b2e90ed90..3dd61c5e9c9 100644
--- a/cpp/demo/Freeze/library/LibraryI.h
+++ b/cpp/demo/Freeze/library/LibraryI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile
index 4c1ac2630bd..078c55a2389 100644
--- a/cpp/demo/Freeze/library/Makefile
+++ b/cpp/demo/Freeze/library/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp
index 2c4d2f5cb37..7a1f7f21695 100644
--- a/cpp/demo/Freeze/library/Parser.cpp
+++ b/cpp/demo/Freeze/library/Parser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/Parser.h b/cpp/demo/Freeze/library/Parser.h
index 30a469e2716..9368f81b991 100644
--- a/cpp/demo/Freeze/library/Parser.h
+++ b/cpp/demo/Freeze/library/Parser.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp
index 2deb15e8845..495c6128661 100644
--- a/cpp/demo/Freeze/library/RunParser.cpp
+++ b/cpp/demo/Freeze/library/RunParser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/Scanner.l b/cpp/demo/Freeze/library/Scanner.l
index 2612345d6e3..90be35b535d 100644
--- a/cpp/demo/Freeze/library/Scanner.l
+++ b/cpp/demo/Freeze/library/Scanner.l
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp
index 8ed4378224c..6258db910f0 100644
--- a/cpp/demo/Freeze/library/Server.cpp
+++ b/cpp/demo/Freeze/library/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/Client.cpp b/cpp/demo/Freeze/phonebook/Client.cpp
index d3ed0cd6ed4..b582562052b 100644
--- a/cpp/demo/Freeze/phonebook/Client.cpp
+++ b/cpp/demo/Freeze/phonebook/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 485a8036306..04556e8b817 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.cpp b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
index 79c8649a245..66809f858bf 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.cpp
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.h b/cpp/demo/Freeze/phonebook/ContactFactory.h
index f1466b9f420..623ea87286e 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.h
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/Grammar.y b/cpp/demo/Freeze/phonebook/Grammar.y
index ec853ec6405..607948e15ca 100644
--- a/cpp/demo/Freeze/phonebook/Grammar.y
+++ b/cpp/demo/Freeze/phonebook/Grammar.y
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile
index 9a58d6992b5..4cdd73707a2 100644
--- a/cpp/demo/Freeze/phonebook/Makefile
+++ b/cpp/demo/Freeze/phonebook/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/Parser.cpp b/cpp/demo/Freeze/phonebook/Parser.cpp
index 6cd8674cea9..1d849e653e2 100644
--- a/cpp/demo/Freeze/phonebook/Parser.cpp
+++ b/cpp/demo/Freeze/phonebook/Parser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/Parser.h b/cpp/demo/Freeze/phonebook/Parser.h
index 3acf903b0a7..edf7444d4b2 100644
--- a/cpp/demo/Freeze/phonebook/Parser.h
+++ b/cpp/demo/Freeze/phonebook/Parser.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/PhoneBook.ice b/cpp/demo/Freeze/phonebook/PhoneBook.ice
index 91c2007a0c3..f9f13e6feea 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBook.ice
+++ b/cpp/demo/Freeze/phonebook/PhoneBook.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
index a8e2336d47a..b5eb8744601 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h
index a468c26036a..1a599a94ba0 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.h
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/RunParser.cpp b/cpp/demo/Freeze/phonebook/RunParser.cpp
index 7cb0da8310a..bc42fa55b62 100644
--- a/cpp/demo/Freeze/phonebook/RunParser.cpp
+++ b/cpp/demo/Freeze/phonebook/RunParser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/Scanner.l b/cpp/demo/Freeze/phonebook/Scanner.l
index 74c55819436..07ffb48a6b4 100644
--- a/cpp/demo/Freeze/phonebook/Scanner.l
+++ b/cpp/demo/Freeze/phonebook/Scanner.l
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index 016683a0d37..383c1b6d998 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Freeze/phonebook/contacts b/cpp/demo/Freeze/phonebook/contacts
index a635a5dc388..dbf2046386a 100644
--- a/cpp/demo/Freeze/phonebook/contacts
+++ b/cpp/demo/Freeze/phonebook/contacts
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Glacier/Makefile b/cpp/demo/Glacier/Makefile
index a606843e3a3..54b2781cd4f 100644
--- a/cpp/demo/Glacier/Makefile
+++ b/cpp/demo/Glacier/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp
index 25e478adc31..284a57af121 100644
--- a/cpp/demo/Glacier/session/Client.cpp
+++ b/cpp/demo/Glacier/session/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Glacier/session/HelloSession.ice b/cpp/demo/Glacier/session/HelloSession.ice
index c8345eae8d0..e445935c68b 100644
--- a/cpp/demo/Glacier/session/HelloSession.ice
+++ b/cpp/demo/Glacier/session/HelloSession.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Glacier/session/HelloSessionI.cpp b/cpp/demo/Glacier/session/HelloSessionI.cpp
index 816a7b69080..44ee4c4673b 100644
--- a/cpp/demo/Glacier/session/HelloSessionI.cpp
+++ b/cpp/demo/Glacier/session/HelloSessionI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Glacier/session/HelloSessionI.h b/cpp/demo/Glacier/session/HelloSessionI.h
index 2c8e6bbee89..9b63002e46b 100644
--- a/cpp/demo/Glacier/session/HelloSessionI.h
+++ b/cpp/demo/Glacier/session/HelloSessionI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Glacier/session/Makefile b/cpp/demo/Glacier/session/Makefile
index a6b7f094055..bb6fe2eaac3 100644
--- a/cpp/demo/Glacier/session/Makefile
+++ b/cpp/demo/Glacier/session/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Glacier/session/Server.cpp b/cpp/demo/Glacier/session/Server.cpp
index 9c179e9f53f..fb417b44e91 100644
--- a/cpp/demo/Glacier/session/Server.cpp
+++ b/cpp/demo/Glacier/session/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/Makefile b/cpp/demo/Ice/Makefile
index e9b3fada352..dc9ed2d6984 100644
--- a/cpp/demo/Ice/Makefile
+++ b/cpp/demo/Ice/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice
index 071224210dd..92e6b73c413 100644
--- a/cpp/demo/Ice/callback/Callback.ice
+++ b/cpp/demo/Ice/callback/Callback.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/callback/CallbackI.cpp b/cpp/demo/Ice/callback/CallbackI.cpp
index 495dddc571d..b4cc5587f87 100644
--- a/cpp/demo/Ice/callback/CallbackI.cpp
+++ b/cpp/demo/Ice/callback/CallbackI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/callback/CallbackI.h b/cpp/demo/Ice/callback/CallbackI.h
index d09685ccb20..03571a0000d 100644
--- a/cpp/demo/Ice/callback/CallbackI.h
+++ b/cpp/demo/Ice/callback/CallbackI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index ea22d52d10e..6720db5df99 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/callback/Makefile b/cpp/demo/Ice/callback/Makefile
index ded1e2c0903..e98b74b2da4 100644
--- a/cpp/demo/Ice/callback/Makefile
+++ b/cpp/demo/Ice/callback/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp
index c65400742b2..ce7d2e70e9f 100644
--- a/cpp/demo/Ice/callback/Server.cpp
+++ b/cpp/demo/Ice/callback/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index e9e3c53dd77..29598427d46 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice
index de413858f20..1f9928521e9 100644
--- a/cpp/demo/Ice/hello/Hello.ice
+++ b/cpp/demo/Ice/hello/Hello.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/hello/HelloI.cpp b/cpp/demo/Ice/hello/HelloI.cpp
index e2df9f383e6..ac103516702 100644
--- a/cpp/demo/Ice/hello/HelloI.cpp
+++ b/cpp/demo/Ice/hello/HelloI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/hello/HelloI.h b/cpp/demo/Ice/hello/HelloI.h
index 1af986c6f06..4608b72a8d4 100644
--- a/cpp/demo/Ice/hello/HelloI.h
+++ b/cpp/demo/Ice/hello/HelloI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/hello/Makefile b/cpp/demo/Ice/hello/Makefile
index 36aa34936df..2750f9a4648 100644
--- a/cpp/demo/Ice/hello/Makefile
+++ b/cpp/demo/Ice/hello/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp
index 465824fef6b..78ecd2b47d3 100644
--- a/cpp/demo/Ice/hello/Server.cpp
+++ b/cpp/demo/Ice/hello/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp
index 68db9083849..ba5a051e8f2 100644
--- a/cpp/demo/Ice/latency/Client.cpp
+++ b/cpp/demo/Ice/latency/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice
index 7c4c385de89..9f9a07f7e8f 100644
--- a/cpp/demo/Ice/latency/Latency.ice
+++ b/cpp/demo/Ice/latency/Latency.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/latency/Makefile b/cpp/demo/Ice/latency/Makefile
index b54e86444db..7fec7960827 100644
--- a/cpp/demo/Ice/latency/Makefile
+++ b/cpp/demo/Ice/latency/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp
index 357763f40e6..9ddc250904b 100644
--- a/cpp/demo/Ice/latency/Server.cpp
+++ b/cpp/demo/Ice/latency/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index 2c5c3feabbb..fefc6d8c33d 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/nested/Makefile b/cpp/demo/Ice/nested/Makefile
index 16344be8944..5a514c3de22 100644
--- a/cpp/demo/Ice/nested/Makefile
+++ b/cpp/demo/Ice/nested/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice
index 4f25fd0ac98..438dae5a5ec 100644
--- a/cpp/demo/Ice/nested/Nested.ice
+++ b/cpp/demo/Ice/nested/Nested.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp
index 7827c329084..4029fe9030c 100644
--- a/cpp/demo/Ice/nested/NestedI.cpp
+++ b/cpp/demo/Ice/nested/NestedI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/nested/NestedI.h b/cpp/demo/Ice/nested/NestedI.h
index b4947055771..f40d8e6643a 100644
--- a/cpp/demo/Ice/nested/NestedI.h
+++ b/cpp/demo/Ice/nested/NestedI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp
index 63f086a4e3c..56dd3ca3663 100644
--- a/cpp/demo/Ice/nested/Server.cpp
+++ b/cpp/demo/Ice/nested/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index f282e26906d..4634f87a71a 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/value/Makefile b/cpp/demo/Ice/value/Makefile
index 577996d5229..752a03667ce 100644
--- a/cpp/demo/Ice/value/Makefile
+++ b/cpp/demo/Ice/value/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/Ice/value/ObjectFactory.cpp b/cpp/demo/Ice/value/ObjectFactory.cpp
index ec3e7c3d122..2b7e518004d 100644
--- a/cpp/demo/Ice/value/ObjectFactory.cpp
+++ b/cpp/demo/Ice/value/ObjectFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/value/ObjectFactory.h b/cpp/demo/Ice/value/ObjectFactory.h
index 649a367f1d2..1f1300fa061 100644
--- a/cpp/demo/Ice/value/ObjectFactory.h
+++ b/cpp/demo/Ice/value/ObjectFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp
index 26fbf44e145..6311ffcd6b9 100644
--- a/cpp/demo/Ice/value/Server.cpp
+++ b/cpp/demo/Ice/value/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice
index a0e24b2fb81..35e38d76aae 100644
--- a/cpp/demo/Ice/value/Value.ice
+++ b/cpp/demo/Ice/value/Value.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp
index 507fb2816b0..f5fe1e3637d 100644
--- a/cpp/demo/Ice/value/ValueI.cpp
+++ b/cpp/demo/Ice/value/ValueI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h
index ede423c1dd8..b5886eb66db 100644
--- a/cpp/demo/Ice/value/ValueI.h
+++ b/cpp/demo/Ice/value/ValueI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceBox/Makefile b/cpp/demo/IceBox/Makefile
index 49acf7475f8..5eedf8b37be 100644
--- a/cpp/demo/IceBox/Makefile
+++ b/cpp/demo/IceBox/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp
index a5821b07d5e..f8dafbe93b5 100644
--- a/cpp/demo/IceBox/hello/Client.cpp
+++ b/cpp/demo/IceBox/hello/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice
index 4a3acc0f71f..759582a01bd 100644
--- a/cpp/demo/IceBox/hello/Hello.ice
+++ b/cpp/demo/IceBox/hello/Hello.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceBox/hello/HelloI.cpp b/cpp/demo/IceBox/hello/HelloI.cpp
index 951d683f9d8..bbf249478a4 100644
--- a/cpp/demo/IceBox/hello/HelloI.cpp
+++ b/cpp/demo/IceBox/hello/HelloI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceBox/hello/HelloI.h b/cpp/demo/IceBox/hello/HelloI.h
index eb8d3c8232d..2b634ff27a7 100644
--- a/cpp/demo/IceBox/hello/HelloI.h
+++ b/cpp/demo/IceBox/hello/HelloI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceBox/hello/HelloServiceI.cpp b/cpp/demo/IceBox/hello/HelloServiceI.cpp
index ffcd7b95d27..c746b6be508 100644
--- a/cpp/demo/IceBox/hello/HelloServiceI.cpp
+++ b/cpp/demo/IceBox/hello/HelloServiceI.cpp
@@ -1,3 +1,17 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
#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 6cf8cde7c2b..971b8b5179a 100644
--- a/cpp/demo/IceBox/hello/HelloServiceI.h
+++ b/cpp/demo/IceBox/hello/HelloServiceI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceBox/hello/Makefile b/cpp/demo/IceBox/hello/Makefile
index cce08b41702..fec129b4821 100644
--- a/cpp/demo/IceBox/hello/Makefile
+++ b/cpp/demo/IceBox/hello/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/IceStorm/Makefile b/cpp/demo/IceStorm/Makefile
index 861418c34ea..c37ef4e5cf8 100644
--- a/cpp/demo/IceStorm/Makefile
+++ b/cpp/demo/IceStorm/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/IceStorm/clock/Clock.ice b/cpp/demo/IceStorm/clock/Clock.ice
index 4869f7bd43d..69f679ea326 100644
--- a/cpp/demo/IceStorm/clock/Clock.ice
+++ b/cpp/demo/IceStorm/clock/Clock.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceStorm/clock/ClockI.cpp b/cpp/demo/IceStorm/clock/ClockI.cpp
index 160366004ec..eb0b13024ba 100644
--- a/cpp/demo/IceStorm/clock/ClockI.cpp
+++ b/cpp/demo/IceStorm/clock/ClockI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceStorm/clock/ClockI.h b/cpp/demo/IceStorm/clock/ClockI.h
index 5c7862a1f28..5f6a09d0669 100644
--- a/cpp/demo/IceStorm/clock/ClockI.h
+++ b/cpp/demo/IceStorm/clock/ClockI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile
index 377d8d762c8..4dc43d73c03 100644
--- a/cpp/demo/IceStorm/clock/Makefile
+++ b/cpp/demo/IceStorm/clock/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp
index 5053660e30c..250be913e4b 100644
--- a/cpp/demo/IceStorm/clock/Publisher.cpp
+++ b/cpp/demo/IceStorm/clock/Publisher.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp
index 834ba4413a1..0d5f7ea6264 100644
--- a/cpp/demo/IceStorm/clock/Subscriber.cpp
+++ b/cpp/demo/IceStorm/clock/Subscriber.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/IceUtil/Makefile b/cpp/demo/IceUtil/Makefile
index 6b7d6639521..f754a755a3d 100644
--- a/cpp/demo/IceUtil/Makefile
+++ b/cpp/demo/IceUtil/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/IceUtil/workqueue/Makefile b/cpp/demo/IceUtil/workqueue/Makefile
index 14060bd625e..faa1a7179a5 100644
--- a/cpp/demo/IceUtil/workqueue/Makefile
+++ b/cpp/demo/IceUtil/workqueue/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/demo/IceUtil/workqueue/WorkQueue.cpp b/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
index fd7e90f9c3e..ece413cfe77 100644
--- a/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
+++ b/cpp/demo/IceUtil/workqueue/WorkQueue.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile
index e68eca88239..00439be0f43 100644
--- a/cpp/demo/Makefile
+++ b/cpp/demo/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile
index bedf1581ba7..3ef4a913e44 100644
--- a/cpp/doc/Makefile
+++ b/cpp/doc/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/doc/Properties.sgml b/cpp/doc/Properties.sgml
index 5734e29a9a1..b91be4271a5 100644
--- a/cpp/doc/Properties.sgml
+++ b/cpp/doc/Properties.sgml
@@ -2,7 +2,7 @@
**********************************************************************
Copyright (c) 2001
ZeroC, Inc.
-Huntsville, AL, USA
+Billerica, MA, USA
All Rights Reserved
**********************************************************************
diff --git a/cpp/doc/ProxiesEndpoints.sgml b/cpp/doc/ProxiesEndpoints.sgml
index 33f5def01f0..90af3ee0c00 100644
--- a/cpp/doc/ProxiesEndpoints.sgml
+++ b/cpp/doc/ProxiesEndpoints.sgml
@@ -2,7 +2,7 @@
**********************************************************************
Copyright (c) 2001
ZeroC, Inc.
-Huntsville, AL, USA
+Billerica, MA, USA
All Rights Reserved
**********************************************************************
diff --git a/cpp/doc/manual.sgml b/cpp/doc/manual.sgml
index fc9f92ec675..72e5104fad4 100644
--- a/cpp/doc/manual.sgml
+++ b/cpp/doc/manual.sgml
@@ -18,7 +18,7 @@
**********************************************************************
Copyright (c) 2001
ZeroC, Inc.
-Huntsville, AL, USA
+Billerica, MA, USA
All Rights Reserved
**********************************************************************
@@ -37,8 +37,8 @@ All Rights Reserved
<publisher>
<publishername>ZeroC, Inc.</publishername>
<address>
-<city>Huntsville</city>
-<state>Alabama</state>
+<city>Billerica</city>
+<state>Massachusetts</state>
<country>USA</country>
</address>
</publisher>
diff --git a/cpp/include/Freeze/Application.h b/cpp/include/Freeze/Application.h
index 3a6f511da55..2291394fd6a 100644
--- a/cpp/include/Freeze/Application.h
+++ b/cpp/include/Freeze/Application.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h
index cdcf6f2df99..478cdfa36a6 100644
--- a/cpp/include/Freeze/Freeze.h
+++ b/cpp/include/Freeze/Freeze.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h
index 53b090db7dd..88581396cca 100644
--- a/cpp/include/Freeze/Initialize.h
+++ b/cpp/include/Freeze/Initialize.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h
index 850152c9623..7d4bec93731 100644
--- a/cpp/include/Freeze/Map.h
+++ b/cpp/include/Freeze/Map.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Glacier/Glacier.h b/cpp/include/Glacier/Glacier.h
index 76ac419ba43..0b1d2ea4b93 100644
--- a/cpp/include/Glacier/Glacier.h
+++ b/cpp/include/Glacier/Glacier.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 6ee6fedb59b..f3e43be583e 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index fb459308eb2..f1be2bf6a03 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index e59e7dc1f7e..65b775ac33d 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index d63130fc412..6dbb3569894 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ConnectionF.h b/cpp/include/Ice/ConnectionF.h
index deb7c3f81e1..6043f2ae758 100644
--- a/cpp/include/Ice/ConnectionF.h
+++ b/cpp/include/Ice/ConnectionF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ConnectionFactoryF.h b/cpp/include/Ice/ConnectionFactoryF.h
index 16f71fab324..dcc02e7374c 100644
--- a/cpp/include/Ice/ConnectionFactoryF.h
+++ b/cpp/include/Ice/ConnectionFactoryF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Const.h b/cpp/include/Ice/Const.h
index b79930f9642..7a9d10feb26 100644
--- a/cpp/include/Ice/Const.h
+++ b/cpp/include/Ice/Const.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Direct.h b/cpp/include/Ice/Direct.h
index f6175fe0a5b..1a23d9b91c0 100644
--- a/cpp/include/Ice/Direct.h
+++ b/cpp/include/Ice/Direct.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index 340190bf030..68be640beab 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index f80ba7e84e0..f14e3b29233 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/EndpointF.h b/cpp/include/Ice/EndpointF.h
index 2f5e18c777b..79b6eddff32 100644
--- a/cpp/include/Ice/EndpointF.h
+++ b/cpp/include/Ice/EndpointF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/EndpointFactory.h b/cpp/include/Ice/EndpointFactory.h
index 17664375e91..99d6f9acb2b 100644
--- a/cpp/include/Ice/EndpointFactory.h
+++ b/cpp/include/Ice/EndpointFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h
index 2e0a96fed06..8cdebaaaa6a 100644
--- a/cpp/include/Ice/EndpointFactoryF.h
+++ b/cpp/include/Ice/EndpointFactoryF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index 9c2d891be31..ded29361efd 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index 9b283b52916..f001fdf4b26 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index 6bd80726f4b..670c6fcc069 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 22ac9840f1c..af43017b2e3 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/IdentityUtil.h b/cpp/include/Ice/IdentityUtil.h
index df9a67a72f6..1aa278d9665 100644
--- a/cpp/include/Ice/IdentityUtil.h
+++ b/cpp/include/Ice/IdentityUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index 5588e43f4d0..02a72ffb988 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index ef915f1586b..0ea129e7d0c 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index 2ae59b8eedd..ea88271933f 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 1b84a24748c..50ff5c1dae3 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 8d57b80ddd6..d8482fb28bc 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index b90bd6a444a..7af22b64f96 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index b3e3fb32506..ba4d0f44b34 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ObjectAdapterFactoryF.h b/cpp/include/Ice/ObjectAdapterFactoryF.h
index 9a32f0d9b14..e252a2985c6 100644
--- a/cpp/include/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/include/Ice/ObjectAdapterFactoryF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index be391ffbb7a..75da22b6f31 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index 099aaf73e69..7a06764762d 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h
index c07b732d706..24d2c0ba66f 100644
--- a/cpp/include/Ice/ProtocolPluginFacade.h
+++ b/cpp/include/Ice/ProtocolPluginFacade.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ProtocolPluginFacadeF.h b/cpp/include/Ice/ProtocolPluginFacadeF.h
index 1402224aa01..d282a4d6109 100644
--- a/cpp/include/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/include/Ice/ProtocolPluginFacadeF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 68b35ed1063..da126785da2 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index 73edd7b9f87..2fb4997da29 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h
index b1557172263..2401e814d22 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index a1fae802720..2fc6550c8a6 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h
index 00e5467ffe3..08d3aac0fdd 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/RoutingTable.h b/cpp/include/Ice/RoutingTable.h
index bf6fb0bfb96..332ffb800f5 100644
--- a/cpp/include/Ice/RoutingTable.h
+++ b/cpp/include/Ice/RoutingTable.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Ice/RoutingTableF.h b/cpp/include/Ice/RoutingTableF.h
index 0151e67967b..cbb2e7145bc 100644
--- a/cpp/include/Ice/RoutingTableF.h
+++ b/cpp/include/Ice/RoutingTableF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IcePatch/ClientUtil.h b/cpp/include/IcePatch/ClientUtil.h
index fba0bb36554..8cdeae3da99 100644
--- a/cpp/include/IcePatch/ClientUtil.h
+++ b/cpp/include/IcePatch/ClientUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IcePatch/FileDescFactory.h b/cpp/include/IcePatch/FileDescFactory.h
index f7477bdb58f..3204691509c 100644
--- a/cpp/include/IcePatch/FileDescFactory.h
+++ b/cpp/include/IcePatch/FileDescFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IcePatch/Util.h b/cpp/include/IcePatch/Util.h
index 8cbe1719d08..b8ba4d8174f 100644
--- a/cpp/include/IcePatch/Util.h
+++ b/cpp/include/IcePatch/Util.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/CertificateVerifierOpenSSL.h b/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
index 84c71f0e6cf..82238de34e2 100644
--- a/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
+++ b/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/RSACertificateGen.h b/cpp/include/IceSSL/RSACertificateGen.h
index 34d7879149a..d0db8d35c0a 100644
--- a/cpp/include/IceSSL/RSACertificateGen.h
+++ b/cpp/include/IceSSL/RSACertificateGen.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/RSACertificateGenF.h b/cpp/include/IceSSL/RSACertificateGenF.h
index 416cc3e3969..9a3529cd9f6 100644
--- a/cpp/include/IceSSL/RSACertificateGenF.h
+++ b/cpp/include/IceSSL/RSACertificateGenF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/RSAKeyPair.h b/cpp/include/IceSSL/RSAKeyPair.h
index df85edc66f0..5cc369a4923 100644
--- a/cpp/include/IceSSL/RSAKeyPair.h
+++ b/cpp/include/IceSSL/RSAKeyPair.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/RSAKeyPairF.h b/cpp/include/IceSSL/RSAKeyPairF.h
index 27df20e8791..067b4d97c0b 100644
--- a/cpp/include/IceSSL/RSAKeyPairF.h
+++ b/cpp/include/IceSSL/RSAKeyPairF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/RSAPrivateKey.h b/cpp/include/IceSSL/RSAPrivateKey.h
index ee2dd9b39e5..9e583c5c7b5 100644
--- a/cpp/include/IceSSL/RSAPrivateKey.h
+++ b/cpp/include/IceSSL/RSAPrivateKey.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/RSAPrivateKeyF.h b/cpp/include/IceSSL/RSAPrivateKeyF.h
index 0457f3e5a8b..35b24383308 100644
--- a/cpp/include/IceSSL/RSAPrivateKeyF.h
+++ b/cpp/include/IceSSL/RSAPrivateKeyF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/RSAPublicKey.h b/cpp/include/IceSSL/RSAPublicKey.h
index 92385a2741a..9595b5baa63 100644
--- a/cpp/include/IceSSL/RSAPublicKey.h
+++ b/cpp/include/IceSSL/RSAPublicKey.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceSSL/RSAPublicKeyF.h b/cpp/include/IceSSL/RSAPublicKeyF.h
index 19bb9a72f0e..99e6d4e33b2 100644
--- a/cpp/include/IceSSL/RSAPublicKeyF.h
+++ b/cpp/include/IceSSL/RSAPublicKeyF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Base64.h b/cpp/include/IceUtil/Base64.h
index f4fc39b431d..c0983591593 100644
--- a/cpp/include/IceUtil/Base64.h
+++ b/cpp/include/IceUtil/Base64.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index 3c2006cf436..054928102a1 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 9ec62f6fcdb..b7c40aee6dc 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index 942dd1a959c..36bc1e0bd8d 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index 936e6774d77..c03f34073fd 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index e9a73a513bc..00f8d695238 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index c4186c7a69e..25a08ba2f44 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index 63c1543bfcc..08ada8f43e5 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index addd43418ba..94847dffcea 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index 8a23018447e..f50cf2880e1 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index 70d503ba731..5d47bf0e227 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index 0010e30e4fe..08dc3f009c9 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/RWRecMutex.h b/cpp/include/IceUtil/RWRecMutex.h
index 1841aaa6fed..1ece2665cd8 100644
--- a/cpp/include/IceUtil/RWRecMutex.h
+++ b/cpp/include/IceUtil/RWRecMutex.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/RecMutex.h b/cpp/include/IceUtil/RecMutex.h
index 8ad9947801e..7d3a296d58d 100644
--- a/cpp/include/IceUtil/RecMutex.h
+++ b/cpp/include/IceUtil/RecMutex.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index 525ac277fb0..afe92825eec 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index 97271f6bbba..541e7e25d0d 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index 4ddc7a10a13..2823a7d9188 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h
index 2fcdd49baeb..8ee357c9704 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index caf9724e46b..45e39c160ec 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h
index f3f485229b2..0e31c35d0ac 100644
--- a/cpp/include/IceUtil/Unicode.h
+++ b/cpp/include/IceUtil/Unicode.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/IceXML/StreamI.h b/cpp/include/IceXML/StreamI.h
index 8b5b9ea5ef9..3f1559569f8 100644
--- a/cpp/include/IceXML/StreamI.h
+++ b/cpp/include/IceXML/StreamI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index 393a6f53407..0065cc469cb 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index b3abb921c07..c6edc62e04d 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index db5205a01ee..d357013f996 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/include/XMLTransform/XMLTransform.h b/cpp/include/XMLTransform/XMLTransform.h
index f9fca66b4bf..97ad5f34775 100644
--- a/cpp/include/XMLTransform/XMLTransform.h
+++ b/cpp/include/XMLTransform/XMLTransform.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/schema/ice.xsd b/cpp/schema/ice.xsd
index 3acf47f9085..05de9d19b80 100644
--- a/cpp/schema/ice.xsd
+++ b/cpp/schema/ice.xsd
@@ -3,7 +3,7 @@
**********************************************************************
Copyright (c) 2001
ZeroC, Inc.
-Huntsville, AL, USA
+Billerica, MA, USA
All Rights Reserved
**********************************************************************
diff --git a/cpp/slice/Freeze/DB.ice b/cpp/slice/Freeze/DB.ice
index 416860528c4..e3f1c13a349 100644
--- a/cpp/slice/Freeze/DB.ice
+++ b/cpp/slice/Freeze/DB.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Freeze/DBException.ice b/cpp/slice/Freeze/DBException.ice
index ec0729de48c..264f2f2c097 100644
--- a/cpp/slice/Freeze/DBException.ice
+++ b/cpp/slice/Freeze/DBException.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Freeze/DBF.ice b/cpp/slice/Freeze/DBF.ice
index d3921a1ef7f..fba3ba2b9de 100644
--- a/cpp/slice/Freeze/DBF.ice
+++ b/cpp/slice/Freeze/DBF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Freeze/Evictor.ice b/cpp/slice/Freeze/Evictor.ice
index 419de3e4b1b..44122a4b28d 100644
--- a/cpp/slice/Freeze/Evictor.ice
+++ b/cpp/slice/Freeze/Evictor.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Freeze/EvictorF.ice b/cpp/slice/Freeze/EvictorF.ice
index bc7ab7f7dfe..481f36b78b0 100644
--- a/cpp/slice/Freeze/EvictorF.ice
+++ b/cpp/slice/Freeze/EvictorF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Glacier/Router.ice b/cpp/slice/Glacier/Router.ice
index 2440b75a6d9..dcb2f93b890 100644
--- a/cpp/slice/Glacier/Router.ice
+++ b/cpp/slice/Glacier/Router.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Glacier/Session.ice b/cpp/slice/Glacier/Session.ice
index 851aa5429c4..98a2980c84c 100644
--- a/cpp/slice/Glacier/Session.ice
+++ b/cpp/slice/Glacier/Session.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Glacier/SessionF.ice b/cpp/slice/Glacier/SessionF.ice
index 195f3f9208d..2f888c995a7 100644
--- a/cpp/slice/Glacier/SessionF.ice
+++ b/cpp/slice/Glacier/SessionF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Glacier/SessionManager.ice b/cpp/slice/Glacier/SessionManager.ice
index b70a46f6ab5..99d76b0ae93 100644
--- a/cpp/slice/Glacier/SessionManager.ice
+++ b/cpp/slice/Glacier/SessionManager.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Glacier/SessionManagerF.ice b/cpp/slice/Glacier/SessionManagerF.ice
index eed2d44341d..bf6a4ec5ce3 100644
--- a/cpp/slice/Glacier/SessionManagerF.ice
+++ b/cpp/slice/Glacier/SessionManagerF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Glacier/Starter.ice b/cpp/slice/Glacier/Starter.ice
index b16e029887d..cc6756dc9de 100644
--- a/cpp/slice/Glacier/Starter.ice
+++ b/cpp/slice/Glacier/Starter.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/BuiltinSequences.ice b/cpp/slice/Ice/BuiltinSequences.ice
index 84e87e889f5..38e2b6bf7a0 100644
--- a/cpp/slice/Ice/BuiltinSequences.ice
+++ b/cpp/slice/Ice/BuiltinSequences.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice
index ad934cb42dd..9240ceeebb8 100644
--- a/cpp/slice/Ice/Communicator.ice
+++ b/cpp/slice/Ice/Communicator.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/CommunicatorF.ice b/cpp/slice/Ice/CommunicatorF.ice
index 7acac72b577..1b1c7c7e4c6 100644
--- a/cpp/slice/Ice/CommunicatorF.ice
+++ b/cpp/slice/Ice/CommunicatorF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Current.ice b/cpp/slice/Ice/Current.ice
index 8349faa51ce..e87ee8b4121 100644
--- a/cpp/slice/Ice/Current.ice
+++ b/cpp/slice/Ice/Current.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Facet.ice b/cpp/slice/Ice/Facet.ice
index c09077115c1..0cf9b42743c 100644
--- a/cpp/slice/Ice/Facet.ice
+++ b/cpp/slice/Ice/Facet.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Identity.ice b/cpp/slice/Ice/Identity.ice
index f327eb3157a..a942a5cadc0 100644
--- a/cpp/slice/Ice/Identity.ice
+++ b/cpp/slice/Ice/Identity.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/LocalException.ice b/cpp/slice/Ice/LocalException.ice
index 3970bd25255..a84af659cff 100644
--- a/cpp/slice/Ice/LocalException.ice
+++ b/cpp/slice/Ice/LocalException.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Locator.ice b/cpp/slice/Ice/Locator.ice
index f473ae8cd5b..5017133e10c 100644
--- a/cpp/slice/Ice/Locator.ice
+++ b/cpp/slice/Ice/Locator.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/LocatorF.ice b/cpp/slice/Ice/LocatorF.ice
index b93bc53f138..5d209c9488e 100644
--- a/cpp/slice/Ice/LocatorF.ice
+++ b/cpp/slice/Ice/LocatorF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Logger.ice b/cpp/slice/Ice/Logger.ice
index 2a4e33ef97a..b6b8d2c81ed 100644
--- a/cpp/slice/Ice/Logger.ice
+++ b/cpp/slice/Ice/Logger.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/LoggerF.ice b/cpp/slice/Ice/LoggerF.ice
index b2f9b8a8b15..c382138a70b 100644
--- a/cpp/slice/Ice/LoggerF.ice
+++ b/cpp/slice/Ice/LoggerF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice
index 86b4d419d81..d82e429214b 100644
--- a/cpp/slice/Ice/ObjectAdapter.ice
+++ b/cpp/slice/Ice/ObjectAdapter.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/ObjectAdapterF.ice b/cpp/slice/Ice/ObjectAdapterF.ice
index 3ed99c85ead..8d26df8c90b 100644
--- a/cpp/slice/Ice/ObjectAdapterF.ice
+++ b/cpp/slice/Ice/ObjectAdapterF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/ObjectFactory.ice b/cpp/slice/Ice/ObjectFactory.ice
index 95b175d02f6..b7b60ce4dc2 100644
--- a/cpp/slice/Ice/ObjectFactory.ice
+++ b/cpp/slice/Ice/ObjectFactory.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/ObjectFactoryF.ice b/cpp/slice/Ice/ObjectFactoryF.ice
index f52ebd69242..17054acb402 100644
--- a/cpp/slice/Ice/ObjectFactoryF.ice
+++ b/cpp/slice/Ice/ObjectFactoryF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Plugin.ice b/cpp/slice/Ice/Plugin.ice
index 7f237f3d144..8a8149184d0 100644
--- a/cpp/slice/Ice/Plugin.ice
+++ b/cpp/slice/Ice/Plugin.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/PluginF.ice b/cpp/slice/Ice/PluginF.ice
index 6dcbbcfa8f8..c9b9cfe4cda 100644
--- a/cpp/slice/Ice/PluginF.ice
+++ b/cpp/slice/Ice/PluginF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Properties.ice b/cpp/slice/Ice/Properties.ice
index a61511dda3f..331f024652f 100644
--- a/cpp/slice/Ice/Properties.ice
+++ b/cpp/slice/Ice/Properties.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/PropertiesF.ice b/cpp/slice/Ice/PropertiesF.ice
index a6ed7ccc246..74653754e77 100644
--- a/cpp/slice/Ice/PropertiesF.ice
+++ b/cpp/slice/Ice/PropertiesF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Router.ice b/cpp/slice/Ice/Router.ice
index 7d96f2a96a2..6121879bfc6 100644
--- a/cpp/slice/Ice/Router.ice
+++ b/cpp/slice/Ice/Router.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/RouterF.ice b/cpp/slice/Ice/RouterF.ice
index a296053521c..c94abdc59ce 100644
--- a/cpp/slice/Ice/RouterF.ice
+++ b/cpp/slice/Ice/RouterF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/ServantLocator.ice b/cpp/slice/Ice/ServantLocator.ice
index 497241f9614..f40b7b8981f 100644
--- a/cpp/slice/Ice/ServantLocator.ice
+++ b/cpp/slice/Ice/ServantLocator.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/ServantLocatorF.ice b/cpp/slice/Ice/ServantLocatorF.ice
index ef59b979f11..71b90fcfbb9 100644
--- a/cpp/slice/Ice/ServantLocatorF.ice
+++ b/cpp/slice/Ice/ServantLocatorF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/Stream.ice b/cpp/slice/Ice/Stream.ice
index 8236d91616e..c2b97f23f7d 100644
--- a/cpp/slice/Ice/Stream.ice
+++ b/cpp/slice/Ice/Stream.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/StreamF.ice b/cpp/slice/Ice/StreamF.ice
index 14c110fd1c7..ed4e8772aef 100644
--- a/cpp/slice/Ice/StreamF.ice
+++ b/cpp/slice/Ice/StreamF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/UserExceptionFactory.ice b/cpp/slice/Ice/UserExceptionFactory.ice
index 370e80b634d..353519b937e 100644
--- a/cpp/slice/Ice/UserExceptionFactory.ice
+++ b/cpp/slice/Ice/UserExceptionFactory.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Ice/UserExceptionFactoryF.ice b/cpp/slice/Ice/UserExceptionFactoryF.ice
index 417366a3cad..59c29b53592 100644
--- a/cpp/slice/Ice/UserExceptionFactoryF.ice
+++ b/cpp/slice/Ice/UserExceptionFactoryF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IceBox/IceBox.ice b/cpp/slice/IceBox/IceBox.ice
index d196cdec530..181a588ad87 100644
--- a/cpp/slice/IceBox/IceBox.ice
+++ b/cpp/slice/IceBox/IceBox.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IcePack/Admin.ice b/cpp/slice/IcePack/Admin.ice
index 95084f8086f..363b1924a82 100644
--- a/cpp/slice/IcePack/Admin.ice
+++ b/cpp/slice/IcePack/Admin.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IcePack/AdminF.ice b/cpp/slice/IcePack/AdminF.ice
index 85065acdbfc..0b8d67c104c 100644
--- a/cpp/slice/IcePack/AdminF.ice
+++ b/cpp/slice/IcePack/AdminF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IcePatch/IcePatch.ice b/cpp/slice/IcePatch/IcePatch.ice
index 3c637dbe9f0..30e021f928d 100644
--- a/cpp/slice/IcePatch/IcePatch.ice
+++ b/cpp/slice/IcePatch/IcePatch.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IceSSL/CertificateVerifier.ice b/cpp/slice/IceSSL/CertificateVerifier.ice
index 370f375f849..3a8eec128ef 100644
--- a/cpp/slice/IceSSL/CertificateVerifier.ice
+++ b/cpp/slice/IceSSL/CertificateVerifier.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IceSSL/CertificateVerifierF.ice b/cpp/slice/IceSSL/CertificateVerifierF.ice
index 5e4cb138272..a2d1038b886 100644
--- a/cpp/slice/IceSSL/CertificateVerifierF.ice
+++ b/cpp/slice/IceSSL/CertificateVerifierF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IceSSL/Exception.ice b/cpp/slice/IceSSL/Exception.ice
index 273182df4bc..72551ef602f 100644
--- a/cpp/slice/IceSSL/Exception.ice
+++ b/cpp/slice/IceSSL/Exception.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IceSSL/Plugin.ice b/cpp/slice/IceSSL/Plugin.ice
index 424b0aa8d6c..af02e652313 100644
--- a/cpp/slice/IceSSL/Plugin.ice
+++ b/cpp/slice/IceSSL/Plugin.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IceSSL/PluginF.ice b/cpp/slice/IceSSL/PluginF.ice
index 0fefb7c3383..c9f04b88439 100644
--- a/cpp/slice/IceSSL/PluginF.ice
+++ b/cpp/slice/IceSSL/PluginF.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/IceStorm/IceStorm.ice b/cpp/slice/IceStorm/IceStorm.ice
index 13a1d4e1c49..b331ee22c57 100644
--- a/cpp/slice/IceStorm/IceStorm.ice
+++ b/cpp/slice/IceStorm/IceStorm.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/slice/Yellow/Yellow.ice b/cpp/slice/Yellow/Yellow.ice
index fe625729b5e..82c0d59e0e2 100644
--- a/cpp/slice/Yellow/Yellow.ice
+++ b/cpp/slice/Yellow/Yellow.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Freeze/Application.cpp b/cpp/src/Freeze/Application.cpp
index f9946e7ce8d..1db50c856c9 100644
--- a/cpp/src/Freeze/Application.cpp
+++ b/cpp/src/Freeze/Application.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp
index f1e7c0d67c4..3c80c4bfacc 100644
--- a/cpp/src/Freeze/DBI.cpp
+++ b/cpp/src/Freeze/DBI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Freeze/DBI.h b/cpp/src/Freeze/DBI.h
index 9211d340981..0d48284ef71 100644
--- a/cpp/src/Freeze/DBI.h
+++ b/cpp/src/Freeze/DBI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index b3f35052116..80d55890702 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index 2c34a2137c2..8930bdf7a44 100644
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 4934101c0f4..0895a33c17b 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/Glacier/Blobject.cpp b/cpp/src/Glacier/Blobject.cpp
index 1b36f7411f0..b17f5fc03e9 100644
--- a/cpp/src/Glacier/Blobject.cpp
+++ b/cpp/src/Glacier/Blobject.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/Blobject.h b/cpp/src/Glacier/Blobject.h
index db2d5465d44..cd4a31c9996 100644
--- a/cpp/src/Glacier/Blobject.h
+++ b/cpp/src/Glacier/Blobject.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/ClientBlobject.cpp b/cpp/src/Glacier/ClientBlobject.cpp
index 740c0109a4f..713063e5e50 100644
--- a/cpp/src/Glacier/ClientBlobject.cpp
+++ b/cpp/src/Glacier/ClientBlobject.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/ClientBlobject.h b/cpp/src/Glacier/ClientBlobject.h
index 9529fa652ca..2dca1765673 100644
--- a/cpp/src/Glacier/ClientBlobject.h
+++ b/cpp/src/Glacier/ClientBlobject.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/GlacierRouter.cpp b/cpp/src/Glacier/GlacierRouter.cpp
index cafad4022f2..d5a2534fe87 100644
--- a/cpp/src/Glacier/GlacierRouter.cpp
+++ b/cpp/src/Glacier/GlacierRouter.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/GlacierStarter.cpp b/cpp/src/Glacier/GlacierStarter.cpp
index e549770ae79..b8a6dff5369 100644
--- a/cpp/src/Glacier/GlacierStarter.cpp
+++ b/cpp/src/Glacier/GlacierStarter.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile
index a28fdae5f74..9a704951209 100644
--- a/cpp/src/Glacier/Makefile
+++ b/cpp/src/Glacier/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/Glacier/Missive.cpp b/cpp/src/Glacier/Missive.cpp
index 4cc20b2c5ef..ea2a31b578f 100644
--- a/cpp/src/Glacier/Missive.cpp
+++ b/cpp/src/Glacier/Missive.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/Missive.h b/cpp/src/Glacier/Missive.h
index 26e819c1b70..d9b3bba3b52 100644
--- a/cpp/src/Glacier/Missive.h
+++ b/cpp/src/Glacier/Missive.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/RouterI.cpp b/cpp/src/Glacier/RouterI.cpp
index 9b338f48a68..d9fb268f467 100644
--- a/cpp/src/Glacier/RouterI.cpp
+++ b/cpp/src/Glacier/RouterI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/RouterI.h b/cpp/src/Glacier/RouterI.h
index fcc58850ed8..c1a2e60c114 100644
--- a/cpp/src/Glacier/RouterI.h
+++ b/cpp/src/Glacier/RouterI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/ServerBlobject.cpp b/cpp/src/Glacier/ServerBlobject.cpp
index 54c49dd06b6..931f1eebd3a 100644
--- a/cpp/src/Glacier/ServerBlobject.cpp
+++ b/cpp/src/Glacier/ServerBlobject.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/ServerBlobject.h b/cpp/src/Glacier/ServerBlobject.h
index 42ea249c72a..2f666ce812b 100644
--- a/cpp/src/Glacier/ServerBlobject.h
+++ b/cpp/src/Glacier/ServerBlobject.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/StarterI.cpp b/cpp/src/Glacier/StarterI.cpp
index 1cff6cf63b1..90a1615de01 100644
--- a/cpp/src/Glacier/StarterI.cpp
+++ b/cpp/src/Glacier/StarterI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Glacier/StarterI.h b/cpp/src/Glacier/StarterI.h
index 9e3ce0da655..6a1b419b2d3 100644
--- a/cpp/src/Glacier/StarterI.h
+++ b/cpp/src/Glacier/StarterI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp
index 25dbea97073..cda9d47280c 100644
--- a/cpp/src/Ice/Acceptor.cpp
+++ b/cpp/src/Ice/Acceptor.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index f3b4e3a23f8..5ee0385ffb4 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index 4ef932ae481..0fa4a98fae1 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 552adff626a..28a32c51062 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 11d1ebfa009..67ee24fb571 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index eb4de0af869..8510acb6ada 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index c8c924ec5c4..1946ec58cda 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index 00f770d256b..b811e1f4be9 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Connection.h b/cpp/src/Ice/Connection.h
index 89ec156e10f..894b052ebfe 100644
--- a/cpp/src/Ice/Connection.h
+++ b/cpp/src/Ice/Connection.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 41a85a9ec33..4e3a68afa04 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index dc0b7316aa8..791c433b0d0 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Connector.cpp b/cpp/src/Ice/Connector.cpp
index e0db66a236a..2dd26231587 100644
--- a/cpp/src/Ice/Connector.cpp
+++ b/cpp/src/Ice/Connector.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index 5bcb8e75a88..d831c7221ad 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index 0b6b0d1a805..81712ade724 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 46124cb32c4..3dac9871bb5 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index d7c5dd47d71..d0702227b3e 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/DefaultsAndOverridesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h
index 5afdfe5b993..3bc49018614 100644
--- a/cpp/src/Ice/DefaultsAndOverridesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp
index 9c6269e0961..0ddda1e8da7 100644
--- a/cpp/src/Ice/Direct.cpp
+++ b/cpp/src/Ice/Direct.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 19a4ba3c930..c4a61b69695 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index 787eba6db84..ab04aab1ca3 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h
index 6ca22a23059..ab3d208f12d 100644
--- a/cpp/src/Ice/Endpoint.h
+++ b/cpp/src/Ice/Endpoint.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp
index b2450ca055b..f44f3c3d546 100644
--- a/cpp/src/Ice/EndpointFactory.cpp
+++ b/cpp/src/Ice/EndpointFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index 6d2f3f38149..06ceabea15e 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index a5131a5caac..37367404afc 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/EndpointFactoryManagerF.h b/cpp/src/Ice/EndpointFactoryManagerF.h
index 1630065194a..dedcd9c7459 100644
--- a/cpp/src/Ice/EndpointFactoryManagerF.h
+++ b/cpp/src/Ice/EndpointFactoryManagerF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 80308d1ea87..b162127ba39 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index e967860bd85..9ccf2c89d74 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index ef16a338507..e8006fad77c 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index a9430100a74..f692766732b 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/IdentityUtil.cpp b/cpp/src/Ice/IdentityUtil.cpp
index 3ecd9fd28e7..f1ccfc29521 100644
--- a/cpp/src/Ice/IdentityUtil.cpp
+++ b/cpp/src/Ice/IdentityUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index e690954677f..b0ba1cbf11a 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index a560d90f5c7..d383978da38 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 1d3542b6783..51170d62941 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index a9945962487..94a860286e2 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp
index 7c6423de8f5..2dafbae876e 100644
--- a/cpp/src/Ice/LocalObject.cpp
+++ b/cpp/src/Ice/LocalObject.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 80e3af311f1..fce024bd147 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 66a482ede27..50a18047d82 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h
index 505a3cac421..0a01dc740a6 100644
--- a/cpp/src/Ice/LocatorInfoF.h
+++ b/cpp/src/Ice/LocatorInfoF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index 84f62aa7930..01f8b99ecd4 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index 6d196bfc05a..439f7abd0cf 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index c8ef64f55c6..35e55149c9d 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 75ae50c92e6..19a5a0dec9f 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 7467b164511..67f01fa04e1 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 08263c23a5c..c7cea6f760b 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 29ff7380e15..9979f1b41cc 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 3559cfbf1d6..68c1f4e0546 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index c6948f4a01f..e6c8262453f 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index a7b775c6299..5e7c2f1c98f 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index ae7f2971614..ec1191629da 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp
index 225c2bea676..fbad635b0d8 100644
--- a/cpp/src/Ice/ObjectFactoryManager.cpp
+++ b/cpp/src/Ice/ObjectFactoryManager.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h
index 950e4e39368..08dfc08f37e 100644
--- a/cpp/src/Ice/ObjectFactoryManager.h
+++ b/cpp/src/Ice/ObjectFactoryManager.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ObjectFactoryManagerF.h b/cpp/src/Ice/ObjectFactoryManagerF.h
index ed74251946b..93895e1a5b7 100644
--- a/cpp/src/Ice/ObjectFactoryManagerF.h
+++ b/cpp/src/Ice/ObjectFactoryManagerF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index f8c588bbb60..593f39441d5 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/PicklerI.h b/cpp/src/Ice/PicklerI.h
index 9943cc90114..ab1b9cd3f9a 100644
--- a/cpp/src/Ice/PicklerI.h
+++ b/cpp/src/Ice/PicklerI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index 9d6e11adc86..11b2416479b 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index 534e2568a78..b2e1b817903 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 21dfa3df188..96907406d75 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index 0240c1ba709..0091237050e 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Protocol.h b/cpp/src/Ice/Protocol.h
index 711d73398ec..aa7eb62edcf 100644
--- a/cpp/src/Ice/Protocol.h
+++ b/cpp/src/Ice/Protocol.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index 0a899e42623..08cf80716fa 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 02280d060e2..07c7e8b471b 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index a1e11c404e2..058accf0809 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 1274eb1e3eb..150dd007516 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 412f5066d73..c5f8fad76b1 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index f99eebff996..374de6716bc 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index b2884aa8a30..48a154629ec 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index 25e7ea1b4d9..e30fed89bdf 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h
index 845727eb44e..40b67ded2d0 100644
--- a/cpp/src/Ice/ReferenceFactoryF.h
+++ b/cpp/src/Ice/ReferenceFactoryF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index 32833ac8b5c..a0236ff9935 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index a721b199566..d6cd1ea81be 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h
index 618568b17b0..a3010d50fa9 100644
--- a/cpp/src/Ice/RouterInfoF.h
+++ b/cpp/src/Ice/RouterInfoF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/RoutingTable.cpp b/cpp/src/Ice/RoutingTable.cpp
index 1934c2e5237..1cbf0a096d9 100644
--- a/cpp/src/Ice/RoutingTable.cpp
+++ b/cpp/src/Ice/RoutingTable.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/StringUtil.cpp b/cpp/src/Ice/StringUtil.cpp
index 7ee078da4df..56394373bc5 100644
--- a/cpp/src/Ice/StringUtil.cpp
+++ b/cpp/src/Ice/StringUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/StringUtil.h b/cpp/src/Ice/StringUtil.h
index 2e54f0c00b0..59ae0a80f47 100644
--- a/cpp/src/Ice/StringUtil.h
+++ b/cpp/src/Ice/StringUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index 9aa56a46f4c..27da0780880 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index f27694d48cf..54df4e7e085 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index cf8633251e8..5f0d7837b06 100644
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index eedf2f820cc..6ed57a9f42a 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index eec56f652a9..57a6c1138dc 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index 5643be4584a..6c837e0f1f8 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TcpEndpoint.cpp b/cpp/src/Ice/TcpEndpoint.cpp
index 368212bfe70..1ce1aebaed0 100644
--- a/cpp/src/Ice/TcpEndpoint.cpp
+++ b/cpp/src/Ice/TcpEndpoint.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TcpEndpoint.h b/cpp/src/Ice/TcpEndpoint.h
index ab9633c9019..48116ec333d 100644
--- a/cpp/src/Ice/TcpEndpoint.h
+++ b/cpp/src/Ice/TcpEndpoint.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index f1388965e76..6f519a9e2af 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index 14106464199..91f3d98c9b2 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index bd7925e152f..2374f01b3d9 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 2e6dc333e67..133d6b16696 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/ThreadPoolF.h b/cpp/src/Ice/ThreadPoolF.h
index 651c6fe216c..18841bca2c9 100644
--- a/cpp/src/Ice/ThreadPoolF.h
+++ b/cpp/src/Ice/ThreadPoolF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TraceLevels.cpp b/cpp/src/Ice/TraceLevels.cpp
index fa653459f79..eef78310482 100644
--- a/cpp/src/Ice/TraceLevels.cpp
+++ b/cpp/src/Ice/TraceLevels.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h
index ce6a1ec99bd..381150a8571 100644
--- a/cpp/src/Ice/TraceLevels.h
+++ b/cpp/src/Ice/TraceLevels.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h
index 9caacfe811b..4e697a16712 100644
--- a/cpp/src/Ice/TraceLevelsF.h
+++ b/cpp/src/Ice/TraceLevelsF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index 262637d4ec5..567075c95ec 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index a2b2f175105..db521433036 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Transceiver.cpp b/cpp/src/Ice/Transceiver.cpp
index 6091be14b97..567feadc68e 100644
--- a/cpp/src/Ice/Transceiver.cpp
+++ b/cpp/src/Ice/Transceiver.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index d1cd597ef52..872e11bdd1f 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index 3bcd3a26e7a..834b984d7dc 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UdpEndpoint.cpp b/cpp/src/Ice/UdpEndpoint.cpp
index 343c5b83e31..1fc29bff9e3 100644
--- a/cpp/src/Ice/UdpEndpoint.cpp
+++ b/cpp/src/Ice/UdpEndpoint.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UdpEndpoint.h b/cpp/src/Ice/UdpEndpoint.h
index 0ed0d3af870..e504b8973b2 100644
--- a/cpp/src/Ice/UdpEndpoint.h
+++ b/cpp/src/Ice/UdpEndpoint.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 587fd7a81e5..82fdd4b85b1 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 39935a18a76..892ce4a5ff7 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UnknownEndpoint.cpp b/cpp/src/Ice/UnknownEndpoint.cpp
index 84e1a09a5a5..c59361fc931 100644
--- a/cpp/src/Ice/UnknownEndpoint.cpp
+++ b/cpp/src/Ice/UnknownEndpoint.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UnknownEndpoint.h b/cpp/src/Ice/UnknownEndpoint.h
index 9e5bfeff015..c9ffa610372 100644
--- a/cpp/src/Ice/UnknownEndpoint.h
+++ b/cpp/src/Ice/UnknownEndpoint.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UserExceptionFactoryManager.cpp b/cpp/src/Ice/UserExceptionFactoryManager.cpp
index c9e72e3c58c..4d799fc9743 100644
--- a/cpp/src/Ice/UserExceptionFactoryManager.cpp
+++ b/cpp/src/Ice/UserExceptionFactoryManager.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UserExceptionFactoryManager.h b/cpp/src/Ice/UserExceptionFactoryManager.h
index b3392f91fcf..f28b8b1c58e 100644
--- a/cpp/src/Ice/UserExceptionFactoryManager.h
+++ b/cpp/src/Ice/UserExceptionFactoryManager.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Ice/UserExceptionFactoryManagerF.h b/cpp/src/Ice/UserExceptionFactoryManagerF.h
index d928f927a0d..bcd42cf3dd7 100644
--- a/cpp/src/Ice/UserExceptionFactoryManagerF.h
+++ b/cpp/src/Ice/UserExceptionFactoryManagerF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index 9457f97f370..5ac3bf14a59 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp
index b91995385ff..34c700aeaaf 100644
--- a/cpp/src/IceBox/Exception.cpp
+++ b/cpp/src/IceBox/Exception.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index 653b95905b2..8153d495780 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/IceBox/Server.cpp b/cpp/src/IceBox/Server.cpp
index a14fbdce240..6309711e482 100644
--- a/cpp/src/IceBox/Server.cpp
+++ b/cpp/src/IceBox/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 459aecdec24..fabcf2e460c 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h
index d63dc62b888..37e25344b74 100644
--- a/cpp/src/IceBox/ServiceManagerI.h
+++ b/cpp/src/IceBox/ServiceManagerI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Activator.ice b/cpp/src/IcePack/Activator.ice
index 3a4e6a94d74..ac530b99dbf 100644
--- a/cpp/src/IcePack/Activator.ice
+++ b/cpp/src/IcePack/Activator.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp
index e868e5059f8..88d44889c98 100644
--- a/cpp/src/IcePack/ActivatorI.cpp
+++ b/cpp/src/IcePack/ActivatorI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ActivatorI.h b/cpp/src/IcePack/ActivatorI.h
index a84c232cfaf..009454efe6d 100644
--- a/cpp/src/IcePack/ActivatorI.h
+++ b/cpp/src/IcePack/ActivatorI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/AdapterFactory.cpp b/cpp/src/IcePack/AdapterFactory.cpp
index acd94b57be8..89d38cdb1bb 100644
--- a/cpp/src/IcePack/AdapterFactory.cpp
+++ b/cpp/src/IcePack/AdapterFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/AdapterFactory.h b/cpp/src/IcePack/AdapterFactory.h
index 640158f6936..3777cb5e312 100644
--- a/cpp/src/IcePack/AdapterFactory.h
+++ b/cpp/src/IcePack/AdapterFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/AdapterI.cpp b/cpp/src/IcePack/AdapterI.cpp
index 43d941cb711..cd1ae7a565a 100644
--- a/cpp/src/IcePack/AdapterI.cpp
+++ b/cpp/src/IcePack/AdapterI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/AdapterI.h b/cpp/src/IcePack/AdapterI.h
index 4b3e35e2450..ddc4d954644 100644
--- a/cpp/src/IcePack/AdapterI.h
+++ b/cpp/src/IcePack/AdapterI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/AdapterRegistryI.cpp b/cpp/src/IcePack/AdapterRegistryI.cpp
index 6e2fb16084f..31c99d263f8 100644
--- a/cpp/src/IcePack/AdapterRegistryI.cpp
+++ b/cpp/src/IcePack/AdapterRegistryI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/AdapterRegistryI.h b/cpp/src/IcePack/AdapterRegistryI.h
index a86817505dc..0430d079d45 100644
--- a/cpp/src/IcePack/AdapterRegistryI.h
+++ b/cpp/src/IcePack/AdapterRegistryI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/AdminI.cpp b/cpp/src/IcePack/AdminI.cpp
index 492071c7bb9..303e6c3f499 100644
--- a/cpp/src/IcePack/AdminI.cpp
+++ b/cpp/src/IcePack/AdminI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/AdminI.h b/cpp/src/IcePack/AdminI.h
index 0a73a7b8265..31a71aae99d 100644
--- a/cpp/src/IcePack/AdminI.h
+++ b/cpp/src/IcePack/AdminI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ApplicationBuilder.cpp b/cpp/src/IcePack/ApplicationBuilder.cpp
index a62fecac327..7159aa1870f 100644
--- a/cpp/src/IcePack/ApplicationBuilder.cpp
+++ b/cpp/src/IcePack/ApplicationBuilder.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ApplicationBuilder.h b/cpp/src/IcePack/ApplicationBuilder.h
index f41aa35b338..c1dc2166559 100644
--- a/cpp/src/IcePack/ApplicationBuilder.h
+++ b/cpp/src/IcePack/ApplicationBuilder.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Client.cpp b/cpp/src/IcePack/Client.cpp
index 6616b351211..134c4d86d91 100644
--- a/cpp/src/IcePack/Client.cpp
+++ b/cpp/src/IcePack/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ComponentBuilder.cpp b/cpp/src/IcePack/ComponentBuilder.cpp
index cbad16743a9..881f6fbb9b0 100644
--- a/cpp/src/IcePack/ComponentBuilder.cpp
+++ b/cpp/src/IcePack/ComponentBuilder.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ComponentBuilder.h b/cpp/src/IcePack/ComponentBuilder.h
index 0d82ded5bcf..334843ef7f9 100644
--- a/cpp/src/IcePack/ComponentBuilder.h
+++ b/cpp/src/IcePack/ComponentBuilder.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ExceptionFactory.cpp b/cpp/src/IcePack/ExceptionFactory.cpp
index 85440bbd1e1..7e39f967caa 100644
--- a/cpp/src/IcePack/ExceptionFactory.cpp
+++ b/cpp/src/IcePack/ExceptionFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ExceptionFactory.h b/cpp/src/IcePack/ExceptionFactory.h
index df14b33a6f6..8df0b58db59 100644
--- a/cpp/src/IcePack/ExceptionFactory.h
+++ b/cpp/src/IcePack/ExceptionFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Grammar.y b/cpp/src/IcePack/Grammar.y
index 8500154d8c8..7a8b4010571 100644
--- a/cpp/src/IcePack/Grammar.y
+++ b/cpp/src/IcePack/Grammar.y
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/IcePackNode.cpp b/cpp/src/IcePack/IcePackNode.cpp
index 21b9c16c149..580675c912a 100644
--- a/cpp/src/IcePack/IcePackNode.cpp
+++ b/cpp/src/IcePack/IcePackNode.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/IcePackRegistry.cpp b/cpp/src/IcePack/IcePackRegistry.cpp
index c8c379e3fe7..84149e1c070 100644
--- a/cpp/src/IcePack/IcePackRegistry.cpp
+++ b/cpp/src/IcePack/IcePackRegistry.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Internal.ice b/cpp/src/IcePack/Internal.ice
index beb8f0533ad..b59e2b5e064 100644
--- a/cpp/src/IcePack/Internal.ice
+++ b/cpp/src/IcePack/Internal.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/LocatorI.cpp b/cpp/src/IcePack/LocatorI.cpp
index 1626cda374b..2eb90bf134a 100644
--- a/cpp/src/IcePack/LocatorI.cpp
+++ b/cpp/src/IcePack/LocatorI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/LocatorI.h b/cpp/src/IcePack/LocatorI.h
index 253a0c9a975..d7de10878eb 100644
--- a/cpp/src/IcePack/LocatorI.h
+++ b/cpp/src/IcePack/LocatorI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/LocatorRegistryI.cpp b/cpp/src/IcePack/LocatorRegistryI.cpp
index 9b02825136e..ae59c23d678 100644
--- a/cpp/src/IcePack/LocatorRegistryI.cpp
+++ b/cpp/src/IcePack/LocatorRegistryI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/LocatorRegistryI.h b/cpp/src/IcePack/LocatorRegistryI.h
index 55e2c84744a..65c53e61428 100644
--- a/cpp/src/IcePack/LocatorRegistryI.h
+++ b/cpp/src/IcePack/LocatorRegistryI.h
@@ -3,9 +3,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index 8294fa84cd9..e31b3675aee 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/IcePack/NodeI.cpp b/cpp/src/IcePack/NodeI.cpp
index 3a19fb7fc0f..793896384e0 100644
--- a/cpp/src/IcePack/NodeI.cpp
+++ b/cpp/src/IcePack/NodeI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/NodeI.h b/cpp/src/IcePack/NodeI.h
index 0e93b49e6a9..b9992800c27 100644
--- a/cpp/src/IcePack/NodeI.h
+++ b/cpp/src/IcePack/NodeI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/NodeInfo.cpp b/cpp/src/IcePack/NodeInfo.cpp
index f2a23c0b2c3..c667f16297b 100644
--- a/cpp/src/IcePack/NodeInfo.cpp
+++ b/cpp/src/IcePack/NodeInfo.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/NodeInfo.h b/cpp/src/IcePack/NodeInfo.h
index a287f5018a5..941d56a8b9d 100644
--- a/cpp/src/IcePack/NodeInfo.h
+++ b/cpp/src/IcePack/NodeInfo.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/NodeRegistryI.cpp b/cpp/src/IcePack/NodeRegistryI.cpp
index 315fb28e134..4c77ad4181f 100644
--- a/cpp/src/IcePack/NodeRegistryI.cpp
+++ b/cpp/src/IcePack/NodeRegistryI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/NodeRegistryI.h b/cpp/src/IcePack/NodeRegistryI.h
index f4ca54051b8..572ba467aa3 100644
--- a/cpp/src/IcePack/NodeRegistryI.h
+++ b/cpp/src/IcePack/NodeRegistryI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Parser.cpp b/cpp/src/IcePack/Parser.cpp
index 187beef47d7..afba53d0cd8 100644
--- a/cpp/src/IcePack/Parser.cpp
+++ b/cpp/src/IcePack/Parser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Parser.h b/cpp/src/IcePack/Parser.h
index d73b42c3e4b..147908e7934 100644
--- a/cpp/src/IcePack/Parser.h
+++ b/cpp/src/IcePack/Parser.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Registry.cpp b/cpp/src/IcePack/Registry.cpp
index 4eddd273a0f..6a8f0c97ce4 100644
--- a/cpp/src/IcePack/Registry.cpp
+++ b/cpp/src/IcePack/Registry.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Registry.h b/cpp/src/IcePack/Registry.h
index d743cb1fcae..22410d03ac4 100644
--- a/cpp/src/IcePack/Registry.h
+++ b/cpp/src/IcePack/Registry.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/Scanner.l b/cpp/src/IcePack/Scanner.l
index e0116bcc7e9..7a5fa83ecad 100644
--- a/cpp/src/IcePack/Scanner.l
+++ b/cpp/src/IcePack/Scanner.l
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerAdapterI.cpp b/cpp/src/IcePack/ServerAdapterI.cpp
index cd3ad2b7726..29aa1cea9c3 100644
--- a/cpp/src/IcePack/ServerAdapterI.cpp
+++ b/cpp/src/IcePack/ServerAdapterI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerAdapterI.h b/cpp/src/IcePack/ServerAdapterI.h
index 760adfba12a..38cf0e6821b 100644
--- a/cpp/src/IcePack/ServerAdapterI.h
+++ b/cpp/src/IcePack/ServerAdapterI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerBuilder.cpp b/cpp/src/IcePack/ServerBuilder.cpp
index fd2c6788873..3bc514c5d7e 100644
--- a/cpp/src/IcePack/ServerBuilder.cpp
+++ b/cpp/src/IcePack/ServerBuilder.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerBuilder.h b/cpp/src/IcePack/ServerBuilder.h
index d38f4ef0e2e..bd7f1c3d9e0 100644
--- a/cpp/src/IcePack/ServerBuilder.h
+++ b/cpp/src/IcePack/ServerBuilder.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerDeployerI.cpp b/cpp/src/IcePack/ServerDeployerI.cpp
index e5da4cc7304..d8c2cbacb71 100644
--- a/cpp/src/IcePack/ServerDeployerI.cpp
+++ b/cpp/src/IcePack/ServerDeployerI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerDeployerI.h b/cpp/src/IcePack/ServerDeployerI.h
index 95320fa6d89..8ec07abbdad 100644
--- a/cpp/src/IcePack/ServerDeployerI.h
+++ b/cpp/src/IcePack/ServerDeployerI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerFactory.cpp b/cpp/src/IcePack/ServerFactory.cpp
index 6b42b038f88..a5264b4165e 100644
--- a/cpp/src/IcePack/ServerFactory.cpp
+++ b/cpp/src/IcePack/ServerFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerFactory.h b/cpp/src/IcePack/ServerFactory.h
index 39fc5205237..c6def711474 100644
--- a/cpp/src/IcePack/ServerFactory.h
+++ b/cpp/src/IcePack/ServerFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerI.cpp b/cpp/src/IcePack/ServerI.cpp
index 40b8925fbee..97411440f6a 100644
--- a/cpp/src/IcePack/ServerI.cpp
+++ b/cpp/src/IcePack/ServerI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerI.h b/cpp/src/IcePack/ServerI.h
index eaba3c89df3..3320fc39f7f 100644
--- a/cpp/src/IcePack/ServerI.h
+++ b/cpp/src/IcePack/ServerI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerRegistryI.cpp b/cpp/src/IcePack/ServerRegistryI.cpp
index b842d712878..0f5451a145a 100644
--- a/cpp/src/IcePack/ServerRegistryI.cpp
+++ b/cpp/src/IcePack/ServerRegistryI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServerRegistryI.h b/cpp/src/IcePack/ServerRegistryI.h
index e7270336da8..0cabd3f196b 100644
--- a/cpp/src/IcePack/ServerRegistryI.h
+++ b/cpp/src/IcePack/ServerRegistryI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServiceBuilder.cpp b/cpp/src/IcePack/ServiceBuilder.cpp
index f76eca00188..08528d69d1b 100644
--- a/cpp/src/IcePack/ServiceBuilder.cpp
+++ b/cpp/src/IcePack/ServiceBuilder.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/ServiceBuilder.h b/cpp/src/IcePack/ServiceBuilder.h
index 32fdb33001a..fc6901f1c98 100644
--- a/cpp/src/IcePack/ServiceBuilder.h
+++ b/cpp/src/IcePack/ServiceBuilder.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/TraceLevels.cpp b/cpp/src/IcePack/TraceLevels.cpp
index ce9c164cac3..e43e6e8900b 100644
--- a/cpp/src/IcePack/TraceLevels.cpp
+++ b/cpp/src/IcePack/TraceLevels.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePack/TraceLevels.h b/cpp/src/IcePack/TraceLevels.h
index 09979d75368..c3084733531 100644
--- a/cpp/src/IcePack/TraceLevels.h
+++ b/cpp/src/IcePack/TraceLevels.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp
index 3a78169ad98..34dc7a828f7 100644
--- a/cpp/src/IcePatch/Client.cpp
+++ b/cpp/src/IcePatch/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/ClientUtil.cpp b/cpp/src/IcePatch/ClientUtil.cpp
index dedadedf80c..327c0b239f4 100644
--- a/cpp/src/IcePatch/ClientUtil.cpp
+++ b/cpp/src/IcePatch/ClientUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/FileDescFactory.cpp b/cpp/src/IcePatch/FileDescFactory.cpp
index fd876e07c97..76d049aa0e1 100644
--- a/cpp/src/IcePatch/FileDescFactory.cpp
+++ b/cpp/src/IcePatch/FileDescFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/FileLocator.cpp b/cpp/src/IcePatch/FileLocator.cpp
index f5f09fc9c85..a7687512561 100644
--- a/cpp/src/IcePatch/FileLocator.cpp
+++ b/cpp/src/IcePatch/FileLocator.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/FileLocator.h b/cpp/src/IcePatch/FileLocator.h
index cf554ad86bf..3f6c159c29b 100644
--- a/cpp/src/IcePatch/FileLocator.h
+++ b/cpp/src/IcePatch/FileLocator.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/IcePatchI.cpp b/cpp/src/IcePatch/IcePatchI.cpp
index 9cce8373707..5600bbd54de 100644
--- a/cpp/src/IcePatch/IcePatchI.cpp
+++ b/cpp/src/IcePatch/IcePatchI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/IcePatchI.h b/cpp/src/IcePatch/IcePatchI.h
index 9a046883dc6..b3d6eed3dd2 100644
--- a/cpp/src/IcePatch/IcePatchI.h
+++ b/cpp/src/IcePatch/IcePatchI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile
index 4ccc41a60d9..97fb6345992 100644
--- a/cpp/src/IcePatch/Makefile
+++ b/cpp/src/IcePatch/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/IcePatch/Server.cpp b/cpp/src/IcePatch/Server.cpp
index 3d1e15d50d6..2547ec791ef 100644
--- a/cpp/src/IcePatch/Server.cpp
+++ b/cpp/src/IcePatch/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IcePatch/Util.cpp b/cpp/src/IcePatch/Util.cpp
index b82de93f42d..1484d1d2aed 100644
--- a/cpp/src/IcePatch/Util.cpp
+++ b/cpp/src/IcePatch/Util.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/BaseCerts.cpp b/cpp/src/IceSSL/BaseCerts.cpp
index 0d14ef7e54b..e9137ae79f1 100644
--- a/cpp/src/IceSSL/BaseCerts.cpp
+++ b/cpp/src/IceSSL/BaseCerts.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/BaseCerts.h b/cpp/src/IceSSL/BaseCerts.h
index 25ae7fc64b1..83f48baa34c 100644
--- a/cpp/src/IceSSL/BaseCerts.h
+++ b/cpp/src/IceSSL/BaseCerts.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/CertificateAuthority.cpp b/cpp/src/IceSSL/CertificateAuthority.cpp
index 31b59cf5563..24dbe9f9ffa 100644
--- a/cpp/src/IceSSL/CertificateAuthority.cpp
+++ b/cpp/src/IceSSL/CertificateAuthority.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/CertificateAuthority.h b/cpp/src/IceSSL/CertificateAuthority.h
index 966bd7d2b9c..1d9c4336148 100644
--- a/cpp/src/IceSSL/CertificateAuthority.h
+++ b/cpp/src/IceSSL/CertificateAuthority.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/CertificateDesc.cpp b/cpp/src/IceSSL/CertificateDesc.cpp
index d7be4a47eb4..f5d06c6f336 100644
--- a/cpp/src/IceSSL/CertificateDesc.cpp
+++ b/cpp/src/IceSSL/CertificateDesc.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/CertificateDesc.h b/cpp/src/IceSSL/CertificateDesc.h
index ea32f56ec2c..3396efb8eda 100644
--- a/cpp/src/IceSSL/CertificateDesc.h
+++ b/cpp/src/IceSSL/CertificateDesc.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp
index b6bc3641e59..9c86132a38e 100644
--- a/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp
+++ b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ClientContext.cpp b/cpp/src/IceSSL/ClientContext.cpp
index 282c5e05ef7..95331f60d1c 100644
--- a/cpp/src/IceSSL/ClientContext.cpp
+++ b/cpp/src/IceSSL/ClientContext.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ClientContext.h b/cpp/src/IceSSL/ClientContext.h
index 1e49dfffeca..3e1308d52de 100644
--- a/cpp/src/IceSSL/ClientContext.h
+++ b/cpp/src/IceSSL/ClientContext.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ConfigParser.cpp b/cpp/src/IceSSL/ConfigParser.cpp
index 463cd4d7d83..f23ff9bafa8 100644
--- a/cpp/src/IceSSL/ConfigParser.cpp
+++ b/cpp/src/IceSSL/ConfigParser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ConfigParser.h b/cpp/src/IceSSL/ConfigParser.h
index 23c8f1affd0..a42f7ba2e0c 100644
--- a/cpp/src/IceSSL/ConfigParser.h
+++ b/cpp/src/IceSSL/ConfigParser.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ConfigParserErrorReporter.cpp b/cpp/src/IceSSL/ConfigParserErrorReporter.cpp
index 01356a62f4e..8dd4cbd4325 100644
--- a/cpp/src/IceSSL/ConfigParserErrorReporter.cpp
+++ b/cpp/src/IceSSL/ConfigParserErrorReporter.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ConfigParserErrorReporter.h b/cpp/src/IceSSL/ConfigParserErrorReporter.h
index 4e122071608..0203f4d6791 100644
--- a/cpp/src/IceSSL/ConfigParserErrorReporter.h
+++ b/cpp/src/IceSSL/ConfigParserErrorReporter.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/Context.cpp b/cpp/src/IceSSL/Context.cpp
index 660ef2b796f..0d8da2ba191 100644
--- a/cpp/src/IceSSL/Context.cpp
+++ b/cpp/src/IceSSL/Context.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/Context.h b/cpp/src/IceSSL/Context.h
index d5db46761df..cb392e83353 100644
--- a/cpp/src/IceSSL/Context.h
+++ b/cpp/src/IceSSL/Context.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ContextF.h b/cpp/src/IceSSL/ContextF.h
index 8609db1aa5c..df93341834f 100644
--- a/cpp/src/IceSSL/ContextF.h
+++ b/cpp/src/IceSSL/ContextF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/Convert.cpp b/cpp/src/IceSSL/Convert.cpp
index 42e52e79a30..b1e44cd5aab 100644
--- a/cpp/src/IceSSL/Convert.cpp
+++ b/cpp/src/IceSSL/Convert.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/Convert.h b/cpp/src/IceSSL/Convert.h
index 03308a6472c..ef60fe0e1d3 100644
--- a/cpp/src/IceSSL/Convert.h
+++ b/cpp/src/IceSSL/Convert.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/DHParams.cpp b/cpp/src/IceSSL/DHParams.cpp
index ada69a5ef77..e59f9444381 100644
--- a/cpp/src/IceSSL/DHParams.cpp
+++ b/cpp/src/IceSSL/DHParams.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/DHParams.h b/cpp/src/IceSSL/DHParams.h
index d75891e5c5e..f412658694d 100644
--- a/cpp/src/IceSSL/DHParams.h
+++ b/cpp/src/IceSSL/DHParams.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/DHParamsF.h b/cpp/src/IceSSL/DHParamsF.h
index 05b804ff9e6..1260366e579 100644
--- a/cpp/src/IceSSL/DHParamsF.h
+++ b/cpp/src/IceSSL/DHParamsF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/DefaultCertificateVerifier.cpp b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp
index 54429e0a85b..b917fcec30f 100644
--- a/cpp/src/IceSSL/DefaultCertificateVerifier.cpp
+++ b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/DefaultCertificateVerifier.h b/cpp/src/IceSSL/DefaultCertificateVerifier.h
index 93b76303e5e..ee3a5e7ed34 100644
--- a/cpp/src/IceSSL/DefaultCertificateVerifier.h
+++ b/cpp/src/IceSSL/DefaultCertificateVerifier.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/GeneralConfig.cpp b/cpp/src/IceSSL/GeneralConfig.cpp
index d18eeb72ce0..c08aaf9b8df 100644
--- a/cpp/src/IceSSL/GeneralConfig.cpp
+++ b/cpp/src/IceSSL/GeneralConfig.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/GeneralConfig.h b/cpp/src/IceSSL/GeneralConfig.h
index 46363669608..675d53d9dba 100644
--- a/cpp/src/IceSSL/GeneralConfig.h
+++ b/cpp/src/IceSSL/GeneralConfig.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile
index bbc7e80be3b..80d1cb19d79 100644
--- a/cpp/src/IceSSL/Makefile
+++ b/cpp/src/IceSSL/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/IceSSL/OpenSSL.h b/cpp/src/IceSSL/OpenSSL.h
index 09c101619f5..4a0331629b5 100644
--- a/cpp/src/IceSSL/OpenSSL.h
+++ b/cpp/src/IceSSL/OpenSSL.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/OpenSSLJanitors.cpp b/cpp/src/IceSSL/OpenSSLJanitors.cpp
index e6ec58d97ed..0a69b37fc76 100644
--- a/cpp/src/IceSSL/OpenSSLJanitors.cpp
+++ b/cpp/src/IceSSL/OpenSSLJanitors.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/OpenSSLJanitors.h b/cpp/src/IceSSL/OpenSSLJanitors.h
index 39fc97408b7..361e8f9f433 100644
--- a/cpp/src/IceSSL/OpenSSLJanitors.h
+++ b/cpp/src/IceSSL/OpenSSLJanitors.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 09a957d605a..3bfbba484bd 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.h b/cpp/src/IceSSL/OpenSSLPluginI.h
index db35fd59b0b..46c6f6a8b26 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.h
+++ b/cpp/src/IceSSL/OpenSSLPluginI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/OpenSSLPluginIF.h b/cpp/src/IceSSL/OpenSSLPluginIF.h
index 959e5e0a81d..76b1e1da88a 100644
--- a/cpp/src/IceSSL/OpenSSLPluginIF.h
+++ b/cpp/src/IceSSL/OpenSSLPluginIF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/OpenSSLUtils.cpp b/cpp/src/IceSSL/OpenSSLUtils.cpp
index 207c01f73c3..b69739dd010 100644
--- a/cpp/src/IceSSL/OpenSSLUtils.cpp
+++ b/cpp/src/IceSSL/OpenSSLUtils.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/OpenSSLUtils.h b/cpp/src/IceSSL/OpenSSLUtils.h
index 48b1c29be28..70a8df6c97f 100644
--- a/cpp/src/IceSSL/OpenSSLUtils.h
+++ b/cpp/src/IceSSL/OpenSSLUtils.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp
index c37b0ccdcb4..a061a3fde58 100644
--- a/cpp/src/IceSSL/RSACertificateGen.cpp
+++ b/cpp/src/IceSSL/RSACertificateGen.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/RSAKeyPair.cpp b/cpp/src/IceSSL/RSAKeyPair.cpp
index 98f264bca80..f3f4933789d 100644
--- a/cpp/src/IceSSL/RSAKeyPair.cpp
+++ b/cpp/src/IceSSL/RSAKeyPair.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/RSAPrivateKey.cpp b/cpp/src/IceSSL/RSAPrivateKey.cpp
index b8650ae1487..944fd581cf3 100644
--- a/cpp/src/IceSSL/RSAPrivateKey.cpp
+++ b/cpp/src/IceSSL/RSAPrivateKey.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/RSAPublicKey.cpp b/cpp/src/IceSSL/RSAPublicKey.cpp
index 1fe87a890ce..0321f38c831 100644
--- a/cpp/src/IceSSL/RSAPublicKey.cpp
+++ b/cpp/src/IceSSL/RSAPublicKey.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ServerContext.cpp b/cpp/src/IceSSL/ServerContext.cpp
index 69bc6cc5ac3..ae025a0af64 100644
--- a/cpp/src/IceSSL/ServerContext.cpp
+++ b/cpp/src/IceSSL/ServerContext.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/ServerContext.h b/cpp/src/IceSSL/ServerContext.h
index c251f7bf074..5e802d84dbf 100644
--- a/cpp/src/IceSSL/ServerContext.h
+++ b/cpp/src/IceSSL/ServerContext.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SingleCertificateVerifier.cpp b/cpp/src/IceSSL/SingleCertificateVerifier.cpp
index 91bfd9e35e7..ab6f87c698b 100644
--- a/cpp/src/IceSSL/SingleCertificateVerifier.cpp
+++ b/cpp/src/IceSSL/SingleCertificateVerifier.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SingleCertificateVerifier.h b/cpp/src/IceSSL/SingleCertificateVerifier.h
index 10fb3e8160e..ce586abe202 100644
--- a/cpp/src/IceSSL/SingleCertificateVerifier.h
+++ b/cpp/src/IceSSL/SingleCertificateVerifier.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslAcceptor.cpp b/cpp/src/IceSSL/SslAcceptor.cpp
index 053302bd515..dc0b6665041 100644
--- a/cpp/src/IceSSL/SslAcceptor.cpp
+++ b/cpp/src/IceSSL/SslAcceptor.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslAcceptor.h b/cpp/src/IceSSL/SslAcceptor.h
index 0c27108b9e3..2582c10575e 100644
--- a/cpp/src/IceSSL/SslAcceptor.h
+++ b/cpp/src/IceSSL/SslAcceptor.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslClientTransceiver.cpp b/cpp/src/IceSSL/SslClientTransceiver.cpp
index 395e8cbce0e..045b402a6f7 100644
--- a/cpp/src/IceSSL/SslClientTransceiver.cpp
+++ b/cpp/src/IceSSL/SslClientTransceiver.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslClientTransceiver.h b/cpp/src/IceSSL/SslClientTransceiver.h
index 42dccf2d6ec..e82943e7b39 100644
--- a/cpp/src/IceSSL/SslClientTransceiver.h
+++ b/cpp/src/IceSSL/SslClientTransceiver.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslConnector.cpp b/cpp/src/IceSSL/SslConnector.cpp
index ae5cfa38495..42f57f351c0 100644
--- a/cpp/src/IceSSL/SslConnector.cpp
+++ b/cpp/src/IceSSL/SslConnector.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslConnector.h b/cpp/src/IceSSL/SslConnector.h
index d2d7de66ca4..c5ec766b84a 100644
--- a/cpp/src/IceSSL/SslConnector.h
+++ b/cpp/src/IceSSL/SslConnector.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslEndpoint.cpp b/cpp/src/IceSSL/SslEndpoint.cpp
index 98ed5139767..f3886c2a93e 100644
--- a/cpp/src/IceSSL/SslEndpoint.cpp
+++ b/cpp/src/IceSSL/SslEndpoint.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslEndpoint.h b/cpp/src/IceSSL/SslEndpoint.h
index b0c8056f45f..0b611d4c5c6 100644
--- a/cpp/src/IceSSL/SslEndpoint.h
+++ b/cpp/src/IceSSL/SslEndpoint.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslException.cpp b/cpp/src/IceSSL/SslException.cpp
index 20602e56111..f7f76e42cc4 100644
--- a/cpp/src/IceSSL/SslException.cpp
+++ b/cpp/src/IceSSL/SslException.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslServerTransceiver.cpp b/cpp/src/IceSSL/SslServerTransceiver.cpp
index 8f9fd6be730..91c44421278 100644
--- a/cpp/src/IceSSL/SslServerTransceiver.cpp
+++ b/cpp/src/IceSSL/SslServerTransceiver.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslServerTransceiver.h b/cpp/src/IceSSL/SslServerTransceiver.h
index 91e55cedc82..8cf4a0baa2f 100644
--- a/cpp/src/IceSSL/SslServerTransceiver.h
+++ b/cpp/src/IceSSL/SslServerTransceiver.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslTransceiver.cpp b/cpp/src/IceSSL/SslTransceiver.cpp
index a71f8d349f8..30ae5ba54b2 100644
--- a/cpp/src/IceSSL/SslTransceiver.cpp
+++ b/cpp/src/IceSSL/SslTransceiver.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslTransceiver.h b/cpp/src/IceSSL/SslTransceiver.h
index 28f0507e8cd..7af6f5f2f37 100644
--- a/cpp/src/IceSSL/SslTransceiver.h
+++ b/cpp/src/IceSSL/SslTransceiver.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/SslTransceiverF.h b/cpp/src/IceSSL/SslTransceiverF.h
index f3ab60506f9..d830ea26d20 100644
--- a/cpp/src/IceSSL/SslTransceiverF.h
+++ b/cpp/src/IceSSL/SslTransceiverF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/TempCerts.cpp b/cpp/src/IceSSL/TempCerts.cpp
index 3fc4310d4fc..89e23a3fa0e 100644
--- a/cpp/src/IceSSL/TempCerts.cpp
+++ b/cpp/src/IceSSL/TempCerts.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/TempCerts.h b/cpp/src/IceSSL/TempCerts.h
index de8258aff8f..aadafad2f84 100644
--- a/cpp/src/IceSSL/TempCerts.h
+++ b/cpp/src/IceSSL/TempCerts.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/TraceLevels.cpp b/cpp/src/IceSSL/TraceLevels.cpp
index a00e5774cb0..d477057afb6 100644
--- a/cpp/src/IceSSL/TraceLevels.cpp
+++ b/cpp/src/IceSSL/TraceLevels.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/TraceLevels.h b/cpp/src/IceSSL/TraceLevels.h
index 3a51b2f2afd..66ebaa82dee 100644
--- a/cpp/src/IceSSL/TraceLevels.h
+++ b/cpp/src/IceSSL/TraceLevels.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceSSL/TraceLevelsF.h b/cpp/src/IceSSL/TraceLevelsF.h
index b7eeaac270e..a53bdb14883 100644
--- a/cpp/src/IceSSL/TraceLevelsF.h
+++ b/cpp/src/IceSSL/TraceLevelsF.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 6a91468c018..f443121d523 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Flushable.h b/cpp/src/IceStorm/Flushable.h
index 924f4f71cd0..1fa2813d017 100644
--- a/cpp/src/IceStorm/Flushable.h
+++ b/cpp/src/IceStorm/Flushable.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Flusher.cpp b/cpp/src/IceStorm/Flusher.cpp
index 385e7533d31..ca7544545af 100644
--- a/cpp/src/IceStorm/Flusher.cpp
+++ b/cpp/src/IceStorm/Flusher.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Flusher.h b/cpp/src/IceStorm/Flusher.h
index 1fb96daeec5..9569f614e47 100644
--- a/cpp/src/IceStorm/Flusher.h
+++ b/cpp/src/IceStorm/Flusher.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y
index 7bfe918ed6d..df8c20408f8 100644
--- a/cpp/src/IceStorm/Grammar.y
+++ b/cpp/src/IceStorm/Grammar.y
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice
index 3e4d9ca9946..2e929219443 100644
--- a/cpp/src/IceStorm/IceStormInternal.ice
+++ b/cpp/src/IceStorm/IceStormInternal.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/LinkDB.ice b/cpp/src/IceStorm/LinkDB.ice
index c7bdb3c81ee..734307fa54e 100644
--- a/cpp/src/IceStorm/LinkDB.ice
+++ b/cpp/src/IceStorm/LinkDB.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/LinkSubscriber.cpp b/cpp/src/IceStorm/LinkSubscriber.cpp
index 3fbf01b321d..d8680a47975 100644
--- a/cpp/src/IceStorm/LinkSubscriber.cpp
+++ b/cpp/src/IceStorm/LinkSubscriber.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/LinkSubscriber.h b/cpp/src/IceStorm/LinkSubscriber.h
index 125bb918766..88d6e8224c1 100644
--- a/cpp/src/IceStorm/LinkSubscriber.h
+++ b/cpp/src/IceStorm/LinkSubscriber.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 67191a35036..2b52a517467 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/IceStorm/OnewayBatchSubscriber.cpp b/cpp/src/IceStorm/OnewayBatchSubscriber.cpp
index 345c94b7b80..e97db5d6bb1 100644
--- a/cpp/src/IceStorm/OnewayBatchSubscriber.cpp
+++ b/cpp/src/IceStorm/OnewayBatchSubscriber.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/OnewayBatchSubscriber.h b/cpp/src/IceStorm/OnewayBatchSubscriber.h
index b1c9e59cd6b..8d2bb3b8ef4 100644
--- a/cpp/src/IceStorm/OnewayBatchSubscriber.h
+++ b/cpp/src/IceStorm/OnewayBatchSubscriber.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/OnewaySubscriber.cpp b/cpp/src/IceStorm/OnewaySubscriber.cpp
index df14ff6a622..af1e528b772 100644
--- a/cpp/src/IceStorm/OnewaySubscriber.cpp
+++ b/cpp/src/IceStorm/OnewaySubscriber.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/OnewaySubscriber.h b/cpp/src/IceStorm/OnewaySubscriber.h
index 36bf28c423f..f6b87e37c48 100644
--- a/cpp/src/IceStorm/OnewaySubscriber.h
+++ b/cpp/src/IceStorm/OnewaySubscriber.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index ba023b6429b..f28fbc33fd7 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index da34068fbc1..d4cef25f84e 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l
index 4cfdcd13f40..71bf74e2deb 100644
--- a/cpp/src/IceStorm/Scanner.l
+++ b/cpp/src/IceStorm/Scanner.l
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index 0f1dd634f28..caa6ba3a505 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index b31e7467442..34209cb11bb 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h
index 9f33abf0547..6a59c1c9b24 100644
--- a/cpp/src/IceStorm/Subscriber.h
+++ b/cpp/src/IceStorm/Subscriber.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/SubscriberFactory.cpp b/cpp/src/IceStorm/SubscriberFactory.cpp
index 4e6c38727c3..268eb7ed758 100644
--- a/cpp/src/IceStorm/SubscriberFactory.cpp
+++ b/cpp/src/IceStorm/SubscriberFactory.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/SubscriberFactory.h b/cpp/src/IceStorm/SubscriberFactory.h
index af5c9375b11..d23c82a2b40 100644
--- a/cpp/src/IceStorm/SubscriberFactory.h
+++ b/cpp/src/IceStorm/SubscriberFactory.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index 9528472335a..11bbe13e051 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h
index 1830dab3572..90b138527f5 100644
--- a/cpp/src/IceStorm/TopicI.h
+++ b/cpp/src/IceStorm/TopicI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index 05d942342e8..504e3e240b9 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h
index ccb841755c8..4582b82f9ef 100644
--- a/cpp/src/IceStorm/TopicManagerI.h
+++ b/cpp/src/IceStorm/TopicManagerI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp
index c6ff8c65e90..7f9ba62a457 100644
--- a/cpp/src/IceStorm/TraceLevels.cpp
+++ b/cpp/src/IceStorm/TraceLevels.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h
index 281845e1232..feac914d0c9 100644
--- a/cpp/src/IceStorm/TraceLevels.h
+++ b/cpp/src/IceStorm/TraceLevels.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/WeightedGraph.cpp b/cpp/src/IceStorm/WeightedGraph.cpp
index 180d73db950..e5b618b24ee 100644
--- a/cpp/src/IceStorm/WeightedGraph.cpp
+++ b/cpp/src/IceStorm/WeightedGraph.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceStorm/WeightedGraph.h b/cpp/src/IceStorm/WeightedGraph.h
index 854b857f269..fda6f5f6499 100644
--- a/cpp/src/IceStorm/WeightedGraph.h
+++ b/cpp/src/IceStorm/WeightedGraph.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/Base64.cpp b/cpp/src/IceUtil/Base64.cpp
index dc20a3dc1c3..60cdca3738d 100644
--- a/cpp/src/IceUtil/Base64.cpp
+++ b/cpp/src/IceUtil/Base64.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp
index 35041d84ef4..404a06165f3 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/IceUtil/Cond.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index fafd1b5b90d..8767ea33173 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index a334b6c0515..1279ad7740f 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile
index 82a53c98c0a..d31385a44d1 100644
--- a/cpp/src/IceUtil/Makefile
+++ b/cpp/src/IceUtil/Makefile
@@ -1,9 +1,13 @@
# ********************************************************************** #
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index d77b5d7f1f3..79cbb35dc21 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/RWRecMutex.cpp b/cpp/src/IceUtil/RWRecMutex.cpp
index d75ba8c03bf..6092b7e802d 100644
--- a/cpp/src/IceUtil/RWRecMutex.cpp
+++ b/cpp/src/IceUtil/RWRecMutex.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 27270e119ac..1c98f1aaacb 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp
index 7267a691663..4620a7e2f4a 100644
--- a/cpp/src/IceUtil/Thread.cpp
+++ b/cpp/src/IceUtil/Thread.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 7f7a0074acf..54d25dd8b36 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index 528d4a22fb7..3413a0d69b0 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 7b2ea932377..e3794c4d225 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp
index b39c0514ec6..99888300613 100644
--- a/cpp/src/IceUtil/Unicode.cpp
+++ b/cpp/src/IceUtil/Unicode.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile
index 456734d0df8..82bb29475df 100644
--- a/cpp/src/IceXML/Makefile
+++ b/cpp/src/IceXML/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/IceXML/StreamI.cpp b/cpp/src/IceXML/StreamI.cpp
index 3381cbb535d..e73867cc283 100644
--- a/cpp/src/IceXML/StreamI.cpp
+++ b/cpp/src/IceXML/StreamI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index 1e03afcb751..4256dd1e0a1 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 68535932c04..d1b41fcd068 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
@@ -63,11 +67,15 @@ Slice::printHeader(Output& out)
static const char* header =
"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2001\n"
+"// Copyright (c) 2002\n"
"// ZeroC, Inc.\n"
-"// Huntsville, AL, USA\n"
+"// Billerica, MA, USA\n"
+"//\n"
+"// All Rights Reserved.\n"
"//\n"
-"// All Rights Reserved\n"
+"// Ice is free software; you can redistribute it and/or modify it under\n"
+"// the terms of the GNU General Public License version 2 as published by\n"
+"// the Free Software Foundation.\n"
"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index e2a7531bfdb..bc86e98cc0b 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index 9b3278cec11..4a95f9e5f9f 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3fbe1d0bd02..cc4b6ed89a6 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
@@ -1846,9 +1850,14 @@ Slice::JavaGenerator::printHeader()
"//\n"
"// Copyright (c) 2002\n"
"// ZeroC, Inc.\n"
-"// Huntsville, AL, USA\n"
+"// Billerica, MA, USA\n"
+"//\n"
+"// All Rights Reserved.\n"
"//\n"
-"// All Rights Reserved\n"
+"// Ice is free software; you can redistribute it and/or modify it under\n"
+"// the terms of the GNU General Public License version 2 as published by\n"
+"// the Free Software Foundation.\n"
+"// All Rights Reserved.
"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
index 67453fec851..9788f4caf57 100644
--- a/cpp/src/Slice/Makefile
+++ b/cpp/src/Slice/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 3c951cc56a6..5655da7e421 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 66bb13f1133..c01b42d234f 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/XMLTransform/ErrorReporter.cpp b/cpp/src/XMLTransform/ErrorReporter.cpp
index a8a55d356d7..d9e6ad09b78 100644
--- a/cpp/src/XMLTransform/ErrorReporter.cpp
+++ b/cpp/src/XMLTransform/ErrorReporter.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/XMLTransform/ErrorReporter.h b/cpp/src/XMLTransform/ErrorReporter.h
index 24362213cec..97af6784d93 100644
--- a/cpp/src/XMLTransform/ErrorReporter.h
+++ b/cpp/src/XMLTransform/ErrorReporter.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/XMLTransform/Makefile b/cpp/src/XMLTransform/Makefile
index 2637ec87389..dac0b424f47 100644
--- a/cpp/src/XMLTransform/Makefile
+++ b/cpp/src/XMLTransform/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/XMLTransform/TransformDB.cpp b/cpp/src/XMLTransform/TransformDB.cpp
index 3bf532214de..85b08cf2cb5 100644
--- a/cpp/src/XMLTransform/TransformDB.cpp
+++ b/cpp/src/XMLTransform/TransformDB.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/XMLTransform/XMLTransform.cpp b/cpp/src/XMLTransform/XMLTransform.cpp
index 0bf73077120..59199537084 100644
--- a/cpp/src/XMLTransform/XMLTransform.cpp
+++ b/cpp/src/XMLTransform/XMLTransform.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/Admin.cpp b/cpp/src/Yellow/Admin.cpp
index 381d6358492..cc0b272d4bc 100644
--- a/cpp/src/Yellow/Admin.cpp
+++ b/cpp/src/Yellow/Admin.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/AdminI.cpp b/cpp/src/Yellow/AdminI.cpp
index b1c2395ed7e..c997836c2f2 100644
--- a/cpp/src/Yellow/AdminI.cpp
+++ b/cpp/src/Yellow/AdminI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/AdminI.h b/cpp/src/Yellow/AdminI.h
index a84f7bbaec0..7bbd94b3029 100644
--- a/cpp/src/Yellow/AdminI.h
+++ b/cpp/src/Yellow/AdminI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/Grammar.y b/cpp/src/Yellow/Grammar.y
index 726653346b4..fbeb427bee9 100644
--- a/cpp/src/Yellow/Grammar.y
+++ b/cpp/src/Yellow/Grammar.y
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/Makefile b/cpp/src/Yellow/Makefile
index aa116f1c2b3..0fe99c933a5 100644
--- a/cpp/src/Yellow/Makefile
+++ b/cpp/src/Yellow/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/Yellow/Parser.cpp b/cpp/src/Yellow/Parser.cpp
index 6b5e947a71b..7a93d4626b4 100644
--- a/cpp/src/Yellow/Parser.cpp
+++ b/cpp/src/Yellow/Parser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/Parser.h b/cpp/src/Yellow/Parser.h
index 116c42dc6c8..9cd57a259dd 100644
--- a/cpp/src/Yellow/Parser.h
+++ b/cpp/src/Yellow/Parser.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/QueryI.cpp b/cpp/src/Yellow/QueryI.cpp
index f4dec991980..4db848057ae 100644
--- a/cpp/src/Yellow/QueryI.cpp
+++ b/cpp/src/Yellow/QueryI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/QueryI.h b/cpp/src/Yellow/QueryI.h
index 88d3fa70d2c..07db1ba5b92 100644
--- a/cpp/src/Yellow/QueryI.h
+++ b/cpp/src/Yellow/QueryI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/Scanner.l b/cpp/src/Yellow/Scanner.l
index 23875583a8e..7c92a9b6a96 100644
--- a/cpp/src/Yellow/Scanner.l
+++ b/cpp/src/Yellow/Scanner.l
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/Yellow/Service.cpp b/cpp/src/Yellow/Service.cpp
index a00feffd15e..69be947d1e5 100644
--- a/cpp/src/Yellow/Service.cpp
+++ b/cpp/src/Yellow/Service.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index a0c6741f5d8..adf2a365611 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index b09a7fa4f5c..02e5490595d 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 373685b57c1..298e9ef68fa 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index 58f23cdda9f..2318b94e9a6 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index 6df1cb808ce..f654381a9e6 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
@@ -728,7 +732,7 @@ Slice::Gen::printHeader()
"**********************************************************************\n"
"Copyright (c) 2001\n"
"ZeroC, Inc.\n"
-"Huntsville, AL, USA\n"
+"Billerica, MA, USA\n"
"\n"
"All Rights Reserved\n"
"\n"
diff --git a/cpp/src/slice2docbook/Gen.h b/cpp/src/slice2docbook/Gen.h
index b907e448f9c..aefa95d0991 100644
--- a/cpp/src/slice2docbook/Gen.h
+++ b/cpp/src/slice2docbook/Gen.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp
index f3070872d7e..7073be2d328 100644
--- a/cpp/src/slice2docbook/Main.cpp
+++ b/cpp/src/slice2docbook/Main.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2docbook/Makefile b/cpp/src/slice2docbook/Makefile
index 862bb04391b..c9e1e7bbf72 100644
--- a/cpp/src/slice2docbook/Makefile
+++ b/cpp/src/slice2docbook/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 6132c26ddba..cf538e1d0ce 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
index a26d760afc7..fde26d97b39 100644
--- a/cpp/src/slice2freeze/Makefile
+++ b/cpp/src/slice2freeze/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 172680c8dbf..711fa75e43b 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
index b74b64c4472..67d14eab4b3 100644
--- a/cpp/src/slice2freezej/Makefile
+++ b/cpp/src/slice2freezej/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 359e93deae0..ec2382448ec 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 7562fb9e7ec..22c4c9b46de 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 058c897279e..41a2fe7a8db 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index 4babdd2cdb0..78d285af88a 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/slice2wsdl/Gen.cpp b/cpp/src/slice2wsdl/Gen.cpp
index 8ac617afa97..631ee3f96b6 100644
--- a/cpp/src/slice2wsdl/Gen.cpp
+++ b/cpp/src/slice2wsdl/Gen.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
@@ -172,11 +176,15 @@ Slice::Gen::printHeader(XMLOutput& O)
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
"**********************************************************************\n"
-"Copyright (c) 2001\n"
+"Copyright (c) 2002\n"
"ZeroC, Inc.\n"
-"Huntsville, AL, USA\n"
+"Billerica, MA, USA\n"
+"\n"
+"All Rights Reserved.\n"
"\n"
-"All Rights Reserved\n"
+"Ice is free software; you can redistribute it and/or modify it under\n"
+"the terms of the GNU General Public License version 2 as published by\n"
+"the Free Software Foundation.\n"
"\n"
"Generated by the `slice2wsdl' converter\n"
"**********************************************************************\n"
diff --git a/cpp/src/slice2wsdl/Gen.h b/cpp/src/slice2wsdl/Gen.h
index de6d01ba977..b320388e9a4 100644
--- a/cpp/src/slice2wsdl/Gen.h
+++ b/cpp/src/slice2wsdl/Gen.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2wsdl/Main.cpp b/cpp/src/slice2wsdl/Main.cpp
index a6eb6d2f461..0277edec144 100644
--- a/cpp/src/slice2wsdl/Main.cpp
+++ b/cpp/src/slice2wsdl/Main.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2wsdl/Makefile b/cpp/src/slice2wsdl/Makefile
index d4a556218fb..5d6ecabc564 100644
--- a/cpp/src/slice2wsdl/Makefile
+++ b/cpp/src/slice2wsdl/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/slice2xsd/Gen.cpp b/cpp/src/slice2xsd/Gen.cpp
index b339b5b17d9..b7e71e263d0 100644
--- a/cpp/src/slice2xsd/Gen.cpp
+++ b/cpp/src/slice2xsd/Gen.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
@@ -458,11 +462,15 @@ Slice::Gen::printHeader()
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!--\n"
"**********************************************************************\n"
-"Copyright (c) 2001\n"
+"Copyright (c) 2002\n"
"ZeroC, Inc.\n"
-"Huntsville, AL, USA\n"
+"Billerica, MA, USA\n"
+"\n"
+"All Rights Reserved.\n"
"\n"
-"All Rights Reserved\n"
+"Ice is free software; you can redistribute it and/or modify it under\n"
+"the terms of the GNU General Public License version 2 as published by\n"
+"the Free Software Foundation.\n"
"\n"
"Generated by the `slice2xsd' converter\n"
"**********************************************************************\n"
diff --git a/cpp/src/slice2xsd/Gen.h b/cpp/src/slice2xsd/Gen.h
index 2cf0a58014c..92c9f3bcdaa 100644
--- a/cpp/src/slice2xsd/Gen.h
+++ b/cpp/src/slice2xsd/Gen.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2xsd/Main.cpp b/cpp/src/slice2xsd/Main.cpp
index 75208c8a891..6fe7e772f2e 100644
--- a/cpp/src/slice2xsd/Main.cpp
+++ b/cpp/src/slice2xsd/Main.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/src/slice2xsd/Makefile b/cpp/src/slice2xsd/Makefile
index fb669d46818..c2a31adbea4 100644
--- a/cpp/src/slice2xsd/Makefile
+++ b/cpp/src/slice2xsd/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/src/slice2xsd/Validate.cpp b/cpp/src/slice2xsd/Validate.cpp
index 8d4d5a107e9..edd1cde663e 100644
--- a/cpp/src/slice2xsd/Validate.cpp
+++ b/cpp/src/slice2xsd/Validate.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile
index 1055bc61b92..b45bf1a6338 100644
--- a/cpp/test/Freeze/Makefile
+++ b/cpp/test/Freeze/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Freeze/complex/Client.cpp b/cpp/test/Freeze/complex/Client.cpp
index 2b47fe9e88e..0e191dd8a40 100644
--- a/cpp/test/Freeze/complex/Client.cpp
+++ b/cpp/test/Freeze/complex/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/complex/Complex.ice b/cpp/test/Freeze/complex/Complex.ice
index 193d82f3ce4..c7d613c74ad 100644
--- a/cpp/test/Freeze/complex/Complex.ice
+++ b/cpp/test/Freeze/complex/Complex.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/complex/Grammar.y b/cpp/test/Freeze/complex/Grammar.y
index d8d2d544148..527403d938f 100644
--- a/cpp/test/Freeze/complex/Grammar.y
+++ b/cpp/test/Freeze/complex/Grammar.y
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile
index 24afa2b0589..3c403eb7a69 100644
--- a/cpp/test/Freeze/complex/Makefile
+++ b/cpp/test/Freeze/complex/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Freeze/complex/NodeI.h b/cpp/test/Freeze/complex/NodeI.h
index 8ae5b3e7cfd..4bece6c4c31 100644
--- a/cpp/test/Freeze/complex/NodeI.h
+++ b/cpp/test/Freeze/complex/NodeI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/complex/Parser.cpp b/cpp/test/Freeze/complex/Parser.cpp
index cc7ca515cbe..e14eb0be0db 100644
--- a/cpp/test/Freeze/complex/Parser.cpp
+++ b/cpp/test/Freeze/complex/Parser.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/complex/Parser.h b/cpp/test/Freeze/complex/Parser.h
index 246b23423a3..1b6786ce3ef 100644
--- a/cpp/test/Freeze/complex/Parser.h
+++ b/cpp/test/Freeze/complex/Parser.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/complex/Scanner.l b/cpp/test/Freeze/complex/Scanner.l
index 220fd044284..8b690d5fcd0 100644
--- a/cpp/test/Freeze/complex/Scanner.l
+++ b/cpp/test/Freeze/complex/Scanner.l
@@ -4,9 +4,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index ce61aad3f14..10e50337def 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Freeze/cursor/Client.cpp b/cpp/test/Freeze/cursor/Client.cpp
index fa6bd2bb4a6..033ce1aecb8 100644
--- a/cpp/test/Freeze/cursor/Client.cpp
+++ b/cpp/test/Freeze/cursor/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/cursor/Makefile b/cpp/test/Freeze/cursor/Makefile
index 025fec64496..f35a6fafda3 100644
--- a/cpp/test/Freeze/cursor/Makefile
+++ b/cpp/test/Freeze/cursor/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Freeze/cursor/run.py b/cpp/test/Freeze/cursor/run.py
index 1ce91f819ba..3b29d87f78a 100755
--- a/cpp/test/Freeze/cursor/run.py
+++ b/cpp/test/Freeze/cursor/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp
index 46291680be2..8f944502135 100644
--- a/cpp/test/Freeze/dbmap/Client.cpp
+++ b/cpp/test/Freeze/dbmap/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile
index c88a0d3dbad..530f1c104f1 100644
--- a/cpp/test/Freeze/dbmap/Makefile
+++ b/cpp/test/Freeze/dbmap/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py
index f549b1a4f16..d3110bbaf90 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp
index f6f6bbf8dca..9de65373701 100644
--- a/cpp/test/Freeze/evictor/Client.cpp
+++ b/cpp/test/Freeze/evictor/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile
index d9c30749de6..51e453d9c46 100644
--- a/cpp/test/Freeze/evictor/Makefile
+++ b/cpp/test/Freeze/evictor/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp
index 1bd00a6d5ea..b9d8cfdbce5 100644
--- a/cpp/test/Freeze/evictor/Server.cpp
+++ b/cpp/test/Freeze/evictor/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/evictor/Test.ice b/cpp/test/Freeze/evictor/Test.ice
index 2c4e5cf999c..3867a5beea2 100644
--- a/cpp/test/Freeze/evictor/Test.ice
+++ b/cpp/test/Freeze/evictor/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp
index 2c68325bab2..08fbfdddadd 100644
--- a/cpp/test/Freeze/evictor/TestI.cpp
+++ b/cpp/test/Freeze/evictor/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/evictor/TestI.h b/cpp/test/Freeze/evictor/TestI.h
index b4e4e92e410..02b5cdc05c5 100644
--- a/cpp/test/Freeze/evictor/TestI.h
+++ b/cpp/test/Freeze/evictor/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py
index 9413699939c..918d826265e 100755
--- a/cpp/test/Freeze/evictor/run.py
+++ b/cpp/test/Freeze/evictor/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Glacier/Makefile b/cpp/test/Glacier/Makefile
index e64db1a07c3..8961111f655 100644
--- a/cpp/test/Glacier/Makefile
+++ b/cpp/test/Glacier/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Glacier/starter/Callback.ice b/cpp/test/Glacier/starter/Callback.ice
index 2069fdaf944..030b528fd85 100644
--- a/cpp/test/Glacier/starter/Callback.ice
+++ b/cpp/test/Glacier/starter/Callback.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Glacier/starter/CallbackI.cpp b/cpp/test/Glacier/starter/CallbackI.cpp
index 1999284544f..340da9387a0 100644
--- a/cpp/test/Glacier/starter/CallbackI.cpp
+++ b/cpp/test/Glacier/starter/CallbackI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Glacier/starter/CallbackI.h b/cpp/test/Glacier/starter/CallbackI.h
index 7569c562c73..5c13384cda5 100644
--- a/cpp/test/Glacier/starter/CallbackI.h
+++ b/cpp/test/Glacier/starter/CallbackI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Glacier/starter/Client.cpp b/cpp/test/Glacier/starter/Client.cpp
index 46a02bf9487..64d42526f5a 100644
--- a/cpp/test/Glacier/starter/Client.cpp
+++ b/cpp/test/Glacier/starter/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Glacier/starter/Makefile b/cpp/test/Glacier/starter/Makefile
index 0f83dffa360..9e34ee5d62b 100644
--- a/cpp/test/Glacier/starter/Makefile
+++ b/cpp/test/Glacier/starter/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Glacier/starter/Server.cpp b/cpp/test/Glacier/starter/Server.cpp
index 7c2721bb5a9..d38af73ceaf 100644
--- a/cpp/test/Glacier/starter/Server.cpp
+++ b/cpp/test/Glacier/starter/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py
index b55c515a89c..b6c512a23ad 100755
--- a/cpp/test/Glacier/starter/run.py
+++ b/cpp/test/Glacier/starter/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile
index 3de39558320..05d15121a6f 100644
--- a/cpp/test/Ice/Makefile
+++ b/cpp/test/Ice/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index e8e7bd87816..c23f0dd90a5 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp
index a4b8ab472b4..5f5f7753831 100644
--- a/cpp/test/Ice/adapterDeactivation/Client.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index 89c839fffc9..4082a6345bb 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/Makefile b/cpp/test/Ice/adapterDeactivation/Makefile
index 9aec6579f71..4ecdf89225b 100644
--- a/cpp/test/Ice/adapterDeactivation/Makefile
+++ b/cpp/test/Ice/adapterDeactivation/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
index 200bd441672..521d5393583 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
index 396d5c6433c..c7a8ccdc528 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp
index ae48e687027..0cfcbc76920 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/Test.ice b/cpp/test/Ice/adapterDeactivation/Test.ice
index 0b31204bfac..3e808dba8e7 100644
--- a/cpp/test/Ice/adapterDeactivation/Test.ice
+++ b/cpp/test/Ice/adapterDeactivation/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp
index 3ccf1d858f5..d09ff7169de 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.h b/cpp/test/Ice/adapterDeactivation/TestI.h
index 354e554d415..cd3103bda47 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.h
+++ b/cpp/test/Ice/adapterDeactivation/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py
index 9a1a30e7a08..2e8b114c5e1 100755
--- a/cpp/test/Ice/adapterDeactivation/run.py
+++ b/cpp/test/Ice/adapterDeactivation/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 900c70b7345..17cc2a75195 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp
index 6d3bacc060f..db552522ccd 100644
--- a/cpp/test/Ice/exceptions/Client.cpp
+++ b/cpp/test/Ice/exceptions/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index 1e8a0bee00e..358450f5524 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/exceptions/Makefile b/cpp/test/Ice/exceptions/Makefile
index 23977de82fb..9ac36ea1b96 100644
--- a/cpp/test/Ice/exceptions/Makefile
+++ b/cpp/test/Ice/exceptions/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 3414fe8ebf5..380ca901e86 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice
index 449a222af7b..633836364ad 100644
--- a/cpp/test/Ice/exceptions/Test.ice
+++ b/cpp/test/Ice/exceptions/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp
index 09880747fa0..96c85dc794c 100644
--- a/cpp/test/Ice/exceptions/TestI.cpp
+++ b/cpp/test/Ice/exceptions/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/exceptions/TestI.h b/cpp/test/Ice/exceptions/TestI.h
index 2148a95ceea..675b73cceba 100644
--- a/cpp/test/Ice/exceptions/TestI.h
+++ b/cpp/test/Ice/exceptions/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py
index d3be9a0920a..0ea4236d31c 100755
--- a/cpp/test/Ice/exceptions/run.py
+++ b/cpp/test/Ice/exceptions/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index 5d3be706489..11393d05279 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp
index 97a62c8c1cb..04bf6870f52 100644
--- a/cpp/test/Ice/facets/Client.cpp
+++ b/cpp/test/Ice/facets/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp
index c4faed6abb3..9c386743c6f 100644
--- a/cpp/test/Ice/facets/Collocated.cpp
+++ b/cpp/test/Ice/facets/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/facets/Makefile b/cpp/test/Ice/facets/Makefile
index 23977de82fb..9ac36ea1b96 100644
--- a/cpp/test/Ice/facets/Makefile
+++ b/cpp/test/Ice/facets/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index b36b3901716..478f81db8c3 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice
index 4bf57f2e425..295646fc009 100644
--- a/cpp/test/Ice/facets/Test.ice
+++ b/cpp/test/Ice/facets/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/facets/TestI.cpp b/cpp/test/Ice/facets/TestI.cpp
index adedb593480..124f8dc689c 100644
--- a/cpp/test/Ice/facets/TestI.cpp
+++ b/cpp/test/Ice/facets/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/facets/TestI.h b/cpp/test/Ice/facets/TestI.h
index 80167b7026a..ee5f1de1bc1 100644
--- a/cpp/test/Ice/facets/TestI.h
+++ b/cpp/test/Ice/facets/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py
index abb272f95dd..59ac0173cc5 100755
--- a/cpp/test/Ice/facets/run.py
+++ b/cpp/test/Ice/facets/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index 1758277a116..67f95d25497 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/faultTolerance/Client.cpp b/cpp/test/Ice/faultTolerance/Client.cpp
index 187e829d653..9f6e6729754 100644
--- a/cpp/test/Ice/faultTolerance/Client.cpp
+++ b/cpp/test/Ice/faultTolerance/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/faultTolerance/Makefile b/cpp/test/Ice/faultTolerance/Makefile
index ba63fbee911..6abf6e53374 100644
--- a/cpp/test/Ice/faultTolerance/Makefile
+++ b/cpp/test/Ice/faultTolerance/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp
index 42b98687352..6c08aa25162 100644
--- a/cpp/test/Ice/faultTolerance/Server.cpp
+++ b/cpp/test/Ice/faultTolerance/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice
index ee2b81aa96b..e3d9e9c0fbd 100644
--- a/cpp/test/Ice/faultTolerance/Test.ice
+++ b/cpp/test/Ice/faultTolerance/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp
index 6cddfa07a43..0829715886d 100644
--- a/cpp/test/Ice/faultTolerance/TestI.cpp
+++ b/cpp/test/Ice/faultTolerance/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h
index 0a4e1249757..45c4218c853 100644
--- a/cpp/test/Ice/faultTolerance/TestI.h
+++ b/cpp/test/Ice/faultTolerance/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index 14f5400cff8..64d1f5a596e 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index e4289c16c9b..3c53b464b24 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp
index b31bb6eaed7..cbeb2e49369 100644
--- a/cpp/test/Ice/inheritance/Client.cpp
+++ b/cpp/test/Ice/inheritance/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 5a2d76d1e49..1022ed2237e 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/inheritance/Makefile b/cpp/test/Ice/inheritance/Makefile
index 23977de82fb..9ac36ea1b96 100644
--- a/cpp/test/Ice/inheritance/Makefile
+++ b/cpp/test/Ice/inheritance/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index eaacdc22639..9bb8a7730e3 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice
index ab3e1af96b5..444965bbb38 100644
--- a/cpp/test/Ice/inheritance/Test.ice
+++ b/cpp/test/Ice/inheritance/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp
index c60eec27dc5..76219ce6fab 100644
--- a/cpp/test/Ice/inheritance/TestI.cpp
+++ b/cpp/test/Ice/inheritance/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h
index da896de4a64..d755f08cff6 100644
--- a/cpp/test/Ice/inheritance/TestI.h
+++ b/cpp/test/Ice/inheritance/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py
index d16a62390cd..607e5f5860f 100755
--- a/cpp/test/Ice/inheritance/run.py
+++ b/cpp/test/Ice/inheritance/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index 6a55e840f61..2a90588a78a 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp
index 241ca1a391c..611aa676545 100644
--- a/cpp/test/Ice/location/Client.cpp
+++ b/cpp/test/Ice/location/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/Collocated.cpp b/cpp/test/Ice/location/Collocated.cpp
index 4174a33b2d9..1b881a89013 100644
--- a/cpp/test/Ice/location/Collocated.cpp
+++ b/cpp/test/Ice/location/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/Makefile b/cpp/test/Ice/location/Makefile
index cd8af562a56..2a43820bacb 100644
--- a/cpp/test/Ice/location/Makefile
+++ b/cpp/test/Ice/location/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp
index 361847ad185..c1c226c9642 100644
--- a/cpp/test/Ice/location/Server.cpp
+++ b/cpp/test/Ice/location/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp
index 4ff7d7280c2..3dbd9d47315 100644
--- a/cpp/test/Ice/location/ServerLocator.cpp
+++ b/cpp/test/Ice/location/ServerLocator.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h
index 74a5631d0f4..27870d5730c 100644
--- a/cpp/test/Ice/location/ServerLocator.h
+++ b/cpp/test/Ice/location/ServerLocator.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/Test.ice b/cpp/test/Ice/location/Test.ice
index 33b8214de05..bcc9d789877 100644
--- a/cpp/test/Ice/location/Test.ice
+++ b/cpp/test/Ice/location/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp
index 3e550f25295..bd432288d6b 100644
--- a/cpp/test/Ice/location/TestI.cpp
+++ b/cpp/test/Ice/location/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/TestI.h b/cpp/test/Ice/location/TestI.h
index e840d62ce16..95bbc0c0927 100644
--- a/cpp/test/Ice/location/TestI.h
+++ b/cpp/test/Ice/location/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py
index 4965c43c262..79ebc1fafa9 100755
--- a/cpp/test/Ice/location/run.py
+++ b/cpp/test/Ice/location/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/locationForward/AllTests.cpp b/cpp/test/Ice/locationForward/AllTests.cpp
index 78216604160..5e3e28a2c15 100644
--- a/cpp/test/Ice/locationForward/AllTests.cpp
+++ b/cpp/test/Ice/locationForward/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/locationForward/Client.cpp b/cpp/test/Ice/locationForward/Client.cpp
index 85342ac7957..d75483b04a4 100644
--- a/cpp/test/Ice/locationForward/Client.cpp
+++ b/cpp/test/Ice/locationForward/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/locationForward/Makefile b/cpp/test/Ice/locationForward/Makefile
index ba63fbee911..6abf6e53374 100644
--- a/cpp/test/Ice/locationForward/Makefile
+++ b/cpp/test/Ice/locationForward/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/locationForward/Server.cpp b/cpp/test/Ice/locationForward/Server.cpp
index 0e1f01bf21c..dcafdba2186 100644
--- a/cpp/test/Ice/locationForward/Server.cpp
+++ b/cpp/test/Ice/locationForward/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/locationForward/Test.ice b/cpp/test/Ice/locationForward/Test.ice
index 225b9b97776..4cb685b4aa2 100644
--- a/cpp/test/Ice/locationForward/Test.ice
+++ b/cpp/test/Ice/locationForward/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/locationForward/TestI.cpp b/cpp/test/Ice/locationForward/TestI.cpp
index 4e4e8391720..a44db53e673 100644
--- a/cpp/test/Ice/locationForward/TestI.cpp
+++ b/cpp/test/Ice/locationForward/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/locationForward/TestI.h b/cpp/test/Ice/locationForward/TestI.h
index 8d096c5b82d..64fd2649d6d 100644
--- a/cpp/test/Ice/locationForward/TestI.h
+++ b/cpp/test/Ice/locationForward/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/locationForward/run.py b/cpp/test/Ice/locationForward/run.py
index b2378348bfb..4b35d9b9da1 100755
--- a/cpp/test/Ice/locationForward/run.py
+++ b/cpp/test/Ice/locationForward/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index d4b8429d03b..7b57c7664a8 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 04351dc128f..297c370dc97 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index 2323207f6c3..d92080f1454 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/objects/Makefile b/cpp/test/Ice/objects/Makefile
index 23977de82fb..9ac36ea1b96 100644
--- a/cpp/test/Ice/objects/Makefile
+++ b/cpp/test/Ice/objects/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index 88ed0e98d74..5173bbaf340 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice
index 54a6827cc55..e5c1420fea9 100644
--- a/cpp/test/Ice/objects/Test.ice
+++ b/cpp/test/Ice/objects/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index c7ea1e13c5b..111017ea381 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h
index 176305b5fd3..0fd3e49eff9 100644
--- a/cpp/test/Ice/objects/TestI.h
+++ b/cpp/test/Ice/objects/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py
index df5c80dd149..b3049647a9e 100755
--- a/cpp/test/Ice/objects/run.py
+++ b/cpp/test/Ice/objects/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index aaadfbd34f1..e7b782f8158 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 4cbcb7681e4..8f6b8661e15 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index c5736a6ec12..eaffbfdc8a3 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/operations/Makefile b/cpp/test/Ice/operations/Makefile
index f222d5d24df..22e15cf477d 100644
--- a/cpp/test/Ice/operations/Makefile
+++ b/cpp/test/Ice/operations/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index 544748e1e4b..d92365e1911 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice
index 47a31cb9ce7..e749e3f2d12 100644
--- a/cpp/test/Ice/operations/Test.ice
+++ b/cpp/test/Ice/operations/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index 97205d8c617..e19b4cde42d 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h
index ee51d840ad5..30e7754c166 100644
--- a/cpp/test/Ice/operations/TestI.h
+++ b/cpp/test/Ice/operations/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 3b2fe3670ec..a5974fe29a7 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py
index 1263c494a8e..010ae0fcc40 100755
--- a/cpp/test/Ice/operations/run.py
+++ b/cpp/test/Ice/operations/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IcePack/Makefile b/cpp/test/IcePack/Makefile
index 4638c51bd3a..c24dddfca31 100644
--- a/cpp/test/IcePack/Makefile
+++ b/cpp/test/IcePack/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IcePack/deployer/AllTests.cpp b/cpp/test/IcePack/deployer/AllTests.cpp
index 93fccb76f43..8f1f7c7f847 100644
--- a/cpp/test/IcePack/deployer/AllTests.cpp
+++ b/cpp/test/IcePack/deployer/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/deployer/Client.cpp b/cpp/test/IcePack/deployer/Client.cpp
index 26da21b940e..5e5942c799c 100644
--- a/cpp/test/IcePack/deployer/Client.cpp
+++ b/cpp/test/IcePack/deployer/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile
index 85628d8b86d..9f6b65668fa 100644
--- a/cpp/test/IcePack/deployer/Makefile
+++ b/cpp/test/IcePack/deployer/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IcePack/deployer/Server.cpp b/cpp/test/IcePack/deployer/Server.cpp
index 56ee98b5804..f51519d49fb 100644
--- a/cpp/test/IcePack/deployer/Server.cpp
+++ b/cpp/test/IcePack/deployer/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/deployer/Service.cpp b/cpp/test/IcePack/deployer/Service.cpp
index 0f27fe5fb0f..fb17d51747b 100644
--- a/cpp/test/IcePack/deployer/Service.cpp
+++ b/cpp/test/IcePack/deployer/Service.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/deployer/Test.ice b/cpp/test/IcePack/deployer/Test.ice
index d728ac3a4bb..86a03ea7fb4 100644
--- a/cpp/test/IcePack/deployer/Test.ice
+++ b/cpp/test/IcePack/deployer/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/deployer/TestI.cpp b/cpp/test/IcePack/deployer/TestI.cpp
index 22d3c75f155..e2a60e407e4 100644
--- a/cpp/test/IcePack/deployer/TestI.cpp
+++ b/cpp/test/IcePack/deployer/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/deployer/TestI.h b/cpp/test/IcePack/deployer/TestI.h
index ca7d1521629..bebe702fc67 100644
--- a/cpp/test/IcePack/deployer/TestI.h
+++ b/cpp/test/IcePack/deployer/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py
index b9d660d6c06..d7e73e51228 100755
--- a/cpp/test/IcePack/deployer/run.py
+++ b/cpp/test/IcePack/deployer/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IcePack/simple/AllTests.cpp b/cpp/test/IcePack/simple/AllTests.cpp
index 059da06b185..03d5cfcdfe7 100644
--- a/cpp/test/IcePack/simple/AllTests.cpp
+++ b/cpp/test/IcePack/simple/AllTests.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/simple/Client.cpp b/cpp/test/IcePack/simple/Client.cpp
index 9d2b049c7cb..e3698fbd4b0 100644
--- a/cpp/test/IcePack/simple/Client.cpp
+++ b/cpp/test/IcePack/simple/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/simple/Makefile b/cpp/test/IcePack/simple/Makefile
index 91c89a0d53b..3485ae33193 100644
--- a/cpp/test/IcePack/simple/Makefile
+++ b/cpp/test/IcePack/simple/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IcePack/simple/Server.cpp b/cpp/test/IcePack/simple/Server.cpp
index 65d903f3a27..b644019ab6d 100644
--- a/cpp/test/IcePack/simple/Server.cpp
+++ b/cpp/test/IcePack/simple/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/simple/Test.ice b/cpp/test/IcePack/simple/Test.ice
index 225b9b97776..4cb685b4aa2 100644
--- a/cpp/test/IcePack/simple/Test.ice
+++ b/cpp/test/IcePack/simple/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/simple/TestI.cpp b/cpp/test/IcePack/simple/TestI.cpp
index dfcc6c9593d..b07468f09ad 100644
--- a/cpp/test/IcePack/simple/TestI.cpp
+++ b/cpp/test/IcePack/simple/TestI.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/simple/TestI.h b/cpp/test/IcePack/simple/TestI.h
index 4f0e4f2205f..00501b38286 100644
--- a/cpp/test/IcePack/simple/TestI.h
+++ b/cpp/test/IcePack/simple/TestI.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IcePack/simple/icepackadmin.py b/cpp/test/IcePack/simple/icepackadmin.py
index abdc3fe4fea..39c46979e7b 100755
--- a/cpp/test/IcePack/simple/icepackadmin.py
+++ b/cpp/test/IcePack/simple/icepackadmin.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py
index 837972caf0f..564de204d94 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/Makefile b/cpp/test/IceSSL/Makefile
index 148ea7e8276..2a5456b5bd4 100644
--- a/cpp/test/IceSSL/Makefile
+++ b/cpp/test/IceSSL/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp
index a7962f0737a..142ab493108 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
index bfff0086bdc..a8bf4f2c1cd 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
index 0faed66d0d8..af0805acaab 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/certificateVerification/Client.cpp b/cpp/test/IceSSL/certificateVerification/Client.cpp
index 32acba9d57e..1901d55d202 100644
--- a/cpp/test/IceSSL/certificateVerification/Client.cpp
+++ b/cpp/test/IceSSL/certificateVerification/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceSSL/certificateVerification/Makefile b/cpp/test/IceSSL/certificateVerification/Makefile
index 81335d690f9..7de2d7e6222 100644
--- a/cpp/test/IceSSL/certificateVerification/Makefile
+++ b/cpp/test/IceSSL/certificateVerification/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/certificateVerification/Pinger.ice b/cpp/test/IceSSL/certificateVerification/Pinger.ice
index f80457dbb32..6477cea53a3 100644
--- a/cpp/test/IceSSL/certificateVerification/Pinger.ice
+++ b/cpp/test/IceSSL/certificateVerification/Pinger.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceSSL/certificateVerification/Server.cpp b/cpp/test/IceSSL/certificateVerification/Server.cpp
index fc54dde50ae..9dce7df74e4 100644
--- a/cpp/test/IceSSL/certificateVerification/Server.cpp
+++ b/cpp/test/IceSSL/certificateVerification/Server.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceSSL/certificateVerification/run.py b/cpp/test/IceSSL/certificateVerification/run.py
index cf991a2e309..95f5a4f947b 100755
--- a/cpp/test/IceSSL/certificateVerification/run.py
+++ b/cpp/test/IceSSL/certificateVerification/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp
index 71d236e33fe..42290079db5 100644
--- a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp
+++ b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceSSL/certificateVerifier/Makefile b/cpp/test/IceSSL/certificateVerifier/Makefile
index c848c3c4ac7..b41bde55805 100644
--- a/cpp/test/IceSSL/certificateVerifier/Makefile
+++ b/cpp/test/IceSSL/certificateVerifier/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py
index 13d25b53cf1..340febd22ec 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/configuration/Configuration.cpp b/cpp/test/IceSSL/configuration/Configuration.cpp
index b060bfb3d95..11101f575bb 100644
--- a/cpp/test/IceSSL/configuration/Configuration.cpp
+++ b/cpp/test/IceSSL/configuration/Configuration.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
index 1cadb48728b..de038eb1625 100644
--- a/cpp/test/IceSSL/configuration/Makefile
+++ b/cpp/test/IceSSL/configuration/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index e4a855c0d75..f36caeaca66 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp
index 29f1c29b4a4..99bf009c339 100644
--- a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp
+++ b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceSSL/loadPEM/Makefile b/cpp/test/IceSSL/loadPEM/Makefile
index 39c8b3f925e..169b467c227 100644
--- a/cpp/test/IceSSL/loadPEM/Makefile
+++ b/cpp/test/IceSSL/loadPEM/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py
index 98f6dac4489..27a4a7b05c3 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceStorm/Makefile b/cpp/test/IceStorm/Makefile
index 2344b259d18..f559ca46477 100644
--- a/cpp/test/IceStorm/Makefile
+++ b/cpp/test/IceStorm/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice
index 8521b2eabec..abee10003cc 100644
--- a/cpp/test/IceStorm/federation/Event.ice
+++ b/cpp/test/IceStorm/federation/Event.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile
index 6d51fa81a56..fb445b2fdea 100644
--- a/cpp/test/IceStorm/federation/Makefile
+++ b/cpp/test/IceStorm/federation/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp
index d3765ae4223..46dd1a3b82c 100644
--- a/cpp/test/IceStorm/federation/Publisher.cpp
+++ b/cpp/test/IceStorm/federation/Publisher.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp
index 4bc9a669db7..92886657f05 100644
--- a/cpp/test/IceStorm/federation/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation/Subscriber.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 722635fe54f..8645e19f97c 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 05e94a4209d..29e6b3c7b80 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile
index 1f3dc9b30b4..c1fa7b4378a 100644
--- a/cpp/test/IceStorm/single/Makefile
+++ b/cpp/test/IceStorm/single/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp
index 1f16919d76f..eb3ea47b58d 100644
--- a/cpp/test/IceStorm/single/Publisher.cpp
+++ b/cpp/test/IceStorm/single/Publisher.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice
index 1f90ac9aa92..24c1caff7b0 100644
--- a/cpp/test/IceStorm/single/Single.ice
+++ b/cpp/test/IceStorm/single/Single.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index 24693b51b6f..6c5d7cb9cee 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 5cdeb384b29..5ee98f89d39 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceUtil/Makefile b/cpp/test/IceUtil/Makefile
index b3962d91602..a4446b6550b 100644
--- a/cpp/test/IceUtil/Makefile
+++ b/cpp/test/IceUtil/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index e7317933c84..ecd7caafb7b 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/inputUtil/Makefile b/cpp/test/IceUtil/inputUtil/Makefile
index 6594a12ac5c..4aa91ebe331 100644
--- a/cpp/test/IceUtil/inputUtil/Makefile
+++ b/cpp/test/IceUtil/inputUtil/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py
index 2376fd7797b..1e5cec5c3cd 100755
--- a/cpp/test/IceUtil/inputUtil/run.py
+++ b/cpp/test/IceUtil/inputUtil/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceUtil/thread/Client.cpp b/cpp/test/IceUtil/thread/Client.cpp
index 795d3a17146..88306dd5e4b 100644
--- a/cpp/test/IceUtil/thread/Client.cpp
+++ b/cpp/test/IceUtil/thread/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/CreateTest.cpp b/cpp/test/IceUtil/thread/CreateTest.cpp
index daf15c2ed89..5b42b8f3c1f 100644
--- a/cpp/test/IceUtil/thread/CreateTest.cpp
+++ b/cpp/test/IceUtil/thread/CreateTest.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/CreateTest.h b/cpp/test/IceUtil/thread/CreateTest.h
index f165ed67c83..4434f27aad4 100644
--- a/cpp/test/IceUtil/thread/CreateTest.h
+++ b/cpp/test/IceUtil/thread/CreateTest.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/Makefile b/cpp/test/IceUtil/thread/Makefile
index 7edcda68566..ca6a1ea3eb1 100644
--- a/cpp/test/IceUtil/thread/Makefile
+++ b/cpp/test/IceUtil/thread/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
index 571004bbad1..e5ee43cca14 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.h b/cpp/test/IceUtil/thread/MonitorMutexTest.h
index 619ec7b51dc..0ce7b03b501 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
index 87a4520a513..4dffa88fcd5 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
index f595403122c..207ab8f7d27 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/MutexTest.cpp b/cpp/test/IceUtil/thread/MutexTest.cpp
index 73ca37d3afd..f41d0f8705a 100644
--- a/cpp/test/IceUtil/thread/MutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MutexTest.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/MutexTest.h b/cpp/test/IceUtil/thread/MutexTest.h
index 8ba268cb672..5cc0444a98a 100644
--- a/cpp/test/IceUtil/thread/MutexTest.h
+++ b/cpp/test/IceUtil/thread/MutexTest.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp
index 020205e2cb9..bebbeeacc48 100644
--- a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.h b/cpp/test/IceUtil/thread/RWRecMutexTest.h
index 18153db1792..f312ecad3dd 100644
--- a/cpp/test/IceUtil/thread/RWRecMutexTest.h
+++ b/cpp/test/IceUtil/thread/RWRecMutexTest.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.cpp b/cpp/test/IceUtil/thread/RecMutexTest.cpp
index 9ef95c506ad..7742466e2bd 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RecMutexTest.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.h b/cpp/test/IceUtil/thread/RecMutexTest.h
index 92debbfcc94..dbb4c24c8b8 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.h
+++ b/cpp/test/IceUtil/thread/RecMutexTest.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/TestBase.cpp b/cpp/test/IceUtil/thread/TestBase.cpp
index cfc559c9d5f..a3f2dcef7fd 100644
--- a/cpp/test/IceUtil/thread/TestBase.cpp
+++ b/cpp/test/IceUtil/thread/TestBase.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/TestBase.h b/cpp/test/IceUtil/thread/TestBase.h
index e7fdf894ffe..0dca9d11c74 100644
--- a/cpp/test/IceUtil/thread/TestBase.h
+++ b/cpp/test/IceUtil/thread/TestBase.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/TestSuite.cpp b/cpp/test/IceUtil/thread/TestSuite.cpp
index f5a672bd3a3..65eac720422 100644
--- a/cpp/test/IceUtil/thread/TestSuite.cpp
+++ b/cpp/test/IceUtil/thread/TestSuite.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/TestSuite.h b/cpp/test/IceUtil/thread/TestSuite.h
index b0a3c0c5230..71f2d4b9611 100644
--- a/cpp/test/IceUtil/thread/TestSuite.h
+++ b/cpp/test/IceUtil/thread/TestSuite.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py
index 55556de951f..bfb63383395 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp
index fc64aa0b517..1987ca44d4a 100644
--- a/cpp/test/IceUtil/unicode/Client.cpp
+++ b/cpp/test/IceUtil/unicode/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceUtil/unicode/Makefile b/cpp/test/IceUtil/unicode/Makefile
index 6594a12ac5c..4aa91ebe331 100644
--- a/cpp/test/IceUtil/unicode/Makefile
+++ b/cpp/test/IceUtil/unicode/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py
index a5489c5f06c..852239ea742 100755
--- a/cpp/test/IceUtil/unicode/run.py
+++ b/cpp/test/IceUtil/unicode/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceXML/Makefile b/cpp/test/IceXML/Makefile
index 2bbde380d3c..b7409d44a79 100644
--- a/cpp/test/IceXML/Makefile
+++ b/cpp/test/IceXML/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceXML/encoding/Client.cpp b/cpp/test/IceXML/encoding/Client.cpp
index 4bc42dc78a6..30508655d35 100644
--- a/cpp/test/IceXML/encoding/Client.cpp
+++ b/cpp/test/IceXML/encoding/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceXML/encoding/Makefile b/cpp/test/IceXML/encoding/Makefile
index 72264b184d7..d902fc5978c 100644
--- a/cpp/test/IceXML/encoding/Makefile
+++ b/cpp/test/IceXML/encoding/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/IceXML/encoding/Test.ice b/cpp/test/IceXML/encoding/Test.ice
index f28e5be0613..81cba53f251 100644
--- a/cpp/test/IceXML/encoding/Test.ice
+++ b/cpp/test/IceXML/encoding/Test.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/IceXML/encoding/ice.xsd b/cpp/test/IceXML/encoding/ice.xsd
index 3acf47f9085..05de9d19b80 100644
--- a/cpp/test/IceXML/encoding/ice.xsd
+++ b/cpp/test/IceXML/encoding/ice.xsd
@@ -3,7 +3,7 @@
**********************************************************************
Copyright (c) 2001
ZeroC, Inc.
-Huntsville, AL, USA
+Billerica, MA, USA
All Rights Reserved
**********************************************************************
diff --git a/cpp/test/IceXML/encoding/run.py b/cpp/test/IceXML/encoding/run.py
index 6aa3125b680..c83adbc7958 100755
--- a/cpp/test/IceXML/encoding/run.py
+++ b/cpp/test/IceXML/encoding/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Makefile b/cpp/test/Makefile
index 3e4705ce999..7b9c7691698 100644
--- a/cpp/test/Makefile
+++ b/cpp/test/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.err b/cpp/test/Slice/errorDetection/CaseInsensitive.err
index fa6deca7247..b833324ea8f 100644
--- a/cpp/test/Slice/errorDetection/CaseInsensitive.err
+++ b/cpp/test/Slice/errorDetection/CaseInsensitive.err
@@ -1,73 +1,73 @@
-CaseInsensitive.ice:13: redefinition of operation `op' as operation `op'
-CaseInsensitive.ice:18: operation `oP' differs only in capitalization from operation `op'
-CaseInsensitive.ice:18: redefinition of operation `op' as operation `oP'
-CaseInsensitive.ice:23: redefinition of data member `l' as operation `l'
-CaseInsensitive.ice:28: operation `L' differs only in capitalization from data member `l'
-CaseInsensitive.ice:28: redefinition of data member `l' as operation `L'
-CaseInsensitive.ice:33: module `M1' is capitalized inconsistently with its previous name: `m1'
-CaseInsensitive.ice:33: `M1' has changed meaning
-CaseInsensitive.ice:34: redefinition of class `c1' as module
-CaseInsensitive.ice:35: module `C1' differs only in capitalization from class name `c1'
-CaseInsensitive.ice:35: `C1' has changed meaning
-CaseInsensitive.ice:38: redefinition of parameter `aa'
-CaseInsensitive.ice:39: parameter `BB' differs only in capitalization from parameter `bb'
-CaseInsensitive.ice:39: `BB' has changed meaning
-CaseInsensitive.ice:43: operation `I4' differs only in capitalization from enclosing interface name `i4'
-CaseInsensitive.ice:47: interface name `i5' cannot be used as operation name
-CaseInsensitive.ice:55: operation `op' is already defined as an operation in a base interface or class
-CaseInsensitive.ice:59: operation `OP' differs only in capitalization from operation `op', which is defined in a base interface or class
-CaseInsensitive.ice:67: operation `l' is already defined as a data member in a base interface or class
-CaseInsensitive.ice:71: operation `L' differs only in capitalization from data member `l', which is defined in a base interface or class
-CaseInsensitive.ice:76: operation `L' differs only in capitalization from data member `l'
-CaseInsensitive.ice:76: redefinition of data member `l' as operation `L'
-CaseInsensitive.ice:80: data member `l' is already defined as a data member in a base interface or class
-CaseInsensitive.ice:84: data member `L' differs only in capitalization from data member `l', which is defined in a base interface or class
-CaseInsensitive.ice:89: data member `l' differs only in capitalization from operation `L'
-CaseInsensitive.ice:89: `l' has changed meaning
-CaseInsensitive.ice:94: redefinition of exception member `l'
-CaseInsensitive.ice:99: exception member `L' differs only in capitalization from exception member `l'
-CaseInsensitive.ice:99: `L' has changed meaning
-CaseInsensitive.ice:103: exception name `e3' cannot be used as exception member name
-CaseInsensitive.ice:107: exception member `E4' differs only in capitalization from enclosing exception name `e4'
-CaseInsensitive.ice:115: exception member `l' is already defined in a base exception
-CaseInsensitive.ice:119: exception member `L' differs only in capitalization from exception member `l', which is defined in a base exception
-CaseInsensitive.ice:124: redefinition of struct member `l'
-CaseInsensitive.ice:129: member `L' differs only in capitalization from member `l'
-CaseInsensitive.ice:129: `L' has changed meaning
-CaseInsensitive.ice:133: struct name `s3' cannot be used as member name
-CaseInsensitive.ice:138: struct member `S4' differs only in capitalization from enclosing struct name `s4'
-CaseInsensitive.ice:143: sequence `LS' differs only in capitalization from sequence `ls'
-CaseInsensitive.ice:144: redefinition of module `m1' as sequence
-CaseInsensitive.ice:145: sequence `M1' differs only in capitalization from module `m1'
-CaseInsensitive.ice:148: dictionary `D' differs only in capitalization from dictionary `d'
-CaseInsensitive.ice:149: redefinition of module `m1' as dictionary
-CaseInsensitive.ice:150: dictionary `M1' differs only in capitalization from module `m1'
-CaseInsensitive.ice:153: enumeration `eN1' differs only in capitalization from enumeration `en1'
-CaseInsensitive.ice:153: `eN1' has changed meaning
-CaseInsensitive.ice:154: redefinition of module `m1' as enumeration
-CaseInsensitive.ice:155: enumeration `M1' differs only in capitalization from module `m1'
-CaseInsensitive.ice:155: `M1' has changed meaning
-CaseInsensitive.ice:157: redefinition of enumeration `en1' as enumerator
-CaseInsensitive.ice:158: enumerator `EN1' differs only in capitalization from enumeration `en1'
-CaseInsensitive.ice:159: redefinition of module `m1' as enumerator
-CaseInsensitive.ice:160: enumerator `M1' differs only in capitalization from module `m1'
-CaseInsensitive.ice:172: interface name `base' is capitalized inconsistently with its previous name: `::xxx::xx::Base'
-CaseInsensitive.ice:172: redefinition of interface `Derived'
-CaseInsensitive.ice:176: exception name `E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
-CaseInsensitive.ice:180: sequence name `S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1'
-CaseInsensitive.ice:181: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1'
-CaseInsensitive.ice:182: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1'
-CaseInsensitive.ice:183: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1'
-CaseInsensitive.ice:188: interface name `derived' is capitalized inconsistently with its previous name: `::xxx::xx::Derived'
-CaseInsensitive.ice:196: parameter `Param' differs only in capitalization from parameter `param'
-CaseInsensitive.ice:196: `Param' has changed meaning
-CaseInsensitive.ice:198: exception name `E1' is capitalized inconsistently with its previous name: `::e1'
-CaseInsensitive.ice:200: exception name `xxx::xx::E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
-CaseInsensitive.ice:201: exception name `xxx::XX::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
-CaseInsensitive.ice:202: exception name `XXX::xx::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
+CaseInsensitive.ice:17: redefinition of operation `op' as operation `op'
+CaseInsensitive.ice:22: operation `oP' differs only in capitalization from operation `op'
+CaseInsensitive.ice:22: redefinition of operation `op' as operation `oP'
+CaseInsensitive.ice:27: redefinition of data member `l' as operation `l'
+CaseInsensitive.ice:32: operation `L' differs only in capitalization from data member `l'
+CaseInsensitive.ice:32: redefinition of data member `l' as operation `L'
+CaseInsensitive.ice:37: module `M1' is capitalized inconsistently with its previous name: `m1'
+CaseInsensitive.ice:37: `M1' has changed meaning
+CaseInsensitive.ice:38: redefinition of class `c1' as module
+CaseInsensitive.ice:39: module `C1' differs only in capitalization from class name `c1'
+CaseInsensitive.ice:39: `C1' has changed meaning
+CaseInsensitive.ice:42: redefinition of parameter `aa'
+CaseInsensitive.ice:43: parameter `BB' differs only in capitalization from parameter `bb'
+CaseInsensitive.ice:43: `BB' has changed meaning
+CaseInsensitive.ice:47: operation `I4' differs only in capitalization from enclosing interface name `i4'
+CaseInsensitive.ice:51: interface name `i5' cannot be used as operation name
+CaseInsensitive.ice:59: operation `op' is already defined as an operation in a base interface or class
+CaseInsensitive.ice:63: operation `OP' differs only in capitalization from operation `op', which is defined in a base interface or class
+CaseInsensitive.ice:71: operation `l' is already defined as a data member in a base interface or class
+CaseInsensitive.ice:75: operation `L' differs only in capitalization from data member `l', which is defined in a base interface or class
+CaseInsensitive.ice:80: operation `L' differs only in capitalization from data member `l'
+CaseInsensitive.ice:80: redefinition of data member `l' as operation `L'
+CaseInsensitive.ice:84: data member `l' is already defined as a data member in a base interface or class
+CaseInsensitive.ice:88: data member `L' differs only in capitalization from data member `l', which is defined in a base interface or class
+CaseInsensitive.ice:93: data member `l' differs only in capitalization from operation `L'
+CaseInsensitive.ice:93: `l' has changed meaning
+CaseInsensitive.ice:98: redefinition of exception member `l'
+CaseInsensitive.ice:103: exception member `L' differs only in capitalization from exception member `l'
+CaseInsensitive.ice:103: `L' has changed meaning
+CaseInsensitive.ice:107: exception name `e3' cannot be used as exception member name
+CaseInsensitive.ice:111: exception member `E4' differs only in capitalization from enclosing exception name `e4'
+CaseInsensitive.ice:119: exception member `l' is already defined in a base exception
+CaseInsensitive.ice:123: exception member `L' differs only in capitalization from exception member `l', which is defined in a base exception
+CaseInsensitive.ice:128: redefinition of struct member `l'
+CaseInsensitive.ice:133: member `L' differs only in capitalization from member `l'
+CaseInsensitive.ice:133: `L' has changed meaning
+CaseInsensitive.ice:137: struct name `s3' cannot be used as member name
+CaseInsensitive.ice:142: struct member `S4' differs only in capitalization from enclosing struct name `s4'
+CaseInsensitive.ice:147: sequence `LS' differs only in capitalization from sequence `ls'
+CaseInsensitive.ice:148: redefinition of module `m1' as sequence
+CaseInsensitive.ice:149: sequence `M1' differs only in capitalization from module `m1'
+CaseInsensitive.ice:152: dictionary `D' differs only in capitalization from dictionary `d'
+CaseInsensitive.ice:153: redefinition of module `m1' as dictionary
+CaseInsensitive.ice:154: dictionary `M1' differs only in capitalization from module `m1'
+CaseInsensitive.ice:157: enumeration `eN1' differs only in capitalization from enumeration `en1'
+CaseInsensitive.ice:157: `eN1' has changed meaning
+CaseInsensitive.ice:158: redefinition of module `m1' as enumeration
+CaseInsensitive.ice:159: enumeration `M1' differs only in capitalization from module `m1'
+CaseInsensitive.ice:159: `M1' has changed meaning
+CaseInsensitive.ice:161: redefinition of enumeration `en1' as enumerator
+CaseInsensitive.ice:162: enumerator `EN1' differs only in capitalization from enumeration `en1'
+CaseInsensitive.ice:163: redefinition of module `m1' as enumerator
+CaseInsensitive.ice:164: enumerator `M1' differs only in capitalization from module `m1'
+CaseInsensitive.ice:176: interface name `base' is capitalized inconsistently with its previous name: `::xxx::xx::Base'
+CaseInsensitive.ice:176: redefinition of interface `Derived'
+CaseInsensitive.ice:180: exception name `E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
+CaseInsensitive.ice:184: sequence name `S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1'
+CaseInsensitive.ice:185: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1'
+CaseInsensitive.ice:186: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1'
+CaseInsensitive.ice:187: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1'
+CaseInsensitive.ice:192: interface name `derived' is capitalized inconsistently with its previous name: `::xxx::xx::Derived'
+CaseInsensitive.ice:200: parameter `Param' differs only in capitalization from parameter `param'
+CaseInsensitive.ice:200: `Param' has changed meaning
+CaseInsensitive.ice:202: exception name `E1' is capitalized inconsistently with its previous name: `::e1'
CaseInsensitive.ice:204: exception name `xxx::xx::E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
CaseInsensitive.ice:205: exception name `xxx::XX::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
CaseInsensitive.ice:206: exception name `XXX::xx::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
-CaseInsensitive.ice:207: operation name `op12' cannot be used as parameter name
-CaseInsensitive.ice:208: parameter `OP13' differs only in capitalization from operation name `op13'
-CaseInsensitive.ice:221: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces
+CaseInsensitive.ice:208: exception name `xxx::xx::E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
+CaseInsensitive.ice:209: exception name `xxx::XX::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
+CaseInsensitive.ice:210: exception name `XXX::xx::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1'
+CaseInsensitive.ice:211: operation name `op12' cannot be used as parameter name
+CaseInsensitive.ice:212: parameter `OP13' differs only in capitalization from operation name `op13'
+CaseInsensitive.ice:225: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces
diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
index 2118d2b9c7a..f7afc3c4bdb 100644
--- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/CaseSensitive.err b/cpp/test/Slice/errorDetection/CaseSensitive.err
index 883a78999f8..061df53b85a 100644
--- a/cpp/test/Slice/errorDetection/CaseSensitive.err
+++ b/cpp/test/Slice/errorDetection/CaseSensitive.err
@@ -1,3 +1,3 @@
-CaseSensitive.ice:16: redefinition of struct `m2' as class
-CaseSensitive.ice:58: `I8' is not defined
-CaseSensitive.ice:64: `I10' is not defined
+CaseSensitive.ice:30: redefinition of struct `m2' as class
+CaseSensitive.ice:72: `I8' is not defined
+CaseSensitive.ice:78: `I10' is not defined
diff --git a/cpp/test/Slice/errorDetection/CaseSensitive.ice b/cpp/test/Slice/errorDetection/CaseSensitive.ice
index c729fdf88d4..bda6788ce6b 100644
--- a/cpp/test/Slice/errorDetection/CaseSensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseSensitive.ice
@@ -1,3 +1,17 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
module M1
{
};
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.err b/cpp/test/Slice/errorDetection/ChangedMeaning.err
index fd5c731535f..2f5e57ccdc9 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.err
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.err
@@ -1,16 +1,16 @@
-ChangedMeaning.ice:5: `ls' has changed meaning
-ChangedMeaning.ice:16: `ls' has changed meaning
-ChangedMeaning.ice:35: `M' has changed meaning
-ChangedMeaning.ice:41: `M' has changed meaning
-ChangedMeaning.ice:48: `i1' has changed meaning
-ChangedMeaning.ice:49: `i2' has changed meaning
-ChangedMeaning.ice:70: `e1' has changed meaning
-ChangedMeaning.ice:71: `e2' has changed meaning
-ChangedMeaning.ice:83: `c1' has changed meaning
-ChangedMeaning.ice:84: `c2' has changed meaning
-ChangedMeaning.ice:95: `blue' has changed meaning
-ChangedMeaning.ice:105: `CounterSeq' has changed meaning
-ChangedMeaning.ice:112: `counter' has changed meaning
-ChangedMeaning.ice:113: `counter' is not a type
-ChangedMeaning.ice:114: redefinition of parameter `param'
-ChangedMeaning.ice:120: `is' has changed meaning
+ChangedMeaning.ice:19: `ls' has changed meaning
+ChangedMeaning.ice:30: `ls' has changed meaning
+ChangedMeaning.ice:49: `M' has changed meaning
+ChangedMeaning.ice:55: `M' has changed meaning
+ChangedMeaning.ice:62: `i1' has changed meaning
+ChangedMeaning.ice:63: `i2' has changed meaning
+ChangedMeaning.ice:84: `e1' has changed meaning
+ChangedMeaning.ice:85: `e2' has changed meaning
+ChangedMeaning.ice:97: `c1' has changed meaning
+ChangedMeaning.ice:98: `c2' has changed meaning
+ChangedMeaning.ice:109: `blue' has changed meaning
+ChangedMeaning.ice:119: `CounterSeq' has changed meaning
+ChangedMeaning.ice:126: `counter' has changed meaning
+ChangedMeaning.ice:127: `counter' is not a type
+ChangedMeaning.ice:128: redefinition of parameter `param'
+ChangedMeaning.ice:134: `is' has changed meaning
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
index 7a19a29c6c3..41e5fc84169 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
@@ -1,3 +1,17 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
sequence<long> ls;
struct s00
diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.err b/cpp/test/Slice/errorDetection/ClassRedefinition.err
index c46657dd95f..344d9e96520 100644
--- a/cpp/test/Slice/errorDetection/ClassRedefinition.err
+++ b/cpp/test/Slice/errorDetection/ClassRedefinition.err
@@ -1,4 +1,4 @@
-ClassRedefinition.ice:13: redefinition of class `Class1'
-ClassRedefinition.ice:13: parse error
-ClassRedefinition.ice:17: redefinition of class `Class2'
+ClassRedefinition.ice:17: redefinition of class `Class1'
ClassRedefinition.ice:17: parse error
+ClassRedefinition.ice:21: redefinition of class `Class2'
+ClassRedefinition.ice:21: parse error
diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
index 075517e4a8d..368cdc2fad0 100644
--- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/ConstDef.err b/cpp/test/Slice/errorDetection/ConstDef.err
index 4b0d2b6733a..20a82b3dec4 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.err
+++ b/cpp/test/Slice/errorDetection/ConstDef.err
@@ -1,21 +1,21 @@
-ConstDef.ice:37: `XXX' is not defined
-ConstDef.ice:38: redefinition of constant `f11' as constant
-ConstDef.ice:39: constant `F10' differs only in capitalization from constant `f10'
-ConstDef.ice:42: constant `ic2' has illegal type
-ConstDef.ice:43: constant `ic3' has illegal type: `Object'
-ConstDef.ice:45: initializer of type `long' is incompatible with the type `bool' of constant `ic4'
-ConstDef.ice:46: initializer of type `string' is incompatible with the type `byte' of constant `ic5'
-ConstDef.ice:47: initializer of type `double' is incompatible with the type `short' of constant `ic6'
-ConstDef.ice:48: type of initializer is incompatible with the type `int' of constant `ic7'
-ConstDef.ice:49: initializer of type `bool' is incompatible with the type `long' of constant `ic8'
-ConstDef.ice:51: missing constant name
-ConstDef.ice:54: enumerator `two' is not defined in enumeration `::color'
-ConstDef.ice:55: type of initializer is incompatible with the type of constant `ic10'
-ConstDef.ice:71: integer constant `-9223372036854775809' out of range
-ConstDef.ice:72: integer constant `+9223372036854775808' out of range
-ConstDef.ice:76: initializer `-2147483649' for constant `i3' out of range for type int
-ConstDef.ice:77: initializer `2147483648' for constant `i4' out of range for type int
-ConstDef.ice:81: initializer `-32769' for constant `s3' out of range for type short
-ConstDef.ice:82: initializer `32768' for constant `s4' out of range for type short
-ConstDef.ice:86: initializer `-1' for constant `b3' out of range for type byte
-ConstDef.ice:87: initializer `256' for constant `b4' out of range for type byte
+ConstDef.ice:51: `XXX' is not defined
+ConstDef.ice:52: redefinition of constant `f11' as constant
+ConstDef.ice:53: constant `F10' differs only in capitalization from constant `f10'
+ConstDef.ice:56: constant `ic2' has illegal type
+ConstDef.ice:57: constant `ic3' has illegal type: `Object'
+ConstDef.ice:59: initializer of type `long' is incompatible with the type `bool' of constant `ic4'
+ConstDef.ice:60: initializer of type `string' is incompatible with the type `byte' of constant `ic5'
+ConstDef.ice:61: initializer of type `double' is incompatible with the type `short' of constant `ic6'
+ConstDef.ice:62: type of initializer is incompatible with the type `int' of constant `ic7'
+ConstDef.ice:63: initializer of type `bool' is incompatible with the type `long' of constant `ic8'
+ConstDef.ice:65: missing constant name
+ConstDef.ice:68: enumerator `two' is not defined in enumeration `::color'
+ConstDef.ice:69: type of initializer is incompatible with the type of constant `ic10'
+ConstDef.ice:85: integer constant `-9223372036854775809' out of range
+ConstDef.ice:86: integer constant `+9223372036854775808' out of range
+ConstDef.ice:90: initializer `-2147483649' for constant `i3' out of range for type int
+ConstDef.ice:91: initializer `2147483648' for constant `i4' out of range for type int
+ConstDef.ice:95: initializer `-32769' for constant `s3' out of range for type short
+ConstDef.ice:96: initializer `32768' for constant `s4' out of range for type short
+ConstDef.ice:100: initializer `-1' for constant `b3' out of range for type byte
+ConstDef.ice:101: initializer `256' for constant `b4' out of range for type byte
diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice
index 164b60032a6..8714aa1c8fa 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.ice
+++ b/cpp/test/Slice/errorDetection/ConstDef.ice
@@ -1,3 +1,17 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
//
// Basic checks (all OK)
//
diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.err b/cpp/test/Slice/errorDetection/DataMemberRedefinition.err
index c5124508493..75297e9fc3e 100644
--- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.err
+++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.err
@@ -1 +1 @@
-DataMemberRedefinition.ice:14: redefinition of data member `member' as data member `member'
+DataMemberRedefinition.ice:18: redefinition of data member `member' as data member `member'
diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
index 17212833c32..123afce2935 100644
--- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.err b/cpp/test/Slice/errorDetection/DeclaratorMissing.err
index cdc6cbf0457..070ea115152 100644
--- a/cpp/test/Slice/errorDetection/DeclaratorMissing.err
+++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.err
@@ -1,4 +1,4 @@
-DeclaratorMissing.ice:13: missing parameter name
-DeclaratorMissing.ice:13: missing parameter name
-DeclaratorMissing.ice:14: missing parameter name
-DeclaratorMissing.ice:14: missing parameter name
+DeclaratorMissing.ice:17: missing parameter name
+DeclaratorMissing.ice:17: missing parameter name
+DeclaratorMissing.ice:18: missing parameter name
+DeclaratorMissing.ice:18: missing parameter name
diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
index 84b2c082723..982fc2d0e6d 100644
--- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
+++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.err b/cpp/test/Slice/errorDetection/DerivedRedefinition.err
index 3d0e0e7d1d4..74b41401a20 100644
--- a/cpp/test/Slice/errorDetection/DerivedRedefinition.err
+++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.err
@@ -1,6 +1,6 @@
-DerivedRedefinition.ice:17: operation `op' is already defined as an operation in a base interface or class
-DerivedRedefinition.ice:18: operation `op' is already defined as an operation in a base interface or class
-DerivedRedefinition.ice:31: operation `op' is already defined as an operation in a base interface or class
-DerivedRedefinition.ice:34: ambiguous multiple inheritance: `D3' inherits operation `op' from two or more unrelated base interfaces
-DerivedRedefinition.ice:39: data member `l' is already defined as a data member in a base interface or class
-DerivedRedefinition.ice:41: data member `l' is already defined as a data member in a base interface or class
+DerivedRedefinition.ice:21: operation `op' is already defined as an operation in a base interface or class
+DerivedRedefinition.ice:22: operation `op' is already defined as an operation in a base interface or class
+DerivedRedefinition.ice:35: operation `op' is already defined as an operation in a base interface or class
+DerivedRedefinition.ice:38: ambiguous multiple inheritance: `D3' inherits operation `op' from two or more unrelated base interfaces
+DerivedRedefinition.ice:43: data member `l' is already defined as a data member in a base interface or class
+DerivedRedefinition.ice:45: data member `l' is already defined as a data member in a base interface or class
diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
index e145b538aab..78dbcc40d22 100644
--- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err
index ac8336d6570..cdf3844e1f4 100644
--- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err
+++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err
@@ -1,6 +1,6 @@
-DictionaryRedefinition.ice:11: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization
-DictionaryRedefinition.ice:11: keyword `dictionary' cannot be used as dictionary name
-DictionaryRedefinition.ice:12: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization
-DictionaryRedefinition.ice:12: redefinition of dictionary `dictionary' as dictionary
-DictionaryRedefinition.ice:12: keyword `dictionary' cannot be used as dictionary name
-DictionaryRedefinition.ice:14: redefinition of dictionary `foo' as dictionary
+DictionaryRedefinition.ice:15: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization
+DictionaryRedefinition.ice:15: keyword `dictionary' cannot be used as dictionary name
+DictionaryRedefinition.ice:16: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization
+DictionaryRedefinition.ice:16: redefinition of dictionary `dictionary' as dictionary
+DictionaryRedefinition.ice:16: keyword `dictionary' cannot be used as dictionary name
+DictionaryRedefinition.ice:18: redefinition of dictionary `foo' as dictionary
diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
index d4a9848d52f..137ac4f3b13 100644
--- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.err b/cpp/test/Slice/errorDetection/DuplicateParameter.err
index 0ab34a11c0c..2266a397688 100644
--- a/cpp/test/Slice/errorDetection/DuplicateParameter.err
+++ b/cpp/test/Slice/errorDetection/DuplicateParameter.err
@@ -1,8 +1,8 @@
-DuplicateParameter.ice:14: redefinition of parameter `s'
-DuplicateParameter.ice:15: redefinition of parameter `s'
-DuplicateParameter.ice:16: redefinition of parameter `s'
-DuplicateParameter.ice:17: redefinition of parameter `i'
-DuplicateParameter.ice:23: redefinition of parameter `s'
-DuplicateParameter.ice:24: redefinition of parameter `s'
-DuplicateParameter.ice:25: redefinition of parameter `s'
-DuplicateParameter.ice:26: redefinition of parameter `i'
+DuplicateParameter.ice:18: redefinition of parameter `s'
+DuplicateParameter.ice:19: redefinition of parameter `s'
+DuplicateParameter.ice:20: redefinition of parameter `s'
+DuplicateParameter.ice:21: redefinition of parameter `i'
+DuplicateParameter.ice:27: redefinition of parameter `s'
+DuplicateParameter.ice:28: redefinition of parameter `s'
+DuplicateParameter.ice:29: redefinition of parameter `s'
+DuplicateParameter.ice:30: redefinition of parameter `i'
diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
index b717e53cdca..83fcb0e211e 100644
--- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.err b/cpp/test/Slice/errorDetection/DuplicateThrows.err
index 1d9cef48b29..4fd4aac496d 100644
--- a/cpp/test/Slice/errorDetection/DuplicateThrows.err
+++ b/cpp/test/Slice/errorDetection/DuplicateThrows.err
@@ -1,4 +1,4 @@
-DuplicateThrows.ice:3: operation `op' has a throws clause with a duplicate exception: `e'
-DuplicateThrows.ice:4: operation `op' has a throws clause with a duplicate exception: `e'
-DuplicateThrows.ice:5: operation `op' has a throws clause with a duplicate exception: `e2'
-DuplicateThrows.ice:6: operation `op' has a throws clause with duplicate exceptions: `e', `e2'
+DuplicateThrows.ice:17: operation `op' has a throws clause with a duplicate exception: `e'
+DuplicateThrows.ice:18: operation `op' has a throws clause with a duplicate exception: `e'
+DuplicateThrows.ice:19: operation `op' has a throws clause with a duplicate exception: `e2'
+DuplicateThrows.ice:20: operation `op' has a throws clause with duplicate exceptions: `e', `e2'
diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
index 536899593f5..3b786cb18e1 100644
--- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
@@ -1,3 +1,17 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
exception e {};
exception e2 {};
interface i2 { void op() throws ::e, e; };
diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.err b/cpp/test/Slice/errorDetection/EnumEmpty.err
index fb3d5e71a9d..47010df6239 100644
--- a/cpp/test/Slice/errorDetection/EnumEmpty.err
+++ b/cpp/test/Slice/errorDetection/EnumEmpty.err
@@ -1 +1 @@
-EnumEmpty.ice:1: enum `foo' must have at least one enumerator
+EnumEmpty.ice:15: enum `foo' must have at least one enumerator
diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice
index ff174a2db4a..2760193630b 100644
--- a/cpp/test/Slice/errorDetection/EnumEmpty.ice
+++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice
@@ -1 +1,15 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
enum foo {};
diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.err b/cpp/test/Slice/errorDetection/EnumRedefinition.err
index 4cea5b2085a..fac12aa205c 100644
--- a/cpp/test/Slice/errorDetection/EnumRedefinition.err
+++ b/cpp/test/Slice/errorDetection/EnumRedefinition.err
@@ -1 +1 @@
-EnumRedefinition.ice:12: redefinition of enumeration `E1' as enumeration
+EnumRedefinition.ice:16: redefinition of enumeration `E1' as enumeration
diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
index acf245e631d..a6a38d102aa 100644
--- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err
index 30c8a829617..d391d9c7784 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err
+++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err
@@ -1,2 +1,2 @@
-EnumeratorRedefinition.ice:12: redefinition of enumerator `A' as enumerator
-EnumeratorRedefinition.ice:12: redefinition of enumerator `B' as enumerator
+EnumeratorRedefinition.ice:16: redefinition of enumerator `A' as enumerator
+EnumeratorRedefinition.ice:16: redefinition of enumerator `B' as enumerator
diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
index 1a143d7e4b3..30ef18be0b0 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.err b/cpp/test/Slice/errorDetection/IdentAsKeyword.err
index 002b967aefc..e27c35eb307 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeyword.err
+++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.err
@@ -1,92 +1,92 @@
-IdentAsKeyword.ice:11: illegal identifier: `INTERFACE' differs from keyword `interface' only in capitalization
-IdentAsKeyword.ice:13: illegal identifier: `Void' differs from keyword `void' only in capitalization
-IdentAsKeyword.ice:13: keyword `void' cannot be used as exception name
-IdentAsKeyword.ice:14: keyword `int' cannot be used as exception name
-IdentAsKeyword.ice:16: illegal identifier: `OUT' differs from keyword `out' only in capitalization
-IdentAsKeyword.ice:16: keyword `out' cannot be used as struct name
-IdentAsKeyword.ice:17: keyword `double' cannot be used as struct name
-IdentAsKeyword.ice:19: illegal identifier: `Int' differs from keyword `int' only in capitalization
-IdentAsKeyword.ice:19: keyword `int' cannot be used as data member name
-IdentAsKeyword.ice:20: keyword `byte' cannot be used as data member name
-IdentAsKeyword.ice:21: illegal identifier: `Int' differs from keyword `int' only in capitalization
-IdentAsKeyword.ice:21: keyword `int' cannot be used as data member name
-IdentAsKeyword.ice:22: keyword `byte' cannot be used as data member name
-IdentAsKeyword.ice:24: illegal identifier: `inTERface' differs from keyword `interface' only in capitalization
-IdentAsKeyword.ice:24: keyword `interface' cannot be used as class name
-IdentAsKeyword.ice:25: keyword `interface' cannot be used as class name
-IdentAsKeyword.ice:27: illegal identifier: `MOdule' differs from keyword `module' only in capitalization
-IdentAsKeyword.ice:27: keyword `module' cannot be used as class name
-IdentAsKeyword.ice:28: keyword `module' cannot be used as class name
-IdentAsKeyword.ice:28: redefinition of class `module'
-IdentAsKeyword.ice:28: parse error
-IdentAsKeyword.ice:30: illegal identifier: `extendS' differs from keyword `extends' only in capitalization
-IdentAsKeyword.ice:30: keyword `extends' cannot be used as data member name
-IdentAsKeyword.ice:31: redefinition of class `C'
-IdentAsKeyword.ice:31: parse error
-IdentAsKeyword.ice:32: keyword `extends' cannot be used as data member name
-IdentAsKeyword.ice:34: keyword `local' cannot be used as interface name
-IdentAsKeyword.ice:35: illegal identifier: `Local' differs from keyword `local' only in capitalization
-IdentAsKeyword.ice:35: keyword `local' cannot be used as interface name
-IdentAsKeyword.ice:37: keyword `Object' cannot be used as interface name
-IdentAsKeyword.ice:38: illegal identifier: `object' differs from keyword `Object' only in capitalization
-IdentAsKeyword.ice:38: keyword `Object' cannot be used as interface name
-IdentAsKeyword.ice:38: redefinition of interface `Object'
-IdentAsKeyword.ice:38: parse error
-IdentAsKeyword.ice:39: keyword `long' cannot be used as interface name
-IdentAsKeyword.ice:41: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization
-IdentAsKeyword.ice:41: keyword `implements' cannot be used as sequence name
-IdentAsKeyword.ice:42: redefinition of sequence `implements' as sequence
-IdentAsKeyword.ice:42: keyword `implements' cannot be used as sequence name
-IdentAsKeyword.ice:43: keyword `short' cannot be used as sequence name
-IdentAsKeyword.ice:45: parse error
-IdentAsKeyword.ice:46: illegal identifier: `moDule' differs from keyword `module' only in capitalization
-IdentAsKeyword.ice:46: parse error
-IdentAsKeyword.ice:48: keyword `throws' cannot be used as dictionary name
-IdentAsKeyword.ice:49: illegal identifier: `thRows' differs from keyword `throws' only in capitalization
-IdentAsKeyword.ice:49: redefinition of dictionary `throws' as dictionary
-IdentAsKeyword.ice:49: keyword `throws' cannot be used as dictionary name
-IdentAsKeyword.ice:50: illegal identifier: `LOCALobject' differs from keyword `LocalObject' only in capitalization
-IdentAsKeyword.ice:50: keyword `LocalObject' cannot be used as dictionary name
-IdentAsKeyword.ice:52: parse error
-IdentAsKeyword.ice:53: illegal identifier: `MODULE' differs from keyword `module' only in capitalization
-IdentAsKeyword.ice:53: parse error
-IdentAsKeyword.ice:55: parse error
-IdentAsKeyword.ice:56: illegal identifier: `OUT' differs from keyword `out' only in capitalization
+IdentAsKeyword.ice:15: illegal identifier: `INTERFACE' differs from keyword `interface' only in capitalization
+IdentAsKeyword.ice:17: illegal identifier: `Void' differs from keyword `void' only in capitalization
+IdentAsKeyword.ice:17: keyword `void' cannot be used as exception name
+IdentAsKeyword.ice:18: keyword `int' cannot be used as exception name
+IdentAsKeyword.ice:20: illegal identifier: `OUT' differs from keyword `out' only in capitalization
+IdentAsKeyword.ice:20: keyword `out' cannot be used as struct name
+IdentAsKeyword.ice:21: keyword `double' cannot be used as struct name
+IdentAsKeyword.ice:23: illegal identifier: `Int' differs from keyword `int' only in capitalization
+IdentAsKeyword.ice:23: keyword `int' cannot be used as data member name
+IdentAsKeyword.ice:24: keyword `byte' cannot be used as data member name
+IdentAsKeyword.ice:25: illegal identifier: `Int' differs from keyword `int' only in capitalization
+IdentAsKeyword.ice:25: keyword `int' cannot be used as data member name
+IdentAsKeyword.ice:26: keyword `byte' cannot be used as data member name
+IdentAsKeyword.ice:28: illegal identifier: `inTERface' differs from keyword `interface' only in capitalization
+IdentAsKeyword.ice:28: keyword `interface' cannot be used as class name
+IdentAsKeyword.ice:29: keyword `interface' cannot be used as class name
+IdentAsKeyword.ice:31: illegal identifier: `MOdule' differs from keyword `module' only in capitalization
+IdentAsKeyword.ice:31: keyword `module' cannot be used as class name
+IdentAsKeyword.ice:32: keyword `module' cannot be used as class name
+IdentAsKeyword.ice:32: redefinition of class `module'
+IdentAsKeyword.ice:32: parse error
+IdentAsKeyword.ice:34: illegal identifier: `extendS' differs from keyword `extends' only in capitalization
+IdentAsKeyword.ice:34: keyword `extends' cannot be used as data member name
+IdentAsKeyword.ice:35: redefinition of class `C'
+IdentAsKeyword.ice:35: parse error
+IdentAsKeyword.ice:36: keyword `extends' cannot be used as data member name
+IdentAsKeyword.ice:38: keyword `local' cannot be used as interface name
+IdentAsKeyword.ice:39: illegal identifier: `Local' differs from keyword `local' only in capitalization
+IdentAsKeyword.ice:39: keyword `local' cannot be used as interface name
+IdentAsKeyword.ice:41: keyword `Object' cannot be used as interface name
+IdentAsKeyword.ice:42: illegal identifier: `object' differs from keyword `Object' only in capitalization
+IdentAsKeyword.ice:42: keyword `Object' cannot be used as interface name
+IdentAsKeyword.ice:42: redefinition of interface `Object'
+IdentAsKeyword.ice:42: parse error
+IdentAsKeyword.ice:43: keyword `long' cannot be used as interface name
+IdentAsKeyword.ice:45: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization
+IdentAsKeyword.ice:45: keyword `implements' cannot be used as sequence name
+IdentAsKeyword.ice:46: redefinition of sequence `implements' as sequence
+IdentAsKeyword.ice:46: keyword `implements' cannot be used as sequence name
+IdentAsKeyword.ice:47: keyword `short' cannot be used as sequence name
+IdentAsKeyword.ice:49: parse error
+IdentAsKeyword.ice:50: illegal identifier: `moDule' differs from keyword `module' only in capitalization
+IdentAsKeyword.ice:50: parse error
+IdentAsKeyword.ice:52: keyword `throws' cannot be used as dictionary name
+IdentAsKeyword.ice:53: illegal identifier: `thRows' differs from keyword `throws' only in capitalization
+IdentAsKeyword.ice:53: redefinition of dictionary `throws' as dictionary
+IdentAsKeyword.ice:53: keyword `throws' cannot be used as dictionary name
+IdentAsKeyword.ice:54: illegal identifier: `LOCALobject' differs from keyword `LocalObject' only in capitalization
+IdentAsKeyword.ice:54: keyword `LocalObject' cannot be used as dictionary name
IdentAsKeyword.ice:56: parse error
-IdentAsKeyword.ice:58: parse error
-IdentAsKeyword.ice:59: illegal identifier: `VOID' differs from keyword `void' only in capitalization
+IdentAsKeyword.ice:57: illegal identifier: `MODULE' differs from keyword `module' only in capitalization
+IdentAsKeyword.ice:57: parse error
IdentAsKeyword.ice:59: parse error
-IdentAsKeyword.ice:59: illegal identifier: `VOID' differs from keyword `void' only in capitalization
-IdentAsKeyword.ice:61: keyword `local' cannot be used as enumeration name
-IdentAsKeyword.ice:61: redefinition of interface `local' as enumeration
-IdentAsKeyword.ice:62: illegal identifier: `LOCAL' differs from keyword `local' only in capitalization
-IdentAsKeyword.ice:62: keyword `local' cannot be used as enumeration name
-IdentAsKeyword.ice:62: redefinition of interface `local' as enumeration
-IdentAsKeyword.ice:62: enumerator `c' differs only in capitalization from class `C'
-IdentAsKeyword.ice:64: keyword `long' cannot be used as enumerator
-IdentAsKeyword.ice:64: keyword `byte' cannot be used as enumerator
-IdentAsKeyword.ice:65: illegal identifier: `LONG' differs from keyword `long' only in capitalization
-IdentAsKeyword.ice:65: keyword `long' cannot be used as enumerator
-IdentAsKeyword.ice:65: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
-IdentAsKeyword.ice:65: keyword `byte' cannot be used as enumerator
-IdentAsKeyword.ice:67: keyword `module' cannot be used as operation name
-IdentAsKeyword.ice:68: illegal identifier: `mODule' differs from keyword `module' only in capitalization
-IdentAsKeyword.ice:68: keyword `module' cannot be used as operation name
-IdentAsKeyword.ice:70: keyword `exception' cannot be used as operation name
-IdentAsKeyword.ice:71: illegal identifier: `EXception' differs from keyword `exception' only in capitalization
-IdentAsKeyword.ice:71: keyword `exception' cannot be used as operation name
-IdentAsKeyword.ice:73: parse error
-IdentAsKeyword.ice:74: illegal identifier: `OUT' differs from keyword `out' only in capitalization
-IdentAsKeyword.ice:74: parse error
-IdentAsKeyword.ice:76: keyword `byte' cannot be used as parameter name
-IdentAsKeyword.ice:77: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
-IdentAsKeyword.ice:77: keyword `byte' cannot be used as parameter name
-IdentAsKeyword.ice:79: keyword `byte' cannot be used as parameter name
-IdentAsKeyword.ice:80: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
+IdentAsKeyword.ice:60: illegal identifier: `OUT' differs from keyword `out' only in capitalization
+IdentAsKeyword.ice:60: parse error
+IdentAsKeyword.ice:62: parse error
+IdentAsKeyword.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization
+IdentAsKeyword.ice:63: parse error
+IdentAsKeyword.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization
+IdentAsKeyword.ice:65: keyword `local' cannot be used as enumeration name
+IdentAsKeyword.ice:65: redefinition of interface `local' as enumeration
+IdentAsKeyword.ice:66: illegal identifier: `LOCAL' differs from keyword `local' only in capitalization
+IdentAsKeyword.ice:66: keyword `local' cannot be used as enumeration name
+IdentAsKeyword.ice:66: redefinition of interface `local' as enumeration
+IdentAsKeyword.ice:66: enumerator `c' differs only in capitalization from class `C'
+IdentAsKeyword.ice:68: keyword `long' cannot be used as enumerator
+IdentAsKeyword.ice:68: keyword `byte' cannot be used as enumerator
+IdentAsKeyword.ice:69: illegal identifier: `LONG' differs from keyword `long' only in capitalization
+IdentAsKeyword.ice:69: keyword `long' cannot be used as enumerator
+IdentAsKeyword.ice:69: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
+IdentAsKeyword.ice:69: keyword `byte' cannot be used as enumerator
+IdentAsKeyword.ice:71: keyword `module' cannot be used as operation name
+IdentAsKeyword.ice:72: illegal identifier: `mODule' differs from keyword `module' only in capitalization
+IdentAsKeyword.ice:72: keyword `module' cannot be used as operation name
+IdentAsKeyword.ice:74: keyword `exception' cannot be used as operation name
+IdentAsKeyword.ice:75: illegal identifier: `EXception' differs from keyword `exception' only in capitalization
+IdentAsKeyword.ice:75: keyword `exception' cannot be used as operation name
+IdentAsKeyword.ice:77: parse error
+IdentAsKeyword.ice:78: illegal identifier: `OUT' differs from keyword `out' only in capitalization
+IdentAsKeyword.ice:78: parse error
IdentAsKeyword.ice:80: keyword `byte' cannot be used as parameter name
-IdentAsKeyword.ice:84: warning: illegal underscore in identifier `_a'
-IdentAsKeyword.ice:85: warning: illegal underscore in identifier `_true'
-IdentAsKeyword.ice:86: warning: illegal underscore in identifier `_true'
-IdentAsKeyword.ice:88: warning: illegal underscore in identifier `b_'
-IdentAsKeyword.ice:89: warning: illegal underscore in identifier `tr_ue'
-IdentAsKeyword.ice:90: warning: illegal underscore in identifier `tr_ue'
+IdentAsKeyword.ice:81: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
+IdentAsKeyword.ice:81: keyword `byte' cannot be used as parameter name
+IdentAsKeyword.ice:83: keyword `byte' cannot be used as parameter name
+IdentAsKeyword.ice:84: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
+IdentAsKeyword.ice:84: keyword `byte' cannot be used as parameter name
+IdentAsKeyword.ice:88: warning: illegal underscore in identifier `_a'
+IdentAsKeyword.ice:89: warning: illegal underscore in identifier `_true'
+IdentAsKeyword.ice:90: warning: illegal underscore in identifier `_true'
+IdentAsKeyword.ice:92: warning: illegal underscore in identifier `b_'
+IdentAsKeyword.ice:93: warning: illegal underscore in identifier `tr_ue'
+IdentAsKeyword.ice:94: warning: illegal underscore in identifier `tr_ue'
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
index 269476ecfa4..0a6880e4578 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.err b/cpp/test/Slice/errorDetection/IllegalDeclaration.err
index 216543463a1..ef7539242c7 100644
--- a/cpp/test/Slice/errorDetection/IllegalDeclaration.err
+++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.err
@@ -1,2 +1,2 @@
-IllegalDeclaration.ice:11: exceptions cannot be forward declared
-IllegalDeclaration.ice:12: structs cannot be forward declared
+IllegalDeclaration.ice:15: exceptions cannot be forward declared
+IllegalDeclaration.ice:16: structs cannot be forward declared
diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
index f0345b51f60..9ed42c6472b 100644
--- a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.err b/cpp/test/Slice/errorDetection/IllegalDictionary.err
index e58062a7bac..5f43c053467 100644
--- a/cpp/test/Slice/errorDetection/IllegalDictionary.err
+++ b/cpp/test/Slice/errorDetection/IllegalDictionary.err
@@ -1,9 +1,9 @@
-IllegalDictionary.ice:8: dictionary `b1' uses an illegal key type
-IllegalDictionary.ice:9: dictionary `b2' uses an illegal key type
-IllegalDictionary.ice:10: dictionary `b3' uses an illegal key type
-IllegalDictionary.ice:11: dictionary `b4' uses an illegal key type
-IllegalDictionary.ice:12: dictionary `b5' uses an illegal key type
-IllegalDictionary.ice:18: dictionary `b6' uses an illegal key type
-IllegalDictionary.ice:21: dictionary `b7' uses an illegal key type
-IllegalDictionary.ice:35: dictionary `b8' uses an illegal key type
-IllegalDictionary.ice:43: dictionary `b9' uses an illegal key type
+IllegalDictionary.ice:22: dictionary `b1' uses an illegal key type
+IllegalDictionary.ice:23: dictionary `b2' uses an illegal key type
+IllegalDictionary.ice:24: dictionary `b3' uses an illegal key type
+IllegalDictionary.ice:25: dictionary `b4' uses an illegal key type
+IllegalDictionary.ice:26: dictionary `b5' uses an illegal key type
+IllegalDictionary.ice:32: dictionary `b6' uses an illegal key type
+IllegalDictionary.ice:35: dictionary `b7' uses an illegal key type
+IllegalDictionary.ice:49: dictionary `b8' uses an illegal key type
+IllegalDictionary.ice:57: dictionary `b9' uses an illegal key type
diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
index befcb29913a..3f3513a5505 100644
--- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
@@ -1,3 +1,17 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
dictionary<bool, long> d1; // OK
dictionary<byte, long> d2; // OK
dictionary<short, long> d3; // OK
diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.err b/cpp/test/Slice/errorDetection/IllegalLocal.err
index 5eefb3eec02..ef54e5273bb 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.err
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.err
@@ -1,20 +1,20 @@
-IllegalLocal.ice:5: non-local `i3' cannot have base local interface `i2'
-IllegalLocal.ice:11: non-local `c2' cannot have base local interface `i2'
-IllegalLocal.ice:17: non-local interface `i' cannot have operation `op' throwing local exception `le'
-IllegalLocal.ice:20: non-local exception `le2' cannot have local base exception `le'
-IllegalLocal.ice:26: non-local class`c3' cannot contain local member `lo1'
-IllegalLocal.ice:27: cannot create proxy for local interface `i2'
-IllegalLocal.ice:27: non-local class`c3' cannot contain local member `lo2'
-IllegalLocal.ice:28: non-local class`c3' cannot contain local member `lo3'
-IllegalLocal.ice:29: non-local class`c3' cannot contain local member `ls'
-IllegalLocal.ice:34: non-local struct`s1' cannot contain local member `ls'
-IllegalLocal.ice:39: non-local exception`e3' cannot contain local member `ls'
-IllegalLocal.ice:42: non-local sequence `los' cannot have local element type
-IllegalLocal.ice:45: non-local dictionary `d1' cannot have local key type
-IllegalLocal.ice:46: non-local dictionary `d2' cannot have local value type
-IllegalLocal.ice:47: non-local dictionary `d3' cannot have local key type
-IllegalLocal.ice:47: non-local dictionary `d3' cannot have local value type
-IllegalLocal.ice:52: non-local struct`s2' cannot contain local member `m'
-IllegalLocal.ice:58: non-local struct`s3' cannot contain local member `e'
-IllegalLocal.ice:63: non-local interface `i5' cannot have local parameter `p' in operation `op'
-IllegalLocal.ice:64: non-local interface `i5' cannot have operation `op2' with local return type
+IllegalLocal.ice:19: non-local `i3' cannot have base local interface `i2'
+IllegalLocal.ice:25: non-local `c2' cannot have base local interface `i2'
+IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le'
+IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le'
+IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1'
+IllegalLocal.ice:41: cannot create proxy for local interface `i2'
+IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2'
+IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3'
+IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls'
+IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls'
+IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls'
+IllegalLocal.ice:56: non-local sequence `los' cannot have local element type
+IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type
+IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type
+IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type
+IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type
+IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m'
+IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e'
+IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op'
+IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type
diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice
index 92cf9e0d9aa..7e63a3f1ce6 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.ice
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice
@@ -1,3 +1,17 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
interface i1 {};
local interface i2 extends i1 {}; // OK
diff --git a/cpp/test/Slice/errorDetection/IllegalMI.err b/cpp/test/Slice/errorDetection/IllegalMI.err
index c88c80811fd..f9b3d846c31 100644
--- a/cpp/test/Slice/errorDetection/IllegalMI.err
+++ b/cpp/test/Slice/errorDetection/IllegalMI.err
@@ -1,26 +1,26 @@
-IllegalMI.ice:46: ambiguous multiple inheritance: `A3' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:69: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:91: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:113: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:154: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:176: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:198: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:221: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:271: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:297: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:323: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:349: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:375: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:401: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:428: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:455: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:482: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:509: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:537: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:604: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:638: operation `op' is already defined as an operation in a base interface or class
-IllegalMI.ice:759: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:820: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:881: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:940: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
-IllegalMI.ice:999: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:50: ambiguous multiple inheritance: `A3' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:73: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:95: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:117: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:158: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:180: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:202: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:225: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:275: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:301: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:327: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:353: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:379: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:405: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:432: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:459: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:486: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:513: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:541: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:608: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:642: operation `op' is already defined as an operation in a base interface or class
+IllegalMI.ice:763: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:824: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:885: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:944: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
+IllegalMI.ice:1003: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces
diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice
index 902ea19fe8c..00ef9063170 100644
--- a/cpp/test/Slice/errorDetection/IllegalMI.ice
+++ b/cpp/test/Slice/errorDetection/IllegalMI.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err
index 31c81068873..a7dfbac0f16 100644
--- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err
+++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err
@@ -1,26 +1,26 @@
-IllegalUseOfKeyword.ice:11: keyword `module' cannot be used as exception name
-IllegalUseOfKeyword.ice:11: exceptions cannot be forward declared
-IllegalUseOfKeyword.ice:12: keyword `void' cannot be used as exception name
-IllegalUseOfKeyword.ice:17: keyword `exception' cannot be used as struct name
-IllegalUseOfKeyword.ice:17: structs cannot be forward declared
-IllegalUseOfKeyword.ice:18: keyword `class' cannot be used as struct name
-IllegalUseOfKeyword.ice:23: keyword `interface' cannot be used as class name
-IllegalUseOfKeyword.ice:24: keyword `struct' cannot be used as class name
-IllegalUseOfKeyword.ice:30: keyword `local' cannot be used as interface name
-IllegalUseOfKeyword.ice:31: keyword `extends' cannot be used as interface name
-IllegalUseOfKeyword.ice:38: keyword `implements' cannot be used as operation name
-IllegalUseOfKeyword.ice:40: keyword `throws' cannot be used as parameter name
-IllegalUseOfKeyword.ice:40: keyword `void' cannot be used as parameter name
-IllegalUseOfKeyword.ice:42: keyword `byte' cannot be used as parameter name
-IllegalUseOfKeyword.ice:42: keyword `short' cannot be used as parameter name
-IllegalUseOfKeyword.ice:47: keyword `int' cannot be used as data member name
-IllegalUseOfKeyword.ice:48: keyword `long' cannot be used as data member name
-IllegalUseOfKeyword.ice:49: keyword `float' cannot be used as data member name
-IllegalUseOfKeyword.ice:50: keyword `double' cannot be used as data member name
-IllegalUseOfKeyword.ice:53: keyword `Object' cannot be used as sequence name
-IllegalUseOfKeyword.ice:55: keyword `LocalObject' cannot be used as dictionary name
-IllegalUseOfKeyword.ice:57: keyword `string' cannot be used as enumeration name
-IllegalUseOfKeyword.ice:64: keyword `sequence' cannot be used as enumerator
-IllegalUseOfKeyword.ice:65: keyword `dictionary' cannot be used as enumerator
-IllegalUseOfKeyword.ice:66: keyword `enum' cannot be used as enumerator
-IllegalUseOfKeyword.ice:70: illegal inheritance from type Object
+IllegalUseOfKeyword.ice:15: keyword `module' cannot be used as exception name
+IllegalUseOfKeyword.ice:15: exceptions cannot be forward declared
+IllegalUseOfKeyword.ice:16: keyword `void' cannot be used as exception name
+IllegalUseOfKeyword.ice:21: keyword `exception' cannot be used as struct name
+IllegalUseOfKeyword.ice:21: structs cannot be forward declared
+IllegalUseOfKeyword.ice:22: keyword `class' cannot be used as struct name
+IllegalUseOfKeyword.ice:27: keyword `interface' cannot be used as class name
+IllegalUseOfKeyword.ice:28: keyword `struct' cannot be used as class name
+IllegalUseOfKeyword.ice:34: keyword `local' cannot be used as interface name
+IllegalUseOfKeyword.ice:35: keyword `extends' cannot be used as interface name
+IllegalUseOfKeyword.ice:42: keyword `implements' cannot be used as operation name
+IllegalUseOfKeyword.ice:44: keyword `throws' cannot be used as parameter name
+IllegalUseOfKeyword.ice:44: keyword `void' cannot be used as parameter name
+IllegalUseOfKeyword.ice:46: keyword `byte' cannot be used as parameter name
+IllegalUseOfKeyword.ice:46: keyword `short' cannot be used as parameter name
+IllegalUseOfKeyword.ice:51: keyword `int' cannot be used as data member name
+IllegalUseOfKeyword.ice:52: keyword `long' cannot be used as data member name
+IllegalUseOfKeyword.ice:53: keyword `float' cannot be used as data member name
+IllegalUseOfKeyword.ice:54: keyword `double' cannot be used as data member name
+IllegalUseOfKeyword.ice:57: keyword `Object' cannot be used as sequence name
+IllegalUseOfKeyword.ice:59: keyword `LocalObject' cannot be used as dictionary name
+IllegalUseOfKeyword.ice:61: keyword `string' cannot be used as enumeration name
+IllegalUseOfKeyword.ice:68: keyword `sequence' cannot be used as enumerator
+IllegalUseOfKeyword.ice:69: keyword `dictionary' cannot be used as enumerator
+IllegalUseOfKeyword.ice:70: keyword `enum' cannot be used as enumerator
+IllegalUseOfKeyword.ice:74: illegal inheritance from type Object
diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
index 93fb07fe880..82738f51556 100644
--- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.err b/cpp/test/Slice/errorDetection/InterfaceMismatch.err
index 98dcd23a0f6..ae710e0e193 100644
--- a/cpp/test/Slice/errorDetection/InterfaceMismatch.err
+++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.err
@@ -1,8 +1,8 @@
-InterfaceMismatch.ice:12: class `Foo1' was declared as interface
-InterfaceMismatch.ice:13: class `Foo1' was declared as interface
-InterfaceMismatch.ice:13: parse error
-InterfaceMismatch.ice:16: class `Foo2' was defined as interface
-InterfaceMismatch.ice:19: interface `Foo3' was declared as class
-InterfaceMismatch.ice:20: interface `Foo3' was declared as class
-InterfaceMismatch.ice:20: parse error
-InterfaceMismatch.ice:23: interface `Foo4' was defined as class
+InterfaceMismatch.ice:16: class `Foo1' was declared as interface
+InterfaceMismatch.ice:17: class `Foo1' was declared as interface
+InterfaceMismatch.ice:17: parse error
+InterfaceMismatch.ice:20: class `Foo2' was defined as interface
+InterfaceMismatch.ice:23: interface `Foo3' was declared as class
+InterfaceMismatch.ice:24: interface `Foo3' was declared as class
+InterfaceMismatch.ice:24: parse error
+InterfaceMismatch.ice:27: interface `Foo4' was defined as class
diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
index 78beccc7543..f367c59d102 100644
--- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.err b/cpp/test/Slice/errorDetection/InterfaceRedefinition.err
index 57f547d7bd6..d94d4658598 100644
--- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.err
+++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.err
@@ -1,4 +1,4 @@
-InterfaceRedefinition.ice:12: redefinition of interface `Intf1'
-InterfaceRedefinition.ice:12: parse error
-InterfaceRedefinition.ice:16: redefinition of interface `Intf2'
+InterfaceRedefinition.ice:16: redefinition of interface `Intf1'
InterfaceRedefinition.ice:16: parse error
+InterfaceRedefinition.ice:20: redefinition of interface `Intf2'
+InterfaceRedefinition.ice:20: parse error
diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
index 49aed46057a..5e8db486196 100644
--- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.err b/cpp/test/Slice/errorDetection/LocalMismatch.err
index a2b7807177d..f91cc2209c7 100644
--- a/cpp/test/Slice/errorDetection/LocalMismatch.err
+++ b/cpp/test/Slice/errorDetection/LocalMismatch.err
@@ -1,16 +1,16 @@
-LocalMismatch.ice:12: local `Intf1' was declared non-local
-LocalMismatch.ice:13: local `Intf1' was declared non-local
-LocalMismatch.ice:13: parse error
-LocalMismatch.ice:16: local `Intf2' was defined non-local
-LocalMismatch.ice:19: non-local `Intf3' was declared local
-LocalMismatch.ice:20: non-local `Intf3' was declared local
-LocalMismatch.ice:20: parse error
-LocalMismatch.ice:23: non-local `Intf4' was defined local
-LocalMismatch.ice:26: local `Class1' was declared non-local
-LocalMismatch.ice:27: local `Class1' was declared non-local
-LocalMismatch.ice:27: parse error
-LocalMismatch.ice:30: local `Class2' was defined non-local
-LocalMismatch.ice:33: non-local `Class3' was declared local
-LocalMismatch.ice:34: non-local `Class3' was declared local
-LocalMismatch.ice:34: parse error
-LocalMismatch.ice:37: non-local `Class4' was defined local
+LocalMismatch.ice:16: local `Intf1' was declared non-local
+LocalMismatch.ice:17: local `Intf1' was declared non-local
+LocalMismatch.ice:17: parse error
+LocalMismatch.ice:20: local `Intf2' was defined non-local
+LocalMismatch.ice:23: non-local `Intf3' was declared local
+LocalMismatch.ice:24: non-local `Intf3' was declared local
+LocalMismatch.ice:24: parse error
+LocalMismatch.ice:27: non-local `Intf4' was defined local
+LocalMismatch.ice:30: local `Class1' was declared non-local
+LocalMismatch.ice:31: local `Class1' was declared non-local
+LocalMismatch.ice:31: parse error
+LocalMismatch.ice:34: local `Class2' was defined non-local
+LocalMismatch.ice:37: non-local `Class3' was declared local
+LocalMismatch.ice:38: non-local `Class3' was declared local
+LocalMismatch.ice:38: parse error
+LocalMismatch.ice:41: non-local `Class4' was defined local
diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice
index f20a9ef34a3..53914d18cba 100644
--- a/cpp/test/Slice/errorDetection/LocalMismatch.ice
+++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err
index 12901a65000..c82cf68b992 100644
--- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err
+++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err
@@ -1,6 +1,6 @@
-NameCanNotBeUsed.ice:13: class name `Foo' cannot be used as operation name
-NameCanNotBeUsed.ice:19: interface name `IFoo' cannot be used as operation name
-NameCanNotBeUsed.ice:24: class name `Bar' cannot be used as data member name
-NameCanNotBeUsed.ice:30: exception name `EBar' cannot be used as exception member name
-NameCanNotBeUsed.ice:35: struct name `SBar' cannot be used as member name
-NameCanNotBeUsed.ice:36: struct `SBar' must have at least one member
+NameCanNotBeUsed.ice:17: class name `Foo' cannot be used as operation name
+NameCanNotBeUsed.ice:23: interface name `IFoo' cannot be used as operation name
+NameCanNotBeUsed.ice:28: class name `Bar' cannot be used as data member name
+NameCanNotBeUsed.ice:34: exception name `EBar' cannot be used as exception member name
+NameCanNotBeUsed.ice:39: struct name `SBar' cannot be used as member name
+NameCanNotBeUsed.ice:40: struct `SBar' must have at least one member
diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
index 4513b9a6f09..5b9717e9a32 100644
--- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
+++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.err b/cpp/test/Slice/errorDetection/NotClassOrInterface.err
index 6dd8300ba7c..d9df5d08fa3 100644
--- a/cpp/test/Slice/errorDetection/NotClassOrInterface.err
+++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.err
@@ -1,9 +1,9 @@
-NotClassOrInterface.ice:15: `Seq' is not an interface
-NotClassOrInterface.ice:16: `Seq' is not a class
-NotClassOrInterface.ice:17: `Sequence3' is not an interface
-NotClassOrInterface.ice:17: `Sequence2' is not an interface
-NotClassOrInterface.ice:17: `Sequence1' is not an interface
-NotClassOrInterface.ice:18: `Seq' is not a class
-NotClassOrInterface.ice:18: `Sequence3' is not an interface
-NotClassOrInterface.ice:18: `Sequence2' is not an interface
-NotClassOrInterface.ice:18: `Sequence1' is not an interface
+NotClassOrInterface.ice:19: `Seq' is not an interface
+NotClassOrInterface.ice:20: `Seq' is not a class
+NotClassOrInterface.ice:21: `Sequence3' is not an interface
+NotClassOrInterface.ice:21: `Sequence2' is not an interface
+NotClassOrInterface.ice:21: `Sequence1' is not an interface
+NotClassOrInterface.ice:22: `Seq' is not a class
+NotClassOrInterface.ice:22: `Sequence3' is not an interface
+NotClassOrInterface.ice:22: `Sequence2' is not an interface
+NotClassOrInterface.ice:22: `Sequence1' is not an interface
diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
index 708dcb306d7..5cc8c7efa39 100644
--- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
+++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/NotException.err b/cpp/test/Slice/errorDetection/NotException.err
index 95293440630..6375c8e83b2 100644
--- a/cpp/test/Slice/errorDetection/NotException.err
+++ b/cpp/test/Slice/errorDetection/NotException.err
@@ -1,4 +1,4 @@
-NotException.ice:20: `C' is not an exception
-NotException.ice:21: `S' is not an exception
-NotException.ice:22: `D' is not an exception
-NotException.ice:23: keyword `int' cannot be used as exception name
+NotException.ice:24: `C' is not an exception
+NotException.ice:25: `S' is not an exception
+NotException.ice:26: `D' is not an exception
+NotException.ice:27: keyword `int' cannot be used as exception name
diff --git a/cpp/test/Slice/errorDetection/NotException.ice b/cpp/test/Slice/errorDetection/NotException.ice
index c06fc61fc92..27af9390b2a 100644
--- a/cpp/test/Slice/errorDetection/NotException.ice
+++ b/cpp/test/Slice/errorDetection/NotException.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/NotType.err b/cpp/test/Slice/errorDetection/NotType.err
index 5d36239a258..b28ddbc7502 100644
--- a/cpp/test/Slice/errorDetection/NotType.err
+++ b/cpp/test/Slice/errorDetection/NotType.err
@@ -1,15 +1,15 @@
-NotType.ice:17: `Mod' is not a type
-NotType.ice:18: `Mod' is not a type
-NotType.ice:19: `Mod' is not a type
-NotType.ice:20: `Mod' is not a type
-NotType.ice:21: `Module3' is not a type
-NotType.ice:21: `Module2' is not a type
-NotType.ice:21: `Module1' is not a type
+NotType.ice:21: `Mod' is not a type
NotType.ice:22: `Mod' is not a type
-NotType.ice:22: `Module3' is not a type
-NotType.ice:22: `Module2' is not a type
-NotType.ice:22: `Module1' is not a type
-NotType.ice:30: `E' is an exception, which cannot be used as a type
-NotType.ice:31: struct `S' must have at least one member
-NotType.ice:35: `E' is an exception, which cannot be used as a type
-NotType.ice:35: `E' is an exception, which cannot be used as a type
+NotType.ice:23: `Mod' is not a type
+NotType.ice:24: `Mod' is not a type
+NotType.ice:25: `Module3' is not a type
+NotType.ice:25: `Module2' is not a type
+NotType.ice:25: `Module1' is not a type
+NotType.ice:26: `Mod' is not a type
+NotType.ice:26: `Module3' is not a type
+NotType.ice:26: `Module2' is not a type
+NotType.ice:26: `Module1' is not a type
+NotType.ice:34: `E' is an exception, which cannot be used as a type
+NotType.ice:35: struct `S' must have at least one member
+NotType.ice:39: `E' is an exception, which cannot be used as a type
+NotType.ice:39: `E' is an exception, which cannot be used as a type
diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice
index 4557da3cb7f..202034299b3 100644
--- a/cpp/test/Slice/errorDetection/NotType.ice
+++ b/cpp/test/Slice/errorDetection/NotType.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.err b/cpp/test/Slice/errorDetection/OperationRedefinition.err
index 240f23410d6..befa3ed4cdf 100644
--- a/cpp/test/Slice/errorDetection/OperationRedefinition.err
+++ b/cpp/test/Slice/errorDetection/OperationRedefinition.err
@@ -1 +1 @@
-OperationRedefinition.ice:14: redefinition of operation `operation' as operation `operation'
+OperationRedefinition.ice:18: redefinition of operation `operation' as operation `operation'
diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
index 1b793fb69bd..359dd8aa937 100644
--- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err
index c1f3635177c..0eede01a786 100644
--- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err
+++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err
@@ -1,2 +1,2 @@
-ParamsOutOfOrder.ice:13: `l3': in parameters cannot follow out parameters
-ParamsOutOfOrder.ice:14: `l3': in parameters cannot follow out parameters
+ParamsOutOfOrder.ice:17: `l3': in parameters cannot follow out parameters
+ParamsOutOfOrder.ice:18: `l3': in parameters cannot follow out parameters
diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
index 24261977f3e..1d5184e31b3 100644
--- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
+++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.err b/cpp/test/Slice/errorDetection/RedefinitionAsClass.err
index dd46aca7d70..8cfe1c1173a 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.err
@@ -1,2 +1,2 @@
-RedefinitionAsClass.ice:12: declaration of already defined `Sequence1' as class
-RedefinitionAsClass.ice:15: redefinition of sequence `Sequence2' as class
+RedefinitionAsClass.ice:16: declaration of already defined `Sequence1' as class
+RedefinitionAsClass.ice:19: redefinition of sequence `Sequence2' as class
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
index 11ab9e02a56..3a3bd9f8b7f 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err
index 502fcc8e523..dbbf3f68d98 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err
@@ -1 +1 @@
-RedefinitionAsDataMember.ice:14: redefinition of operation `operation' as data member `operation'
+RedefinitionAsDataMember.ice:18: redefinition of operation `operation' as data member `operation'
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
index 15564403a79..bb6f785ea0a 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err
index 60014b2d2c8..8a6858f8b90 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err
@@ -1 +1 @@
-RedefinitionAsDictionary.ice:12: redefinition of class `C' as dictionary
+RedefinitionAsDictionary.ice:16: redefinition of class `C' as dictionary
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
index 72aab19a267..585eb6e53c1 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err
index 0749ccc2ad4..78992bb773b 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err
@@ -1,2 +1,2 @@
-RedefinitionAsEnum.ice:12: redefinition of class `C' as enumeration
-RedefinitionAsEnum.ice:12: redefinition of class `C' as enumerator
+RedefinitionAsEnum.ice:16: redefinition of class `C' as enumeration
+RedefinitionAsEnum.ice:16: redefinition of class `C' as enumerator
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
index e5b4bb2004d..286d3d7ea78 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err
index cbf033e008b..ca3919b9536 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err
@@ -1,2 +1,2 @@
-RedefinitionAsEnumerator.ice:13: redefinition of class `C' as enumerator
-RedefinitionAsEnumerator.ice:13: redefinition of sequence `Seq' as enumerator
+RedefinitionAsEnumerator.ice:17: redefinition of class `C' as enumerator
+RedefinitionAsEnumerator.ice:17: redefinition of sequence `Seq' as enumerator
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice
index c5d411ca0ec..20b7447e63c 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err
index 21139424809..2a5d92b882c 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err
@@ -1,2 +1,2 @@
-RedefinitionAsInterface.ice:12: declaration of already defined `Sequence1' as interface
-RedefinitionAsInterface.ice:15: redefinition of sequence `Sequence2' as interface
+RedefinitionAsInterface.ice:16: declaration of already defined `Sequence1' as interface
+RedefinitionAsInterface.ice:19: redefinition of sequence `Sequence2' as interface
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
index bcb23f8c69e..98447dd4252 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.err b/cpp/test/Slice/errorDetection/RedefinitionAsModule.err
index 2991d9dce09..680ec8ab739 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.err
@@ -1 +1 @@
-RedefinitionAsModule.ice:12: redefinition of sequence `Seq' as module
+RedefinitionAsModule.ice:16: redefinition of sequence `Seq' as module
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
index d2ac2e80d4d..d18f0d407cb 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err
index ec261129525..361a03d9192 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err
@@ -1 +1 @@
-RedefinitionAsOperation.ice:14: redefinition of data member `member' as operation `member'
+RedefinitionAsOperation.ice:18: redefinition of data member `member' as operation `member'
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
index 07e3a3703f2..39f46e60573 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err
index ec61073f58a..706eb02db02 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err
@@ -1 +1 @@
-RedefinitionAsSequence.ice:12: redefinition of class `C' as sequence
+RedefinitionAsSequence.ice:16: redefinition of class `C' as sequence
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
index 5c98a5e8f33..954d7f12372 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/Reserved.err b/cpp/test/Slice/errorDetection/Reserved.err
index 79d7531c3d8..9ea9fb7f805 100644
--- a/cpp/test/Slice/errorDetection/Reserved.err
+++ b/cpp/test/Slice/errorDetection/Reserved.err
@@ -1,21 +1,21 @@
-Reserved.ice:29: illegal identifier `Prx': `Prx' suffix is reserved
-Reserved.ice:30: illegal identifier `abcPrx': `Prx' suffix is reserved
-Reserved.ice:31: illegal identifier `Ptr': `Ptr' suffix is reserved
-Reserved.ice:32: illegal identifier `abcPtr': `Ptr' suffix is reserved
-Reserved.ice:33: illegal identifier `Helper': `Helper' suffix is reserved
-Reserved.ice:34: illegal identifier `abcHelper': `Helper' suffix is reserved
-Reserved.ice:35: illegal identifier `Holder': `Holder' suffix is reserved
-Reserved.ice:36: illegal identifier `abcHolder': `Holder' suffix is reserved
-Reserved.ice:37: illegal identifier `Operations': `Operations' suffix is reserved
-Reserved.ice:38: illegal identifier `abcOperations': `Operations' suffix is reserved
-Reserved.ice:39: illegal identifier `Ice': `Ice' prefix is reserved
-Reserved.ice:40: illegal identifier `ice': `ice' prefix is reserved
-Reserved.ice:40: constant `ice' differs only in capitalization from constant `Ice'
-Reserved.ice:41: illegal identifier `icea': `ice' prefix is reserved
-Reserved.ice:42: illegal identifier `Iceblah': `Ice' prefix is reserved
-Reserved.ice:43: illegal identifier `IceFoo': `Ice' prefix is reserved
-Reserved.ice:44: illegal identifier `icecream': `ice' prefix is reserved
-Reserved.ice:45: illegal identifier `ICEpick': `ICE' prefix is reserved
-Reserved.ice:46: illegal identifier `iCEaxe': `iCE' prefix is reserved
-Reserved.ice:49: illegal identifier `Ice': `Ice' prefix is reserved
-Reserved.ice:50: illegal identifier `IceFoo': `Ice' prefix is reserved
+Reserved.ice:33: illegal identifier `Prx': `Prx' suffix is reserved
+Reserved.ice:34: illegal identifier `abcPrx': `Prx' suffix is reserved
+Reserved.ice:35: illegal identifier `Ptr': `Ptr' suffix is reserved
+Reserved.ice:36: illegal identifier `abcPtr': `Ptr' suffix is reserved
+Reserved.ice:37: illegal identifier `Helper': `Helper' suffix is reserved
+Reserved.ice:38: illegal identifier `abcHelper': `Helper' suffix is reserved
+Reserved.ice:39: illegal identifier `Holder': `Holder' suffix is reserved
+Reserved.ice:40: illegal identifier `abcHolder': `Holder' suffix is reserved
+Reserved.ice:41: illegal identifier `Operations': `Operations' suffix is reserved
+Reserved.ice:42: illegal identifier `abcOperations': `Operations' suffix is reserved
+Reserved.ice:43: illegal identifier `Ice': `Ice' prefix is reserved
+Reserved.ice:44: illegal identifier `ice': `ice' prefix is reserved
+Reserved.ice:44: constant `ice' differs only in capitalization from constant `Ice'
+Reserved.ice:45: illegal identifier `icea': `ice' prefix is reserved
+Reserved.ice:46: illegal identifier `Iceblah': `Ice' prefix is reserved
+Reserved.ice:47: illegal identifier `IceFoo': `Ice' prefix is reserved
+Reserved.ice:48: illegal identifier `icecream': `ice' prefix is reserved
+Reserved.ice:49: illegal identifier `ICEpick': `ICE' prefix is reserved
+Reserved.ice:50: illegal identifier `iCEaxe': `iCE' prefix is reserved
+Reserved.ice:53: illegal identifier `Ice': `Ice' prefix is reserved
+Reserved.ice:54: illegal identifier `IceFoo': `Ice' prefix is reserved
diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice
index f198259d6d4..efeab30dada 100644
--- a/cpp/test/Slice/errorDetection/Reserved.ice
+++ b/cpp/test/Slice/errorDetection/Reserved.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/SelfContainment.err b/cpp/test/Slice/errorDetection/SelfContainment.err
index a87b053e7f2..4af59683fbb 100644
--- a/cpp/test/Slice/errorDetection/SelfContainment.err
+++ b/cpp/test/Slice/errorDetection/SelfContainment.err
@@ -1 +1 @@
-SelfContainment.ice:4: struct `x' cannot contain itself
+SelfContainment.ice:18: struct `x' cannot contain itself
diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice
index 25dd5f90f37..9422e4b2df8 100644
--- a/cpp/test/Slice/errorDetection/SelfContainment.ice
+++ b/cpp/test/Slice/errorDetection/SelfContainment.ice
@@ -1,3 +1,17 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// ZeroC, Inc.
+// Huntsville, AL, 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.
+//
+// **********************************************************************
+
struct x
{
int i;
diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.err b/cpp/test/Slice/errorDetection/SequenceRedefinition.err
index a4a2ff915a4..98e9430ad5b 100644
--- a/cpp/test/Slice/errorDetection/SequenceRedefinition.err
+++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.err
@@ -1 +1 @@
-SequenceRedefinition.ice:12: redefinition of sequence `Seq' as sequence
+SequenceRedefinition.ice:16: redefinition of sequence `Seq' as sequence
diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
index 29ed8ed6f59..ce38d50655f 100644
--- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/StructMembers.err b/cpp/test/Slice/errorDetection/StructMembers.err
index 188a8ff2d9d..a92a2f1eb92 100644
--- a/cpp/test/Slice/errorDetection/StructMembers.err
+++ b/cpp/test/Slice/errorDetection/StructMembers.err
@@ -1,7 +1,7 @@
-StructMembers.ice:13: struct `s1' must have at least one member
-StructMembers.ice:45: missing data member name
-StructMembers.ice:51: missing data member name
-StructMembers.ice:51: `;' missing after definition
+StructMembers.ice:17: struct `s1' must have at least one member
+StructMembers.ice:49: missing data member name
StructMembers.ice:55: missing data member name
-StructMembers.ice:61: missing data member name
-StructMembers.ice:61: `;' missing after definition
+StructMembers.ice:55: `;' missing after definition
+StructMembers.ice:59: missing data member name
+StructMembers.ice:65: missing data member name
+StructMembers.ice:65: `;' missing after definition
diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice
index 2f45e43a9f4..993c4523db9 100644
--- a/cpp/test/Slice/errorDetection/StructMembers.ice
+++ b/cpp/test/Slice/errorDetection/StructMembers.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/Undefined.err b/cpp/test/Slice/errorDetection/Undefined.err
index be2203abc3f..e069c49a3eb 100644
--- a/cpp/test/Slice/errorDetection/Undefined.err
+++ b/cpp/test/Slice/errorDetection/Undefined.err
@@ -1,11 +1,11 @@
-Undefined.ice:11: `Foo' is not defined
-Undefined.ice:12: `Foo' is not defined
-Undefined.ice:13: `Foo' is not defined
-Undefined.ice:14: `Foo' is not defined
-Undefined.ice:15: `Foo3' is not defined
-Undefined.ice:15: `Foo2' is not defined
-Undefined.ice:15: `Foo1' is not defined
+Undefined.ice:15: `Foo' is not defined
Undefined.ice:16: `Foo' is not defined
-Undefined.ice:16: `Foo3' is not defined
-Undefined.ice:16: `Foo2' is not defined
-Undefined.ice:16: `Foo1' is not defined
+Undefined.ice:17: `Foo' is not defined
+Undefined.ice:18: `Foo' is not defined
+Undefined.ice:19: `Foo3' is not defined
+Undefined.ice:19: `Foo2' is not defined
+Undefined.ice:19: `Foo1' is not defined
+Undefined.ice:20: `Foo' is not defined
+Undefined.ice:20: `Foo3' is not defined
+Undefined.ice:20: `Foo2' is not defined
+Undefined.ice:20: `Foo1' is not defined
diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice
index 9dd8e99506b..792da526310 100644
--- a/cpp/test/Slice/errorDetection/Undefined.ice
+++ b/cpp/test/Slice/errorDetection/Undefined.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.err b/cpp/test/Slice/errorDetection/WrongProxyType.err
index 0b385867a0a..8665b846f14 100644
--- a/cpp/test/Slice/errorDetection/WrongProxyType.err
+++ b/cpp/test/Slice/errorDetection/WrongProxyType.err
@@ -1,6 +1,6 @@
-WrongProxyType.ice:16: `Seq' must be class or interface
-WrongProxyType.ice:17: `Seq' must be class or interface
-WrongProxyType.ice:18: `Seq' must be class or interface
-WrongProxyType.ice:20: `Dict' must be class or interface
-WrongProxyType.ice:21: `Dict' must be class or interface
-WrongProxyType.ice:22: `Dict' must be class or interface
+WrongProxyType.ice:20: `Seq' must be class or interface
+WrongProxyType.ice:21: `Seq' must be class or interface
+WrongProxyType.ice:22: `Seq' must be class or interface
+WrongProxyType.ice:24: `Dict' must be class or interface
+WrongProxyType.ice:25: `Dict' must be class or interface
+WrongProxyType.ice:26: `Dict' must be class or interface
diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice
index bd33c3c7d06..8cee4008789 100644
--- a/cpp/test/Slice/errorDetection/WrongProxyType.ice
+++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/include/IcePrefix.ice b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
index 4c6257c73eb..cfa4e7edb11 100644
--- a/cpp/test/Slice/errorDetection/include/IcePrefix.ice
+++ b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py
index fc18bad69b8..2908efd341c 100755
--- a/cpp/test/Slice/errorDetection/run.py
+++ b/cpp/test/Slice/errorDetection/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/XMLTransform/Makefile b/cpp/test/XMLTransform/Makefile
index 534e158d0d6..0311302e04c 100644
--- a/cpp/test/XMLTransform/Makefile
+++ b/cpp/test/XMLTransform/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/XMLTransform/transform/Makefile b/cpp/test/XMLTransform/transform/Makefile
index 781a8cb7a9b..985c4b27c15 100644
--- a/cpp/test/XMLTransform/transform/Makefile
+++ b/cpp/test/XMLTransform/transform/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/XMLTransform/transform/Populate.cpp b/cpp/test/XMLTransform/transform/Populate.cpp
index b79075fd56e..50601953437 100644
--- a/cpp/test/XMLTransform/transform/Populate.cpp
+++ b/cpp/test/XMLTransform/transform/Populate.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/XMLTransform/transform/Validate.cpp b/cpp/test/XMLTransform/transform/Validate.cpp
index 4b25e733327..2dc311f31e6 100644
--- a/cpp/test/XMLTransform/transform/Validate.cpp
+++ b/cpp/test/XMLTransform/transform/Validate.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/XMLTransform/transform/run.py b/cpp/test/XMLTransform/transform/run.py
index f8239b2c3f0..1ef1cb30895 100755
--- a/cpp/test/XMLTransform/transform/run.py
+++ b/cpp/test/XMLTransform/transform/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2002
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Yellow/Makefile b/cpp/test/Yellow/Makefile
index 709fde60e40..48abf0f7b66 100644
--- a/cpp/test/Yellow/Makefile
+++ b/cpp/test/Yellow/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Yellow/basicYellow/Client.cpp b/cpp/test/Yellow/basicYellow/Client.cpp
index 18f35975d13..6b0c69a656f 100644
--- a/cpp/test/Yellow/basicYellow/Client.cpp
+++ b/cpp/test/Yellow/basicYellow/Client.cpp
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************
diff --git a/cpp/test/Yellow/basicYellow/Makefile b/cpp/test/Yellow/basicYellow/Makefile
index e6ef665faa9..ef5187c32da 100644
--- a/cpp/test/Yellow/basicYellow/Makefile
+++ b/cpp/test/Yellow/basicYellow/Makefile
@@ -2,9 +2,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/Yellow/basicYellow/run.py b/cpp/test/Yellow/basicYellow/run.py
index 1a7b88ef90f..4b705cc15d0 100755
--- a/cpp/test/Yellow/basicYellow/run.py
+++ b/cpp/test/Yellow/basicYellow/run.py
@@ -3,9 +3,13 @@
#
# Copyright (c) 2001
# ZeroC, Inc.
-# Huntsville, AL, USA
+# Billerica, MA, USA
#
-# All Rights Reserved
+# 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.
#
# **********************************************************************
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index 7416651b73d..7c3b93b6d06 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.h
@@ -2,9 +2,13 @@
//
// Copyright (c) 2001
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// 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.
//
// **********************************************************************