The original file has added a former intro in commit b51208d41c6a4e7fc2f0
("docs: Tweak the top-level Sphinx page") and hence update the Chinese
version for it.
Signed-off-by: Hu Haowen <[email protected]>
---
Documentation/translations/zh_CN/index.rst | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
index 1f953d3439a5..003126abc0d6 100644
--- a/Documentation/translations/zh_CN/index.rst
+++ b/Documentation/translations/zh_CN/index.rst
@@ -17,6 +17,11 @@
**翻译计划:**
内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
+这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
+在进行的工作；当我们努力将许多分散的文件整合成一个连贯的整体时尤其如此。另
+外，随时欢迎您对内核文档进行改进；如果您想提供帮助，请加入vger.kernel.org
+上的linux-doc邮件列表。
+
许可证文档
----------
--
2.25.1
CC Xiangcheng
teng sterling <[email protected]> 于2021年6月7日周一 下午9:40写道：
>
> CC [email protected]
> Hu Haowen <[email protected]> 于2021年6月7日周一 下午5:37写道：
> >
> > The original file has added a former intro in commit b51208d41c6a4e7fc2f0
> > ("docs: Tweak the top-level Sphinx page") and hence update the Chinese
> > version for it.
> >
> > Signed-off-by: Hu Haowen <[email protected]>
> > ---
> > Documentation/translations/zh_CN/index.rst | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
> > index 1f953d3439a5..003126abc0d6 100644
> > --- a/Documentation/translations/zh_CN/index.rst
> > +++ b/Documentation/translations/zh_CN/index.rst
> > @@ -17,6 +17,11 @@
> > **翻译计划:**
> > 内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
> >
> > +这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
> how about:
>
> 这是中文内核文档树的顶级目录。
> > +在进行的工作；当我们努力将许多分散的文件整合成一个连贯的整体时尤其如此。另
> > +外，随时欢迎您对内核文档进行改进；如果您想提供帮助，请加入vger.kernel.org
> 中文内核文档进行改进；
> > +上的linux-doc邮件列表。
> 上的linux-doc邮件列表，先改进原始英文文档，再将其翻译为中文后，更新相应的中文文档。
> > +
> > 许可证文档
> > ----------
> >
> > --
> > 2.25.1
> >
> BTW, I think these are similar to "disclaimer-zh_CN", but not as good
> as the latter.
>
> Alex and Xiangcheng, what do you think?
>
> Thanks,
> Yanteng
CC [email protected]
Hu Haowen <[email protected]> 于2021年6月7日周一 下午5:37写道：
>
> The original file has added a former intro in commit b51208d41c6a4e7fc2f0
> ("docs: Tweak the top-level Sphinx page") and hence update the Chinese
> version for it.
>
> Signed-off-by: Hu Haowen <[email protected]>
> ---
> Documentation/translations/zh_CN/index.rst | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
> index 1f953d3439a5..003126abc0d6 100644
> --- a/Documentation/translations/zh_CN/index.rst
> +++ b/Documentation/translations/zh_CN/index.rst
> @@ -17,6 +17,11 @@
> **翻译计划:**
> 内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
>
> +这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
how about:
这是中文内核文档树的顶级目录。
> +在进行的工作；当我们努力将许多分散的文件整合成一个连贯的整体时尤其如此。另
> +外，随时欢迎您对内核文档进行改进；如果您想提供帮助，请加入vger.kernel.org
中文内核文档进行改进；
> +上的linux-doc邮件列表。
上的linux-doc邮件列表，先改进原始英文文档，再将其翻译为中文后，更新相应的中文文档。
> +
> 许可证文档
> ----------
>
> --
> 2.25.1
>
BTW, I think these are similar to "disclaimer-zh_CN", but not as good
as the latter.
Alex and Xiangcheng, what do you think?
Thanks,
Yanteng
在 2021/6/7 下午9:40, teng sterling 写道:
> CC [email protected]
> Hu Haowen <[email protected]> 于2021年6月7日周一 下午5:37写道：
>> The original file has added a former intro in commit b51208d41c6a4e7fc2f0
>> ("docs: Tweak the top-level Sphinx page") and hence update the Chinese
>> version for it.
>>
>> Signed-off-by: Hu Haowen <[email protected]>
>> ---
>> Documentation/translations/zh_CN/index.rst | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
>> index 1f953d3439a5..003126abc0d6 100644
>> --- a/Documentation/translations/zh_CN/index.rst
>> +++ b/Documentation/translations/zh_CN/index.rst
>> @@ -17,6 +17,11 @@
>> **翻译计划:*kernel's documentation*
>> 内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
>>
>> +这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
> how about:
>
> 这是中文内核文档树的顶级目录。
But the English version says "kernel's documentation". It seems that we
should add an explanation for readers in order to drag them out of the
dilemma on whether he or she should update En version at first, as your
thought picking ideas from "disclaimer-zh_CN".
What's your opinion, maintainers?
>> +在进行的工作；当我们努力将许多分散的文件整合成一个连贯的整体时尤其如此。另
>> +外，随时欢迎您对内核文档进行改进；如果您想提供帮助，请加入vger.kernel.org
> 中文内核文档进行改进；
>> +上的linux-doc邮件列表。
> 上的linux-doc邮件列表，先改进原始英文文档，再将其翻译为中文后，更新相应的中文文档。
>> +
>> 许可证文档
>> ----------
>>
>> --
>> 2.25.1
>>
> BTW, I think these are similar to "disclaimer-zh_CN", but not as good
> as the latter.
>
> Alex and Xiangcheng, what do you think?
>
> Thanks,
> Yanteng
Hu Haowen <[email protected]> 于2021年6月7日周一 下午9:52写道：
>
>
> 在 2021/6/7 下午9:40, teng sterling 写道:
> > CC [email protected]
> > Hu Haowen <[email protected]> 于2021年6月7日周一 下午5:37写道：
> >> The original file has added a former intro in commit b51208d41c6a4e7fc2f0
> >> ("docs: Tweak the top-level Sphinx page") and hence update the Chinese
> >> version for it.
> >>
> >> Signed-off-by: Hu Haowen <[email protected]>
> >> ---
> >> Documentation/translations/zh_CN/index.rst | 5 +++++
> >> 1 file changed, 5 insertions(+)
> >>
> >> diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
> >> index 1f953d3439a5..003126abc0d6 100644
> >> --- a/Documentation/translations/zh_CN/index.rst
> >> +++ b/Documentation/translations/zh_CN/index.rst
> >> @@ -17,6 +17,11 @@
> >> **翻译计划:*kernel's documentation*
> >> 内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
> >>
> >> +这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
> > how about:
> >
> > 这是中文内核文档树的顶级目录。
>
>
> But the English version says "kernel's documentation". It seems that we
> should add an explanation for readers in order to drag them out of the
> dilemma on whether he or she should update En version at first, as your
> thought picking ideas from "disclaimer-zh_CN".
>
> What's your opinion, maintainers?
When the original documentation is updated, the Chinese documentation
has to follow. I think we have reached a consensus on this point.
However, this file is described in this directory as zh_CN, so I think
it needs to be localized. But the localization will conflict with
"disclaimer-zh_CN".
Thanks,
Yanteng
>
>
> >> +在进行的工作；当我们努力将许多分散的文件整合成一个连贯的整体时尤其如此。另
> >> +外，随时欢迎您对内核文档进行改进；如果您想提供帮助，请加入vger.kernel.org
> > 中文内核文档进行改进；
> >> +上的linux-doc邮件列表。
> > 上的linux-doc邮件列表，先改进原始英文文档，再将其翻译为中文后，更新相应的中文文档。
> >> +
> >> 许可证文档
> >> ----------
> >>
> >> --
> >> 2.25.1
> >>
> > BTW, I think these are similar to "disclaimer-zh_CN", but not as good
> > as the latter.
> >
> > Alex and Xiangcheng, what do you think?
> >
> > Thanks,
> > Yanteng
>
在 2021/6/8 上午9:41, teng sterling 写道:
> Hu Haowen <[email protected]> 于2021年6月7日周一 下午9:52写道：
>>
>> 在 2021/6/7 下午9:40, teng sterling 写道:
>>> CC [email protected]
>>> Hu Haowen <[email protected]> 于2021年6月7日周一 下午5:37写道：
>>>> The original file has added a former intro in commit b51208d41c6a4e7fc2f0
>>>> ("docs: Tweak the top-level Sphinx page") and hence update the Chinese
>>>> version for it.
>>>>
>>>> Signed-off-by: Hu Haowen <[email protected]>
>>>> ---
>>>> Documentation/translations/zh_CN/index.rst | 5 +++++
>>>> 1 file changed, 5 insertions(+)
>>>>
>>>> diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
>>>> index 1f953d3439a5..003126abc0d6 100644
>>>> --- a/Documentation/translations/zh_CN/index.rst
>>>> +++ b/Documentation/translations/zh_CN/index.rst
>>>> @@ -17,6 +17,11 @@
>>>> **翻译计划:*kernel's documentation*
>>>> 内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
>>>>
>>>> +这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
>>> how about:
>>>
>>> 这是中文内核文档树的顶级目录。
>>
>> But the English version says "kernel's documentation". It seems that we
>> should add an explanation for readers in order to drag them out of the
>> dilemma on whether he or she should update En version at first, as your
>> thought picking ideas from "disclaimer-zh_CN".
>>
>> What's your opinion, maintainers?
> When the original documentation is updated, the Chinese documentation
> has to follow. I think we have reached a consensus on this point.
> However, this file is described in this directory as zh_CN, so I think
> it needs to be localized. But the localization will conflict with
> "disclaimer-zh_CN".
Hmm... That's an issue. Does that mean we should edit "disclaimer-zh_CN"
as well to avoid the conflict?
Thx,
Hu Haowen
> Thanks,
> Yanteng
>>
>>>> +在进行的工作；当我们努力将许多分散的文件整合成一个连贯的整体时尤其如此。另
>>>> +外，随时欢迎您对内核文档进行改进；如果您想提供帮助，请加入vger.kernel.org
>>> 中文内核文档进行改进；
>>>> +上的linux-doc邮件列表。
>>> 上的linux-doc邮件列表，先改进原始英文文档，再将其翻译为中文后，更新相应的中文文档。
>>>> +
>>>> 许可证文档
>>>> ----------
>>>>
>>>> --
>>>> 2.25.1
>>>>
>>> BTW, I think these are similar to "disclaimer-zh_CN", but not as good
>>> as the latter.
>>>
>>> Alex and Xiangcheng, what do you think?
>>>
>>> Thanks,
>>> Yanteng
On Mon, Jun 07, 2021 at 09:43:37PM +0800, teng sterling wrote:
> CC Xiangcheng
>
> teng sterling <[email protected]> 于2021年6月7日周一 下午9:40写道：
> >
> > CC [email protected]
> > Hu Haowen <[email protected]> 于2021年6月7日周一 下午5:37写道：
> > >
> > > The original file has added a former intro in commit b51208d41c6a4e7fc2f0
> > > ("docs: Tweak the top-level Sphinx page") and hence update the Chinese
> > > version for it.
> > >
> > > Signed-off-by: Hu Haowen <[email protected]>
> > > ---
> > > Documentation/translations/zh_CN/index.rst | 5 +++++
> > > 1 file changed, 5 insertions(+)
> > >
> > > diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
> > > index 1f953d3439a5..003126abc0d6 100644
> > > --- a/Documentation/translations/zh_CN/index.rst
> > > +++ b/Documentation/translations/zh_CN/index.rst
> > > @@ -17,6 +17,11 @@
> > > **翻译计划:**
> > > 内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
> > >
> > > +这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
> > how about:
> >
> > 这是中文内核文档树的顶级目录。
> > > +在进行的工作；当我们努力将许多分散的文件整合成一个连贯的整体时尤其如此。另
> > > +外，随时欢迎您对内核文档进行改进；如果您想提供帮助，请加入vger.kernel.org
> > 中文内核文档进行改进；
> > > +上的linux-doc邮件列表。
> > 上的linux-doc邮件列表，先改进原始英文文档，再将其翻译为中文后，更新相应的中文文档。
> > > +
> > > 许可证文档
> > > ----------
> > >
> > > --
> > > 2.25.1
> > >
> > BTW, I think these are similar to "disclaimer-zh_CN", but not as good
> > as the latter.
> >
> > Alex and Xiangcheng, what do you think?
> >
> > Thanks,
> > Yanteng
I think,
Use 中文内核文档树
And then
.. include:: ./disclaimer-zh_CN.rst
Thanks,
Wu X.C.
在 2021/6/8 上午11:09, Wu X.C. 写道:
> On Mon, Jun 07, 2021 at 09:43:37PM +0800, teng sterling wrote:
>> CC Xiangcheng
>>
>> teng sterling <[email protected]> 于2021年6月7日周一 下午9:40写道：
>>> CC [email protected]
>>> Hu Haowen <[email protected]> 于2021年6月7日周一 下午5:37写道：
>>>> The original file has added a former intro in commit b51208d41c6a4e7fc2f0
>>>> ("docs: Tweak the top-level Sphinx page") and hence update the Chinese
>>>> version for it.
>>>>
>>>> Signed-off-by: Hu Haowen <[email protected]>
>>>> ---
>>>> Documentation/translations/zh_CN/index.rst | 5 +++++
>>>> 1 file changed, 5 insertions(+)
>>>>
>>>> diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
>>>> index 1f953d3439a5..003126abc0d6 100644
>>>> --- a/Documentation/translations/zh_CN/index.rst
>>>> +++ b/Documentation/translations/zh_CN/index.rst
>>>> @@ -17,6 +17,11 @@
>>>> **翻译计划:**
>>>> 内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
>>>>
>>>> +这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
>>> how about:
>>>
>>> 这是中文内核文档树的顶级目录。
>>>> +在进行的工作；当我们努力将许多分散的文件整合成一个连贯的整体时尤其如此。另
>>>> +外，随时欢迎您对内核文档进行改进；如果您想提供帮助，请加入vger.kernel.org
>>> 中文内核文档进行改进；
>>>> +上的linux-doc邮件列表。
>>> 上的linux-doc邮件列表，先改进原始英文文档，再将其翻译为中文后，更新相应的中文文档。
>>>> +
>>>> 许可证文档
>>>> ----------
>>>>
>>>> --
>>>> 2.25.1
>>>>
>>> BTW, I think these are similar to "disclaimer-zh_CN", but not as good
>>> as the latter.
>>>
>>> Alex and Xiangcheng, what do you think?
>>>
>>> Thanks,
>>> Yanteng
> I think,
>
> Use 中文内核文档树
>
> And then
>
> .. include:: ./disclaimer-zh_CN.rst
OK, fixing it and going to send patch v2.
Thx,
Hu Haowen
> Thanks,
> Wu X.C.
On 6/8/21 10:48 AM, Hu Haowen wrote:
>
> 在 2021/6/8 上午9:41, teng sterling 写道:
>> Hu Haowen <[email protected]> 于2021年6月7日周一 下午9:52写道：
>>>
>>> 在 2021/6/7 下午9:40, teng sterling 写道:
>>>> CC [email protected]
>>>> Hu Haowen <[email protected]> 于2021年6月7日周一 下午5:37写道：
>>>>> The original file has added a former intro in commit b51208d41c6a4e7fc2f0
>>>>> ("docs: Tweak the top-level Sphinx page") and hence update the Chinese
>>>>> version for it.
>>>>>
>>>>> Signed-off-by: Hu Haowen <[email protected]>
>>>>> ---
>>>>> Documentation/translations/zh_CN/index.rst | 5 +++++
>>>>> 1 file changed, 5 insertions(+)
>>>>>
>>>>> diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
>>>>> index 1f953d3439a5..003126abc0d6 100644
>>>>> --- a/Documentation/translations/zh_CN/index.rst
>>>>> +++ b/Documentation/translations/zh_CN/index.rst
>>>>> @@ -17,6 +17,11 @@
>>>>> **翻译计划:*kernel's documentation*
>>>>> 内核中文文档欢迎任何翻译投稿，特别是关于内核用户和管理员指南部分。
>>>>>
>>>>> +这是内核文档树的顶级目录。内核文档，就像内核本身一样，在很大程度上是一项正
>>>> how about:
>>>>
>>>> 这是中文内核文档树的顶级目录。
>>>
>>> But the English version says "kernel's documentation". It seems that we
>>> should add an explanation for readers in order to drag them out of the
>>> dilemma on whether he or she should update En version at first, as your
>>> thought picking ideas from "disclaimer-zh_CN".
>>>
>>> What's your opinion, maintainers?
>> When the original documentation is updated, the Chinese documentation
>> has to follow. I think we have reached a consensus on this point.
>> However, this file is described in this directory as zh_CN, so I think
>> it needs to be localized. But the localization will conflict with
>> "disclaimer-zh_CN".
>
>
> Hmm... That's an issue. Does that mean we should edit "disclaimer-zh_CN"
> as well to avoid the conflict?
>
the disclaimer is for single docs, shorter is better. For this file, we don't
have to copy exactly from original index.rst.
Thanks
Alex