diff mbox

[dpdk-dev,v4,3/5] doc: Fix encoding of (r) character

Message ID 1422972678-7982-4-git-send-email-john.mcnamara@intel.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Mcnamara, John 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

Iremonger, Bernard Feb. 13, 2015, 2:29 p.m. UTC | #1
> -----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
Mcnamara, John Feb. 13, 2015, 3:59 p.m. UTC | #2
> -----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.
--
Iremonger, Bernard Feb. 13, 2015, 4:42 p.m. UTC | #3
> -----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
Iremonger, Bernard Feb. 16, 2015, 2:22 p.m. UTC | #4
> -----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 mbox

Patch

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)