[PATCH 3.4 061/214] Documentation: Update stable address in Chinese and Japanese translations

Greg Kroah-Hartman
2014-06-05T05:03:54Z

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 4234 bytes --]

3.4-stable review patch. If anyone has any objections, please let me know.

------------------

From: Geert Uytterhoeven <geert+renesas@glider.be>

commit 98b0f811aade1b7c6e7806c86aa0befd5919d65f upstream.

The English and Korean translations were updated, the Chinese and Japanese
weren't.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
Documentation/ja_JP/HOWTO | 2 +-
Documentation/ja_JP/stable_kernel_rules.txt | 6 +++---
Documentation/zh_CN/HOWTO | 2 +-
Documentation/zh_CN/stable_kernel_rules.txt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)

--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
@@ -315,7 +315,7 @@ Andrew Morton ãŒ Linux-kernel ãƒ¡ãƒ¼ãƒª
ã‚‚ã—ã€2.6.x.y ã‚«ãƒ¼ãƒãƒ«ãŒå­˜åœ¨ã—ãªã„å ´åˆã«ã¯ã€ç•ªå·ãŒä¸€ç•ªå¤§ãã„ 2.6.x ãŒ
æœ€æ–°ã®å®‰å®šç‰ˆã‚«ãƒ¼ãƒãƒ«ã§ã™ã€‚

-2.6.x.y ã¯ "stable" ãƒãƒ¼ãƒ  <stable@kernel.org> ã§ãƒ¡ãƒ³ãƒ†ã•ã‚Œã¦ãŠã‚Šã€å¿…
+2.6.x.y ã¯ "stable" ãƒãƒ¼ãƒ  <stable@vger.kernel.org> ã§ãƒ¡ãƒ³ãƒ†ã•ã‚Œã¦ãŠã‚Šã€å¿…
è¦ã«å¿œã˜ã¦ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¾ã™ã€‚é€šå¸¸ã®ãƒªãƒªãƒ¼ã‚¹æœŸé–“ã¯ 2é€±é–“æ¯Žã§ã™ãŒã€å·®ã—è¿«ã£
ãŸå•é¡ŒãŒãªã‘ã‚Œã°ã‚‚ã†å°‘ã—é•·ããªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£é–¢é€£ã®å•é¡Œ
ã®å ´åˆã¯ã“ã‚Œã«å¯¾ã—ã¦ã ã„ãŸã„ã®å ´åˆã€ã™ãã«ãƒªãƒªãƒ¼ã‚¹ãŒã•ã‚Œã¾ã™ã€‚
--- a/Documentation/ja_JP/stable_kernel_rules.txt
+++ b/Documentation/ja_JP/stable_kernel_rules.txt
@@ -50,16 +50,16 @@ linux-2.6.29/Documentation/stable_kernel

-stable ãƒ„ãƒªãƒ¼ã«ãƒ‘ãƒƒãƒã‚’é€ä»˜ã™ã‚‹æ‰‹ç¶šã-

- - ä¸Šè¨˜ã®è¦å‰‡ã«å¾“ã£ã¦ã„ã‚‹ã‹ã‚’ç¢ºèªã—ãŸå¾Œã«ã€stable@kernel.org ã«ãƒ‘ãƒƒãƒ
+ - ä¸Šè¨˜ã®è¦å‰‡ã«å¾“ã£ã¦ã„ã‚‹ã‹ã‚’ç¢ºèªã—ãŸå¾Œã«ã€stable@vger.kernel.org ã«ãƒ‘ãƒƒãƒ
ã‚’é€ã‚‹ã€‚
- é€ä¿¡è€…ã¯ãƒ‘ãƒƒãƒãŒã‚­ãƒ¥ãƒ¼ã«å—ã‘ä»˜ã‘ã‚‰ã‚ŒãŸéš›ã«ã¯ ACK ã‚’ã€å´ä¸‹ã•ã‚ŒãŸå ´åˆ
ã«ã¯ NAK ã‚’å—ã‘å–ã‚‹ã€‚ã“ã®åå¿œã¯é–‹ç™ºè€…ãŸã¡ã®ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ã«ã‚ˆã£ã¦ã€æ•°
æ—¥ã‹ã‹ã‚‹å ´åˆãŒã‚ã‚‹ã€‚
- ã‚‚ã—å—ã‘å–ã‚‰ã‚ŒãŸã‚‰ã€ãƒ‘ãƒƒãƒã¯ä»–ã®é–‹ç™ºè€…ãŸã¡ã¨é–¢é€£ã™ã‚‹ã‚µãƒ–ã‚·ã‚¹ãƒ†ãƒ ã®
ãƒ¡ãƒ³ãƒ†ãƒŠãƒ¼ã«ã‚ˆã‚‹ãƒ¬ãƒ“ãƒ¥ãƒ¼ã®ãŸã‚ã« -stable ã‚­ãƒ¥ãƒ¼ã«è¿½åŠ ã•ã‚Œã‚‹ã€‚
- - ãƒ‘ãƒƒãƒã« stable@kernel.org ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒä»˜åŠ ã•ã‚Œã¦ã„ã‚‹ã¨ãã«ã¯ã€ãã‚Œ
+ - ãƒ‘ãƒƒãƒã« stable@vger.kernel.org ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒä»˜åŠ ã•ã‚Œã¦ã„ã‚‹ã¨ãã«ã¯ã€ãã‚Œ
ãŒ Linus ã®ãƒ„ãƒªãƒ¼ã«å…¥ã‚‹æ™‚ã«è‡ªå‹•çš„ã« stable ãƒãƒ¼ãƒ ã« email ã•ã‚Œã‚‹ã€‚
- - ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ãƒ‘ãƒƒãƒã¯ã“ã®ã‚¨ã‚¤ãƒªã‚¢ã‚¹ (stable@kernel.org) ã«é€ã‚‰ã‚Œã‚‹ã¹
+ - ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ãƒ‘ãƒƒãƒã¯ã“ã®ã‚¨ã‚¤ãƒªã‚¢ã‚¹ (stable@vger.kernel.org) ã«é€ã‚‰ã‚Œã‚‹ã¹
ãã§ã¯ãªãã€ä»£ã‚ã‚Šã« security@kernel.org ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ã‚‰ã‚Œã‚‹ã€‚

ãƒ¬ãƒ“ãƒ¥ãƒ¼ã‚µã‚¤ã‚¯ãƒ«-
--- a/Documentation/zh_CN/HOWTO
+++ b/Documentation/zh_CN/HOWTO
@@ -237,7 +237,7 @@ kernel.orgç½‘ç«™çš„pub/linux/kernel/v2.6
å¦‚æžœæ²¡æœ‰2.6.x.yç‰ˆæœ¬å†…æ ¸å­˜åœ¨ï¼Œé‚£ä¹ˆæœ€æ–°çš„2.6.xç‰ˆæœ¬å†…æ ¸å°±ç›¸å½“äºŽæ˜¯å½“å‰çš„ç¨³å®š
ç‰ˆå†…æ ¸ã€‚

-2.6.x.yç‰ˆæœ¬ç”±“ç¨³å®šç‰ˆâ€å°ç»„ï¼ˆé‚®ä»¶åœ°å€<stable@kernel.org>ï¼‰ç»´æŠ¤ï¼Œä¸€èˆ¬éš”å‘¨å‘
+2.6.x.yç‰ˆæœ¬ç”±“ç¨³å®šç‰ˆâ€å°ç»„ï¼ˆé‚®ä»¶åœ°å€<stable@vger.kernel.org>ï¼‰ç»´æŠ¤ï¼Œä¸€èˆ¬éš”å‘¨å‘
å¸ƒæ–°ç‰ˆæœ¬ã€‚

å†…æ ¸æºç ä¸­çš„Documentation/stable_kernel_rules.txtæ–‡ä»¶å…·ä½“æè¿°äº†å¯è¢«ç¨³å®š
--- a/Documentation/zh_CN/stable_kernel_rules.txt
+++ b/Documentation/zh_CN/stable_kernel_rules.txt
@@ -42,7 +42,7 @@ Documentation/stable_kernel_rules.txt çš

å‘ç¨³å®šç‰ˆä»£ç æ ‘æäº¤è¡¥ä¸çš„è¿‡ç¨‹ï¼š

- - åœ¨ç¡®è®¤äº†è¡¥ä¸ç¬¦åˆä»¥ä¸Šçš„è§„åˆ™åŽï¼Œå°†è¡¥ä¸å‘é€åˆ°stable@kernel.orgã€‚
+ - åœ¨ç¡®è®¤äº†è¡¥ä¸ç¬¦åˆä»¥ä¸Šçš„è§„åˆ™åŽï¼Œå°†è¡¥ä¸å‘é€åˆ°stable@vger.kernel.orgã€‚
- å¦‚æžœè¡¥ä¸è¢«æŽ¥å—åˆ°é˜Ÿåˆ—é‡Œï¼Œå‘é€è€…ä¼šæ”¶åˆ°ä¸€ä¸ªACKå›žå¤ï¼Œå¦‚æžœæ²¡æœ‰è¢«æŽ¥å—ï¼Œæ”¶
åˆ°çš„æ˜¯NAKå›žå¤ã€‚å›žå¤éœ€è¦å‡ å¤©çš„æ—¶é—´ï¼Œè¿™å–å†³äºŽå¼€å‘è€…çš„æ—¶é—´å®‰æŽ’ã€‚
- è¢«æŽ¥å—çš„è¡¥ä¸ä¼šè¢«åŠ åˆ°ç¨³å®šç‰ˆæœ¬é˜Ÿåˆ—é‡Œï¼Œç­‰å¾…å…¶ä»–å¼€å‘è€…çš„å®¡æŸ¥ã€‚