diff --git a/Makefile b/Makefile index 4ec6d04a95..455fa6ed88 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # A simple static wrapper for a number of standard Makefile targets, # mostly just forwarding to build/Makefile. This is provided only for # convenience and supports only a subset of what CMake's Makefile -# to offer. For more, execute that one directly. +# offers. For more, execute that one directly. # BUILD=build diff --git a/NEWS b/NEWS index aca9a820b6..4586410afc 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,7 @@ Bro 2.0 ------- As the version number jump suggests, Bro 2.0 is a major upgrade and -lots of things have changed. We have assembled a separate upprade +lots of things have changed. We have assembled a separate upgrade guide with the most important changes compared to Bro 1.5 at http://www.bro-ids.org/documentation/upgrade.bro.html. You can find the offline version of that document in ``doc/upgrade.rst.``. @@ -32,8 +32,9 @@ final release are: be redefined on the command line, e.g. ``bro -i eth0 snaplen=65535``. - * Reintroduced the BRO_LOG_SUFFIX environment that the ASCII - logger now respects to add a suffix to the log files it creates. + * Reintroduced the BRO_LOG_SUFFIX environment variable that the + ASCII logger now respects to add a suffix to the log files it + creates. * The ASCII logs now include further header information, and fields set to an empty value are now logged as ``(empty)`` by diff --git a/README b/README index 37cee2f333..c837afaf92 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ Bro Network Security Monitor Bro is a powerful framework for network analysis and security monitoring. Please see the INSTALL file for installation instructions -and pointers for getting started. NEWS contains releases notes for the +and pointers for getting started. NEWS contains release notes for the current version, and CHANGES has the complete history of changes. Please see COPYING for licensing information. diff --git a/doc/README b/doc/README index 57d569db84..0ba0a8587f 100644 --- a/doc/README +++ b/doc/README @@ -2,7 +2,7 @@ Documentation ============= -This directory contains Bro documentation in reStructured text format +This directory contains Bro documentation in reStructuredText format (see http://docutils.sourceforge.net/rst.html). It is the root of a Sphinx source tree and can be modified to add more