--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties	Fri May 20 09:47:00 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties	Fri May 20 11:55:46 2016 -0700
@@ -74,8 +74,8 @@
 jshell.msg.error = Error:
 jshell.msg.warning = Warning:
 
-jshell.err.set.arg = The ''/set'' command requires a sub-command and arguments. See: ''/help /set''
-jshell.err.set.ambiguous = Ambiguous sub-command argument to ''/set'': {0}
+jshell.err.sub.arg = The ''{0}'' command requires a sub-command. See: ''/help {0}''
+jshell.err.sub.ambiguous = Ambiguous sub-command argument to ''{0}'': {1}
 
 jshell.err.classpath.arg = The /classpath command requires a path argument.
 jshell.msg.classpath = Path ''{0}'' added to classpath
@@ -120,6 +120,10 @@
 jshell.err.truncation.expected.length = Expected truncation length -- {0}
 jshell.err.truncation.length.not.integer = Truncation length must be an integer: {0} -- {1}
 
+jshell.err.not.valid.with.predefined.mode = Not valid with predefined modes: {0} -- {1}
+jshell.err.retained.feedback.mode.must.be.retained.or.predefined = \
+''/retain feedback <mode>'' requires that <mode> is predefined or has been retained with ''/retain mode'' -- {0}
+
 jshell.console.see.more = <press tab to see more>
 jshell.console.do.nothing = Do nothing
 jshell.console.choice = Choice: \
@@ -355,12 +359,31 @@
 /set prompt <mode> "<prompt>" "<continuation-prompt>"\n\t\
      Set the displayed prompts for a given feedback mode.\n\n\
 /set truncation <mode> <length> <selector>...\n\t\
-     Set the maximum length of a displayed value\n\t\
+     Set the maximum length of a displayed value\n\
 /set format <mode> <field> "<format>" <selector>...\n\t\
      Configure a feedback mode by setting the format of a field when the selector matchs.\n\n\
 To get more information about one of these forms, use /help with the form specified.\n\
 For example:   /help /set format
 
+help.retain.summary = retain jshell configuration information for subsequent sessions
+help.retain.args = editor|start|feedback|mode
+help.retain =\
+Retain jshell configuration information for future invocations of the jshell tool,\n\
+including: the external editor to use, the start-up definitions to use, the\n\
+configuration of a feedback mode, or the feedback mode to use.\n\
+\n\
+/retain editor [<command> <optional-arg>...]\n\t\
+     Specify the command to launch for the /edit command.\n\t\
+     The <command> is an operating system dependent string.\n\n\
+/retain start [<file>]\n\t\
+     The contents of the specified <file> become the default start-up snippets and commands.\n\n\
+/retain feedback [<mode>]\n\t\
+     Set the feedback mode describing displayed feedback for entered snippets and commands.\n\n\
+/retain mode <mode>\n\t\
+     Create a user-defined feedback mode, optionally copying from an existing mode.\n\n\
+To get more information about one of these forms, use /help with the form specified.\n\
+For example:   /help /retain feedback
+
 help.quest.summary = get information about jshell
 help.quest.args = [<command>|<subject>]
 help.quest =\
@@ -568,10 +591,10 @@
 help.set.editor =\
 Specify the command to launch for the /edit command.\n\
 \n\t\
-/set editor <command> <optional-arg>...\n\
+/set editor <command>\n\
 \n\
 The <command> is an operating system dependent string.\n\
-The <command> may include space-separated arguments (such as flags) -- <optional-arg>....\n\
+The <command> may include space-separated arguments (such as flags)\n\
 When /edit is used, the temporary file to edit will be appended as the last argument.
 
 help.set.start =\
@@ -579,8 +602,54 @@
 \n\t\
 /set start <file>\n\
 \n\
+The contents of the specified <file> become the start-up snippets and commands used\n\
+when the /reset or /reload commands are used in this session.\n\
+This command is good for testing the start-up settings.  To retain them for future\n\
+runs of the jshell tool use the command:\n\t\
+/retain start\n
+
+help.retain.feedback = \
+Retain which feedback mode to use for displayed feedback for entered snippets and commands.\n\
+This feedback mode will be used in this and future sessions of the jshell tool.\n\
+\n\t\
+/retain feedback [<mode>]\n\
+\n\
+Where <mode> is the name of a previously defined feedback mode.\n\
+You may use just enough letters to make it unique.\n\
+If the <mode> is not specified, this command retains the current mode (as set\n\
+with the most recent /set feedback or /retain feedback command.)\n\
+
+help.retain.mode = \
+Retain the existence and configuration of a user-defined feedback mode.\n\
+This mode will be available in this and future sessions of the jshell tool.
+\n\t\
+/retain mode <mode>\n\
+\n\
+Where <mode> is the name of a mode you wish to retain.\n\
+The <mode> must previously have been created with /set newmode and\n\
+configured as desired with /set prompt, /set format, and /set truncation.\n
+
+help.retain.editor =\
+Retain the command to launch for the /edit command.  This command will be invoked when\n\
+the /edit command is used in this and future sessions of the jshell tool.\n\
+\n\t\
+/retain editor [<command>]\n\
+\n\
+The <command> is an operating system dependent string.\n\
+The <command> may include space-separated arguments (such as flags)\n\
+When /edit is used, the temporary file to edit will be appended as the last argument.\n\
+If <command> is not specified, the command last specified in a /set editor or\n\
+/retain editor command will be retained.\n
+
+help.retain.start =\
+Retain the start-up configuration -- a sequence of snippets and commands read at start-up.\n\
+\n\t\
+/retain start [<file>]\n\
+\n\
 The contents of the specified <file> become the default start-up snippets and commands --\n\
-which are run when the jshell tool is started or reset.
+which are run when the jshell tool is started or reset.\n\
+If <file> is not specified, the start-up last specified in a /set start or\n\
+/retain start command will be retained.\n
 
 startup.feedback = \
 /set newmode verbose -command    \n\