Index: src/wp-admin/includes/template.php
===================================================================
--- src/wp-admin/includes/template.php	(revision 26863)
+++ src/wp-admin/includes/template.php	(working copy)
@@ -802,13 +802,21 @@
  *
  * @since 2.5.0
  *
- * @param string $id String for use in the 'id' attribute of tags.
- * @param string $title Title of the meta box.
- * @param string $callback Function that fills the box with the desired content. The function should echo its output.
- * @param string|object $screen Optional. The screen on which to show the box (post, page, link). Defaults to current screen.
- * @param string $context Optional. The context within the page where the boxes should show ('normal', 'advanced').
- * @param string $priority Optional. The priority within the context where the boxes should show ('high', 'low').
- * @param array $callback_args Optional. Data that should be set as the "args" property of the box array (which is the second parameter passed to your callback).
+ * @param string           $id            String for use in the 'id' attribute of tags.
+ * @param string           $title         Title of the meta box.
+ * @param string           $callback      Function that fills the box with the desired
+ *                                        content. The function should echo its output.
+ * @param string|WP_Screen $screen        Optional. The screen on which to show the box
+ *                                        (post, page, link). Default is the current screen.
+ * @param string           $context       Optional. The context within the page where the
+ *                                        boxes should show ('normal', 'advanced', 'side').
+ *                                        Default 'advanced'.
+ * @param string           $priority      Optional. The priority within the context where
+ *                                        the boxes should show ('high', 'low').
+ *                                        Default 'default'.
+ * @param array            $callback_args Optional. Data that should be set as the $args
+ *                                        property of the box array (which is the second
+ *                                        parameter passed to your callback). Default null.
  */
 function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null ) {
 	global $wp_meta_boxes;
