From 59fe1739338a1413b01c19f6c992389511c8a2d5 Mon Sep 17 00:00:00 2001
From: sebastiaan <unknown@kiln.example.com>
Date: Mon, 17 Sep 2012 07:47:13 -0200
Subject: [PATCH] Removed old and completely unused GraphicHeadlineFormat
 config setting Some updates to umbracoSettings.config Thanks to Jan Skovgaard
 for the help!

---
 src/Umbraco.Core/Configuration/UmbracoSettings.cs     | 11 +----------
 .../config/umbracoSettings.Release.config             | 11 +++++------
 src/Umbraco.Web.UI/config/umbracoSettings.config      | 11 +++++------
 src/umbraco.businesslogic/UmbracoSettings.cs          | 11 +----------
 4 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings.cs b/src/Umbraco.Core/Configuration/UmbracoSettings.cs
index 12643fa10c..d7a7d4723c 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings.cs
@@ -661,16 +661,7 @@ namespace Umbraco.Core.Configuration
                     return false;
             }
         }
-
-        /// <summary>
-        /// Gets the graphic headline format - png or gif
-        /// </summary>
-        /// <value>The graphic headline format.</value>
-        public static string GraphicHeadlineFormat
-        {
-            get { return GetKey("/settings/content/graphicHeadlineFormat"); }
-        }
-
+        
         /// <summary>
         /// Gets a value indicating whether umbraco will ensure unique node naming.
         /// This will ensure that nodes cannot have the same url, but will add extra characters to a url.
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index e600e40947..5f649fac98 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -29,9 +29,11 @@
 		should be set to false if the aspnet account hasn't got readrights of the driveroot up to the /media directory -->
         <UploadAllowDirectories>True</UploadAllowDirectories>
         <errors>
-            <!-- the id of the page that should be shown if the page is not found -->
-            <!--        <errorPage culture="default">1</errorPage>-->
-            <!--        <errorPage culture="en-US">200</errorPage>-->
+          <!-- the id of the page that should be shown if the page is not found -->
+          <!--<error404>
+                   <errorPage culture="default">1</errorPage>
+                   <errorPage culture="en-US">200</errorPage>
+            </error404>-->
             <error404>1</error404>
         </errors>
         <notifications>
@@ -42,9 +44,6 @@
         <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
         <ensureUniqueNaming>True</ensureUniqueNaming>
 
-        <!-- lowercase, either 'gif' or 'png' -->
-        <graphicHeadlineFormat>gif</graphicHeadlineFormat>
-
         <!-- clean editor content with use of tidy -->
         <TidyEditorContent>False</TidyEditorContent>
 
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index f212d20605..dcb71c0538 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -26,12 +26,14 @@
         </scripteditor>
 
         <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
-		should be set to false if the aspnet account hasn't got readrights of the driveroot up to the /media directory -->
+		should be set to false if the application pool's user account hasn't got readrights of the driveroot up to the /media directory -->
         <UploadAllowDirectories>True</UploadAllowDirectories>
         <errors>
             <!-- the id of the page that should be shown if the page is not found -->
-            <!--        <errorPage culture="default">1</errorPage>-->
-            <!--        <errorPage culture="en-US">200</errorPage>-->
+            <!--<error404>
+                   <errorPage culture="default">1</errorPage>
+                   <errorPage culture="en-US">200</errorPage>
+            </error404>-->
             <error404>
                 <errorPage culture="default">1134</errorPage>
                 <errorPage culture="en-US">1135</errorPage>
@@ -46,9 +48,6 @@
         <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
         <ensureUniqueNaming>True</ensureUniqueNaming>
 
-        <!-- lowercase, either 'gif' or 'png' -->
-        <graphicHeadlineFormat>gif</graphicHeadlineFormat>
-
         <!-- clean editor content with use of tidy -->
         <TidyEditorContent>False</TidyEditorContent>
 
diff --git a/src/umbraco.businesslogic/UmbracoSettings.cs b/src/umbraco.businesslogic/UmbracoSettings.cs
index 855028adfb..6e30200699 100644
--- a/src/umbraco.businesslogic/UmbracoSettings.cs
+++ b/src/umbraco.businesslogic/UmbracoSettings.cs
@@ -322,16 +322,7 @@ namespace umbraco
         {
 			get { return Umbraco.Core.Configuration.UmbracoSettings.ScriptDisableEditor; }
         }
-
-        /// <summary>
-        /// Gets the graphic headline format - png or gif
-        /// </summary>
-        /// <value>The graphic headline format.</value>
-        public static string GraphicHeadlineFormat
-        {
-			get { return Umbraco.Core.Configuration.UmbracoSettings.GraphicHeadlineFormat; }
-        }
-
+        
         /// <summary>
         /// Gets a value indicating whether umbraco will ensure unique node naming.
         /// This will ensure that nodes cannot have the same url, but will add extra characters to a url.