From owner-freebsd-doc@FreeBSD.ORG  Sun Jul  7 20:14:42 2013
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: doc@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 070D97B9;
 Sun,  7 Jul 2013 20:14:42 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from server.mypc.hu (server.mypc.hu [87.229.73.95])
 by mx1.freebsd.org (Postfix) with ESMTP id B36C1134E;
 Sun,  7 Jul 2013 20:14:41 +0000 (UTC)
Received: from server.mypc.hu (localhost [127.0.0.1])
 by server.mypc.hu (Postfix) with ESMTP id 68C8B14D242E;
 Sun,  7 Jul 2013 22:14:39 +0200 (CEST)
X-Virus-Scanned: amavisd-new at !change-mydomain-variable!.example.com
Received: from server.mypc.hu ([127.0.0.1])
 by server.mypc.hu (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id PVxWuOZnJewP; Sun,  7 Jul 2013 22:14:39 +0200 (CEST)
Received: from [192.168.0.10] (54034B4D.catv.pool.telekom.hu [84.3.75.77])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by server.mypc.hu (Postfix) with ESMTPSA id EF4DA14D2400;
 Sun,  7 Jul 2013 22:14:38 +0200 (CEST)
Message-ID: <51D9CC30.7090604@FreeBSD.org>
Date: Sun, 07 Jul 2013 22:14:40 +0200
From: Gabor Kovesdan <gabor@FreeBSD.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:22.0) Gecko/20100101 Thunderbird/22.0
MIME-Version: 1.0
To: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org>
Subject: Re: [CFT] merging projects/entities
References: <51D7F70B.8000206@freebsd.org> <51D83F92.7030808@FreeBSD.org>
 <51D98705.4070403@freebsd.org> <51D988DE.2050600@FreeBSD.org>
 <51D98E6D.2060306@freebsd.org> <51D99892.3000905@FreeBSD.org>
 <51D99D07.1070808@freebsd.org> <51D9B744.8040004@FreeBSD.org>
 <51D9BAD0.6000904@freebsd.org>
In-Reply-To: <51D9BAD0.6000904@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
Cc: FBSD Doc project <doc@FreeBSD.org>
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-doc>,
 <mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
 <mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jul 2013 20:14:42 -0000

Em 07-07-2013 21:00, René Ladan escreveu:
> Heh, missed that myself too. So now only tidying up or synchronizing
> whitespace for share/xml/catalog.xml remains to be done?
Personally, I think it would be better to commit that whitespace fix 
separately. Even if you committed it separately in the branch, it would 
go to head intermixed with real changes, which makes it hard to read the 
backlog. This is a disadvantage in general and it is quite a big hassle 
for translators. I think you did it fine since you didn't have to 
foresee these consequences but maybe we should document it as a best 
practice to avoid whitespace changes in branches.

Gabor