From 5260cf0b5649fc25b9d69a97f9604a3be257e13e Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 17 Apr 2016 10:06:18 -0500
Subject: [PATCH] Capitalize "Windows Overlay Filesystem" consistently

---
 doc/man1/wimlib-imagex-apply.1 |  5 ++---
 include/wimlib/wof.h           |  4 ++--
 src/wimboot.c                  | 10 +---------
 src/win32_common.c             |  2 +-
 src/write.c                    |  2 +-
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/doc/man1/wimlib-imagex-apply.1 b/doc/man1/wimlib-imagex-apply.1
index d284f9f6..0fad8dd4 100644
--- a/doc/man1/wimlib-imagex-apply.1
+++ b/doc/man1/wimlib-imagex-apply.1
@@ -365,9 +365,8 @@ target volume is NTFS or another filesystem that supports reparse points.
 .IP ""
 In addition, this option works best when running on Windows 8.1 Update 1 or
 later, since that is the first version of Windows that contains the Windows
-Overlay File System Filter Driver ("WOF").  If the WOF driver is detected,
-wimlib will create the WIMBoot "pointer files" using documented ioctls provided
-by WOF.
+Overlay Filesystem filter driver ("WOF").  If the WOF driver is detected, wimlib
+will create the WIMBoot "pointer files" using documented ioctls provided by WOF.
 .IP ""
 Otherwise, if the WOF driver is not detected, wimlib will create the reparse
 points and edit the file "\\System Volume Information\\WimOverlay.dat" on the
diff --git a/include/wimlib/wof.h b/include/wimlib/wof.h
index da1546c0..0d2cec26 100644
--- a/include/wimlib/wof.h
+++ b/include/wimlib/wof.h
@@ -1,7 +1,7 @@
 /*
  * wof.h
  *
- * Definitions for the Windows Overlay File System Filter (WOF) ioctls, as well
+ * Definitions for the Windows Overlay Filesystem filter (WOF) ioctls, as well
  * some definitions for associated undocumented data structures.  See
  * http://msdn.microsoft.com/en-us/library/windows/hardware/ff540367(v=vs.85).aspx
  * for more information about the documented ioctls.
@@ -17,7 +17,7 @@
 #include "wimlib/types.h"
 
 /*
- * The Windows Overlay FileSystem Filter (WOF, a.k.a. wof.sys) is a filesystem
+ * The Windows Overlay Filesystem filter (WOF, a.k.a. wof.sys) is a filesystem
  * filter driver, available in Windows 8.1 and later, which allows files to be
  * "externally backed", meaning that their data is stored in another location,
  * possibly in compressed form.
diff --git a/src/wimboot.c b/src/wimboot.c
index 740db91a..16ea1c6d 100644
--- a/src/wimboot.c
+++ b/src/wimboot.c
@@ -7,7 +7,7 @@
  * information about WIMBoot.
  *
  * Note that WIMBoot pointer files are actually implemented on top of the
- * Windows Overlay File System Filter (WOF).  See wof.h for more info.
+ * Windows Overlay Filesystem filter (WOF).  See wof.h for more info.
  */
 
 /*
@@ -974,15 +974,7 @@ out_free_in:
 	FREE(in);
 out:
 	if (ret == WIMLIB_ERR_UNSUPPORTED) {
-	#if 0
-		WARNING(
-		"The version of Windows you are running does not appear to support\n"
-		"        the Windows Overlay File System Filter Driver.  This is normally\n"
-		"        available on Windows 8.1 Update 1 or later.  Therefore, wimlib\n"
-		"        will attempt to update the WimOverlay.dat file directly.\n");
-	#else
 		WARNING("WOF driver is not available; updating WimOverlay.dat directly.");
-	#endif
 		ret = update_wimoverlay_manually(drive_path + 4, wim_path,
 						 wim_guid, image,
 						 data_source_id_ret);
diff --git a/src/win32_common.c b/src/win32_common.c
index d3007916..514965b8 100644
--- a/src/win32_common.c
+++ b/src/win32_common.c
@@ -220,7 +220,7 @@ win32_get_drive_path(const wchar_t *file_path, wchar_t drive_path[7])
 	return 0;
 }
 
-/* Try to attach an instance of the Windows Overlay File System Filter Driver to
+/* Try to attach an instance of the Windows Overlay Filesystem filter driver to
  * the specified drive (such as C:)  */
 bool
 win32_try_to_attach_wof(const wchar_t *drive)
diff --git a/src/write.c b/src/write.c
index dff5118c..f5a9935d 100644
--- a/src/write.c
+++ b/src/write.c
@@ -829,7 +829,7 @@ should_rewrite_blob_uncompressed(const struct write_blobs_ctx *ctx,
 	 * Exception: if the compressed size happens to be *exactly* the same as
 	 * the uncompressed size, then the blob *must* be written uncompressed
 	 * in order to remain compatible with the Windows Overlay Filesystem
-	 * Filter Driver (WOF).
+	 * filter driver (WOF).
 	 *
 	 * TODO: we are currently assuming that the optimization for
 	 * single-chunk resources in maybe_rewrite_blob_uncompressed() prevents
-- 
2.43.0