Merge tag 'v0.18.0+dfsg' into wip/master

DFSG-clean upstream version 0.18.0

1 files changed, 22 insertions, 14 deletions

diff --git a/doc/index.md b/doc/index.md
index 752aceda..65df2445 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -8,8 +8,14 @@ features are centered around `cider-mode`, an Emacs minor-mode that complements
 compilation, debugging, definition and documentation lookup, running tests and
 so on.
 
-CIDER is the successor to the now deprecated combination of using [SLIME][] +
-[swank-clojure][] for Clojure development.
+!!! Note
+
+    CIDER was originally inspired by the powerful Common Lisp interactive
+    development environment [SLIME][]. In the beginning we started by
+    adapting SLIME's core functionality to Clojure, but over the course of time
+    CIDER became pretty different from SLIME in many areas. Check out
+    [this presentation](https://www.youtube.com/watch?v=4X-1fJm25Ww&list=PLZdCLR02grLoc322bYirANEso3mmzvCiI&index=6)
+    if you'd like to know more about CIDER's early history.
 
 **Please consider
 [supporting financially its ongoing development](about/contributing.md#funding).**
@@ -28,10 +34,8 @@ using CIDER - you're constantly interacting with it and changing it.
 You can find more details about the typical CIDER workflow in the
 [Interactive Programming](interactive_programming.md) section. While we're a bit
 short on video tutorials, you can check out this
-[tutorial about SLIME](https://www.youtube.com/watch?v=_B_4vhsmRRI) to get a
-feel about what do we mean by an "Interactive Development Environment".  There
-are plenty of differences between CIDER and SLIME, but the core ideas are pretty
-much the same (and SLIME served as the principle inspiration for CIDER).
+[into to CIDER](https://www.youtube.com/watch?v=aYA4AAjLfT0) to get a
+feel about what do we mean by an "Interactive Development Environment".
 
 CIDER's built on top of [nREPL][], the Clojure networked REPL server.
 
@@ -44,9 +48,14 @@ CIDER's basic architecture looks something like this:
 Clojure code gets executed by an nREPL server. CIDER sends requests to the
 server and processes its responses. The server's functionality is augmented by
 additional nREPL middleware, designed specifically to address the needs of an
-interactive development environment like CIDER. Much of the middleware we
-developed for CIDER is editor-agnostic and is being used by other Clojure
-development environments as well (e.g. [vim-fireplace][] & [CCW][]).
+interactive development environment like CIDER.
+
+
+!!! Note
+
+    Much of the middleware we originally
+    developed for CIDER is editor-agnostic and is being used by other Clojure
+    development environments as well (e.g. [vim-fireplace][] & [calva][]).
 
 CIDER packs plenty of features. Here are some of them (in no particular order):
 
@@ -75,21 +84,20 @@ CIDER packs plenty of features. Here are some of them (in no particular order):
 * [Scratchpad](miscellaneous_features.md#using-a-scratchpad)
 * [Minibuffer code evaluation](miscellaneous_features.md#evaluating-clojure-code-in-the-minibuffer)
 * Integration with [company-mode][]
-* [Support for working with multiple simultaneous nREPL connections](managing_connections.md)
+* [Support for working with multiple REPLs](managing_connections.md)
 
 ![CIDER Screenshot](images/cider-overview.png)
 
-[nREPL]: https://github.com/clojure/tools.nrepl
+[nREPL]: https://github.com/nrepl/nrepl
 [SLIME]: https://github.com/slime/slime
-[swank-clojure]: https://github.com/technomancy/swank-clojure
 [Sly]: https://github.com/capitaomorte/sly
 [Geiser]: https://github.com/jaor/geiser
 [company-mode]: http://company-mode.github.io/
 [leiningen]: http://leiningen.org/
 [boot]: http://boot-clj.com/
-[piggieback]: https://github.com/clojure-emacs/piggieback
+[piggieback]: https://github.com/nrepl/piggieback
 [vim-fireplace]: https://github.com/tpope/vim-fireplace
-[CCW]: https://github.com/laurentpetit/ccw
+[calva]: https://github.com/BetterThanTomorrow/calva
 [cider-nrepl]: https://github.com/clojure-emacs/cider-nrepl
 [clojure-mode]: https://github.com/clojure-emacs/clojure-mode
 [inf-clojure]: https://github.com/clojure-emacs/inf-clojure