Fix 3306 - Plugin -> Plug-in

10 files changed, 23 insertions, 23 deletions

diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index dd72f15ed82..4b584274039 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -635,7 +635,7 @@ void
 Ice::PluginInitializationException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nplugin initialization failed";
+    out << ":\nplug-in initialization failed";
     if(!reason.empty())
     {
         out << ": " << reason;
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index a41030e3065..8c7ad3ed4e8 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -757,7 +757,7 @@ void
 IceInternal::Instance::setStringConverter(const Ice::StringConverterPtr& stringConverter)
 {
     //
-    // No locking, as it can only be called during plugin loading
+    // No locking, as it can only be called during plug-in loading
     //
     _initData.stringConverter = stringConverter;
 }
@@ -766,7 +766,7 @@ void
 IceInternal::Instance::setWstringConverter(const Ice::WstringConverterPtr& wstringConverter)
 {
     //
-    // No locking, as it can only be called during plugin loading
+    // No locking, as it can only be called during plug-in loading
     //
     _initData.wstringConverter = wstringConverter;
 }
@@ -775,7 +775,7 @@ void
 IceInternal::Instance::setLogger(const Ice::LoggerPtr& logger)
 {
     //
-    // No locking, as it can only be called during plugin loading
+    // No locking, as it can only be called during plug-in loading
     //
     _initData.logger = logger;
 }
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index d19e195b622..a12eff6b937 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -29,12 +29,12 @@ Ice::PluginManagerI::initializePlugins()
     if(_initialized)
     {
         InitializationException ex(__FILE__, __LINE__);
-        ex.reason = "plugins already initialized";
+        ex.reason = "plug-ins already initialized";
         throw ex;
     }
 
     //
-    // Invoke initialize() on the plugins, in the order they were loaded.
+    // Invoke initialize() on the plug-ins, in the order they were loaded.
     //
     vector<PluginPtr> initializedPlugins;
     try
@@ -48,7 +48,7 @@ Ice::PluginManagerI::initializePlugins()
     catch(...)
     {
         //
-        // Destroy the plugins that have been successfully initialized, in the
+        // Destroy the plug-ins that have been successfully initialized, in the
         // reverse order.
         //
         for(vector<PluginPtr>::reverse_iterator p = initializedPlugins.rbegin(); p != initializedPlugins.rend(); ++p)
@@ -157,8 +157,8 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
     // Ice.Plugin.name[.<language>]=entry_point [args]
     //
     // If the Ice.PluginLoadOrder property is defined, load the
-    // specified plugins in the specified order, then load any
-    // remaining plugins.
+    // specified plug-ins in the specified order, then load any
+    // remaining plug-ins.
     //
     const string prefix = "Ice.Plugin.";
     PropertiesPtr properties = _communicator->getProperties();
@@ -172,7 +172,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
         if(_plugins.find(name) != _plugins.end())
         {
             PluginInitializationException ex(__FILE__, __LINE__);
-            ex.reason = "plugin `" + name + "' already loaded";
+            ex.reason = "plug-in `" + name + "' already loaded";
             throw ex;
         }
 
@@ -194,13 +194,13 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
         else
         {
             PluginInitializationException ex(__FILE__, __LINE__);
-            ex.reason = "plugin `" + name + "' not defined";
+            ex.reason = "plug-in `" + name + "' not defined";
             throw ex;
         }
     }
 
     //
-    // Load any remaining plugins that weren't specified in PluginLoadOrder.
+    // Load any remaining plug-ins that weren't specified in PluginLoadOrder.
     //
    
     while(!plugins.empty())
@@ -259,7 +259,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
     //
     // An application can set Ice.InitPlugins=0 if it wants to postpone
     // initialization until after it has interacted directly with the
-    // plugins.
+    // plug-ins.
     //
     if(properties->getPropertyAsIntWithDefault("Ice.InitPlugins", 1) > 0)
     {
diff --git a/cpp/src/Ice/StringConverter.cpp b/cpp/src/Ice/StringConverter.cpp
index 6fa5382f7d6..52c9dc2ed4b 100644
--- a/cpp/src/Ice/StringConverter.cpp
+++ b/cpp/src/Ice/StringConverter.cpp
@@ -221,7 +221,7 @@ StringConverterPlugin::destroy()
 }
 
 //
-// The entry point for the "string converter" plugin built-in the Ice library
+// The entry point for the "string converter" plug-in built-in the Ice library
 //
 extern "C"
 {
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index a3438795057..0cb8aba1c9d 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -961,7 +961,7 @@ IceBox::ServiceManagerI::createCommunicator(const string& service, Ice::StringSe
 
     //
     // Remaining command line options are passed to the communicator. This is 
-    // necessary for Ice plugin properties (e.g.: IceSSL).
+    // necessary for Ice plug-in properties (e.g.: IceSSL).
     //
     InitializationData initData;
     initData.properties = properties;
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index a2d4513d735..1b55a7e2066 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -521,7 +521,7 @@ NodeService::start(int argc, char* argv[])
         catch(const Ice::NotRegisteredException&)
         {
             //
-            // Some plugin removed the Process facet, so we don't replace it.
+            // Some plug-in removed the Process facet, so we don't replace it.
             // (unlikely error though)
             // 
         }
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 1cbfccc5ee6..441e2fb8399 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -67,12 +67,12 @@ IceInternal::TransceiverPtr
 IceSSL::AcceptorI::accept()
 {
     //
-    // The plugin may not be initialized.
+    // The plug-in may not be initialized.
     //
     if(!_instance->context())
     {
         PluginInitializationException ex(__FILE__, __LINE__);
-        ex.reason = "IceSSL: plugin is not initialized";
+        ex.reason = "IceSSL: plug-in is not initialized";
         throw ex;
     }
 
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 9d03d2c1a47..aa034e66a18 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -25,12 +25,12 @@ IceInternal::TransceiverPtr
 IceSSL::ConnectorI::connect()
 {
     //
-    // The plugin may not be initialized.
+    // The plug-in may not be initialized.
     //
     if(!_instance->context())
     {
         PluginInitializationException ex(__FILE__, __LINE__);
-        ex.reason = "IceSSL: plugin is not initialized";
+        ex.reason = "IceSSL: plug-in is not initialized";
         throw ex;
     }
 
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index b3e0a77388f..9c4875f6267 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -233,7 +233,7 @@ IceSSL::Instance::Instance(const CommunicatorPtr& communicator) :
     //
     // Register the endpoint factory. We have to do this now, rather than
     // in initialize, because the communicator may need to interpret
-    // proxies before the plugin is fully initialized.
+    // proxies before the plug-in is fully initialized.
     //
     _facade->addEndpointFactory(new EndpointFactoryI(this));
 
@@ -662,7 +662,7 @@ IceSSL::Instance::context(SSL_CTX* context)
     if(_ctx)
     {
         PluginInitializationException ex(__FILE__, __LINE__);
-        ex.reason = "IceSSL: plugin is already initialized";
+        ex.reason = "IceSSL: plug-in is already initialized";
         throw ex;
     }
 
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index a8595334547..e06cdb2eec9 100644
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -19,7 +19,7 @@ using namespace Ice;
 using namespace IceSSL;
 
 //
-// Plugin factory function.
+// Plug-in factory function.
 //
 extern "C"
 {