From 93ac6ce3bf732759c46eceeea00dce632ec5a4c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= <jpandre@users.sourceforge.net>
Date: Mon, 18 Jun 2012 12:46:21 +0200
Subject: [PATCH] Removed the suggestions to use option remove_hiberfile

The suggestion to use option remove_hiberfile was displayed in the
standard help and when a volume is found dirty. As this option may
lead to loss of data, only mention it in the manual, with a proper
warning.
---
 libntfs-3g/volume.c | 7 +------
 src/lowntfs-3g.c    | 2 +-
 src/ntfs-3g.c       | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libntfs-3g/volume.c b/libntfs-3g/volume.c
index 4713fbd5..389acee4 100644
--- a/libntfs-3g/volume.c
+++ b/libntfs-3g/volume.c
@@ -94,12 +94,7 @@ static const char *corrupt_volume_msg =
 
 static const char *hibernated_volume_msg =
 "The NTFS partition is hibernated. Please resume and shutdown Windows\n"
-"properly, or mount the volume read-only with the 'ro' mount option, or\n"
-"mount the volume read-write with the 'remove_hiberfile' mount option.\n"
-"For example type on the command line:\n"
-"\n"
-"            mount -t ntfs-3g -o remove_hiberfile %s %s\n"
-"\n";
+"properly, or mount the volume read-only with the 'ro' mount option.\n";
 
 static const char *unclean_journal_msg =
 "Write access is denied because the disk wasn't safely powered\n"
diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
index 426499f0..7a80e36b 100644
--- a/src/lowntfs-3g.c
+++ b/src/lowntfs-3g.c
@@ -219,7 +219,7 @@ static const char *usage_msg =
 "\n"
 "Usage:    %s [-o option[,...]] <device|image_file> <mount_point>\n"
 "\n"
-"Options:  ro (read-only mount), remove_hiberfile, uid=, gid=,\n" 
+"Options:  ro (read-only mount), windows_names, uid=, gid=,\n" 
 "          umask=, fmask=, dmask=, streams_interface=.\n"
 "          Please see the details in the manual (type: man ntfs-3g).\n"
 "\n"
diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
index 0868ccc3..1418bb83 100644
--- a/src/ntfs-3g.c
+++ b/src/ntfs-3g.c
@@ -173,7 +173,7 @@ static const char *usage_msg =
 "\n"
 "Usage:    %s [-o option[,...]] <device|image_file> <mount_point>\n"
 "\n"
-"Options:  ro (read-only mount), remove_hiberfile, uid=, gid=,\n" 
+"Options:  ro (read-only mount), windows_names, uid=, gid=,\n" 
 "          umask=, fmask=, dmask=, streams_interface=.\n"
 "          Please see the details in the manual (type: man ntfs-3g).\n"
 "\n"