diff --git a/[refs] b/[refs] index 91d5446b4aec..c8cc017c993e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6144bb9e7b4c82f7366bd74f8beac826f5f6b7f +refs/heads/master: 6d12760c9f3d961a8bfc23ba9702d12f7eea35dd diff --git a/trunk/README b/trunk/README index 9853cadec8cd..73e2c0c284dd 100644 --- a/trunk/README +++ b/trunk/README @@ -163,7 +163,7 @@ CONFIGURING the kernel: new version with minimal work, use "make oldconfig", which will only ask you for the answers to new questions. - - Alternate configuration commands are: + - Alternative configuration commands are: "make config" Plain text interface. "make menuconfig" Text based color menus, radiolists & dialogs. "make nconfig" Enhanced text based color menus. @@ -328,7 +328,7 @@ IF SOMETHING GOES WRONG: sense of the dump (but compiling with CONFIG_KALLSYMS is usually preferred). This utility can be downloaded from ftp://ftp..kernel.org/pub/linux/utils/kernel/ksymoops/ . - Alternately, you can do the dump lookup by hand: + Alternatively, you can do the dump lookup by hand: - In debugging dumps like the above, it helps enormously if you can look up what the EIP value means. The hex value as such doesn't help @@ -361,7 +361,7 @@ IF SOMETHING GOES WRONG: kernel image or similar), telling me as much about your setup as possible will help. Please read the REPORTING-BUGS document for details. - - Alternately, you can use gdb on a running kernel. (read-only; i.e. you + - Alternatively, you can use gdb on a running kernel. (read-only; i.e. you cannot change values or set break points.) To do this, first compile the kernel with -g; edit arch/i386/Makefile appropriately, then do a "make clean". You'll also need to enable CONFIG_PROC_FS (via "make config").