diff --git a/PythonicGcodeMachine/Gcode/Rs274/Config.py b/PythonicGcodeMachine/Gcode/Rs274/Config.py
index 6dae9f345b6aae12c984517481130cf9043ff8a1..b8ee6a71af6351fad7b5e1e7ea5ed7e2e3b5f173 100644
--- a/PythonicGcodeMachine/Gcode/Rs274/Config.py
+++ b/PythonicGcodeMachine/Gcode/Rs274/Config.py
@@ -343,7 +343,7 @@ class ExecutionOrder(YamlMixin, RstMixin):
             path,
             headers=('Order', 'G-codes', 'Comment'),
             columns=('index', 'gcodes', 'meaning'),
-            str_gcodes=lambda item: ', '.join(item),
+            str_gcodes=lambda item: ' '.join(item),
         )
 
 ####################################################################################################
@@ -411,7 +411,7 @@ class ModalGroups(YamlMixin, RstMixin):
             path,
             headers=('Group', 'G-codes', 'Comment'),
             columns=('index', 'gcodes', 'meaning'),
-            str_gcodes=lambda item: '(' + ', '.join(item) + ')',
+            str_gcodes=lambda item: ' '.join(item),
         )
 
 ####################################################################################################
diff --git a/doc/sphinx/source/gcode-reference/index.rst b/doc/sphinx/source/gcode-reference/index.rst
index b724872550404d853b0c433d69d6cd3eac68ab98..f3e9d209a21ab5bff78366b6b82ac017fbceef5c 100644
--- a/doc/sphinx/source/gcode-reference/index.rst
+++ b/doc/sphinx/source/gcode-reference/index.rst
@@ -1,4 +1,4 @@
-.. include:: abbreviation.txt
+.. include:: ../abbreviation.txt
 
 .. _gcode-reference-page:
 
@@ -7,8 +7,5 @@
 ==================
 
 .. toctree::
-  :maxdepth: 3
-  :numbered:
-
   rs-274/index.rst
 
diff --git a/doc/sphinx/source/gcode-reference/rs-274/index.rst b/doc/sphinx/source/gcode-reference/rs-274/index.rst
index ea4655574e73b0dc2d9b186b21e3a6f5f1cad836..a8e8b8aa579fc0d11f2a3499eaebd1451594e8ac 100644
--- a/doc/sphinx/source/gcode-reference/rs-274/index.rst
+++ b/doc/sphinx/source/gcode-reference/rs-274/index.rst
@@ -1,4 +1,4 @@
-.. include:: abbreviation.txt
+.. include:: ../../abbreviation.txt
 
 .. _rs-274-reference-page:
 
diff --git a/tools/make-api-doc b/tools/make-api-doc
index d8777962cf4bcf604ee0c0285af071a7cd367d21..746d3e4157c5d7ce1ab3a41ffb804cd3d2249ec5 100755
--- a/tools/make-api-doc
+++ b/tools/make-api-doc
@@ -10,6 +10,8 @@ find PythonicGcodeMachine -name "lextab.py" -exec rm {} \;
 api=doc/sphinx/source/api
 rm -rf ${api}
 
+python3 PythonicGcodeMachine/Gcode/Rs274/data/make-rst.py
+
 echo
 echo Generate RST API files
 pyterate-rst-api PythonicGcodeMachine