Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Fix minor typos in the documentation
  Fix compiler warning about Brofiler ctor init list order.
This commit is contained in:
Robin Sommer 2012-02-10 00:02:35 -08:00
commit 357cdd3f8d
5 changed files with 33 additions and 24 deletions

View file

@ -601,10 +601,10 @@ function add_signature_file(sold: string, snew: string): string
}
## Signature files to read. Use ``redef signature_files += "foo.sig"`` to
## extend. Signature files will be searched relative to ``BRO_PATH``.
## extend. Signature files will be searched relative to ``BROPATH``.
global signature_files = "" &add_func = add_signature_file;
## ``p0f`` fingerprint file to use. Will be searched relative to ``BRO_PATH``.
## ``p0f`` fingerprint file to use. Will be searched relative to ``BROPATH``.
const passive_fingerprint_file = "base/misc/p0f.fp" &redef;
# todo::testing to see if I can remove these without causing problems.