2 files changed, 29 insertions, 2 deletions

diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index d4fda25db868..b974cf595d01 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -41,6 +41,7 @@ COPYING
 CREDITS
 CVS
 ChangeSet
+Image
 Kerntypes
 MODS.txt
 Module.symvers
@@ -103,6 +104,7 @@ logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
+mach-types.h
 make_times_h
 map
 maui_boot.h
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index f89b440fad1d..eef4aca0c753 100644
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -21,7 +21,7 @@ Overview
 ========
 
 Linux-NTFS comes with a number of user-space programs known as ntfsprogs.
-These include mkntfs, a full-featured ntfs file system format utility,
+These include mkntfs, a full-featured ntfs filesystem format utility,
 ntfsundelete used for recovering files that were unintentionally deleted
 from an NTFS volume and ntfsresize which is used to resize an NTFS partition.
 See the web site for more information.
@@ -149,7 +149,14 @@ case_sensitive=<BOOL>	If case_sensitive is specified, treat all file names as
                         name, if it exists.  If case_sensitive, you will need
                         to provide the correct case of the short file name.
 
-errors=opt              What to do when critical file system errors are found.
+disable_sparse=<BOOL>   If disable_sparse is specified, creation of sparse
+                        regions, i.e. holes, inside files is disabled for the
+                        volume (for the duration of this mount only).  By
+                        default, creation of sparse regions is enabled, which
+                        is consistent with the behaviour of traditional Unix
+                        filesystems.
+
+errors=opt              What to do when critical filesystem errors are found.
                         Following values can be used for "opt":
                           continue: DEFAULT, try to clean-up as much as
                                     possible, e.g. marking a corrupt inode as
@@ -432,6 +439,24 @@ ChangeLog
 
 Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
 
+2.1.23:
+        - Stamp the user space journal, aka transaction log, aka $UsnJrnl, if
+          it is present and active thus telling Windows and applications using
+          the transaction log that changes can have happened on the volume
+          which are not recorded in $UsnJrnl.
+        - Detect the case when Windows has been hibernated (suspended to disk)
+          and if this is the case do not allow (re)mounting read-write to
+          prevent data corruption when you boot back into the suspended
+          Windows session.
+        - Implement extension of resident files using the normal file write
+          code paths, i.e. most very small files can be extended to be a little
+          bit bigger but not by much.
+        - Add new mount option "disable_sparse".  (See list of mount options
+          above for details.)
+        - Improve handling of ntfs volumes with errors and strange boot sectors
+          in particular.
+        - Fix various bugs including a nasty deadlock that appeared in recent
+          kernels (around 2.6.11-2.6.12 timeframe).
 2.1.22:
         - Improve handling of ntfs volumes with errors.
         - Fix various bugs and race conditions.