Backport of r120545.

svn path=/branches/mono-2-2/mono/; revision=120546

diff --git a/data/net_2_0/ChangeLog b/data/net_2_0/ChangeLog
index 08211bbf82c2a674c4dae19b33e3984d81e35ead..217a37b97a42539254a30e5e7743f2bd808de573 100644 (file)
--- a/data/net_2_0/ChangeLog
+++ b/data/net_2_0/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-03  Marek Habersack  <mhabersack@novell.com>
+
+       * machine.config: rename serviceModelHostingEnvironment to
+       serviceHostingEnvironment.
 
 2008-11-14 Gonzalo Paniagua Javier <gonzalo@novell.com>
 

diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config
index 7aa3504efdec57feca5ed547040c26426f444b81..dea2918f9e1bdccb40b8f82fadcca60c04c90d44 100644 (file)
--- a/data/net_2_0/machine.config
+++ b/data/net_2_0/machine.config
@@ -81,7 +81,7 @@
                        <section name="commonBehaviors" type="System.ServiceModel.Configuration.CommonBehaviorsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                        <section name="diagnostic" type="System.ServiceModel.Configuration.DiagnosticSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                        <section name="extensions" type="System.ServiceModel.Configuration.ExtensionsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-                       <section name="serviceModelHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+                       <section name="serviceHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                        <section name="services" type="System.ServiceModel.Configuration.ServicesSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                </sectionGroup>
                <section name="system.webServer" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />