changeset 27461:15752c577f6d

maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Mon, 30 Sep 2019 12:11:06 -0400
parents 02500c701539 (current diff) e92bab9a7f26 (diff)
children 463d6852c312
files libgui/src/m-editor/file-editor-tab.cc libgui/src/m-editor/find-dialog.cc libgui/src/m-editor/find-dialog.h libgui/src/m-editor/octave-qscintilla.cc libinterp/corefcn/help.cc
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/help.cc	Mon Sep 30 12:54:35 2019 +0200
+++ b/libinterp/corefcn/help.cc	Mon Sep 30 12:11:06 2019 -0400
@@ -711,9 +711,9 @@
 @deftypefn {} {[@var{text}, @var{format}] =} get_help_text (@var{name})
 Return the raw help text of function @var{name}.
 
-The raw help text is returned in @var{text} and the format in @var{format}
-The format is a string which is one of @qcode{"texinfo"},
-@qcode{"html"}, or @qcode{"plain text"}.
+The raw help text is returned in @var{text} and the format in @var{format}.
+The format is a string which is one of @qcode{"texinfo"}, @qcode{"html"}, or
+@w{@qcode{"plain text"}}.
 @seealso{get_help_text_from_file}
 @end deftypefn */)
 {
@@ -736,9 +736,9 @@
 @deftypefn {} {[@var{text}, @var{format}] =} get_help_text_from_file (@var{fname})
 Return the raw help text from the file @var{fname}.
 
-The raw help text is returned in @var{text} and the format in @var{format}
-The format is a string which is one of @qcode{"texinfo"},
-@qcode{"html"}, or @qcode{"plain text"}.
+The raw help text is returned in @var{text} and the format in @var{format}.
+The format is a string which is one of @qcode{"texinfo"}, @qcode{"html"}, or
+@w{@qcode{"plain text"}}.
 @seealso{get_help_text}
 @end deftypefn */)
 {