Index: wp-content/themes/twentyten/attachment.php
===================================================================
--- wp-content/themes/twentyten/attachment.php	(revision 14423)
+++ wp-content/themes/twentyten/attachment.php	(working copy)
@@ -22,7 +22,7 @@
 
 					<div class="entry-meta">
 						<?php
-							printf(__( '<span class="meta-prep meta-prep-author"> By </span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>', 'twentyten'),
+							printf(__( '<span class="meta-prep meta-prep-author"> By </span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>', 'twentyten' ),
 								get_author_posts_url( get_the_author_meta( 'ID' ) ),
 								sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
 								get_the_author()
@@ -30,13 +30,13 @@
 						?>
 						<span class="meta-sep"> | </span>
 						<?php
-							printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>', 'twentyten'),
+							printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>', 'twentyten' ),
 								esc_attr( get_the_time() ),
 								get_the_date()
 							);
 							if ( wp_attachment_is_image() ) {
 								$size = getimagesize( wp_get_attachment_url() );
-								printf( __( ' at <a href="%1$s" title="Link to full-size image">%2$s &times; %3$s</a>', 'twentyten'),
+								printf( __( ' at <a href="%1$s" title="Link to full-size image">%2$s &times; %3$s</a>', 'twentyten' ),
 									wp_get_attachment_url(),
 									$size[0],
 									$size[1]
@@ -50,7 +50,7 @@
 						<div class="entry-attachment">
 <?php if ( wp_attachment_is_image() ) : ?>
 						<p class="attachment"><a href="<?php echo twentyten_get_next_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
-							$attachment_size = apply_filters( 'twentyten_attachment_size',  900 );
+							$attachment_size = apply_filters( 'twentyten_attachment_size', 900 );
 							echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height.
 						?></a></p>
 
@@ -64,7 +64,7 @@
 						</div>
 						<div class="entry-caption"><?php if ( ! empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
 
-<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
+<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
 <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
 
 					</div><!-- .entry-content -->
Index: wp-content/themes/twentyten/author.php
===================================================================
--- wp-content/themes/twentyten/author.php	(revision 14423)
+++ wp-content/themes/twentyten/author.php	(working copy)
@@ -17,15 +17,15 @@
 
 				<h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a>" ); ?></h1>
 
-<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries  ?>
+<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
 					<div id="entry-author-info">
 						<div id="author-avatar">
 							<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
-						</div><!-- #author-avatar 	-->
+						</div><!-- #author-avatar -->
 						<div id="author-description">
 							<h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
 							<?php the_author_meta( 'description' ); ?>
-						</div><!-- #author-description	-->
+						</div><!-- #author-description -->
 					</div><!-- .entry-author-info -->
 <?php endif; ?>
 
Index: wp-content/themes/twentyten/comments.php
===================================================================
--- wp-content/themes/twentyten/comments.php	(revision 14423)
+++ wp-content/themes/twentyten/comments.php	(working copy)
@@ -29,7 +29,7 @@
 <?php if ( have_comments() ) : ?>
 			<h3 id="comments-title">
 <?php
-    printf( _n('One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten'),
+    printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
         number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
 ?>
             </h3>
Index: wp-content/themes/twentyten/footer.php
===================================================================
--- wp-content/themes/twentyten/footer.php	(revision 14423)
+++ wp-content/themes/twentyten/footer.php	(working copy)
@@ -34,4 +34,4 @@
 <?php wp_footer(); ?>
 
 </body>
-</html>
+</html>
\ No newline at end of file
Index: wp-content/themes/twentyten/functions.php
===================================================================
--- wp-content/themes/twentyten/functions.php	(revision 14423)
+++ wp-content/themes/twentyten/functions.php	(working copy)
@@ -104,8 +104,8 @@
 
 	// The height and width of your custom header. You can hook into the theme's own filters to change these values.
 	// Add a filter to twentyten_header_image_width and twentyten_header_image_height to change these values.
-	define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width',  940 ) );
-	define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height',	198 ) );
+	define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width', 940 ) );
+	define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) );
 
 	// We'll be using post thumbnails for custom header images on posts and pages.
 	// We want them to be 940 pixels wide by 198 pixels tall (larger images will be auto-cropped to fit).
@@ -227,7 +227,7 @@
  * @return string A pretty 'Continue reading' link.
  */
 function twentyten_excerpt_more( $more ) {
-	return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . __('Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten') . '</a>';
+	return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) . '</a>';
 }
 add_filter( 'excerpt_more', 'twentyten_excerpt_more' );
 
@@ -268,7 +268,7 @@
 			<br />
 		<?php endif; ?>
 
-		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ),'  ','' ); ?></div>
+		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ),' ','' ); ?></div>
 
 		<div class="comment-body"><?php comment_text(); ?></div>
 
@@ -279,7 +279,7 @@
 
 	<?php else : ?>
 	<li class="post pingback">
-		<p><?php _e( 'Pingback: ', 'twentyten' ); ?><?php comment_author_link(); ?><?php edit_comment_link ( __('edit', 'twentyten'), '&nbsp;&nbsp;', '' ); ?></p>
+		<p><?php _e( 'Pingback: ', 'twentyten' ); ?><?php comment_author_link(); ?><?php edit_comment_link ( __('(Edit)', 'twentyten'), ' ', '' ); ?></p>
 	<?php endif;
 }
 endif;
@@ -294,9 +294,9 @@
 function twentyten_widgets_init() {
 	// Area 1
 	register_sidebar( array (
-		'name' => __( 'Primary Widget Area' , 'twentyten' ),
+		'name' => __( 'Primary Widget Area', 'twentyten' ),
 		'id' => 'primary-widget-area',
-		'description' => __( 'The primary widget area' , 'twentyten' ),
+		'description' => __( 'The primary widget area', 'twentyten' ),
 		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
 		'after_widget' => "</li>",
 		'before_title' => '<h3 class="widget-title">',
@@ -305,9 +305,9 @@
 
 	// Area 2
 	register_sidebar( array (
-		'name' => __( 'Secondary Widget Area' , 'twentyten' ),
+		'name' => __( 'Secondary Widget Area', 'twentyten' ),
 		'id' => 'secondary-widget-area',
-		'description' => __( 'The secondary widget area' , 'twentyten' ),
+		'description' => __( 'The secondary widget area', 'twentyten' ),
 		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
 		'after_widget' => "</li>",
 		'before_title' => '<h3 class="widget-title">',
@@ -316,9 +316,9 @@
 
 	// Area 3
 	register_sidebar( array (
-		'name' => __( 'First Footer Widget Area' , 'twentyten' ),
+		'name' => __( 'First Footer Widget Area', 'twentyten' ),
 		'id' => 'first-footer-widget-area',
-		'description' => __( 'The first footer widget area' , 'twentyten' ),
+		'description' => __( 'The first footer widget area', 'twentyten' ),
 		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
 		'after_widget' => "</li>",
 		'before_title' => '<h3 class="widget-title">',
@@ -327,9 +327,9 @@
 
 	// Area 4
 	register_sidebar( array (
-		'name' => __( 'Second Footer Widget Area' , 'twentyten' ),
+		'name' => __( 'Second Footer Widget Area', 'twentyten' ),
 		'id' => 'second-footer-widget-area',
-		'description' => __( 'The second footer widget area' , 'twentyten' ),
+		'description' => __( 'The second footer widget area', 'twentyten' ),
 		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
 		'after_widget' => "</li>",
 		'before_title' => '<h3 class="widget-title">',
@@ -338,9 +338,9 @@
 
 	// Area 5
 	register_sidebar( array (
-		'name' => __( 'Third Footer Widget Area' , 'twentyten' ),
+		'name' => __( 'Third Footer Widget Area', 'twentyten' ),
 		'id' => 'third-footer-widget-area',
-		'description' => __( 'The third footer widget area' , 'twentyten' ),
+		'description' => __( 'The third footer widget area', 'twentyten' ),
 		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
 		'after_widget' => "</li>",
 		'before_title' => '<h3 class="widget-title">',
@@ -349,9 +349,9 @@
 
 	// Area 6
 	register_sidebar( array (
-		'name' => __( 'Fourth Footer Widget Area' , 'twentyten' ),
+		'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
 		'id' => 'fourth-footer-widget-area',
-		'description' => __( 'The fourth footer widget area' , 'twentyten' ),
+		'description' => __( 'The fourth footer widget area', 'twentyten' ),
 		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
 		'after_widget' => "</li>",
 		'before_title' => '<h3 class="widget-title">',
@@ -375,7 +375,7 @@
 function twentyten_get_next_attachment_url() {
 	global $post;
 	$post = get_post($post);
-	$attachments = array_values(get_children( array('post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID') ));
+	$attachments = array_values(get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ));
  
 	foreach ( $attachments as $k => $attachment )
 		if ( $attachment->ID == $post->ID )
Index: wp-content/themes/twentyten/header.php
===================================================================
--- wp-content/themes/twentyten/header.php	(revision 14423)
+++ wp-content/themes/twentyten/header.php	(working copy)
@@ -55,7 +55,7 @@
 
 				<?php
 					// Check if this is a post or page, if it has a thumbnail, and if it's a big one
-					if ( 	is_singular() &&
+					if ( is_singular() &&
 							has_post_thumbnail( $post->ID ) &&
 							( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail') ) &&
 							$image[1] >= HEADER_IMAGE_WIDTH ) :
Index: wp-content/themes/twentyten/index.php
===================================================================
--- wp-content/themes/twentyten/index.php	(revision 14423)
+++ wp-content/themes/twentyten/index.php	(working copy)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * The main template file
  *
@@ -13,7 +12,6 @@
  * @subpackage Twenty Ten
  * @since 3.0.0
  */
- 
 ?>
  
 <?php get_header(); ?>
@@ -28,6 +26,7 @@
 			 */
 			 get_template_part( 'loop', 'index' );
 			?>
+
 			</div><!-- #content -->
 		</div><!-- #container -->
 
Index: wp-content/themes/twentyten/loop.php
===================================================================
--- wp-content/themes/twentyten/loop.php	(revision 14423)
+++ wp-content/themes/twentyten/loop.php	(working copy)
@@ -2,7 +2,7 @@
 /**
  * The loop that displays posts
  *
- * The loop displays the posts and the post content.  See
+ * The loop displays the posts and the post content. See
  * http://codex.wordpress.org/The_Loop to understand it and
  * http://codex.wordpress.org/Template_Tags to understand
  * the tags used in it.
@@ -13,7 +13,7 @@
  */
 ?>
 
-<?php /* Display navigation to next/previous pages when applicable  */ ?>
+<?php /* Display navigation to next/previous pages when applicable */ ?>
 <?php if ( $wp_query->max_num_pages > 1 ) : ?>
 	<div id="nav-above" class="navigation">
 		<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
@@ -21,7 +21,7 @@
 	</div><!-- #nav-above -->
 <?php endif; ?>
 
-<?php /* If there are no posts to display, such as an empty archive page  */ ?>
+<?php /* If there are no posts to display, such as an empty archive page */ ?>
 <?php if ( ! have_posts() ) : ?>
 	<div id="post-0" class="post error404 not-found">
 		<h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
@@ -32,10 +32,10 @@
 	</div><!-- #post-0 -->
 <?php endif; ?>
 
-<?php /* Start the Loop  */ ?>
+<?php /* Start the Loop */ ?>
 <?php while ( have_posts() ) : the_post(); ?>
 
-<?php /* How to Display posts in the Gallery Category  */ ?>
+<?php /* How to Display posts in the Gallery Category */ ?>
 	<?php if ( in_category( _x('gallery', 'gallery category slug', 'twentyten') ) ) : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
@@ -91,7 +91,7 @@
 			</div><!-- .entry-summary -->
 	<?php else : ?>
 			<div class="entry-content">
-				<?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
 			</div><!-- .entry-content -->
 	<?php endif; ?>
 
@@ -112,7 +112,7 @@
 			</div><!-- #entry-utility -->
 		</div><!-- #post-<?php the_ID(); ?> -->
 
-<?php /* How to display all other posts  */ ?>
+<?php /* How to display all other posts */ ?>
 	<?php else : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
@@ -136,7 +136,7 @@
 			</div><!-- .entry-summary -->
 	<?php else : ?>
 			<div class="entry-content">
-				<?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
 				<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
 			</div><!-- .entry-content -->
 	<?php endif; ?>
@@ -155,8 +155,8 @@
 	<?php endif; // if different categories queried ?>
 <?php endwhile; ?>
 
-<?php /* Display navigation to next/previous pages when applicable  */ ?>
-<?php if (  $wp_query->max_num_pages > 1 ) : ?>
+<?php /* Display navigation to next/previous pages when applicable */ ?>
+<?php if ( $wp_query->max_num_pages > 1 ) : ?>
 				<div id="nav-below" class="navigation">
 					<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
 					<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
Index: wp-content/themes/twentyten/single.php
===================================================================
--- wp-content/themes/twentyten/single.php	(revision 14423)
+++ wp-content/themes/twentyten/single.php	(working copy)
@@ -39,14 +39,14 @@
 					<div id="entry-author-info">
 						<div id="author-avatar">
 							<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
-						</div><!-- #author-avatar 	-->
+						</div><!-- #author-avatar -->
 						<div id="author-description">
 							<h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
 							<?php the_author_meta( 'description' ); ?>
 							<div id="author-link">
 								<a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php _e( 'View all posts by ', 'twentyten' ); ?><?php the_author(); ?> &rarr;</a>
 							</div><!-- #author-link	-->
-						</div><!-- #author-description	-->
+						</div><!-- #author-description -->
 					</div><!-- .entry-author-info -->
 <?php endif; ?>