diff --git a/doc/org-manual.org b/doc/org-manual.org
index 29be225d9..bdef9f61b 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -17573,29 +17573,29 @@ code block header arguments:
 
 Code blocks in the following languages are supported.
 
-| Language   | Identifier | Language       | Identifier |
-|------------+------------+----------------+------------|
-| Asymptote  | asymptote  | Awk            | awk        |
-| C          | C          | C++            | C++        |
-| Clojure    | clojure    | CSS            | css        |
-| D          | d          | ditaa          | ditaa      |
-| Graphviz   | dot        | Emacs Calc     | calc       |
-| Emacs Lisp | emacs-lisp | Fortran        | fortran    |
-| Gnuplot    | gnuplot    | Haskell        | haskell    |
-| Java       | java       | Javascript     | js         |
-| LaTeX      | latex      | Ledger         | ledger     |
-| Lisp       | lisp       | Lilypond       | lilypond   |
-| Lua        | lua        | MATLAB         | matlab     |
-| Mscgen     | mscgen     | Objective Caml | ocaml      |
-| Octave     | octave     | Org mode       | org        |
-| Oz         | oz         | Perl           | perl       |
-| Plantuml   | plantuml   | Processing.js  | processing |
-| Python     | python     | R              | R          |
-| Ruby       | ruby       | Sass           | sass       |
-| Scheme     | scheme     | GNU Screen     | screen     |
-| Sed        | sed        | shell          | sh         |
-| SQL        | sql        | SQLite         | sqlite     |
-| Vala       | vala       |                |            |
+| Language   | Identifier   | Language       | Identifier   |
+|------------+--------------+----------------+--------------|
+| Asymptote  | =asymptote=  | Lua            | =lua=        |
+| Awk        | =awk=        | MATLAB         | =matlab=     |
+| C          | =C=          | Mscgen         | =mscgen=     |
+| C++        | =C++=        | Objective Caml | =ocaml=      |
+| Clojure    | =clojure=    | Octave         | =octave=     |
+| CSS        | =css=        | Org mode       | =org=        |
+| D          | =d=          | Oz             | =oz=         |
+| ditaa      | =ditaa=      | Perl           | =perl=       |
+| Emacs Calc | =calc=       | Plantuml       | =plantuml=   |
+| Emacs Lisp | =emacs-lisp= | Processing.js  | =processing= |
+| Fortran    | =fortran=    | Python         | =python=     |
+| Gnuplot    | =gnuplot=    | R              | =R=          |
+| GNU Screen | =screen=     | Ruby           | =ruby=       |
+| Graphviz   | =dot=        | Sass           | =sass=       |
+| Haskell    | =haskell=    | Scheme         | =scheme=     |
+| Java       | =java=       | Sed            | =sed=        |
+| Javascript | =js=         | shell          | =sh=         |
+| LaTeX      | =latex=      | SQL            | =sql=        |
+| Ledger     | =ledger=     | SQLite         | =sqlite=     |
+| Lilypond   | =lilypond=   | Vala           | =vala=       |
+| Lisp       | =lisp=       |                |              |
 
 Additional documentation for some languages is at
 https://orgmode.org/worg/org-contrib/babel/languages.html.
diff --git a/doc/org.texi b/doc/org.texi
index c160ec750..b2bb0ca96 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -18424,93 +18424,93 @@ file.
 
 Code blocks in the following languages are supported.
 
-@multitable {aaaaaaaaaa} {aaaaaaaaaa} {aaaaaaaaaaaaaa} {aaaaaaaaaa}
+@multitable {aaaaaaaaaa} {aaaaaaaaaaaa} {aaaaaaaaaaaaaa} {aaaaaaaaaaaa}
 @headitem Language
 @tab Identifier
 @tab Language
 @tab Identifier
 @item Asymptote
-@tab asymptote
-@tab Awk
-@tab awk
-@item C
-@tab C
-@tab C++
-@tab C++
-@item Clojure
-@tab clojure
-@tab CSS
-@tab css
-@item D
-@tab d
-@tab ditaa
-@tab ditaa
-@item Graphviz
-@tab dot
-@tab Emacs Calc
-@tab calc
-@item Emacs Lisp
-@tab emacs-lisp
-@tab Fortran
-@tab fortran
-@item Gnuplot
-@tab gnuplot
-@tab Haskell
-@tab haskell
-@item Java
-@tab java
-@tab Javascript
-@tab js
-@item @LaTeX{}
-@tab latex
-@tab Ledger
-@tab ledger
-@item Lisp
-@tab lisp
-@tab Lilypond
-@tab lilypond
-@item Lua
-@tab lua
+@tab @samp{asymptote}
+@tab Lua
+@tab @samp{lua}
+@item Awk
+@tab @samp{awk}
 @tab MATLAB
-@tab matlab
-@item Mscgen
-@tab mscgen
+@tab @samp{matlab}
+@item C
+@tab @samp{C}
+@tab Mscgen
+@tab @samp{mscgen}
+@item C++
+@tab @samp{C++}
 @tab Objective Caml
-@tab ocaml
-@item Octave
-@tab octave
+@tab @samp{ocaml}
+@item Clojure
+@tab @samp{clojure}
+@tab Octave
+@tab @samp{octave}
+@item CSS
+@tab @samp{css}
 @tab Org mode
-@tab org
-@item Oz
-@tab oz
+@tab @samp{org}
+@item D
+@tab @samp{d}
+@tab Oz
+@tab @samp{oz}
+@item ditaa
+@tab @samp{ditaa}
 @tab Perl
-@tab perl
-@item Plantuml
-@tab plantuml
+@tab @samp{perl}
+@item Emacs Calc
+@tab @samp{calc}
+@tab Plantuml
+@tab @samp{plantuml}
+@item Emacs Lisp
+@tab @samp{emacs-lisp}
 @tab Processing.js
-@tab processing
-@item Python
-@tab python
+@tab @samp{processing}
+@item Fortran
+@tab @samp{fortran}
+@tab Python
+@tab @samp{python}
+@item Gnuplot
+@tab @samp{gnuplot}
 @tab R
-@tab R
-@item Ruby
-@tab ruby
+@tab @samp{R}
+@item GNU Screen
+@tab @samp{screen}
+@tab Ruby
+@tab @samp{ruby}
+@item Graphviz
+@tab @samp{dot}
 @tab Sass
-@tab sass
-@item Scheme
-@tab scheme
-@tab GNU Screen
-@tab screen
-@item Sed
-@tab sed
+@tab @samp{sass}
+@item Haskell
+@tab @samp{haskell}
+@tab Scheme
+@tab @samp{scheme}
+@item Java
+@tab @samp{java}
+@tab Sed
+@tab @samp{sed}
+@item Javascript
+@tab @samp{js}
 @tab shell
-@tab sh
-@item SQL
-@tab sql
+@tab @samp{sh}
+@item @LaTeX{}
+@tab @samp{latex}
+@tab SQL
+@tab @samp{sql}
+@item Ledger
+@tab @samp{ledger}
 @tab SQLite
-@tab sqlite
-@item Vala
-@tab vala
+@tab @samp{sqlite}
+@item Lilypond
+@tab @samp{lilypond}
+@tab Vala
+@tab @samp{vala}
+@item Lisp
+@tab @samp{lisp}
 @tab 
 @tab 
 @end multitable