diff --git a/README.md b/README.md
index 2152a9c..952d07f 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ For detailed explanatin of the `.vimspector.json` format, see the
        * [Console autocompletion](#console-autocompletion)
        * [Log View](#log-view)
     * [Closing debugger](#closing-debugger)
+    * [Terminate debuggee](#terminate-debuggee)
  * [Debug profile configuration](#debug-profile-configuration)
     * [C, C  , Rust, etc.](#c-c-rust-etc)
        * [C   Remote debugging](#c-remote-debugging)
@@ -76,6 +77,7 @@ For detailed explanatin of the `.vimspector.json` format, see the
        * [Debug cli application](#debug-cli-application)
     * [JavaScript, TypeScript, etc.](#javascript-typescript-etc)
     * [Java](#java)
+       * [Hot code replace](#hot-code-replace)
        * [Usage with YouCompleteMe](#usage-with-youcompleteme)
        * [Other LSP clients](#other-lsp-clients)
     * [Lua](#lua)
@@ -91,7 +93,7 @@ For detailed explanatin of the `.vimspector.json` format, see the
     * [Example](#example)
  * [FAQ](#faq)
 
-<!-- Added by: ben, at: Sun 21 Feb 2021 21:15:32 GMT -->
+<!-- Added by: ben, at: Fri 19 Mar 2021 22:57:28 GMT -->
 
 <!--te-->
 
@@ -1591,6 +1593,20 @@ editor plugin to use Java. I recommend [YouCompleteMe][], which has full support
 for jdt.ls, and most importantly a trivial way to load the debug adapter and to
 use it with Vimspector.
 
+### Hot code replace
+
+When using the [java debug server][java-debug-server], Vimspector supports the
+hot code replace custom feature. By default, when the underlying class files
+change, vimspector asks the user if they wish to reload these classes at
+runtime.
+
+This behaviour can be customised:
+
+* `let g:ycm_java_hotcodereplace_mode = 'ask'` - the default, ask the user for
+  each reload.
+* `let g:ycm_java_hotcodereplace_mode = 'always'` - don't ask, always reload
+* `let g:ycm_java_hotcodereplace_mode = 'never'` - don't ask, never reload
+
 ### Usage with YouCompleteMe
 
 * Set up [YCM for java][YcmJava].
diff --git a/autoload/vimspector/internal/neopopup.vim b/autoload/vimspector/internal/neopopup.vim
index eb5a0dc..a734ca3 100644
--- a/autoload/vimspector/internal/neopopup.vim
+++ b/autoload/vimspector/internal/neopopup.vim
@@ -87,16 +87,16 @@ function! vimspector#internal#neopopup#Confirm( confirm_id,
                                               \ keys ) abort
 
   " Neovim doesn't have an equivalent of popup_dialog, and it's way too much
-  " effort to write one, so we just use confirm().
+  " effort to write one, so we just use confirm()...
+  " Annoyingly we can't use confirm() here because for some reason it doesn't
+  " render properly in a channel callback. So we use input() and mimic dialog
+  " behaviour.
   let prompt = a:text
   for opt in a:options
     let prompt .= ' ' . opt
   endfor
   let prompt .= ': '
 
-  " Annoyingly we can't use confirm() here because for some reason it doesn't
-  " render properly in a channel callback. So we use input() and mimic dialog
-  " behaviour.
   try
     let result = input( prompt, a:keys[ a:default_value - 1 ] )
   catch /.*/