ChangeLog, ls.c:
  ls.c (list_super): Use better description of s_last_orphan
.del-ext2_fs.h~7a460879, ChangeLog:
  ext2_fs.h: Add comment explaining when journal fields are valid.

diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog
index c4fd358..3d0ccb9 100644
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-14    <tytso@valinux.com>
+
+	* ext2_fs.h: Add comment explaining when journal fields are valid.
+
 2000-07-13    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.19
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index 2f8fcfb..eca1a48 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -382,7 +382,7 @@
 	__u8	s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
 	__u16	s_padding1;
 	/* 
-	 * Journaling support.
+	 * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
 	 */
 	__u8	s_journal_uuid[16];	/* uuid of journal superblock */
 	__u32	s_journal_inum;		/* inode number of journal file */
diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 0b920b5..bf197bf 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-14    <tytso@valinux.com>
+
+	* ls.c (list_super): Use better description of s_last_orphan
+
 2000-07-13    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.19
diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index 2ab74b3..4cef3a6 100644
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -295,8 +295,8 @@
 			e2p_uuid_to_str(sb->s_uuid, buf);
 		printf("Journal UUID:             %s\n", buf);
 		printf("Journal inode:            %u\n", s->s_journal_inum);
-		printf("Journal device:		  %x\n", s->s_journal_dev);
-		printf("Orphaned inode list:      %u\n", s->s_last_orphan);
+		printf("Journal device:	          %x\n", s->s_journal_dev);
+		printf("First orphan inode:       %u\n", s->s_last_orphan);
 	}
 }