Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'topic/christian/doc-tweaks' of https://github.com/ckreibich/bro

Browse source
This commit is contained in:
Robin Sommer 2017-10-27 13:27:16 -07:00
commit b6e3603481
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -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 2.5-328 | 2017-10-16 13:13:41 -0700
* Patch OOB write in content-line analyzer. * Patch OOB write in content-line analyzer.

2
VERSION
View file

@ -1 +1 @@
2.5-328 2.5-332

6
doc/_static/broxygen.css vendored
View file

@ -153,10 +153,8 @@ sup, sub {
pre, code { pre, code {
white-space: pre; white-space: pre;
overflow: auto; overflow: auto;
margin-left: 2em; margin-left: 0.25em;
margin-right: 2em; margin-right: 0.25em;
margin-top: .5em;
margin-bottom: 1.5em;
word-wrap: normal; word-wrap: normal;
} }

4
doc/_templates/layout.html vendored
View file

@ -10,7 +10,7 @@
{% endblock %} {% endblock %}
{% block header %} {% block header %}
<iframe src="//www.bro.org/frames/header-no-logo.html" width="100%" height="100px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0"> <iframe src="https://www.bro.org/frames/header-no-logo.html" width="100%" height="100px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0">
</iframe> </iframe>
{% endblock %} {% endblock %}
@ -108,6 +108,6 @@
{% endblock %} {% endblock %}
{% block footer %} {% block footer %}
<iframe src="//www.bro.org/frames/footer.html" width="100%" height="420px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0"> <iframe src="https://www.bro.org/frames/footer.html" width="100%" height="420px" frameborder="0" marginheight="0" scrolling="no" marginwidth="0">
</iframe> </iframe>
{% endblock %} {% endblock %}