summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2011-12-162-0/+44
|\
| * Merge branch 'v5-stable' into betaRainer Gerhards2011-12-162-0/+44
| |\
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-162-0/+44
| | |\
| | | * added doc for omprogRainer Gerhards2011-12-162-0/+44
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2011-12-122-4/+5
|\| | |
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-3/+2
| |\| |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-11-031-3/+2
| | |\|
| | | * doc bugfix: typo in imgssapi docRainer Gerhards2011-11-031-3/+2
| | | |
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-251-1/+3
| |\| |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-251-1/+3
| | |\|
| | | * doc: imfile: clarified that empty lines are not processedRainer Gerhards2011-10-251-1/+3
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2011-10-273-29/+59
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-2/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html
| * | | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-212-25/+68
| | | | | | | | | | | | | | | | | | | | see v6 compatibility document for reasons
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-212-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-212-5/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | | preparing for 5.8.6 releasev5.8.6Rainer Gerhards2011-10-211-1/+1
| | | |/ / | | |/| |
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-202-5/+5
| | |\ \ \ | | | | |/ | | | |/|
| | | * | doc bugfix: pri-text neees to be fixed in an article as wellRainer Gerhards2011-10-201-3/+3
| | | | |
| | | * | doc bug: property pri-text was incorrectly describedRainer Gerhards2011-10-201-2/+2
| | | | |
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-171-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | preparing for 5.9.3 releasev5.9.3Rainer Gerhards2011-08-311-1/+1
| | | | |
| * | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
* | \ \ \ \ Merge branch 'beta'Rainer Gerhards2011-10-171-0/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-171-0/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-171-0/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | doc: clarified that imklog does not support SolarisRainer Gerhards2011-10-171-0/+2
| | | | | |
| | | * | | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-0714-22/+348
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html
| | | | * | | preparing for 4.7.5 releasev4.7.5Rainer Gerhards2011-08-311-1/+1
| | | | | | |
| | | | * | | preparing for 4.7.4v4.7.4Rainer Gerhards2011-07-111-1/+1
| | | | | | |
| | | | * | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-0/+19
| | | | | | |
| | | | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-114-10/+17
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | | * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-0/+1
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| | | * | | | | | preparing for 4.6.8 releasev4.6.8Rainer Gerhards2011-08-311-1/+1
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | preparing for 5.8.5 releasev5.8.5Rainer Gerhards2011-08-311-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | preparing for 6.1.12 releasev6.1.12Rainer Gerhards2011-08-311-1/+1
| | | | | | |
* | | | | | | preparing for 6.3.6 releasev6.3.6Rainer Gerhards2011-09-191-1/+2
| | | | | | |
* | | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-081-3/+6
| | | | | | |
* | | | | | | preparing for 6.3.5 releaseRainer Gerhards2011-08-311-1/+1
| | | | | | |
* | | | | | | Merge branch 'beta'Andre Lorbach2011-08-181-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | | minor doc: made body tag parsable for web site scriptsRainer Gerhards2011-08-121-2/+2
| | | | | | |
| | * | | | | preparing for version 5.8.4v5.8.4root2011-08-101-1/+1
| | | | | | |
| * | | | | | preparing for 6.1.11v6.1.11Rainer Gerhards2011-07-111-1/+1
| | | | | | |
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-114-6/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
* | | | | | | preparing for 6.3.4 releasev6.3.4Rainer Gerhards2011-08-021-1/+1
| | | | | | |
* | | | | | | milestone: queue-params are properly initialized for action queuesRainer Gerhards2011-08-011-0/+4
| | | | | | |
* | | | | | | milestone: queue object now has a param handler for new conf interfaceRainer Gerhards2011-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues)
* | | | | | | need to handle legacy-legacy omusrmsg format stricterRainer Gerhards2011-07-221-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, the grammar for if-constructs was broken
* | | | | | | milestone: omfile basically gets its parameters via the new systemRainer Gerhards2011-07-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work).