--- a/doc/interpreter/expr.txi	Wed Oct 12 18:24:08 2016 -0700
+++ b/doc/interpreter/expr.txi	Thu Oct 13 08:20:10 2016 -0700
@@ -319,8 +319,6 @@
 
 @DOCSTRING(isindex)
 
-@DOCSTRING(allow_noninteger_range_as_index)
-
 @node Calling Functions
 @section Calling Functions
 
@@ -1009,12 +1007,10 @@
 
 @sc{matlab} has special behavior that allows the operators @samp{&} and
 @samp{|} to short-circuit when used in the truth expression for @code{if} and
-@code{while} statements.  Octave also behaves the same way by default,
-though the use of the @samp{&} and @samp{|} operators in this way is
-strongly discouraged.  Instead, you should use the @samp{&&} and @samp{||}
-operators that always have short-circuit behavior.
-
-@DOCSTRING(do_braindead_shortcircuit_evaluation)
+@code{while} statements.  Octave behaves the same way for compatibility,
+however, the use of the @samp{&} and @samp{|} operators in this way is
+strongly discouraged and a warning will be issued.  Instead, you should use
+the @samp{&&} and @samp{||} operators that always have short-circuit behavior.
 
 Finally, the ternary operator (?:) is not supported in Octave.  If
 short-circuiting is not important, it can be replaced by the @code{ifelse}

--- a/doc/interpreter/grammar.txi	Wed Oct 12 18:24:08 2016 -0700
+++ b/doc/interpreter/grammar.txi	Thu Oct 13 08:20:10 2016 -0700
@@ -64,8 +64,7 @@
 
 The parser has a number of variables that affect its internal operation.
 These variables are generally documented in the manual alongside the code that
-they affect.  For example, @code{allow_noninteger_range_as_index} is discussed
-in the section on index expressions.
+they affect.
 
 In addition, there are three non-specific parser customization functions.
 @code{add_input_event_hook} can be used to schedule a user function for