Merge remote-tracking branch 'origin/master' into topic/dnthayer/doc-fixes-for-2.3

Conflicts:
	doc/scripting/index.rst
This commit is contained in:
Daniel Thayer 2014-06-11 23:20:31 -05:00
commit 690ea30798
17 changed files with 241 additions and 18 deletions

View file

@ -1172,7 +1172,7 @@ from the connection relative to the behavior that has been observed by
Bro.
.. btest-include:: ${BRO_SRC_ROOT}/scripts/policy/protocols/ssl/expiring-certs.bro
:lines: 61-64
:lines: 64-68
In the :doc:`/scripts/policy/protocols/ssl/expiring-certs.bro` script
which identifies when SSL certificates are set to expire and raises