Merge branch 'maint' into next

12 files changed, 35 insertions, 35 deletions

diff --git a/ext2ed/README b/ext2ed/README
index fda4b87c..1f473cf4 100644
--- a/ext2ed/README
+++ b/ext2ed/README
@@ -48,10 +48,10 @@ This is version 0.2 of ext2ed - The extended-2 filesystem editor.
 Modifications on Apr 5 2001
 This is minor bug fixes to ext2ed, as of April 2001.
 It supports modern ext2 version that has file type in directory structure
-and fixes the missunderstanding between ncurses and
+and fixes the misunderstanding between ncurses and
 readline.
 
-I first applied patches from Redhat except the one for readline that 
+I first applied patches from Red Hat except the one for readline that 
 rewrote a readline behavior.
 
 Globals diffs between version 0.1 and 0.2 is stored in file :
@@ -114,7 +114,7 @@ that ncurses will be properly installed on your system:
 	set your TERM environment variable to 'linux' or link
 	l/linux to c/console in the terminfo database.
 
-4.	The percompiled binary was linked with ncurses 1.9.4 and will search
+4.	The precompiled binary was linked with ncurses 1.9.4 and will search
 	for the terminfo database on /usr/local/lib/terminfo. If you are
 	using it, and your 1.9.4 compatible terminfo database is not on the
 	directory above, use the TERMINFO environment variable to specify
diff --git a/ext2ed/dir_com.c b/ext2ed/dir_com.c
index ba852676..67bb4b57 100644
--- a/ext2ed/dir_com.c
+++ b/ext2ed/dir_com.c
@@ -539,7 +539,7 @@ void type_dir___remember (char *command_line)
 
 /*
 
-This is overrided here because we don't remember a directory - It is too complicated. Instead, we remember the
+This is overridden here because we don't remember a directory - It is too complicated. Instead, we remember the
 inode of the current directory.
 
 */
diff --git a/ext2ed/disk.c b/ext2ed/disk.c
index 5c243127..4612d00d 100644
--- a/ext2ed/disk.c
+++ b/ext2ed/disk.c
@@ -14,7 +14,7 @@ double check the various permissions and possible errors here.
 The major update which needs to be done here is switching to the use of the llseek system call, so that we will
 be able to support ext2 filesystems up to 4 TB. Currently, due to the standard fseek usage, we can't handle
 filesystems bigger than 4 GB. The limit is actually 2 GB because I used long rather than unsigned long long at too
-many places in the program. To conclude - This upgrade needs to be done carefuly; There are many places to change.
+many places in the program. To conclude - This upgrade needs to be done carefully; There are many places to change.
 
 First written on: April 9 1995
 
@@ -86,7 +86,7 @@ If logging is enabled, we log the change before writing it to the device.
 	char temp [80];
 
 	if (!write_access) {
-		wprintw (command_win,"Error - Write access not aviable (use enablewrite)\n");
+		wprintw (command_win,"Error - Write access not available (use enablewrite)\n");
 		return (0);
 	}
 
diff --git a/ext2ed/doc/ext2ed-design.sgml b/ext2ed/doc/ext2ed-design.sgml
index 7841358a..e8052a90 100644
--- a/ext2ed/doc/ext2ed-design.sgml
+++ b/ext2ed/doc/ext2ed-design.sgml
@@ -83,7 +83,7 @@ subjects. I can think of two ways in which I could have made my project:
 <Para>
 	The "Engineer" way
 
-Learn the subject throughly before I get to the programming itself.
+Learn the subject thoroughly before I get to the programming itself.
 Then, I could easily see the entire picture and select the best
 course of action, taking all the factors into account.
 </Para>
@@ -94,7 +94,7 @@ course of action, taking all the factors into account.
 	The "Explorer - Progressive" way.
 
 Jump immediately into the cold water - Start programming and
-learning the material parallelly.
+learning the material in parallel.
 </Para>
 </ListItem>
 
@@ -418,7 +418,7 @@ superblock was set exactly to the above value.
 <Para>
 It seems that starting with the <Literal remap="tt">superblock</Literal> was a good bet - Just from
 the list of variables, one can learn a lot. I didn't understand all of them
-at the time, but it seemed that the following keywords were repeating themself
+at the time, but it seemed that the following keywords were repeating themselves
 in various variables:
 
 <ItemizedList>
@@ -710,8 +710,8 @@ int dispatch (char *command_line)
 <Title>Source files in EXT2ED</Title>
 
 <Para>
-The project was getting large enough to be splitted into several source
-files. I splitted the source as much as I could into self-contained
+The project was getting large enough to be split into several source
+files. I split the source as much as I could into self-contained
 source files. The source files consist of the following blocks:
 
 <ItemizedList>
@@ -1156,7 +1156,7 @@ according to the source division outlined above, in inode_com.c) will
 store the necessary information about the inode in a specific structure
 of type struct_file_info which will be available for use by the file_com.c
 functions. Only then it will set the type to file. This is also the reason
-that a direct asynchronic set of the object type to a file through a settype
+that a direct asynchronous set of the object type to a file through a settype
 command will fail - The above data structure will not be initialized
 properly because the user never was at the inode of the file. 
 
diff --git a/ext2ed/doc/ext2fs-overview.sgml b/ext2ed/doc/ext2fs-overview.sgml
index 900c3930..0d54f07c 100644
--- a/ext2ed/doc/ext2fs-overview.sgml
+++ b/ext2ed/doc/ext2fs-overview.sgml
@@ -533,7 +533,7 @@ allocated blocks.
 </Para>
 
 <Para>
-It was found experimently that many of the files in the filesystem are
+It was found experimentally that many of the files in the filesystem are
 actually quite small. To take advantage of this effect, the kernel provides
 storage of up to 12 block numbers in the inode itself. Those blocks are
 called <Literal remap="tt">direct blocks</Literal>. The advantage is that once the kernel has the
@@ -692,7 +692,7 @@ options. They determine the type of the "file" to which the inode belongs:
 <Title>Time and date</Title>
 
 <Para>
-Linux records the last time in which various operations occured with the
+Linux records the last time in which various operations occurred with the
 file. The time and date are saved in the standard C library format - The
 number of seconds which passed since 00:00:00 GMT, January 1, 1970. The
 following times are recorded:
@@ -1087,7 +1087,7 @@ the length of the file name.
 <Para>
 The variable <Literal remap="tt">rec&lowbar;len</Literal> is provided because the directory entries are
 padded with zeroes so that the next entry will be in an offset which is
-a multiplition of 4. The resulting directory entry size is stored in
+a multiplication of 4. The resulting directory entry size is stored in
 <Literal remap="tt">rec&lowbar;len</Literal>. If the directory entry is the last in the block, it is
 padded with zeroes till the end of the block, and rec&lowbar;len is updated
 accordingly.
@@ -1402,7 +1402,7 @@ then zero s&lowbar;mnt&lowbar;count. <Literal remap="tt">s&lowbar;max&lowbar;mnt
 E2fsck also records the last time in which the file system was checked in
 the <Literal remap="tt">s&lowbar;lastcheck</Literal> variable. The user tunable parameter
 <Literal remap="tt">s&lowbar;checkinterval</Literal> will contain the number of seconds which are allowed
-to pass since <Literal remap="tt">s&lowbar;lastcheck</Literal> until a check is reforced. A value of
+to pass since <Literal remap="tt">s&lowbar;lastcheck</Literal> until a check is forced. A value of
 <Literal remap="tt">0</Literal> disables time-based check.
 </Para>
 
diff --git a/ext2ed/doc/user-guide.sgml b/ext2ed/doc/user-guide.sgml
index 42887eff..1e8f3cdf 100644
--- a/ext2ed/doc/user-guide.sgml
+++ b/ext2ed/doc/user-guide.sgml
@@ -506,8 +506,8 @@ itself the direct blocks, indirect blocks, ..., while still preserving the
 actual view of the exact block usage of the file.
 </Screen>
 
-The point is that the "tour" of the filesystem will now be synchronic rather
-than asynchronic - Each object has the "links" to pass between connected
+The point is that the "tour" of the filesystem will now be synchronous rather
+than asynchronous - Each object has the "links" to pass between connected
 logical structures, and special fine-tuned functions to deal with it.
 </Para>
 
@@ -855,7 +855,7 @@ The <Command>setdevice</Command> command is described at section <XRef LinkEnd="
 Syntax: setoffset [block || type] [+|-]offset
 </Screen>
 
-The <Command>setoffset</Command> command is used to move asynchronically inside the file
+The <Command>setoffset</Command> command is used to move asynchronously inside the file
 system. It is considered a low level command, and usually should not be used
 when editing an ext2 filesystem, simply because movement is better
 utilized through the specific ext2 commands.
diff --git a/ext2ed/ext2.descriptors b/ext2ed/ext2.descriptors
index b1ac4c4b..e356f4cd 100644
--- a/ext2ed/ext2.descriptors
+++ b/ext2ed/ext2.descriptors
@@ -5,7 +5,7 @@ Most of this file is just copied from the ext2 main include file.
 My parser is very primitive - It only searches for the struct keywords,
 and uses the variables in there. The rest of the file is just ignored.
 
-You will find at the end a few additional types which are not aviable in
+You will find at the end a few additional types which are not available in
 the original include file, such as the types "file" and "dir". They have
 no variables, but are necessary due to the way ext2ed binds C commands
 to specific types.
diff --git a/ext2ed/ext2ed.conf.in b/ext2ed/ext2ed.conf.in
index 7e2a9255..c0796234 100644
--- a/ext2ed/ext2ed.conf.in
+++ b/ext2ed/ext2ed.conf.in
@@ -52,8 +52,8 @@ AllowMountedRead	on
 
 # When ForceExt2 is set to on, the filesystem is assumed to be ext2
 # filesystem, despite the possibly corrupt superblock magic number reading.
-# All the ext2 specific commands will be aviable despite the possible
-# autodetection failture.
+# All the ext2 specific commands will be available despite the possible
+# autodetection failure.
 
 ForceExt2		off
 
diff --git a/ext2ed/ext2ed.h b/ext2ed/ext2ed.h
index b9b43b47..0ac77b7a 100644
--- a/ext2ed/ext2ed.h
+++ b/ext2ed/ext2ed.h
@@ -249,7 +249,7 @@ void signal_SIGSEGV_handler (int sig_num);
 
 /* general_com.c */
 
-/* General commands which are aviable always */
+/* General commands which are available always */
 
 extern void help (char *command_line);
 extern void set (char *command_line);
@@ -275,7 +275,7 @@ void detailed_help (char *text);
 
 /* ext2_com.c */
 
-/* Extended2 filesystem genereal commands - Aviable only when editing an
+/* Extended2 filesystem general commands - Available only when editing an
    ext2 filesystem */
 
 extern void type_ext2___super (char *command_line);
diff --git a/ext2ed/general_com.c b/ext2ed/general_com.c
index c9b2ffc4..aa274e33 100644
--- a/ext2ed/general_com.c
+++ b/ext2ed/general_com.c
@@ -90,7 +90,7 @@ void help (char *command_line)
 	wprintw (show_pad,"EXT2ED ver %s (%s)\n",E2FSPROGS_VERSION, E2FSPROGS_DATE);
 	wprintw (show_pad,"Copyright (C) 1995 Gadi Oxman\n");
 	wprintw (show_pad,"Reviewed 2001 Christian Bac\n");
-	wprintw (show_pad,"Modified and enchanced by Theodore Ts'o, 2002\n");
+	wprintw (show_pad,"Modified and enhanced by Theodore Ts'o, 2002\n");
 	wprintw (show_pad,"EXT2ED is hereby placed under the terms of the GNU General Public License.\n\n");
 	wprintw (show_pad,"EXT2ED was programmed as a student project in the software laboratory\n");
 	wprintw (show_pad,"of the faculty of electrical engineering in the\n");
@@ -140,7 +140,7 @@ void detailed_help (char *text)
 		refresh_show_pad ();return;
 	}
 
-	wprintw (show_pad,"Error - Command %s not aviable now\n",text);
+	wprintw (show_pad,"Error - Command %s not available now\n",text);
 	refresh_show_pad ();return;
 }
 
diff --git a/ext2ed/init.c b/ext2ed/init.c
index 7d9b526f..4e584317 100644
--- a/ext2ed/init.c
+++ b/ext2ed/init.c
@@ -57,7 +57,7 @@ int init (void)
 
 	general_commands.last_command=-1;	/* No commands whatsoever meanwhile */
 	ext2_commands.last_command=-1;
-	add_general_commands ();		/* Add the general commands, aviable always */
+	add_general_commands ();		/* Add the general commands, available always */
 	device_handle=NULL;			/* Notice that our device is still not set up */
 	device_offset=-1;
 	current_type=NULL;			/* No filesystem specific types yet */
@@ -80,8 +80,8 @@ void add_general_commands (void)
 	add_user_command (&general_commands,"help","EXT2ED help system",help);
 	add_user_command (&general_commands,"set","Changes a variable in the current object",set);
 	add_user_command (&general_commands,"setdevice","Selects the filesystem block device (e.g. /dev/hda1)",set_device);
-	add_user_command (&general_commands,"setoffset","Moves asynchronicly in the filesystem",set_offset);
-	add_user_command (&general_commands,"settype","Tells EXT2ED how to interpert the current object",set_type);
+	add_user_command (&general_commands,"setoffset","Moves asynchronously in the filesystem",set_offset);
+	add_user_command (&general_commands,"settype","Tells EXT2ED how to interpret the current object",set_type);
 	add_user_command (&general_commands,"show","Displays the current object",show);
 	add_user_command (&general_commands,"pgup","Scrolls data one page up",pgup);
 	add_user_command (&general_commands,"pgdn","Scrolls data one page down",pgdn);
@@ -316,7 +316,7 @@ Set specific type user commands.
 	}
 
 	if (strcmp ((ptr->name),"ext2_group_desc")==0) {
-		add_user_command (&ptr->type_commands,"next","Pass to the next block group decriptor",type_ext2_group_desc___next);
+		add_user_command (&ptr->type_commands,"next","Pass to the next block group descriptor",type_ext2_group_desc___next);
 		add_user_command (&ptr->type_commands,"prev","Pass to the previous group descriptor",type_ext2_group_desc___prev);
 		add_user_command (&ptr->type_commands,"entry","Pass to a specific group descriptor",type_ext2_group_desc___entry);
 		add_user_command (&ptr->type_commands,"show","Shows the current group descriptor",type_ext2_group_desc___show);
diff --git a/ext2ed/main.c b/ext2ed/main.c
index 4a29979b..f7e7d7df 100644
--- a/ext2ed/main.c
+++ b/ext2ed/main.c
@@ -14,7 +14,7 @@ This file mostly contains:
 2.	The parser, which asks the command line from the user.
 3.	The dispatcher, which analyzes the command line and calls the appropriate handler function.
 4.	A command pattern matcher which is used along with the readline completion feature.
-5.	A function which tells the user that an internal error has occured.
+5.	A function which tells the user that an internal error has occurred.
 
 First written on: March 30 1995
 
@@ -57,7 +57,7 @@ They are initialized below to some logical defaults.
 char Ext2Descriptors [200]="ext2.descriptors";	/* The location of the ext2 filesystem object definition */
 char AlternateDescriptors [200]="";		/* We allow the user to define additional structures */
 char LogFile [200]="ext2ed.log";		/* The location of the log file - Each write will be logged there */
-int LogChanges=1;				/* 1 enables logging, 0 diables logging */
+int LogChanges=1;				/* 1 enables logging, 0 disables logging */
 int AllowChanges=0;				/* When set, the enablewrite command will fail */
 int AllowMountedRead=0;				/* Behavior when trying to open a mounted filesystem read-only */
 int ForceExt2=0;				/* When set, ext2 autodetection is overridden */
@@ -334,7 +334,7 @@ void parser (void)
 
 
 /*
- * This is a very important function. Its task is to recieve a command
+ * This is a very important function. Its task is to receive a command
  * name and link it to a C function.  There are three types of commands:
  *
  * 1.	General commands - Always available and accessed through
@@ -354,7 +354,7 @@ void parser (void)
  *
  * When an handling function is found, it is called along with the
  * command line that was passed to us. The handling function is then
- * free to interpert the arguments in its own style.
+ * free to interpret the arguments in its own style.
  */
 int dispatch (char *command_line)
 {
@@ -480,7 +480,7 @@ char *complete_command (char *text,int state)
 			}
 		}
 
-	/* No, pehaps ext2 specific command then ? */
+	/* No, perhaps ext2 specific command then ? */
 
 	for (i=0;i<=ext2_commands.last_command;i++) {
 		if (strncmp (ext2_commands.names [i],text,len)==0) {