Commit 4de151d8cd2553e7e89044ab5d72fcad4eb04afb

Authored by Alexey Dobriyan
Committed by Adrian Bunk
1 parent e0f4ab8a17

It's UTF-8

Fix some comments to "UTF-8".

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

Showing 11 changed files with 14 additions and 14 deletions Side-by-side Diff

Documentation/filesystems/isofs.txt
... ... @@ -9,9 +9,9 @@
9 9 iocharset=name Character set to use for converting from Unicode to
10 10 ASCII. Joliet filenames are stored in Unicode format, but
11 11 Unix for the most part doesn't know how to deal with Unicode.
12   - There is also an option of doing UTF8 translations with the
  12 + There is also an option of doing UTF-8 translations with the
13 13 utf8 option.
14   - utf8 Encode Unicode names in UTF8 format. Default is no.
  14 + utf8 Encode Unicode names in UTF-8 format. Default is no.
15 15  
16 16 Mount options unique to the isofs filesystem.
17 17 block=512 Set the block size for the disk to 512 bytes
Documentation/filesystems/jfs.txt
... ... @@ -6,7 +6,7 @@
6 6  
7 7 iocharset=name Character set to use for converting from Unicode to
8 8 ASCII. The default is to do no conversion. Use
9   - iocharset=utf8 for UTF8 translations. This requires
  9 + iocharset=utf8 for UTF-8 translations. This requires
10 10 CONFIG_NLS_UTF8 to be set in the kernel .config file.
11 11 iocharset=none specifies the default behavior explicitly.
12 12  
Documentation/filesystems/vfat.txt
... ... @@ -28,16 +28,16 @@
28 28 know how to deal with Unicode.
29 29 By default, FAT_DEFAULT_IOCHARSET setting is used.
30 30  
31   - There is also an option of doing UTF8 translations
  31 + There is also an option of doing UTF-8 translations
32 32 with the utf8 option.
33 33  
34 34 NOTE: "iocharset=utf8" is not recommended. If unsure,
35 35 you should consider the following option instead.
36 36  
37   -utf8=<bool> -- UTF8 is the filesystem safe version of Unicode that
  37 +utf8=<bool> -- UTF-8 is the filesystem safe version of Unicode that
38 38 is used by the console. It can be be enabled for the
39 39 filesystem with this option. If 'uni_xlate' gets set,
40   - UTF8 gets disabled.
  40 + UTF-8 gets disabled.
41 41  
42 42 uni_xlate=<bool> -- Translate unhandled Unicode characters to special
43 43 escaped sequences. This would let you backup and
... ... @@ -561,7 +561,7 @@
561 561 * @sb: Superblock
562 562 * @src: Input string buffer in NLS format
563 563 * @srclen: Length of input string in bytes
564   - * @dest: The output string in UTF8 format
  564 + * @dest: The output string in UTF-8 format
565 565 * @destlen: Length of the output buffer
566 566 *
567 567 * Converts input string @src, which is in the format of the loaded NLS map,
... ... @@ -160,7 +160,7 @@
160 160 Version 1.25
161 161 ------------
162 162 Fix internationalization problem in cifs readdir with filenames that map to
163   -longer UTF8 strings than the string on the wire was in Unicode. Add workaround
  163 +longer UTF-8 strings than the string on the wire was in Unicode. Add workaround
164 164 for readdir to netapp servers. Fix search rewind (seek into readdir to return
165 165 non-consecutive entries). Do not do readdir when server negotiates
166 166 buffer size to small to fit filename. Add support for reading POSIX ACLs from
... ... @@ -114,7 +114,7 @@
114 114 }
115 115  
116 116 /*
117   - * Convert Unicode 16 to UTF8, translated Unicode, or ASCII.
  117 + * Convert Unicode 16 to UTF-8, translated Unicode, or ASCII.
118 118 * If uni_xlate is enabled and we can't get a 1:1 conversion, use a
119 119 * colon as an escape character since it is normally invalid on the vfat
120 120 * filesystem. The following four characters are the hexadecimal digits
... ... @@ -1101,7 +1101,7 @@
1101 1101 return -EINVAL;
1102 1102 }
1103 1103 }
1104   - /* UTF8 doesn't provide FAT semantics */
  1104 + /* UTF-8 doesn't provide FAT semantics */
1105 1105 if (!strcmp(opts->iocharset, "utf8")) {
1106 1106 printk(KERN_ERR "FAT: utf8 is not a recommended IO charset"
1107 1107 " for FAT filesystems, filesystem will be case sensitive!\n");
... ... @@ -11,7 +11,7 @@
11 11 #include "isofs.h"
12 12  
13 13 /*
14   - * Convert Unicode 16 to UTF8 or ASCII.
  14 + * Convert Unicode 16 to UTF-8 or ASCII.
15 15 */
16 16 static int
17 17 uni16_to_x8(unsigned char *ascii, u16 *uni, int len, struct nls_table *nls)
... ... @@ -491,7 +491,7 @@
491 491 (koi8-u) and Belarusian (koi8-ru) character sets.
492 492  
493 493 config NLS_UTF8
494   - tristate "NLS UTF8"
  494 + tristate "NLS UTF-8"
495 495 depends on NLS
496 496 help
497 497 If you want to display filenames with native language characters
include/asm-mips/termbits.h
... ... @@ -77,7 +77,7 @@
77 77 #define IXANY 0004000 /* Any character will restart after stop. */
78 78 #define IXOFF 0010000 /* Enable start/stop input control. */
79 79 #define IMAXBEL 0020000 /* Ring bell when input queue is full. */
80   -#define IUTF8 0040000 /* Input is UTF8 */
  80 +#define IUTF8 0040000 /* Input is UTF-8 */
81 81  
82 82 /* c_oflag bits */
83 83 #define OPOST 0000001 /* Perform output processing. */
include/linux/msdos_fs.h
... ... @@ -199,7 +199,7 @@
199 199 sys_immutable:1, /* set = system files are immutable */
200 200 dotsOK:1, /* set = hidden and system files are named '.filename' */
201 201 isvfat:1, /* 0=no vfat long filename support, 1=vfat support */
202   - utf8:1, /* Use of UTF8 character set (Default) */
  202 + utf8:1, /* Use of UTF-8 character set (Default) */
203 203 unicode_xlate:1, /* create escape sequences for unhandled Unicode */
204 204 numtail:1, /* Does first alias have a numeric '~1' type tail? */
205 205 atari:1, /* Use Atari GEMDOS variation of MS-DOS fs */