# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1353689029 18000
# Node ID 55014745413715b36c328a877aeafcc1c3969bf1
# Parent  d928ad126b667f80e01dd534d77d689abc7045ab# Parent  7f4e7073b2e085d4ae55573d28f770e7534b0dea
maint: periodic merge of stable to default

diff -r d928ad126b66 -r 550147454137 libinterp/corefcn/tril.cc
--- a/libinterp/corefcn/tril.cc	Fri Nov 23 11:42:13 2012 -0500
+++ b/libinterp/corefcn/tril.cc	Fri Nov 23 11:43:49 2012 -0500
@@ -356,9 +356,9 @@
 The default value of @var{k} is zero, so that @code{triu} and\n\
 @code{tril} normally include the main diagonal as part of the result.\n\
 \n\
-If the value of @var{k} is negative, additional elements above (for\n\
-@code{tril}) or below (for @code{triu}) the main diagonal are also\n\
-selected.\n\
+If the value of @var{k} is nonzero integer, the selection of elements\
+starts at an offset of @var{k} diagonals above or below the main\
+diagonal; above for positive @var{k} and below for negative @var{k}.\
 \n\
 The absolute value of @var{k} must not be greater than the number of\n\
 sub-diagonals or super-diagonals.\n\
diff -r d928ad126b66 -r 550147454137 libinterp/interpfcn/error.cc
--- a/libinterp/interpfcn/error.cc	Fri Nov 23 11:42:13 2012 -0500
+++ b/libinterp/interpfcn/error.cc	Fri Nov 23 11:43:49 2012 -0500
@@ -1943,6 +1943,7 @@
 When called from inside a function with the \"local\" option, the variable is\n\
 changed locally for the function and any subroutines it calls.  The original\n\
 variable value is restored when exiting the function.\n\
+@seealso{debug_on_warning, debug_on_interrupt}\n\
 @end deftypefn")
 {
   return SET_INTERNAL_VARIABLE (debug_on_error);
@@ -1959,6 +1960,7 @@
 When called from inside a function with the \"local\" option, the variable is\n\
 changed locally for the function and any subroutines it calls.  The original\n\
 variable value is restored when exiting the function.\n\
+@seealso{debug_on_error, debug_on_interrupt}\n\
 @end deftypefn")
 {
   return SET_INTERNAL_VARIABLE (debug_on_warning);
diff -r d928ad126b66 -r 550147454137 libinterp/interpfcn/sighandlers.cc
--- a/libinterp/interpfcn/sighandlers.cc	Fri Nov 23 11:42:13 2012 -0500
+++ b/libinterp/interpfcn/sighandlers.cc	Fri Nov 23 11:43:49 2012 -0500
@@ -978,6 +978,7 @@
 When called from inside a function with the \"local\" option, the variable is\n\
 changed locally for the function and any subroutines it calls.  The original\n\
 variable value is restored when exiting the function.\n\
+@seealso{debug_on_error, debug_on_warning}\n\
 @end deftypefn")
 {
   return SET_INTERNAL_VARIABLE (debug_on_interrupt);
diff -r d928ad126b66 -r 550147454137 scripts/plot/private/__print_parse_opts__.m