<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16630] branches/3.0/wp-content/themes/twentyten: Complete Twenty Ten 1.
1 merge.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16630">16630</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-30 20:38:12 +0000 (Tue, 30 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Complete Twenty Ten 1.1 merge.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenlanguagestwentytenpot">branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenloopattachmentphp">branches/3.0/wp-content/themes/twentyten/loop-attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenlooppagephp">branches/3.0/wp-content/themes/twentyten/loop-page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenloopsinglephp">branches/3.0/wp-content/themes/twentyten/loop-single.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenattachmentphp">branches/3.0/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenpagephp">branches/3.0/wp-content/themes/twentyten/page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytensinglephp">branches/3.0/wp-content/themes/twentyten/single.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpcontentthemestwentytenattachmentphp"></a>
<div class="propset"><h4>Property changes: branches/3.0/wp-content/themes/twentyten/attachment.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenlanguagestwentytenpot"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot (16629 => 16630)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot        2010-11-30 20:31:49 UTC (rev 16629)
+++ branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot        2010-11-30 20:38:12 UTC (rev 16630)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Translation of the WordPress theme Twenty Ten 1.2-RC1 by the WordPress team.
</del><ins>+# Translation of the WordPress theme Twenty Ten 1.1 by the WordPress team.
</ins><span class="cx"> # Copyright (C) 2010 the WordPress team
</span><span class="cx"> # This file is distributed under the same license as the Twenty Ten package.
</span><span class="cx"> # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> #, fuzzy
</span><span class="cx"> msgid ""
</span><span class="cx"> msgstr ""
</span><del>-"Project-Id-Version: Twenty Ten 1.2-RC1\n"
</del><ins>+"Project-Id-Version: Twenty Ten 1.1\n"
</ins><span class="cx"> "Report-Msgid-Bugs-To: http://wordpress.org/tag/twentyten\n"
</span><del>-"POT-Creation-Date: 2010-11-06 00:21+0000\n"
</del><ins>+"POT-Creation-Date: 2010-07-14 16:21+0000\n"
</ins><span class="cx"> "PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
</span><span class="cx"> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
</span><span class="cx"> "Language-Team: LANGUAGE <LL@li.org>\n"
</span><span class="lines">@@ -46,12 +46,61 @@
</span><span class="cx"> msgid "Blog Archives"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><ins>+#: attachment.php:18
+#, php-format
+msgid "Return to %s"
+msgstr ""
+
+#. translators: %s - title of parent post
+#: attachment.php:20
+#, php-format
+msgid "<span class=\"meta-nav\">&larr;</span> %s"
+msgstr ""
+
+#: attachment.php:29
+#, php-format
+msgid "<span class=\"%1$s\">By</span> %2$s"
+msgstr ""
+
+#: attachment.php:33 functions.php:451
+#, php-format
+msgid "View all posts by %s"
+msgstr ""
+
+#: attachment.php:40
+#, php-format
+msgid "<span class=\"%1$s\">Published</span> %2$s"
+msgstr ""
+
+#: attachment.php:50
+#, php-format
+msgid "Full size is %s pixels"
+msgstr ""
+
+#: attachment.php:53
+msgid "Link to full-size image"
+msgstr ""
+
+#: attachment.php:60 attachment.php:107 loop.php:95 loop.php:118 loop.php:160
+#: onecolumn-page.php:27 page.php:32 single.php:53
+msgid "Edit"
+msgstr ""
+
+#: attachment.php:100 functions.php:241 loop.php:110 loop.php:138
+msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
+msgstr ""
+
+#: attachment.php:101 loop.php:139 onecolumn-page.php:26 page.php:31
+#: single.php:31
+msgid "Pages:"
+msgstr ""
+
</ins><span class="cx"> #: author.php:27
</span><span class="cx"> #, php-format
</span><span class="cx"> msgid "Author Archives: %s"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#: author.php:37 loop-single.php:43
</del><ins>+#: author.php:37 single.php:40
</ins><span class="cx"> #, php-format
</span><span class="cx"> msgid "About %s"
</span><span class="cx"> msgstr ""
</span><span class="lines">@@ -85,7 +134,7 @@
</span><span class="cx"> msgid "Comments are closed."
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#. #-#-#-#-# twentyten.pot (Twenty Ten 1.2-RC1) #-#-#-#-#
</del><ins>+#. #-#-#-#-# twentyten.pot (Twenty Ten 1.1) #-#-#-#-#
</ins><span class="cx"> #. Theme URI of the plugin/theme
</span><span class="cx"> #: footer.php:33
</span><span class="cx"> msgid "http://wordpress.org/"
</span><span class="lines">@@ -144,10 +193,6 @@
</span><span class="cx"> msgid "Sunset"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#: functions.php:241 loop-attachment.php:103 loop.php:110 loop.php:138
-msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
-msgstr ""
-
</del><span class="cx"> #: functions.php:308
</span><span class="cx"> #, php-format
</span><span class="cx"> msgid "%s <span class=\"says\">says:</span>"
</span><span class="lines">@@ -226,11 +271,6 @@
</span><span class="cx"> "span> %3$s"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#: functions.php:451 loop-attachment.php:36
-#, php-format
-msgid "View all posts by %s"
-msgstr ""
-
</del><span class="cx"> #: functions.php:468
</span><span class="cx"> #, php-format
</span><span class="cx"> msgid ""
</span><span class="lines">@@ -261,60 +301,6 @@
</span><span class="cx"> msgid "Skip to content"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><del>-#: loop-attachment.php:21
-#, php-format
-msgid "Return to %s"
-msgstr ""
-
-#. translators: %s - title of parent post
-#: loop-attachment.php:23
-#, php-format
-msgid "<span class=\"meta-nav\">&larr;</span> %s"
-msgstr ""
-
-#: loop-attachment.php:32
-#, php-format
-msgid "<span class=\"%1$s\">By</span> %2$s"
-msgstr ""
-
-#: loop-attachment.php:43
-#, php-format
-msgid "<span class=\"%1$s\">Published</span> %2$s"
-msgstr ""
-
-#: loop-attachment.php:53
-#, php-format
-msgid "Full size is %s pixels"
-msgstr ""
-
-#: loop-attachment.php:56
-msgid "Link to full-size image"
-msgstr ""
-
-#: loop-attachment.php:63 loop-attachment.php:110 loop-page.php:30
-#: loop-single.php:56 loop.php:95 loop.php:118 loop.php:160
-msgid "Edit"
-msgstr ""
-
-#: loop-attachment.php:104 loop-page.php:29 loop-single.php:34 loop.php:139
-msgid "Pages:"
-msgstr ""
-
-#: loop-single.php:21 loop-single.php:61
-msgctxt "Previous post link"
-msgid "&larr;"
-msgstr ""
-
-#: loop-single.php:22 loop-single.php:62
-msgctxt "Next post link"
-msgid "&rarr;"
-msgstr ""
-
-#: loop-single.php:47
-#, php-format
-msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
-msgstr ""
-
</del><span class="cx"> #: loop.php:25 loop.php:173
</span><span class="cx"> msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
</span><span class="cx"> msgstr ""
</span><span class="lines">@@ -402,6 +388,21 @@
</span><span class="cx"> msgid "Meta"
</span><span class="cx"> msgstr ""
</span><span class="cx">
</span><ins>+#: single.php:18 single.php:58
+msgctxt "Previous post link"
+msgid "&larr;"
+msgstr ""
+
+#: single.php:19 single.php:59
+msgctxt "Next post link"
+msgid "&rarr;"
+msgstr ""
+
+#: single.php:44
+#, php-format
+msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
+msgstr ""
+
</ins><span class="cx"> #: tag.php:16
</span><span class="cx"> #, php-format
</span><span class="cx"> msgid "Tag Archives: %s"
</span><span class="lines">@@ -431,5 +432,5 @@
</span><span class="cx"> msgid ""
</span><span class="cx"> "black, blue, white, two-columns, fixed-width, custom-header, custom-"
</span><span class="cx"> "background, threaded-comments, sticky-post, translation-ready, microformats, "
</span><del>-"rtl-language-support, editor-style, custom-menu"
</del><ins>+"rtl-language-support, editor-style"
</ins><span class="cx"> msgstr ""
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenloopattachmentphp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/loop-attachment.php (16629 => 16630)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-attachment.php        2010-11-30 20:31:49 UTC (rev 16629)
+++ branches/3.0/wp-content/themes/twentyten/loop-attachment.php        2010-11-30 20:38:12 UTC (rev 16630)
</span><span class="lines">@@ -1,116 +0,0 @@
</span><del>-<?php
-/**
- * The loop that displays an attachment.
- *
- * 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.
- *
- * This can be overridden in child themes with loop-attachment.php.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.2
- */
-?>
-
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
-                                <?php if ( ! empty( $post->post_parent ) ) : ?>
-                                        <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
-                                                /* translators: %s - title of parent post */
-                                                printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
-                                        ?></a></p>
-                                <?php endif; ?>
-
-                                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                        <h2 class="entry-title"><?php the_title(); ?></h2>
-
-                                        <div class="entry-meta">
-                                                <?php
-                                                        printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
-                                                                'meta-prep meta-prep-author',
-                                                                sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
-                                                                        get_author_posts_url( get_the_author_meta( 'ID' ) ),
-                                                                        sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
-                                                                        get_the_author()
-                                                                )
-                                                        );
-                                                ?>
-                                                <span class="meta-sep">|</span>
-                                                <?php
-                                                        printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
-                                                                'meta-prep meta-prep-entry-date',
-                                                                sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
-                                                                        esc_attr( get_the_time() ),
-                                                                        get_the_date()
-                                                                )
-                                                        );
-                                                        if ( wp_attachment_is_image() ) {
-                                                                echo ' <span class="meta-sep">|</span> ';
-                                                                $metadata = wp_get_attachment_metadata();
-                                                                printf( __( 'Full size is %s pixels', 'twentyten'),
-                                                                        sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
-                                                                                wp_get_attachment_url(),
-                                                                                esc_attr( __('Link to full-size image', 'twentyten') ),
-                                                                                $metadata['width'],
-                                                                                $metadata['height']
-                                                                        )
-                                                                );
-                                                        }
-                                                ?>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
-                                        </div><!-- .entry-meta -->
-
-                                        <div class="entry-content">
-                                                <div class="entry-attachment">
-<?php if ( wp_attachment_is_image() ) :
-        $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 )
-                        break;
-        }
-        $k++;
-        // If there is more than 1 image attachment in a gallery
-        if ( count( $attachments ) > 1 ) {
-                if ( isset( $attachments[ $k ] ) )
-                        // get the URL of the next image attachment
-                        $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-                else
-                        // or get the URL of the first image attachment
-                        $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
-        } else {
-                // or, if there's only 1 image attachment, get the URL of the image
-                $next_attachment_url = wp_get_attachment_url();
-        }
-?>
-                                                <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
-                                                        $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>
-
-                                                <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><!-- #nav-below -->
-<?php else : ?>
-                                                <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
-<?php endif; ?>
-                                                </div><!-- .entry-attachment -->
-                                                <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 wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
-
-                                        </div><!-- .entry-content -->
-
-                                        <div class="entry-utility">
-                                                <?php twentyten_posted_in(); ?>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
-                                        </div><!-- .entry-utility -->
-                                </div><!-- #post-## -->
-
-<?php comments_template(); ?>
-
-<?php endwhile; // end of the loop. ?>
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytenlooppagephp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/loop-page.php (16629 => 16630)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-page.php        2010-11-30 20:31:49 UTC (rev 16629)
+++ branches/3.0/wp-content/themes/twentyten/loop-page.php        2010-11-30 20:38:12 UTC (rev 16630)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-<?php
-/**
- * The loop that displays a page.
- *
- * 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.
- *
- * This can be overridden in child themes with loop-page.php.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.2
- */
-?>
-
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
-                                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                        <?php if ( is_front_page() ) { ?>
-                                                <h2 class="entry-title"><?php the_title(); ?></h2>
-                                        <?php } else { ?>
-                                                <h1 class="entry-title"><?php the_title(); ?></h1>
-                                        <?php } ?>
-
-                                        <div class="entry-content">
-                                                <?php the_content(); ?>
-                                                <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
-                                        </div><!-- .entry-content -->
-                                </div><!-- #post-## -->
-
-                                <?php comments_template( '', true ); ?>
-
-<?php endwhile; // end of the loop. ?>
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytenloopsinglephp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/loop-single.php (16629 => 16630)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-single.php        2010-11-30 20:31:49 UTC (rev 16629)
+++ branches/3.0/wp-content/themes/twentyten/loop-single.php        2010-11-30 20:38:12 UTC (rev 16630)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-<?php
-/**
- * The loop that displays a single post.
- *
- * 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.
- *
- * This can be overridden in child themes with loop-single.php.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.2
- */
-?>
-
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
-                                <div id="nav-above" class="navigation">
-                                        <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
-                                        <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
-                                </div><!-- #nav-above -->
-
-                                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                                        <h1 class="entry-title"><?php the_title(); ?></h1>
-
-                                        <div class="entry-meta">
-                                                <?php twentyten_posted_on(); ?>
-                                        </div><!-- .entry-meta -->
-
-                                        <div class="entry-content">
-                                                <?php the_content(); ?>
-                                                <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
-                                        </div><!-- .entry-content -->
-
-<?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 id="author-description">
-                                                        <h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_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' ) ); ?>">
-                                                                        <?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentyten' ), get_the_author() ); ?>
-                                                                </a>
-                                                        </div><!-- #author-link        -->
-                                                </div><!-- #author-description -->
-                                        </div><!-- #entry-author-info -->
-<?php endif; ?>
-
-                                        <div class="entry-utility">
-                                                <?php twentyten_posted_in(); ?>
-                                                <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
-                                        </div><!-- .entry-utility -->
-                                </div><!-- #post-## -->
-
-                                <div id="nav-below" class="navigation">
-                                        <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
-                                        <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
-                                </div><!-- #nav-below -->
-
-                                <?php comments_template( '', true ); ?>
-
-<?php endwhile; // end of the loop. ?>
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytenpagephp"></a>
<div class="propset"><h4>Property changes: branches/3.0/wp-content/themes/twentyten/page.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytensinglephp"></a>
<div class="propset"><h4>Property changes: branches/3.0/wp-content/themes/twentyten/single.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre>
</div>
</div>
</body>
</html>