components/rsyslog/patches/tools-rsyslog.conf.patch
changeset 847 4ae04177ffa1
equal deleted inserted replaced
846:fe258446a1ae 847:4ae04177ffa1
       
     1 --- rsyslog/tools/rsyslog.conf.5	Thu Dec  1 02:26:19 2011
       
     2 +++ rsyslog/tools/rsyslog.conf.5	Fri May 25 11:09:56 2012
       
     3 @@ -17,27 +17,23 @@
       
     4  .\" along with this program; if not, write to the Free Software
       
     5  .\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
       
     6  .\"
       
     7 -.TH RSYSLOG.CONF 5 "11 July 2008" "Version 3.18.0" "Linux System Administration"
       
     8 +.TH RSYSLOG.CONF 4 "16 May 2012" "Version 6.2.0" "File Formats"
       
     9  .SH NAME
       
    10 -rsyslog.conf \- rsyslogd(8) configuration file
       
    11 +rsyslog.conf \- rsyslogd(1M) configuration file
       
    12  .SH DESCRIPTION
       
    13  The
       
    14  .I rsyslog.conf
       
    15  file is the main configuration file for the
       
    16 -.BR rsyslogd (8)
       
    17 +.BR rsyslogd (1M)
       
    18  which logs system messages on *nix systems.  This file specifies rules
       
    19  for logging.  For special features see the
       
    20 -.BR rsyslogd (8)
       
    21 -manpage. Rsyslog.conf is backward-compatible with sysklogd's syslog.conf file. So if you migrate
       
    22 -from sysklogd you can rename it and it should work.
       
    23 +.BR rsyslogd (1M)
       
    24 +manpage.
       
    25  
       
    26 -.B Note that this version of rsyslog ships with extensive documentation in html format.
       
    27 -This is provided in the ./doc subdirectory and probably
       
    28 -in a separate package if you installed rsyslog via a packaging system.
       
    29  To use rsyslog's advanced features, you
       
    30  .B need
       
    31 -to look at the html documentation, because the man pages only cover
       
    32 -basic aspects of operation.
       
    33 +to look at the online documentation at http://www.rsyslog.com/doc,
       
    34 +because the man pages only cover basic aspects of operation.
       
    35  
       
    36  
       
    37  .SH MODULES
       
    38 @@ -184,7 +180,7 @@
       
    39  priority and higher are logged according to the given action. Rsyslogd behaves
       
    40  the same, but has some extensions.
       
    41  
       
    42 -In addition to the above mentioned names the rsyslogd(8) understands the
       
    43 +In addition to the above mentioned names the rsyslogd(1M) understands the
       
    44  following extensions: An asterisk ('*') stands for all facilities or all
       
    45  priorities, depending on where it is used (before or after the period). The
       
    46  keyword none stands for no priority of the given facility.
       
    47 @@ -231,10 +227,10 @@
       
    48  .RE
       
    49  
       
    50  .SS Named pipes
       
    51 -This version of rsyslogd(8) has support for logging output to named pipes (fifos). A fifo or 
       
    52 +This version of rsyslogd(1M) has support for logging output to named pipes (fifos). A fifo or 
       
    53  named pipe can be used as a destination for log messages by prepending a pipe symbol ('|') 
       
    54  to the name of the file. This is handy for debugging. Note that the fifo must be created with 
       
    55 -the mkfifo(1) command before rsyslogd(8) is started.
       
    56 +the mkfifo(1) command before rsyslogd(1M) is started.
       
    57  
       
    58  .SS Terminal and console
       
    59  If the file you specified is a tty, special tty-handling is done, same with /dev/console.
       
    60 @@ -426,7 +422,8 @@
       
    61  
       
    62  Properties can be accessed by the property replacer (see there for details).
       
    63  
       
    64 -.B Please note that templates can also by used to generate selector lines with dynamic file names.
       
    65 +.B Please note
       
    66 +that templates can also be used to generate selector lines with dynamic file names.
       
    67  For example, if you would like to split syslog messages from different hosts 
       
    68  to different files (one per host), you can define the following template:
       
    69  
       
    70 @@ -472,7 +469,8 @@
       
    71  that several vendors have violated the sql standard and introduced their own 
       
    72  escape methods, it is impossible to have a single option doing all the work.  
       
    73  So you yourself must make sure you are using the right format.
       
    74 -.B If you choose the wrong one, you are still vulnerable to sql injection.
       
    75 +.B If you choose the wrong one,
       
    76 +you are still vulnerable to sql injection.
       
    77  
       
    78  Please note that the database writer *checks* that the sql option is present 
       
    79  in the template. If it is not present, the write database action is disabled. 
       
    80 @@ -758,9 +756,9 @@
       
    81  .B rsyslogd
       
    82  
       
    83  .SH SEE ALSO
       
    84 -.BR rsyslogd (8),
       
    85 +.BR rsyslogd (1M),
       
    86  .BR logger (1),
       
    87 -.BR syslog (3)
       
    88 +.BR syslog (3C)
       
    89  
       
    90  The complete documentation can be found in the doc folder of the rsyslog distribution or online at
       
    91