<!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" />
<title>[25521] trunk/src/wp-content/themes/twentytwelve: Twenty Twelve: update code comments to reflect WP inline docs standards.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25521">25521</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-09-20 19:23:22 +0000 (Fri, 20 Sep 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Twelve: update code comments to reflect WP inline docs standards. Props DrewAPicture, see <a href="http://core.trac.wordpress.org/ticket/25256">#25256</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentytwelve404php">trunk/src/wp-content/themes/twentytwelve/404.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvearchivephp">trunk/src/wp-content/themes/twentytwelve/archive.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelveauthorphp">trunk/src/wp-content/themes/twentytwelve/author.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvecategoryphp">trunk/src/wp-content/themes/twentytwelve/category.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvecommentsphp">trunk/src/wp-content/themes/twentytwelve/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvecontentnonephp">trunk/src/wp-content/themes/twentytwelve/content-none.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvecontentstatusphp">trunk/src/wp-content/themes/twentytwelve/content-status.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvecontentphp">trunk/src/wp-content/themes/twentytwelve/content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvefooterphp">trunk/src/wp-content/themes/twentytwelve/footer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvefunctionsphp">trunk/src/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelveheaderphp">trunk/src/wp-content/themes/twentytwelve/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelveimagephp">trunk/src/wp-content/themes/twentytwelve/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelveinccustomheaderphp">trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelveindexphp">trunk/src/wp-content/themes/twentytwelve/index.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvepagephp">trunk/src/wp-content/themes/twentytwelve/page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvesearchphp">trunk/src/wp-content/themes/twentytwelve/search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvesidebarfrontphp">trunk/src/wp-content/themes/twentytwelve/sidebar-front.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvesidebarphp">trunk/src/wp-content/themes/twentytwelve/sidebar.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvesinglephp">trunk/src/wp-content/themes/twentytwelve/single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvetagphp">trunk/src/wp-content/themes/twentytwelve/tag.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentytwelve404php"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/404.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/404.php 2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/404.php    2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying 404 pages (Not Found).
</del><ins>+ * The template for displaying 404 pages (Not Found)
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvearchivephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/archive.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/archive.php     2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/archive.php        2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Archive pages.
</del><ins>+ * The template for displaying Archive pages
</ins><span class="cx">  *
</span><span class="cx">  * Used to display archive-type pages if nothing more specific matches a query.
</span><span class="cx">  * For example, puts together date-based pages if no date.php file exists.
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx">  * has tag.php for Tag archives, category.php for Category archives, and
</span><span class="cx">  * author.php for Author archives.
</span><span class="cx">  *
</span><del>- * Learn more: http://codex.wordpress.org/Template_Hierarchy
</del><ins>+ * @link http://codex.wordpress.org/Template_Hierarchy
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelveauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/author.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/author.php      2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/author.php 2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Author Archive pages.
</del><ins>+ * The template for displaying Author Archive pages
</ins><span class="cx">  *
</span><span class="cx">  * Used to display archive-type pages for posts by an author.
</span><span class="cx">  *
</span><del>- * Learn more: http://codex.wordpress.org/Template_Hierarchy
</del><ins>+ * @link http://codex.wordpress.org/Template_Hierarchy
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span><span class="lines">@@ -47,7 +47,11 @@
</span><span class="cx">                  if ( get_the_author_meta( 'description' ) ) : ?>
</span><span class="cx">                  <div class="author-info">
</span><span class="cx">                          <div class="author-avatar">
</span><del>-                                       <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentytwelve_author_bio_avatar_size', 60 ) ); ?>
</del><ins>+                                        <?php
+                                       //duplicate_hook
+                                       $author_bio_avatar_size = apply_filters( 'twentytwelve_author_bio_avatar_size', 68 );
+                                       echo get_avatar( get_the_author_meta( 'user_email' ), $author_bio_avatar_size );
+                                       ?>
</ins><span class="cx">                           </div><!-- .author-avatar -->
</span><span class="cx">                          <div class="author-description">
</span><span class="cx">                                  <h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvecategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/category.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/category.php    2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/category.php       2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Category pages.
</del><ins>+ * The template for displaying Category pages
</ins><span class="cx">  *
</span><span class="cx">  * Used to display archive-type pages for posts in a category.
</span><span class="cx">  *
</span><del>- * Learn more: http://codex.wordpress.org/Template_Hierarchy
</del><ins>+ * @link http://codex.wordpress.org/Template_Hierarchy
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvecommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/comments.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/comments.php    2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/comments.php       2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Comments.
</del><ins>+ * The template for displaying Comments
</ins><span class="cx">  *
</span><span class="cx">  * The area of the page that contains both current comments
</span><span class="cx">  * and the comment form. The actual display of comments is
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-/*
</del><ins>+/**
</ins><span class="cx">  * If the current post is protected by a password and
</span><span class="cx">  * the visitor has not yet entered the password we will
</span><span class="cx">  * return early without loading the comments.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvecontentnonephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/content-none.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/content-none.php        2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/content-none.php   2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying a "No posts found" message.
</del><ins>+ * The template for displaying a "No posts found" message
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvecontentstatusphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/content-status.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/content-status.php      2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/content-status.php 2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -14,7 +14,17 @@
</span><span class="cx">                          <h1><?php the_author(); ?></h1>
</span><span class="cx">                          <h2><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a></h2>
</span><span class="cx">                  </header>
</span><del>-                       <?php echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentytwelve_status_avatar', '48' ) ); ?>
</del><ins>+                        <?php
+                       /**
+                        * Filter the status avatar size.
+                        *
+                        * @since Twenty Twelve 1.0
+                        *
+                        * @param int $size The height and width of the avatar in pixels.
+                        */
+                       $status_avatar = apply_filters( 'twentytwelve_status_avatar', 48 );
+                       echo get_avatar( get_the_author_meta( 'ID' ), $status_avatar );
+                       ?>
</ins><span class="cx">           </div><!-- .entry-header -->
</span><span class="cx"> 
</span><span class="cx">          <div class="entry-content">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvecontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/content.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/content.php     2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/content.php        2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,7 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The default template for displaying content. Used for both single and index/archive/search.
</del><ins>+ * The default template for displaying content
</ins><span class="cx">  *
</span><ins>+ * Used for both single and index/archive/search.
+ *
</ins><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="lines">@@ -47,7 +49,17 @@
</span><span class="cx">                  <?php if ( is_singular() && get_the_author_meta( 'description' ) && is_multi_author() ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries. ?>
</span><span class="cx">                          <div class="author-info">
</span><span class="cx">                                  <div class="author-avatar">
</span><del>-                                               <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentytwelve_author_bio_avatar_size', 68 ) ); ?>
</del><ins>+                                                <?php
+                                               /**
+                                                * Filter the author bio avatar size.
+                                                *
+                                                * @since Twenty Twelve 1.0
+                                                *
+                                                * @param int $size The height and width of the avatar in pixels.
+                                                */
+                                               $author_bio_avatar_size = apply_filters( 'twentytwelve_author_bio_avatar_size', 68 );
+                                               echo get_avatar( get_the_author_meta( 'user_email' ), $author_bio_avatar_size );
+                                               ?>
</ins><span class="cx">                                   </div><!-- .author-avatar -->
</span><span class="cx">                                  <div class="author-description">
</span><span class="cx">                                          <h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvefooterphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/footer.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/footer.php      2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/footer.php 2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,9 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying the footer.
</del><ins>+ * The template for displaying the footer
</ins><span class="cx">  *
</span><del>- * Contains footer content and the closing of the
- * #main and #page div elements.
</del><ins>+ * Contains footer content and the closing of the #main and #page div elements.
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/functions.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/functions.php   2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/functions.php      2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Twenty Twelve functions and definitions.
</del><ins>+ * Twenty Twelve functions and definitions
</ins><span class="cx">  *
</span><span class="cx">  * Sets up the theme and provides some helper functions, which are used
</span><span class="cx">  * in the theme as custom template tags. Others are attached to action and
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">  * Functions that are not pluggable (not wrapped in function_exists()) are instead attached
</span><span class="cx">  * to a filter or action hook.
</span><span class="cx">  *
</span><del>- * For more information on hooks, actions, and filters, see http://codex.wordpress.org/Plugin_API.
</del><ins>+ * For more information on hooks, actions, and filters, @link http://codex.wordpress.org/Plugin_API
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span><span class="lines">@@ -23,12 +23,14 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Sets up the content width value based on the theme's design and stylesheet.
</del><ins>+ * Set up the content width value based on the theme's design and stylesheet.
</ins><span class="cx">  */
</span><span class="cx"> if ( ! isset( $content_width ) )
</span><span class="cx">  $content_width = 625;
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Twenty Twelve setup.
+ *
</ins><span class="cx">  * Sets up theme defaults and registers the various WordPress features that
</span><span class="cx">  * Twenty Twelve supports.
</span><span class="cx">  *
</span><span class="lines">@@ -42,7 +44,7 @@
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="cx">  */
</span><span class="cx"> function twentytwelve_setup() {
</span><del>-       /*
</del><ins>+        /**
</ins><span class="cx">    * Makes Twenty Twelve available for translation.
</span><span class="cx">   *
</span><span class="cx">   * Translations can be added to the /languages/ directory.
</span><span class="lines">@@ -63,9 +65,9 @@
</span><span class="cx">  // This theme uses wp_nav_menu() in one location.
</span><span class="cx">  register_nav_menu( 'primary', __( 'Primary Menu', 'twentytwelve' ) );
</span><span class="cx"> 
</span><del>-       /*
-        * This theme supports custom background color and image, and here
-        * we also set up the default background color.
</del><ins>+        /**
+        * This theme supports custom background color and image,
+        * and here we also set up the default background color.
</ins><span class="cx">    */
</span><span class="cx">  add_theme_support( 'custom-background', array(
</span><span class="cx">          'default-color' => 'e6e6e6',
</span><span class="lines">@@ -78,12 +80,12 @@
</span><span class="cx"> add_action( 'after_setup_theme', 'twentytwelve_setup' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Adds support for a custom header image.
</del><ins>+ * Add support for a custom header image.
</ins><span class="cx">  */
</span><span class="cx"> require( get_template_directory() . '/inc/custom-header.php' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Returns the Google font stylesheet URL if available.
</del><ins>+ * Return the Google font stylesheet URL if available.
</ins><span class="cx">  *
</span><span class="cx">  * The use of Open Sans by default is localized. For languages that use
</span><span class="cx">  * characters not supported by the font, the font can be disabled.
</span><span class="lines">@@ -95,13 +97,17 @@
</span><span class="cx"> function twentytwelve_get_font_url() {
</span><span class="cx">  $font_url = '';
</span><span class="cx"> 
</span><del>-       /* translators: If there are characters in your language that are not supported
-        by Open Sans, translate this to 'off'. Do not translate into your own language. */
</del><ins>+        /**
+        * translators: If there are characters in your language that are not supported
+        * by Open Sans, translate this to 'off'. Do not translate into your own language.
+        */
</ins><span class="cx">   if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
</span><span class="cx">          $subsets = 'latin,latin-ext';
</span><span class="cx"> 
</span><del>-               /* translators: To add an additional Open Sans character subset specific to your language, translate
-                this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language. */
</del><ins>+                /**
+                * translators: To add an additional Open Sans character subset specific to your language,
+                * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
+                */
</ins><span class="cx">           $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
</span><span class="cx"> 
</span><span class="cx">          if ( 'cyrillic' == $subset )
</span><span class="lines">@@ -123,21 +129,23 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Enqueues scripts and styles for front-end.
</del><ins>+ * Enqueue scripts and styles for front-end.
</ins><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><ins>+ *
+ * @return void
</ins><span class="cx">  */
</span><span class="cx"> function twentytwelve_scripts_styles() {
</span><span class="cx">  global $wp_styles;
</span><span class="cx"> 
</span><del>-       /*
</del><ins>+        /**
</ins><span class="cx">    * Adds JavaScript to pages with the comment form to support
</span><span class="cx">   * sites with threaded comments (when in use).
</span><span class="cx">   */
</span><span class="cx">  if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
</span><span class="cx">          wp_enqueue_script( 'comment-reply' );
</span><span class="cx"> 
</span><del>-       /*
</del><ins>+        /**
</ins><span class="cx">    * Adds JavaScript for handling the navigation menu hide-and-show behavior.
</span><span class="cx">   */
</span><span class="cx">  wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '1.0', true );
</span><span class="lines">@@ -146,12 +154,12 @@
</span><span class="cx">  if ( ! empty( $font_url ) )
</span><span class="cx">          wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
</span><span class="cx"> 
</span><del>-       /*
</del><ins>+        /**
</ins><span class="cx">    * Loads our main stylesheet.
</span><span class="cx">   */
</span><span class="cx">  wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
</span><span class="cx"> 
</span><del>-       /*
</del><ins>+        /**
</ins><span class="cx">    * Loads the Internet Explorer specific stylesheet.
</span><span class="cx">   */
</span><span class="cx">  wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
</span><span class="lines">@@ -160,6 +168,8 @@
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Filter TinyMCE CSS path to include Google Fonts.
+ *
</ins><span class="cx">  * Adds additional stylesheets to the TinyMCE editor if needed.
</span><span class="cx">  *
</span><span class="cx">  * @uses twentytwelve_get_font_url() To get the Google Font stylesheet URL.
</span><span class="lines">@@ -167,7 +177,7 @@
</span><span class="cx">  * @since Twenty Twelve 1.2
</span><span class="cx">  *
</span><span class="cx">  * @param string $mce_css CSS path to load in TinyMCE.
</span><del>- * @return string
</del><ins>+ * @return string Filtered CSS path.
</ins><span class="cx">  */
</span><span class="cx"> function twentytwelve_mce_css( $mce_css ) {
</span><span class="cx">  $font_url = twentytwelve_get_font_url();
</span><span class="lines">@@ -185,6 +195,8 @@
</span><span class="cx"> add_filter( 'mce_css', 'twentytwelve_mce_css' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Filter the page title.
+ *
</ins><span class="cx">  * Creates a nicely formatted and more specific title element text
</span><span class="cx">  * for output in head of document, based on current view.
</span><span class="cx">  *
</span><span class="lines">@@ -217,6 +229,8 @@
</span><span class="cx"> add_filter( 'wp_title', 'twentytwelve_wp_title', 10, 2 );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Filter the page menu arguments.
+ *
</ins><span class="cx">  * Makes our wp_nav_menu() fallback -- wp_page_menu() -- show a home link.
</span><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="lines">@@ -229,6 +243,8 @@
</span><span class="cx"> add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Register sidebars.
+ *
</ins><span class="cx">  * Registers our main widget area and the front page widget areas.
</span><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="lines">@@ -297,6 +313,8 @@
</span><span class="cx">  * Used as a callback by wp_list_comments() for displaying the comments.
</span><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><ins>+ *
+ * @return void
</ins><span class="cx">  */
</span><span class="cx"> function twentytwelve_comment( $comment, $args, $depth ) {
</span><span class="cx">  $GLOBALS['comment'] = $comment;
</span><span class="lines">@@ -353,11 +371,15 @@
</span><span class="cx"> 
</span><span class="cx"> if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
</span><span class="cx"> /**
</span><ins>+ * Set up post entry meta.
+ *
</ins><span class="cx">  * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
</span><span class="cx">  *
</span><span class="cx">  * Create your own twentytwelve_entry_meta() to override in a child theme.
</span><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><ins>+ *
+ * @return void
</ins><span class="cx">  */
</span><span class="cx"> function twentytwelve_entry_meta() {
</span><span class="cx">  // Translators: used between list items, there is a space after the comma.
</span><span class="lines">@@ -399,6 +421,8 @@
</span><span class="cx"> endif;
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Extend the default WordPress body classes.
+ *
</ins><span class="cx">  * Extends the default WordPress body class to denote:
</span><span class="cx">  * 1. Using a full-width layout, when no active widgets in the sidebar
</span><span class="cx">  *    or full-width template.
</span><span class="lines">@@ -410,7 +434,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="cx">  *
</span><del>- * @param array Existing class values.
</del><ins>+ * @param array $classes Existing class values.
</ins><span class="cx">  * @return array Filtered class values.
</span><span class="cx">  */
</span><span class="cx"> function twentytwelve_body_class( $classes ) {
</span><span class="lines">@@ -447,10 +471,14 @@
</span><span class="cx"> add_filter( 'body_class', 'twentytwelve_body_class' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Adjust content width in certain contexts.
+ *
</ins><span class="cx">  * Adjusts content_width value for full-width and single image attachment
</span><span class="cx">  * templates, and when there are no active widgets in the sidebar.
</span><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><ins>+ *
+ * @return void
</ins><span class="cx">  */
</span><span class="cx"> function twentytwelve_content_width() {
</span><span class="cx">  if ( is_page_template( 'page-templates/full-width.php' ) || is_attachment() || ! is_active_sidebar( 'sidebar-1' ) ) {
</span><span class="lines">@@ -461,11 +489,13 @@
</span><span class="cx"> add_action( 'template_redirect', 'twentytwelve_content_width' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Add postMessage support for site title and description for the Theme Customizer.
</del><ins>+ * Register postMessage support.
</ins><span class="cx">  *
</span><ins>+ * Add postMessage support for site title and description for the Customizer.
+ *
</ins><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="cx">  *
</span><del>- * @param WP_Customize_Manager $wp_customize Theme Customizer object.
</del><ins>+ * @param WP_Customize_Manager $wp_customize Customizer object.
</ins><span class="cx">  * @return void
</span><span class="cx">  */
</span><span class="cx"> function twentytwelve_customize_register( $wp_customize ) {
</span><span class="lines">@@ -476,9 +506,13 @@
</span><span class="cx"> add_action( 'customize_register', 'twentytwelve_customize_register' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
</del><ins>+ * Enqueue Javascript postMessage handlers for the Customizer.
</ins><span class="cx">  *
</span><ins>+ * Binds JS handlers to make the Customizer preview reload changes asynchronously.
+ *
</ins><span class="cx">  * @since Twenty Twelve 1.0
</span><ins>+ *
+ * @return void
</ins><span class="cx">  */
</span><span class="cx"> function twentytwelve_customize_preview_js() {
</span><span class="cx">  wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20130301', true );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelveheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/header.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/header.php      2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/header.php 2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The Header for our theme.
</del><ins>+ * The Header template for our theme
</ins><span class="cx">  *
</span><span class="cx">  * Displays all of the <head> section and everything up till <div id="main">
</span><span class="cx">  *
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelveimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/image.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/image.php       2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/image.php  2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying image attachments.
</del><ins>+ * The template for displaying image attachments
</ins><span class="cx">  *
</span><del>- * Learn more: http://codex.wordpress.org/Template_Hierarchy
</del><ins>+ * @link http://codex.wordpress.org/Template_Hierarchy
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span><span class="lines">@@ -74,6 +74,16 @@
</span><span class="cx"> endif;
</span><span class="cx"> ?>
</span><span class="cx">                                                          <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
</span><ins>+                                                               /**
+                                                                * Filter the image attachment size to use.
+                                                                *
+                                                                * @since Twenty Twelve 1.0
+                                                                *
+                                                                * @param array $size {
+                                                                *     @type int The attachment height in pixels.
+                                                                *     @type int The attachment width in pixels.
+                                                                * }
+                                                                */
</ins><span class="cx">                                                           $attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
</span><span class="cx">                                                          echo wp_get_attachment_image( $post->ID, $attachment_size );
</span><span class="cx">                                                          ?></a>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelveinccustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php   2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php      2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Implements an optional custom header for Twenty Twelve.
</del><ins>+ * Implement an optional custom header for Twenty Twelve
+ *
</ins><span class="cx">  * See http://codex.wordpress.org/Custom_Headers
</span><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="lines">@@ -9,7 +10,7 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Sets up the WordPress core custom header arguments and settings.
</del><ins>+ * Set up the WordPress core custom header arguments and settings.
</ins><span class="cx">  *
</span><span class="cx">  * @uses add_theme_support() to register support for 3.4 and up.
</span><span class="cx">  * @uses twentytwelve_header_style() to style front-end.
</span><span class="lines">@@ -47,7 +48,7 @@
</span><span class="cx"> add_action( 'after_setup_theme', 'twentytwelve_custom_header_setup' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Loads our special font CSS file.
</del><ins>+ * Load our special font CSS file.
</ins><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.2
</span><span class="cx">  *
</span><span class="lines">@@ -61,7 +62,7 @@
</span><span class="cx"> add_action( 'admin_print_styles-appearance_page_custom-header', 'twentytwelve_custom_header_fonts' );
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Styles the header text displayed on the blog.
</del><ins>+ * Style the header text displayed on the blog.
</ins><span class="cx">  *
</span><span class="cx">  * get_header_textcolor() options: 515151 is default, hide text (returns 'blank'), or any hex value.
</span><span class="cx">  *
</span><span class="lines">@@ -101,7 +102,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Styles the header image displayed on the Appearance > Header admin panel.
</del><ins>+ * Style the header image displayed on the Appearance > Header admin panel.
</ins><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="cx">  */
</span><span class="lines">@@ -141,7 +142,8 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Outputs markup to be displayed on the Appearance > Header admin panel.
</del><ins>+ * Output markup to be displayed on the Appearance > Header admin panel.
+ *
</ins><span class="cx">  * This callback overrides the default markup displayed there.
</span><span class="cx">  *
</span><span class="cx">  * @since Twenty Twelve 1.0
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelveindexphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/index.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/index.php       2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/index.php  2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The main template file.
</del><ins>+ * The main template file
</ins><span class="cx">  *
</span><span class="cx">  * This is the most generic template file in a WordPress theme
</span><span class="cx">  * and one of the two required files for a theme (the other being style.css).
</span><span class="cx">  * It is used to display a page when nothing more specific matches a query.
</span><span class="cx">  * For example, it puts together the home page when no home.php file exists.
</span><span class="cx">  *
</span><del>- * Learn more: http://codex.wordpress.org/Template_Hierarchy
</del><ins>+ * @link http://codex.wordpress.org/Template_Hierarchy
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvepagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/page.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/page.php        2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/page.php   2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying all pages.
</del><ins>+ * The template for displaying all pages
</ins><span class="cx">  *
</span><span class="cx">  * This is the template that displays all pages by default.
</span><span class="cx">  * Please note that this is the WordPress construct of pages
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvesearchphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/search.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/search.php      2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/search.php 2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Search Results pages.
</del><ins>+ * The template for displaying Search Results pages
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvesidebarfrontphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/sidebar-front.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/sidebar-front.php       2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/sidebar-front.php  2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The sidebar containing the front page widget areas.
</del><ins>+ * The sidebar containing the front page widget areas
</ins><span class="cx">  *
</span><del>- * If no active widgets in either sidebar, they will be hidden completely.
</del><ins>+ * If no active widgets are in either sidebar, hide them completely.
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span><span class="cx">  * @since Twenty Twelve 1.0
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-/*
</del><ins>+/**
</ins><span class="cx">  * The front page widget area is triggered if any of the areas
</span><span class="cx">  * have widgets. So let's check that first.
</span><span class="cx">  *
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvesidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/sidebar.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/sidebar.php     2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/sidebar.php        2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The sidebar containing the main widget area.
</del><ins>+ * The sidebar containing the main widget area
</ins><span class="cx">  *
</span><del>- * If no active widgets in sidebar, let's hide it completely.
</del><ins>+ * If no active widgets are in the sidebar, hide it completely.
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvesinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/single.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/single.php      2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/single.php 2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The Template for displaying all single posts.
</del><ins>+ * The Template for displaying all single posts
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvetagphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/tag.php (25520 => 25521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/tag.php 2013-09-20 19:12:45 UTC (rev 25520)
+++ trunk/src/wp-content/themes/twentytwelve/tag.php    2013-09-20 19:23:22 UTC (rev 25521)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Tag pages.
</del><ins>+ * The template for displaying Tag pages
</ins><span class="cx">  *
</span><span class="cx">  * Used to display archive-type pages for posts in a tag.
</span><span class="cx">  *
</span><del>- * Learn more: http://codex.wordpress.org/Template_Hierarchy
</del><ins>+ * @link http://codex.wordpress.org/Template_Hierarchy
</ins><span class="cx">  *
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Twelve
</span><span class="lines">@@ -29,7 +29,8 @@
</span><span class="cx">                  /* Start the Loop */
</span><span class="cx">                  while ( have_posts() ) : the_post();
</span><span class="cx"> 
</span><del>-                               /* Include the post format-specific template for the content. If you want to
</del><ins>+                                /**
+                                * Include the post format-specific template for the content. If you want to
</ins><span class="cx">                            * this in a child theme then include a file called called content-___.php
</span><span class="cx">                           * (where ___ is the post format) and that will be used instead.
</span><span class="cx">                           */
</span></span></pre>
</div>
</div>

</body>
</html>