Begin new beta branch

Merge branch 'master' into beta

Conflicts:
	ChangeLog
	tests/Makefile.am

1 files changed, 6 insertions, 5 deletions

diff --git a/doc/omoracle.html b/doc/omoracle.html
index cfcf277f..2bb6aa5d 100644
--- a/doc/omoracle.html
+++ b/doc/omoracle.html
@@ -13,10 +13,11 @@
 <p><b>Available since: </b>: 4.3.0
 <p><b>Status: </b>: contributed module, not maitained by rsyslog  core authors
 <p><b>Description</b>:</p>
-<p>This module provides native support for logging to Oracle databases. It offers
-superior performance over the more generic <a href="omlibdbi.html">omlibdbi</a> module.
-It also includes a number of enhancements, most importantly prepared statements and
-batching, what provides a big performance improvements.
+<p>This module provides native support for logging to Oracle
+databases. It offers superior performance over the more
+generic <a href="omlibdbi.html">omlibdbi</a> module.  It also includes
+a number of enhancements, most importantly prepared statements and
+batching, what provides a big performance improvement.
 </p>
 <p>Note that this module is maintained by its original author. If you need assistance with it,
 it is suggested to post questions to the
@@ -63,7 +64,7 @@ it is suggested to post questions to the
     $OmoracleStatement \
         insert into foo(hostname,message)values(:host,:message)
 
-    Also note that identifiers to placeholders are arbitrarry. You
+    Also note that identifiers to placeholders are arbitrary. You
     need to define the properties on the template in the correct order
     you want them passed to the statement!
 </pre>