Merge remote-tracking branch 'origin/master' into topic/bernhard/input

This commit is contained in:
Bernhard Amann 2011-11-21 15:21:20 -08:00
commit bfe90199bd
16 changed files with 474 additions and 44 deletions

View file

@ -15,6 +15,16 @@ these comments are transferred directly into the auto-generated
.. tip:: You can embed directives and roles within ``##``-stylized comments.
There's also a custom role to reference any identifier node in
the Bro Sphinx domain that's good for "see alsos", e.g.
See also: :bro:see:`Example::a_var`, :bro:see:`Example::ONE`,
:bro:see:`SSH::Info`
And a custom directive does the equivalent references:
.. bro:see:: Example::a_var Example::ONE SSH::Info
:Imports: :doc:`policy/frameworks/software/vulnerable </scripts/policy/frameworks/software/vulnerable>`
Summary