| From 98b0f811aade1b7c6e7806c86aa0befd5919d65f Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Mon, 14 Apr 2014 18:52:14 +0200 |
| Subject: Documentation: Update stable address in Chinese and Japanese translations |
| |
| 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åå¤ãåå¤éè¦å 天çæ¶é´ï¼è¿åå³äºå¼åè
çæ¶é´å®æã |
| - 被æ¥åçè¡¥ä¸ä¼è¢«å å°ç¨³å®çæ¬éåéï¼çå¾
å
¶ä»å¼åè
ç审æ¥ã |