From unknown Mon Aug 18 07:45:35 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25617: [patch] use a single string to describe an option Resent-From: Benno Schulenberg Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Sat, 04 Feb 2017 10:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 25617 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: patch To: 25617@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.148620284624954 (code B ref -1); Sat, 04 Feb 2017 10:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2017 10:07:26 +0000 Received: from localhost ([127.0.0.1]:55512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZxFe-0006UQ-87 for submit@debbugs.gnu.org; Sat, 04 Feb 2017 05:07:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZxFc-0006UE-Qd for submit@debbugs.gnu.org; Sat, 04 Feb 2017 05:07:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZxFW-0005VG-Q7 for submit@debbugs.gnu.org; Sat, 04 Feb 2017 05:07:19 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:53989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZxFW-0005VC-MW for submit@debbugs.gnu.org; Sat, 04 Feb 2017 05:07:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZxFV-0005Y5-60 for bug-diffutils@gnu.org; Sat, 04 Feb 2017 05:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZxFR-0005Tm-42 for bug-diffutils@gnu.org; Sat, 04 Feb 2017 05:07:17 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36292) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZxFQ-0005S1-QY for bug-diffutils@gnu.org; Sat, 04 Feb 2017 05:07:13 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B2ABA208A4 for ; Sat, 4 Feb 2017 05:07:10 -0500 (EST) Received: from web1 ([10.202.2.211]) by compute5.internal (MEProxy); Sat, 04 Feb 2017 05:07:10 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=justemail.net; h= content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= mesmtp; bh=bM9I3iySf98Q8GSwefyCftCbXbA=; b=TjA+3WfDsipCseqgS8kw6 MxVklZ5rtTkUSVpPNXC52NA8rnfjkEnx5XnqZGkgGYch0pqIFg7iog5L1uRkY9kK Z1ZM+3wp2MWiQJ7dTZdaozjuLkwauNBnQAEjs1/mkZnxvYGaEI72gstId4FuDkHp Xro4dZ4VQQyHB1nRZ9QQwY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=smtpout; bh=bM9I3iySf98Q8GSwefyCftCbX bA=; b=o5Mf06BtuXlbDgkD/swbU2IHjva8DIvL81xbEvQqiqyT4CfjOz3BRpG8s uVNX7tbOiOI95Lo2e5vGYKTUovwLwPYnmzd9yhbieosD2kFfsxOon09r2chCUf8f B9i2/LIt3v898wAUjEHUAHKUTnX79idvsaN6qcWdWgcIm/A2cc= X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 92A90AA6C8; Sat, 4 Feb 2017 05:07:10 -0500 (EST) Message-Id: <1486202830.1664320.870083096.7EED6C35@webmail.messagingengine.com> From: Benno Schulenberg MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148620283016643201" X-Mailer: MessagingEngine.com Webmail Interface - html Date: Sat, 04 Feb 2017 11:07:10 +0100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) This is a multi-part message in MIME format. --_----------=_148620283016643201 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" In the latest diffutils PO file, two new option descriptions are each split over two separate msgids. It is better when a description is kept together in a single msgid. Attached patch makes that change. Benno -- http://www.fastmail.com - Faster than the air-speed velocity of an unladen european swallow --_----------=_148620283016643201 Content-Disposition: attachment; filename="0001-diff-use-a-single-string-to-describe-an-option.patch" Content-Id: <1486202777.1664275.4fcb008dba3e51623d43aa8ca1267fd9565d2e32.7D7615EC@content.messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name="0001-diff-use-a-single-string-to-describe-an-option.patch" RnJvbSA3OWFkNzY3NTQ0NWRkNzhkYWFhYTZlYTcyNjRmMjVhZGEzNGZkMDMy IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA0IEZl YiAyMDE3IDEwOjU1OjU0ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gZGlmZjog dXNlIGEgc2luZ2xlIHN0cmluZyB0byBkZXNjcmliZSBhbiBvcHRpb24KCiog c3JjL2RpZmYuYzogRnVzZSBmb3VyIGRlc2NyaXB0aW9uIHBpZWNlcyBpbnRv IHR3byB3aG9sZSBvbmVzLgpBbmQgcmV3b3JkIGFuZCByZXdyYXAgb25lIG9m IHRoZW0gdG8gZml0IHdpdGhpbiBlaWdodHkgY2hhcmFjdGVycy4KLS0tCiBz cmMvZGlmZi5jIHwgOCArKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5z ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMv ZGlmZi5jIGIvc3JjL2RpZmYuYwppbmRleCA3Njg1MWFjLi5jNjdkNTE2IDEw MDY0NAotLS0gYS9zcmMvZGlmZi5jCisrKyBiL3NyYy9kaWZmLmMKQEAgLTk3 MSwxMCArOTcxLDEwIEBAIHN0YXRpYyBjaGFyIGNvbnN0ICogY29uc3Qgb3B0 aW9uX2hlbHBfbXNnaWRbXSA9IHsKICAgTl8oIi1kLCAtLW1pbmltYWwgICAg ICAgICAgICB0cnkgaGFyZCB0byBmaW5kIGEgc21hbGxlciBzZXQgb2YgY2hh bmdlcyIpLAogICBOXygiICAgIC0taG9yaXpvbi1saW5lcz1OVU0gIGtlZXAg TlVNIGxpbmVzIG9mIHRoZSBjb21tb24gcHJlZml4IGFuZCBzdWZmaXgiKSwK ICAgTl8oIiAgICAtLXNwZWVkLWxhcmdlLWZpbGVzICBhc3N1bWUgbGFyZ2Ug ZmlsZXMgYW5kIG1hbnkgc2NhdHRlcmVkIHNtYWxsIGNoYW5nZXMiKSwKLSAg Tl8oIiAgICAtLWNvbG9yWz1XSEVOXSAgICAgICBjb2xvcml6ZSB0aGUgb3V0 cHV0OyBXSEVOIGNhbiBiZSAnbmV2ZXInLCAnYWx3YXlzJywiKSwKLSAgTl8o IiAgICAgICAgICAgICAgICAgICAgICAgICAgIG9yICdhdXRvJyAodGhlIGRl ZmF1bHQpIiksCi0gIE5fKCIgICAgLS1wYWxldHRlPVBBTEVUVEUgICAgc3Bl Y2lmeSB0aGUgY29sb3JzIHRvIHVzZSB3aGVuIC0tY29sb3IgaXMgYWN0aXZl IiksCi0gIE5fKCIgICAgICAgICAgICAgICAgICAgICAgICAgICBQQUxFVFRF IGlzIGEgY29sb24tc2VwYXJhdGVkIGxpc3QgdGVybWluZm8gY2FwYWJpbGl0 aWVzIiksCisgIE5fKCIgICAgLS1jb2xvcls9V0hFTl0gICAgICAgY29sb3Jp emUgdGhlIG91dHB1dDsgV0hFTiBjYW4gYmUgJ25ldmVyJywgJ2Fsd2F5cycs XG4iCisgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgICBvciAnYXV0 bycgKHRoZSBkZWZhdWx0KSIpLAorICBOXygiICAgIC0tcGFsZXR0ZT1QQUxF VFRFICAgIHRoZSBjb2xvcnMgdG8gdXNlIHdoZW4gLS1jb2xvciBpcyBhY3Rp dmU7IFBBTEVUVEUgaXNcbiIKKyAgICAgIiAgICAgICAgICAgICAgICAgICAg ICAgICAgIGEgY29sb24tc2VwYXJhdGVkIGxpc3Qgb2YgdGVybWluZm8gY2Fw YWJpbGl0aWVzIiksCiAgICIiLAogICBOXygiICAgIC0taGVscCAgICAgICAg ICAgICAgIGRpc3BsYXkgdGhpcyBoZWxwIGFuZCBleGl0IiksCiAgIE5fKCIt diwgLS12ZXJzaW9uICAgICAgICAgICAgb3V0cHV0IHZlcnNpb24gaW5mb3Jt YXRpb24gYW5kIGV4aXQiKSwKLS0gCjIuMTEuMAoK --_----------=_148620283016643201-- From unknown Mon Aug 18 07:45:35 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Benno Schulenberg Subject: bug#25617: closed (Re: [bug-diffutils] bug#25617: [patch] use a single string to describe an option) Message-ID: References: <1486202830.1664320.870083096.7EED6C35@webmail.messagingengine.com> X-Gnu-PR-Message: they-closed 25617 X-Gnu-PR-Package: diffutils X-Gnu-PR-Keywords: patch Reply-To: 25617@debbugs.gnu.org Date: Fri, 05 May 2017 05:42:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1493962922-30189-1" This is a multi-part message in MIME format... ------------=_1493962922-30189-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #25617: [patch] use a single string to describe an option which was filed against the diffutils package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 25617@debbugs.gnu.org. --=20 25617: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25617 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1493962922-30189-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 25617-done) by debbugs.gnu.org; 5 May 2017 05:41:57 +0000 Received: from localhost ([127.0.0.1]:55170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6W05-0007qf-LJ for submit@debbugs.gnu.org; Fri, 05 May 2017 01:41:57 -0400 Received: from mail-ua0-f169.google.com ([209.85.217.169]:34339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6W04-0007qS-21 for 25617-done@debbugs.gnu.org; Fri, 05 May 2017 01:41:56 -0400 Received: by mail-ua0-f169.google.com with SMTP id g49so22607691uaa.1 for <25617-done@debbugs.gnu.org>; Thu, 04 May 2017 22:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=XE6vhzQAcpV55Jq6UuHqBsbIdG2DfMD2VpUzrGP9YwY=; b=ZFQAVnxG4ZYgJucFFhttRP5HdO2JY50KLBtUBdsxMJ26+8CMOMM0QxvQ80EwhNFL6d XPMEKBSvZrt1LYNGD948/Nssw7wxIkXXVOZxaKGgeBzN4Bc86FEUrVzC7qGM4eUOXS7o wfhaJCt+bgfDj8WffxULPrs0OsNujVT9n0i9pVbo4PTWNRLgKZbxQab934KiJ2fNHXKP /XGZlM4wsUQkQBIdeZuvcXW5lt4BzrgJXW1KI2ONhQBKOtFbH8pxrDfU4yWL3pu0iQN/ qZeysj+ELhkkqCA7i+GPhi0+tAAs31wa30M2CV1jd0ZJnv7vOJN1IWJ9G/KyZWcnH8n5 Tq9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=XE6vhzQAcpV55Jq6UuHqBsbIdG2DfMD2VpUzrGP9YwY=; b=lDukWVYSWIwsWBfPQ47YAqui1sK+IxF7dZG88T34A1/mnq20q2OttOMHTQDUoizzad hjAaDxARqM7rxZJxGA7Xzp2D6EIyIyeQLaU4vMcQKYGbCkLIBYxq2R98JDg6vprOy+v8 ipIJeWSS1flJ0s4VQWmYeKXyHO9M7NBlOyV/pA6FLn12UKXFUQHNtR654SbailLfeP5C Puy8J7GbK0h3A48QyYQ1SBgaR+X2AEsJQ4WNHGdUUUfXFnII2QcGQBUUJUYjXflZjzKD Tu26fkcL6mtQBS40h/EjgHqahnFBJhoi3Iyr8dpPOK13pCQaXDLSOW+6zHD9saYNPUhT p8eg== X-Gm-Message-State: AN3rC/7672UpgOwrA4QNyHciiSABK211vTLtOhindmJG8kPqZI2pxALm x9A81DhkkpbB4ls8tmsHi0gCjdGgX5VP X-Received: by 10.176.25.15 with SMTP id v15mr19187316uag.81.1493962910452; Thu, 04 May 2017 22:41:50 -0700 (PDT) MIME-Version: 1.0 Received: by 10.176.86.86 with HTTP; Thu, 4 May 2017 22:41:29 -0700 (PDT) In-Reply-To: <1486202830.1664320.870083096.7EED6C35@webmail.messagingengine.com> References: <1486202830.1664320.870083096.7EED6C35@webmail.messagingengine.com> From: Jim Meyering Date: Thu, 4 May 2017 22:41:29 -0700 X-Google-Sender-Auth: Dz_11Zys-VOt57O-xo5gWc213y4 Message-ID: Subject: Re: [bug-diffutils] bug#25617: [patch] use a single string to describe an option To: Benno Schulenberg Content-Type: text/plain; charset=UTF-8 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 25617-done Cc: 25617-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Thank you. Applied with slightly tweaked log entry. https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=98b6fc2f320cfb ------------=_1493962922-30189-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Feb 2017 10:07:26 +0000 Received: from localhost ([127.0.0.1]:55512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZxFe-0006UQ-87 for submit@debbugs.gnu.org; Sat, 04 Feb 2017 05:07:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZxFc-0006UE-Qd for submit@debbugs.gnu.org; Sat, 04 Feb 2017 05:07:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZxFW-0005VG-Q7 for submit@debbugs.gnu.org; Sat, 04 Feb 2017 05:07:19 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:53989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZxFW-0005VC-MW for submit@debbugs.gnu.org; Sat, 04 Feb 2017 05:07:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZxFV-0005Y5-60 for bug-diffutils@gnu.org; Sat, 04 Feb 2017 05:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZxFR-0005Tm-42 for bug-diffutils@gnu.org; Sat, 04 Feb 2017 05:07:17 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36292) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZxFQ-0005S1-QY for bug-diffutils@gnu.org; Sat, 04 Feb 2017 05:07:13 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B2ABA208A4 for ; Sat, 4 Feb 2017 05:07:10 -0500 (EST) Received: from web1 ([10.202.2.211]) by compute5.internal (MEProxy); Sat, 04 Feb 2017 05:07:10 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=justemail.net; h= content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= mesmtp; bh=bM9I3iySf98Q8GSwefyCftCbXbA=; b=TjA+3WfDsipCseqgS8kw6 MxVklZ5rtTkUSVpPNXC52NA8rnfjkEnx5XnqZGkgGYch0pqIFg7iog5L1uRkY9kK Z1ZM+3wp2MWiQJ7dTZdaozjuLkwauNBnQAEjs1/mkZnxvYGaEI72gstId4FuDkHp Xro4dZ4VQQyHB1nRZ9QQwY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=smtpout; bh=bM9I3iySf98Q8GSwefyCftCbX bA=; b=o5Mf06BtuXlbDgkD/swbU2IHjva8DIvL81xbEvQqiqyT4CfjOz3BRpG8s uVNX7tbOiOI95Lo2e5vGYKTUovwLwPYnmzd9yhbieosD2kFfsxOon09r2chCUf8f B9i2/LIt3v898wAUjEHUAHKUTnX79idvsaN6qcWdWgcIm/A2cc= X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 92A90AA6C8; Sat, 4 Feb 2017 05:07:10 -0500 (EST) Message-Id: <1486202830.1664320.870083096.7EED6C35@webmail.messagingengine.com> From: Benno Schulenberg To: bug-diffutils@gnu.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148620283016643201" X-Mailer: MessagingEngine.com Webmail Interface - html Subject: [patch] use a single string to describe an option Date: Sat, 04 Feb 2017 11:07:10 +0100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) This is a multi-part message in MIME format. --_----------=_148620283016643201 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" In the latest diffutils PO file, two new option descriptions are each split over two separate msgids. It is better when a description is kept together in a single msgid. Attached patch makes that change. Benno -- http://www.fastmail.com - Faster than the air-speed velocity of an unladen european swallow --_----------=_148620283016643201 Content-Disposition: attachment; filename="0001-diff-use-a-single-string-to-describe-an-option.patch" Content-Id: <1486202777.1664275.4fcb008dba3e51623d43aa8ca1267fd9565d2e32.7D7615EC@content.messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name="0001-diff-use-a-single-string-to-describe-an-option.patch" RnJvbSA3OWFkNzY3NTQ0NWRkNzhkYWFhYTZlYTcyNjRmMjVhZGEzNGZkMDMy IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogU2F0LCA0IEZl YiAyMDE3IDEwOjU1OjU0ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gZGlmZjog dXNlIGEgc2luZ2xlIHN0cmluZyB0byBkZXNjcmliZSBhbiBvcHRpb24KCiog c3JjL2RpZmYuYzogRnVzZSBmb3VyIGRlc2NyaXB0aW9uIHBpZWNlcyBpbnRv IHR3byB3aG9sZSBvbmVzLgpBbmQgcmV3b3JkIGFuZCByZXdyYXAgb25lIG9m IHRoZW0gdG8gZml0IHdpdGhpbiBlaWdodHkgY2hhcmFjdGVycy4KLS0tCiBz cmMvZGlmZi5jIHwgOCArKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5z ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMv ZGlmZi5jIGIvc3JjL2RpZmYuYwppbmRleCA3Njg1MWFjLi5jNjdkNTE2IDEw MDY0NAotLS0gYS9zcmMvZGlmZi5jCisrKyBiL3NyYy9kaWZmLmMKQEAgLTk3 MSwxMCArOTcxLDEwIEBAIHN0YXRpYyBjaGFyIGNvbnN0ICogY29uc3Qgb3B0 aW9uX2hlbHBfbXNnaWRbXSA9IHsKICAgTl8oIi1kLCAtLW1pbmltYWwgICAg ICAgICAgICB0cnkgaGFyZCB0byBmaW5kIGEgc21hbGxlciBzZXQgb2YgY2hh bmdlcyIpLAogICBOXygiICAgIC0taG9yaXpvbi1saW5lcz1OVU0gIGtlZXAg TlVNIGxpbmVzIG9mIHRoZSBjb21tb24gcHJlZml4IGFuZCBzdWZmaXgiKSwK ICAgTl8oIiAgICAtLXNwZWVkLWxhcmdlLWZpbGVzICBhc3N1bWUgbGFyZ2Ug ZmlsZXMgYW5kIG1hbnkgc2NhdHRlcmVkIHNtYWxsIGNoYW5nZXMiKSwKLSAg Tl8oIiAgICAtLWNvbG9yWz1XSEVOXSAgICAgICBjb2xvcml6ZSB0aGUgb3V0 cHV0OyBXSEVOIGNhbiBiZSAnbmV2ZXInLCAnYWx3YXlzJywiKSwKLSAgTl8o IiAgICAgICAgICAgICAgICAgICAgICAgICAgIG9yICdhdXRvJyAodGhlIGRl ZmF1bHQpIiksCi0gIE5fKCIgICAgLS1wYWxldHRlPVBBTEVUVEUgICAgc3Bl Y2lmeSB0aGUgY29sb3JzIHRvIHVzZSB3aGVuIC0tY29sb3IgaXMgYWN0aXZl IiksCi0gIE5fKCIgICAgICAgICAgICAgICAgICAgICAgICAgICBQQUxFVFRF IGlzIGEgY29sb24tc2VwYXJhdGVkIGxpc3QgdGVybWluZm8gY2FwYWJpbGl0 aWVzIiksCisgIE5fKCIgICAgLS1jb2xvcls9V0hFTl0gICAgICAgY29sb3Jp emUgdGhlIG91dHB1dDsgV0hFTiBjYW4gYmUgJ25ldmVyJywgJ2Fsd2F5cycs XG4iCisgICAgICIgICAgICAgICAgICAgICAgICAgICAgICAgICBvciAnYXV0 bycgKHRoZSBkZWZhdWx0KSIpLAorICBOXygiICAgIC0tcGFsZXR0ZT1QQUxF VFRFICAgIHRoZSBjb2xvcnMgdG8gdXNlIHdoZW4gLS1jb2xvciBpcyBhY3Rp dmU7IFBBTEVUVEUgaXNcbiIKKyAgICAgIiAgICAgICAgICAgICAgICAgICAg ICAgICAgIGEgY29sb24tc2VwYXJhdGVkIGxpc3Qgb2YgdGVybWluZm8gY2Fw YWJpbGl0aWVzIiksCiAgICIiLAogICBOXygiICAgIC0taGVscCAgICAgICAg ICAgICAgIGRpc3BsYXkgdGhpcyBoZWxwIGFuZCBleGl0IiksCiAgIE5fKCIt diwgLS12ZXJzaW9uICAgICAgICAgICAgb3V0cHV0IHZlcnNpb24gaW5mb3Jt YXRpb24gYW5kIGV4aXQiKSwKLS0gCjIuMTEuMAoK --_----------=_148620283016643201-- ------------=_1493962922-30189-1--