WP Merge to 4197

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@761 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 16 insertions, 14 deletions

diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 232c90a..bb7bd9e 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -11,26 +11,27 @@ include('admin-header.php');
 <h2><?php _e('Reading Options') ?></h2> 
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <?php if ( get_pages() ): ?>
 <fieldset class="options"> 
 <legend><?php _e('Front Page') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Front page displays:')?></th> 
 <td>
-	<label>
+	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> /> 
-		<?php _e('The latest posts'); ?>
+		<?php _e('Your latest posts'); ?>
 	</label>
-	<br />
-	<label>
+	</p>
+	<p><label>
 		<input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> /> 
-		<?php printf(__('A static <a href="%s">page</a> (select below)'), 'edit-pages.php'); ?>
+		<?php printf(__('A <a href="%s">static page</a> (select below)'), 'edit-pages.php'); ?>
 	</label>
+	</p>
 <ul>
-	<li><?php printf(__('Show this page on the front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
-	<li><?php printf(__('Show the latest posts on this page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
+	<li><?php printf(__('Front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
+	<li><?php printf(__('Posts page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
 </ul>
 <?php if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front') ) : ?>
 <div id="front-page-warning" class="updated fade-ff0000">
@@ -48,7 +49,7 @@ include('admin-header.php');
 
 <fieldset class="options"> 
 <legend><?php _e('Blog Pages') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Show at most:') ?></th> 
 <td>
@@ -64,7 +65,7 @@ include('admin-header.php');
 
 <fieldset class="options"> 
 <legend><?php _e('Syndication Feeds') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Show the most recent:') ?></th> 
 <td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" size="3" /> <?php _e('posts') ?></td> 
@@ -72,13 +73,14 @@ include('admin-header.php');
 <tr valign="top">
 <th scope="row"><?php _e('For each article, show:') ?> </th>
 <td>
-<label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text') ?></label><br />
-<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
+<p><label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text') ?></label><br />
+<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
+<p><?php _e('Note: If you use the <code>&lt;--more--&gt;</code> feature, it will cut off posts in RSS feeds.'); ?></p>
 </td>
 </tr> 
 </table> 
 </fieldset> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Encoding for pages and feeds:') ?></th> 
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />