Merge branch 'master' into libraries

Author: pnathan

ides/emacs-setup.html

@@ -22,23 +22,20 @@ <h3>With Portacle</h3>
 packages SBCL, Emacs25, Slime, Quicklisp and Git altogether. There is no
 installation required, so it's the easiest way to go.
 
-<h3>Install GNU/Emacs</h3>
-
-<p>In order to use emacs, there are two variants; XEmacs and GNU
-Emacs. I usually use GNU emacs, so I&#8217;ll talk about it here.</p>
+<h3>Install GNU Emacs</h3>
 
 <p>In order to get it, you can obtain it from
-the <a href="http://www.gnu.org/software/emacs/">GNU</a>. Windows,
+ <a href="http://www.gnu.org/software/emacs/">its home page</a>. Windows,
 Linux, and OSX versions are available. It&#8217;s also available via
 most Linux distributions package repositories. The most recent version
 is 25; 23 still works well with the Superior Lisp
 Interaction Mode for Emacs, a.k.a SLIME.</p>
 
 <p>New users can find many resources online for Emacs, including a
-well-written help system! An emacs tutorial can be
-found <a href="http://www.gnu.org/software/emacs/manual/html_mono/emacs.html">here</a>,
-and the GNU FAQ is
-also <a href="http://www.gnu.org/software/emacs/emacs-faq.text">available</a></p>
+well-written help system! An emacs tutorial
+ <a href="http://www.gnu.org/software/emacs/manual/html_mono/emacs.html">can be found here</a>,
+and the GNU Emacs FAQ is
+also <a href="http://www.gnu.org/software/emacs/emacs-faq.text">available</a>.</p>
 
 <h2>Get SLIME</h2>