diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index d0d1dff563..a44944bbe2 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -34,12 +34,12 @@ add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', null,
 do_action( 'add_meta_boxes', 'link', $link );
 
 /**
-* Fires when link-specific meta boxes are added.
-*
-* @since 3.0.0
-*
-* @param object $link Link object.
-*/
+ * Fires when link-specific meta boxes are added.
+ *
+ * @since 3.0.0
+ *
+ * @param object $link Link object.
+ */
 do_action( 'add_meta_boxes_link', $link );
 
 /** This action is documented in wp-admin/edit-form-advanced.php */
diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php
index bb8328fb1b..356a3f9412 100644
--- a/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -160,7 +160,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		$this->theme_installer();
 	}
 
-	/*
+	/**
 	 * Prints a theme from the WordPress.org API.
 	 *
 	 * @param object $theme An object that contains theme data returned by the WordPress.org API.
@@ -247,7 +247,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		$this->install_theme_info( $theme );
 	}
 
-	/*
+	/**
 	 * Prints the wrapper for the theme installer.
 	 */
 	function theme_installer() {
@@ -272,7 +272,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		<?php
 	}
 
-	/*
+	/**
 	 * Prints the wrapper for the theme installer with a provided theme's data.
 	 * Used to make the theme installer work for no-js.
 	 *
@@ -291,7 +291,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		<?php
 	}
 
-	/*
+	/**
 	 * Prints the info for a theme (to be used in the theme installer modal).
 	 *
 	 * @param object $theme - A WordPress.org Theme API object.
diff --git a/wp-admin/js/customize-controls.js b/wp-admin/js/customize-controls.js
index f780db7c75..8e563612f8 100644
--- a/wp-admin/js/customize-controls.js
+++ b/wp-admin/js/customize-controls.js
@@ -1,7 +1,7 @@
 (function( exports, $ ){
 	var api = wp.customize;
 
-	/*
+	/**
 	 * @param options
 	 * - previewer - The Previewer instance to sync with.
 	 * - transport - The transport to use for previewing. Supports 'refresh' and 'postMessage'.
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index cad326a96a..b3f9f68192 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -38,12 +38,12 @@ if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
 }
 
 /**
-* Toggle site update services configuration functionality.
-*
-* @since 3.0.0
-*
-* @param bool True or false, based on whether update services configuration is enabled or not.
-*/
+ * Toggle site update services configuration functionality.
+ *
+ * @since 3.0.0
+ *
+ * @param bool True or false, based on whether update services configuration is enabled or not.
+ */
 if ( apply_filters( 'enable_update_services_configuration', true ) ) {
 	get_current_screen()->add_help_tab( array(
 		'id'      => 'options-services',
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 75a834b4f8..d24e64ca5b 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -684,7 +684,7 @@ class WP_User {
 		return $this->__isset( $key );
 	}
 
-	/*
+	/**
 	 * Return an array representation.
 	 *
 	 * @since 3.5.0
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 9975158c74..e82e730a28 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -396,7 +396,7 @@ class WP_Comment_Query {
 		return $comments;
 	}
 
-	/*
+	/**
 	 * Used internally to generate an SQL string for searching across multiple columns
 	 *
 	 * @access protected
diff --git a/wp-includes/js/plupload/wp-plupload.js b/wp-includes/js/plupload/wp-plupload.js
index dc91674930..c8b51383d5 100644
--- a/wp-includes/js/plupload/wp-plupload.js
+++ b/wp-includes/js/plupload/wp-plupload.js
@@ -6,7 +6,7 @@ window.wp = window.wp || {};
 	if ( typeof _wpPluploadSettings === 'undefined' )
 		return;
 
-	/*
+	/**
 	 * An object that helps create a WordPress uploader using plupload.
 	 *
 	 * @param options - object - The options passed to the new plupload instance.
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index e0f77cd36c..880f7e142f 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -736,12 +736,13 @@ function edit_term_link( $link = '', $before = '', $after = '', $term = null, $e
 }
 
 /**
-* Retrieve permalink for search.
-*
-* @since  3.0.0
-* @param string $query Optional. The query string to use. If empty the current query is used.
-* @return string
-*/
+ * Retrieve permalink for search.
+ *
+ * @since  3.0.0
+ *
+ * @param string $query Optional. The query string to use. If empty the current query is used.
+ * @return string
+ */
 function get_search_link( $query = '' ) {
 	global $wp_rewrite;
 
diff --git a/wp-includes/query.php b/wp-includes/query.php
index a7dfb7823c..a53a8399db 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1712,7 +1712,7 @@ class WP_Query {
 		do_action_ref_array('parse_query', array(&$this));
 	}
 
-	/*
+	/**
 	 * Parses various taxonomy related query vars.
 	 *
 	 * @access protected
diff --git a/wp-includes/update.php b/wp-includes/update.php
index bc666fd225..a6976c6fbe 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -452,7 +452,7 @@ function wp_get_translation_updates() {
 	return $updates;
 }
 
-/*
+/**
  * Collect counts and UI strings for available updates
  *
  * @since 3.3.0
diff --git a/wp-includes/user.php b/wp-includes/user.php
index a534232405..61768b76d2 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -618,7 +618,7 @@ class WP_User_Query {
 		$this->query_vars[$query_var] = $value;
 	}
 
-	/*
+	/**
 	 * Used internally to generate an SQL string for searching across multiple columns
 	 *
 	 * @access protected