summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2011-03-311-0/+6
|\ | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * preparing for 5.7.10Rainer Gerhards2011-03-291-1/+1
| |
| * enhance: added $BOM system property to ease writing byte order masksRainer Gerhards2011-03-221-0/+6
| |
| * some minor enhancements to doc set -- point to more examplesRainer Gerhards2011-03-171-4/+7
| |
| * preparing for 5.7.9v5.7.9Rainer Gerhards2011-03-161-1/+1
| |
* | some more minor changesRainer Gerhards2011-03-173-7/+9
| |
* | some more slight improvements to the docRainer Gerhards2011-03-172-3/+8
| |
* | somewhat improved documentation indexTom Bergfeld2011-03-174-54/+105
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | preparing for 6.1.6v6.1.6Rainer Gerhards2011-03-141-1/+1
| |
* | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-1/+7
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * preparing for 5.7.8 releasev5.7.8Rainer Gerhards2011-03-091-1/+1
| |
| * Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-081-1/+7
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c
| | * bugfix(kind of): tell users that config graph can currently not be generatedRainer Gerhards2011-03-081-1/+7
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
| | * preparing for 5.6.4v5.6.4Rainer Gerhards2011-03-021-1/+1
| | |
| | * preparing for v5.6.3v5.6.3Rainer Gerhards2011-01-261-1/+1
| | |
| * | preparing for 5.7.7v5.7.7Rainer Gerhards2011-03-021-1/+1
| | |
* | | Merge branch 'v5-beta'Rainer Gerhards2011-02-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | preparing for 5.7.6v5.7.6Rainer Gerhards2011-02-251-1/+1
| | |
| * | preparing for 5.7.5 releaseRainer Gerhards2011-02-231-1/+1
| | |
* | | Merge branch 'v5-beta'Rainer Gerhards2011-02-181-1/+4
|\| | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c
| * | enhance: imfile did not yet support multiple rulesets, now addedRainer Gerhards2011-02-181-1/+4
| | | | | | | | | | | | | | | | | | we do this directly in the beta because a) it does not affect existing functionality and b) one may argue that this missing functionality is close to a bug.
| * | preparing for 5.7.4 releasev5.7.4Rainer Gerhards2011-02-171-1/+1
| | |
* | | preparing for 6.1.4 releasev6.1.4Rainer Gerhards2011-02-181-1/+1
| | |
* | | Merge branch 'v5-beta'Rainer Gerhards2011-02-111-1/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | preparing for 5.7.3v5.7.3Rainer Gerhards2011-02-041-1/+1
| | |
| * | removed invalid link from docRainer Gerhards2011-02-041-1/+0
| | |
* | | preparing for 6.1.3v6.1.3Rainer Gerhards2011-02-011-1/+1
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2011-02-012-0/+17
|\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c
| * | added doc for new ommysql directivesAriel P2011-02-011-0/+12
| | |
| * | enhanced imfile to support multi-line messagesDavid Lang2011-01-251-0/+5
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | cleanup of imptcp; doc added; config statement for workers addedRainer Gerhards2011-01-311-0/+5
| | |
* | | doc: minor typo fixRainer Gerhards2010-12-171-1/+1
| | |
* | | added minimal doc for new imudp config statementsRainer Gerhards2010-12-171-0/+6
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2010-12-172-2/+8
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * | Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-171-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
| | * | added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect
| | * | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
| | * | | preparing for 4.7.3Rainer Gerhards2010-11-251-1/+1
| | | | |
| | * | | doc/imfile: fixed small but important typoRainer Gerhards2010-10-201-1/+1
| | | | |
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-171-2/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-161-2/+2
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
| | | * | typo fix (thanks to Björn Påhlsson for finding it!)Michael Biebl2010-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | preparing for 5.6.2v5.6.2Rainer Gerhards2010-11-301-1/+1
| | | | |
* | | | | preparing for 6.1.2 releasev6.1.2Rainer Gerhards2010-12-163-1/+58
| | | | |
* | | | | Merge branch 'lognorm' + some doc addedRainer Gerhards2010-12-133-2/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | milestone: added support for CEE-variables to RainerScriptRainer Gerhards2010-12-031-1/+52
| | | | | |
| * | | | | milestone: added support for CEE-properties in property-based filtersRainer Gerhards2010-12-011-0/+7
|/ / / / /
* | | | | Merge branch 'v5-devel'v6.1.1Rainer Gerhards2010-11-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | bumped version to 5.7.2v5.7.2Rainer Gerhards2010-11-301-1/+1
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-11-251-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h