diff --git a/README_maintainer b/README_maintainer
index 76a039109..c76758742 100644
--- a/README_maintainer
+++ b/README_maintainer
@@ -1,8 +1,7 @@
-
 # -*- mode:org -*-
 
 #+title: Maintainer tasks
-#+startup: indent
+#+startup: noindent
 
 This document describes the tasks the Org-mode maintainer has to do
 and how they are performed.
@@ -61,7 +60,7 @@ marked on the patchwork server as "changes requested".
 
 : pw update -s "Changed Requested" -m "What to change" NNN
 
-This will sand an email to the contributor and the mailing list with a
+This will send an email to the contributor and the mailing list with a
 request for changes.  The =-m= message should not be more than one
 sentence and describe the requested changes.  If you need to explain
 in more detail, write a separate email to the contributor.
@@ -82,7 +81,7 @@ the HEAD state in the branch =t/patchNNN=.  To merge, do this:
 
 : pw merge -m "maintainer comment" NNN
 
-This will merge than patch into master, switch back to master and send
+This will merge the patch into master, switch back to master and send
 an email to both contributor and mailing list stating that this change
 has been accepted, along with the comment given in the =-m= message.
 
@@ -121,7 +120,7 @@ The release number for minor releases look like this:  =7.13.01=
 Minor releases are small amends to main releases.  Usually they fix
 bugs discovered in a main release.  Only the fix to the bug is
 bundled into a release, without the main development work going on in
-the master branch.  Since the big fix will also be needed in the
+the master branch.  Since the bug fix will also be needed in the
 master branch, usually the fix is made in master and then
 cherry-picked into maint.  When this is done, a release is made from
 maint with this command:
@@ -145,7 +144,7 @@ change only this file, use =--only=.
 
 This is still a significant headache.  Some hand work is needed here.
 
-Emacs uses bzr, and while I see all the advantages thiswould have, I
+Emacs uses bzr, and while I see all the advantages this would have, I
 cannot bring myself to switch away from git for my day-to-day work.
 So the way I have been doing things with Emacs is this:
 
diff --git a/doc/org.texi b/doc/org.texi
index 0e2a6f321..bef8fa3a5 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -9327,7 +9327,7 @@ These options take effect in both the HTML and La@TeX{} export, except for
 @code{TeX} and @code{LaTeX}, which are respectively @code{t} and @code{nil}
 for the La@TeX{} export.  The default values for these and many other options
 are given by a set of variables.  For a list of such variables, the
-corresponding OPTIONS keys and also the publishing keys (pxref{Project
+corresponding OPTIONS keys and also the publishing keys (@pxref{Project
 alist}), see the constant @code{org-export-plist-vars}.
 
 When exporting only a single subtree by selecting it with @kbd{C-c @@} before
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index cdc7a6250..c0ca653e9 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -57,9 +57,9 @@
   "Replace newline character with ellipses.
 If STRING ends in a newline character, then remove the newline
 character and replace it with ellipses."
-  (if (and (stringp string) (string-match "[\n\r]" string))
-      (concat (substring string 0 (match-beginning 0)) "...")
-    string))
+  (if (and (stringp string) (string-match "[\n\r]\\(.\\)?" string))
+      (concat (substring string 0 (match-beginning 0))
+	      (if (match-string 1 string) "...")) string))
 
 (defmacro sbe (source-block &rest variables)
   "Return the results of calling SOURCE-BLOCK with VARIABLES.