Merge remote branch 'upstream/master'

starter-kit-gnus-imap.org

@@ -77,11 +77,11 @@ and make sure that no-one else can read it with
 #+end_src
 
 * sending mail
-/Requirement/: gnus uses the [[http://en.wikipedia.org/wiki/STARTTLS][starttls]] tool for encrypted sending of
+/Requirement/: gnus uses the [[http://www.gnu.org/software/gnutls/][gnutls]] tool for encrypted sending of
 email to the Gmail SMTP server.  This is easily installed on modern
 Debian (including Ubuntu) systems with
 #+begin_src sh
-  apt-get install starttls
+  apt-get install gnutls-bin
 #+end_src
 
 The following configures gnus to use the Gmail SMTP server for sending
@@ -92,7 +92,8 @@ email.
         smtpmail-auth-credentials '(("smtp.gmail.com" 587 "your-name@gmail.com" nil))
         smtpmail-default-smtp-server "smtp.gmail.com"
         smtpmail-smtp-server "smtp.gmail.com"
-        smtpmail-smtp-service 587)
+        smtpmail-smtp-service 587
+        starttls-use-gnutls t)
 #+end_src
 
 If you don't want to be prompted for a password on every mail sent,

starter-kit-org.org

@@ -261,6 +261,7 @@ This code defines the =starter-kit-project= which is used to publish
 the documentation for the Starter Kit to html.
 
 #+begin_src emacs-lisp :results silent
+  (setq org-export-htmlize-output-type 'css)
   (unless (boundp 'org-publish-project-alist)
     (setq org-publish-project-alist nil))
   (let ((this-dir (file-name-directory (or load-file-name buffer-file-name))))
@@ -271,6 +272,7 @@ the documentation for the Starter Kit to html.
                    :style "<link rel=\"stylesheet\" href=\"emacs.css\" type=\"text/css\"/>"
                    :publishing-directory ,this-dir
                    :index-filename "starter-kit.org"
-                   :auto-postamble nil)))
+                   :auto-postamble nil
+                   :postamble nil)))
 #+end_src
 

starter-kit.org

@@ -67,7 +67,7 @@ The [[http://emacswiki.org][Emacs Wiki]] is also very handy.
    cd src/org/
    make
    #+end_src
-6. build [[http://www.gnu.org/software/auctex/][auctex]] -- for instilllation help see the [[http://www.gnu.org/software/auctex/manual/auctex/Installation.html#Installation][auctex instillation
+6. build [[http://www.gnu.org/software/auctex/][auctex]] -- for installation help see the [[http://www.gnu.org/software/auctex/manual/auctex/Installation.html#Installation][auctex installation
    instructions]], auctex requires a working TeX installation
 
    #+begin_src sh
@@ -677,7 +677,7 @@ Frequently asked questions.
 
 Please share anything that you have come across which you think could
 be helpful, either in the form of a pull request, a patch, or just an
-email to me http://github.com/eschulte.
+email to me at =schulte.eric= /at/ =gmail.com=.
 
 ** How do I use the starter kit without compiling org-mode?
 :PROPERTIES: