From 482ccf2e15eedb9ba9a7f390906fe7aa7d94db3f Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Tue, 22 Jun 2021 15:29:19 +0200 Subject: [PATCH] [#745] Make grammar now has --markdown enabled --- doc/Makefile.am | 10 +++++----- doc/sphinx/grammar/grammar.rst | 12 +++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 75082a078e..582fa186d7 100644 --- 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 931b7fa143..6e8d55894f 100644 --- 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