Merge branch 'master' into 2.0

3 files changed, 12 insertions, 3 deletions

diff --git a/docs/features/commands.rst b/docs/features/commands.rst
index 8e61a472..cc603f70 100644
--- a/docs/features/commands.rst
+++ b/docs/features/commands.rst
@@ -127,7 +127,7 @@ without errors), and that ``cmd2`` should prompt the user for more input.
 If you return ``True`` from a command method, that indicates to ``cmd2`` that
 it should stop prompting for user input and cleanly exit. ``cmd2`` already
 includes a ``quit`` command, but if you wanted to make another one called
-``finis`` you could::
+``finish`` you could::
 
     def do_finish(self, line):
         """Exit the application"""
@@ -156,7 +156,7 @@ system shell::
         """A simple cmd2 application."""
 
     def do_bail(self, line):
-        """Exit the application""
+        """Exit the application"""
         self.perror("fatal error, exiting")
         self.exit_code = 2
         return true
diff --git a/docs/features/modular_commands.rst b/docs/features/modular_commands.rst
index 790b933e..8bd9ba2f 100644
--- a/docs/features/modular_commands.rst
+++ b/docs/features/modular_commands.rst
@@ -29,7 +29,7 @@ Features
 
 See API documentation for :attr:`cmd2.command_definition.CommandSet`
 
-See the examples for more details: https://github.com/python-cmd2/cmd2/tree/master/plugins/command_sets/examples
+See [the examples](https://github.com/python-cmd2/cmd2/tree/master/examples/modular_commands) for more details.
 
 
 Defining Commands
diff --git a/docs/features/startup_commands.rst b/docs/features/startup_commands.rst
index aaaf7722..f105054b 100644
--- a/docs/features/startup_commands.rst
+++ b/docs/features/startup_commands.rst
@@ -64,3 +64,12 @@ like so::
 This text file should contain a :ref:`Command Script
 <features/scripting:Command Scripts>`. See the AliasStartup_ example for a
 demonstration.
+
+You can silence a startup script's output by setting ``silent_startup_script``
+to True::
+
+    cmd2.Cmd.__init__(self, startup_script='.cmd2rc', silent_startup_script=True)
+
+Anything written to stderr will still print. Additionally, a startup script
+cannot be silenced if ``allow_redirection`` is False since silencing works
+by redirecting a script's output to ``os.devnull``.