Merge branch 'master' of github.com:apache/spark into reverse-api-tag

# Conflicts:
#	sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala

sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala

@@ -744,16 +744,7 @@ class SparkSession private(
     }
   }
 
-  /**
-   * Returns a [[DataFrameReader]] that can be used to read non-streaming data in as a
-   * `DataFrame`.
-   * {{{
-   *   sparkSession.read.parquet("/path/to/file.parquet")
-   *   sparkSession.read.schema(schema).json("/path/to/file.json")
-   * }}}
-   *
-   * @since 2.0.0
-   */
+  /** @inheritdoc */
   def read: DataFrameReader = new DataFrameReader(self)
 
   /**