public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] uio-howto.tmpl: use standard copyright/legal markings
@ 2008-06-23  3:12 Mike Frysinger
  2008-06-24  7:20 ` Andrew Morton
  0 siblings, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2008-06-23  3:12 UTC (permalink / raw)
  To: hjk, linux-kernel, akpm

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1397 bytes --]

The Userspace I/O HOWTO document uses straight <sect1> tags and plain text
to describe copyright/legal information.  It should instead use the
<copyright> and <legalnotice> tags like all other documents in the kernel.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Documentation/DocBook/uio-howto.tmpl |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index fdd7f4f..3da4855 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -21,6 +21,18 @@
     </affiliation>
 </author>
 
+<copyright>
+	<year>2006</year>
+	<holder>Hans-Jürgen Koch.</holder>
+</copyright>
+
+<legalnotice>
+<para>
+This documentation is Free Software licensed under the terms of the
+GPL version 2.
+</para>
+</legalnotice>
+
 <pubdate>2006-12-11</pubdate>
 
 <abstract>
@@ -60,17 +72,6 @@
 <?dbhtml filename="about.html"?>
 <title>About this document</title>
 
-<sect1 id="copyright">
-<?dbhtml filename="copyright.html"?>
-<title>Copyright and License</title>
-<para>
-      Copyright (c) 2006 by Hans-Jürgen Koch.</para>
-<para>
-This documentation is Free Software licensed under the terms of the
-GPL version 2.
-</para>
-</sect1>
-
 <sect1 id="translations">
 <?dbhtml filename="translations.html"?>
 <title>Translations</title>
-- 
1.5.5.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] uio-howto.tmpl: use standard copyright/legal markings
  2008-06-23  3:12 [PATCH] uio-howto.tmpl: use standard copyright/legal markings Mike Frysinger
@ 2008-06-24  7:20 ` Andrew Morton
  2008-06-24  9:45   ` Mike Frysinger
  2008-06-24 10:53   ` Mike Frysinger
  0 siblings, 2 replies; 6+ messages in thread
From: Andrew Morton @ 2008-06-24  7:20 UTC (permalink / raw)
  To: Mike Frysinger; +Cc: hjk, linux-kernel

On Sun, 22 Jun 2008 23:12:42 -0400 Mike Frysinger <vapier@gentoo.org> wrote:

> The Userspace I/O HOWTO document uses straight <sect1> tags and plain text
> to describe copyright/legal information.  It should instead use the
> <copyright> and <legalnotice> tags like all other documents in the kernel.
> 

There are conflicting changes in this file in linux-next.

In late -rc the difference between mainline and linux-next is huge.  It
is better to raise (and test!) patches against linux-next.  That's what
it is for.

> +	<holder>Hans-J__rgen Koch.</holder>
> -      Copyright (c) 2006 by Hans-J__rgen Koch.</para>

Oh dear, that got mangled at your end, or in transmission.  It seems to
be mangled in mainline too.   This happens a lot.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] uio-howto.tmpl: use standard copyright/legal markings
  2008-06-24  7:20 ` Andrew Morton
@ 2008-06-24  9:45   ` Mike Frysinger
  2008-06-24 10:53   ` Mike Frysinger
  1 sibling, 0 replies; 6+ messages in thread
From: Mike Frysinger @ 2008-06-24  9:45 UTC (permalink / raw)
  To: Andrew Morton; +Cc: hjk, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 836 bytes --]

On Tuesday 24 June 2008, Andrew Morton wrote:
> On Sun, 22 Jun 2008 23:12:42 -0400 Mike Frysinger <vapier@gentoo.org> wrote:
> > The Userspace I/O HOWTO document uses straight <sect1> tags and plain
> > text to describe copyright/legal information.  It should instead use the
> > <copyright> and <legalnotice> tags like all other documents in the
> > kernel.
>
> There are conflicting changes in this file in linux-next.

i'll take a look

> > +	<holder>Hans-J__rgen Koch.</holder>
> > -      Copyright (c) 2006 by Hans-J__rgen Koch.</para>
>
> Oh dear, that got mangled at your end, or in transmission.  It seems to
> be mangled in mainline too.   This happens a lot.

i doubt it was on my end since i didnt modify the code, but i dont think it's 
mangled either.  it looks like a standard UTF8 umlaut to me.
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 835 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] uio-howto.tmpl: use standard copyright/legal markings
  2008-06-24  7:20 ` Andrew Morton
  2008-06-24  9:45   ` Mike Frysinger
@ 2008-06-24 10:53   ` Mike Frysinger
  1 sibling, 0 replies; 6+ messages in thread
From: Mike Frysinger @ 2008-06-24 10:53 UTC (permalink / raw)
  To: Andrew Morton; +Cc: hjk, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

On Tuesday 24 June 2008, Andrew Morton wrote:
> On Sun, 22 Jun 2008 23:12:42 -0400 Mike Frysinger <vapier@gentoo.org> wrote:
> > The Userspace I/O HOWTO document uses straight <sect1> tags and plain
> > text to describe copyright/legal information.  It should instead use the
> > <copyright> and <legalnotice> tags like all other documents in the
> > kernel.
>
> There are conflicting changes in this file in linux-next.

looks like the difference is just year range ... i'll post a new patch
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 835 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] uio-howto.tmpl: use standard copyright/legal markings
@ 2008-06-24 10:54 Mike Frysinger
  2008-06-24 13:42 ` Hans J. Koch
  0 siblings, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2008-06-24 10:54 UTC (permalink / raw)
  To: hjk, linux-kernel, akpm

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1407 bytes --]

The Userspace I/O HOWTO document uses straight <sect1> tags and plain text
to describe copyright/legal information.  It should instead use the
<copyright> and <legalnotice> tags like all other documents in the kernel.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Documentation/DocBook/uio-howto.tmpl |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index c4d1873..d799a26 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -21,6 +21,18 @@
     </affiliation>
 </author>
 
+<copyright>
+	<year>2006-2008</year>
+	<holder>Hans-Jürgen Koch.</holder>
+</copyright>
+
+<legalnotice>
+<para>
+This documentation is Free Software licensed under the terms of the
+GPL version 2.
+</para>
+</legalnotice>
+
 <pubdate>2006-12-11</pubdate>
 
 <abstract>
@@ -66,17 +78,6 @@
 <?dbhtml filename="about.html"?>
 <title>About this document</title>
 
-<sect1 id="copyright">
-<?dbhtml filename="copyright.html"?>
-<title>Copyright and License</title>
-<para>
-      Copyright (c) 2006-2008 by Hans-Jürgen Koch.</para>
-<para>
-This documentation is Free Software licensed under the terms of the
-GPL version 2.
-</para>
-</sect1>
-
 <sect1 id="translations">
 <?dbhtml filename="translations.html"?>
 <title>Translations</title>
-- 
1.5.5.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] uio-howto.tmpl: use standard copyright/legal markings
  2008-06-24 10:54 Mike Frysinger
@ 2008-06-24 13:42 ` Hans J. Koch
  0 siblings, 0 replies; 6+ messages in thread
From: Hans J. Koch @ 2008-06-24 13:42 UTC (permalink / raw)
  To: Mike Frysinger; +Cc: hjk, linux-kernel, akpm, gregkh

(Added GregKH to Cc:)

@Greg: Take care, the patch modifies a line with my name in it :-)

On Tue, Jun 24, 2008 at 06:54:37AM -0400, Mike Frysinger wrote:
> The Userspace I/O HOWTO document uses straight <sect1> tags and plain text
> to describe copyright/legal information.  It should instead use the
> <copyright> and <legalnotice> tags like all other documents in the kernel.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Signed-off-by: Hans J. Koch <hjk@linutronix.de>

> ---
>  Documentation/DocBook/uio-howto.tmpl |   23 ++++++++++++-----------
>  1 files changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
> index c4d1873..d799a26 100644
> --- a/Documentation/DocBook/uio-howto.tmpl
> +++ b/Documentation/DocBook/uio-howto.tmpl
> @@ -21,6 +21,18 @@
>      </affiliation>
>  </author>
>  
> +<copyright>
> +	<year>2006-2008</year>
> +	<holder>Hans-JÃŒrgen Koch.</holder>
> +</copyright>
> +
> +<legalnotice>
> +<para>
> +This documentation is Free Software licensed under the terms of the
> +GPL version 2.
> +</para>
> +</legalnotice>
> +
>  <pubdate>2006-12-11</pubdate>
>  
>  <abstract>
> @@ -66,17 +78,6 @@
>  <?dbhtml filename="about.html"?>
>  <title>About this document</title>
>  
> -<sect1 id="copyright">
> -<?dbhtml filename="copyright.html"?>
> -<title>Copyright and License</title>
> -<para>
> -      Copyright (c) 2006-2008 by Hans-JÃŒrgen Koch.</para>
> -<para>
> -This documentation is Free Software licensed under the terms of the
> -GPL version 2.
> -</para>
> -</sect1>
> -
>  <sect1 id="translations">
>  <?dbhtml filename="translations.html"?>
>  <title>Translations</title>
> -- 
> 1.5.5.3

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-06-24 13:43 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-23  3:12 [PATCH] uio-howto.tmpl: use standard copyright/legal markings Mike Frysinger
2008-06-24  7:20 ` Andrew Morton
2008-06-24  9:45   ` Mike Frysinger
2008-06-24 10:53   ` Mike Frysinger
  -- strict thread matches above, loose matches on Subject: below --
2008-06-24 10:54 Mike Frysinger
2008-06-24 13:42 ` Hans J. Koch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox