patch 8.0.1250: 'hlsearch' highlighting not removed after incsearch

Problem:    'hlsearch' highlighting not removed after incsearch (lacygoill)
Solution:   Redraw all windows. Start search at the end of the match.  Improve
            how CTRL-G works with incremental search. Add tests. (Christian
            Brabandt, Hirohito Higashi, haya14busa, closes #2267)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 181aa94..c3b5ab8 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4454,8 +4454,8 @@
 	Example: >
 		augroup vimrc-incsearch-highlight
 		  autocmd!
-		  autocmd CmdlineEnter [/\?] :set hlsearch
-		  autocmd CmdlineLeave [/\?] :set nohlsearch
+		  autocmd CmdlineEnter /,\? :set hlsearch
+		  autocmd CmdlineLeave /,\? :set nohlsearch
 		augroup END
 <
 	CTRL-L can be used to add one character from after the current match