Sync some files

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

3 files changed, 3 insertions, 4 deletions

diff --git a/wp-admin/export.php b/wp-admin/export.php
index 8894f29..755dba8 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -12,7 +12,6 @@ require_once ('admin-header.php');
 <div class="wrap">

 <h2><?php _e('Export'); ?></h2>

 <p><?php _e('This will allow you to download an export of your WordPress posts and comments in a XML format.'); ?></p>

-<p>We need some more text here. Maybe talking about the export file or how to save it.</p>

 <form action="" method="get">

 <p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" />

 <input type="hidden" name="download" value="true" />

@@ -103,4 +102,4 @@ if ( $comments ) { foreach ( $comments as $c ) { ?>
 }

 

 include ('admin-footer.php');

-?>
\ No newline at end of file
+?>

diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index c96b246..8776664 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -90,7 +90,7 @@ if ($action == 'retrospam') {
 </fieldset>
 <p class="submit">
 <input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys,open_proxy_check" /> 
+<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys" /> 
 <input type="submit" name="Submit" value="<?php _e('Update Options') ?>" /> 
 </p> 
 </form> 
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index aa806c9..ef0b6cf 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -87,7 +87,7 @@ include('admin-header.php');
 </table> 
 <p class="submit"> 
 <input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" /> 
+<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,show_on_front,page_on_front,page_for_posts" /> 
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
 </p> 
 </form>