Merge branch 'upstream' of git.debian.org:/git/collab-maint/smartmontools into upstream

[mirror_smartmontools-debian.git] / smartctl.8.in

diff --git a/smartctl.8.in b/smartctl.8.in
index 943b6221d7b045730947d156903af031a0285a34..6ad026966133f23226f1d0f03aacc238c80296a6 100644 (file)
--- a/smartctl.8.in
+++ b/smartctl.8.in
@@ -1,8 +1,14 @@
 .ig
 Copyright (C) 2002-10 Bruce Allen
+<<<<<<< HEAD
 Copyright (C) 2004-16 Christian Franke
 
 $Id: smartctl.8.in 4311 2016-04-27 21:03:01Z chrfranke $
+=======
+Copyright (C) 2004-15 Christian Franke
+
+$Id: smartctl.8.in 4099 2015-05-30 17:32:13Z chrfranke $
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 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
@@ -134,6 +140,7 @@ scsi controller "\\\\.\\Scsi[0\-9]:".
 
 For SATA or SAS disks behind an Areca controller use
 \fB"/dev/arcmsr[0\-9]"\fP, see \'\-d areca,N[/E]\' below.
+<<<<<<< HEAD
 
 [NEW EXPERIMENTAL SMARTCTL FEATURE]
 Use the forms \fB"/dev/nvme[0\-9]"\fP (broadcast namespace) or
@@ -141,6 +148,8 @@ Use the forms \fB"/dev/nvme[0\-9]"\fP (broadcast namespace) or
 second, ..., NVMe device.
 Alternatively use the forms \fB"/dev/nvmes[0\-9][n[1\-9]]"\fP for NVMe devices
 behind the logical scsi controller "\\\\.\\Scsi[0\-9]:".
+=======
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 The prefix \fB"/dev/"\fP is optional.
 .\" %ENDIF OS Windows Cygwin
@@ -995,6 +1004,7 @@ Please note that the TapeAlert log page flags are cleared for the initiator
 when the page is read.
 This means that each alert condition is reported only once by \fBsmartctl\fP
 for each initiator for each activation of the condition.
+<<<<<<< HEAD
 .\" %IF OS FreeBSD Linux Windows Cygwin
 
 [NVMe] [FreeBSD, Linux, Windows and Cygwin only]
@@ -1002,6 +1012,8 @@ for each initiator for each activation of the condition.
 NVMe status is obtained by reading the "Critical Warning" byte from
 the SMART/Health Information log.
 .\" %ENDIF OS FreeBSD Linux Windows Cygwin
+=======
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 .TP
 .B \-c, \-\-capabilities
 [ATA] Prints only the generic SMART capabilities.  These
@@ -2104,6 +2116,19 @@ browser.
 .SH EXAMPLES
 .nf
 .B smartctl \-a /dev/sda
+<<<<<<< HEAD
+.fi
+Print a large amount of SMART information for drive /dev/sda .
+.PP
+.nf
+.B smartctl \-s off /dev/sdd
+.fi
+Disable SMART monitoring and data log collection on drive /dev/sdd .
+.PP
+.nf
+.B smartctl \-\-smart=on \-\-offlineauto=on \-\-saveauto=on /dev/sda
+.fi
+=======
 .fi
 Print a large amount of SMART information for drive /dev/sda .
 .PP
@@ -2115,6 +2140,7 @@ Disable SMART monitoring and data log collection on drive /dev/sdd .
 .nf
 .B smartctl \-\-smart=on \-\-offlineauto=on \-\-saveauto=on /dev/sda
 .fi
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 Enable SMART on drive /dev/sda, enable automatic offline
 testing every four hours, and enable autosaving of
 SMART Attributes.  This is a good start-up line for your system\'s
@@ -2358,4 +2384,8 @@ Links to these and other documents may be found on the Links page of the
 .SH PACKAGE VERSION
 CURRENT_SVN_VERSION CURRENT_SVN_DATE CURRENT_SVN_REV
 .br
+<<<<<<< HEAD
 $Id: smartctl.8.in 4311 2016-04-27 21:03:01Z chrfranke $
+=======
+$Id: smartctl.8.in 4099 2015-05-30 17:32:13Z chrfranke $
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74