Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Baruch Siach <baruch@tkos.co.il>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 for-2014.05] manual: remove contributor list and add copyright
Date: Wed, 28 May 2014 20:28:52 +0300	[thread overview]
Message-ID: <20140528172852.GJ20069@tarshish> (raw)
In-Reply-To: <d8e41c0960cd9064e59c.1401295880@argentina>

Hi Thomas,

On Wed, May 28, 2014 at 06:51:20PM +0200, Thomas De Schampheleire wrote:
> 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>
> 
> ---
> v2: remove accidental changes to manual.mk

Remove from the diffstat that is. The hunk itself is still there though.

>  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 \
>  	        -D $$(@D) $$(@D)/.build/$(1).txt
> -	-$(Q)rm -rf $$(@D)/.build
> +	#-$(Q)rm -rf $$(@D)/.build

Here.

baruch

>  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[]

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

      reply	other threads:[~2014-05-28 17:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-28 16:51 [Buildroot] [PATCH v2 for-2014.05] manual: remove contributor list and add copyright Thomas De Schampheleire
2014-05-28 17:28 ` Baruch Siach [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140528172852.GJ20069@tarshish \
    --to=baruch@tkos.co.il \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox