[#745] Make grammar now has --markdown enabled

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 75082a078e5fe62a72c96e0e4cfde889c3db34b5..582fa186d7bf898da70a12b4c816d0673adfecd4 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -79,11 +79,11 @@ grammar:
 if GENERATE_DOCS
 if GENERATE_PARSER
        mkdir -p $(abs_top_srcdir)/doc/sphinx/grammar
-       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/dhcp4/dhcp4_parser > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-dhcp4-parser.txt
-       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/dhcp6/dhcp6_parser > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-dhcp6-parser.txt
-       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/d2/d2_parser > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-d2-parser.txt
-       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/agent/agent_parser > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-ca-parser.txt
-       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/netconf/netconf_parser > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-netconf-parser.txt
+       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/dhcp4/dhcp4_parser --markdown > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-dhcp4-parser.rst
+       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/dhcp6/dhcp6_parser --markdown > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-dhcp6-parser.rst
+       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/d2/d2_parser --markdown > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-d2-parser.rst
+       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/agent/agent_parser --markdown > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-ca-parser.rst
+       $(abs_top_srcdir)/tools/extract_bnf.sh $(abs_top_srcdir)/src/bin/netconf/netconf_parser --markdown > $(abs_top_srcdir)/doc/sphinx/grammar/grammar-netconf-parser.rst
 else
        @echo "ERROR: You need to enable both docs (--enable-generate-docs) and parser (--enable-generate-parser)"
        @echo "ERROR: to regenerate grammar documentation."

diff --git a/doc/sphinx/grammar/grammar.rst b/doc/sphinx/grammar/grammar.rst
index 931b7fa14399f1e3fc7a4bd1d16cc94b95e55e7c..6e8d55894f53db90748fba0d521c47c27fca7055 100644 (file)
--- a/doc/sphinx/grammar/grammar.rst
+++ b/doc/sphinx/grammar/grammar.rst
@@ -18,26 +18,24 @@ Here's the Backus-Naur form (BNF) https://en.wikipedia.org/wiki/Backus%E2%80%93N
 BNF Grammar for DHCPv4
 ----------------------
 
-```
-.. include:: grammar-dhcp4-parser.txt
-```
+.. include:: grammar-dhcp4-parser.rst
 
 BNF Grammar for DHCPv6
 ----------------------
 
-.. include:: grammar-dhcp6-parser.txt
+.. include:: grammar-dhcp6-parser.rst
 
 BNF Grammar for Control Agent
 -----------------------------
 
-.. include:: grammar-ca-parser.txt
+.. include:: grammar-ca-parser.rst
 
 BNF Grammar for D2 (DHCP-DDNS)
 ------------------------------
 
-.. include:: grammar-d2-parser.txt
+.. include:: grammar-d2-parser.rst
 
 BNF Grammar for Kea-netconf
 ---------------------------
 
-.. include:: grammar-netconf-parser.txt
+.. include:: grammar-netconf-parser.rst