Message ID | 1422972678-7982-4-git-send-email-john.mcnamara@intel.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 695C29AE6; Tue, 3 Feb 2015 15:11:31 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 9ED209AD8 for <dev@dpdk.org>; Tue, 3 Feb 2015 15:11:28 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 03 Feb 2015 06:11:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,513,1418112000"; d="scan'208";a="521861455" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 03 Feb 2015 06:03:47 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t13EBLDk015573; Tue, 3 Feb 2015 14:11:21 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id t13EBLM2008051; Tue, 3 Feb 2015 14:11:21 GMT Received: (from jmcnam2x@localhost) by sivswdev02.ir.intel.com with id t13EBLAq008046; Tue, 3 Feb 2015 14:11:21 GMT From: John McNamara <john.mcnamara@intel.com> To: dev@dpdk.org Date: Tue, 3 Feb 2015 14:11:16 +0000 Message-Id: <1422972678-7982-4-git-send-email-john.mcnamara@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1422972678-7982-1-git-send-email-john.mcnamara@intel.com> References: <1421255657-19521-1-git-send-email-john.mcnamara@intel.com> <1422972678-7982-1-git-send-email-john.mcnamara@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] =?utf-8?q?=5BPATCH_v4_3/5=5D_doc=3A_Fix_encoding_of_?= =?utf-8?q?=28r=29_character?= X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK <dev.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> |
Commit Message
John McNamara
Feb. 3, 2015, 2:11 p.m. UTC
Change encoding of (r) from Latin-1 to UTF8 to match the other
symbols in the doc and to allow it to convert cleanly to PDF.
Signed-off-by: John McNamara <john.mcnamara@intel.com>
---
doc/guides/rel_notes/supported_features.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Comments
> -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of John McNamara > Sent: Tuesday, February 3, 2015 2:11 PM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH v4 3/5] doc: Fix encoding of (r) character > > Change encoding of (r) from Latin-1 to UTF8 to match the other symbols in the doc and to allow it to > convert cleanly to PDF. > > Signed-off-by: John McNamara <john.mcnamara@intel.com> > --- > doc/guides/rel_notes/supported_features.rst | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/doc/guides/rel_notes/supported_features.rst > b/doc/guides/rel_notes/supported_features.rst > index 7936e93..d87fcaa 100644 > --- a/doc/guides/rel_notes/supported_features.rst > +++ b/doc/guides/rel_notes/supported_features.rst > @@ -51,7 +51,7 @@ Supported Features > > * Intel® X710 40 Gigabit Ethernet Controller > > -* Support NIC filters in addition to flow director for Intel 1GbE and 10GbE Controllers > +* Support NIC filters in addition to flow director for Intel® 1GbE and 10GbE Controllers > > * Virtualization (KVM) > > -- > 1.7.4.1 Hi John, The following error occurs when applying this patch: :Applying: doc: Fix encoding of (r) character error: patch failed: doc/guides/rel_notes/supported_features.rst:51 error: doc/guides/rel_notes/supported_features.rst: patch does not apply Patch failed at 0001 doc: Fix encoding of (r) character There is normally an escape chararacter before the(r) character, ® Regards, Bernard
> -----Original Message----- > From: Iremonger, Bernard > Sent: Friday, February 13, 2015 2:30 PM > To: Mcnamara, John; dev@dpdk.org > Subject: RE: [dpdk-dev] [PATCH v4 3/5] doc: Fix encoding of (r) character > > The following error occurs when applying this patch: > > :Applying: doc: Fix encoding of (r) character > error: patch failed: doc/guides/rel_notes/supported_features.rst:51 > error: doc/guides/rel_notes/supported_features.rst: patch does not apply > Patch failed at 0001 doc: Fix encoding of (r) character > Hi Bernard, That part of the patchset contains a fix for an non-UTF8 character so it probably needs to saved/transferred carefully. Email clients may well mess it up. It should apply cleanly though. I just tried it with a clean clone and the pwcient patchwork client: $ git clone http://dpdk.org/git/dpdk Cloning into 'dpdk'... $ cd dpdk $ pwclient search encoding ID State Name -- ----- ---- 2852 Superseded [dpdk-dev,v2,3/4] doc: Fix encoding of (r) character 2914 Superseded [dpdk-dev,v3,3/4] doc: Fix encoding of (r) character 2930 New [dpdk-dev,v4,3/5] doc: Fix encoding of (r) character $ pwclient git-am 2930 Applying patch #2930 using 'git am' Description: [dpdk-dev,v4,3/5] doc: Fix encoding of (r) character Applying: doc: Fix encoding of (r) character $ git log -1 --oneline eca8a8c doc: Fix encoding of (r) character John. --
> -----Original Message----- > From: Mcnamara, John > Sent: Friday, February 13, 2015 3:59 PM > To: Iremonger, Bernard; dev@dpdk.org > Subject: RE: [dpdk-dev] [PATCH v4 3/5] doc: Fix encoding of (r) character > > > -----Original Message----- > > From: Iremonger, Bernard > > Sent: Friday, February 13, 2015 2:30 PM > > To: Mcnamara, John; dev@dpdk.org > > Subject: RE: [dpdk-dev] [PATCH v4 3/5] doc: Fix encoding of (r) > > character > > > > The following error occurs when applying this patch: > > > > :Applying: doc: Fix encoding of (r) character > > error: patch failed: doc/guides/rel_notes/supported_features.rst:51 > > error: doc/guides/rel_notes/supported_features.rst: patch does not > > apply Patch failed at 0001 doc: Fix encoding of (r) character > > > > Hi Bernard, > > That part of the patchset contains a fix for an non-UTF8 character so it probably needs to > saved/transferred carefully. Email clients may well mess it up. > > It should apply cleanly though. I just tried it with a clean clone and the pwcient patchwork client: > > $ git clone http://dpdk.org/git/dpdk > Cloning into 'dpdk'... > > $ cd dpdk > > $ pwclient search encoding > ID State Name > -- ----- ---- > 2852 Superseded [dpdk-dev,v2,3/4] doc: Fix encoding of (r) character > 2914 Superseded [dpdk-dev,v3,3/4] doc: Fix encoding of (r) character > 2930 New [dpdk-dev,v4,3/5] doc: Fix encoding of (r) character > > $ pwclient git-am 2930 > Applying patch #2930 using 'git am' > Description: [dpdk-dev,v4,3/5] doc: Fix encoding of (r) character > Applying: doc: Fix encoding of (r) character > > $ git log -1 --oneline > eca8a8c doc: Fix encoding of (r) character > > John. > -- > Hi John, I have downloaded the patch from patchwork and it applies cleanly. The problem seems to have been caused by my mutt email client. Regards, Bernard
> -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of John McNamara > Sent: Tuesday, February 3, 2015 2:11 PM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH v4 3/5] doc: Fix encoding of (r) character > > Change encoding of (r) from Latin-1 to UTF8 to match the other symbols in the doc and to allow it to > convert cleanly to PDF. > > Signed-off-by: John McNamara <john.mcnamara@intel.com> Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
diff --git a/doc/guides/rel_notes/supported_features.rst b/doc/guides/rel_notes/supported_features.rst index 7936e93..d87fcaa 100644 --- a/doc/guides/rel_notes/supported_features.rst +++ b/doc/guides/rel_notes/supported_features.rst @@ -51,7 +51,7 @@ Supported Features * Intel® X710 40 Gigabit Ethernet Controller -* Support NIC filters in addition to flow director for Intel� 1GbE and 10GbE Controllers +* Support NIC filters in addition to flow director for Intel® 1GbE and 10GbE Controllers * Virtualization (KVM)