diff --git a/HISTORY b/HISTORY
index a69ad33d..6cfb543b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,11 @@
 SnapRAID HISTORY
 ================
 
+1.8 2011/12
+===========
+ * The example configuration files now put the content files in the data
+   disks instead than in the parity disks.
+
 1.7 2011/11
 ===========
 * If a file is modified or removed during a sync, the sync process doesn't
diff --git a/INSTALL b/INSTALL
index c63ddb6c..4e2f95d1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,7 +10,7 @@ When you have to check for correctness the application typing:
 
     make check
 
-If if terminates with "Success", you can install the application and
+If it terminates with "Success", you can install the application and
 the documentation running as root:
 
     sudo make install
diff --git a/TODO b/TODO
index 77238b46..85a59fbb 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,8 @@ This is the list of TODO items for SnapRAID.
 
 - v1.8
 
+* Check the bug report: https://sourceforge.net/tracker/?func=detail&aid=3437536&group_id=507749&atid=2064492
+
 * In fix an existing symlink with the same name of a file to be recovered may stop
 the process making the create() operation to fail.
 
@@ -17,6 +19,11 @@ with an atomic rename operation.
 
 * Recheck the 2nd issue reported at: https://sourceforge.net/projects/snapraid/forums/forum/1677233/topic/4747897
 
+* If a directory exist with the same name of a parity/content file be more explicative
+on the error message. See: https://sourceforge.net/projects/snapraid/forums/forum/1677233/topic/4861034
+Also adding an estension to these files in the configuration file for Windows may help to understand
+that they are files and not directories.
+
 * Put the content files in the data disks in the default configuration file.
 
 * Easy way to find duplicates using the computed hash.
diff --git a/snapraid.1 b/snapraid.1
index b099808e..2615bceb 100644
--- a/snapraid.1
+++ b/snapraid.1
@@ -121,16 +121,15 @@ as the redundancy information may grow in size as the biggest data
 disk in the array.
 .PP
 These disks will be dedicated to store the \(a"parity\(a" and \(a"q\(hyparity\(a"
-files. You should not store other data in them, with the only
-possible exception of the \(a"content\(a" files.
+files. You should not store your data in them.
 .PP
-The list of files is stored in the \(a"content\(a" files, usually
+The list of files is saved in the \(a"content\(a" files, usually
 stored in the data, parity or boot disks.
-These files contain the details of your backup with all the
+These files contain the details of your backup, with all the
 checksums to verify its integrity.
-The \(a"content\(a" file is stored in multiple copies, each one in a
-different disk, to ensure that in even in case of multiple disk
-failures at least one copy is available.
+The \(a"content\(a" file is stored in multiple copies, and each one must
+be in a different disk, to ensure that in even in case of multiple
+disk failures at least one copy is available.
 .PP
 For example, suppose that you are interested only at one parity level
 of protection, and that your disks are present in:
@@ -162,11 +161,15 @@ parity /mnt/diskpar/parity
 .PD 0
 .PP
 .PD
-content /mnt/diskpar/content
+content /var/snapraid/content
 .PD 0
 .PP
 .PD
-content /var/snapraid/content
+content /mnt/disk1/content
+.PD 0
+.PP
+.PD
+content /mnt/disk2/content
 .PD 0
 .PP
 .PD
@@ -192,11 +195,15 @@ parity E:\(rspar\(rsparity
 .PD 0
 .PP
 .PD
-content E:\(rspar\(rscontent
+content C:\(rssnapraid\(rscontent
 .PD 0
 .PP
 .PD
-content C:\(rssnapraid\(rscontent
+content F:\(rsarray\(rscontent
+.PD 0
+.PP
+.PD
+content G:\(rsarray\(rscontent
 .PD 0
 .PP
 .PD
diff --git a/snapraid.conf.example b/snapraid.conf.example
index 8a040d19..12c61305 100644
--- a/snapraid.conf.example
+++ b/snapraid.conf.example
@@ -17,9 +17,9 @@ parity /mnt/diskpar/parity
 # They can be in the disks used for data, parity or boot,
 # but each file must be in a different disk
 # Format: "content FILE_PATH"
-content /mnt/diskpar/content
-#content /mnt/diskqar/content
 content /var/snapraid/content
+content /mnt/disk1/content
+content /mnt/disk2/content
 
 # Defines the data disks to use
 # The order is relevant for parity, do not change it
diff --git a/snapraid.conf.example.windows b/snapraid.conf.example.windows
index a6f1d85e..7c921e2d 100644
--- a/snapraid.conf.example.windows
+++ b/snapraid.conf.example.windows
@@ -17,9 +17,9 @@ parity E:\par\parity
 # They can be in the disks used for data, parity or boot,
 # but each file must be in a different disk
 # Format: "content FILE_PATH"
-content E:\par\content
-#content F:\qar\content
 content C:\snapraid\content
+content G:\array\content
+content H:\array\content
 
 # Defines the data disks to use
 # The order is relevant for parity, do not change it
diff --git a/snapraid.d b/snapraid.d
index 31dcfcc6..260dca77 100644
--- a/snapraid.d
+++ b/snapraid.d
@@ -84,16 +84,15 @@ Getting Started
 	disk in the array.
 
 	These disks will be dedicated to store the "parity" and "q-parity"
-	files. You should not store other data in them, with the only
-	possible exception of the "content" files.
+	files. You should not store your data in them.
 
-	The list of files is stored in the "content" files, usually
+	The list of files is saved in the "content" files, usually
 	stored in the data, parity or boot disks.
-	These files contain the details of your backup with all the
+	These files contain the details of your backup, with all the
 	checksums to verify its integrity.
-	The "content" file is stored in multiple copies, each one in a
-	different disk, to ensure that in even in case of multiple disk
-	failures at least one copy is available.
+	The "content" file is stored in multiple copies, and each one must
+	be in a different disk, to ensure that in even in case of multiple
+	disk failures at least one copy is available.
 
 	For example, suppose that you are interested only at one parity level
 	of protection, and that your disks are present in:
@@ -107,8 +106,9 @@ Getting Started
 	the following options:
 
 		:parity /mnt/diskpar/parity
-		:content /mnt/diskpar/content
 		:content /var/snapraid/content
+		:content /mnt/disk1/content
+		:content /mnt/disk2/content
 		:disk d1 /mnt/disk1/
 		:disk d2 /mnt/disk2/
 		:disk d3 /mnt/disk3/
@@ -117,8 +117,9 @@ Getting Started
 	instead of slashes:
 
 		:parity E:\par\parity
-		:content E:\par\content
 		:content C:\snapraid\content
+		:content F:\array\content
+		:content G:\array\content
 		:disk d1 F:\array\
 		:disk d2 G:\array\
 		:disk d3 H:\array\
diff --git a/snapraid.txt b/snapraid.txt
index 91692202..8e8d2e54 100644
--- a/snapraid.txt
+++ b/snapraid.txt
@@ -97,16 +97,15 @@ as the redundancy information may grow in size as the biggest data
 disk in the array.
 
 These disks will be dedicated to store the "parity" and "q-parity"
-files. You should not store other data in them, with the only
-possible exception of the "content" files.
+files. You should not store your data in them.
 
-The list of files is stored in the "content" files, usually
+The list of files is saved in the "content" files, usually
 stored in the data, parity or boot disks.
-These files contain the details of your backup with all the
+These files contain the details of your backup, with all the
 checksums to verify its integrity.
-The "content" file is stored in multiple copies, each one in a
-different disk, to ensure that in even in case of multiple disk
-failures at least one copy is available.
+The "content" file is stored in multiple copies, and each one must
+be in a different disk, to ensure that in even in case of multiple
+disk failures at least one copy is available.
 
 For example, suppose that you are interested only at one parity level
 of protection, and that your disks are present in:
@@ -120,8 +119,9 @@ you have to create the configuration file /etc/snapraid.conf with
 the following options:
 
     parity /mnt/diskpar/parity
-    content /mnt/diskpar/content
     content /var/snapraid/content
+    content /mnt/disk1/content
+    content /mnt/disk2/content
     disk d1 /mnt/disk1/
     disk d2 /mnt/disk2/
     disk d3 /mnt/disk3/
@@ -130,8 +130,9 @@ If you are in Windows, you should use drive letters and backslashes
 instead of slashes:
 
     parity E:\par\parity
-    content E:\par\content
     content C:\snapraid\content
+    content F:\array\content
+    content G:\array\content
     disk d1 F:\array\
     disk d2 G:\array\
     disk d3 H:\array\