fixed merge of changes from smartd.conf.5.in 1.78

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@2337 4ea69e1a-61f1-4043-bf83-b5c94c648137

sm5/smartd.8.in

 .ig
 Copyright (C) 2002-6 Bruce Allen <smartmontools-support@lists.sourceforge.net>
  
-$Id: smartd.8.in,v 1.111 2006/11/30 16:15:19 dpgilbert Exp $
+$Id: smartd.8.in,v 1.112 2006/12/13 13:51:34 chrfranke Exp $
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -629,7 +629,7 @@ directives can be used for these disks (but see note below).
 .B \-d TYPE
 Specifies the type of the device.  This Directive may be used multiple
 times for one device, but the arguments \fIata\fP, \fIscsi\fP, \fIsat\fP,
-\fImarvell\fP, \fIcciss\fP and \fI3ware,N\fP are mutually-exclusive. If more
+\fImarvell\fP, \fIcciss,N\fP and \fI3ware,N\fP are mutually-exclusive. If more
 than one is given then \fBsmartd\fP will use the last one which appears.
 
 If none of these three arguments is given, then \fBsmartd\fP will
@@ -1949,4 +1949,4 @@ smartmontools home page at \fBhttp://smartmontools.sourceforge.net/#references\f
 
 .SH
 CVS ID OF THIS PAGE:
-$Id: smartd.8.in,v 1.111 2006/11/30 16:15:19 dpgilbert Exp $
+$Id: smartd.8.in,v 1.112 2006/12/13 13:51:34 chrfranke Exp $