diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index dc3cd4eb76..6dd9c4bc3c 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -129,7 +129,7 @@ function twentytwelve_scripts_styles() {
 	 * Ideally, should load after main CSS file.
 	 * See html5.js link in header.php.
 	 *
-	 * TODO depends on IE dependency being in core for JS enqueuing
+	 * @todo depends on IE dependency being in core for JS enqueuing
 	 * before we can move here properly: see http://core.trac.wordpress.org/ticket/16024
 	 */
 }
diff --git a/wp-content/themes/twentytwelve/page-templates/front-page.php b/wp-content/themes/twentytwelve/page-templates/front-page.php
index 904b84b3f0..03b4d1aec5 100644
--- a/wp-content/themes/twentytwelve/page-templates/front-page.php
+++ b/wp-content/themes/twentytwelve/page-templates/front-page.php
@@ -2,7 +2,10 @@
 /**
  * Template Name: Front Page Template
  *
- * @todo Better documentation here.
+ * Description: A page template that provides a key component of WordPress as a CMS
+ * by meeting the need for a carefully crafted introductory page. The front page template
+ * in Twenty Twelve consists of a page content area for adding text, images, video --
+ * anything you’d like -- followed by front-page-only widgets in one or two columns.
  *
  * @package WordPress
  * @subpackage Twenty_Twelve
diff --git a/wp-content/themes/twentytwelve/page-templates/full-width.php b/wp-content/themes/twentytwelve/page-templates/full-width.php
index e5c7dd4c3d..b0ce333c2d 100644
--- a/wp-content/themes/twentytwelve/page-templates/full-width.php
+++ b/wp-content/themes/twentytwelve/page-templates/full-width.php
@@ -2,7 +2,12 @@
 /**
  * Template Name: Full-width Page Template, No Sidebar
  *
- * @todo Better documentation here.
+ * Description: Twenty Twelve loves the no-sidebar look as much as
+ * you do. Use this page template to remove the sidebar from any page.
+ *
+ * Tip: to remove the sidebar from all posts and pages simply remove
+ * any active widgets from the Main Sidebar area, and the sidebar will
+ * disappear everywhere.
  *
  * @package WordPress
  * @subpackage Twenty_Twelve