diff mbox

[for,2014.05] manual: remove contributor list and add copyright

Message ID 65f6151a027a1048a118.1401292259@argentina
State Superseded
Headers show

Commit Message

Thomas De Schampheleire May 28, 2014, 3:50 p.m. UTC
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>

---
 docs/manual/manual.txt |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

Comments

Yann E. MORIN May 28, 2014, 4:27 p.m. UTC | #1
Thomas, All,

On 2014-05-28 17:50 +0200, Thomas De Schampheleire spake thusly:
> 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>
> 
> ---
>  docs/manual/manual.txt |  11 +++++------
>  1 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
> --- a/docs/manual/manual.mk
> +++ b/docs/manual/manual.mk
> @@ -61,9 +61,9 @@ manual-check-dependencies-$(3):
>  	$(Q)$(call MESSAGE,"Generating $(5) $(1)...")
>  	$(Q)mkdir -p $$(@D)/.build
>  	$(Q)rsync -au docs/$(1)/*.txt $$(@D)/.build
> -	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
> +	$(Q)a2x $(6) --verbose -k -f $(2) -d book -L -r $(TOPDIR)/docs/images \

Why --verbose?

>  	        -D $$(@D) $$(@D)/.build/$(1).txt
> -	-$(Q)rm -rf $$(@D)/.build
> +	#-$(Q)rm -rf $$(@D)/.build

Debug stuff left over?

Regards,
Yann E. MORIN.

>  endef
>  
>  ################################################################################
> 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[]
>  
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas De Schampheleire May 28, 2014, 4:39 p.m. UTC | #2
"Yann E. MORIN" <yann.morin.1998@free.fr> schreef:
>Thomas, All,
>
>On 2014-05-28 17:50 +0200, Thomas De Schampheleire spake thusly:
>> 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>
>> 
>> ---
>>  docs/manual/manual.txt |  11 +++++------
>>  1 files changed, 5 insertions(+), 6 deletions(-)
>> 
>> diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
>> --- a/docs/manual/manual.mk
>> +++ b/docs/manual/manual.mk
>> @@ -61,9 +61,9 @@ manual-check-dependencies-$(3):
>>  	$(Q)$(call MESSAGE,"Generating $(5) $(1)...")
>>  	$(Q)mkdir -p $$(@D)/.build
>>  	$(Q)rsync -au docs/$(1)/*.txt $$(@D)/.build
>> -	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
>> +	$(Q)a2x $(6) --verbose -k -f $(2) -d book -L -r $(TOPDIR)/docs/images \
>
>Why --verbose?
>
>>  	        -D $$(@D) $$(@D)/.build/$(1).txt
>> -	-$(Q)rm -rf $$(@D)/.build
>> +	#-$(Q)rm -rf $$(@D)/.build
>
>Debug stuff left over?

Ai, yes the changes in manual.mk should not be part of this patch.. I'll resend, sorry...
diff mbox

Patch

diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -61,9 +61,9 @@  manual-check-dependencies-$(3):
 	$(Q)$(call MESSAGE,"Generating $(5) $(1)...")
 	$(Q)mkdir -p $$(@D)/.build
 	$(Q)rsync -au docs/$(1)/*.txt $$(@D)/.build
-	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
+	$(Q)a2x $(6) --verbose -k -f $(2) -d book -L -r $(TOPDIR)/docs/images \
 	        -D $$(@D) $$(@D)/.build/$(1).txt
-	-$(Q)rm -rf $$(@D)/.build
+	#-$(Q)rm -rf $$(@D)/.build
 endef
 
 ################################################################################
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[]