Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php	(revision 15614)
+++ wp-admin/options-general.php	(working copy)
@@ -84,15 +84,6 @@
 </tr>
 <?php if ( !is_multisite() ) { ?>
 <tr valign="top">
-<th scope="row"><label for="siteurl"><?php _e('WordPress address (URL)') ?></label></th>
-<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="home"><?php _e('Site address (URL)') ?></label></th>
-<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
-</tr>
-<tr valign="top">
 <th scope="row"><label for="admin_email"><?php _e('E-mail address') ?> </label></th>
 <td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text" />
 <span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></td>
@@ -318,8 +309,20 @@
 ?>
 </select></td>
 </tr>
-<?php do_settings_fields('general', 'default'); ?>
+<?php if ( !is_multisite() ) : ?>
+<tr><td colspan="2">Before changing the following two values, please ensure you have read and understand the instructions for <a href="http://codex.wordpress.org/Moving_WordPress">moving WordPress</a>.</td></tr>
+<tr valign="top">
+<th scope="row"><label for="siteurl"><?php _e('WordPress address (URL)') ?></label></th>
+<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
+</tr>
+<tr valign="top">
+<th scope="row"><label for="home"><?php _e('Site address (URL)') ?></label></th>
+<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
+<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
+</tr>
 <?php
+	endif;
+ do_settings_fields('general', 'default'); 
 	$languages = get_available_languages();
 	if ( is_multisite() && !empty( $languages ) ):
 ?>