Move some configuration around

3 files changed, 28 insertions, 22 deletions

diff --git a/doc/configuration.md b/doc/configuration.md
index 0a238406..f7ac4581 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -60,19 +60,6 @@ make the hidden buffers visible. They'll always be visible in
 (setq cider-prefer-local-resources t)
 ```
 
-* Prevent the auto-display of the REPL buffer in a separate window
-  after connection is established:
-
-```el
-(setq cider-repl-pop-to-buffer-on-connect nil)
-```
-
-* Make <kbd>C-c C-z</kbd> switch to the CIDER REPL buffer in the current window:
-
-```el
-(setq cider-repl-display-in-current-window t)
-```
-
 * Prevent <kbd>C-c C-k</kbd> from prompting to save the file corresponding to
   the buffer being loaded, if it's modified:
 
@@ -100,15 +87,6 @@ To remove the prefix altogether just set it to an empty string(`""`).
 (setq cider-font-lock-dynamically '(macro core function var))
 ```
 
-* You can configure known endpoints used by the cider command offered via a
-completing read. This is useful if you have a list of common host/ports you
-want to establish remote nREPL connections to. Using an optional label is
-helpful for identifying each host.
-
-```el
-(setq cider-known-endpoints '(("host-a" "10.10.10.1" "7888") ("host-b" "7888")))
-```
-
 * If you are targeting the JVM and prefer a local copy of the JDK API
   documentation over Oracle's official copy (e.g., for
   [JavaSE 8](http://docs.oracle.com/javase/8/docs/api/)), per nREPL's
diff --git a/doc/up_and_running.md b/doc/up_and_running.md
index b063143f..52bc76b4 100644
--- a/doc/up_and_running.md
+++ b/doc/up_and_running.md
@@ -59,6 +59,15 @@ Typing there <kbd>M-x cider-connect</kbd> will allow you to connect to the runni
 
 In Clojure(Script) buffers the command `cider-connect` is bound to <kbd>C-c M-c</kbd>.
 
+You can configure known endpoints used by the `cider-connect` command offered
+via a completing read. This is useful if you have a list of common host/ports
+you want to establish remote nREPL connections to. Using an optional label is
+helpful for identifying each host.
+
+```el
+(setq cider-known-endpoints '(("host-a" "10.10.10.1" "7888") ("host-b" "7888")))
+```
+
 ### ClojureScript usage
 
 ClojureScript support relies on the
diff --git a/doc/using_the_repl.md b/doc/using_the_repl.md
index ec9c30ca..fd2bf7f1 100644
--- a/doc/using_the_repl.md
+++ b/doc/using_the_repl.md
@@ -60,6 +60,25 @@ character used to trigger the shortcuts is configurable via
 
 #### REPL Configuration
 
+##### Behavior on connect
+
+Normally, the REPL buffer is auto-displayed in a separate window after
+  a connection is established. You can suppress this behaviour like this:
+
+```el
+(setq cider-repl-pop-to-buffer-on-connect nil)
+```
+
+##### Behavior on switch
+
+By default <kbd>C-c C-z</kbd> will display the REPL buffer in a different window.
+You can make <kbd>C-c C-z</kbd> switch to the CIDER REPL buffer in the current
+window:
+
+```el
+(setq cider-repl-display-in-current-window t)
+```
+
 ##### Eldoc
 
 Eldoc displays function signatures in the minibuffer as you're typing.