[PATCH] [media] DocBook: Fix typo in intro.xml

[PATCH] [media] DocBook: Fix typo in intro.xml

[Masanari Iida]

This patch fix spelling typos in intro.xml.
This xml file is not created from comments within source,
I fix the xml file.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
---
 Documentation/DocBook/media/dvb/intro.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/DocBook/media/dvb/intro.xml b/Documentation/DocBook/media/dvb/intro.xml
index bcc72c2..4abf6d9 100644
--- a/Documentation/DocBook/media/dvb/intro.xml
+++ b/Documentation/DocBook/media/dvb/intro.xml
@@ -163,8 +163,8 @@ are called:</para>
 <para>where N enumerates the DVB PCI cards in a system starting
 from&#x00A0;0, and M enumerates the devices of each type within each
 adapter, starting from&#x00A0;0, too. We will omit the &#8220;
-<constant>/dev/dvb/adapterN/</constant>&#8221; in the further dicussion
-of these devices. The naming scheme for the devices is the same wheter
+<constant>/dev/dvb/adapterN/</constant>&#8221; in the further discussion
+of these devices. The naming scheme for the devices is the same whether
 devfs is used or not.</para>
 
 <para>More details about the data structures and function calls of all
-- 
2.5.0.rc1

Re: [PATCH] [media] DocBook: Fix typo in intro.xml

[Jonathan Corbet]

On Tue, 14 Jul 2015 08:36:50 +0900
Masanari Iida <standby24x7@gmail.com> wrote:

> This patch fix spelling typos in intro.xml.
> This xml file is not created from comments within source,
> I fix the xml file.

Applied to the docs tree, thanks.

jon

Re: [PATCH] [media] DocBook: Fix typo in intro.xml

[Hans Verkuil]

On 07/14/2015 08:38 PM, Jonathan Corbet wrote:
> On Tue, 14 Jul 2015 08:36:50 +0900
> Masanari Iida <standby24x7@gmail.com> wrote:
> 
>> This patch fix spelling typos in intro.xml.
>> This xml file is not created from comments within source,
>> I fix the xml file.
> 
> Applied to the docs tree, thanks.

Jon, would you mind if I take this patch and let it go through the media
tree? I'd like to apply a patch on top of this one that removes the mention of
devfs.

It makes more sense in general to take patches to Documentation/DocBook/media
via the media route.

Regards,

	Hans

Re: [PATCH] [media] DocBook: Fix typo in intro.xml

[Jonathan Corbet]

On Fri, 24 Jul 2015 10:33:51 +0200
Hans Verkuil <hverkuil@xs4all.nl> wrote:

> Jon, would you mind if I take this patch and let it go through the media
> tree? I'd like to apply a patch on top of this one that removes the mention of
> devfs.

Fine, I'll drop it.

> It makes more sense in general to take patches to Documentation/DocBook/media
> via the media route.

OK.  I'll stick the following into MAINTAINERS so I'm not tempted to grab
them from you :)

jon

MAINTAINERS: Direct Documentation/DocBook/media properly

The media maintainers want DocBook changes to go through their tree;
document that wish accordingly.
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index b9b91566380e..11e2516c2712 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3440,6 +3440,7 @@ X:	Documentation/devicetree/
 X:	Documentation/acpi
 X:	Documentation/power
 X:	Documentation/spi
+X:	Documentation/DocBook/media
 T:	git git://git.lwn.net/linux-2.6.git docs-next
 
 DOUBLETALK DRIVER
-- 
2.4.3

Re: [PATCH] [media] DocBook: Fix typo in intro.xml

[Hans Verkuil]

On 07/24/2015 03:10 PM, Jonathan Corbet wrote:
> On Fri, 24 Jul 2015 10:33:51 +0200
> Hans Verkuil <hverkuil@xs4all.nl> wrote:
> 
>> Jon, would you mind if I take this patch and let it go through the media
>> tree? I'd like to apply a patch on top of this one that removes the mention of
>> devfs.
> 
> Fine, I'll drop it.
> 
>> It makes more sense in general to take patches to Documentation/DocBook/media
>> via the media route.
> 
> OK.  I'll stick the following into MAINTAINERS so I'm not tempted to grab
> them from you :)
> 
> jon
> 
> MAINTAINERS: Direct Documentation/DocBook/media properly
> 
> The media maintainers want DocBook changes to go through their tree;
> document that wish accordingly.

Thank you very much!

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>

Regards,

	Hans

> ---
>  MAINTAINERS | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b9b91566380e..11e2516c2712 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3440,6 +3440,7 @@ X:	Documentation/devicetree/
>  X:	Documentation/acpi
>  X:	Documentation/power
>  X:	Documentation/spi
> +X:	Documentation/DocBook/media
>  T:	git git://git.lwn.net/linux-2.6.git docs-next
>  
>  DOUBLETALK DRIVER
>