# HG changeset patch
# User Rik <rik@octave.org>
# Date 1515978894 28800
# Node ID 56f1f60f35fd5823d2e065ab78e9ef7b7581805c
# Parent  a81af57f614451772795f3252c73744a7c32c788# Parent  49876d80d110f303562f8d9ae5014ef758c4e3f6
maint: merge stable to default.

diff -r a81af57f6144 -r 56f1f60f35fd libinterp/corefcn/input.cc
--- a/libinterp/corefcn/input.cc	Sun Jan 14 16:57:20 2018 -0800
+++ b/libinterp/corefcn/input.cc	Sun Jan 14 17:14:54 2018 -0800
@@ -1210,7 +1210,7 @@
 When executing interactively, Octave displays the primary prompt when it is
 ready to read a command.
 
-The default value of the primary prompt string is @qcode{"octave:\#> "}.
+The default value of the primary prompt string is @qcode{'octave:\#> '}.
 To change it, use a command like
 
 @example
diff -r a81af57f6144 -r 56f1f60f35fd scripts/deprecated/md5sum.m
diff -r a81af57f6144 -r 56f1f60f35fd scripts/strings/regexptranslate.m
--- a/scripts/strings/regexptranslate.m	Sun Jan 14 16:57:20 2018 -0800
+++ b/scripts/strings/regexptranslate.m	Sun Jan 14 17:14:54 2018 -0800
@@ -33,7 +33,7 @@
 ## @example
 ## @group
 ## regexptranslate ("wildcard", "*.m")
-##      @result{} ".*\.m"
+##      @result{} '.*\.m'
 ## @end group
 ## @end example
 ##
@@ -44,7 +44,7 @@
 ## @example
 ## @group
 ## regexptranslate ("escape", "12.5")
-##      @result{} "12\.5"
+##      @result{} '12\.5'
 ## @end group
 ## @end example
 ##