diff --git a/CHANGES b/CHANGES index f776f2817a..5c6f946c11 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +2.5-332 | 2017-10-27 13:27:16 -0700 + + * Bro docs tweaks for correctness and readability. (Christian Kreibich) + + * Fix use-after-free in Trigger.cc. (Johanna Amann) + 2.5-328 | 2017-10-16 13:13:41 -0700 * Patch OOB write in content-line analyzer. diff --git a/VERSION b/VERSION index a0bdbec59b..3ba7617601 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-328 +2.5-332 diff --git a/doc/_static/broxygen.css b/doc/_static/broxygen.css index 5259c3adfc..ad06b0f9d9 100644 --- a/doc/_static/broxygen.css +++ b/doc/_static/broxygen.css @@ -152,12 +152,10 @@ sup, sub { pre, code { white-space: pre; - overflow: auto; - margin-left: 2em; - margin-right: 2em; - margin-top: .5em; - margin-bottom: 1.5em; - word-wrap: normal; + overflow: auto; + margin-left: 0.25em; + margin-right: 0.25em; + word-wrap: normal; } pre, code, tt { @@ -482,4 +480,4 @@ li { .btest-cmd .code pre, .btest-include .code pre { margin-left: 0px; -} \ No newline at end of file +} diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html index 3df56a12ff..4debd1d90e 100644 --- a/doc/_templates/layout.html +++ b/doc/_templates/layout.html @@ -10,7 +10,7 @@ {% endblock %} {% block header %} - {% endblock %} @@ -108,6 +108,6 @@ {% endblock %} {% block footer %} - {% endblock %}