Merge branch 'master' of orgmode.org:org-mode

doc/orgguide.texi

@@ -1498,7 +1498,7 @@ the resulting time in inserts it after the time range as @samp{=>
 HH:MM}.
 @item C-c C-x C-e
 Update the effort estimate for the current clock task.
-@item C-c C-x C-x
+@item C-c C-x C-q
 Cancel the current clock.  This is useful if a clock was started by
 mistake, or if you ended up working on something else.
 @item C-c C-x C-j

lisp/org-element.el

@@ -2450,7 +2450,7 @@ Assume point is at the beginning of the table."
 
 (defun org-element-table-interpreter (table contents)
   "Interpret TABLE element as Org syntax.
-CONTENTS is nil."
+CONTENTS is a string, if table's type is `org', or nil."
   (if (eq (org-element-property :type table) 'table.el)
       (org-remove-indentation (org-element-property :value table))
     (concat (with-temp-buffer (insert contents)