Merge branch 'maint'

lisp/org.el

@@ -1839,7 +1839,7 @@ links in Org buffers can have an optional tag after a double colon, e.g.,
 
      [[linkkey:tag][description]]
 
-The `linkkey' must be a word word, starting with a letter, followed
+The `linkkey' must be a single word, starting with a letter, followed
 by letters, numbers, `-' or `_'.
 
 If REPLACE is a string, the tag will simply be appended to create the link.

lisp/ox-html.el

@@ -2629,7 +2629,7 @@ CONTENTS is nil.  INFO is a plist holding contextual information."
 CONTENTS holds the contents of the item.  INFO is a plist holding
 contextual information."
   (let ((lang (org-element-property :language inline-src-block))
-	(code (org-html-format-code inline-src-block info))
+	(code (org-element-property :value inline-src-block))
 	(label
 	 (let ((lbl (and (org-element-property :name inline-src-block)
 			 (org-export-get-reference inline-src-block info))))