Update generated Op docs.

Change: 111922002

5 files changed, 87 insertions, 4 deletions

diff --git a/tensorflow/g3doc/api_docs/python/framework.md b/tensorflow/g3doc/api_docs/python/framework.md
index 02d4e7e7e3..669e85aafe 100644
--- a/tensorflow/g3doc/api_docs/python/framework.md
+++ b/tensorflow/g3doc/api_docs/python/framework.md
@@ -1858,10 +1858,21 @@ Returns a list of Dimensions, or None if the shape is unspecified.
 
 - - -
 
-#### `tf.TensorShape.as_list()` {#TensorShape.as_list}
+#### `tf.TensorShape.as_list(to_proto=False)` {#TensorShape.as_list}
 
 Returns a list of integers or None for each dimension.
 
+If `to_proto` is True, returns -1 instead of None for unknown dimensions.
+
+##### Args:
+
+
+*  <b>`to_proto`</b>: boolean.  Determines how unknown dimensions are treated.
+
+##### Returns:
+
+  A list of integers or None for each dimension.
+
 
 - - -
 
diff --git a/tensorflow/g3doc/api_docs/python/index.md b/tensorflow/g3doc/api_docs/python/index.md
index a1d0cdcd28..388f8d8c0d 100644
--- a/tensorflow/g3doc/api_docs/python/index.md
+++ b/tensorflow/g3doc/api_docs/python/index.md
@@ -168,6 +168,8 @@
   * [`sign`](../../api_docs/python/math_ops.md#sign)
   * [`sin`](../../api_docs/python/math_ops.md#sin)
   * [`sparse_segment_mean`](../../api_docs/python/math_ops.md#sparse_segment_mean)
+  * [`sparse_segment_sqrt_n`](../../api_docs/python/math_ops.md#sparse_segment_sqrt_n)
+  * [`sparse_segment_sqrt_n_grad`](../../api_docs/python/math_ops.md#sparse_segment_sqrt_n_grad)
   * [`sparse_segment_sum`](../../api_docs/python/math_ops.md#sparse_segment_sum)
   * [`sqrt`](../../api_docs/python/math_ops.md#sqrt)
   * [`square`](../../api_docs/python/math_ops.md#square)
diff --git a/tensorflow/g3doc/api_docs/python/math_ops.md b/tensorflow/g3doc/api_docs/python/math_ops.md
index 6101d11167..11d3b62dba 100644
--- a/tensorflow/g3doc/api_docs/python/math_ops.md
+++ b/tensorflow/g3doc/api_docs/python/math_ops.md
@@ -23,7 +23,7 @@ Returns x + y element-wise.
 ##### Args:
 
 
-*  <b>`x`</b>: A `Tensor`. Must be one of the following types: `float32`, `float64`, `uint8`, `int8`, `int16`, `int32`, `int64`, `complex64`.
+*  <b>`x`</b>: A `Tensor`. Must be one of the following types: `float32`, `float64`, `uint8`, `int8`, `int16`, `int32`, `int64`, `complex64`, `string`.
 *  <b>`y`</b>: A `Tensor`. Must have the same type as `x`.
 *  <b>`name`</b>: A name for the operation (optional).
 
@@ -1762,6 +1762,35 @@ dimension, selecting a subset of dimension 0, specified by `indices`.
   has size `k`, the number of segments.
 
 
+- - -
+
+### `tf.sparse_segment_sqrt_n(data, indices, segment_ids, name=None)` {#sparse_segment_sqrt_n}
+
+Computes the sum along sparse segments of a tensor divided by the sqrt of N.
+
+N is the size of the segment being reduced.
+
+Read [the section on
+Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
+of segments.
+
+##### Args:
+
+
+*  <b>`data`</b>: A `Tensor`. Must be one of the following types: `float32`, `float64`.
+*  <b>`indices`</b>: A `Tensor` of type `int32`.
+    A 1-D tensor. Has same rank as `segment_ids`.
+*  <b>`segment_ids`</b>: A `Tensor` of type `int32`.
+    A 1-D tensor. Values should be sorted and can be repeated.
+*  <b>`name`</b>: A name for the operation (optional).
+
+##### Returns:
+
+  A `Tensor`. Has the same type as `data`.
+  Has same shape as data, except for dimension 0 which
+  has size `k`, the number of segments.
+
+
 
 
 ## Sequence Comparison and Indexing
@@ -2043,3 +2072,32 @@ invert_permutation(x) ==> [2, 4, 3, 0, 1]
   A `Tensor` of type `int32`. 1-D.
 
 
+
+## Other Functions and Classes
+- - -
+
+### `tf.sparse_segment_sqrt_n_grad(grad, indices, segment_ids, output_dim0, name=None)` {#sparse_segment_sqrt_n_grad}
+
+Computes gradients for SparseSegmentSqrtN.
+
+Returns tensor "output" with same shape as grad, except for dimension 0 whose
+value is output_dim0.
+
+##### Args:
+
+
+*  <b>`grad`</b>: A `Tensor`. Must be one of the following types: `float32`, `float64`.
+    gradient propagated to the SparseSegmentSqrtN op.
+*  <b>`indices`</b>: A `Tensor` of type `int32`.
+    indices passed to the corresponding SparseSegmentSqrtN op.
+*  <b>`segment_ids`</b>: A `Tensor` of type `int32`.
+    segment_ids passed to the corresponding SparseSegmentSqrtN op.
+*  <b>`output_dim0`</b>: A `Tensor` of type `int32`.
+    dimension 0 of "data" passed to SparseSegmentSqrtN op.
+*  <b>`name`</b>: A name for the operation (optional).
+
+##### Returns:
+
+  A `Tensor`. Has the same type as `grad`.
+
+
diff --git a/tensorflow/g3doc/api_docs/python/nn.md b/tensorflow/g3doc/api_docs/python/nn.md
index 87388c9539..418be25ca3 100644
--- a/tensorflow/g3doc/api_docs/python/nn.md
+++ b/tensorflow/g3doc/api_docs/python/nn.md
@@ -832,7 +832,7 @@ Since they are nondifferentiable, they are typically used at evaluation time.
 
 - - -
 
-### `tf.nn.top_k(input, k, name=None)` {#top_k}
+### `tf.nn.top_k(input, k, sorted=None, name=None)` {#top_k}
 
 Returns the values and indices of the `k` largest elements for each row.
 
@@ -849,6 +849,9 @@ elements are equal, the lower-index element appears first.
     A `batch_size` x `classes` tensor.
 *  <b>`k`</b>: An `int` that is `>= 1`.
     Number of top elements to look for within each row.
+*  <b>`sorted`</b>: An optional `bool`. Defaults to `True`.
+    If true the resulting `k` elements will be sorted by the values in
+    descending order.
 *  <b>`name`</b>: A name for the operation (optional).
 
 ##### Returns:
@@ -856,7 +859,7 @@ elements are equal, the lower-index element appears first.
   A tuple of `Tensor` objects (values, indices).
 
 *  <b>`values`</b>: A `Tensor`. Has the same type as `input`. A `batch_size` x `k` tensor with the `k` largest elements for
-    each row, sorted in descending order.
+    each row.
 *  <b>`indices`</b>: A `Tensor` of type `int32`. A `batch_size` x `k` tensor with the index of each value within
     each row.
 
diff --git a/tensorflow/g3doc/api_docs/python/train.md b/tensorflow/g3doc/api_docs/python/train.md
index f63e54fb64..f8b7bc626f 100644
--- a/tensorflow/g3doc/api_docs/python/train.md
+++ b/tensorflow/g3doc/api_docs/python/train.md
@@ -1181,6 +1181,15 @@ Create a new Coordinator.
 
 - - -
 
+#### `tf.train.Coordinator.clear_stop()` {#Coordinator.clear_stop}
+
+Clears the stop flag.
+
+After this is called, calls to `should_stop()` will return `False`.
+
+
+- - -
+
 #### `tf.train.Coordinator.join(threads, stop_grace_period_secs=120)` {#Coordinator.join}
 
 Wait for threads to terminate.