Merge branch 'trunk' into html-api/normalization-special-newlines

Author: sirreal

src/wp-admin/includes/misc.php

@@ -492,6 +492,9 @@ function wp_make_plugin_file_tree( $plugin_editable_files ) {
  * @since 4.9.0
  * @access private
  *
+ * @global string $file   Path to the file being edited.
+ * @global string $plugin Path to the plugin file relative to the plugins directory.
+ *
  * @param array|string $tree  List of file/folder paths, or filename.
  * @param string       $label Name of file or folder to print.
  * @param int          $level The aria-level for the current iteration.

src/wp-admin/includes/schema.php

@@ -12,8 +12,8 @@
  * Declare these as global in case schema.php is included from a function.
  *
  * @global wpdb   $wpdb            WordPress database abstraction object.
- * @global array  $wp_queries
- * @global string $charset_collate
+ * @global array  $wp_queries      Global database queries array.
+ * @global string $charset_collate Database charset and collation.
  */
 global $wpdb, $wp_queries, $charset_collate;