diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 1b77d87aac..6ecbf9fb0d 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -124,8 +124,14 @@ include the kitchen sink... but you can use it for plumbing."
 ==============================================================================
 2. Design decisions					*design-decisions*
 
-Window
+Jargon	 							*dev-jargon*
 
+Host ~
+A plugin "host" is both a client (of the Nvim API) and a server (of an
+external platform, e.g. python). It is a remote plugin that hosts other
+plugins.
+
+Window ~
 The word "window" is commonly used for several things: A window on the screen,
 the xterm window, a window inside Vim to view a buffer.
 To avoid confusion, other items that are sometimes called window have been
@@ -139,7 +145,6 @@ window		View on a buffer.  There can be several windows in Vim,
 		together with the command line, menubar, toolbar, etc. they
 		fit in the shell.
 
-
 Providers 							*dev-provider*
 
 A goal of Nvim is to allow extension of the editor without special knowledge
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 45695ccf02..4296ef6490 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -33,9 +33,15 @@ There are 3 ways to create a terminal buffer:
 - By editing a file with a name matching `term://(.{-}//(\d+:)?)?\zs.*`.
   For example:
 >
-    :e term://bash
-    :vsp term://top
+    :edit term://bash
+    :vsplit term://top
 <
+    Note: The "term://" pattern is handled by a BufReadCmd handler, so the
+    |autocmd-nested| modifier is required to use it in an autocmd. >
+        autocmd VimEnter * nested split term://sh
+<    This is only mentioned for reference; you should use the |:terminal|
+    command instead.
+
 When the terminal spawns the program, the buffer will start to mirror the
 terminal display and change its name to `term://$CWD//$PID:$COMMAND`.
 Note that |:mksession| will "save" the terminal buffers by restarting all