summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-05 15:33:18 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-05 15:33:18 +0100
commitddf09f54e1fe331dc8d957d4a1de6b65f288938e (patch)
tree77699328c63478af573cca6a71cdd7516e63ca17
parent8149d06f97d94ec2ae1f3fe117a775f8dcd7ef75 (diff)
downloadrsyslog-ddf09f54e1fe331dc8d957d4a1de6b65f288938e.tar.gz
rsyslog-ddf09f54e1fe331dc8d957d4a1de6b65f288938e.tar.xz
rsyslog-ddf09f54e1fe331dc8d957d4a1de6b65f288938e.zip
preparing for 5.5.2v5.5.2
-rw-r--r--ChangeLog2
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/manual.html2
-rw-r--r--tests/Makefile.am2
4 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9884fcd5..8816f3ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 5.5.2 [DEVEL] (rgerhards), 2009-11-??
+Version 5.5.2 [DEVEL] (rgerhards), 2010-02-05
- applied patches that make rsyslog compile under Apple OS X.
Thanks to trey for providing these.
- replaced data type "bool" by "sbool" because this created some
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 30f5771a..74d7fb2a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -65,6 +65,7 @@ html_files = \
rsconf1_actionresumeinterval.html \
rsconf1_allowedsender.html \
rsconf1_controlcharacterescapeprefix.html \
+ rsconf1_escape8bitcharsonreceive.html \
rsconf1_debugprintcfsyslinehandlerlist.html \
rsconf1_debugprintmodulelist.html \
rsconf1_debugprinttemplatelist.html \
@@ -74,7 +75,6 @@ html_files = \
rsconf1_dropmsgswithmaliciousdnsptrrecords.html \
rsconf1_droptrailinglfonreception.html \
rsconf1_dynafilecachesize.html \
- rsconf1_escape8bitcharactersonreceive.html \
rsconf1_escapecontrolcharactersonreceive.html \
rsconf1_failonchownfailure.html \
rsconf1_filecreatemode.html \
diff --git a/doc/manual.html b/doc/manual.html
index c672af58..6fa4f3a8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 5.5.1 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.5.2 (devel branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3a59f64d..a3f05068 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -98,7 +98,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/subsecond.conf \
testsuites/master.subsecond \
testsuites/parse_8bit_escape.conf \
- testsuites/8bit.parse_8bit_escape.conf \
+ testsuites/8bit.parse_8bit_escape \
testsuites/parse1.conf \
testsuites/field1.conf \
testsuites/1.parse1 \