diff --git a/disk/raid.c b/disk/raid.c index 663bab882..d5015e047 100644 --- a/disk/raid.c +++ b/disk/raid.c @@ -162,7 +162,7 @@ grub_raid_read (grub_disk_t disk, grub_disk_addr_t sector, read_size = size; /* Check whether the sector was aligned on a chunk size - bounday. If this isn't the case, it's the first read + boundary. If this isn't the case, it's the first read and the next read should be set back to start of the boundary. */ grub_divmod64 (read_sector, array->chunk_size, &i); @@ -282,7 +282,7 @@ grub_raid_read (grub_disk_t disk, grub_disk_addr_t sector, read_size = size; /* Check whether the sector was aligned on a chunk size - bounday. If this isn't the case, it's the first read + boundary. If this isn't the case, it's the first read and the next read should be set back to start of the boundary. */ grub_divmod64 (read_sector, array->chunk_size, &i); diff --git a/fs/ext2.c b/fs/ext2.c index 1aeaa9481..ec665827b 100644 --- a/fs/ext2.c +++ b/fs/ext2.c @@ -21,7 +21,7 @@ #define EXT2_MAGIC 0xEF53 /* Amount of indirect blocks in an inode. */ #define INDIRECT_BLOCKS 12 -/* Maximum lenght of a pathname. */ +/* Maximum length of a pathname. */ #define EXT2_PATH_MAX 4096 /* Maximum nesting of symlinks, used to prevent a loop. */ #define EXT2_MAX_SYMLINKCNT 8 @@ -146,7 +146,7 @@ struct grub_ext2_inode grub_uint32_t dir_blocks[INDIRECT_BLOCKS]; grub_uint32_t indir_block; grub_uint32_t double_indir_block; - grub_uint32_t tripple_indir_block; + grub_uint32_t triple_indir_block; } blocks; char symlink[60]; }; @@ -251,11 +251,11 @@ grub_ext2_read_block (grub_fshelp_node_t node, int fileblock) blknr = grub_le_to_cpu32 (indir[rblock % perblock]); } - /* Tripple indirect. */ + /* triple indirect. */ else { grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "ext2fs doesn't support tripple indirect blocks"); + "ext2fs doesn't support triple indirect blocks"); blknr = -1; } diff --git a/fs/hfs.c b/fs/hfs.c index be129b4cd..e8e9c3e50 100644 --- a/fs/hfs.c +++ b/fs/hfs.c @@ -43,7 +43,7 @@ enum GRUB_HFS_FILETYPE_FILE = 2 }; -/* A node desciptor. This is the header of every node. */ +/* A node descriptor. This is the header of every node. */ struct grub_hfs_node { grub_uint32_t next; diff --git a/fs/hfsplus.c b/fs/hfsplus.c index c3e57a4ca..fe7253945 100644 --- a/fs/hfsplus.c +++ b/fs/hfsplus.c @@ -303,7 +303,7 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, int fileblock) blk = grub_hfsplus_find_block (extents, &blksleft); /* The previous iteration of this loop allocated memory. The - code above used this memory, it can be free'ed now. */ + code above used this memory, it can be freed now. */ grub_free (nnode); nnode = 0; @@ -505,7 +505,7 @@ grub_hfsplus_cmp_catkey (struct grub_hfsplus_key *keya, if (diff) return diff; - /* Change the filename in keya so the endianess is correct. */ + /* Change the filename in keya so the endianness is correct. */ for (i = 0; i < grub_be_to_cpu16 (catkey_a->namelen); i++) catkey_a->name[i] = grub_be_to_cpu16 (catkey_a->name[i]); @@ -521,7 +521,7 @@ grub_hfsplus_cmp_catkey (struct grub_hfsplus_key *keya, grub_free (filename); - /* The endianess was changed to host format, change it back to + /* The endianness was changed to host format, change it back to whatever it was. */ for (i = 0; i < grub_be_to_cpu16 (catkey_a->namelen); i++) catkey_a->name[i] = grub_cpu_to_be16 (catkey_a->name[i]); @@ -606,7 +606,7 @@ grub_hfsplus_btree_iterate_node (struct grub_hfsplus_btree *btree, /* Lookup the node described by KEY in the B+ Tree BTREE. Compare keys using the function COMPARE_KEYS. When a match is found, return the node in MATCHNODE and a pointer to the data in this node - in KEYOFFSET. MATCHNODE should be free'ed by the caller. */ + in KEYOFFSET. MATCHNODE should be freed by the caller. */ static grub_err_t grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree, struct grub_hfsplus_key_internal *key, @@ -661,7 +661,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree, { grub_uint32_t *pointer; - /* The place where the key could've been found didn't + /* The place where the key could have been found didn't contain the key. This means that the previous match is the one that should be followed. */ if (compare_keys (currkey, key) > 0) @@ -943,7 +943,7 @@ grub_hfsplus_label (grub_device_t device __attribute__((unused)) /* XXX: It's not documented how to read a label. */ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "reading the label of a HFS+ " - "partiton is not implemented"); + "partition is not implemented"); } diff --git a/fs/iso9660.c b/fs/iso9660.c index 325068b06..15ce51d26 100644 --- a/fs/iso9660.c +++ b/fs/iso9660.c @@ -283,13 +283,13 @@ grub_iso9660_mount (grub_disk_t disk) /* Test if the SUSP protocol is used on this filesystem. */ if (grub_strncmp ((char *) entry->sig, "SP", 2) == 0) { - /* The 2nd data byte stored how many bytes are skipped everytime + /* The 2nd data byte stored how many bytes are skipped every time to get to the SUA (System Usage Area). */ data->susp_skip = entry->data[2]; entry = (struct grub_iso9660_susp_entry *) ((char *) entry + entry->len); /* Iterate over the entries in the SUA area to detect - entensions. */ + extensions. */ if (grub_iso9660_susp_iterate (data, (grub_le_to_cpu32 (data->voldesc.rootdir.first_sector) << GRUB_ISO9660_LOG2_BLKSZ), diff --git a/fs/jfs.c b/fs/jfs.c index be489b9b2..8a027aec8 100644 --- a/fs/jfs.c +++ b/fs/jfs.c @@ -478,7 +478,7 @@ grub_jfs_getent (struct grub_jfs_diropen *diro) { unsigned int next; - /* If the inode contains the entrie tree or if this was the last + /* If the inode contains the entry tree or if this was the last node, there is nothing to read. */ if ((diro->inode->file.tree.flags & GRUB_JFS_TREE_LEAF) || !grub_le_to_cpu64 (diro->dirpage->header.nextb)) diff --git a/fs/ufs.c b/fs/ufs.c index ba7bfb03f..917d9a295 100644 --- a/fs/ufs.c +++ b/fs/ufs.c @@ -231,7 +231,7 @@ grub_ufs_get_file_block (struct grub_ufs_data *data, unsigned int blk) grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "ufs does not support tripple indirect blocks"); + "ufs does not support triple indirect blocks"); return 0; } diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h index c7d0c123a..6c2975337 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -711,7 +711,7 @@ struct grub_efi_boot_services (*reinstall_protocol_interface) (grub_efi_handle_t handle, grub_efi_guid_t *protocol, void *old_interface, - void *new_inteface); + void *new_interface); grub_efi_status_t (*uninstall_protocol_interface) (grub_efi_handle_t handle, diff --git a/include/grub/elf.h b/include/grub/elf.h index 91f1f3ccd..9aec816c7 100644 --- a/include/grub/elf.h +++ b/include/grub/elf.h @@ -799,7 +799,7 @@ typedef struct #define VER_NDX_LORESERVE 0xff00 /* Beginning of reserved entries. */ #define VER_NDX_ELIMINATE 0xff01 /* Symbol is to be eliminated. */ -/* Auxialiary version information. */ +/* Auxiliary version information. */ typedef struct { diff --git a/include/grub/i386/pc/vbe.h b/include/grub/i386/pc/vbe.h index c00d7d019..3a301cb14 100644 --- a/include/grub/i386/pc/vbe.h +++ b/include/grub/i386/pc/vbe.h @@ -39,8 +39,8 @@ Please refer to VESA BIOS Extension 3.0 Specification for more descriptive meanings of following structures and how they should be used. - I have tried to maintain field name comatibility against specification - while following naming convetions used in GRUB. */ + I have tried to maintain field name compatibility against specification + while following naming conventions used in GRUB. */ typedef grub_uint32_t grub_vbe_farptr_t; typedef grub_uint32_t grub_vbe_physptr_t; @@ -68,7 +68,7 @@ struct grub_vbe_info_block struct grub_vbe_mode_info_block { - /* Mandory information for all VBE revisions. */ + /* Mandatory information for all VBE revisions. */ grub_uint16_t mode_attributes; grub_uint8_t win_a_attributes; grub_uint8_t win_b_attributes; @@ -79,7 +79,7 @@ struct grub_vbe_mode_info_block grub_vbe_farptr_t win_func_ptr; grub_uint16_t bytes_per_scan_line; - /* Mandory information for VBE 1.2 and above. */ + /* Mandatory information for VBE 1.2 and above. */ grub_uint16_t x_resolution; grub_uint16_t y_resolution; grub_uint8_t x_char_size; @@ -103,12 +103,12 @@ struct grub_vbe_mode_info_block grub_uint8_t rsvd_field_position; grub_uint8_t direct_color_mode_info; - /* Mandory information for VBE 2.0 and above. */ + /* Mandatory information for VBE 2.0 and above. */ grub_vbe_physptr_t phys_base_addr; grub_uint32_t reserved2; grub_uint16_t reserved3; - /* Mandory information for VBE 3.0 and above. */ + /* Mandatory information for VBE 3.0 and above. */ grub_uint16_t lin_bytes_per_scan_line; grub_uint8_t bnk_number_of_image_pages; grub_uint8_t lin_number_of_image_pages; @@ -148,7 +148,7 @@ struct grub_vbe_palette_data grub_uint8_t blue; grub_uint8_t green; grub_uint8_t red; - grub_uint8_t aligment; + grub_uint8_t alignment; } __attribute__ ((packed)); /* Prototypes for kernel real mode thunks. */ @@ -220,7 +220,7 @@ struct grub_video_render_target unsigned int height; } viewport; - /* Indicates wether the data has been allocated by us and must be freed + /* Indicates whether the data has been allocated by us and must be freed when render target is destroyed. */ int is_allocated; diff --git a/include/grub/i386/time.h b/include/grub/i386/time.h index a09d793d2..842882cf2 100644 --- a/include/grub/i386/time.h +++ b/include/grub/i386/time.h @@ -22,7 +22,7 @@ static __inline void grub_cpu_idle (void) { - /* FIXME: this can't work untill we handle interrupts. */ + /* FIXME: this can't work until we handle interrupts. */ /* __asm__ __volatile__ ("hlt"); */ } diff --git a/include/grub/video.h b/include/grub/video.h index e617196b8..be395ca7f 100644 --- a/include/grub/video.h +++ b/include/grub/video.h @@ -22,7 +22,7 @@ #include #include -/* Video color in hardware dependant format. Users should not assume any +/* Video color in hardware dependent format. Users should not assume any specific coding format. */ typedef grub_uint32_t grub_video_color_t; diff --git a/io/gzio.c b/io/gzio.c index 62d5c720c..0fada6cc5 100644 --- a/io/gzio.c +++ b/io/gzio.c @@ -56,9 +56,9 @@ /* The state stored in filesystem-specific data. */ struct grub_gzio { - /* The underlyding file object. */ + /* The underlying file object. */ grub_file_t file; - /* The offset at which the data starts in the underlyding file. */ + /* The offset at which the data starts in the underlying file. */ grub_off_t data_offset; /* The type of current block. */ int block_type; @@ -79,7 +79,7 @@ struct grub_gzio unsigned long bb; /* The bits in the bit buffer. */ unsigned bk; - /* Ths sliding window in uncompressed data. */ + /* The sliding window in uncompressed data. */ grub_uint8_t slide[WSIZE]; /* Current position in the slide. */ unsigned wp; diff --git a/kern/env.c b/kern/env.c index 6696c1822..6ab10e2a1 100644 --- a/kern/env.c +++ b/kern/env.c @@ -53,7 +53,7 @@ grub_env_hashval (const char *s) { unsigned int i = 0; - /* XXX: This can be done much more effecient. */ + /* XXX: This can be done much more efficiently. */ while (*s) i += 5 * *(s++); diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S index 4267f5b7d..c1da148aa 100644 --- a/kern/i386/pc/startup.S +++ b/kern/i386/pc/startup.S @@ -1089,7 +1089,7 @@ xsmap: * character and the attribute, and restore the current position. * * The reason why this is so complicated is that there is no easy way to - * get the height of the screen, and the TELETYPE OUPUT BIOS call doesn't + * get the height of the screen, and the TELETYPE OUTPUT BIOS call doesn't * support setting a background attribute. */ FUNCTION(grub_console_real_putchar) diff --git a/kern/misc.c b/kern/misc.c index 4cb846d5e..9ac88f63d 100644 --- a/kern/misc.c +++ b/kern/misc.c @@ -576,7 +576,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint32_t d, grub_uint32_t *r) unsigned long long q = 0; unsigned m = 0; - /* Skip the slow computation, if 32-bit arithmetics are possible. */ + /* Skip the slow computation if 32-bit arithmetic is possible. */ if (n < 0xffffffff) { if (r) diff --git a/kern/mm.c b/kern/mm.c index 736039e10..b56c4ab6f 100644 --- a/kern/mm.c +++ b/kern/mm.c @@ -164,7 +164,7 @@ grub_mm_init_region (void *addr, grub_size_t size) r->size = (h->size << GRUB_MM_ALIGN_LOG2); /* Find where to insert this region. Put a smaller one before bigger ones, - to prevent fragmentations. */ + to prevent fragmentation. */ for (p = &base, q = *p; q; p = &(q->next), q = *p) if (q->size > r->size) break; diff --git a/kern/powerpc/ieee1275/cmain.c b/kern/powerpc/ieee1275/cmain.c index ab7ae660f..c9d13f059 100644 --- a/kern/powerpc/ieee1275/cmain.c +++ b/kern/powerpc/ieee1275/cmain.c @@ -88,7 +88,7 @@ grub_ieee1275_find_options (void) 3rd party updates which fix the partition bugs are common, and for some reason their fixes aren't being merged into trunk. So for example we know that 1.2 and 1.3 are broken, but there's 1.2.99 - and 1.3.99 which are known good (and appliing this workaround + and 1.3.99 which are known good (and applying this workaround would cause breakage). */ if (!grub_strcmp (tmp, "1.0") || !grub_strcmp (tmp, "1.1") diff --git a/kern/powerpc/ieee1275/openfw.c b/kern/powerpc/ieee1275/openfw.c index b8207b028..d8f7189af 100644 --- a/kern/powerpc/ieee1275/openfw.c +++ b/kern/powerpc/ieee1275/openfw.c @@ -1,4 +1,4 @@ -/* openfw.c -- Open firmware support funtions. */ +/* openfw.c -- Open firmware support functions. */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc. @@ -159,7 +159,7 @@ grub_err_t grub_available_iterate (int (*hook) (grub_uint64_t, grub_uint64_t)) if (grub_ieee1275_get_property (memory, "available", available, sizeof available, 0)) return grub_error (GRUB_ERR_UNKNOWN_DEVICE, - "Couldn't examine /memory/available propery"); + "Couldn't examine /memory/available property"); /* Decode each entry and call `hook'. */ i = 0; diff --git a/kern/sparc64/ieee1275/openfw.c b/kern/sparc64/ieee1275/openfw.c index 5f2f20c08..03c6a66ec 100644 --- a/kern/sparc64/ieee1275/openfw.c +++ b/kern/sparc64/ieee1275/openfw.c @@ -1,4 +1,4 @@ -/* openfw.c -- Open firmware support funtions. */ +/* openfw.c -- Open firmware support functions. */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 2003,2004,2005,2007 Free Software Foundation, Inc. diff --git a/normal/execute.c b/normal/execute.c index c7946e304..4462ddd59 100644 --- a/normal/execute.c +++ b/normal/execute.c @@ -231,7 +231,7 @@ grub_script_execute_menuentry (struct grub_script_cmd *cmd) return grub_errno; } - /* XXX: When this fails, the memory should be free'ed? */ + /* XXX: When this fails, the memory should be freed? */ return grub_normal_menu_addentry (title, script, cmd_menuentry->sourcecode); } diff --git a/normal/lexer.c b/normal/lexer.c index 053a770a1..b72b4ee47 100644 --- a/normal/lexer.c +++ b/normal/lexer.c @@ -254,7 +254,7 @@ grub_script_yylex2 (YYSTYPE *yylval, struct grub_parser_param *parsestate) break; /* If the string is not quoted or escaped, stop processing - when a special token was found. It will be recognised + when a special token was found. It will be recognized next time when this function is called. */ if (newstate == GRUB_PARSER_STATE_TEXT && state->state != GRUB_PARSER_STATE_ESC) diff --git a/normal/menu_entry.c b/normal/menu_entry.c index f754b85d2..6bb947eed 100644 --- a/normal/menu_entry.c +++ b/normal/menu_entry.c @@ -335,7 +335,7 @@ insert_string (struct screen *screen, char *s, int update) int size; int orig_num, new_num; - /* Find a string delimitted by LF. */ + /* Find a string delimited by LF. */ p = grub_strchr (s, '\n'); if (! p) p = s + grub_strlen (s); diff --git a/normal/parser.y b/normal/parser.y index 02fe8c55c..19cd1bd09 100644 --- a/normal/parser.y +++ b/normal/parser.y @@ -92,7 +92,7 @@ argument: GRUB_PARSER_TOKEN_VAR $$ = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_STR, $1); } /* XXX: Currently disabled to simplify the parser. This should be - parsed by yet another parser for readibility. */ + parsed by yet another parser for readability. */ /* | argument GRUB_PARSER_TOKEN_VAR */ /* { */ /* $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_VAR, $2); */ @@ -163,14 +163,14 @@ commands: command '\n' change any stuff because it might seem like a fun thing to do! Special care was take to make sure the mid-rule actions are executed on the right moment. So the `commands' rule should be - recognised after executing the `grub_script_mem_record; and before + recognized after executing the `grub_script_mem_record; and before `grub_script_mem_record_stop'. */ function: "function" GRUB_PARSER_TOKEN_NAME { grub_script_lexer_ref (state->lexerstate); } newlines '{' { - /* The first part of the function was recognised. + /* The first part of the function was recognized. Now start recording the memory usage to store this function. */ state->func_mem = grub_script_mem_record (state); diff --git a/normal/script.c b/normal/script.c index 475a03a49..5169e4949 100644 --- a/normal/script.c +++ b/normal/script.c @@ -24,14 +24,14 @@ /* It is not possible to deallocate the memory when a syntax error was found. Because of that it is required to keep track of all memory - allocations. The memory is free'ed in case of an error, or + allocations. The memory is freed in case of an error, or assigned to the parsed script when parsing was successful. */ /* XXX */ /* In case of the normal malloc, some additional bytes are allocated for this datastructure. All reserved memory is stored in a linked - list so it can be easily free'ed. The original memory can be found + list so it can be easily freed. The original memory can be found from &mem. */ struct grub_script_mem { @@ -230,7 +230,7 @@ grub_script_create_cmdmenu (struct grub_parser_param *state, cmd = grub_script_malloc (state, sizeof (*cmd)); cmd->cmd.exec = grub_script_execute_menuentry; cmd->cmd.next = 0; - /* XXX: Check if this memory is properly free'ed. */ + /* XXX: Check if this memory is properly freed. */ cmd->sourcecode = sourcecode; cmd->title = title; cmd->options = options; diff --git a/partmap/acorn.c b/partmap/acorn.c index a136d8167..9db5e0e45 100644 --- a/partmap/acorn.c +++ b/partmap/acorn.c @@ -27,8 +27,8 @@ #define LINUX_SWAP_MAGIC grub_cpu_to_le32 (0xdeafab1e) #define LINUX_MAP_ENTRIES (512 / 12) -#define NONADFS_PARTITON_TYPE_LINUX 9 -#define NONADFS_PARTITON_TYPE_MASK 15 +#define NONADFS_PARTITION_TYPE_LINUX 9 +#define NONADFS_PARTITION_TYPE_MASK 15 struct grub_acorn_boot_block { @@ -65,7 +65,7 @@ acorn_partition_map_find (grub_disk_t disk, struct linux_part *m, if (err) return err; - if ((boot.flags & NONADFS_PARTITON_TYPE_MASK) != NONADFS_PARTITON_TYPE_LINUX) + if ((boot.flags & NONADFS_PARTITION_TYPE_MASK) != NONADFS_PARTITION_TYPE_LINUX) goto fail; for (i = 0; i != 0x1ff; ++i) diff --git a/partmap/sun.c b/partmap/sun.c index 46376f5ab..b05a2e2a3 100644 --- a/partmap/sun.c +++ b/partmap/sun.c @@ -110,13 +110,13 @@ sun_partition_map_iterate (grub_disk_t disk, (char *) &block) == GRUB_ERR_NONE) { if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.magic)) - grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partiton table"); + grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partition table"); if (! grub_sun_is_valid (&block)) grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum"); /* Maybe another error value would be better, because partition - table _is_ recognised but invalid. */ + table _is_ recognized but invalid. */ for (partnum = 0; partnum < GRUB_PARTMAP_SUN_MAX_PARTS; partnum++) { struct grub_sun_partition_descriptor *desc; diff --git a/term/gfxterm.c b/term/gfxterm.c index 0ace430a9..f1144bfd0 100644 --- a/term/gfxterm.c +++ b/term/gfxterm.c @@ -349,7 +349,7 @@ grub_gfxterm_init (void) /* Try out video mode. */ - /* If we have 8 or less bits, then assuem that it is indexed color mode. */ + /* If we have 8 or less bits, then assume that it is indexed color mode. */ if ((depth <= 8) && (depth != -1)) flags |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR; @@ -399,7 +399,7 @@ grub_gfxterm_init (void) { /* No gfxmode variable set, use defaults. */ - /* If we have 8 or less bits, then assuem that it is indexed color mode. */ + /* If we have 8 or less bits, then assume that it is indexed color mode. */ if ((depth <= 8) && (depth != -1)) flags |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR; diff --git a/term/i386/pc/serial.c b/term/i386/pc/serial.c index 1fc2be137..762d4e9c0 100644 --- a/term/i386/pc/serial.c +++ b/term/i386/pc/serial.c @@ -88,7 +88,7 @@ serial_hw_fetch (void) return -1; } -/* Put a chararacter. */ +/* Put a character. */ static void serial_hw_put (const int c) { @@ -273,7 +273,7 @@ serial_hw_init (void) { unsigned char status = 0; - /* Turn off the interupt. */ + /* Turn off the interrupt. */ grub_outb (0, serial_settings.port + UART_IER); /* Set DLAB. */ diff --git a/term/i386/pc/vesafb.c b/term/i386/pc/vesafb.c index d14ad89ca..c1811a846 100644 --- a/term/i386/pc/vesafb.c +++ b/term/i386/pc/vesafb.c @@ -54,7 +54,7 @@ struct grub_colored_char struct grub_virtual_screen { - /* Dimensions of the virual screen. */ + /* Dimensions of the virtual screen. */ grub_uint32_t width; grub_uint32_t height; @@ -77,7 +77,7 @@ struct grub_virtual_screen grub_uint8_t fg_color; grub_uint8_t bg_color; - /* Text buffer for virual screen. Contains (columns * rows) number + /* Text buffer for virtual screen. Contains (columns * rows) number of entries. */ struct grub_colored_char *text_buffer; }; @@ -376,7 +376,7 @@ scroll_up (void) virtual_screen.text_buffer[i].index = 0; } - /* Scroll frambuffer with one line to up. */ + /* Scroll framebuffer with one line to up. */ grub_memmove (framebuffer, framebuffer + bytes_per_scan_line * virtual_screen.char_height, diff --git a/util/biosdisk.c b/util/biosdisk.c index accb8fcc4..c80c335c5 100644 --- a/util/biosdisk.c +++ b/util/biosdisk.c @@ -425,7 +425,7 @@ grub_util_biosdisk_read (grub_disk_t disk, grub_disk_addr_t sector, #ifdef __linux__ if (sector == 0 && size > 1) { - /* Work around a bug in linux's ez remapping. Linux remaps all + /* Work around a bug in Linux ez remapping. Linux remaps all sectors that are read together with the MBR in one read. It should only remap the MBR, so we split the read in two parts. -jochen */ diff --git a/util/genmoddep.c b/util/genmoddep.c index f4dc66a11..e2620a81f 100644 --- a/util/genmoddep.c +++ b/util/genmoddep.c @@ -257,7 +257,7 @@ main (int argc, char *argv[]) /* First, get defined symbols. */ read_defined_symbols (stdin); - /* Second, find the dependecies. */ + /* Second, find the dependencies. */ for (i = 1; i < argc; i++) { FILE *fp; diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in index 3e1dda6ed..63ff61e08 100644 --- a/util/i386/efi/grub-install.in +++ b/util/i386/efi/grub-install.in @@ -61,7 +61,7 @@ Install GRUB on your EFI partition. --no-floppy do not probe any floppy drive --recheck probe a device map even if it already exists -grub-install copies GRUB images into the DIR/boot directory specfied by +grub-install copies GRUB images into the DIR/boot directory specified by --root-directory. Report bugs to . diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in index a2d9c5b43..e705086c6 100644 --- a/util/i386/pc/grub-install.in +++ b/util/i386/pc/grub-install.in @@ -69,7 +69,7 @@ Install GRUB on your drive. INSTALL_DEVICE can be a GRUB device name or a system device filename. -grub-install copies GRUB images into the DIR/boot directory specfied by +grub-install copies GRUB images into the DIR/boot directory specified by --root-directory, and uses grub-setup to install grub into the boot sector. diff --git a/util/powerpc/ieee1275/grub-install.in b/util/powerpc/ieee1275/grub-install.in index 2f917829c..827b827f9 100644 --- a/util/powerpc/ieee1275/grub-install.in +++ b/util/powerpc/ieee1275/grub-install.in @@ -65,7 +65,7 @@ Install GRUB on your drive. --grub-probe=FILE use FILE as grub-probe --no-nvram don't update the boot-device NVRAM variable -grub-install copies GRUB images into the DIR/boot directory specfied by +grub-install copies GRUB images into the DIR/boot directory specified by --root-directory, and uses nvsetenv to set the Open Firmware boot-device variable. diff --git a/util/update-grub.in b/util/update-grub.in index f9f69b97f..f60e6287c 100644 --- a/util/update-grub.in +++ b/util/update-grub.in @@ -69,7 +69,7 @@ if test -e ${grub_prefix}/device.map ; then : ; else grub-mkdevicemap fi -# Device containing our userland. Typicaly used for root= parameter. +# Device containing our userland. Typically used for root= parameter. GRUB_DEVICE="`grub-probe --target=device /`" # Filesystem for the device containing our userland. Used for stuff like @@ -135,7 +135,7 @@ cat << EOF # # DO NOT EDIT THIS FILE # -# It is automaticaly generated by $0 using templates +# It is automatically generated by $0 using templates # from ${update_grub_dir} and settings from ${sysconfdir}/default/grub # EOF diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c index 5aded70de..8d4fe16aa 100644 --- a/video/i386/pc/vbe.c +++ b/video/i386/pc/vbe.c @@ -606,7 +606,7 @@ grub_video_vbe_set_viewport (unsigned int x, unsigned int y, unsigned int width, unsigned int height) { /* Make sure viewport is withing screen dimensions. If viewport was set - to be out of the reqion, mark its size as zero. */ + to be out of the region, mark its size as zero. */ if (x > active_mode_info.x_resolution) { x = 0; @@ -766,7 +766,7 @@ grub_video_vbe_unmap_color (struct grub_video_i386_vbeblit_info * source, if ((mode_info->mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != 0) { - /* If we have out of bounds color, return trasnparent black. */ + /* If we have an out-of-bounds color, return transparent black. */ if (color > 255) { *red = 0; @@ -958,7 +958,7 @@ grub_video_vbe_blit_glyph (struct grub_font_glyph * glyph, return GRUB_ERR_NONE; } -/* NOTE: This function assumes that given coordiantes are within bounds of +/* NOTE: This function assumes that given coordinates are within bounds of handled data. */ static void common_blitter (struct grub_video_i386_vbeblit_info *target, @@ -1435,7 +1435,7 @@ grub_video_vbe_create_render_target (struct grub_video_render_target **result, target->mode_info.bpp = 32; target->mode_info.bytes_per_pixel = 4; target->mode_info.pitch = target->mode_info.bytes_per_pixel * width; - target->mode_info.number_of_colors = 256; /* Emulated paletted. */ + target->mode_info.number_of_colors = 256; /* Emulated palette. */ target->mode_info.red_mask_size = 8; target->mode_info.red_field_pos = 0; target->mode_info.green_mask_size = 8; diff --git a/video/readers/tga.c b/video/readers/tga.c index 6acb5920b..7b944b09f 100644 --- a/video/readers/tga.c +++ b/video/readers/tga.c @@ -327,7 +327,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap, ID from end of file, but we really don't care about that as we are not going to support developer area & extensions at this point. */ - /* Read TGA header from begining of file. */ + /* Read TGA header from beginning of file. */ if (grub_file_read (file, (char*)&header, sizeof (header)) != sizeof (header)) { @@ -440,7 +440,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap, } } - /* If there were loading proble, destroy bitmap. */ + /* If there was a loading problem, destroy bitmap. */ if (grub_errno != GRUB_ERR_NONE) { grub_video_bitmap_destroy (*bitmap); diff --git a/video/video.c b/video/video.c index 5d01f0da5..bd434462e 100644 --- a/video/video.c +++ b/video/video.c @@ -20,7 +20,7 @@ #include #include -/* The list of video adapters registerd to system. */ +/* The list of video adapters registered to system. */ static grub_video_adapter_t grub_video_adapter_list; /* Active video adapter. */ @@ -112,7 +112,7 @@ grub_video_setup (unsigned int width, unsigned int height, "Can't locate valid adapter for mode"); } -/* Restore back to initial mode (where applicaple). */ +/* Restore back to initial mode (where applicable). */ grub_err_t grub_video_restore (void) {