diff options
| -rw-r--r-- | doc/developer/conf.py | 7 | ||||
| -rw-r--r-- | doc/requirements.txt | 1 | ||||
| -rw-r--r-- | doc/user/conf.py | 17 | ||||
| -rw-r--r-- | lib/command.c | 2 |
4 files changed, 16 insertions, 11 deletions
diff --git a/doc/developer/conf.py b/doc/developer/conf.py index 20265f4aad..8f282c0790 100644 --- a/doc/developer/conf.py +++ b/doc/developer/conf.py @@ -395,8 +395,11 @@ def setup(app): # printfrr extensions app.add_object_type("frrfmt", "frrfmt", parse_node=parse_frrfmt) - # css overrides for HTML theme - app.add_stylesheet("overrides.css") + if "add_css_file" in dir(app): + app.add_css_file("overrides.css") + else: + app.add_stylesheet("overrides.css") + # load Pygments lexer for FRR config syntax # # NB: in Pygments 2.2+ this can be done with `load_lexer_from_file`, but we diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 0000000000..debc7f1889 --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1 @@ +sphinx==4.0.2 diff --git a/doc/user/conf.py b/doc/user/conf.py index e0aec40443..6db58b07c3 100644 --- a/doc/user/conf.py +++ b/doc/user/conf.py @@ -386,16 +386,17 @@ def setup(app): # node later on app.add_object_type("clicmd", "clicmd", indextemplate="pair: %s; configuration command") - # css overrides for HTML theme - # Note sphinx version differences - sver = vparse(sphinx.__version__) - - if sver < vparse("1.8.0"): - app.add_stylesheet("overrides.css") - app.add_javascript("overrides.js") + # I dont care how stupid this is + if "add_js_file" in dir(app): + app.add_js_file("overrides.js") else: + app.add_javascript("overrides.js") + + if "add_css_file" in dir(app): app.add_css_file("overrides.css") - app.add_js_file("overrides.js") + else: + app.add_stylesheet("overrides.css") + # load Pygments lexer for FRR config syntax # diff --git a/lib/command.c b/lib/command.c index 008f98a34c..a19d392f38 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1496,7 +1496,7 @@ static void permute(struct graph_node *start, struct vty *vty) static void print_cmd(struct vty *vty, const char *cmd) { int i, j, len = strlen(cmd); - char buf[len]; + char buf[len + 1]; bool skip = false; j = 0; |