From c1f7aeb0b90bb17113b4bdab71f6aa5492f69c81 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 25 Oct 2008 21:29:18 +0000
Subject: [PATCH] More options pages updates.

git-svn-id: http://svn.automattic.com/wordpress/trunk@9346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-discussion.php | 4 ----
 wp-admin/options-media.php      | 4 ----
 wp-admin/options-permalink.php  | 5 -----
 wp-admin/options-privacy.php    | 4 ----
 wp-admin/options-reading.php    | 8 ++------
 wp-admin/options-writing.php    | 4 ----
 6 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index edbeab853..dd2dba75e 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -23,10 +23,6 @@ include('admin-header.php');
 <input type="hidden" name="action" value="update" />
 <?php wp_nonce_field('discussion-options') ?>
 
-<p class="submit submit-top">
-<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
-</p>
-
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><?php _e('Default article settings') ?></th>
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index 7337ccdb2..7391d6e7b 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -25,10 +25,6 @@ include('admin-header.php');
 <input type='hidden' name='option_page' value='media' />
 <input type="hidden" name="page_options" value="thumbnail_size_w,thumbnail_size_h,thumbnail_crop,medium_size_w,medium_size_h,image_default_size,image_default_align,image_default_link_type,large_size_w,large_size_h" /> <!-- is this needed anymore TODO -->
 
-<p class="submit submit-top">
-	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
-</p>
-
 <p><?php _e('The setting below determines where images, documents, and other media files will be linked to when inserted into the body of a post.'); ?></p>
 
 <table class="form-table">
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index afa6abdc4..8d382534a 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -128,11 +128,6 @@ else
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
 
-
-<p class="submit submit-top">
-	<input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" />
-</p>
-
   <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 
 <?php
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index f61950d14..fd7794cf1 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -23,10 +23,6 @@ include('./admin-header.php');
 <input type='hidden' name='option_page' value='privacy' />
 <input type="hidden" name="action" value="update" />
 
-<p class="submit submit-top">
-	<input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" />
-</p>
-
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><?php _e('Blog Visibility') ?> </th>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 35cbbba3f..364e864ff 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -23,10 +23,6 @@ include('admin-header.php');
 <input type='hidden' name='option_page' value='reading' />
 <input type="hidden" name="action" value="update" />
 
-<p class="submit submit-top">
-	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
-</p>
-
 <table class="form-table">
 <?php if ( get_pages() ): ?>
 <tr valign="top">
@@ -76,8 +72,8 @@ include('admin-header.php');
 
 <tr valign="top">
 <th scope="row"><label for="blog_charset"><?php _e('Encoding for pages and feeds') ?></label></th>
-<td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
-<?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></td>
+<td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" />
+<span class="setting-description"><?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></span></td>
 </tr>
 <?php do_settings_fields('reading', 'default'); ?>
 </table>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 28434c251..e1f218c66 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -23,10 +23,6 @@ include('admin-header.php');
 <input type='hidden' name='option_page' value='writing' />
 <input type="hidden" name="action" value="update" />
 
-<p class="submit submit-top">
-	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
-</p>
-
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><label for="default_post_edit_rows"> <?php _e('Size of the post box') ?></label></th>