Index: attachment.php
===================================================================
--- attachment.php	(revision 13052)
+++ attachment.php	(working copy)
@@ -21,17 +21,17 @@
 
 					<div class="entry-content">
 						<div class="entry-attachment">
-<?php if ( wp_attachment_is_image( $post->id ) ) : $att_image = wp_get_attachment_image_src( $post->id, array(640,640)); ?>
-						<p class="attachment"><a href="<?php echo wp_get_attachment_url($post->id); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><img src="<?php echo $att_image[0];?>" width="<?php echo $att_image[1];?>" height="<?php echo $att_image[2];?>"  class="attachment-medium" alt="<?php $post->post_excerpt; ?>" /></a>
+<?php if ( wp_attachment_is_image() ) : $att_image = wp_get_attachment_image_src( $post->ID, array(640,640)); ?>
+						<p class="attachment"><a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><img src="<?php echo $att_image[0];?>" width="<?php echo $att_image[1];?>" height="<?php echo $att_image[2];?>"  class="attachment-medium" alt="<?php $post->post_excerpt; ?>" /></a>
 						</p>
 
 
 				<div id="nav-below" class="navigation">
-					<div class="nav-previous"><?php previous_image_link( false ); ?></div>
-					<div class="nav-next"><?php next_image_link( false ); ?></div>
+					<div class="nav-previous"><?php previous_image_link(); ?></div>
+					<div class="nav-next"><?php next_image_link(); ?></div>
 				</div><!-- #nav-below -->
 <?php else : ?>
-						<a href="<?php echo wp_get_attachment_url($post->ID) ?>" title="<?php echo esc_attr( get_the_title($post->ID) ); ?>" rel="attachment"><?php echo basename($post->guid) ?></a>
+						<a href="<?php echo wp_get_attachment_url() ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename($post->guid) ?></a>
 <?php endif; ?>
 						</div>
 						<div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt() ?></div>
@@ -47,7 +47,7 @@
 						get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ),
 						get_permalink(),
 						the_title_attribute('echo=0'),
-						comments_rss() ) ?>
+						get_post_comments_feed_link() ) ?>
 
 <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
 						<?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ) ?>