diff -u b/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
--- b/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -857,8 +857,8 @@
  * @param $reset
  *   (optional) TRUE to reset one or all variables(s). This parameter is only
  *   used internally and should not be passed in; use drupal_static_reset()
- *   instead.
- *   (This function's return value should not be used when TRUE is passed in.)
+ *   instead. (This function's return value should not be used when TRUE is
+ *   passed in.)
  *
  * @return
  *   Returns a variable by reference.
@@ -932,7 +932,7 @@
  * avoid "Exception thrown without a stack frame in Unknown".
  *
  * @param $callback
- *   (optional) An additional shutdown function to register().
+ *   (optional) An additional shutdown function to register.
  * @param ...
  *   (optional) Additional arguments to pass to the shutdown function.
  *
diff -u b/core/includes/file.inc b/core/includes/file.inc
--- b/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -443,7 +443,7 @@
  *     the filename is unique.
  *   - FILE_EXISTS_ERROR: Do nothing and return FALSE.
  *
- * @return URI|FALSE
+ * @return string|false
  *   The path to the new file, or FALSE in the event of an error.
  *
  * @see file_copy()
@@ -541,7 +541,7 @@
  *     unique.
  *   - FILE_EXISTS_ERROR: Do nothing and return FALSE.
  *
- * @return  URI|FALSE
+ * @return  string|false
  *   The destination filepath, or FALSE if the file already exists
  *   and FILE_EXISTS_ERROR is specified.
  */
@@ -582,7 +582,7 @@
  *     filename is unique.
  *   - FILE_EXISTS_ERROR: Do nothing and return FALSE.
  *
- * @return URI|FALSE
+ * @return string|false
  *   The URI of the moved file, or FALSE in the event of an error.
  *
  * @see file_move()
@@ -614,7 +614,7 @@
  *
  * Function behavior is also controlled by the configuration
  * 'system.file:allow_insecure_uploads'. If it evaluates to TRUE, no
- * alterations will be made, if it evaluates to FALSE, the filename is
+ * alterations will be made; if it evaluates to FALSE, the filename is
  * 'munged'.
  *
  * @param $filename
@@ -880,7 +880,7 @@
  *     filename is unique.
  *   - FILE_EXISTS_ERROR: Do nothing and return FALSE.
  *
- * @return URI|FALSE
+ * @return string|false
  *   A string with the path of the resulting file, or FALSE on error.
  *
  * @see file_save_data()