| Message ID | 7ccc79e730c982d53177.1401298191@argentina |
|---|---|
| State | Accepted |
| Headers | show |
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> 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 > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> > --- > 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(-) > diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt > --- a/docs/manual/manual.txt > +++ b/docs/manual/manual.txt > @@ -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. + This trailing '+' seems wrong. I've removed it. > +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.
Peter Korsgaard <jacmet@uclibc.org> schreef: >>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> 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 > > > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> > > > --- > > 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(-) > > > diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt > > --- a/docs/manual/manual.txt > > +++ b/docs/manual/manual.txt > > @@ -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. + > >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. > > > +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
diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -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[]
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 Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> --- 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(-)