[PATCH] [trivial] fix references to Documentation/x86/i386/boot.txt

[PATCH] [trivial] fix references to Documentation/x86/i386/boot.txt

[Kyle McMartin]

From: Kyle McMartin <kyle@redhat.com>

The amazing dancing boot.txt file has jumped places again. :)

Signed-off-by: Kyle McMartin <kyle@redhat.com>

---
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b182626..37b6a73 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -114,7 +114,7 @@ In addition, the following text indicates that the option:
 Parameters denoted with BOOT are actually interpreted by the boot
 loader, and have no meaning to the kernel directly.
 Do not modify the syntax of boot loader parameters without extreme
-need or coordination with <Documentation/x86/i386/boot.txt>.
+need or coordination with <Documentation/x86/boot.txt>.
 
 There are also arch-specific kernel-parameters not documented here.
 See for example <Documentation/x86/x86_64/boot-options.txt>.
@@ -2449,7 +2449,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See Documentation/fb/modedb.txt.
 
 	vga=		[BOOT,X86-32] Select a particular video mode
-			See Documentation/x86/i386/boot.txt and
+			See Documentation/x86/boot.txt and
 			Documentation/svga.txt.
 			Use vga=ask for menu.
 			This is actually a boot loader parameter; the value is

Re: [PATCH] [trivial] fix references to Documentation/x86/i386/boot.txt

[Randy Dunlap]

Kyle McMartin wrote:
> From: Kyle McMartin <kyle@redhat.com>
> 
> The amazing dancing boot.txt file has jumped places again. :)
> 
> Signed-off-by: Kyle McMartin <kyle@redhat.com>

Thanks.  I'll merge it if the x86 people don't.

> ---
> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
> index b182626..37b6a73 100644
> --- a/Documentation/kernel-parameters.txt
> +++ b/Documentation/kernel-parameters.txt
> @@ -114,7 +114,7 @@ In addition, the following text indicates that the option:
>  Parameters denoted with BOOT are actually interpreted by the boot
>  loader, and have no meaning to the kernel directly.
>  Do not modify the syntax of boot loader parameters without extreme
> -need or coordination with <Documentation/x86/i386/boot.txt>.
> +need or coordination with <Documentation/x86/boot.txt>.
>  
>  There are also arch-specific kernel-parameters not documented here.
>  See for example <Documentation/x86/x86_64/boot-options.txt>.
> @@ -2449,7 +2449,7 @@ and is between 256 and 4096 characters. It is defined in the file
>  			See Documentation/fb/modedb.txt.
>  
>  	vga=		[BOOT,X86-32] Select a particular video mode
> -			See Documentation/x86/i386/boot.txt and
> +			See Documentation/x86/boot.txt and
>  			Documentation/svga.txt.
>  			Use vga=ask for menu.
>  			This is actually a boot loader parameter; the value is


-- 
~Randy

Re: [PATCH] [trivial] fix references to Documentation/x86/i386/boot.txt

[H. Peter Anvin]

Randy Dunlap wrote:
> Kyle McMartin wrote:
>> From: Kyle McMartin <kyle@redhat.com>
>>
>> The amazing dancing boot.txt file has jumped places again. :)
>>
>> Signed-off-by: Kyle McMartin <kyle@redhat.com>
> 
> Thanks.  I'll merge it if the x86 people don't.

I'll be happy to merge it if I get an unmolested patch.

boot.txt is one of several files which got moved into x86/i386 in 
error... they never were i386 specific (as opposed to x86 specific).

	-hpa

[PATCH] [trivial] fix references to Documentation/x86/i386/boot.txt

[Kyle McMartin]

From: Kyle McMartin <kyle@redhat.com>

The amazing dancing boot.txt file has jumped places again. :)

Signed-off-by: Kyle McMartin <kyle@redhat.com>

---
Resending to x86@kernel.org, cheers.

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b182626..37b6a73 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -114,7 +114,7 @@ In addition, the following text indicates that the option:
 Parameters denoted with BOOT are actually interpreted by the boot
 loader, and have no meaning to the kernel directly.
 Do not modify the syntax of boot loader parameters without extreme
-need or coordination with <Documentation/x86/i386/boot.txt>.
+need or coordination with <Documentation/x86/boot.txt>.
 
 There are also arch-specific kernel-parameters not documented here.
 See for example <Documentation/x86/x86_64/boot-options.txt>.
@@ -2449,7 +2449,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See Documentation/fb/modedb.txt.
 
 	vga=		[BOOT,X86-32] Select a particular video mode
-			See Documentation/x86/i386/boot.txt and
+			See Documentation/x86/boot.txt and
 			Documentation/svga.txt.
 			Use vga=ask for menu.
 			This is actually a boot loader parameter; the value is
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/