* [PATCH] [media] DocBook: Fix typo in intro.xml
@ 2015-07-13 23:36 Masanari Iida
2015-07-14 18:38 ` Jonathan Corbet
0 siblings, 1 reply; 5+ messages in thread
From: Masanari Iida @ 2015-07-13 23:36 UTC (permalink / raw)
To: mchehab, linux-kernel, linux-media, corbet; +Cc: 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 0, and M enumerates the devices of each type within each
adapter, starting from 0, too. We will omit the “
-<constant>/dev/dvb/adapterN/</constant>” in the further dicussion
-of these devices. The naming scheme for the devices is the same wheter
+<constant>/dev/dvb/adapterN/</constant>” 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] [media] DocBook: Fix typo in intro.xml
2015-07-13 23:36 [PATCH] [media] DocBook: Fix typo in intro.xml Masanari Iida
@ 2015-07-14 18:38 ` Jonathan Corbet
2015-07-24 8:33 ` Hans Verkuil
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Corbet @ 2015-07-14 18:38 UTC (permalink / raw)
To: Masanari Iida; +Cc: mchehab, linux-kernel, linux-media
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] [media] DocBook: Fix typo in intro.xml
2015-07-14 18:38 ` Jonathan Corbet
@ 2015-07-24 8:33 ` Hans Verkuil
2015-07-24 13:10 ` Jonathan Corbet
0 siblings, 1 reply; 5+ messages in thread
From: Hans Verkuil @ 2015-07-24 8:33 UTC (permalink / raw)
To: Jonathan Corbet, Masanari Iida; +Cc: mchehab, linux-kernel, linux-media
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] [media] DocBook: Fix typo in intro.xml
2015-07-24 8:33 ` Hans Verkuil
@ 2015-07-24 13:10 ` Jonathan Corbet
2015-07-24 13:25 ` Hans Verkuil
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Corbet @ 2015-07-24 13:10 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Masanari Iida, mchehab, linux-kernel, linux-media
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] [media] DocBook: Fix typo in intro.xml
2015-07-24 13:10 ` Jonathan Corbet
@ 2015-07-24 13:25 ` Hans Verkuil
0 siblings, 0 replies; 5+ messages in thread
From: Hans Verkuil @ 2015-07-24 13:25 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: Masanari Iida, mchehab, linux-kernel, linux-media
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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-07-24 13:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-13 23:36 [PATCH] [media] DocBook: Fix typo in intro.xml Masanari Iida
2015-07-14 18:38 ` Jonathan Corbet
2015-07-24 8:33 ` Hans Verkuil
2015-07-24 13:10 ` Jonathan Corbet
2015-07-24 13:25 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).