jffs2: Correct language use

PATCH In review Alan Cox 2 participants 3 messages May 2, 2008

Subsystems (2)

Memory technology devices (MTD) Journalling flash file system V2 (JFFS2)

lore

Share & tools

lore

Alan Cox

author

2008-05-02 13:40 UTC #0 lore raw

PATCH 1/1 jffs2: Correct language use

Dwmw2 will appreciate this I am sure

The verb form of journal is "to journalise" not "to journal". Verified with the OED and querying the British Computer Society. The s/z is debatable but as the US prefers the s and the BCS prefers the s (and Dwmw2 is in Cambridge which favours 's' over the Oxford 'z' ;)) we'll use the s form.

No code changes included

Signed-off-by Alan Cox <[email protected]>

fs/jffs2/acl.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/acl.c linux-2.6.25-mm1/fs/jffs2/acl.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2006  NEC Corporation
  *

fs/jffs2/acl.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/acl.h linux-2.6.25-mm1/fs/jffs2/acl.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2006  NEC Corporation
  *

fs/jffs2/background.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/background.c linux-2.6.25-mm1/fs/jffs2/background.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/build.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/build.c linux-2.6.25-mm1/fs/jffs2/build.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/compr.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/compr.c linux-2.6.25-mm1/fs/jffs2/compr.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  * Created by Arjan van de Ven <[email protected]>

fs/jffs2/compr.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/compr.h linux-2.6.25-mm1/fs/jffs2/compr.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2004   Ferenc Havasi <[email protected]>,
  *		      University of Szeged, Hungary

fs/jffs2/compr_lzo.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/compr_lzo.c linux-2.6.25-mm1/fs/jffs2/compr_lzo.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2007 Nokia Corporation. All rights reserved.
  *

fs/jffs2/compr_rtime.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/compr_rtime.c linux-2.6.25-mm1/fs/jffs2/compr_rtime.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/compr_rubin.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/compr_rubin.c linux-2.6.25-mm1/fs/jffs2/compr_rubin.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/compr_zlib.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/compr_zlib.c linux-2.6.25-mm1/fs/jffs2/compr_zlib.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/debug.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/debug.c linux-2.6.25-mm1/fs/jffs2/debug.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/debug.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/debug.h linux-2.6.25-mm1/fs/jffs2/debug.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/dir.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/dir.c linux-2.6.25-mm1/fs/jffs2/dir.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/erase.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/erase.c linux-2.6.25-mm1/fs/jffs2/erase.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/file.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/file.c linux-2.6.25-mm1/fs/jffs2/file.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/fs.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/fs.c linux-2.6.25-mm1/fs/jffs2/fs.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/gc.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/gc.c linux-2.6.25-mm1/fs/jffs2/gc.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/ioctl.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/ioctl.c linux-2.6.25-mm1/fs/jffs2/ioctl.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/jffs2_fs_i.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/jffs2_fs_i.h linux-2.6.25-mm1/fs/jffs2/jffs2_fs_i.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/jffs2_fs_sb.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/jffs2_fs_sb.h linux-2.6.25-mm1/fs/jffs2/jffs2_fs_sb.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/malloc.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/malloc.c linux-2.6.25-mm1/fs/jffs2/malloc.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/nodelist.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/nodelist.c linux-2.6.25-mm1/fs/jffs2/nodelist.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/nodelist.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/nodelist.h linux-2.6.25-mm1/fs/jffs2/nodelist.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/nodemgmt.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/nodemgmt.c linux-2.6.25-mm1/fs/jffs2/nodemgmt.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/os-linux.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/os-linux.h linux-2.6.25-mm1/fs/jffs2/os-linux.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/read.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/read.c linux-2.6.25-mm1/fs/jffs2/read.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/readinode.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/readinode.c linux-2.6.25-mm1/fs/jffs2/readinode.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/scan.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/scan.c linux-2.6.25-mm1/fs/jffs2/scan.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/security.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/security.c linux-2.6.25-mm1/fs/jffs2/security.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2006  NEC Corporation
  *

fs/jffs2/summary.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/summary.c linux-2.6.25-mm1/fs/jffs2/summary.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2004  Ferenc Havasi <[email protected]>,
  *		     Zoltan Sogor <[email protected]>,

fs/jffs2/summary.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/summary.h linux-2.6.25-mm1/fs/jffs2/summary.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2004  Ferenc Havasi <[email protected]>,
  *		     Zoltan Sogor <[email protected]>,

fs/jffs2/super.c +2 -2

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/super.c linux-2.6.25-mm1/fs/jffs2/super.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

@@ -236,7 +236,7 @@
 module_init(init_jffs2_fs);
 module_exit(exit_jffs2_fs);
 
-MODULE_DESCRIPTION("The Journalling Flash File System, v2");
+MODULE_DESCRIPTION("The Journalising Flash File System, v2");
 MODULE_AUTHOR("Red Hat, Inc.");
 MODULE_LICENSE("GPL"); // Actually dual-licensed, but it doesn't matter for
 		       // the sake of this tag. It's Free Software.

fs/jffs2/symlink.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/symlink.c linux-2.6.25-mm1/fs/jffs2/symlink.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/wbuf.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/wbuf.c linux-2.6.25-mm1/fs/jffs2/wbuf.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  * Copyright © 2004 Thomas Gleixner <[email protected]>

fs/jffs2/write.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/write.c linux-2.6.25-mm1/fs/jffs2/write.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/writev.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/writev.c linux-2.6.25-mm1/fs/jffs2/writev.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2001-2007 Red Hat, Inc.
  *

fs/jffs2/xattr.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/xattr.c linux-2.6.25-mm1/fs/jffs2/xattr.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2006  NEC Corporation
  *

fs/jffs2/xattr.h +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/xattr.h linux-2.6.25-mm1/fs/jffs2/xattr.h
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2006  NEC Corporation
  *

fs/jffs2/xattr_trusted.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/xattr_trusted.c linux-2.6.25-mm1/fs/jffs2/xattr_trusted.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2006  NEC Corporation
  *

fs/jffs2/xattr_user.c +1 -1

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/jffs2/xattr_user.c linux-2.6.25-mm1/fs/jffs2/xattr_user.c
@@ -1,5 +1,5 @@
 /*
- * JFFS2 -- Journalling Flash File System, Version 2.
+ * JFFS2 -- Journalising Flash File System, Version 2.
  *
  * Copyright © 2006  NEC Corporation
  *

Trent Piepho

2008-05-02 19:54 UTC #1 lore raw

Quoted 5 lines · Alan Cox

The verb form of journal is "to journalise" not "to journal". Verified with the OED and querying the British Computer Society. The s/z is debatable but as the US prefers the s and the BCS prefers the s (and Dwmw2 is in Cambridge which favours 's' over the Oxford 'z' ;)) we'll use the s form.

Google hits:
journalising filesystem 641
journalizing filesystem 2,090
journaling filesystem 104,000
journalling filesystem 63,600

Alan Cox

author

2008-05-02 22:34 UTC #2 lore raw

Quoted 7 lines · On Fri, 2 May 2008 12:51:54 -0700 (PDT) Trent Piepho <[email protected]>…

Quoted 5 lines · Alan Cox
The verb form of journal is "to journalise" not "to journal". Verified with the OED and querying the British Computer Society. The s/z is debatable but as the US prefers the s and the BCS prefers the s (and Dwmw2 is in Cambridge which favours 's' over the Oxford 'z' ;)) we'll use the s form.

Quoted 5 lines

Google hits:
journalising filesystem 641
journalizing filesystem 2,090
journaling filesystem 104,000
journalling filesystem 63,600

Google isn't a good guide as a lot of it is Linux material but a lot of people seem to really dislike journalising so I withdraw the patch. It's not *that* important !

Alan