[fdo-commits] r699 - in branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO: . ClientServices Commands Commands/DataStore Commands/Feature Commands/Locking Commands/LongTransaction Commands/Schema Schema Xml

svn_fdo at osgeo.org svn_fdo at osgeo.org
Wed Jan 31 20:55:55 EST 2007


Author: gregboone
Date: 2007-01-31 20:55:54 -0500 (Wed, 31 Jan 2007)
New Revision: 699

Modified:
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgConnectionManager.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgFeatureAccessManager.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProvider.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderNameTokens.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderRegistry.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgICreateDataStore.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgICreateDataStoreImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStorePropertyDictionary.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStorePropertyDictionaryImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStoreReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStoreReaderImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDestroyDataStore.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDestroyDataStoreImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIListDataStores.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIListDataStoresImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIBaseSelect.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIBaseSelectImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDataReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDataReaderImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDelete.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDeleteImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIFeatureReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIFeatureReaderImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIInsert.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIInsertImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIReaderImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelect.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectAggregates.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectAggregatesImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIUpdate.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIUpdateImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgConflictType.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIAcquireLock.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIAcquireLockImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockInfo.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockInfoImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockOwners.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockOwnersImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockedObjects.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockedObjectsImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockConflictReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockConflictReaderImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockOwnersReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockOwnersReaderImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockedObjectReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockedObjectReaderImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIReleaseLock.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIReleaseLockImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgLockStrategy.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgLockType.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLTCheckpointImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransaction.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransactionCheckpoint.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransactionImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIChangeLongTransactionPrivileges.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIChangeLongTransactionSetImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgIPhysicalElementMapping.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgPhysicalElementMapping.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgPhysicalSchemaMappingCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgBatchParameterValueCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgCommandType.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgICommand.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgICommandImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIFeatureCommand.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIFeatureCommandImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIdentifierCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgOrderingOption.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgParameterValue.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgParameterValueCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgPropertyValue.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgPropertyValueCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Schema/mgFeatureSchemaCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgIXmlDeserializable.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgIXmlSerializable.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlClassMappingCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlContext.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlDeserializable.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlElementMapping.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlElementMappingCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureContext.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureFlags.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureHandler.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeaturePropertyReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeaturePropertyWriter.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureReader.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureWriter.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFlags.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIConnectionManager.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIConnectionManagerImp.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIDisposableCollection.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIProviderRegistry.h
   branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIProviderRegistryImp.h
Log:
893057: DOC: FDO Managed API Documentation Updates

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgConnectionManager.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgConnectionManager.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgConnectionManager.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -35,7 +35,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns an instance of an FdoIConnection object. Throws an instance of FdoException * if an error occurs.
+    /// Returns an instance of an IConnection object. Throws an instance of Exception if an error occurs.
     /// 
 	NAMESPACE_OSGEO_FDO_CONNECTIONS::IConnection* CreateConnection(String* providerName);
 
@@ -47,7 +47,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void FreeLibrary(String* providerName);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgFeatureAccessManager.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgFeatureAccessManager.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgFeatureAccessManager.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -34,7 +34,7 @@
     /// 
     /// \return
     /// Returns a static instance of an IConnectionManager object. 
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	static NAMESPACE_OSGEO_FDO::IConnectionManager* GetConnectionManager();
 
@@ -43,7 +43,7 @@
     /// 
     /// \return
     /// Returns a static instance of an IProviderRegistry object. 
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	static NAMESPACE_OSGEO_FDO::IProviderRegistry* GetProviderRegistry();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProvider.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProvider.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProvider.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -33,7 +33,7 @@
     /// 
     /// \return
     /// Returns the name as a constant wchar_t*.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	__property System::String* get_Name();
 
@@ -42,7 +42,7 @@
     /// 
     /// \return
     /// Returns the display name as a constant wchar_t*.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	__property System::String* get_DisplayName();
     
@@ -51,7 +51,7 @@
     /// 
     /// \return
     /// Returns the description as a constant wchar_t*.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	__property System::String* get_Description();
     
@@ -61,7 +61,7 @@
     /// 
     /// \return
     /// Returns the version as a constant wchar_t*.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	__property System::String* get_Version();
 
@@ -71,7 +71,7 @@
     /// 
     /// \return
     /// Returns the Feature Data Objects version as a constant wchar_t*.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	__property System::String* get_FeatureDataObjectsVersion();
 
@@ -80,7 +80,7 @@
     /// 
     /// \return
     /// Returns the library path as a constant wchar_t*.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	__property System::String* get_LibraryPath();
 
@@ -89,7 +89,7 @@
     /// 
     /// \return
     /// Returns the managed state flag as a bool.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	__property System::Boolean get_IsManaged();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_CLIENTSERVICES
 
 /// \brief
-/// The FdoProviderCollection class represents a collection of Provider string.
+/// The ProviderCollection class represents a collection of Provider string.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class ProviderCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::ICollection, public System::Collections::IEnumerable
 {
@@ -79,7 +79,7 @@
     /// 
     /// \return
     /// Returns an int containing the number of items.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	__property System::Int32 get_Count(System::Void);
 
@@ -97,7 +97,7 @@
     /// 
     /// \return
     /// Returns true if the collection contains the specified item, otherwise false.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	System::Boolean Contains(System::String* name);
     
@@ -110,7 +110,7 @@
     /// 
     /// \return
     /// Returns the index item or -1 if the item does not exist. Index is 0 based.
-    /// Throws an instance of FdoException * if an error occurs.
+    /// Throws an instance of Exception if an error occurs.
     /// 
 	System::Int32 IndexOf(System::String* name);
 
@@ -132,7 +132,7 @@
     /// 
     /// \return
     /// Returns an instance of an FdoProvider.
-    /// Throws an instance of FdoException * if the index is out of range or an error occurs.
+    /// Throws an instance of Exception if the index is out of range or an error occurs.
     /// 
 	__property NAMESPACE_OSGEO_FDO_CLIENTSERVICES::Provider *get_RealTypeItem(System::Int32 index);
 };

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderNameTokens.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderNameTokens.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderNameTokens.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -48,7 +48,7 @@
     /// Input the provider name to tokenize
     /// 
     /// \return
-    /// Returns FdoProviderNameTokens
+    /// Returns ProviderNameTokens
     /// 
 	ProviderNameTokens(System::String* name);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderRegistry.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderRegistry.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/ClientServices/mgProviderRegistry.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -31,7 +31,7 @@
     /// Gets a read only collection of information describing each of the registered feature providers. 
     /// 
     /// \return
-    /// Returns an an instance of FdoProviderCollection. Throws an instance of FdoException * if an error occurs.
+    /// Returns an an instance of ProviderCollection. Throws an instance of Exception if an error occurs.
     /// 
 	NAMESPACE_OSGEO_FDO_CLIENTSERVICES::ProviderCollection* GetProviders();
 	
@@ -58,7 +58,7 @@
     /// A flag indicating if the provider is a managed or unmanaged .Net provider.
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void RegisterProvider(String * name, 
                                           String * displayName, 
@@ -76,7 +76,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void UnregisterProvider(String * name);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgICreateDataStore.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgICreateDataStore.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgICreateDataStore.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,14 +24,14 @@
 public __gc __interface IDataStorePropertyDictionary;
 
 /// \brief
-/// The FdoICreateDataStore interface defines the create datastore command,
+/// The ICreateDataStore interface defines the create datastore command,
 /// which can be used to create new provider specific datastores. The input is provided
 /// through a dictionary of name value pairs that is provider dependant. 
 public __gc __interface ICreateDataStore : public NAMESPACE_OSGEO_FDO_COMMANDS::ICommand
 {
 public:
     /// \brief
-    /// Gets the FdoIDataStorePropertyDictionary interface that	
+    /// Gets the IDataStorePropertyDictionary interface that	
     /// can be used to dynamically query	and	set	the	properties required	
     /// to create a new datastore.
     /// 
@@ -41,7 +41,7 @@
     __property NAMESPACE_OSGEO_FDO_COMMANDS_DATASTORE::IDataStorePropertyDictionary* get_DataStoreProperties();
 
     /// \brief
-    /// Executes the FdoICreateDataStore command.
+    /// Executes the ICreateDataStore command.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgICreateDataStoreImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgICreateDataStoreImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgICreateDataStoreImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 public __gc __interface IDataStorePropertyDictionary;
 
 /// \brief
-/// The FdoISQLCommand interface defines the SQL command, which supports the
+/// The ISQLCommand interface defines the SQL command, which supports the
 /// execution of a SQL statement against an underlying RDBMS. Two execute
 /// methods are provided to distinguish between statements that return table data
 /// versus those that execute non query type operations.
@@ -35,8 +35,8 @@
 {
 public:
     /// \brief
-    /// Gets the FdoIDataStorePropertyDictionary interface that	
-    /// can be used to dynamically query	and	set	the	properties required	
+    /// Gets the IDataStorePropertyDictionary interface that	
+    /// can be used to dynamically query and set the properties required	
     /// to create a new datastore.
     /// 
     /// \return
@@ -45,7 +45,7 @@
     __property NAMESPACE_OSGEO_FDO_COMMANDS_DATASTORE::IDataStorePropertyDictionary* get_DataStoreProperties();
 
     /// \brief
-    /// Executes the FdoICreateDataStore command.
+    /// Executes the ICreateDataStore command.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStorePropertyDictionary.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStorePropertyDictionary.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStorePropertyDictionary.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -23,7 +23,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_DATASTORE
 
 /// \brief
-/// The FdoIDataStorePropertyDictionary exposes a dictionary style interface
+/// The IDataStorePropertyDictionary exposes a dictionary style interface
 /// to the datastore properties. The properties required to create or destroy a datastore
 /// can be determined and their values can be set through this interface.
 public __gc __interface IDataStorePropertyDictionary : public NAMESPACE_OSGEO_FDO_CONNECTIONS::IConnectionPropertyDictionary

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStorePropertyDictionaryImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStorePropertyDictionaryImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStorePropertyDictionaryImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,7 +26,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_DATASTORE
 
 /// \brief
-/// The FdoISQLCommand interface defines the SQL command, which supports the
+/// The ISQLCommand interface defines the SQL command, which supports the
 /// execution of a SQL statement against an underlying RDBMS. Two execute
 /// methods are provided to distinguish between statements that return table data
 /// versus those that execute non query type operations.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStoreReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStoreReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStoreReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,10 +24,10 @@
 public __gc __interface IDataStorePropertyDictionary;
 
 /// \brief
-/// The FdoIDataStoreReader interface provides a forward-only, read-only iterator
-/// for reading feature data.  A reference to an FdoIDataStoreReader is returned
+/// The IDataStoreReader interface provides a forward-only, read-only iterator
+/// for reading feature data.  A reference to an IDataStoreReader is returned
 /// from the IListDataStores command. Because the initial position of the
-/// FdoIDataStoreReader is prior to the first item, you must call
+/// IDataStoreReader is prior to the first item, you must call
 /// ReadNext to begin accessing any data.
 public __gc __interface IDataStoreReader : public System::IDisposable
 {
@@ -58,7 +58,7 @@
 	System::Boolean GetIsFdoEnabled();
 
     /// \brief
-    /// Gets the FdoIConnectionPropertyDictionary interface that 
+    /// Gets the IConnectionPropertyDictionary interface that 
     /// includes the properties of the datastores set at datastore create 
     /// time, with the exception of password.
     /// 
@@ -79,7 +79,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoIDataStoreReader object, freeing any resources it may be holding.
+    /// Closes the IDataStoreReader object, freeing any resources it may be holding.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStoreReaderImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStoreReaderImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDataStoreReaderImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,7 +26,7 @@
 public __gc __interface IDataStorePropertyDictionary;
 
 /// \brief
-/// The FdoISQLCommand interface defines the SQL command, which supports the
+/// The ISQLCommand interface defines the SQL command, which supports the
 /// execution of a SQL statement against an underlying RDBMS. Two execute
 /// methods are provided to distinguish between statements that return table data
 /// versus those that execute non query type operations.
@@ -59,7 +59,7 @@
 	System::Boolean GetIsFdoEnabled();
 
     /// \brief
-    /// Gets the FdoIConnectionPropertyDictionary interface that 
+    /// Gets the IConnectionPropertyDictionary interface that 
     /// includes the properties of the datastores set at datastore create 
     /// time, with the exception of password.
     /// 
@@ -80,7 +80,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoIDataStoreReader object, freeing any resources it may be holding.
+    /// Closes the IDataStoreReader object, freeing any resources it may be holding.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDestroyDataStore.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDestroyDataStore.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDestroyDataStore.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,14 +24,14 @@
 public __gc __interface IDataStorePropertyDictionary;
 
 /// \brief
-/// The FdoIDestroyDataStore interface defines the create datastore command,
+/// The IDestroyDataStore interface defines the create datastore command,
 /// which can be used to create new provider specific datastores. The input is provided
 /// through a dictionary of name value pairs that is provider dependant. 
 public __gc __interface IDestroyDataStore : public NAMESPACE_OSGEO_FDO_COMMANDS::ICommand
 {
 public:
     /// \brief
-    /// Gets the FdoIDataStorePropertyDictionary interface that	
+    /// Gets the IDataStorePropertyDictionary interface that	
     /// can be used to dynamically query	and	set	the	properties required	
     /// to create a new datastore.
     /// 
@@ -41,7 +41,7 @@
     __property NAMESPACE_OSGEO_FDO_COMMANDS_DATASTORE::IDataStorePropertyDictionary* get_DataStoreProperties();
 
     /// \brief
-    /// Executes the FdoIDestroyDataStore command.
+    /// Executes the IDestroyDataStore command.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDestroyDataStoreImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDestroyDataStoreImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIDestroyDataStoreImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 public __gc __interface IDataStorePropertyDictionary;
 
 /// \brief
-/// The FdoISQLCommand interface defines the SQL command, which supports the
+/// The ISQLCommand interface defines the SQL command, which supports the
 /// execution of a SQL statement against an underlying RDBMS. Two execute
 /// methods are provided to distinguish between statements that return table data
 /// versus those that execute non query type operations.
@@ -35,8 +35,8 @@
 {
 public:
     /// \brief
-    /// Gets the FdoIDataStorePropertyDictionary interface that	
-    /// can be used to dynamically query	and	set	the	properties required	
+    /// Gets the IDataStorePropertyDictionary interface that	
+    /// can be used to dynamically query and set the properties required	
     /// to create a new datastore.
     /// 
     /// \return
@@ -45,7 +45,7 @@
     __property NAMESPACE_OSGEO_FDO_COMMANDS_DATASTORE::IDataStorePropertyDictionary* get_DataStoreProperties();
 
     /// \brief
-    /// Executes the FdoIDestroyDataStore command.
+    /// Executes the IDestroyDataStore command.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIListDataStores.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIListDataStores.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIListDataStores.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -50,7 +50,7 @@
 	__property System::Void set_IncludeNonFdoEnabledDatastores(System::Boolean include);
 
     /// \brief
-    /// Executes the FdoIListDataStores command.
+    /// Executes the IListDataStores command.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIListDataStoresImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIListDataStoresImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/DataStore/mgIListDataStoresImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 public __gc __interface IDataStoreReader;
 
 /// \brief
-/// The FdoIListDataStores interface defines the list datastores command,
+/// The IListDataStores interface defines the list datastores command,
 /// which provides a way to get a list of datastores at a particular server. 
 private __gc class IListDataStoresImp : public NAMESPACE_OSGEO_FDO_COMMANDS::ICommandImp, public NAMESPACE_OSGEO_FDO_COMMANDS_DATASTORE::IListDataStores
 {
@@ -53,7 +53,7 @@
 	__property System::Void set_IncludeNonFdoEnabledDatastores(System::Boolean include);
 
     /// \brief
-    /// Executes the FdoIListDataStores command.
+    /// Executes the IListDataStores command.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIBaseSelect.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIBaseSelect.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIBaseSelect.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -28,14 +28,14 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoISelect interface defines the Select command, which queries for features
+/// The ISelect interface defines the Select command, which queries for features
 /// of a given class that match the specified criteria. Input to the select
 /// command includes the name of the class, the list of properties to be
 /// returned, and a filter. All but the class name is optional. If the list of
 /// properties to be returned is empty then all properties are returned. The
 /// filter may be specified either as text or as an expression tree (most likely
 /// produced by a query builder). The result of executing a select command is an
-/// FdoIFeatureReader reference (see "Reading Features"). If the feature provider
+/// IFeatureReader reference (see "Reading Features"). If the feature provider
 /// supports locking, then the select command can optionally lock all of the
 /// features selected, via the ExecuteWithLock method (see "Locking
 /// Commands" for more information on locking features).
@@ -43,7 +43,7 @@
 {
 public:
     /// \brief
-    /// Gets the FdoIdentifierCollection that holds the list of property names to 
+    /// Gets the IdentifierCollection that holds the list of property names to 
     /// return with the result. If empty all properties of the specified class
     /// are returned.
     /// 
@@ -53,7 +53,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS::IdentifierCollection* get_PropertyNames();
 
     /// \brief
-    /// Gets the FdoIdentifierCollection that holds the list of order by property names. If empty no ordering is used. This list is initially
+    /// Gets the IdentifierCollection that holds the list of order by property names. If empty no ordering is used. This list is initially
     /// empty and the caller need to add the property that the command should use as a order by criteria.
     /// 
     /// \return
@@ -65,8 +65,8 @@
     /// Set the ordering option of the selection. This is only used if the ordering collection is not empty.
     /// 
     /// \param option 
-    /// Is the ordering option and should be set to one of FdoOrderingOption_Ascending or FdoOrderingOption_Descending.
-    /// FdoOrderingOption_Ascending is the default value.
+    /// Is the ordering option and should be set to one of OrderingOption_Ascending or OrderingOption_Descending.
+    /// OrderingOption_Ascending is the default value.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIBaseSelectImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIBaseSelectImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIBaseSelectImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,14 +26,14 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoISelect interface defines the Select command, which queries for features
+/// The ISelect interface defines the Select command, which queries for features
 /// of a given class that match the specified criteria. Input to the select
 /// command includes the name of the class, the list of properties to be
 /// returned, and a filter. All but the class name is optional. If the list of
 /// properties to be returned is empty then all properties are returned. The
 /// filter may be specified either as text or as an expression tree (most likely
 /// produced by a query builder). The result of executing a select command is an
-/// FdoIFeatureReader reference (see "Reading Features"). If the feature provider
+/// IFeatureReader reference (see "Reading Features"). If the feature provider
 /// supports locking, then the select command can optionally lock all of the
 /// features selected, via the ExecuteWithLock method (see "Locking
 /// Commands" for more information on locking features).
@@ -41,7 +41,7 @@
 {
 public:
     /// \brief
-    /// Gets the FdoIdentifierCollection that holds the list of property names to 
+    /// Gets the IdentifierCollection that holds the list of property names to 
     /// return with the result. If empty all properties of the specified class
     /// are returned.
     /// 
@@ -51,7 +51,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS::IdentifierCollection* get_PropertyNames();
 
     /// \brief
-    /// Gets the FdoIdentifierCollection that holds the list of order by property names. If empty no ordering is used. This list is initially
+    /// Gets the IdentifierCollection that holds the list of order by property names. If empty no ordering is used. This list is initially
     /// empty and the caller need to add the property that the command should use as a order by criteria.
     /// 
     /// \return
@@ -63,8 +63,8 @@
     /// Set the ordering option of the selection. This is only used if the ordering collection is not empty.
     /// 
     /// \param option 
-    /// Is the ordering option and should be set to one of FdoOrderingOption_Ascending or FdoOrderingOption_Descending.
-    /// FdoOrderingOption_Ascending is the default value.
+    /// Is the ordering option and should be set to one of OrderingOption_Ascending or OrderingOption_Descending.
+    /// OrderingOption_Ascending is the default value.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDataReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDataReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDataReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,10 +26,10 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIDataReader interface provides a forward-only, read-only
+/// The IDataReader interface provides a forward-only, read-only
 /// iterator for reading relational table data. A reference to an
-/// FdoIDataReader is returned from the SQLCommands ExecuteReader method.
-/// The initial position of the FdoIDataReader interface is prior to the first item.
+/// IDataReader is returned from the SQLCommands ExecuteReader method.
+/// The initial position of the IDataReader interface is prior to the first item.
 /// Thus, you must call ReadNext to begin accessing any data.
 public __gc __interface IDataReader : public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IReader
 {
@@ -66,8 +66,8 @@
 
     /// \brief
     /// Gets the FDO property type of a given property. This is used
-    ///  to indicate if a given property is a geometric property or a data property. If the property is
-    ///  a FdoPropertyType_DataProperty, then GetDataType can be used to to find the data type of the property.
+    /// to indicate if a given property is a geometric property or a data property. If the property is
+    /// a PropertyType_DataProperty, then GetDataType can be used to to find the data type of the property.
     /// 
     /// \param name 
     /// Input the property name.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDataReaderImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDataReaderImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDataReaderImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -29,10 +29,10 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIDataReader interface provides a forward-only, read-only
+/// The IDataReader interface provides a forward-only, read-only
 /// iterator for reading relational table data. A reference to an
-/// FdoIDataReader is returned from the SQLCommands ExecuteReader method.
-/// The initial position of the FdoIDataReader interface is prior to the first item.
+/// IDataReader is returned from the SQLCommands ExecuteReader method.
+/// The initial position of the IDataReader interface is prior to the first item.
 /// Thus, you must call ReadNext to begin accessing any data.
 private __gc class IDataReaderImp : public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IReaderImp, public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IDataReader
 {
@@ -69,8 +69,8 @@
 
     /// \brief
     /// Gets the FDO property type of a given property. This is used
-    ///  to indicate if a given property is a geometric property or a data property. If the property is
-    ///  a FdoPropertyType_DataProperty, then GetDataType can be used to to find the data type of the property.
+    /// to indicate if a given property is a geometric property or a data property. If the property is
+    /// a PropertyType_DataProperty, then GetDataType can be used to to find the data type of the property.
     /// 
     /// \param name 
     /// Input the property name.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDelete.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDelete.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDelete.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIDelete interface defines the Delete command, which deletes instances of
+/// The IDelete interface defines the Delete command, which deletes instances of
 /// a given class that match the specified criteria. Input to the delete command
 /// includes the name of the class, and filter criteria by which to identify the
 /// instances to be deleted. The filter may be specified either as text or as an

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDeleteImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDeleteImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIDeleteImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -30,7 +30,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIDelete interface defines the Delete command, which deletes instances of
+/// The IDelete interface defines the Delete command, which deletes instances of
 /// a given class that match the specified criteria. Input to the delete command
 /// includes the name of the class, and filter criteria by which to identify the
 /// instances to be deleted. The filter may be specified either as text or as an

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIFeatureReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIFeatureReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIFeatureReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,10 +27,10 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIFeatureReader interface provides a forward-only, read-only iterator
-/// for reading feature data.  A reference to an FdoIFeatureReader is returned
+/// The IFeatureReader interface provides a forward-only, read-only iterator
+/// for reading feature data.  A reference to an IFeatureReader is returned
 /// from the Select and SelectAndLock commands. Because the initial position of the
-/// FdoIFeatureReader is prior to the first item, you must call
+/// IFeatureReader is prior to the first item, you must call
 /// ReadNext to begin accessing any data.
 public __gc __interface IFeatureReader : public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IReader
 {
@@ -77,7 +77,7 @@
 	System::Byte GetGeometry(System::String* name) [];
 
     /// \brief
-    /// Gets a reference to an FdoIFeatureReader to read the data contained in
+    /// Gets a reference to an IFeatureReader to read the data contained in
     /// the object or object collection property. If the property is not an
     /// object property, an exception is thrown.
     /// 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIFeatureReaderImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIFeatureReaderImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIFeatureReaderImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -30,10 +30,10 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIFeatureReader interface provides a forward-only, read-only iterator
-/// for reading feature data.  A reference to an FdoIFeatureReader is returned
+/// The IFeatureReader interface provides a forward-only, read-only iterator
+/// for reading feature data.  A reference to an IFeatureReader is returned
 /// from the Select and SelectAndLock commands. Because the initial position of the
-/// FdoIFeatureReader is prior to the first item, you must call
+/// IFeatureReader is prior to the first item, you must call
 /// ReadNext to begin accessing any data.
 private __gc class IFeatureReaderImp : public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IReaderImp, public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IFeatureReader
 {
@@ -80,7 +80,7 @@
 	System::Byte GetGeometry(System::String* propertyName) [];
 
     /// \brief
-    /// Gets a reference to an FdoIFeatureReader to read the data contained in
+    /// Gets a reference to an IFeatureReader to read the data contained in
     /// the object or object collection property. If the property is not an
     /// object property, an exception is thrown.
     /// 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIInsert.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIInsert.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIInsert.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -47,7 +47,7 @@
 {
 public:
     /// \brief
-    /// Gets the name of the class to be operated upon as an FdoIdentifier.
+    /// Gets the name of the class to be operated upon as an Identifier.
     /// 
     /// \return
     /// Returns the class name.
@@ -55,7 +55,7 @@
 	__property NAMESPACE_OSGEO_FDO_EXPRESSION::Identifier* get_FeatureClassName();
 
     /// \brief
-    /// Sets the name of the class to be operated upon as an FdoIdentifier.
+    /// Sets the name of the class to be operated upon as an Identifier.
     /// 
     /// \param value 
     /// Input the identifier for the class.
@@ -66,7 +66,7 @@
 	__property System::Void set_FeatureClassName(NAMESPACE_OSGEO_FDO_EXPRESSION::Identifier* value);
 
     /// \brief
-    /// Sets the name of the class to be operated upon as an FdoIdentifier.
+    /// Sets the name of the class to be operated upon as an Identifier.
     /// 
     /// \param value 
     /// Input the class name.
@@ -77,7 +77,7 @@
 	System::Void SetFeatureClassName(System::String* value);
 
     /// \brief
-    /// Gets the FdoPropertyValueCollection that specifies the names and values
+    /// Gets the PropertyValueCollection that specifies the names and values
     /// of the properties for the instance to be inserted.
     /// 
     /// \return
@@ -86,31 +86,31 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS::PropertyValueCollection* get_PropertyValues();
 
     /// \brief
-    /// Gets the FdoBatchParameterValueCollection that can be used for optimized
+    /// Gets the BatchParameterValueCollection that can be used for optimized
     /// batch inserts of multiple features with a single insert command. Batch
     /// inserts can be performed by using Parameters for each of the property
     /// values, then adding collections of parameter values to the
-    /// FdoBatchParameterValueCollection. Each FdoParameterValueCollection in the
-    /// FdoBatchParameterValueCollection should contain one FdoParameterValue for each
+    /// BatchParameterValueCollection. Each ParameterValueCollection in the
+    /// BatchParameterValueCollection should contain one FdoParameterValue for each
     /// of the parameters specified for property values.
     /// 
     /// \return
-    /// Returns FdoBatchParameterValueCollection
+    /// Returns BatchParameterValueCollection
     /// 
 	__property NAMESPACE_OSGEO_FDO_COMMANDS::BatchParameterValueCollection* get_BatchParameterValues();
 
     /// \brief
     /// Executes the insert command and returns a reference to an
-    /// FdoIFeatureReader. Some feature providers can generate automatic identity
+    /// IFeatureReader. Some feature providers can generate automatic identity
     /// values for features. This will happen automatically as the features are
-    /// inserted. The returned FdoIFeatureReader allows the client to obtain the
+    /// inserted. The returned IFeatureReader allows the client to obtain the
     /// automatic identity property value(s) of newly inserted object(s). The
     /// returned feature reader at a minimum will read the unique identity
     /// properties of the objects just inserted. Multiple objects will be
     /// returned through the reader in the case of a batch insert.
     /// 
     /// \return
-    /// Returns an FdoIFeatureReader
+    /// Returns an IFeatureReader
     /// 
 	NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IFeatureReader* Execute();
 };

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIInsertImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIInsertImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIInsertImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -36,7 +36,7 @@
 public __gc __interface IFeatureReader;
 
 /// \brief
-/// The FdoIInsert interface defines the Insert command, which inserts a new
+/// The IInsert interface defines the Insert command, which inserts a new
 /// instance of a given class. Input to the insert command includes the name of
 /// the class and a collection of property values. Properties that are
 /// not specified and do not have a default value will be assigned a null value
@@ -50,7 +50,7 @@
 {
 public:
     /// \brief
-    /// Gets the name of the class to be operated upon as an FdoIdentifier.
+    /// Gets the name of the class to be operated upon as an Identifier.
     /// 
     /// \return
     /// Returns the class name.
@@ -58,7 +58,7 @@
 	__property NAMESPACE_OSGEO_FDO_EXPRESSION::Identifier* get_FeatureClassName();
 
     /// \brief
-    /// Sets the name of the class to be operated upon as an FdoIdentifier.
+    /// Sets the name of the class to be operated upon as an Identifier.
     /// 
     /// \param value 
     /// Input the identifier for the class.
@@ -69,7 +69,7 @@
 	__property System::Void set_FeatureClassName(NAMESPACE_OSGEO_FDO_EXPRESSION::Identifier* value);
 
     /// \brief
-    /// Sets the name of the class to be operated upon as an FdoIdentifier.
+    /// Sets the name of the class to be operated upon as an Identifier.
     /// 
     /// \param value 
     /// Input the class name.
@@ -80,7 +80,7 @@
 	System::Void SetFeatureClassName(System::String* value);
 
     /// \brief
-    /// Gets the FdoPropertyValueCollection that specifies the names and values
+    /// Gets the PropertyValueCollection that specifies the names and values
     /// of the properties for the instance to be inserted.
     /// 
     /// \return
@@ -89,31 +89,31 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS::PropertyValueCollection* get_PropertyValues();
 
     /// \brief
-    /// Gets the FdoBatchParameterValueCollection that can be used for optimized
+    /// Gets the BatchParameterValueCollection that can be used for optimized
     /// batch inserts of multiple features with a single insert command. Batch
     /// inserts can be performed by using Parameters for each of the property
     /// values, then adding collections of parameter values to the
-    /// FdoBatchParameterValueCollection. Each FdoParameterValueCollection in the
-    /// FdoBatchParameterValueCollection should contain one FdoParameterValue for each
+    /// BatchParameterValueCollection. Each ParameterValueCollection in the
+    /// BatchParameterValueCollection should contain one ParameterValue for each
     /// of the parameters specified for property values.
     /// 
     /// \return
-    /// Returns FdoBatchParameterValueCollection
+    /// Returns BatchParameterValueCollection
     /// 
 	__property NAMESPACE_OSGEO_FDO_COMMANDS::BatchParameterValueCollection* get_BatchParameterValues();
 
     /// \brief
     /// Executes the insert command and returns a reference to an
-    /// FdoIFeatureReader. Some feature providers can generate automatic identity
+    /// IFeatureReader. Some feature providers can generate automatic identity
     /// values for features. This will happen automatically as the features are
-    /// inserted. The returned FdoIFeatureReader allows the client to obtain the
+    /// inserted. The returned IFeatureReader allows the client to obtain the
     /// automatic identity property value(s) of newly inserted object(s). The
     /// returned feature reader at a minimum will read the unique identity
     /// properties of the objects just inserted. Multiple objects will be
     /// returned through the reader in the case of a batch insert.
     /// 
     /// \return
-    /// Returns an FdoIFeatureReader
+    /// Returns an IFeatureReader
     /// 
 	NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IFeatureReader* Execute();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -33,17 +33,17 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIFeatureReader interface provides a forward-only, read-only iterator
-/// for reading feature data.  A reference to an FdoIFeatureReader is returned
+/// The IFeatureReader interface provides a forward-only, read-only iterator
+/// for reading feature data.  A reference to an IFeatureReader is returned
 /// from the Select and SelectAndLock commands. Because the initial position of the
-/// FdoIFeatureReader is prior to the first item, you must call
+/// IFeatureReader is prior to the first item, you must call
 /// ReadNext to begin accessing any data.
 public __gc __interface IReader : public System::IDisposable
 {
 public:
     /// \brief
     /// Gets the Boolean value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Boolean or an 
+    /// performed, thus the property must be DataType_Boolean or an 
     /// exception is thrown.
     /// 
     /// \param name 
@@ -56,7 +56,7 @@
 
     /// \brief
     /// Gets the byte value of the specified property. No conversion is 
-    /// performed, thus the property must be FdoDataType_Byte or an 
+    /// performed, thus the property must be DataType_Byte or an 
     /// exception is thrown.
     /// 
     /// \param name 
@@ -69,7 +69,7 @@
 
     /// \brief
     ///  Gets the date and time value of the specified property. No conversion is 
-    /// performed, thus the property must be FdoDataType_DateTime or an 
+    /// performed, thus the property must be DataType_DateTime or an 
     /// exception is thrown.
     /// 
     /// \param name 
@@ -82,7 +82,7 @@
 
     /// \brief
     /// Gets the double-precision floating point value of the specified property. No
-    /// conversion is performed, thus the property must be FdoDataType_Double
+    /// conversion is performed, thus the property must be DataType_Double
     /// or an exception is thrown.
     /// 
     /// \param name 
@@ -95,7 +95,7 @@
 
     /// \brief
     /// Gets the 16-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int16 or an exception
+    /// performed, thus the property must be DataType_Int16 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -108,7 +108,7 @@
 
     /// \brief
     /// Gets the 32-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int32 or an exception
+    /// performed, thus the property must be DataType_Int32 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -121,7 +121,7 @@
 
     /// \brief
     /// Gets the 64-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int64 or an exception
+    /// performed, thus the property must be DataType_Int64 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -134,7 +134,7 @@
 
     /// \brief
     /// Gets the Single floating point value of the specified property. No
-    /// conversion is performed, thus the property must be FdoDataType_Single
+    /// conversion is performed, thus the property must be DataType_Single
     /// or an exception is thrown.
     /// 
     /// \param name 
@@ -147,7 +147,7 @@
 
     /// \brief
     /// Gets the string value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_String or an exception
+    /// performed, thus the property must be DataType_String or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -160,8 +160,8 @@
 
     /// \brief
     /// Gets a LOBValue reference. The LOB is fully read in and data available.
-    /// Because no conversion is performed, the property must be FdoDataType_BLOB or
-    /// FdoDataType_CLOB etc. (a LOB type)
+    /// Because no conversion is performed, the property must be DataType_BLOB or
+    /// DataType_CLOB etc. (a LOB type)
     /// 
     /// \param name 
     /// Input the property name.
@@ -172,11 +172,11 @@
 	NAMESPACE_OSGEO_FDO_EXPRESSION::LOBValue* GetLOB(System::String* name);
 
     /// \brief
-    /// Gets a reference of the specified LOB property as a FdoBLOBStreamReader or
-    /// FdoCLOBStreamReader etc. to allow reading in blocks of data.
-    /// Because no conversion is performed, the property must be FdoDataType_BLOB 
-    /// or FdoDataType_CLOB etc. (a LOB type)
-    /// Cast the FdoIStreamReader to the appropiate LOB Stream Reader.
+    /// Gets a reference of the specified LOB property as a BLOBStreamReader or
+    /// CLOBStreamReader etc. to allow reading in blocks of data.
+    /// Because no conversion is performed, the property must be DataType_BLOB 
+    /// or DataType_CLOB etc. (a LOB type)
+    /// Cast the IStreamReader to the appropiate LOB Stream Reader.
     /// 
     /// \param name 
     /// Input the property name.
@@ -235,7 +235,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoIFeatureReader object, freeing any resources it may be holding.
+    /// Closes the IFeatureReader object, freeing any resources it may be holding.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIReaderImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIReaderImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIReaderImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -37,17 +37,17 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIFeatureReader interface provides a forward-only, read-only iterator
-/// for reading feature data.  A reference to an FdoIFeatureReader is returned
+/// The IFeatureReader interface provides a forward-only, read-only iterator
+/// for reading feature data.  A reference to an IFeatureReader is returned
 /// from the Select and SelectAndLock commands. Because the initial position of the
-/// FdoIFeatureReader is prior to the first item, you must call
+/// IFeatureReader is prior to the first item, you must call
 /// ReadNext to begin accessing any data.
 private __gc class IReaderImp : public NAMESPACE_OSGEO_RUNTIME::Disposable, public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IReader
 {
 public:
     /// \brief
     /// Gets the Boolean value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Boolean or an 
+    /// performed, thus the property must be DataType_Boolean or an 
     /// exception is thrown.
     /// 
     /// \param name 
@@ -73,7 +73,7 @@
 
     /// \brief
     ///  Gets the date and time value of the specified property. No conversion is 
-    /// performed, thus the property must be FdoDataType_DateTime or an 
+    /// performed, thus the property must be DataType_DateTime or an 
     /// exception is thrown.
     /// 
     /// \param name 
@@ -86,7 +86,7 @@
 
     /// \brief
     /// Gets the double-precision floating point value of the specified property. No
-    /// conversion is performed, thus the property must be FdoDataType_Double
+    /// conversion is performed, thus the property must be DataType_Double
     /// or an exception is thrown.
     /// 
     /// \param name 
@@ -99,7 +99,7 @@
 
     /// \brief
     /// Gets the 16-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int16 or an exception
+    /// performed, thus the property must be DataType_Int16 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -112,7 +112,7 @@
 
     /// \brief
     /// Gets the 32-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int32 or an exception
+    /// performed, thus the property must be DataType_Int32 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -125,7 +125,7 @@
 
     /// \brief
     /// Gets the 64-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int64 or an exception
+    /// performed, thus the property must be DataType_Int64 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -138,7 +138,7 @@
 
     /// \brief
     /// Gets the Single floating point value of the specified property. No
-    /// conversion is performed, thus the property must be FdoDataType_Single
+    /// conversion is performed, thus the property must be DataType_Single
     /// or an exception is thrown.
     /// 
     /// \param name 
@@ -151,7 +151,7 @@
 
     /// \brief
     /// Gets the string value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_String or an exception
+    /// performed, thus the property must be DataType_String or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -164,8 +164,8 @@
 
     /// \brief
     /// Gets a LOBValue reference. The LOB is fully read in and data available.
-    /// Because no conversion is performed, the property must be FdoDataType_BLOB or
-    /// FdoDataType_CLOB etc. (a LOB type)
+    /// Because no conversion is performed, the property must be DataType_BLOB or
+    /// DataType_CLOB etc. (a LOB type)
     /// 
     /// \param name 
     /// Input the property name.
@@ -176,11 +176,11 @@
 	NAMESPACE_OSGEO_FDO_EXPRESSION::LOBValue* GetLOB(System::String* name);
 
     /// \brief
-    /// Gets a reference of the specified LOB property as a FdoBLOBStreamReader or
-    /// FdoCLOBStreamReader etc. to allow reading in blocks of data.
-    /// Because no conversion is performed, the property must be FdoDataType_BLOB 
-    /// or FdoDataType_CLOB etc. (a LOB type)
-    /// Cast the FdoIStreamReader to the appropiate LOB Stream Reader.
+    /// Gets a reference of the specified LOB property as a BLOBStreamReader or
+    /// CLOBStreamReader etc. to allow reading in blocks of data.
+    /// Because no conversion is performed, the property must be DataType_BLOB 
+    /// or DataType_CLOB etc. (a LOB type)
+    /// Cast the IStreamReader to the appropiate LOB Stream Reader.
     /// 
     /// \param name 
     /// Input the property name.
@@ -239,7 +239,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoIFeatureReader object, freeing any resources it may be holding.
+    /// Closes the IFeatureReader object, freeing any resources it may be holding.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelect.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelect.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelect.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -30,14 +30,14 @@
 public __gc __interface IFeatureReader;
 
 /// \brief
-/// The FdoISelect interface defines the Select command, which queries for features
+/// The ISelect interface defines the Select command, which queries for features
 /// of a given class that match the specified criteria. Input to the select
 /// command includes the name of the class, the list of properties to be
 /// returned, and a filter. All but the class name is optional. If the list of
 /// properties to be returned is empty then all properties are returned. The
 /// filter may be specified either as text or as an expression tree (most likely
 /// produced by a query builder). The result of executing a select command is an
-/// FdoIFeatureReader reference (see "Reading Features"). If the feature provider
+/// IFeatureReader reference (see "Reading Features"). If the feature provider
 /// supports locking, then the select command can optionally lock all of the
 /// features selected, via the ExecuteWithLock method (see "Locking
 /// Commands" for more information on locking features).
@@ -45,7 +45,7 @@
 {
 public:
     /// \brief
-    /// Gets the FdoLockType value (see "Locking Commands").
+    /// Gets the LockType value (see "Locking Commands").
     /// 
     /// \return
     /// Returns the lock type.
@@ -53,7 +53,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockType get_LockType();
 
     /// \brief
-    /// Sets the FdoLockType value (see "Locking Commands").
+    /// Sets the LockType value (see "Locking Commands").
     /// 
     /// \param value 
     /// Input the lock type.
@@ -64,7 +64,7 @@
 	__property System::Void set_LockType(NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockType value);
 
     /// \brief
-    /// Gets the FdoLockStrategy value (see "Locking Commands").
+    /// Gets the LockStrategy value (see "Locking Commands").
     /// 
     /// \return
     /// Returns the lock strategy.
@@ -72,7 +72,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockStrategy get_LockStrategy();
 
     /// \brief
-    /// Sets the FdoLockStrategy value (see "Locking Commands").
+    /// Sets the LockStrategy value (see "Locking Commands").
     /// 
     /// \param value 
     /// Input the lock strategy.
@@ -83,7 +83,7 @@
 	__property System::Void set_LockStrategy(NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockStrategy value);
 
     /// \brief
-    /// Executes the select command and returns a reference to an FdoIFeatureReader.
+    /// Executes the select command and returns a reference to an IFeatureReader.
     /// 
     /// \return
     /// Returns the feature reader.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectAggregates.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectAggregates.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectAggregates.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -32,16 +32,16 @@
 public __gc __interface IDataReader;
 
 /// \brief
-/// The FdoISelectAggregate interface defines a Select command that handle selection of properties that include 
-/// the use of aggregate functions. This command differs from the FdoISelect command in a number of ways. 
+/// The ISelectAggregate interface defines a Select command that handle selection of properties that include 
+/// the use of aggregate functions. This command differs from the ISelect command in a number of ways. 
 /// It handles selection of properties that are aggregate functions and supports selecting distinct property values. 
 /// It also includes grouping criteria. The execute method returns an IDataReader which is not tied to a specific class. 
-/// Unlike Select, FdoISelectAggregate does not include any locking functions.
+/// Unlike Select, ISelectAggregate does not include any locking functions.
 public __gc __interface ISelectAggregates : public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IBaseSelect
 {
 public:
     /// \brief
-    /// Executes the select command and returns a reference to an FdoIDataReader.
+    /// Executes the select command and returns a reference to an IDataReader.
     /// 
     /// \return
     /// Returns the data reader.
@@ -70,7 +70,7 @@
 	__property System::Boolean get_Distinct();
 
     /// \brief
-    /// Gets the FdoIdentifierCollection that holds the list of group by property names. If empty no grouping is used. This list is initially
+    /// Gets the IdentifierCollection that holds the list of group by property names. If empty no grouping is used. This list is initially
     /// empty and the caller need to add the property that the command should use as a group by criteria. No LOB or Geometry type properties
     /// can be used for ordering.
     /// 
@@ -81,7 +81,7 @@
 
     /// \brief
     /// Set the grouping by filter. Use the grouping filter to restrict the groups of returned properties to those groups for 
-    /// which the specified filter is TRUE. For example "order by city" and  "min(lanes) = 2". The FdoFilter have to evalute to a 
+    /// which the specified filter is TRUE. For example "order by city" and  "min(lanes) = 2". The Filter have to evalute to a 
     /// binary value(true or false).
     /// 
     /// \param filter 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectAggregatesImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectAggregatesImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectAggregatesImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -35,16 +35,16 @@
 public __gc __interface IDataReader;
 
 /// \brief
-/// The FdoISelectAggregate interface defines a Select command that handle selection of properties that include 
-/// the use of aggregate functions. This command differs from the FdoISelect command in a number of ways. 
+/// The ISelectAggregate interface defines a Select command that handle selection of properties that include 
+/// the use of aggregate functions. This command differs from the ISelect command in a number of ways. 
 /// It handles selection of properties that are aggregate functions and supports selecting distinct property values. 
 /// It also includes grouping criteria. The execute method returns an IDataReader which is not tied to a specific class. 
-/// Unlike Select, FdoISelectAggregate does not include any locking functions.
+/// Unlike Select, ISelectAggregate does not include any locking functions.
 private __gc class ISelectAggregatesImp : public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IBaseSelectImp, public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::ISelectAggregates
 {
 public:
     /// \brief
-    /// Executes the select command and returns a reference to an FdoIDataReader.
+    /// Executes the select command and returns a reference to an IDataReader.
     /// 
     /// \return
     /// Returns the data reader.
@@ -73,7 +73,7 @@
 	__property System::Boolean get_Distinct();
 
     /// \brief
-    /// Gets the FdoIdentifierCollection that holds the list of group by property names. If empty no grouping is used. This list is initially
+    /// Gets the IdentifierCollection that holds the list of group by property names. If empty no grouping is used. This list is initially
     /// empty and the caller need to add the property that the command should use as a group by criteria. No LOB or Geometry type properties
     /// can be used for ordering.
     /// 
@@ -84,7 +84,7 @@
 
     /// \brief
     /// Set the grouping by filter. Use the grouping filter to restrict the groups of returned properties to those groups for 
-    /// which the specified filter is TRUE. For example "order by city" and  "min(lanes) = 2". The FdoFilter have to evalute to a 
+    /// which the specified filter is TRUE. For example "order by city" and  "min(lanes) = 2". The Filter have to evalute to a 
     /// binary value(true or false).
     /// 
     /// \param filter 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgISelectImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,7 +26,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoISelect interface defines the Select command, which queries for features
+/// The ISelect interface defines the Select command, which queries for features
 /// of a given class that match the specified criteria. Input to the select
 /// command includes the name of the class, the list of properties to be
 /// returned, and a filter. All but the class name is optional. If the list of
@@ -41,7 +41,7 @@
 {
 public:
     /// \brief
-    /// Gets the FdoLockType value (see "Locking Commands").
+    /// Gets the LockType value (see "Locking Commands").
     /// 
     /// \return
     /// Returns the lock type.
@@ -49,7 +49,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockType get_LockType();
 
     /// \brief
-    /// Sets the FdoLockType value (see "Locking Commands").
+    /// Sets the LockType value (see "Locking Commands").
     /// 
     /// \param value 
     /// Input the lock type.
@@ -60,7 +60,7 @@
 	__property System::Void set_LockType(NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockType value);
 
     /// \brief
-    /// Gets the FdoLockStrategy value (see "Locking Commands").
+    /// Gets the LockStrategy value (see "Locking Commands").
     /// 
     /// \return
     /// Returns the lock strategy.
@@ -68,7 +68,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockStrategy get_LockStrategy();
 
     /// \brief
-    /// Sets the FdoLockStrategy value (see "Locking Commands").
+    /// Sets the LockStrategy value (see "Locking Commands").
     /// 
     /// \param value 
     /// Input the lock strategy.
@@ -79,7 +79,7 @@
 	__property System::Void set_LockStrategy(NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockStrategy value);
 
     /// \brief
-    /// Executes the select command and returns a reference to an FdoIFeatureReader.
+    /// Executes the select command and returns a reference to an IFeatureReader.
     /// 
     /// \return
     /// Returns the feature reader.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIUpdate.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIUpdate.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIUpdate.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -31,7 +31,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIUpdate interface defines the Update command, which modifies instances
+/// The IUpdate interface defines the Update command, which modifies instances
 /// of a given class that match the specified criteria. Input to the update
 /// command includes the name of the class, the list of property name/value
 /// pairs to be updated, and the filter criteria by which to identify the
@@ -46,7 +46,7 @@
 {
 public:
     /// \brief
-    /// Gets the FdoPropertyValueCollection that specifies the names and values of the 
+    /// Gets the PropertyValueCollection that specifies the names and values of the 
     /// properties to be updated.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIUpdateImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIUpdateImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Feature/mgIUpdateImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,7 +26,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE
 
 /// \brief
-/// The FdoIUpdate interface defines the Update command, which modifies instances
+/// The IUpdate interface defines the Update command, which modifies instances
 /// of a given class that match the specified criteria. Input to the update
 /// command includes the name of the class, the list of property name/value
 /// pairs to be updated, and the filter criteria by which to identify the
@@ -41,7 +41,7 @@
 {
 public:
     /// \brief
-    /// Gets the FdoPropertyValueCollection that specifies the names and values of the 
+    /// Gets the PropertyValueCollection that specifies the names and values of the 
     /// properties to be updated.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgConflictType.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgConflictType.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgConflictType.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -21,21 +21,21 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING
 
 /// \brief
-/// The FdoConflictType enumeration defines conflict types required to
+/// The ConflictType enumeration defines conflict types required to
 /// identify the lock type of a conflict reported with the lock conflict reader.
-/// <param name="FdoConflictType_LockConflict">
+/// <param name="ConflictType_LockConflict">
 /// Identifies a reported conflict
 /// in the lock conflict reader as a lock conflict. A conflict represents a
 /// lock conflict if an object the user requests to be locked is already locked
 /// by a different user.
 /// </param>
-/// <param name="FdoConflictType_VersionConflict">
+/// <param name="ConflictType_VersionConflict">
 /// Identifies a reported conflict
 /// in the lock conflict reader as a version conflict. A conflict represents a
 /// version conflict if an object the user requests to be locked has already been
 /// versioned.
 /// </param>
-/// <param name="FdoConflictType_Unsupported">
+/// <param name="ConflictType_Unsupported">
 /// Indicates that an unsupported or
 /// unknown conflict type has been encountered.
 /// </param>

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIAcquireLock.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIAcquireLock.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIAcquireLock.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,32 +26,32 @@
 public __gc __interface ILockConflictReader;
 
 /// \brief
-/// The FdoIAcquireLock interface locks feature instances of a given class 
+/// The IAcquireLock interface locks feature instances of a given class 
 /// that match the specified criteria. Input to the acquire lock command
 /// includes the name of the class, the lock type, the lock strategy, and
 /// filter criteria by which to identify the instances to be locked. The
 /// filter may be specified either as text or as an expression tree (most 
 /// likely produced by a query builder). The lock type value is one of 
-/// <p> - FdoLockType_Shared
-/// <p> - FdoLockType_Exclusive
-/// <p> - FdoLockType_Transaction
-/// <p> - FdoLockType_LongTransactionExclusive
-/// <p> - FdoLockType_AllLongTransactionExclusive
+/// <p> - LockType_Shared
+/// <p> - LockType_Exclusive
+/// <p> - LockType_Transaction
+/// <p> - LockType_LongTransactionExclusive
+/// <p> - LockType_AllLongTransactionExclusive
 /// \remarks
 /// If the lock strategy has a value of all and at least one of the feature
 /// instances specified in the filter is locked by someone else, the command
-/// returns an FdoILockConflictReader list which contains all of the feature
+/// returns an ILockConflictReader list which contains all of the feature
 /// instances specified in the filter.
 /// <p>If the lock strategy has a value of partial, the command returns an
-/// FdoILockConflictReader list which contains all of the feature instances
+/// ILockConflictReader list which contains all of the feature instances
 /// specified in the filter that are already locked by someone else.
-/// The command returns an empty FdoILockConflictReader list if all of the
+/// The command returns an empty ILockConflictReader list if all of the
 /// feature instances specified in the filter were successfully locked.
 public __gc __interface IAcquireLock : public NAMESPACE_OSGEO_FDO_COMMANDS::IFeatureCommand
 {
 public:
     /// \brief
-    /// Gets the FdoLockType value.
+    /// Gets the LockType value.
     /// 
     /// \return
     /// Returns the lock type.
@@ -59,7 +59,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockType get_LockType();
 
     /// \brief
-    /// Sets the FdoLockType value.
+    /// Sets the LockType value.
     /// 
     /// \param value 
     /// Input the lock type
@@ -70,7 +70,7 @@
 	__property System::Void set_LockType(NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockType value);
 
     /// \brief
-    /// Gets the FdoLockStrategy value.
+    /// Gets the LockStrategy value.
     /// 
     /// \return
     /// Returns the strategy value (all or partial).
@@ -78,7 +78,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockStrategy get_LockStrategy();
 
     /// \brief
-    /// Sets the FdoLockStrategy value (all or partial).
+    /// Sets the LockStrategy value (all or partial).
     /// 
     /// \param value 
     /// Input the lock strategy used for locking objects
@@ -89,7 +89,7 @@
 	__property System::Void set_LockStrategy(NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockStrategy value);
 
     /// \brief
-    /// Executes the AcquireLock command, returning an FdoILockConflictReader.
+    /// Executes the AcquireLock command, returning an ILockConflictReader.
     /// 
     /// \return
     /// Returns a list of feature instances which could not be locked.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIAcquireLockImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIAcquireLockImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIAcquireLockImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -29,32 +29,32 @@
 public __gc __interface ILockConflictReader;
 
 /// \brief
-/// The FdoIAcquireLock interface locks feature instances of a given class 
+/// The IAcquireLock interface locks feature instances of a given class 
 /// that match the specified criteria. Input to the acquire lock command
 /// includes the name of the class, the lock type, the lock strategy, and
 /// filter criteria by which to identify the instances to be locked. The
 /// filter may be specified either as text or as an expression tree (most 
 /// likely produced by a query builder). The lock type value is one of 
-/// <p> - FdoLockType_Shared
-/// <p> - FdoLockType_Exclusive
-/// <p> - FdoLockType_Transaction
-/// <p> - FdoLockType_LongTransactionExclusive
-/// <p> - FdoLockType_AllLongTransactionExclusive
+/// <p> - LockType_Shared
+/// <p> - LockType_Exclusive
+/// <p> - LockType_Transaction
+/// <p> - LockType_LongTransactionExclusive
+/// <p> - LockType_AllLongTransactionExclusive
 /// \remarks
 /// If the lock strategy has a value of all and at least one of the feature
 /// instances specified in the filter is locked by someone else, the command
-/// returns an FdoILockConflictReader list which contains all of the feature
+/// returns an ILockConflictReader list which contains all of the feature
 /// instances specified in the filter.
 /// <p>If the lock strategy has a value of partial, the command returns an
-/// FdoILockConflictReader list which contains all of the feature instances
+/// ILockConflictReader list which contains all of the feature instances
 /// specified in the filter that are already locked by someone else.
-/// The command returns an empty FdoILockConflictReader list if all of the
+/// The command returns an empty ILockConflictReader list if all of the
 /// feature instances specified in the filter were successfully locked.
 private __gc class IAcquireLockImp : public NAMESPACE_OSGEO_FDO_COMMANDS::IFeatureCommandImp, public NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::IAcquireLock
 {
 public:
     /// \brief
-    /// Gets the FdoLockType value.
+    /// Gets the LockType value.
     /// 
     /// \return
     /// Returns the lock type.
@@ -62,7 +62,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockType get_LockType();
 
     /// \brief
-    /// Sets the FdoLockType value.
+    /// Sets the LockType value.
     /// 
     /// \param value 
     /// Input the lock type
@@ -73,7 +73,7 @@
 	__property System::Void set_LockType(NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockType value);
 
     /// \brief
-    /// Gets the FdoLockStrategy value.
+    /// Gets the LockStrategy value.
     /// 
     /// \return
     /// Returns the strategy value (all or partial).
@@ -81,7 +81,7 @@
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockStrategy get_LockStrategy();
 
     /// \brief
-    /// Sets the FdoLockStrategy value (all or partial).
+    /// Sets the LockStrategy value (all or partial).
     /// 
     /// \param value 
     /// Input the lock strategy used for locking objects
@@ -92,7 +92,7 @@
 	__property System::Void set_LockStrategy(NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::LockStrategy value);
 
     /// \brief
-    /// Executes the AcquireLock command, returning an FdoILockConflictReader.
+    /// Executes the AcquireLock command, returning an ILockConflictReader.
     /// 
     /// \return
     /// Returns a list of feature instances which could not be locked.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockInfo.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockInfo.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockInfo.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,14 +24,14 @@
 public __gc __interface ILockedObjectReader;
 
 /// \brief
-/// The FdoIGetLockInfo interface defines the GetLockInfo command, which gets a
+/// The IGetLockInfo interface defines the GetLockInfo command, which gets a
 /// lock information for the feature instances of a given class that match the
 /// specified filter. If the filter is empty, all feature instances of the given class are selected.
 public __gc __interface IGetLockInfo : public NAMESPACE_OSGEO_FDO_COMMANDS::IFeatureCommand
 {
 public:
     /// \brief
-    /// Executes the GetLockInfo command, returning an FdoILockedObjectReader.
+    /// Executes the GetLockInfo command, returning an ILockedObjectReader.
     /// 
     /// \return
     /// Returns a locked object reader.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockInfoImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockInfoImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockInfoImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,14 +27,14 @@
 public __gc __interface ILockedObjectReader;
 
 /// \brief
-/// The FdoIGetLockInfo interface defines the GetLockInfo command, which gets a
+/// The IGetLockInfo interface defines the GetLockInfo command, which gets a
 /// lock information for the feature instances of a given class that match the
 /// specified filter. If the filter is empty, all feature instances of the given class are selected.
 private __gc class IGetLockInfoImp : public NAMESPACE_OSGEO_FDO_COMMANDS::IFeatureCommandImp, public NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::IGetLockInfo
 {
 public:
     /// \brief
-    /// Executes the GetLockInfo command, returning an FdoILockedObjectReader.
+    /// Executes the GetLockInfo command, returning an ILockedObjectReader.
     /// 
     /// \return
     /// Returns a locked object reader.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockOwners.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockOwners.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockOwners.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,14 +24,14 @@
 public __gc __interface ILockOwnersReader;
 
 /// \brief
-/// The FdoIGetLockOwners interface defines the GetLockOwners command, which gets a
+/// The IGetLockOwners interface defines the GetLockOwners command, which gets a
 /// list of all lock owners. A connected user has the status of being a lock owner as
 /// does a user who has released all of his locks.
 public __gc __interface IGetLockOwners : public NAMESPACE_OSGEO_FDO_COMMANDS::ICommand
 {
 public:
     /// \brief
-    /// Executes the GetLockOwners command, returning an FdoILockOwnersReader.
+    /// Executes the GetLockOwners command, returning an ILockOwnersReader.
     /// 
     /// \return
     /// Returns the lock owners reader.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockOwnersImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockOwnersImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockOwnersImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,14 +27,14 @@
 public __gc __interface ILockOwnersReader;
 
 /// \brief
-/// The FdoIGetLockOwners interface defines the GetLockOwners command, which gets a
+/// The IGetLockOwners interface defines the GetLockOwners command, which gets a
 /// list of all lock owners. A connected user has the status of being a lock owner as
 /// does a user who has released all of his locks.
 private __gc class IGetLockOwnersImp : public NAMESPACE_OSGEO_FDO_COMMANDS::ICommandImp, public NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::IGetLockOwners
 {
 public:
     /// \brief
-    /// Executes the GetLockOwners command, returning an FdoILockOwnersReader.
+    /// Executes the GetLockOwners command, returning an ILockOwnersReader.
     /// 
     /// \return
     /// Returns the lock owners reader.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockedObjects.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockedObjects.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockedObjects.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,7 +24,7 @@
 public __gc __interface ILockedObjectReader;
 
 /// \brief
-/// The FdoIGetLockedObjects interface defines the GetLockedObjects command, which
+/// The IGetLockedObjects interface defines the GetLockedObjects command, which
 /// gets a list of all objects that are currently locked by a particular user.
 public __gc __interface IGetLockedObjects : public NAMESPACE_OSGEO_FDO_COMMANDS::ICommand
 {
@@ -49,7 +49,7 @@
 	__property System::Void set_LockOwner(System::String* value);
 
     /// \brief
-    /// Executes the GetLockedObjects command, returning an FdoILockedObjectReader.
+    /// Executes the GetLockedObjects command, returning an ILockedObjectReader.
     /// 
     /// \return
     /// Returns a list of all of the objects currently locked by a particular user.i The list might be empty if the user does not have anything locked.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockedObjectsImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockedObjectsImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIGetLockedObjectsImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 public __gc __interface ILockedObjectReader;
 
 /// \brief
-/// The FdoIGetLockedObjects interface defines the GetLockedObjects command, which
+/// The IGetLockedObjects interface defines the GetLockedObjects command, which
 /// gets a list of all objects that are currently locked by a particular user.
 private __gc class IGetLockedObjectsImp : public NAMESPACE_OSGEO_FDO_COMMANDS::ICommandImp, public NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::IGetLockedObjects
 {
@@ -52,7 +52,7 @@
 	__property System::Void set_LockOwner(System::String* value);
 
     /// \brief
-    /// Executes the GetLockedObjects command, returning an FdoILockedObjectReader.
+    /// Executes the GetLockedObjects command, returning an ILockedObjectReader.
     /// 
     /// \return
     /// Returns a list of all of the objects currently locked by a particular user.i The list might be empty if the user does not have anything locked.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockConflictReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockConflictReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockConflictReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,14 +27,14 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING
 
 /// \brief
-/// The FdoILockConflictReader interface provides forward only, read-only
+/// The ILockConflictReader interface provides forward only, read-only
 /// functionality for identifying features that have a lock conflict.
 /// Features with a lock conflict are those that the caller is attempting to modify 
 /// that are already locked by someone else. 
 /// \remarks
-/// A reference to an FdoILockConflictReader is returned from the
+/// A reference to an ILockConflictReader is returned from the
 /// FdoIAcquireLock, FdoISelect, FdoIReleaseLock, FdoIUpdate, and FdoIDelete commands. The
-/// initial position of the FdoILockConflictReader is prior to the first item,
+/// initial position of the ILockConflictReader is prior to the first item,
 /// thus you must call ReadNext to begin accessing any data.
 public __gc __interface ILockConflictReader : public System::IDisposable
 {
@@ -54,7 +54,7 @@
 	System::String* GetFeatureClassName();
 
     /// \brief
-    /// Returns an FdoPropertyValueCollection containing the property values
+    /// Returns an PropertyValueCollection containing the property values
     /// that uniquely identify the feature currently being read.
     /// 
     /// \return
@@ -100,7 +100,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoILockConflictReader object, freeing any resources it may
+    /// Closes the ILockConflictReader object, freeing any resources it may
     /// be holding.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockConflictReaderImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockConflictReaderImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockConflictReaderImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -30,14 +30,14 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING
 
 /// \brief
-/// The FdoILockConflictReader interface provides forward only, read-only
+/// The ILockConflictReader interface provides forward only, read-only
 /// functionality for identifying features that have a lock conflict.
 /// Features with a lock conflict are those that the caller is attempting to modify 
 /// that are already locked by someone else. 
 /// \remarks
-/// A reference to an FdoILockConflictReader is returned from the
-/// FdoIAcquireLock, FdoISelect, FdoIReleaseLock, FdoIUpdate, and FdoIDelete commands. The
-/// initial position of the FdoILockConflictReader is prior to the first item,
+/// A reference to an ILockConflictReader is returned from the
+/// IAcquireLock, ISelect, IReleaseLock, IUpdate, and IDelete commands. The
+/// initial position of the ILockConflictReader is prior to the first item,
 /// thus you must call ReadNext to begin accessing any data.
 private __gc class ILockConflictReaderImp : public NAMESPACE_OSGEO_RUNTIME::Disposable, public NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::ILockConflictReader
 {
@@ -57,7 +57,7 @@
 	System::String* GetFeatureClassName();
 
     /// \brief
-    /// Returns an FdoPropertyValueCollection containing the property values
+    /// Returns an PropertyValueCollection containing the property values
     /// that uniquely identify the feature currently being read.
     /// 
     /// \return
@@ -103,7 +103,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoILockConflictReader object, freeing any resources it may
+    /// Closes the ILockConflictReader object, freeing any resources it may
     /// be holding.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockOwnersReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockOwnersReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockOwnersReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -21,13 +21,13 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING
 
 /// \brief
-/// The FdoILockOwnersReader interface provides forward-only, read-only functionality
+/// The ILockOwnersReader interface provides forward-only, read-only functionality
 /// for identifying users. A connected user has status of lock owner even if he has
 /// no locks or has released his locks.
 /// \remarks
 /// A reference to an
-/// FdoILockOwnersReader interface is returned from the GetLockOwners command. The initial
-/// position of the FdoILockOwnersReader interface is prior to the first item. Thus, you
+/// ILockOwnersReader interface is returned from the GetLockOwners command. The initial
+/// position of the ILockOwnersReader interface is prior to the first item. Thus, you
 /// must call ReadNext to begin accessing any data.
 public __gc __interface ILockOwnersReader : public System::IDisposable
 {
@@ -51,7 +51,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoILockOwnersReader object, freeing any resources it may be
+    /// Closes the ILockOwnersReader object, freeing any resources it may be
     /// holding.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockOwnersReaderImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockOwnersReaderImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockOwnersReaderImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -25,13 +25,13 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING
 
 /// \brief
-/// The FdoILockOwnersReader interface provides forward-only, read-only functionality
+/// The ILockOwnersReader interface provides forward-only, read-only functionality
 /// for identifying users. A connected user has status of lock owner even if he has
 /// no locks or has released his locks.
 /// \remarks
 /// A reference to an
-/// FdoILockOwnersReader interface is returned from the GetLockOwners command. The initial
-/// position of the FdoILockOwnersReader interface is prior to the first item. Thus, you
+/// ILockOwnersReader interface is returned from the GetLockOwners command. The initial
+/// position of the ILockOwnersReader interface is prior to the first item. Thus, you
 /// must call ReadNext to begin accessing any data.
 private __gc class ILockOwnersReaderImp : public NAMESPACE_OSGEO_RUNTIME::Disposable, public NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::ILockOwnersReader
 {
@@ -55,7 +55,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoILockOwnersReader object, freeing any resources it may be
+    /// Closes the ILockOwnersReader object, freeing any resources it may be
     /// holding.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockedObjectReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockedObjectReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockedObjectReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,11 +27,11 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING
 
 /// \brief
-/// The FdoILockedObjectReader interface provides forward-only, read-only
+/// The ILockedObjectReader interface provides forward-only, read-only
 /// functionality to identify lock information for a set of objects.
 /// \remarks
-/// A reference to an FdoILockedObjectReader interface is returned from the GetLockedObjects
-/// and GetLockInfo commands. The initial position of the FdoILockInfoReader is
+/// A reference to an ILockedObjectReader interface is returned from the GetLockedObjects
+/// and GetLockInfo commands. The initial position of the ILockInfoReader is
 /// prior to the first item. Thus, you must call ReadNext to begin accessing
 /// any data.
 public __gc __interface ILockedObjectReader : public System::IDisposable
@@ -51,7 +51,7 @@
 	System::String* GetFeatureClassName();
 
     /// \brief
-    /// Gets an FdoPropertyValueCollection containing the property values
+    /// Gets an PropertyValueCollection containing the property values
     /// that uniquely identify the feature currently being read.
     /// 
     /// \return
@@ -97,7 +97,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoILockInfoReader object, freeing any resources it may
+    /// Closes the ILockInfoReader object, freeing any resources it may
     /// be holding.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockedObjectReaderImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockedObjectReaderImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgILockedObjectReaderImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -33,8 +33,8 @@
 /// The FdoILockedObjectReader interface provides forward-only, read-only
 /// functionality to identify lock information for a set of objects.
 /// \remarks
-/// A reference to an FdoILockedObjectReader interface is returned from the GetLockedObjects
-/// and GetLockInfo commands. The initial position of the FdoILockInfoReader is
+/// A reference to an ILockedObjectReader interface is returned from the GetLockedObjects
+/// and GetLockInfo commands. The initial position of the ILockInfoReader is
 /// prior to the first item. Thus, you must call ReadNext to begin accessing
 /// any data.
 private __gc class ILockedObjectReaderImp : public NAMESPACE_OSGEO_RUNTIME::Disposable, public NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING::ILockedObjectReader
@@ -54,7 +54,7 @@
 	System::String* GetFeatureClassName();
 
     /// \brief
-    /// Gets an FdoPropertyValueCollection containing the property values
+    /// Gets an PropertyValueCollection containing the property values
     /// that uniquely identify the feature currently being read.
     /// 
     /// \return
@@ -100,7 +100,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoILockInfoReader object, freeing any resources it may
+    /// Closes the ILockInfoReader object, freeing any resources it may
     /// be holding.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIReleaseLock.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIReleaseLock.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIReleaseLock.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,7 +24,7 @@
 public __gc __interface ILockConflictReader;
 
 /// \brief
-/// The FdoIReleaseLock interface defines the ReleaseLock command, which releases
+/// The IReleaseLock interface defines the ReleaseLock command, which releases
 /// locks from feature instances of a given class that match the specified
 /// criteria. Input to the release lock command includes the name of the class
 /// and filter criteria by which to identify the instances to be unlocked. The
@@ -55,7 +55,7 @@
 	__property System::Void set_LockOwner(System::String* value);
 
     /// \brief
-    /// Executes the release lock command, returning an FdoILockConflictReader.
+    /// Executes the release lock command, returning an ILockConflictReader.
     /// 
     /// \return
     /// Returns a list of feature instances whose lock is owned by someone else.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIReleaseLockImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIReleaseLockImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgIReleaseLockImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 public __gc __interface ILockConflictReader;
 
 /// \brief
-/// The FdoIReleaseLock interface defines the ReleaseLock command, which releases
+/// The IReleaseLock interface defines the ReleaseLock command, which releases
 /// locks from feature instances of a given class that match the specified
 /// criteria. Input to the release lock command includes the name of the class
 /// and filter criteria by which to identify the instances to be unlocked. The
@@ -58,7 +58,7 @@
 	__property System::Void set_LockOwner(System::String* value);
 
     /// \brief
-    /// Executes the release lock command, returning an FdoILockConflictReader.
+    /// Executes the release lock command, returning an ILockConflictReader.
     /// 
     /// \return
     /// Returns a list of feature instances whose lock is owned by someone else.

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgLockStrategy.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgLockStrategy.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgLockStrategy.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -21,65 +21,13 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING
 
 /// \brief
-/// The FdoLockType enumeration defines lock types. The lock type for 
-/// a locked object indicates a user's access privileges (including the user 
-/// who applied the persistent lock) to an object.
-/// <p>
-/// The enumeration values are used with the commands FdoIAcquireLock, FdoISelect 
-/// and FdoIGetLockInfo. With the command FdoIAcquireLock or FdoISelect, the 
-/// specified value indicates the lock type to be used when applying a lock on
-/// an object. With the command FdoIGetLockInfo, the enumaration values are used
-/// to report lock types back to the user.
-/// <p>
-/// The enumeration contains some special lock types (FdoLockType_None and FdoLockType_Unsupported) 
-/// that are used only when reporting lock type information.
-/// These special lock types cannot be used to specify a lock type to be applied 
-/// to an object.
-/// <param name="FdoLockType_None">
-/// Indicates that an object is unlocked. 
-/// This type cannot be used with the commands FdoIAcquireLock and FdoISelect.
+/// The LockStrategy enumeration defines how lock acquisition should proceed.
+/// <param name="LockStrategy_All">
+/// Declares that either all of the locks must be acquired or none should be acquired.
 /// </param>
-/// <param name="FdoLockType_Unsupported">
-/// Indicates that an unsupported lock 
-/// type has been encountered. This type cannot be used with the commands 
-/// FdoIAcquireLock and FdoISelect.
+/// <param name="LockStrategy_Partial">
+/// Declares that all of the locks that can be acquired should be acquired.
 /// </param>
-/// <param name="FdoLockType_Shared">
-/// Indicates a shared lock type. The type can 
-/// be used with the commands FdoIAcquireLock and FdoISelect.
-/// </param>
-/// <param name="FdoLockType_Transaction">
-/// Indicates that a transaction lock 
-/// should be applied on an object. This type can be used with the commands 
-/// FdoIAcquireLock and FdoISelect.
-/// </param>
-/// <param name="FdoLockType_Exclusive">
-/// Indicates that only this user can modify 
-/// this object. In a long transaction situation, any user can modify the object in any 
-/// other long transaction, including the root long transaction if it is not the current 
-/// long transaction. 
-/// <P>
-/// The type can be used with the commands FdoIAcquireLock and FdoISelect.
-/// </param>
-/// <param name="FdoLockType_LongTransactionExclusive">
-/// Indicates that only this user can 
-/// modify this object in the long transaction containing the object or any long 
-/// transaction created as a descendent of that one. When not in a long transaction 
-/// situation (for example, if only a root long transaction exists), the lock behaves 
-/// like an Exclusive lock. 
-/// <P>
-/// The type can be used with the commands FdoIAcquireLock and FdoISelect.
-/// </param>
-/// <param name="FdoLockType_AllLongTransactionExclusive">
-/// Indicates that only this user can 
-/// modify this object in this long transaction. No user, not even the user locking the object, 
-/// can modify the object in any long transaction created as a descendent of the one 
-/// containing the object being locked. When not in a long transaction situation (for example, 
-/// if only a root long transaction exists), the lock behaves like an Exclusive lock. 
-/// <P>
-/// This type can be used with the commands FdoIAcquireLock and FdoISelect.
-/// </param>
-
 public __value enum LockStrategy
 {
 	LockStrategy_All = FdoLockStrategy_All,

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgLockType.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgLockType.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Locking/mgLockType.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -21,63 +21,63 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LOCKING
 
 /// \brief
-/// The FdoLockType enumeration defines lock types. The lock type for 
+/// The LockType enumeration defines lock types. The lock type for 
 /// a locked object indicates a user's access privileges (including the user 
 /// who applied the persistent lock) to an object.
 /// <p>
 /// The enumeration values are used with the commands FdoIAcquireLock, FdoISelect 
 /// and FdoIGetLockInfo. With the command FdoIAcquireLock or FdoISelect, the 
 /// specified value indicates the lock type to be used when applying a lock on
-/// an object. With the command FdoIGetLockInfo, the enumaration values are used
+/// an object. With the command IGetLockInfo, the enumaration values are used
 /// to report lock types back to the user.
 /// <p>
-/// The enumeration contains some special lock types (FdoLockType_None and FdoLockType_Unsupported) 
+/// The enumeration contains some special lock types (LockType_None and LockType_Unsupported) 
 /// that are used only when reporting lock type information.
 /// These special lock types cannot be used to specify a lock type to be applied 
 /// to an object.
-/// <param name="FdoLockType_None">
+/// <param name="LockType_None">
 /// Indicates that an object is unlocked. 
-/// This type cannot be used with the commands FdoIAcquireLock and FdoISelect.
+/// This type cannot be used with the commands IAcquireLock and FdoISelect.
 /// </param>
-/// <param name="FdoLockType_Unsupported">
+/// <param name="LockType_Unsupported">
 /// Indicates that an unsupported lock 
 /// type has been encountered. This type cannot be used with the commands 
-/// FdoIAcquireLock and FdoISelect.
+/// IAcquireLock and ISelect.
 /// </param>
-/// <param name="FdoLockType_Shared">
+/// <param name="LockType_Shared">
 /// Indicates a shared lock type. The type can 
-/// be used with the commands FdoIAcquireLock and FdoISelect.
+/// be used with the commands IAcquireLock and ISelect.
 /// </param>
-/// <param name="FdoLockType_Transaction">
+/// <param name="LockType_Transaction">
 /// Indicates that a transaction lock 
 /// should be applied on an object. This type can be used with the commands 
-/// FdoIAcquireLock and FdoISelect.
+/// IAcquireLock and ISelect.
 /// </param>
-/// <param name="FdoLockType_Exclusive">
+/// <param name="LockType_Exclusive">
 /// Indicates that only this user can modify 
 /// this object. In a long transaction situation, any user can modify the object in any 
 /// other long transaction, including the root long transaction if it is not the current 
 /// long transaction. 
 /// <P>
-/// The type can be used with the commands FdoIAcquireLock and FdoISelect.
+/// The type can be used with the commands IAcquireLock and ISelect.
 /// </param>
-/// <param name="FdoLockType_LongTransactionExclusive">
+/// <param name="LockType_LongTransactionExclusive">
 /// Indicates that only this user can 
 /// modify this object in the long transaction containing the object or any long 
 /// transaction created as a descendent of that one. When not in a long transaction 
 /// situation (for example, if only a root long transaction exists), the lock behaves 
 /// like an Exclusive lock. 
 /// <P>
-/// The type can be used with the commands FdoIAcquireLock and FdoISelect.
+/// The type can be used with the commands IAcquireLock and ISelect.
 /// </param>
-/// <param name="FdoLockType_AllLongTransactionExclusive">
+/// <param name="LockType_AllLongTransactionExclusive">
 /// Indicates that only this user can 
 /// modify this object in this long transaction. No user, not even the user locking the object, 
 /// can modify the object in any long transaction created as a descendent of the one 
 /// containing the object being locked. When not in a long transaction situation (for example, 
 /// if only a root long transaction exists), the lock behaves like an Exclusive lock. 
 /// <P>
-/// This type can be used with the commands FdoIAcquireLock and FdoISelect.
+/// This type can be used with the commands IAcquireLock and ISelect.
 /// </param>
 
 public __value enum LockType

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLTCheckpointImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLTCheckpointImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLTCheckpointImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,7 +26,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LONGTRANSACTION
 
 /// \brief
-/// The FdoIActivateLongTransactionCheckpoint interface defines the
+/// The IActivateLongTransactionCheckpoint interface defines the
 /// IActivateLongTransactionCheckpointImp command, which allows the user to
 /// activate the named checkpoint for the given long transaction. As a result, 
 /// the long transaction that owns the checkpoint will be activated as well if

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransaction.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransaction.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransaction.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -23,7 +23,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LONGTRANSACTION
 
 /// \brief
-/// The FdoIActivateLongTransaction interface defines the ActivateLongTransaction
+/// The IActivateLongTransaction interface defines the ActivateLongTransaction
 /// command, which activates a long transaction where feature manipulation and
 /// locking commands operate on it. Input to the activate
 /// long transaction command is the long transaction name. The Execute operation

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransactionCheckpoint.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransactionCheckpoint.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransactionCheckpoint.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -23,7 +23,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LONGTRANSACTION
 
 /// \brief
-/// The FdoIActivateLongTransactionCheckpoint interface defines the
+/// The IActivateLongTransactionCheckpoint interface defines the
 /// IActivateLongTransactionCheckpointImp command, which allows the user to
 /// activate the named checkpoint for the given long transaction. As a result, 
 /// the long transaction that owns the checkpoint will be activated as well if

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransactionImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransactionImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIActivateLongTransactionImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,7 +26,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LONGTRANSACTION
 
 /// \brief
-/// The FdoIActivateLongTransaction interface defines the ActivateLongTransaction
+/// The IActivateLongTransaction interface defines the ActivateLongTransaction
 /// command, which activates a long transaction where feature manipulation and
 /// locking commands operate on it. Input to the activate
 /// long transaction command is the long transaction name. The Execute operation

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIChangeLongTransactionPrivileges.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIChangeLongTransactionPrivileges.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIChangeLongTransactionPrivileges.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,7 +24,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LONGTRANSACTION
 
 /// \brief
-/// The FdoIChangeLongTransactionPrivileges interface defines the
+/// The IChangeLongTransactionPrivileges interface defines the
 /// ChangeLongTransactionPrivileges command, which grants or revokes long
 /// transaction privileges for the named user. The ability to change the 
 /// privileges might be restricted by the datastore security if the long 
@@ -74,21 +74,21 @@
 
     /// \brief
     /// Gets the privilege flags to grant or revoke.The returned value may be
-    /// any combination of the values from the FdoLongTransactionPrivileges
+    /// any combination of the values from the LongTransactionPrivileges
     /// enumeration combined via a bit-wise or operation.
     /// 
     /// \return
-    /// Returns the privileges as a bit masked value based on FdoLongTransactionPrivileges enumeration
+    /// Returns the privileges as a bit masked value based on LongTransactionPrivileges enumeration
     /// 
 	__property System::Int32 get_Privileges();
 
     /// \brief
     /// Sets the privilege flags to grant or revoke. The privileges value may be
-    /// any combination of the values from the FdoLongTransactionPrivileges
+    /// any combination of the values from the LongTransactionPrivileges
     /// enumeration combined via a bit-wise or operation.
     /// 
     /// \param value 
-    /// Input the privileges as a bit masked value based on FdoLongTransactionPrivileges enumeration
+    /// Input the privileges as a bit masked value based on LongTransactionPrivileges enumeration
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIChangeLongTransactionSetImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIChangeLongTransactionSetImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/LongTransaction/mgIChangeLongTransactionSetImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS_LONGTRANSACTION
 
 /// \brief
-/// The FdoIChangeLongTransactionSet interface defines the ChangeLongTransactionSet
+/// The IChangeLongTransactionSet interface defines the ChangeLongTransactionSet
 /// command, which allows the user to add a transaction to, remove a transaction
 /// from, or clear the long transaction selection set. Users can add or remove
 /// long transactions to the selection set for which they have access
@@ -43,6 +43,7 @@
     /// \return
     /// Returns the name of the long transaction
     /// 
+    /// \remarks
     /// Note: This function is not required for the Clear operation.
 	__property System::String* get_LongTransactionName();
 
@@ -56,6 +57,7 @@
     /// \return
     /// Returns nothing
     /// 
+    /// \remarks
     /// Note: This function is not required for the Clear operation.
 	__property System::Void set_LongTransactionName(System::String* value);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgIPhysicalElementMapping.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgIPhysicalElementMapping.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgIPhysicalElementMapping.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -132,9 +132,8 @@
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_XML::XmlWriter* xmlWriter, NAMESPACE_OSGEO_FDO_XML::XmlFlags* flags);
 
-    /// Various error reporting functions that are not yet part of the supported
-    /// FDO API.
-    /// All of them return a FdoXmlSkipElementHandler, which can be used to skip
+    /// Various error reporting functions that are not yet part of the supported FDO API.
+    /// All of them return a XmlSkipElementHandler, which can be used to skip
     /// over the element in error.
 	NAMESPACE_OSGEO_COMMON_XML::IXmlSaxHandler* SubElementError(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context, System::String* parentElement, System::String* subElement);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgPhysicalElementMapping.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgPhysicalElementMapping.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgPhysicalElementMapping.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -136,9 +136,8 @@
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_XML::XmlWriter* xmlWriter, NAMESPACE_OSGEO_FDO_XML::XmlFlags* flags);
 
-    /// Various error reporting functions that are not yet part of the supported
-    /// FDO API.
-    /// All of them return a FdoXmlSkipElementHandler, which can be used to skip
+    /// Various error reporting functions that are not yet part of the supported FDO API.
+    /// All of them return a XmlSkipElementHandler, which can be used to skip
     /// over the element in error.
 	NAMESPACE_OSGEO_COMMON_XML::IXmlSaxHandler* SubElementError(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context, System::String* parentElement, System::String* subElement);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgPhysicalSchemaMappingCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgPhysicalSchemaMappingCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/Schema/mgPhysicalSchemaMappingCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -41,7 +41,7 @@
 public __gc class PhysicalSchemaMapping;
 
 /// \brief
-/// FdoPhysicalSchemaMappingCollection defines a collection of Schema Override
+/// PhysicalSchemaMappingCollection defines a collection of Schema Override
 /// sets. This is a generic collection which can contain override sets for different 
 /// FDO Providers.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
@@ -269,7 +269,7 @@
 		IXmlSaxHandler Implemenations
 	*/
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// starts reading an XML document. Does nothing.
     /// 
     /// \param saxContext 
@@ -282,7 +282,7 @@
 	NAMESPACE_OSGEO_COMMON_XML::IXmlSaxHandler* XmlStartDocument(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context);
 
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// finishes reading an XML document. Does nothing
     /// 
     /// \param saxContext 
@@ -291,7 +291,7 @@
 	System::Void XmlEndDocument(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context);
 
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// reads the start tag for an XML element in the document. Does nothing.
     /// 
     /// \param context 
@@ -312,7 +312,7 @@
 	NAMESPACE_OSGEO_COMMON_XML::IXmlSaxHandler* XmlStartElement(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context, String* resourceLocation, String* name, String* qualifiedName, NAMESPACE_OSGEO_COMMON_XML::XmlAttributeCollection* attributes);
 
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// reads the end tag for an XML element in the document. Does nothing.
     /// 
     /// \param context 
@@ -327,12 +327,12 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false
     /// cause the parse to continue. Return value is ignored if the current parse
-    /// is not an incremental parse ( see FdoXmlReader::Parse())
+    /// is not an incremental parse ( see XmlReader::Parse())
     /// 
 	System::Boolean XmlEndElement(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context, System::String* resourceLocation, System::String* name, System::String* qualifiedName);
 
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// reads a chunk of simple content for the current element. Does nothing by default.
     /// This function may be called multiple times for the same element, if the 
     /// the content is long. Applications must not make any assumptions about the
@@ -405,7 +405,7 @@
     /// \brief
     /// Gets the XML Flags that were passed to the ReadXml() 
     /// function that is currently being executed. This function would 
-    /// typically be called by the FdoXmlSaxHandler callbacks.
+    /// typically be called by the XmlSaxHandler callbacks.
     /// 
     /// \return
     /// Returns the XML Flags
@@ -414,7 +414,7 @@
 
     /// \brief
     /// Gets the current XML Reader. This function would 
-    /// typically be called by the FdoXmlSaxHandler callbacks when 
+    /// typically be called by the XmlSaxHandler callbacks when 
     /// ReadXml() is being invoked. When ReadXml() reads from a file, stream,
     /// or text reader, a wrapping XML reader is automatically created.
     /// 
@@ -425,7 +425,7 @@
 
     /// \brief
     /// Gets the stylesheet for converting the XML document from 
-    /// external to internal format. When classes derived from FdoXmlDeserializable
+    /// external to internal format. When classes derived from XmlDeserializable
     /// define an internal format, they must override this function to return a
     /// stylesheet that does the conversion.
     /// 
@@ -435,8 +435,8 @@
 	NAMESPACE_OSGEO_COMMON_XML::XmlReader* GetFromExternalStylesheet();
 
     /// \brief
-    /// Gets the SAX context to pass to the FdoXmlSaxHandler callbacks.
-    /// Classes derived from FdoXmlDeserializable can override this function to 
+    /// Gets the SAX context to pass to the XmlSaxHandler callbacks.
+    /// Classes derived from XmlDeserializable can override this function to 
     /// specify a SAX context with class-specific information.
     /// 
     /// \return
@@ -456,7 +456,7 @@
     /// Input the file name.
     /// \param flags 
     /// Input controls the writing of the elements to the document.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(String* fileName);
 
@@ -472,7 +472,7 @@
     /// XML writer's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the writer.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_XML::XmlWriter* xmlWriter);
 
@@ -487,7 +487,7 @@
     /// text writer's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the writer.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_IO::IoTextWriter* textWriter);
 
@@ -502,7 +502,7 @@
     /// stream's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the stream.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_IO::IoStream* stream);
 
@@ -510,7 +510,7 @@
 
     /// \brief
     /// Gets the stylesheet for converting the XML document from 
-    /// internal to external format. When classes derived from FdoXmlSerializable
+    /// internal to external format. When classes derived from XmlSerializable
     /// define an internal format, they must override this function to return a
     /// stylesheet that does the conversion.
     /// 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgBatchParameterValueCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgBatchParameterValueCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgBatchParameterValueCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,7 +24,7 @@
 public __gc class ParameterValueCollection;
 
 /// \brief
-/// The FdoBatchParameterValueCollection class represents a collection of parameter value collections that is used for
+/// The BatchParameterValueCollection class represents a collection of parameter value collections that is used for
 /// optimized batch inserts.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class BatchParameterValueCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::IList
@@ -92,7 +92,7 @@
     ///     Constructs a new empty string collection
     /// 
     /// \return
-    ///     Returns FdoStringCollection
+    ///     Returns StringCollection
     /// 
     ///  
 	BatchParameterValueCollection();

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgCommandType.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgCommandType.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgCommandType.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -21,14 +21,167 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS
 
 /// \brief
-/// The FdoOrderingOption enumeration defines the list acceptable values that 
-/// can be specified as order by clause to the select and select aggregate commands.
-/// <param name="FdoOrderingOption_Ascending">
-/// Used for ascending option
+/// The CommandType enumeration defines the list of abstract commands a feature
+/// provider can support.
+/// <param name="CommandType_Select">
+/// Represents the Select command
 /// </param>
-/// <param name="FdoOrderingOption_Descending">
-/// Used for descending option
+/// <param name="CommandType_Insert">
+/// Represents the Insert command
 /// </param>
+/// <param name="CommandType_Delete">
+/// Represents the Delete command
+/// </param>
+/// <param name="CommandType_Update">
+/// Represents the Update command
+/// </param>
+/// <param name="CommandType_DescribeSchema">
+/// Represents the DescribeSchema command
+/// </param>
+/// <param name="CommandType_DescribeSchemaMapping">
+/// Represents the DescribeSchemaMapping command
+/// </param>
+/// <param name="CommandType_ApplySchema">
+/// Represents the ApplySchema command.
+/// </param>
+/// <param name="CommandType_DestroySchema">
+/// Represents the DestroySchema command.
+/// </param>
+/// <param name="CommandType_ActivateSpatialContext">
+/// Represents the ActivateSpatialContext command.
+/// </param>
+/// <param name="CommandType_CreateSpatialContext">
+/// Represents the CreateSpatialContext command.
+/// </param>
+/// <param name="CommandType_DestroySpatialContext">
+/// Represents the DestroySpatialContext command.
+/// </param>
+/// <param name="CommandType_GetSpatialContexts">
+/// Represents the GetSpatialContexts command.
+/// </param>
+/// <param name="CommandType_CreateMeasureUnit">
+/// Represents the CreateMeasureUnit command.
+/// </param>
+/// <param name="CommandType_DestroyMeasureUnit">
+/// Represents the DestroyMeasureUnit command.
+/// </param>
+/// <param name="CommandType_GetMeasureUnits">
+/// Represents the GetMeasureUnits command.
+/// </param>
+/// <param name="CommandType_SQLCommand">
+/// Represents the SQLCommand command.
+/// </param>
+/// <param name="CommandType_AcquireLock">
+/// Represents the AcquireLock command.
+/// </param>
+/// <param name="CommandType_GetLockInfo">
+/// Represents the GetLockInfo command.
+/// </param>
+/// <param name="CommandType_GetLockedObjects">
+/// Represents the GetLockedObjects command.
+/// </param>
+/// <param name="CommandType_GetLockOwners">
+/// Represents the GetLockOwners command.
+/// </param>
+/// <param name="CommandType_ReleaseLock">
+/// Represents the ReleaseLock command.
+/// </param>
+/// <param name="CommandType_ActivateLongTransaction">
+/// Represents the ActivateLongTransaction command.
+/// </param>
+/// <param name="CommandType_CommitLongTransaction">
+/// Represents the CommitLongTransaction command.
+/// </param>
+/// <param name="CommandType_CreateLongTransaction">
+/// Represents the CreateLongTransaction command.
+/// </param>
+/// <param name="CommandType_GetLongTransactions">
+/// Represents the GetLongTransactions command.
+/// </param>
+/// <param name="CommandType_FreezeLongTransaction">
+/// Represents the FreezeLongTransaction command.
+/// </param>
+/// <param name="CommandType_RollbackLongTransaction">
+/// Represents the RollbackLongTransaction command.
+/// </param>
+/// <param name="CommandType_ActivateLongTransactionCheckpoint">
+/// Represents the ActivateLongTransactionCheckpoint command.
+/// </param>
+/// <param name="CommandType_CreateLongTransactionCheckpoint">
+/// Represents the CreateLongTransactionCheckpoint command.
+/// </param>
+/// <param name="CommandType_GetLongTransactionCheckpoints">
+/// Represents the GetLongTransactionCheckpoints command.
+/// </param>
+/// <param name="CommandType_RollbackLongTransactionCheckpoint">
+/// Represents the RollbackLongTransactionCheckpoint command.
+/// </param>
+/// <param name="CommandType_ChangeLongTransactionPrivileges">
+/// Represents the ChangeLongTransactionPrivileges command.
+/// </param>
+/// <param name="CommandType_GetLongTransactionPrivileges">
+/// Represents the GetLongTransactionPrivileges command.
+/// </param>
+/// <param name="CommandType_ChangeLongTransactionSet">
+/// Represents the ChangeLongTransactionSet command.
+/// </param>
+/// <param name="CommandType_GetLongTransactionsInSet">
+/// Represents the GetLongTransactionsInSet command.
+/// </param>
+/// <param name="CommandType_FirstProviderCommand">
+/// Represents the index of the first provider specific command.
+/// </param>
+/// <param name="CommandType_SelectAggregates">
+/// Represents the SelectAggregate command.
+/// </param>
+/// <param name="(See Description note)">
+/// \note
+/// The following parameters are not supported in this release. 
+/// They are provided here for informational use only. OSGeo 
+/// reserves the right to change the software related to the content herein.
+/// </param>
+/// <param name="CommandType_NetworkShortestPath">
+/// Represents the NetworkShortestPath command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_NetworkAllPaths">
+/// Represents the NetworkAllPaths command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_NetworkReachableNodes">
+/// Represents the NetworkReachableNodes command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_NetworkReachingNodes">
+/// Represents the NetworkReachingNodes command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_NetworkNearestNeighbors">
+/// Represents the NetworkNearestNeighbors command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_NetworkWithinCost">
+/// Represents the NetworkWithinCost command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_NetworkTSP">
+/// Represents the NetworkTSP command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_ActivateTopologyArea">
+/// Represents the ActivateTopologyArea command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_DeactivateTopologyArea">
+/// Represents the DeactivateTopologyArea command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_ActivateTopologyInCommandResult">
+/// Represents the ActivateTopologyInCommandResult command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_DeactivateTopologyInCommandResults">
+/// Represents the DeactivateTopologyInCommandResults command (see <b>Note</b>).
+/// </param>
+/// <param name="CommandType_CreateDataStore">
+/// Represents the CreateDataStore command.
+/// </param>
+/// <param name="CommandType_DestroyDataStore">
+/// Represents the DestroyDataStore command.
+/// </param>
+/// <param name="CommandType_ListDataStores">
+/// Represents the ListDataStores command.
+/// </param>
 public __value enum CommandType {
     /// Represents the Select Command.
 	CommandType_Select = FdoCommandType_Select,

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgICommand.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgICommand.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgICommand.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -36,7 +36,7 @@
 {
 public:
     /// \brief
-    /// Gets the FdoIConnection that this command will operate on.
+    /// Gets the IConnection that this command will operate on.
     /// 
     /// \return
     /// Returns the connection object
@@ -87,7 +87,7 @@
 	__property System::Void set_CommandTimeOut(System::Int32 value);
 
     /// \brief
-    /// Returns an FdoParameterValueCollection. If the command requires parameters, the 
+    /// Returns an ParameterValueCollection. If the command requires parameters, the 
     /// literal values to bind to each of those named parameters must be added to
     /// this collection.
     /// 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgICommandImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgICommandImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgICommandImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -31,7 +31,7 @@
 public __gc class ParameterValueCollection;
 
 /// \brief
-/// The FdoICommand interface defines behavior common to all commands in FDO. In
+/// The ICommand interface defines behavior common to all commands in FDO. In
 /// order to be executed, commands must have an association to a connection.
 /// Commands can also be optionally associated with a transaction if the
 /// connection supports transactions. The parameter values collection allows
@@ -40,7 +40,7 @@
 {
 public:
     /// \brief
-    /// Gets the FdoIConnection that this command will operate on.
+    /// Gets the IConnection that this command will operate on.
     /// 
     /// \return
     /// Returns the connection object
@@ -91,7 +91,7 @@
 	__property System::Void set_CommandTimeOut(System::Int32 value);
 
     /// \brief
-    /// Returns an FdoParameterValueCollection. If the command requires parameters, the 
+    /// Returns an ParameterValueCollection. If the command requires parameters, the 
     /// literal values to bind to each of those named parameters must be added to
     /// this collection.
     /// 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIFeatureCommand.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIFeatureCommand.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIFeatureCommand.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -31,7 +31,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS
 
 /// \brief
-/// The FdoIFeatureCommand interface defines the behavior common 
+/// The IFeatureCommand interface defines the behavior common 
 /// to all commands that operate on feature instances. The features to 
 /// be operated on are identified by their class and a filter. If the feature 
 /// provider supports inheritance in the schema capabilities, then the command 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIFeatureCommandImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIFeatureCommandImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIFeatureCommandImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -34,7 +34,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS
 
 /// \brief
-/// The FdoIFeatureCommand interface defines the behavior common 
+/// The IFeatureCommand interface defines the behavior common 
 /// to all commands that operate on feature instances. The features to 
 /// be operated on are identified by their class and a filter. If the feature 
 /// provider supports inheritance in the schema capabilities, then the command 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIdentifierCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIdentifierCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgIdentifierCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,7 +27,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS
 
 /// \brief
-/// The FdoIdentifierCollection class represents a collection of FdoIdentifier objects.
+/// The IdentifierCollection class represents a collection of FdoIdentifier objects.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class IdentifierCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::IList
 {
@@ -94,7 +94,7 @@
     ///     Constructs a new empty string collection
     /// 
     /// \return
-    ///     Returns FdoStringCollection
+    ///     Returns StringCollection
     /// 
     ///  
 	IdentifierCollection();
@@ -208,7 +208,7 @@
     /// Input the item name
     /// 
     /// \return
-    /// Returns FdoIdentifier
+    /// Returns Identifier
     /// 
 	NAMESPACE_OSGEO_FDO_EXPRESSION::Identifier* GetItem(System::String* name);
 
@@ -220,7 +220,7 @@
     /// Input the item name
     /// 
     /// \return
-    /// Returns FdoIdentifier
+    /// Returns Identifier
     /// 
 	NAMESPACE_OSGEO_FDO_EXPRESSION::Identifier* FindItem(System::String* name);
 
@@ -232,7 +232,7 @@
     /// Input index of item
     /// 
     /// \return
-    /// Returns FdoIdentifier
+    /// Returns Identifier
     /// 
 	NAMESPACE_OSGEO_FDO_EXPRESSION::Identifier* GetItem(System::Int32 index);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgOrderingOption.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgOrderingOption.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgOrderingOption.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -21,12 +21,12 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS
 
 /// \brief
-/// The FdoOrderingOption enumeration defines the list acceptable values that 
+/// The OrderingOption enumeration defines the list acceptable values that 
 /// can be specified as order by clause to the select and select aggregate commands.
-/// <param name="FdoOrderingOption_Ascending">
+/// <param name="OrderingOption_Ascending">
 /// Used for ascending option
 /// </param>
-/// <param name="FdoOrderingOption_Descending">
+/// <param name="OrderingOption_Descending">
 /// Used for descending option
 /// </param>
 public __value enum OrderingOption{

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgParameterValue.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgParameterValue.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgParameterValue.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -27,19 +27,19 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS
 
 /// \brief
-/// The FdoParameterValue class specifies a value for a particular parameter.
+/// The ParameterValue class specifies a value for a particular parameter.
 /// Instances of this class are used to specify a value to bind to a parameter
 /// when a command is executed.
 public __sealed __gc class ParameterValue : public NAMESPACE_OSGEO_RUNTIME::Disposable
 {
 public:
     /// \brief
-    /// Constructs a default instance of an FdoParameterValue.
+    /// Constructs a default instance of an ParameterValue.
     /// 
 	ParameterValue();
 	
     /// \brief
-    /// Constructs an instance of an FdoParameterValue using the specified arguments.
+    /// Constructs an instance of an ParameterValue using the specified arguments.
     /// 
     /// \param name 
     /// Input name
@@ -47,7 +47,7 @@
 	ParameterValue(System::String* name);
 
     /// \brief
-    /// Constructs an instance of an FdoParameterValue using the specified arguments.
+    /// Constructs an instance of an ParameterValue using the specified arguments.
     /// 
     /// \param name 
     /// Input name
@@ -76,7 +76,7 @@
 	__property System::Void set_Name(System::String* value);
 
     /// \brief
-    /// Gets the value to bind to the parameter as an FdoLiteralValue.
+    /// Gets the value to bind to the parameter as an LiteralValue.
     /// 
     /// \return
     /// Returns literal value
@@ -84,7 +84,7 @@
 	__property NAMESPACE_OSGEO_FDO_EXPRESSION::LiteralValue* get_Value();
 
     /// \brief
-    /// Sets the value to bind to the parameter as an FdoLiteralValue.
+    /// Sets the value to bind to the parameter as an LiteralValue.
     /// 
     /// \param value 
     /// Input literal value

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgParameterValueCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgParameterValueCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgParameterValueCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,7 +24,7 @@
 public __gc class ParameterValue;
 
 /// \brief
-/// The FdoParameterValueCollection class represents a collection of FdoIdentifier objects.
+/// The ParameterValueCollection class represents a collection of Identifier objects.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class ParameterValueCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::IList
 {
@@ -91,7 +91,7 @@
     ///     Constructs a new empty string collection
     /// 
     /// \return
-    ///     Returns FdoStringCollection
+    ///     Returns StringCollection
     /// 
     ///  
 	ParameterValueCollection();
@@ -204,7 +204,7 @@
     /// Input the item name
     /// 
     /// \return
-    /// Returns FdoIdentifier
+    /// Returns Identifier
     /// 
 	NAMESPACE_OSGEO_FDO_COMMANDS::ParameterValue* GetItem(System::String* name);
 
@@ -228,7 +228,7 @@
     /// Input index of item
     /// 
     /// \return
-    /// Returns FdoIdentifier
+    /// Returns Identifier
     /// 
 	NAMESPACE_OSGEO_FDO_COMMANDS::ParameterValue* GetItem(System::Int32 index);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgPropertyValue.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgPropertyValue.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgPropertyValue.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -32,19 +32,19 @@
 BEGIN_NAMESPACE_OSGEO_FDO_COMMANDS
 
 /// \brief
-/// The FdoPropertyValue class represents a property name/value pair. Instances of
+/// The PropertyValue class represents a property name/value pair. Instances of
 /// this class are used to specify or hold onto a reference to a property name
 /// and the properties value.
 public __gc class PropertyValue : public NAMESPACE_OSGEO_RUNTIME::Disposable
 {
 public:
     /// \brief
-    /// Constructs a default instance of an FdoPropertyValue.
+    /// Constructs a default instance of an PropertyValue.
     /// 
 	PropertyValue();
 
     /// \brief
-    /// Constructs an instance of an FdoPropertyValue using the specified arguments.
+    /// Constructs an instance of an PropertyValue using the specified arguments.
     /// 
     /// \param name 
     /// Input property name as identifier
@@ -54,7 +54,7 @@
 	PropertyValue(NAMESPACE_OSGEO_FDO_EXPRESSION::Identifier* name, NAMESPACE_OSGEO_FDO_EXPRESSION::ValueExpression* value);
 
     /// \brief
-    /// Constructs an instance of an FdoPropertyValue using the specified arguments.
+    /// Constructs an instance of an PropertyValue using the specified arguments.
     /// 
     /// \param name 
     /// Input property name as a string
@@ -62,7 +62,7 @@
     /// Input value of property
     /// 
     /// \return
-    /// Returns FdoPropertyValue
+    /// Returns PropertyValue
     /// 
 	PropertyValue(System::String* name, NAMESPACE_OSGEO_FDO_EXPRESSION::ValueExpression* value);
 
@@ -97,15 +97,15 @@
 	System::Void SetName(System::String* value);
 
     /// \brief
-    /// Gets the value of the property as an FdoValueExpression.
+    /// Gets the value of the property as an ValueExpression.
     /// 
     /// \return
-    /// Returns FdoValueExpression
+    /// Returns ValueExpression
     /// 
 	__property NAMESPACE_OSGEO_FDO_EXPRESSION::ValueExpression* get_Value();
 
     /// \brief
-    /// Sets the value of the property as an FdoValueExpression.
+    /// Sets the value of the property as an ValueExpression.
     /// 
     /// \param value 
     /// Input value
@@ -117,7 +117,7 @@
 
     /// \brief
     /// Sets the value of the property as a string. The string content 
-    /// will be parsed to produce the required FdoValueExpression.
+    /// will be parsed to produce the required ValueExpression.
     /// 
     /// \param value 
     /// Input value
@@ -143,7 +143,7 @@
     /// Gets the value of the property as an Stream Reader.
     /// 
     /// \return
-    /// Returns FdoIStreamReader
+    /// Returns IStreamReader
     /// 
 	__property NAMESPACE_OSGEO_COMMON::IStreamReader* get_StreamReader();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgPropertyValueCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgPropertyValueCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Commands/mgPropertyValueCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,7 +24,7 @@
 public __gc class PropertyValue;
 
 /// \brief
-/// The FdoPropertyValueCollection class represents a collection of FdoIdentifier objects.
+/// The PropertyValueCollection class represents a collection of FdoIdentifier objects.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class PropertyValueCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::IList
 {
@@ -91,7 +91,7 @@
     ///     Constructs a new empty string collection
     /// 
     /// \return
-    ///     Returns FdoStringCollection
+    ///     Returns StringCollection
     /// 
     ///  
 	PropertyValueCollection();
@@ -204,7 +204,7 @@
     /// Input the item name
     /// 
     /// \return
-    /// Returns FdoIdentifier
+    /// Returns Identifier
     /// 
 	NAMESPACE_OSGEO_FDO_COMMANDS::PropertyValue* GetItem(System::String* name);
 
@@ -216,7 +216,7 @@
     /// Input the item name
     /// 
     /// \return
-    /// Returns FdoIdentifier
+    /// Returns Identifier
     /// 
 	NAMESPACE_OSGEO_FDO_COMMANDS::PropertyValue* FindItem(System::String* name);
 
@@ -228,7 +228,7 @@
     /// Input index of item
     /// 
     /// \return
-    /// Returns FdoIdentifier
+    /// Returns Identifier
     /// 
 	NAMESPACE_OSGEO_FDO_COMMANDS::PropertyValue* GetItem(System::Int32 index);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Schema/mgFeatureSchemaCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Schema/mgFeatureSchemaCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Schema/mgFeatureSchemaCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -40,7 +40,7 @@
 public __gc class SchemaElement;
 
 /// \brief
-/// The FdoFeatureSchemaCollection class represents a collection of FdoFeatureSchema objects.
+/// The FeatureSchemaCollection class represents a collection of FeatureSchema objects.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class FeatureSchemaCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::IList, public NAMESPACE_OSGEO_FDO_XML::IXmlDeserializable, public NAMESPACE_OSGEO_FDO_XML::IXmlSerializable
 {
@@ -253,10 +253,10 @@
     /// that describes the mappings between the elements in the GML Schema that were read
     /// and the FDO Feature Schema Elements that were created. This function returns the 
     /// Schema Mapping Collection generated by the last call to ReadXml(). The collection
-    /// contains one FdoXmlSchemaMapping per schema that was read.
+    /// contains one XmlSchemaMapping per schema that was read.
     /// 
     /// \return
-    /// Returns FdoPhysicalSchemaMappingCollection*. Returns NULL if ReadXml() has not been
+    /// Returns PhysicalSchemaMappingCollection*. Returns NULL if ReadXml() has not been
     /// called on this object.
     /// 
 	__property NAMESPACE_OSGEO_FDO_COMMANDS_SCHEMA::PhysicalSchemaMappingCollection* get_XmlSchemaMappings();
@@ -265,7 +265,7 @@
 		IXmlSaxHandler Implemenations
 	*/
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// starts reading an XML document. Does nothing.
     /// 
     /// \param context 
@@ -278,7 +278,7 @@
 	NAMESPACE_OSGEO_COMMON_XML::IXmlSaxHandler* XmlStartDocument(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context);
 
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// finishes reading an XML document. Does nothing
     /// 
     /// \param context 
@@ -287,7 +287,7 @@
 	System::Void XmlEndDocument(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context);
 
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// reads the start tag for an XML element in the document. Does nothing.
     /// 
     /// \param context 
@@ -308,7 +308,7 @@
 	NAMESPACE_OSGEO_COMMON_XML::IXmlSaxHandler* XmlStartElement(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context, String* resourceLocation, String* name, String* qualifiedName, NAMESPACE_OSGEO_COMMON_XML::XmlAttributeCollection* attributes);
 
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// reads the end tag for an XML element in the document. Does nothing.
     /// 
     /// \param context 
@@ -323,12 +323,12 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false
     /// cause the parse to continue. Return value is ignored if the current parse
-    /// is not an incremental parse ( see FdoXmlReader::Parse())
+    /// is not an incremental parse ( see XmlReader::Parse())
     /// 
 	System::Boolean XmlEndElement(NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext* context, System::String* resourceLocation, System::String* name, System::String* qualifiedName);
 
     /// \brief
-    /// Default Sax callback that is called when the FdoXmlReader 
+    /// Default Sax callback that is called when the XmlReader 
     /// reads a chunk of simple content for the current element. Does nothing by default.
     /// This function may be called multiple times for the same element, if the 
     /// the content is long. Applications must not make any assumptions about the
@@ -401,7 +401,7 @@
     /// \brief
     /// Gets the XML Flags that were passed to the ReadXml() 
     /// function that is currently being executed. This function would 
-    /// typically be called by the FdoXmlSaxHandler callbacks.
+    /// typically be called by the XmlSaxHandler callbacks.
     /// 
     /// \return
     /// Returns the XML Flags
@@ -410,7 +410,7 @@
 
     /// \brief
     /// Gets the current XML Reader. This function would 
-    /// typically be called by the FdoXmlSaxHandler callbacks when 
+    /// typically be called by the XmlSaxHandler callbacks when 
     /// ReadXml() is being invoked. When ReadXml() reads from a file, stream,
     /// or text reader, a wrapping XML reader is automatically created.
     /// 
@@ -421,7 +421,7 @@
 
     /// \brief
     /// Gets the stylesheet for converting the XML document from 
-    /// external to internal format. When classes derived from FdoXmlDeserializable
+    /// external to internal format. When classes derived from XmlDeserializable
     /// define an internal format, they must override this function to return a
     /// stylesheet that does the conversion.
     /// 
@@ -432,8 +432,8 @@
     // NAMESPACE_OSGEO_COMMON_XML::XmlReader* GetFromExternalStylesheet();
 
     /// \brief
-    /// Gets the SAX context to pass to the FdoXmlSaxHandler callbacks.
-    /// Classes derived from FdoXmlDeserializable can override this function to 
+    /// Gets the SAX context to pass to the XmlSaxHandler callbacks.
+    /// Classes derived from XmlDeserializable can override this function to 
     /// specify a SAX context with class-specific information.
     /// 
     /// \return
@@ -453,7 +453,7 @@
     /// Input the file name.
     /// \param flags 
     /// Input controls the writing of the elements to the document.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(String* fileName);
 
@@ -469,7 +469,7 @@
     /// XML writer's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the writer.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_XML::XmlWriter* xmlWriter);
 
@@ -484,7 +484,7 @@
     /// text writer's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the writer.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_IO::IoTextWriter* textWriter);
 
@@ -499,7 +499,7 @@
     /// stream's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the stream.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_IO::IoStream* stream);
 
@@ -507,7 +507,7 @@
 
     /// \brief
     /// Gets the stylesheet for converting the XML document from 
-    /// internal to external format. When classes derived from FdoXmlSerializable
+    /// internal to external format. When classes derived from XmlSerializable
     /// define an internal format, they must override this function to return a
     /// stylesheet that does the conversion.
     /// 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgIXmlDeserializable.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgIXmlDeserializable.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgIXmlDeserializable.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -22,9 +22,9 @@
 public __gc class XmlFlags;
 
 /// \brief
-/// FdoXmlDeserializable provides the ability to deserialize an FDO object 
+/// XmlDeserializable provides the ability to deserialize an FDO object 
 /// from an XML Document. Deserialization support can be added to any class by basing
-/// it on FdoXmlDeserializable and implementing the XmlSaxHander callbacks.
+/// it on XmlDeserializable and implementing the XmlSaxHander callbacks.
 public __gc __interface IXmlDeserializable : public NAMESPACE_OSGEO_COMMON_XML::IXmlSaxHandler
 {
 public:
@@ -85,7 +85,7 @@
     /// \brief
     /// Gets the XML Flags that were passed to the ReadXml() 
     /// function that is currently being executed. This function would 
-    /// typically be called by the FdoXmlSaxHandler callbacks.
+    /// typically be called by the XmlSaxHandler callbacks.
     /// 
     /// \return
     /// Returns the XML Flags
@@ -94,7 +94,7 @@
 
     /// \brief
     /// Gets the current XML Reader. This function would 
-    /// typically be called by the FdoXmlSaxHandler callbacks when 
+    /// typically be called by the XmlSaxHandler callbacks when 
     /// ReadXml() is being invoked. When ReadXml() reads from a file, stream,
     /// or text reader, a wrapping XML reader is automatically created.
     /// 
@@ -105,7 +105,7 @@
 
     /// \brief
     /// Gets the stylesheet for converting the XML document from 
-    /// external to internal format. When classes derived from FdoXmlDeserializable
+    /// external to internal format. When classes derived from XmlDeserializable
     /// define an internal format, they must override this function to return a
     /// stylesheet that does the conversion.
     /// 
@@ -115,8 +115,8 @@
 	NAMESPACE_OSGEO_COMMON_XML::XmlReader* GetFromExternalStylesheet();
 
     /// \brief
-    /// Gets the SAX context to pass to the FdoXmlSaxHandler callbacks.
-    /// Classes derived from FdoXmlDeserializable can override this function to 
+    /// Gets the SAX context to pass to the XmlSaxHandler callbacks.
+    /// Classes derived from XmlDeserializable can override this function to 
     /// specify a SAX context with class-specific information.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgIXmlSerializable.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgIXmlSerializable.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgIXmlSerializable.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -22,9 +22,9 @@
 public __gc class XmlFlags;
 
 /// \brief
-/// FdoXmlSerializable provides the ability to serialize an FDO object 
+/// XmlSerializable provides the ability to serialize an FDO object 
 /// to an XML Document. Serialization support can be added to any class by basing
-/// it on FdoXmlSerializable and implementing the _writeXml callback.
+/// it on XmlSerializable and implementing the _writeXml callback.
 public __gc __interface IXmlSerializable : public System::IDisposable
 {
 public:
@@ -36,7 +36,7 @@
     /// Input the file name.
     /// \param flags 
     /// Input controls the writing of the elements to the document.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(String* fileName);
 
@@ -52,7 +52,7 @@
     /// XML writer's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the writer.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_XML::XmlWriter* xmlWriter);
 
@@ -67,7 +67,7 @@
     /// text writer's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the writer.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_IO::IoTextWriter* textWriter);
 
@@ -82,7 +82,7 @@
     /// stream's current position will be just after this object.
     /// \param flags 
     /// Input controls the writing of the elements to the stream.
-    /// If NULL then the default flags are used (see FdoXmlFlags::Create())
+    /// If NULL then the default flags are used (see XmlFlags::Create())
     /// 
 	System::Void WriteXml(NAMESPACE_OSGEO_COMMON_IO::IoStream* stream);
 
@@ -90,7 +90,7 @@
 
     /// \brief
     /// Gets the stylesheet for converting the XML document from 
-    /// internal to external format. When classes derived from FdoXmlSerializable
+    /// internal to external format. When classes derived from XmlSerializable
     /// define an internal format, they must override this function to return a
     /// stylesheet that does the conversion.
     /// 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlClassMappingCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlClassMappingCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlClassMappingCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -28,7 +28,7 @@
 public __gc class XmlClassMapping;
 
 /// \brief
-/// FdoXmlClassMappingCollection is a collection of Fdo-GML Class Mapping objects.
+/// XmlClassMappingCollection is a collection of FDO-GML Class Mapping objects.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class XmlClassMappingCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::IList
 {
@@ -98,7 +98,7 @@
     ///     Constructs a new empty string collection
     /// 
     /// \return
-    ///     Returns FdoStringCollection
+    ///     Returns StringCollection
     /// 
     ///  
 	XmlClassMappingCollection(NAMESPACE_OSGEO_FDO_COMMANDS_SCHEMA::PhysicalElementMapping* parent);

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlContext.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlContext.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlContext.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -25,7 +25,7 @@
 
 /// \brief
 /// Default context for deserializing from XML documents via
-/// FdoXmlDeserializable.
+/// XmlDeserializable.
 public __gc class XmlContext : public NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext
 {
 public:

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlDeserializable.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlDeserializable.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlDeserializable.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,9 +26,9 @@
 public __gc class XmlFlags;
 
 /// \brief
-/// FdoXmlDeserializable provides the ability to deserialize an FDO object 
+/// XmlDeserializable provides the ability to deserialize an FDO object 
 /// from an XML Document. Deserialization support can be added to any class by basing
-/// it on FdoXmlDeserializable and implementing the XmlSaxHander callbacks.
+/// it on XmlDeserializable and implementing the XmlSaxHander callbacks.
 public __gc class XmlDeserializable : public NAMESPACE_OSGEO_COMMON_XML::XmlSaxHandler, public NAMESPACE_OSGEO_FDO_XML::IXmlDeserializable
 {
 public:
@@ -89,7 +89,7 @@
     /// \brief
     /// Gets the XML Flags that were passed to the ReadXml() 
     /// function that is currently being executed. This function would 
-    /// typically be called by the FdoXmlSaxHandler callbacks.
+    /// typically be called by the XmlSaxHandler callbacks.
     /// 
     /// \return
     /// Returns the XML Flags
@@ -98,7 +98,7 @@
 
     /// \brief
     /// Gets the current XML Reader. This function would 
-    /// typically be called by the FdoXmlSaxHandler callbacks when 
+    /// typically be called by the XmlSaxHandler callbacks when 
     /// ReadXml() is being invoked. When ReadXml() reads from a file, stream,
     /// or text reader, a wrapping XML reader is automatically created.
     /// 
@@ -109,7 +109,7 @@
 
     /// \brief
     /// Gets the stylesheet for converting the XML document from 
-    /// external to internal format. When classes derived from FdoXmlDeserializable
+    /// external to internal format. When classes derived from XmlDeserializable
     /// define an internal format, they must override this function to return a
     /// stylesheet that does the conversion.
     /// 
@@ -119,8 +119,8 @@
 	NAMESPACE_OSGEO_COMMON_XML::XmlReader* GetFromExternalStylesheet();
 
     /// \brief
-    /// Gets the SAX context to pass to the FdoXmlSaxHandler callbacks.
-    /// Classes derived from FdoXmlDeserializable can override this function to 
+    /// Gets the SAX context to pass to the XmlSaxHandler callbacks.
+    /// Classes derived from XmlDeserializable can override this function to 
     /// specify a SAX context with class-specific information.
     /// 
     /// \return

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlElementMapping.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlElementMapping.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlElementMapping.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -26,7 +26,7 @@
 public __gc class XmlClassMapping;
 
 /// \brief
-/// FdoXmlElementMapping describes GML to FDO mappings for a particular GML Schema
+/// XmlElementMapping describes GML to FDO mappings for a particular GML Schema
 /// element. Only mappings that cannot be represented in FDO are described.
 public __gc class XmlElementMapping : public NAMESPACE_OSGEO_FDO_COMMANDS_SCHEMA::PhysicalElementMapping
 {

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlElementMappingCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlElementMappingCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlElementMappingCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -28,7 +28,7 @@
 public __gc class XmlElementMapping;
 
 /// \brief
-/// FdoXmlElementMappingCollection is a collection of Fdo-GML Class Mapping objects.
+/// XmlElementMappingCollection is a collection of FDO-GML Class Mapping objects.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class XmlElementMappingCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::IList
 {
@@ -98,7 +98,7 @@
     ///     Constructs a new empty string collection
     /// 
     /// \return
-    ///     Returns FdoStringCollection
+    ///     Returns StringCollection
     /// 
     ///  
 	XmlElementMappingCollection(NAMESPACE_OSGEO_FDO_COMMANDS_SCHEMA::PhysicalElementMapping* parent);

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureContext.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureContext.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureContext.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -24,10 +24,10 @@
 public __gc class XmlFeaturePropertyReader;
 
 /// \brief
-/// FdoXmlFeatureContext provides contextual information to the FdoXmlFeatureHandler 
+/// XmlFeatureContext provides contextual information to the XmlFeatureHandler 
 /// callback implementations when an XML document parse is in progress. This class 
 /// provides very rudimentary functionality such as error reporting and access to the 
-/// FdoXmlFeaturePropertyReader doing the parse. Applications can pass extra information
+/// XmlFeaturePropertyReader doing the parse. Applications can pass extra information
 /// by sub-classing from this class.
 public __gc class XmlFeatureContext : public NAMESPACE_OSGEO_COMMON_XML::XmlSaxContext
 {
@@ -36,15 +36,15 @@
     /// Constructs an XML  feature context
     /// 
     /// \param reader 
-    /// Input the FdoXmlFeaturePropertyReader that is parsing the XML document.
+    /// Input the XmlFeaturePropertyReader that is parsing the XML document.
     /// 
 	XmlFeatureContext(NAMESPACE_OSGEO_FDO_XML::XmlFeaturePropertyReader* value);
 
     /// \brief
-    /// Gets the FdoXmlFeaturePropertyReader that is parsing the XML document.
+    /// Gets the XmlFeaturePropertyReader that is parsing the XML document.
     /// 
     /// \return
-    /// Returns FdoXmlFeaturePropertyReader
+    /// Returns XmlFeaturePropertyReader
     /// 
 	NAMESPACE_OSGEO_FDO_XML::XmlFeaturePropertyReader* GetFeaturePropertyReader();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureFlags.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureFlags.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureFlags.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -25,10 +25,10 @@
 BEGIN_NAMESPACE_OSGEO_FDO_XML
 
 /// \brief
-/// FdoXmlFeatureFlags extends FdoXmlFlags to specify flags specific to feature 
+/// XmlFeatureFlags extends XmlFlags to specify flags specific to feature 
 /// serialization.
 /// \remarks
-/// The Error Levels inherited from FdoXmlFlags take on the following meaning when
+/// The Error Levels inherited from XmlFlags take on the following meaning when
 /// applied to features. Suppose we have GML Document A that conforms to GML Schema A.
 /// If Document A is read into FDO and then written to Document B then the Error Levels
 /// applied to the Document A read have the following meaning:
@@ -58,7 +58,7 @@
 {
 public:
     /// \brief
-    /// The FdoXmlFeatureFlags::ConflictOption specifies how to handle features that 
+    /// The XmlFeatureFlags::ConflictOption specifies how to handle features that 
     /// are already in the DataStore, when Deserializing:
     /// 
     /// \param ConflictOption_Add 
@@ -79,20 +79,20 @@
 	};
 
     /// \brief
-    /// Constructs an FdoXmlFeatureFlags object.
+    /// Constructs an XmlFeatureFlags object.
     /// 
     /// \param url 
-    /// See FdoXmlFlags::Create()
+    /// See XmlFlags::Create()
     /// \param errorLevel 
-    /// See FdoXmlFlags::Create()
+    /// See XmlFlags::Create()
     /// \param nameAdjust 
-    /// See FdoXmlFlags::Create()
+    /// See XmlFlags::Create()
     /// \param conflictOption 
     /// Conflict option to apply to pre-existing features, when deserializing features
     /// into an FDO datastore.
     /// 
     /// \return
-    /// Returns FdoXmlFeatureFlags
+    /// Returns XmlFeatureFlags
     /// 
 	XmlFeatureFlags();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureHandler.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureHandler.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureHandler.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -32,10 +32,10 @@
 public __gc class XmlFeatureContext;
 
 /// \brief
-/// FdoXmlFeatureHandler defines the callback interface for reading features from XML.
+/// XmlFeatureHandler defines the callback interface for reading features from XML.
 /// It is not an interface in the strict sense, since each function has a default 
 /// implementation that does nothing. Implementors can override these callbacks to 
-/// customize the handling of feature fragments parsed by FdoXmlFeaturePropertyReader.
+/// customize the handling of feature fragments parsed by XmlFeaturePropertyReader.
 /// Note that the default FeatureProperty implementations log errors in certain circumstances.
 /// Therefore, these functions must be overridden to avoid these errors and indicate that 
 /// these types of properties are being handled by the caller.
@@ -44,7 +44,7 @@
 public:
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader starts reading an XML document. Does nothing.
+    /// XmlFeaturePropertyReader starts reading an XML document. Does nothing.
     /// 
     /// \param featureContext 
     /// Input caller specified contextual information
@@ -56,8 +56,7 @@
 	NAMESPACE_OSGEO_FDO_XML::XmlFeatureHandler* FeatureDocumentStart(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context);
 
     /// \brief
-    /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader 
+    /// Default feature handler callback that is called when the XmlFeaturePropertyReader 
     /// finishes reading an XML document. Does nothing
     /// 
     /// \param featureContext 
@@ -67,7 +66,7 @@
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the start of a feature collection. 
+    /// XmlFeaturePropertyReader encounters the start of a feature collection. 
     /// Does nothing.
     /// 
     /// \param featureContext 
@@ -81,7 +80,7 @@
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the end of a feature collection. 
+    /// XmlFeaturePropertyReader encounters the end of a feature collection. 
     /// Does nothing
     /// 
     /// \param featureContext 
@@ -90,13 +89,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the parse
     /// to continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureCollectionEnd(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the start of a feature. Does nothing.
+    /// XmlFeaturePropertyReader encounters the start of a feature. Does nothing.
     /// 
     /// \param featureContext 
     /// Input caller specified contextual information
@@ -112,7 +111,7 @@
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the end of a feature. Does nothing.
+    /// XmlFeaturePropertyReader encounters the end of a feature. Does nothing.
     /// 
     /// \param featureContext 
     /// Input caller specified contextual information
@@ -120,13 +119,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the 
     /// parse to continue. Return value is ignored if the current parse is not an 
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureEnd(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with boolean value. 
+    /// XmlFeaturePropertyReader encounters a property with boolean value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -140,13 +139,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::Boolean value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with single byte value. 
+    /// XmlFeaturePropertyReader encounters a property with single byte value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -160,13 +159,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::Byte value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with DataTime value. 
+    /// XmlFeaturePropertyReader encounters a property with DataTime value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -180,13 +179,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::DateTime value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with double value. 
+    /// XmlFeaturePropertyReader encounters a property with double value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -200,13 +199,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::Double value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with int16 value. 
+    /// XmlFeaturePropertyReader encounters a property with int16 value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -220,13 +219,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::Int16 value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with int32 value. 
+    /// XmlFeaturePropertyReader encounters a property with int32 value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -240,13 +239,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::Int32 value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with int64 value. 
+    /// XmlFeaturePropertyReader encounters a property with int64 value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -260,13 +259,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::Int64 value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with single precision value. 
+    /// XmlFeaturePropertyReader encounters a property with single precision value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -280,13 +279,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::Single value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a property with string value. 
+    /// XmlFeaturePropertyReader encounters a property with string value. 
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// 
@@ -300,13 +299,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes
     /// the parse to continue. Return value is ignored if the current parse is not an
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::String* value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the start of a raster property.
+    /// XmlFeaturePropertyReader encounters the start of a raster property.
     /// Logs an error when the current ErrorLevel is High or Normal. An error is 
     /// also logged when the ErrorLevel is Low and the current property is not nullable.
     /// The raster image is sent by subsequent calls to FeatureBinaryData().
@@ -322,13 +321,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the 
     /// parse to continue. Return value is ignored if the current parse is not an 
-    /// incremental parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// incremental parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureStartRasterProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, NAMESPACE_OSGEO_FDO_RASTER::IRaster* value);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the end of a raster property.
+    /// XmlFeaturePropertyReader encounters the end of a raster property.
     /// Does nothing
     /// 
     /// \param featureContext 
@@ -337,13 +336,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the parse
     /// to continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureEndRasterProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters  the start of a lob property. 
+    /// XmlFeaturePropertyReader encounters  the start of a lob property. 
     /// Logs an error when the current ErrorLevel is High or Normal. 
     /// If this is a BLOB property then its value is sent through the FeatureBinaryData() callback.
     /// If this is a CLOB property then its value is sent through the FeatureCharacters() callback.
@@ -356,13 +355,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false cause the parse
     /// to continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureStartLobProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the end of a lob property.
+    /// XmlFeaturePropertyReader encounters the end of a lob property.
     /// Does nothing
     /// 
     /// \param featureContext 
@@ -371,13 +370,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the parse
     /// to continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureEndLobProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters a geometric property.
+    /// XmlFeaturePropertyReader encounters a geometric property.
     /// Logs an error when the current ErrorLevel is High or Normal. 
     /// 
     /// \param featureContext 
@@ -392,13 +391,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the parse
     /// continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureGeometricProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* name, System::Byte buffer[]);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the start of an object property. 
+    /// XmlFeaturePropertyReader encounters the start of an object property. 
     /// Does nothing.
     /// 
     /// \param featureContext 
@@ -416,7 +415,7 @@
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the end of an object property.
+    /// XmlFeaturePropertyReader encounters the end of an object property.
     /// Does nothing
     /// 
     /// \param featureContext 
@@ -425,13 +424,13 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the parse
     /// to continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureEndObjectProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context);
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the start of an association property. 
+    /// XmlFeaturePropertyReader encounters the start of an association property. 
     /// Does nothing by default.
     /// A number of other events are fired between FeatureStartAssociationProperty
     /// and FeatureEndAssociationProperty, to identify the associated feature 
@@ -464,7 +463,7 @@
 
     /// \brief
     /// Default feature handler callback that is called when the 
-    /// FdoXmlFeaturePropertyReader encounters the end of an association property.
+    /// XmlFeaturePropertyReader encounters the end of an association property.
     /// Does nothing
     /// 
     /// \param featureContext 
@@ -473,12 +472,12 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the parse
     /// to continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureEndAssociationProperty(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context);
 
     /// \brief
-    /// Default Feature Handle callback that is called when the FdoXmlFeaturePropertyReader 
+    /// Default Feature Handle callback that is called when the XmlFeaturePropertyReader 
     /// reads a chunk of data for a CLOB property. Does nothing by default.
     /// This function may be called multiple times for the same property, if the 
     /// the property value is large. Applications must not make any assumptions about the
@@ -492,12 +491,12 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the parse
     /// to continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureCharacters(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::String* value);
 
     /// \brief
-    /// Default Feature callback that is called when the FdoXmlFeaturePropertyReader 
+    /// Default Feature callback that is called when the XmlFeaturePropertyReader 
     /// reads a chunk of data for a Raster or BLOB property. 
     /// Does nothing by default.
     /// This function may be called multiple times for the same property, if the 
@@ -515,7 +514,7 @@
     /// \return
     /// Returning true causes the current parse to stop. Returning false causes the parse
     /// to continue. Return value is ignored if the current parse is not an incremental 
-    /// parse ( see FdoXmlFeaturePropertyReader::Parse())
+    /// parse ( see XmlFeaturePropertyReader::Parse())
     /// 
 	System::Boolean FeatureBinaryData(NAMESPACE_OSGEO_FDO_XML::XmlFeatureContext* context, System::Byte buffer[]);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeaturePropertyReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeaturePropertyReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeaturePropertyReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -34,10 +34,10 @@
 public __gc class XmlFeatureFlags;
 
 /// \brief
-/// FdoXmlFeaturePropertyReader reads features from an XML document. The reading
+/// XmlFeaturePropertyReader reads features from an XML document. The reading
 /// is event driven. As features and properties within features are encountered, the 
-/// invoker is notified through the FdoXmlFeatureHandler interface. This class is 
-/// similar to FdoXmlFeatureReader except that it provides better performance.
+/// invoker is notified through the XmlFeatureHandler interface. This class is 
+/// similar to XmlFeatureReader except that it provides better performance.
 public __gc class XmlFeaturePropertyReader : public NAMESPACE_OSGEO_COMMON_XML::XmlSaxHandler
 {
 public:
@@ -66,7 +66,7 @@
     /// the default flags are used.
     /// 
     /// \return
-    /// Returns FdoXmlFeaturePropertyReader
+    /// Returns XmlFeaturePropertyReader
     /// 
 	XmlFeaturePropertyReader(NAMESPACE_OSGEO_COMMON_XML::XmlReader* reader);
 
@@ -76,7 +76,7 @@
     /// Gets the Xml document reader that was passed to this object.
     /// 
     /// \return
-    /// Returns FdoXmlReader.
+    /// Returns XmlReader.
     /// 
 	NAMESPACE_OSGEO_COMMON_XML::XmlReader* GetXmlReader();
 
@@ -84,7 +84,7 @@
     /// Gets the feature schemas describing the features being read.
     /// 
     /// \return
-    /// Returns FdoFeatureSchemaCollection
+    /// Returns FeatureSchemaCollection
     /// 
 	__property NAMESPACE_OSGEO_FDO_SCHEMA::FeatureSchemaCollection* get_FeatureSchemas();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeaturePropertyWriter.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeaturePropertyWriter.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeaturePropertyWriter.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -48,8 +48,8 @@
 public __gc class XmlFlags;
 
 /// \brief
-/// FdoXmlFeaturePropertyWriter writes features in GML format. It is similar to 
-/// FdoXmlFeatureWriter, except that it provides better performance. However, the 
+/// XmlFeaturePropertyWriter writes features in GML format. It is similar to 
+/// XmlFeatureWriter, except that it provides better performance. However, the 
 /// caller is responsible for ensuring that properties are written in proper order. 
 public __gc class XmlFeaturePropertyWriter : public NAMESPACE_OSGEO_RUNTIME::Disposable
 {
@@ -80,7 +80,7 @@
     /// Gets the class definition for the current feature being written.
     /// 
     /// \return
-    /// Returns FdoClassDefinition
+    /// Returns ClassDefinition
     /// 
 	__property NAMESPACE_OSGEO_FDO_SCHEMA::ClassDefinition* get_ClassDefinition();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureReader.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureReader.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureReader.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -36,7 +36,7 @@
 public __gc class XmlFeaturePropertyReader;
 
 /// \brief
-/// FdoXmlFeatureReader reads GML format features from a XML
+/// XmlFeatureReader reads GML format features from a XML
 /// document. The reading is done procedurally, rather than through events.
 /// \remarks
 /// Each feature can be read in 3 steps:
@@ -47,7 +47,7 @@
 /// </ol>
 /// This class allows random access to the properties of the current feature, meaning that 
 /// ReadNext() accumulates a list of these properties. This may have slight performance implications.
-/// If performance is a concern then FdoXmlFeaturePropertyReader should be used instead.
+/// If performance is a concern then XmlFeaturePropertyReader should be used instead.
 public __gc class XmlFeatureReader : public NAMESPACE_OSGEO_FDO_XML::XmlFeatureHandler, public NAMESPACE_OSGEO_FDO_COMMANDS_FEATURE::IFeatureReader
 {
 public:
@@ -56,8 +56,8 @@
     /// 
     /// \param reader 
     /// Input XML document reader. Please refer to the reader parameter of 
-    /// FdoXmlFeaturePropertyReader::Create() for a description of how the features are
-    /// read from the document. An FdoXmlFeaturePropertyReader is automatically wrapped 
+    /// XmlFeaturePropertyReader::Create() for a description of how the features are
+    /// read from the document. An XmlFeaturePropertyReader is automatically wrapped 
     /// around this reader. This Feature Property Reader can be retrieved by calling 
     /// GetFeaturePropertyReader().
     /// \param flags 
@@ -73,7 +73,7 @@
     /// Gets the feature property reader that was passed to this object.
     /// 
     /// \return
-    /// Returns FdoXmlFeaturePropertyReader
+    /// Returns XmlFeaturePropertyReader
     /// 
 	NAMESPACE_OSGEO_FDO_XML::XmlFeaturePropertyReader* GetFeaturePropertyReader();
 
@@ -81,7 +81,7 @@
     /// Gets the feature schemas describing the features being read.
     /// 
     /// \return
-    /// Returns FdoFeatureSchemaCollection
+    /// Returns FeatureSchemaCollection
     /// 
 	__property NAMESPACE_OSGEO_FDO_SCHEMA::FeatureSchemaCollection* get_FeatureSchemas();
 
@@ -134,7 +134,7 @@
 	System::Int32 GetDepth();
 
     /// \brief
-    /// Gets a reference to an FdoIFeatureReader to read the data contained in
+    /// Gets a reference to an IFeatureReader to read the data contained in
     /// the object or object collection property. If the property is not an
     /// object property, an exception is thrown.
     /// 
@@ -151,7 +151,7 @@
 	*/
     /// \brief
     /// Gets the Boolean value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Boolean or an 
+    /// performed, thus the property must be DataType_Boolean or an 
     /// exception is thrown.
     /// 
     /// \param name 
@@ -164,7 +164,7 @@
 
     /// \brief
     /// Gets the byte value of the specified property. No conversion is 
-    /// performed, thus the property must be FdoDataType_Byte or an 
+    /// performed, thus the property must be DataType_Byte or an 
     /// exception is thrown.
     /// 
     /// \param name 
@@ -177,7 +177,7 @@
 
     /// \brief
     ///  Gets the date and time value of the specified property. No conversion is 
-    /// performed, thus the property must be FdoDataType_DateTime or an 
+    /// performed, thus the property must be DataType_DateTime or an 
     /// exception is thrown.
     /// 
     /// \param name 
@@ -190,7 +190,7 @@
 
     /// \brief
     /// Gets the double-precision floating point value of the specified property. No
-    /// conversion is performed, thus the property must be FdoDataType_Double
+    /// conversion is performed, thus the property must be DataType_Double
     /// or an exception is thrown.
     /// 
     /// \param name 
@@ -203,7 +203,7 @@
 
     /// \brief
     /// Gets the 16-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int16 or an exception
+    /// performed, thus the property must be DataType_Int16 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -216,7 +216,7 @@
 
     /// \brief
     /// Gets the 32-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int32 or an exception
+    /// performed, thus the property must be DataType_Int32 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -229,7 +229,7 @@
 
     /// \brief
     /// Gets the 64-bit integer value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_Int64 or an exception
+    /// performed, thus the property must be DataType_Int64 or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -242,7 +242,7 @@
 
     /// \brief
     /// Gets the Single floating point value of the specified property. No
-    /// conversion is performed, thus the property must be FdoDataType_Single
+    /// conversion is performed, thus the property must be DataType_Single
     /// or an exception is thrown.
     /// 
     /// \param name 
@@ -255,7 +255,7 @@
 
     /// \brief
     /// Gets the string value of the specified property. No conversion is
-    /// performed, thus the property must be FdoDataType_String or an exception
+    /// performed, thus the property must be DataType_String or an exception
     /// is thrown.
     /// 
     /// \param name 
@@ -268,8 +268,8 @@
 
     /// \brief
     /// Gets a LOBValue reference. The LOB is fully read in and data available.
-    /// Because no conversion is performed, the property must be FdoDataType_BLOB or
-    /// FdoDataType_CLOB etc. (a LOB type)
+    /// Because no conversion is performed, the property must be DataType_BLOB or
+    /// DataType_CLOB etc. (a LOB type)
     /// 
     /// \param name 
     /// Input the property name.
@@ -280,11 +280,11 @@
 	NAMESPACE_OSGEO_FDO_EXPRESSION::LOBValue* GetLOB(System::String* name);
 
     /// \brief
-    /// Gets a reference of the specified LOB property as a FdoBLOBStreamReader or
-    /// FdoCLOBStreamReader etc. to allow reading in blocks of data.
-    /// Because no conversion is performed, the property must be FdoDataType_BLOB 
-    /// or FdoDataType_CLOB etc. (a LOB type)
-    /// Cast the FdoIStreamReader to the appropiate LOB Stream Reader.
+    /// Gets a reference of the specified LOB property as a BLOBStreamReader or
+    /// CLOBStreamReader etc. to allow reading in blocks of data.
+    /// Because no conversion is performed, the property must be DataType_BLOB 
+    /// or DataType_CLOB etc. (a LOB type)
+    /// Cast the IStreamReader to the appropiate LOB Stream Reader.
     /// 
     /// \param name 
     /// Input the property name.
@@ -343,7 +343,7 @@
 	System::Boolean ReadNext();
 
     /// \brief
-    /// Closes the FdoIFeatureReader object, freeing any resources it may be holding.
+    /// Closes the IFeatureReader object, freeing any resources it may be holding.
     /// 
     /// \return
     /// Returns nothing

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureWriter.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureWriter.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFeatureWriter.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -37,7 +37,7 @@
 public __gc class XmlFeatureFlags;
 
 /// \brief
-/// FdoXmlFeatureWriter writes features to an XML document. The features are 
+/// XmlFeatureWriter writes features to an XML document. The features are 
 /// written in GML format. Each feature is written in 3 steps:
 /// <ol>
 /// 	<li> call SetClassDefintion() to define the feature's class name,
@@ -50,7 +50,7 @@
 /// WriteFeature() ensures that the properties are written in their proper order. This 
 /// may have slight performance implications since this writer has to accumulate the 
 /// property values before writing them. If performance is a concern then 
-/// FdoXmlFeaturePropertyWriter should be used instead.
+/// XmlFeaturePropertyWriter should be used instead.
 public __gc class XmlFeatureWriter : public NAMESPACE_OSGEO_RUNTIME::Disposable
 {
 public:
@@ -65,7 +65,7 @@
     /// flags passed to the document writer are used.
     /// 
     /// \return
-    /// Returns FdoXmlFeatureWriter
+    /// Returns XmlFeatureWriter
     /// 
 	XmlFeatureWriter(NAMESPACE_OSGEO_FDO_XML::XmlFeaturePropertyWriter* writer, NAMESPACE_OSGEO_FDO_XML::XmlFeatureFlags* flags);
 	XmlFeatureWriter(NAMESPACE_OSGEO_FDO_XML::XmlFeaturePropertyWriter* writer);
@@ -75,7 +75,7 @@
     /// 
     /// \param writer 
     /// Input XML document writer. Specifies the XML document that the features will be written    
-    /// to . An FdoXmlFeaturePropertyWriter is automatically wrapped 
+    /// to . An XmlFeaturePropertyWriter is automatically wrapped 
     /// around this writer. This Feature Property Writer can be retrieved by calling 
     /// GetFeaturePropertyWriter().
     /// \param flags 
@@ -83,7 +83,7 @@
     /// flags passed to the document writer are used.
     /// 
     /// \return
-    /// Returns FdoXmlFeatureWriter
+    /// Returns XmlFeatureWriter
     /// 
 	XmlFeatureWriter(NAMESPACE_OSGEO_COMMON_XML::XmlWriter* writer, NAMESPACE_OSGEO_FDO_XML::XmlFeatureFlags* flags);
 	XmlFeatureWriter(NAMESPACE_OSGEO_COMMON_XML::XmlWriter* writer);
@@ -92,7 +92,7 @@
     /// Gets the feature property writer that was passed to this object.
     /// 
     /// \return
-    /// Returns FdoXmlFeaturePropertyWriter
+    /// Returns XmlFeaturePropertyWriter
     /// 
 	__property NAMESPACE_OSGEO_FDO_XML::XmlFeaturePropertyWriter* get_FeaturePropertyWriter();
 
@@ -100,7 +100,7 @@
     /// Gets the class definition for the current feature being written.
     /// 
     /// \return
-    /// Returns FdoClassDefinition
+    /// Returns ClassDefinition
     /// 
 	__property NAMESPACE_OSGEO_FDO_SCHEMA::ClassDefinition* get_ClassDefinition();
 
@@ -127,7 +127,7 @@
 	__property System::Void set_Property(NAMESPACE_OSGEO_FDO_COMMANDS::PropertyValue* propertyValue);
 
     /// \brief
-    /// Gets a reference to an FdoXmlFeatureWriter to write the data contained
+    /// Gets a reference to an XmlFeatureWriter to write the data contained
     /// in a collection object property. If the property is not an object property, an 
     /// exception is thrown.
     /// 
@@ -140,7 +140,7 @@
 	__property NAMESPACE_OSGEO_FDO_XML::XmlFeatureWriter* get_ObjectWriter(System::String* propertyName);
 
     /// \brief
-    /// Gets a reference to an FdoXmlFeatureWriter to write the data contained
+    /// Gets a reference to an XmlFeatureWriter to write the data contained
     /// in an association property. If the property is not an association property, an 
     /// exception is thrown.
     /// 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFlags.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFlags.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/Xml/mgXmlFlags.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -28,7 +28,7 @@
 public __gc class PhysicalElementMapping;
 
 /// \brief
-/// FdoXmlFlags defines various options for serializing and deserializing
+/// XmlFlags defines various options for serializing and deserializing
 /// FDO element to and from XML Documents.
 public __gc class XmlFlags : public NAMESPACE_OSGEO_RUNTIME::Disposable
 {
@@ -78,7 +78,7 @@
 	};
 
     /// \brief
-    /// Constructs an FdoXmlFlags object.
+    /// Constructs an XmlFlags object.
     /// 
     /// \param url 
     /// Input When writing  Feature Schemas, this specifies the 
@@ -92,7 +92,7 @@
     /// false: apply name adjustment only to elements with fdo:nameAdjust="true"
     /// 
     /// \return
-    /// Returns FdoXmlFlags
+    /// Returns XmlFlags
     /// 
 	XmlFlags();
 
@@ -103,7 +103,7 @@
 	XmlFlags(System::String* location, NAMESPACE_OSGEO_FDO_XML::XmlFlags::ErrorLevel errorLevel, System::Boolean nameAdjust);
 
     /// \brief
-    /// Sets the target namespace prefix, see FdoXmlFlags::Create().
+    /// Sets the target namespace prefix, see XmlFlags::Create().
     /// 
     /// \param location 
     /// Input the target namespace prefix.
@@ -111,7 +111,7 @@
     __property System::Void set_Url(System::String* location);
 
     /// \brief
-    /// Gets the target namespace prefix, see FdoXmlFlags::Create().
+    /// Gets the target namespace prefix, see XmlFlags::Create().
     /// 
     /// \return
     /// Returns the target namespace prefix.
@@ -119,7 +119,7 @@
 	__property System::String* get_Url();
 
     /// \brief
-    /// Sets the error level, see FdoXmlFlags::Create().
+    /// Sets the error level, see XmlFlags::Create().
     /// 
     /// \param value 
     /// Input the error level.
@@ -127,7 +127,7 @@
 	__property System::Void set_Errorlevel(NAMESPACE_OSGEO_FDO_XML::XmlFlags::ErrorLevel value);
 
     /// \brief
-    /// Gets the current error level, see FdoXmlFlags::Create().
+    /// Gets the current error level, see XmlFlags::Create().
     /// 
     /// \return
     /// Returns the error level.
@@ -135,7 +135,7 @@
 	__property NAMESPACE_OSGEO_FDO_XML::XmlFlags::ErrorLevel get_Errorlevel();
 
     /// \brief
-    /// Sets the name adjustment flag, see FdoXmlFlags::Create().
+    /// Sets the name adjustment flag, see XmlFlags::Create().
     /// 
     /// \param nameAdjust 
     /// Input the name adjustment flag.
@@ -143,7 +143,7 @@
   	__property System::Void set_NameAdjust(System::Boolean nameAdjust);
 
     /// \brief
-    /// Gets the name adjustment flag, see FdoXmlFlags::Create().
+    /// Gets the name adjustment flag, see XmlFlags::Create().
     /// 
     /// \return
     /// Returns the name adjustment flag.
@@ -201,9 +201,9 @@
     /// 
     /// \param mappings 
     /// Input the Schema Mapping Overrides. This collection
-    /// can contain an FdoXmlSchemaMapping element for each Feature Schema that
+    /// can contain an XmlSchemaMapping element for each Feature Schema that
     /// may be written or read. When a Feature Schema is read or written to or 
-    /// from GML, this collection is checked for an FdoXmlSchemaMapping item named 
+    /// from GML, this collection is checked for an XmlSchemaMapping item named 
     /// the same as the feature schema. If present, the hints in this item 
     /// affect how the feature schema is read or written. The Schema Mapping 
     /// Overrides also control how features are read since they 
@@ -216,7 +216,7 @@
     /// Gets the current Schema Mapping Overrides.
     /// 
     /// \return
-    /// Returns FdoXmlSchemaMappingCollection*.
+    /// Returns XmlSchemaMappingCollection*.
     /// 
     __property NAMESPACE_OSGEO_FDO_COMMANDS_SCHEMA::PhysicalSchemaMappingCollection* get_SchemaMappings();
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIConnectionManager.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIConnectionManager.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIConnectionManager.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -35,7 +35,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns an instance of an FdoIConnection object. Throws an instance of FdoException * if an error occurs.
+    /// Returns an instance of an IConnection object. Throws an instance of FdoException * if an error occurs.
     /// 
 	NAMESPACE_OSGEO_FDO_CONNECTIONS::IConnection* CreateConnection(String* providerName);
 
@@ -47,7 +47,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void FreeLibrary(String* providerName);
 };

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIConnectionManagerImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIConnectionManagerImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIConnectionManagerImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -39,7 +39,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns an instance of an FdoIConnection object. Throws an instance of FdoException * if an error occurs.
+    /// Returns an instance of an IConnection object. Throws an instance of Exception if an error occurs.
     /// 
 	NAMESPACE_OSGEO_FDO_CONNECTIONS::IConnection* CreateConnection(String* providerName);
 
@@ -51,7 +51,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void FreeLibrary(String* providerName);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIDisposableCollection.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIDisposableCollection.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIDisposableCollection.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -23,7 +23,7 @@
 BEGIN_NAMESPACE_OSGEO_FDO
 
 /// \brief
-/// The FdoIDisposableCollection class represents a collection of FdoIDisposable objects.
+/// The IDisposableCollection class represents a collection of IDisposable objects.
 [System::Reflection::DefaultMemberAttribute("RealTypeItem")]
 public __sealed __gc class IDisposableCollection : public NAMESPACE_OSGEO_RUNTIME::Disposable, public System::Collections::IList
 {

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIProviderRegistry.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIProviderRegistry.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIProviderRegistry.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -31,7 +31,7 @@
     /// Gets a read only collection of information describing each of the registered feature providers. 
     /// 
     /// \return
-    /// Returns an an instance of ProviderCollection. Throws an instance of FdoException * if an error occurs.
+    /// Returns an an instance of ProviderCollection. Throws an instance of Exception if an error occurs.
     /// 
 	NAMESPACE_OSGEO_FDO_CLIENTSERVICES::ProviderCollection* GetProviders();
 
@@ -58,7 +58,7 @@
     /// A flag indicating if the provider is a managed or unmanaged .Net provider.
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void RegisterProvider(String * name, 
 		String * displayName, 
@@ -76,7 +76,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void UnregisterProvider(String * name);
 

Modified: branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIProviderRegistryImp.h
===================================================================
--- branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIProviderRegistryImp.h	2007-02-01 01:48:47 UTC (rev 698)
+++ branches/3.2.x/Fdo/Managed/Src/OSGeo/FDO/mgIProviderRegistryImp.h	2007-02-01 01:55:54 UTC (rev 699)
@@ -31,7 +31,7 @@
     /// Gets a read only collection of information describing each of the registered feature providers. 
     /// 
     /// \return
-    /// Returns an an instance of FdoProviderCollection. Throws an instance of FdoException * if an error occurs.
+    /// Returns an an instance of ProviderCollection. Throws an instance of Exception if an error occurs.
     /// 
 	NAMESPACE_OSGEO_FDO_CLIENTSERVICES::ProviderCollection* GetProviders();
 	
@@ -58,7 +58,7 @@
     /// A flag indicating if the provider is a managed or unmanaged .Net provider.
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void RegisterProvider(String * name, 
                                           String * displayName, 
@@ -76,7 +76,7 @@
     /// [Company].[Provider].[Version].
     /// 
     /// \return
-    /// Returns nothing. Throws an instance of FdoException * if an error occurs.
+    /// Returns nothing. Throws an instance of Exception if an error occurs.
     /// 
 	System::Void UnregisterProvider(String * name);
 



More information about the fdo-commits mailing list