Skip to contentSkip to conversation

manual: remove contributor list and add copyright

PATCH Superseded Thomas De Schampheleire 2 participants 3 messages May 28, 2014 – May 29, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 manual: remove contributor list and add copyright

As discussed on the mailing list [1], remove the limited explicit list of contributors in favor of the general mention of 'The Buildroot developers'. Add a copyright statement.
Move the generation info to the front.

[1] http://lists.busybox.net/pipermail/buildroot/2014-May/097589.html

---
v3: dammit, remove for real now, sorry.
v2: remove accidental changes to manual.mk

 docs/manual/manual.txt |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
docs/manual/manual.txt +5 -6
@@ -4,16 +4,15 @@
 = The Buildroot user manual
 :toc:
 
-Buildroot usage and documentation by Thomas Petazzoni. Contributions
-from Karsten Kruse, Ned Ludd, Martin Herren and others.
+Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate}
+{localtime} from git revision {sys:git rev-parse --short HEAD}
 
-The Buildroot manual is licensed under the GNU General Public License,
-version 2. Refer to file
+The Buildroot manual is written by the Buildroot developers. +
+It is licensed under the GNU General Public License, version 2. Refer to file
 http://git.buildroot.org/buildroot/tree/COPYING[COPYING] in the Buildroot
 sources for the full text of this license.
 
-Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate}
-{localtime} from git revision {sys:git rev-parse --short HEAD}
+Copyright (C) 2004-2014 The Buildroot developers
 
 image::logo.png[]
 
#1 lore raw

PATCH v3 1/1 manual: remove contributor list and add copyright

Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

As discussed on the mailing list [1], remove the limited explicit list of contributors in favor of the general mention of 'The Buildroot developers'. Add a copyright statement.
Move the generation info to the front.

[1] http://lists.busybox.net/pipermail/buildroot/2014-May/097589.html

---
v3: dammit, remove for real now, sorry.
v2: remove accidental changes to manual.mk

 docs/manual/manual.txt |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
docs/manual/manual.txt +0 -0
@@ -4,16 +4,15 @@
 = The Buildroot user manual

docs/manual/manual.txt line 10

Quoted 10 lines
docs/manual/manual.txt +3 -4
 :toc:
 
-Buildroot usage and documentation by Thomas Petazzoni. Contributions
-from Karsten Kruse, Ned Ludd, Martin Herren and others.
+Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate}
+{localtime} from git revision {sys:git rev-parse --short HEAD}
 
-The Buildroot manual is licensed under the GNU General Public License,
-version 2. Refer to file
+The Buildroot manual is written by the Buildroot developers. +

This trailing '+' seems wrong. I've removed it.

docs/manual/manual.txt line 12

Quoted 2 lines
docs/manual/manual.txt +1 -0
+It is licensed under the GNU General Public License, version 2. Refer to file
 http://git.buildroot.org/buildroot/tree/COPYING[COPYING] in the Buildroot

I've changed this to 'Refer to the COPYING file'.

Committed with these minor changes, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH v3 1/1 manual: remove contributor list and add copyright

Peter Korsgaard <[email protected]> schreef:

Quoted 30 lines
Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

As discussed on the mailing list [1], remove the limited explicit list of contributors in favor of the general mention of 'The Buildroot developers'. Add a copyright statement.
Move the generation info to the front.

[1] http://lists.busybox.net/pipermail/buildroot/2014-May/097589.html

---
v3: dammit, remove for real now, sorry.
v2: remove accidental changes to manual.mk

 docs/manual/manual.txt |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
docs/manual/manual.txt +2 -2
@@ -4,16 +4,15 @@
 = The Buildroot user manual
 :toc:
 
-Buildroot usage and documentation by Thomas Petazzoni. Contributions
-from Karsten Kruse, Ned Ludd, Martin Herren and others.
+Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate}
+{localtime} from git revision {sys:git rev-parse --short HEAD}
Quoted 5 lines

docs/manual/manual.txt line 10

Quoted 3 lines
docs/manual/manual.txt +1 -2
-The Buildroot manual is licensed under the GNU General Public License,
-version 2. Refer to file
+The Buildroot manual is written by the Buildroot developers. +

This trailing '+' seems wrong. I've removed it.

This was intentional to add a line break. It shows in the pdf, but not in the .text nor .html. This is due to the direct call to a2x. I'm planning to investigate this further.

Anyway, the line break isn't really necessary so its removal is no problem.

Quoted 8 lines

docs/manual/manual.txt line 12

Quoted 3 lines
docs/manual/manual.txt +1 -0
+It is licensed under the GNU General Public License, version 2. Refer to file
 http://git.buildroot.org/buildroot/tree/COPYING[COPYING] in the Buildroot

I've changed this to 'Refer to the COPYING file'.

Committed with these minor changes, thanks.

Thanks!
Thomas