From f3f0b151d60a6672883213ebfaf64d8ded109800 Mon Sep 17 00:00:00 2001
From: sitereactor <unknown@kiln.example.com>
Date: Tue, 17 Jul 2012 12:54:34 -0200
Subject: [PATCH] Adding Japanese langauge files to umbraco.presentation
 project

---
 .../umbraco.presentation.csproj               | 19 +++-
 src/umbraco.presentation/web.Template.config  |  4 +-
 src/umbraco.presentation/web.config           | 98 ++++++++++++-------
 3 files changed, 82 insertions(+), 39 deletions(-)

diff --git a/src/umbraco.presentation/umbraco.presentation.csproj b/src/umbraco.presentation/umbraco.presentation.csproj
index ae3608732f..f7675173a8 100644
--- a/src/umbraco.presentation/umbraco.presentation.csproj
+++ b/src/umbraco.presentation/umbraco.presentation.csproj
@@ -1813,6 +1813,7 @@
       <DependentUpon>UI.xml</DependentUpon>
     </None>
     <Content Include="umbraco\config\lang\he.xml" />
+    <Content Include="umbraco\config\lang\ja.xml" />
     <Content Include="umbraco\config\lang\pl.xml" />
     <Content Include="umbraco\config\lang\pt.xml" />
     <Content Include="umbraco\config\lang\se.xml" />
@@ -1851,6 +1852,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\advhr\js\rule.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\advhr\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\rule.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\css\advimage.css" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\editor_plugin.js" />
@@ -1860,12 +1862,14 @@
     <Content Include="umbraco_client\tinymce3\plugins\advimage\js\image.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\advimage\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\css\advlink.css" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\js\advlink.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\advlink\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\link.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\advlist\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlist\editor_plugin_src.js" />
@@ -1904,6 +1908,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\emotions\js\emotions.js" />
     <Content Include="umbraco_client\tinymce3\plugins\emotions\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\emotions\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\emotions\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\example\dialog.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\example\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\example\editor_plugin_src.js" />
@@ -1920,6 +1925,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\js\fullpage.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullscreen\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullscreen\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullscreen\fullscreen.htm" />
@@ -1959,7 +1965,6 @@
     <Content Include="umbraco_client\tinymce3\plugins\media\js\embed.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\js\media.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\langs\en_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\media\langs\he_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\media.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\media\moxieplayer.swf" />
     <Content Include="umbraco_client\tinymce3\plugins\nonbreaking\editor_plugin.js" />
@@ -1974,6 +1979,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\paste\js\pasteword.js" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\paste\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\pastetext.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\pasteword.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\preview\editor_plugin.js" />
@@ -1991,6 +1997,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\js\searchreplace.js" />
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\searchreplace\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\searchreplace.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\spellchecker\css\content.css" />
     <Content Include="umbraco_client\tinymce3\plugins\spellchecker\editor_plugin.js" />
@@ -2002,6 +2009,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\style\js\props.js" />
     <Content Include="umbraco_client\tinymce3\plugins\style\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\style\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\style\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\style\props.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\style\readme.txt" />
     <Content Include="umbraco_client\tinymce3\plugins\tabfocus\editor_plugin.js" />
@@ -2018,6 +2026,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\table\js\table.js" />
     <Content Include="umbraco_client\tinymce3\plugins\table\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\table\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\table\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\table\merge_cells.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\table\row.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\table\table.htm" />
@@ -2028,6 +2037,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\template\js\template.js" />
     <Content Include="umbraco_client\tinymce3\plugins\template\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\template\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\template\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\template\template.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracocontextmenu\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracocss\dialog.htm" />
@@ -2040,10 +2050,12 @@
     <Content Include="umbraco_client\tinymce3\plugins\umbracoimg\js\image.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracoimg\langs\he_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracoimg\langs\en_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\umbracoimg\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracolink\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracolink\js\umbracolink.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracolink\langs\he_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracolink\langs\en_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\umbracolink\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\dialog.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\img\insMacro.gif" />
@@ -2052,6 +2064,8 @@
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\he.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\ja.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracopaste\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracoshortcut\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\visualblocks\css\visualblocks.css" />
@@ -2080,6 +2094,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\js\ins.js" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\themes\advanced\about.htm" />
     <Content Include="umbraco_client\tinymce3\themes\advanced\anchor.htm" />
     <Content Include="umbraco_client\tinymce3\themes\advanced\charmap.htm" />
@@ -2158,6 +2173,8 @@
     <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\he.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\he_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\ja.js" />
+    <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\ja_dlg.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\link.htm" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\shortcuts.htm" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\umbraco\content.css" />
diff --git a/src/umbraco.presentation/web.Template.config b/src/umbraco.presentation/web.Template.config
index 362a142dd8..773c4e0f47 100644
--- a/src/umbraco.presentation/web.Template.config
+++ b/src/umbraco.presentation/web.Template.config
@@ -26,8 +26,8 @@
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
 
   <appSettings>
-    <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=umbraco;user id=web;password=farmer" />
-    <add key="umbracoConfigurationStatus" value="4.8.0" />
+    <add key="umbracoDbDSN" value="" />
+    <add key="umbracoConfigurationStatus" value="" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
     <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
diff --git a/src/umbraco.presentation/web.config b/src/umbraco.presentation/web.config
index 6200875464..2ff11fd5c5 100644
--- a/src/umbraco.presentation/web.config
+++ b/src/umbraco.presentation/web.config
@@ -3,12 +3,15 @@
   <configSections>
     <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
     <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
+
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
+
+    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false"/>
+    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false"/>
+    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false"/>
+
     <!-- Added in Umbraco 4.6.2 -->
     <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
       <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
@@ -21,9 +24,10 @@
   <clientDependency configSource="config\ClientDependency.config" />
   <Examine configSource="config\ExamineSettings.config" />
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
+
   <appSettings>
-    <add key="umbracoDbDSN" value="server=.\SQLEXPRESS2008;database=dbUmb4x;user id=sa;password=D3gr4d3" />
-    <add key="umbracoConfigurationStatus" value="4.8.0" />
+    <add key="umbracoDbDSN" value="" />
+    <add key="umbracoConfigurationStatus" value="" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
     <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
@@ -41,15 +45,17 @@
     <add key="umbracoProfileUrl" value="profiler" />
     <add key="umbracoUseSSL" value="false" />
     <add key="umbracoUseMediumTrust" value="false" />
+
     <!-- 
       Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
       Alex Norcliffe 2010 02 for 4.1
     -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
+    <add key="umbracoContentXMLUseLocalTemp" value="false"/>
+
     <!-- Added in Umbraco 4.6.2 -->
-    <add key="webpages:Enabled" value="false" />
-    <add key="enableSimpleMembership" value="false" />
-    <add key="autoFormsAuthentication" value="false" />
+    <add key="webpages:Enabled" value="false"/>
+    <add key="enableSimpleMembership" value="false"/>
+    <add key="autoFormsAuthentication" value="false"/>
     <!-- End of added in Umbraco 4.6.2 -->
   </appSettings>
   <system.net>
@@ -59,6 +65,7 @@
       </smtp>
     </mailSettings>
   </system.net>
+
   <connectionStrings>
     <remove name="LocalSqlServer" />
     <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
@@ -69,7 +76,9 @@
     <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
     <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
     <xhtmlConformance mode="Strict" />
+
     <httpRuntime requestValidationMode="2.0" />
+
     <pages enableEventValidation="false">
       <!-- ASPNETAJAX -->
       <controls>
@@ -88,7 +97,7 @@
       <!-- ASPNETAJAX -->
       <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
+      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
     </httpModules>
     <httpHandlers>
       <remove verb="*" path="*.asmx" />
@@ -96,14 +105,16 @@
       <add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
       <add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
       <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
+
       <!-- UMBRACO CHANNELS -->
       <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
       <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
       <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
       <!-- SPELL CHECKER -->
       <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
     </httpHandlers>
+
     <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.0">
       <assemblies>
         <!-- ASP.NET 4.0 Assemblies -->
@@ -115,14 +126,16 @@
         <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
         <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
       </assemblies>
+
       <!-- Added in Umbraco 4.6.2 -->
       <buildProviders>
-        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
+        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
+        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
+        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
       </buildProviders>
       <!-- End of added in Umbraco 4.6.2 -->
     </compilation>
+
     <authentication mode="Forms">
       <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
     </authentication>
@@ -132,7 +145,7 @@
     <!-- Membership Provider -->
     <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
       <providers>
-        <clear />
+        <clear/>
         <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
         <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
       </providers>
@@ -140,44 +153,48 @@
     <!-- added by NH to support membership providers in access layer -->
     <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
       <providers>
-        <clear />
+        <clear/>
         <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
       </providers>
     </roleManager>
     <!-- Sitemap provider-->
     <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
       <providers>
-        <clear />
+        <clear/>
         <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
       </providers>
     </siteMap>
   </system.web>
+
   <!-- ASPNETAJAX -->
   <system.web.extensions>
     <scripting>
       <scriptResourceHandler enableCompression="true" enableCaching="true" />
     </scripting>
   </system.web.extensions>
+
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
     <modules runAllManagedModulesForAllRequests="true">
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <remove name="FormsAuthentication" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
+        <remove name="ScriptModule" />
+        <remove name="UrlRewriteModule" />
+        <remove name="umbracoRequestModule" />
+        <remove name="viewstateMoverModule" />
+        <remove name="umbracoBaseRequestModule" />
+        <remove name="ClientDependencyModule" />
+        <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
+        <remove name="FormsAuthentication" />
+
+        <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+        <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
+        <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
+        <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
+        <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+        <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
+        <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule"/>
     </modules>
+
     <handlers accessPolicy="Read, Write, Script, Execute">
       <remove name="WebServiceHandlerFactory-Integrated" />
       <remove name="ScriptHandlerFactory" />
@@ -187,20 +204,25 @@
       <remove name="Channels_Word" />
       <remove name="ClientDependency" />
       <remove name="SpellChecker" />
+
       <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
       <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
+      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
     </handlers>
+
     <!-- Adobe AIR mime type -->
     <staticContent>
       <remove fileExtension=".air" />
       <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
     </staticContent>
+
   </system.webServer>
+
+
   <system.codedom>
     <compilers>
       <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
@@ -209,6 +231,8 @@
       </compiler>
     </compilers>
   </system.codedom>
+
+
   <runtime>
     <!-- Old asp.net ajax assembly bindings -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -222,9 +246,10 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+
   <!-- Added in Umbraco 4.6.2 -->
   <system.web.webPages.razor>
-    <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines" />
+    <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>
     <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
       <namespaces>
         <add namespace="Microsoft.Web.Helpers" />
@@ -234,4 +259,5 @@
     </pages>
   </system.web.webPages.razor>
   <!-- End of added in Umbraco 4.6.2 -->
+
 </configuration>
\ No newline at end of file