--- old/modules/javafx.controls/src/main/java/javafx/scene/control/TableCell.java	2017-03-09 14:44:32.566173820 -0800
+++ new/modules/javafx.controls/src/main/java/javafx/scene/control/TableCell.java	2017-03-09 14:44:32.462173818 -0800
@@ -63,7 +63,6 @@
  *   property is set to true (to represent that it is allowable to select
  *   individual cells (and not just rows of cells)).</li>
  * </ol>
- * </p>
  *
  * @see TableView
  * @see TableColumn
@@ -210,6 +209,7 @@
     };
     /**
      * The TableColumn instance that backs this TableCell.
+     * @return the TableColumn instance that backs this TableCell
      */
     public final ReadOnlyObjectProperty<TableColumn<S,T>> tableColumnProperty() { return tableColumn.getReadOnlyProperty(); }
     private void setTableColumn(TableColumn<S,T> value) { tableColumn.set(value); }
@@ -227,6 +227,7 @@
 
     /**
      * The TableView associated with this TableCell.
+     * @return the TableView associated with this TableCell
      */
     public final ReadOnlyObjectProperty<TableView<S>> tableViewProperty() {
         return tableViewPropertyImpl().getReadOnlyProperty();
@@ -695,9 +696,10 @@
      * Updates the TableView associated with this TableCell. This is typically
      * only done once when the TableCell is first added to the TableView.
      *
-     * @expert This function is intended to be used by experts, primarily
-     *         by those implementing new Skins. It is not common
-     *         for developers or designers to access this function directly.
+     * Note: This function is intended to be used by experts, primarily
+     *       by those implementing new Skins. It is not common
+     *       for developers or designers to access this function directly.
+     * @param tv the TableView associated with this TableCell
      */
     public final void updateTableView(TableView tv) {
         setTableView(tv);
@@ -706,9 +708,10 @@
     /**
      * Updates the TableRow associated with this TableCell.
      *
-     * @expert This function is intended to be used by experts, primarily
-     *         by those implementing new Skins. It is not common
-     *         for developers or designers to access this function directly.
+     * Note: This function is intended to be used by experts, primarily
+     *       by those implementing new Skins. It is not common
+     *       for developers or designers to access this function directly.
+     * @param tableRow the TableRow associated with this TableCell
      */
     public final void updateTableRow(TableRow tableRow) {
         this.setTableRow(tableRow);
@@ -717,9 +720,10 @@
     /**
      * Updates the TableColumn associated with this TableCell.
      *
-     * @expert This function is intended to be used by experts, primarily
-     *         by those implementing new Skins. It is not common
-     *         for developers or designers to access this function directly.
+     * Note: This function is intended to be used by experts, primarily
+     *       by those implementing new Skins. It is not common
+     *       for developers or designers to access this function directly.
+     * @param col the TableColumn associated with this TableCell
      */
     public final void updateTableColumn(TableColumn col) {
         // remove style class of existing table column, if it is non-null