Skip to contentSkip to conversation

Kconfig: Typos in fs/Kconfig

PATCH In review Matt LaPlante 3 participants 6 messages Jun 29, 2006 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Kconfig: Typos in fs/Kconfig

Fix several typos in fs/Kconfig

-
Matt LaPlante
CCNP, CCDP, A+, Linux+, CQS
[email protected]

--

fs/Kconfig +8 -8
@@ -69,7 +69,7 @@
 	default y
 
 config EXT3_FS
-	tristate "Ext3 journalling file system support"
+	tristate "Ext3 journaling file system support"
 	select JBD
 	help
 	  This is the journaling version of the Second extended file system
@@ -831,7 +831,7 @@
 
 	Some system agents rely on the information in sysfs to operate.
 	/sbin/hotplug uses device and object attributes in sysfs to assist in
-	delegating policy decisions, like persistantly naming devices.
+	delegating policy decisions, like persistently naming devices.
 
 	sysfs is currently used by the block subsystem to mount the root
 	partition.  If sysfs is disabled you must specify the boot device on
@@ -1036,7 +1036,7 @@
 	  module will be called efs.
 
 config JFFS_FS
-	tristate "Journalling Flash File System (JFFS) support"
+	tristate "Journaling Flash File System (JFFS) support"
 	depends on MTD
 	help
 	  JFFS is the Journaling Flash File System developed by Axis
@@ -1059,13 +1059,13 @@
 	  to be made available to the user in the /proc/fs/jffs/ directory.
 
 config JFFS2_FS
-	tristate "Journalling Flash File System v2 (JFFS2) support"
+	tristate "Journaling Flash File System v2 (JFFS2) support"
 	select CRC32
 	depends on MTD
 	help
-	  JFFS2 is the second generation of the Journalling Flash File System
+	  JFFS2 is the second generation of the Journaling Flash File System
 	  for use on diskless embedded devices. It provides improved wear
-	  levelling, compression and support for hard links. You cannot use
+	  leveling, compression and support for hard links. You cannot use
 	  this on normal block devices, only on 'MTD' devices.
 
 	  Further information on the design and implementation of JFFS2 is
@@ -1209,7 +1209,7 @@
 config JFFS2_CMODE_PRIORITY
         bool "priority"
         help
-          Tries the compressors in a predefinied order and chooses the first
+          Tries the compressors in a predefined order and chooses the first
           successful one.
 
 config JFFS2_CMODE_SIZE
@@ -1892,7 +1892,7 @@
 	  If you say Y here, you will get an experimental Andrew File System
 	  driver. It currently only supports unsecured read-only AFS access.
 
-	  See <file:Documentation/filesystems/afs.txt> for more intormation.
+	  See <file:Documentation/filesystems/afs.txt> for more information.
 
 	  If unsure, say N.
 
#1 lore raw

fs/Kconfig line 72

Quoted 11 lines · On Thu, 29 Jun 2006 02:00:52 -0400 Matt LaPlante wrote:

Fix several typos in fs/Kconfig

(quoted diff) +0 -1
-
fs/Kconfig +1 -1
@@ -69,7 +69,7 @@
 	default y
 
 config EXT3_FS
-	tristate "Ext3 journalling file system support"
+	tristate "Ext3 journaling file system support"

Some dictionaries spell it either way, but it should be spelled consistently (see 3 lines below).

Quoted 8 lines
fs/Kconfig +0 -0
 	select JBD
 	help
 	  This is the journaling version of the Second extended file system
@@ -1059,13 +1059,13 @@
 	  to be made available to the user in the /proc/fs/jffs/ directory.
 
 config JFFS2_FS

fs/Kconfig line 1068

Quoted 10 lines
fs/Kconfig +3 -3
-	tristate "Journalling Flash File System v2 (JFFS2) support"
+	tristate "Journaling Flash File System v2 (JFFS2) support"
 	select CRC32
 	depends on MTD
 	help
-	  JFFS2 is the second generation of the Journalling Flash File System
+	  JFFS2 is the second generation of the Journaling Flash File System
 	  for use on diskless embedded devices. It provides improved wear
-	  levelling, compression and support for hard links. You cannot use
+	  leveling, compression and support for hard links. You cannot use

either spelling is OK.

fs/Kconfig line 1071

Quoted 3 lines
fs/Kconfig +0 -0
 	  this on normal block devices, only on 'MTD' devices.
 
 	  Further information on the design and implementation of JFFS2 is

---
~Randy

#2 lore raw
Quoted 10 lines · On Thu, 29 Jun 2006 00:20:36 -0700 "Randy.Dunlap" <[email protected]> wrote:
Quoted 8 lines · On Thu, 29 Jun 2006 02:00:52 -0400 Matt LaPlante wrote:

Fix several typos in fs/Kconfig

(quoted diff) +0 -1
-
fs/Kconfig +0 -0
@@ -69,7 +69,7 @@
 	default y
 
Quoted 6 lines

fs/Kconfig line 72

Quoted 3 lines
fs/Kconfig +1 -1
 config EXT3_FS
-	tristate "Ext3 journalling file system support"
+	tristate "Ext3 journaling file system support"

Some dictionaries spell it either way, but it should be spelled consistently (see 3 lines below).

You are correct, I went with the above since it did appear below and was the default in my references. We can always swap and change the below.

Quoted 8 lines
Quoted 8 lines
fs/Kconfig +0 -0
 	select JBD
 	help
 	  This is the journaling version of the Second extended file system
@@ -1059,13 +1059,13 @@
 	  to be made available to the user in the /proc/fs/jffs/ directory.
 
Quoted 13 lines

fs/Kconfig line 1068

Quoted 11 lines
fs/Kconfig +3 -3
 config JFFS2_FS
-	tristate "Journalling Flash File System v2 (JFFS2) support"
+	tristate "Journaling Flash File System v2 (JFFS2) support"
 	select CRC32
 	depends on MTD
 	help
-	  JFFS2 is the second generation of the Journalling Flash File System
+	  JFFS2 is the second generation of the Journaling Flash File System
 	  for use on diskless embedded devices. It provides improved wear
-	  levelling, compression and support for hard links. You cannot use
+	  leveling, compression and support for hard links. You cannot use

either spelling is OK.

This was my error, I tried to use at least two sources for the others but in this case apparently my initial spell checker was ignorant and I forgot to check elsewhere. Can be left as is.

Quoted 8 lines

fs/Kconfig line 1071

Quoted 4 lines
fs/Kconfig +0 -0
 	  this on normal block devices, only on 'MTD' devices.
 
 	  Further information on the design and implementation of JFFS2 is

---
~Randy

-
Matt

#3 lore raw
In reply to Matt LaPlante

Ar Iau, 2006-06-29 am 02:00 -0400, ysgrifennodd Matt LaPlante:

Quoted 1 line

Fix several typos in fs/Kconfig

Some wrong, some right.

fs/Kconfig line 72

Quoted 2 lines
fs/Kconfig +1 -1
-	tristate "Ext3 journalling file system support"
+	tristate "Ext3 journaling file system support"

There is actually no such word in the dictionaries I have access to (including the OED). An -ing form would be "-lling" in British English and ext3 is maintained in the UK which is probably why it uses "lling". This was discussed at length about three years ago and the lling was the decision taken at the end of the thread.

fs/Kconfig line 75

Quoted 3 lines
fs/Kconfig +0 -0
 	select JBD
 	help
 	  This is the journaling version of the Second extended file system

That one ought to get fixed instead if anything to be consistent.

fs/Kconfig line 834

Quoted 6 lines
fs/Kconfig +1 -1
@@ -831,7 +831,7 @@
 
 	Some system agents rely on the information in sysfs to operate.
 	/sbin/hotplug uses device and object attributes in sysfs to assist in
-	delegating policy decisions, like persistantly naming devices.
+	delegating policy decisions, like persistently naming devices.

Persistantly is also correct. Both forms are valid English

fs/Kconfig line 1068

Quoted 2 lines
fs/Kconfig +1 -1
-	  levelling, compression and support for hard links. You cannot use
+	  leveling, compression and support for hard links. You cannot use

levelling with double ll is also correct English. Single "l" is an Americanism. Please stop trying to "Americanise" the Kconfig files and just fix actual errors.

Quoted 4 lines
fs/Kconfig +0 -0
 config JFFS2_CMODE_PRIORITY
         bool "priority"

help
- Tries the compressors in a predefinied order and chooses the first

Appears to be a genuine fix

fs/Kconfig line 1895

Quoted 8 lines

config JFFS2_CMODE_SIZE

fs/Kconfig +1 -1
@@ -1892,7 +1892,7 @@
 	  If you say Y here, you will get an experimental Andrew File System
 	  driver. It currently only supports unsecured read-only AFS access.
 
-	  See <file:Documentation/filesystems/afs.txt> for more intormation.
+	  See <file:Documentation/filesystems/afs.txt> for more information.

Likewise

#4 lore raw
Quoted 5 lines · On Thu, 29 Jun 2006 13:09:39 +0100 Alan Cox <[email protected]> wrote:

Ar Iau, 2006-06-29 am 02:00 -0400, ysgrifennodd Matt LaPlante:

Quoted 1 line

Fix several typos in fs/Kconfig

Some wrong, some right.

Quoted 8 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-	tristate "Ext3 journalling file system support"
+	tristate "Ext3 journaling file system support"

There is actually no such word in the dictionaries I have access to (including the OED). An -ing form would be "-lling" in British English and ext3 is maintained in the UK which is probably why it uses "lling". This was discussed at length about three years ago and the lling was the decision taken at the end of the thread.

Opposite here with my upstart American English references. :)

Quoted 6 lines

Review

Quoted 4 lines
(quoted diff) +0 -0
 	select JBD
 	help
 	  This is the journaling version of the Second extended file system

That one ought to get fixed instead if anything to be consistent.

This version was actually used several times in the KConfig as well. (See below)

Quoted 10 lines

Review line 834

Quoted 7 lines
(quoted diff) +1 -1
@@ -831,7 +831,7 @@
 
 	Some system agents rely on the information in sysfs to operate.
 	/sbin/hotplug uses device and object attributes in sysfs to assist in
-	delegating policy decisions, like persistantly naming devices.
+	delegating policy decisions, like persistently naming devices.

Persistantly is also correct. Both forms are valid English

Quoted 7 lines

Review line 835

Quoted 2 lines
(quoted diff) +1 -1
-	  levelling, compression and support for hard links. You cannot use
+	  leveling, compression and support for hard links. You cannot use

levelling with double ll is also correct English. Single "l" is an Americanism. Please stop trying to "Americanise" the Kconfig files and just fix actual errors.

^Both are reverted. I can honestly say I'm in no way attempting to Americanise/Americanize the files or the kernel...I've intentionally passed by all the spellings I found to be valid in either Engish (Colour/Color, -ise vs -ize for example). My reference dictionaries, which I will be changing now, were apparently more biased than I thought (they did support *some* british english). English is complicated enough on either side of the pond, and when you combine the two you've got a whole new source of chaos and confusion. I'm just trying to correct real mistakes, and I appologize if I err along the way.

The updated patch is below.

-
Matt LaPlante

--

fs/Kconfig +7 -7
@@ -72,11 +72,11 @@
 	tristate "Ext3 journalling file system support"
 	select JBD
 	help
-	  This is the journaling version of the Second extended file system
+	  This is the journalling version of the Second extended file system
 	  (often called ext3), the de facto standard Linux file system
 	  (method to organize files on a storage device) for hard disks.
 
-	  The journaling code included in this driver means you do not have
+	  The journalling code included in this driver means you do not have
 	  to run e2fsck (file system checker) on your file systems after a
 	  crash.  The journal keeps track of any changes that were being made
 	  at the time the system crashed, and can ensure that your file system
@@ -141,7 +141,7 @@
 config JBD
 	tristate
 	help
-	  This is a generic journaling layer for block devices.  It is
+	  This is a generic journalling layer for block devices.  It is
 	  currently used by the ext3 and OCFS2 file systems, but it could
 	  also be used to add journal support to other file systems or block
 	  devices such as RAID or LVM.
@@ -181,7 +181,7 @@
 	tristate "Reiserfs support"
 	help
 	  Stores not just filenames but the files themselves in a balanced
-	  tree.  Uses journaling.
+	  tree.  Uses journalling.
 
 	  Balanced trees are more efficient than traditional file system
 	  architectural foundations.
@@ -1039,7 +1039,7 @@
 	tristate "Journalling Flash File System (JFFS) support"
 	depends on MTD
 	help
-	  JFFS is the Journaling Flash File System developed by Axis
+	  JFFS is the Journalling Flash File System developed by Axis
 	  Communications in Sweden, aimed at providing a crash/powerdown-safe
 	  file system for disk-less embedded devices. Further information is
 	  available at (<http://developer.axis.com/software/jffs/>).
@@ -1209,7 +1209,7 @@
 config JFFS2_CMODE_PRIORITY
         bool "priority"
         help
-          Tries the compressors in a predefinied order and chooses the first
+          Tries the compressors in a predefined order and chooses the first
           successful one.
 
 config JFFS2_CMODE_SIZE
@@ -1892,7 +1892,7 @@
 	  If you say Y here, you will get an experimental Andrew File System
 	  driver. It currently only supports unsecured read-only AFS access.
 
-	  See <file:Documentation/filesystems/afs.txt> for more intormation.
+	  See <file:Documentation/filesystems/afs.txt> for more information.
 
 	  If unsure, say N.
 
#5 lore raw
Quoted 10 lines

^Both are reverted. I can honestly say I'm in no way attempting to Americanise/Americanize the files or the kernel...I've intentionally passed by all the spellings I found to be valid in either Engish (Colour/Color, -ise vs -ize for example). My reference dictionaries, which I will be changing now, were apparently more biased than I thought (they did support *some* british english). English is complicated enough on either side of the pond, and when you combine the two you've got a whole new source of chaos and confusion. I'm just trying to correct real mistakes, and I appologize if I err along the way.

Things like "journal[l]ing" are hard as there is no real way answer. No need to apologi[sz]e either, I'm just trying to help verify them.

Quoted 1 line

Looks good