diff mbox

docs: Fix description of the sentence

Message ID 1480575357-25056-1-git-send-email-zhangchen.fnst@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Zhang Chen Dec. 1, 2016, 6:55 a.m. UTC
Say it in another way to make it easier to understand.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 docs/colo-proxy.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Eric Blake Dec. 1, 2016, 2:57 p.m. UTC | #1
On 12/01/2016 12:55 AM, Zhang Chen wrote:
> Say it in another way to make it easier to understand.
> 
> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
> Signed-off-by: Eric Blake <eblake@redhat.com>

I guess that's because I suggested the replacement text to use, even
though I didn't write the patch.

At any rate, since this is doc-only, it's safe for inclusion in 2.8, if
the maintainer wants to send a last-minute pull request (but if it
misses the release, that's okay too)

> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  docs/colo-proxy.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
> index 76767cb..c4941de 100644
> --- a/docs/colo-proxy.txt
> +++ b/docs/colo-proxy.txt
> @@ -158,7 +158,9 @@ secondary.
>  
>  == Usage ==
>  
> -Here, we use demo ip and port discribe more clearly.
> +Here is an example using demonstration IP and port addresses to more
> +clearly describe the usage.
> +
>  Primary(ip:3.3.3.3):
>  -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown
>  -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
>
Zhang Chen Dec. 2, 2016, 2:59 a.m. UTC | #2
On 12/01/2016 10:57 PM, Eric Blake wrote:
> On 12/01/2016 12:55 AM, Zhang Chen wrote:
>> Say it in another way to make it easier to understand.
>>
>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>> Signed-off-by: Eric Blake <eblake@redhat.com>
> I guess that's because I suggested the replacement text to use, even
> though I didn't write the patch.

Yes, In that case, should I change the signed-off-by to acked-by or 
remove it?

Thanks
Zhang Chen

> At any rate, since this is doc-only, it's safe for inclusion in 2.8, if
> the maintainer wants to send a last-minute pull request (but if it
> misses the release, that's okay too)
>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>>   docs/colo-proxy.txt | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
>> index 76767cb..c4941de 100644
>> --- a/docs/colo-proxy.txt
>> +++ b/docs/colo-proxy.txt
>> @@ -158,7 +158,9 @@ secondary.
>>   
>>   == Usage ==
>>   
>> -Here, we use demo ip and port discribe more clearly.
>> +Here is an example using demonstration IP and port addresses to more
>> +clearly describe the usage.
>> +
>>   Primary(ip:3.3.3.3):
>>   -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown
>>   -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
>>
Eric Blake Dec. 2, 2016, 3:14 a.m. UTC | #3
On 12/01/2016 08:59 PM, Zhang Chen wrote:
> 
> 
> On 12/01/2016 10:57 PM, Eric Blake wrote:
>> On 12/01/2016 12:55 AM, Zhang Chen wrote:
>>> Say it in another way to make it easier to understand.
>>>
>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>> Signed-off-by: Eric Blake <eblake@redhat.com>
>> I guess that's because I suggested the replacement text to use, even
>> though I didn't write the patch.
> 
> Yes, In that case, should I change the signed-off-by to acked-by or
> remove it?

I'm okay if you want to leave it as-is.
Laurent Vivier Dec. 2, 2016, 7:57 a.m. UTC | #4
On 02/12/2016 03:59, Zhang Chen wrote:
> 
> 
> On 12/01/2016 10:57 PM, Eric Blake wrote:
>> On 12/01/2016 12:55 AM, Zhang Chen wrote:
>>> Say it in another way to make it easier to understand.
>>>
>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>> Signed-off-by: Eric Blake <eblake@redhat.com>
>> I guess that's because I suggested the replacement text to use, even
>> though I didn't write the patch.
> 
> Yes, In that case, should I change the signed-off-by to acked-by or
> remove it?

You can use "Suggested-by:"

https://www.kernel.org/doc/Documentation/SubmittingPatches

Laurent
Zhang Chen Dec. 7, 2016, 8:58 a.m. UTC | #5
On 12/02/2016 03:57 PM, Laurent Vivier wrote:
>
> On 02/12/2016 03:59, Zhang Chen wrote:
>>
>> On 12/01/2016 10:57 PM, Eric Blake wrote:
>>> On 12/01/2016 12:55 AM, Zhang Chen wrote:
>>>> Say it in another way to make it easier to understand.
>>>>
>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>>> Signed-off-by: Eric Blake <eblake@redhat.com>
>>> I guess that's because I suggested the replacement text to use, even
>>> though I didn't write the patch.
>> Yes, In that case, should I change the signed-off-by to acked-by or
>> remove it?
> You can use "Suggested-by:"
>
> https://www.kernel.org/doc/Documentation/SubmittingPatches
>
> Laurent
>

Should I fix it? or can you pick up this directly for 2.8?

Thanks
Zhang Chen

>
Laurent Vivier Dec. 7, 2016, 9:01 a.m. UTC | #6
Le 07/12/2016 à 09:58, Zhang Chen a écrit :
> 
> 
> On 12/02/2016 03:57 PM, Laurent Vivier wrote:
>>
>> On 02/12/2016 03:59, Zhang Chen wrote:
>>>
>>> On 12/01/2016 10:57 PM, Eric Blake wrote:
>>>> On 12/01/2016 12:55 AM, Zhang Chen wrote:
>>>>> Say it in another way to make it easier to understand.
>>>>>
>>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>>>> Signed-off-by: Eric Blake <eblake@redhat.com>
>>>> I guess that's because I suggested the replacement text to use, even
>>>> though I didn't write the patch.
>>> Yes, In that case, should I change the signed-off-by to acked-by or
>>> remove it?
>> You can use "Suggested-by:"
>>
>> https://www.kernel.org/doc/Documentation/SubmittingPatches
>>
>> Laurent
>>
> 
> Should I fix it? or can you pick up this directly for 2.8?

I don't think it is needed.
Perhaps Stefan H can take it directly in his staging tree?

Thanks,
Laurent
Stefan Hajnoczi Dec. 7, 2016, 1:30 p.m. UTC | #7
On Wed, Dec 07, 2016 at 10:01:49AM +0100, Laurent Vivier wrote:
> Le 07/12/2016 à 09:58, Zhang Chen a écrit :
> > 
> > 
> > On 12/02/2016 03:57 PM, Laurent Vivier wrote:
> >>
> >> On 02/12/2016 03:59, Zhang Chen wrote:
> >>>
> >>> On 12/01/2016 10:57 PM, Eric Blake wrote:
> >>>> On 12/01/2016 12:55 AM, Zhang Chen wrote:
> >>>>> Say it in another way to make it easier to understand.
> >>>>>
> >>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
> >>>>> Signed-off-by: Eric Blake <eblake@redhat.com>
> >>>> I guess that's because I suggested the replacement text to use, even
> >>>> though I didn't write the patch.
> >>> Yes, In that case, should I change the signed-off-by to acked-by or
> >>> remove it?
> >> You can use "Suggested-by:"
> >>
> >> https://www.kernel.org/doc/Documentation/SubmittingPatches
> >>
> >> Laurent
> >>
> > 
> > Should I fix it? or can you pick up this directly for 2.8?
> 
> I don't think it is needed.
> Perhaps Stefan H can take it directly in his staging tree?

Too late for that now.  This should be merged through Jason Wang (net
maintainer) like any other colo-proxy patch.

Stefan
Zhang Chen Dec. 8, 2016, 1:32 a.m. UTC | #8
On 12/07/2016 09:30 PM, Stefan Hajnoczi wrote:
> On Wed, Dec 07, 2016 at 10:01:49AM +0100, Laurent Vivier wrote:
>> Le 07/12/2016 à 09:58, Zhang Chen a écrit :
>>>
>>> On 12/02/2016 03:57 PM, Laurent Vivier wrote:
>>>> On 02/12/2016 03:59, Zhang Chen wrote:
>>>>> On 12/01/2016 10:57 PM, Eric Blake wrote:
>>>>>> On 12/01/2016 12:55 AM, Zhang Chen wrote:
>>>>>>> Say it in another way to make it easier to understand.
>>>>>>>
>>>>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>>>>>> Signed-off-by: Eric Blake <eblake@redhat.com>
>>>>>> I guess that's because I suggested the replacement text to use, even
>>>>>> though I didn't write the patch.
>>>>> Yes, In that case, should I change the signed-off-by to acked-by or
>>>>> remove it?
>>>> You can use "Suggested-by:"
>>>>
>>>> https://www.kernel.org/doc/Documentation/SubmittingPatches
>>>>
>>>> Laurent
>>>>
>>> Should I fix it? or can you pick up this directly for 2.8?
>> I don't think it is needed.
>> Perhaps Stefan H can take it directly in his staging tree?
> Too late for that now.  This should be merged through Jason Wang (net
> maintainer) like any other colo-proxy patch.
>

OK~ I change the subject to "for-2.9" and cc Jason.

Thanks
Zhang Chen
Zhang Chen Dec. 26, 2016, 7:26 a.m. UTC | #9
Hi~~ Jason.

Can you pick up this patch?

Thanks

Zhang Chen


On 12/08/2016 09:32 AM, Zhang Chen wrote:
>
>
> On 12/07/2016 09:30 PM, Stefan Hajnoczi wrote:
>> On Wed, Dec 07, 2016 at 10:01:49AM +0100, Laurent Vivier wrote:
>>> Le 07/12/2016 à 09:58, Zhang Chen a écrit :
>>>>
>>>> On 12/02/2016 03:57 PM, Laurent Vivier wrote:
>>>>> On 02/12/2016 03:59, Zhang Chen wrote:
>>>>>> On 12/01/2016 10:57 PM, Eric Blake wrote:
>>>>>>> On 12/01/2016 12:55 AM, Zhang Chen wrote:
>>>>>>>> Say it in another way to make it easier to understand.
>>>>>>>>
>>>>>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>>>>>>> Signed-off-by: Eric Blake <eblake@redhat.com>
>>>>>>> I guess that's because I suggested the replacement text to use, 
>>>>>>> even
>>>>>>> though I didn't write the patch.
>>>>>> Yes, In that case, should I change the signed-off-by to acked-by or
>>>>>> remove it?
>>>>> You can use "Suggested-by:"
>>>>>
>>>>> https://www.kernel.org/doc/Documentation/SubmittingPatches
>>>>>
>>>>> Laurent
>>>>>
>>>> Should I fix it? or can you pick up this directly for 2.8?
>>> I don't think it is needed.
>>> Perhaps Stefan H can take it directly in his staging tree?
>> Too late for that now.  This should be merged through Jason Wang (net
>> maintainer) like any other colo-proxy patch.
>>
>
> OK~ I change the subject to "for-2.9" and cc Jason.
>
> Thanks
> Zhang Chen
>
>
Zhang Chen Jan. 6, 2017, 3:33 a.m. UTC | #10
Ping....


On 12/26/2016 03:26 PM, Zhang Chen wrote:
> Hi~~ Jason.
>
> Can you pick up this patch?
>
> Thanks
>
> Zhang Chen
>
>
> On 12/08/2016 09:32 AM, Zhang Chen wrote:
>>
>>
>> On 12/07/2016 09:30 PM, Stefan Hajnoczi wrote:
>>> On Wed, Dec 07, 2016 at 10:01:49AM +0100, Laurent Vivier wrote:
>>>> Le 07/12/2016 à 09:58, Zhang Chen a écrit :
>>>>>
>>>>> On 12/02/2016 03:57 PM, Laurent Vivier wrote:
>>>>>> On 02/12/2016 03:59, Zhang Chen wrote:
>>>>>>> On 12/01/2016 10:57 PM, Eric Blake wrote:
>>>>>>>> On 12/01/2016 12:55 AM, Zhang Chen wrote:
>>>>>>>>> Say it in another way to make it easier to understand.
>>>>>>>>>
>>>>>>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>>>>>>>> Signed-off-by: Eric Blake <eblake@redhat.com>
>>>>>>>> I guess that's because I suggested the replacement text to use, 
>>>>>>>> even
>>>>>>>> though I didn't write the patch.
>>>>>>> Yes, In that case, should I change the signed-off-by to acked-by or
>>>>>>> remove it?
>>>>>> You can use "Suggested-by:"
>>>>>>
>>>>>> https://www.kernel.org/doc/Documentation/SubmittingPatches
>>>>>>
>>>>>> Laurent
>>>>>>
>>>>> Should I fix it? or can you pick up this directly for 2.8?
>>>> I don't think it is needed.
>>>> Perhaps Stefan H can take it directly in his staging tree?
>>> Too late for that now.  This should be merged through Jason Wang (net
>>> maintainer) like any other colo-proxy patch.
>>>
>>
>> OK~ I change the subject to "for-2.9" and cc Jason.
>>
>> Thanks
>> Zhang Chen
>>
>>
>
Jason Wang Jan. 6, 2017, 3:47 a.m. UTC | #11
On 2017年01月06日 11:33, Zhang Chen wrote:
> Ping....

Applied to -net. Thanks
diff mbox

Patch

diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
index 76767cb..c4941de 100644
--- a/docs/colo-proxy.txt
+++ b/docs/colo-proxy.txt
@@ -158,7 +158,9 @@  secondary.
 
 == Usage ==
 
-Here, we use demo ip and port discribe more clearly.
+Here is an example using demonstration IP and port addresses to more
+clearly describe the usage.
+
 Primary(ip:3.3.3.3):
 -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown
 -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66