This is a note to let you know that I've just added the patch titled
Documentation: Update stable address in Chinese and Japanese translations
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
documentation-update-stable-address-in-chinese-and-japanese-translations.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 98b0f811aade1b7c6e7806c86aa0befd5919d65f Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <[email protected]>
Date: Mon, 14 Apr 2014 18:52:14 +0200
Subject: Documentation: Update stable address in Chinese and Japanese
translations
From: Geert Uytterhoeven <[email protected]>
commit 98b0f811aade1b7c6e7806c86aa0befd5919d65f upstream.
The English and Korean translations were updated, the Chinese and Japanese
weren't.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
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 ã¡ã¼ãª
ããã3.x.y ã«ã¼ãã«ãåå¨ããªãå
´åã«ã¯ãçªå·ãä¸çªå¤§ãã 3.x ã
ææ°ã®å®å®çã«ã¼ãã«ã§ãã
-3.x.y 㯠"stable" ãã¼ã <[email protected]>
ã§ã¡ã³ãããã¦ãããå¿
+3.x.y 㯠"stable" ãã¼ã <[email protected]>
ã§ã¡ã³ãããã¦ãããå¿
è¦ã«å¿ãã¦ãªãªã¼ã¹ããã¾ããé常ã®ãªãªã¼ã¹æéã¯
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 ããªã¼ã«ããããéä»ããæç¶ã-
- -
ä¸è¨ã®è¦åã«å¾ã£ã¦ãããã確èªããå¾ã«ã[email protected]
ã«ããã
+ -
ä¸è¨ã®è¦åã«å¾ã£ã¦ãããã確èªããå¾ã«ã[email protected]
ã«ããã
ãéãã
- éä¿¡è
ã¯ãããããã¥ã¼ã«åãä»ããããéã«ã¯ ACK
ããå´ä¸ãããå ´å
ã«ã¯ NAK ãåãåãããã®åå¿ã¯éçºè
ãã¡ã®ã¹ã±ã¸ã¥ã¼ã«ã«ãã£ã¦ãæ°
æ¥ãããå ´åãããã
- ããåãåããããããããã¯ä»ã®éçºè
ãã¡ã¨é¢é£ãããµãã·ã¹ãã ã®
ã¡ã³ããã¼ã«ããã¬ãã¥ã¼ã®ããã« -stable ãã¥ã¼ã«è¿½å
ãããã
- - ãããã« [email protected] ã®ã¢ãã¬ã¹ãä»å
ããã¦ããã¨ãã«ã¯ããã
+ - ãããã« [email protected] ã®ã¢ãã¬ã¹ãä»å
ããã¦ããã¨ãã«ã¯ããã
ã Linus ã®ããªã¼ã«å
¥ãæã«èªåçã« stable ãã¼ã ã« email
ãããã
- - ã»ãã¥ãªãã£ãããã¯ãã®ã¨ã¤ãªã¢ã¹ ([email protected])
ã«éãããã¹
+ - ã»ãã¥ãªãã£ãããã¯ãã®ã¨ã¤ãªã¢ã¹
([email protected]) ã«éãããã¹
ãã§ã¯ãªãã代ããã« [email protected]
ã®ã¢ãã¬ã¹ã«éãããã
ã¬ãã¥ã¼ãµã¤ã¯ã«-
--- 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çæ¬ç±â稳å®çâå°ç»ï¼é®ä»¶å°å<[email protected]>ï¼ç»´æ¤ï¼ä¸è¬éå¨å
+2.6.x.yçæ¬ç±â稳å®çâå°ç»ï¼é®ä»¶å°å<[email protected]>ï¼ç»´æ¤ï¼ä¸è¬éå¨å
叿°çæ¬ã
å
æ ¸æºç ä¸ç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 ç
å稳å®çä»£ç æ æäº¤è¡¥ä¸çè¿ç¨ï¼
- -
å¨ç¡®è®¤äºè¡¥ä¸ç¬¦å以ä¸çè§ååï¼å°è¡¥ä¸åéå°[email protected]ã
+ -
å¨ç¡®è®¤äºè¡¥ä¸ç¬¦å以ä¸çè§ååï¼å°è¡¥ä¸åéå°[email protected]ã
- å¦æè¡¥ä¸è¢«æ¥åå°éåéï¼åéè
伿¶å°ä¸ä¸ªACKåå¤ï¼å¦ææ²¡æè¢«æ¥åï¼æ¶
å°çæ¯NAKåå¤ãåå¤éè¦å å¤©çæ¶é´ï¼è¿åå³äºå¼åè
çæ¶é´å®æã
- 被æ¥åçè¡¥ä¸ä¼è¢«å å°ç¨³å®çæ¬éåéï¼çå¾
å
¶ä»å¼åè
ç审æ¥ã
Patches currently in stable-queue which might be from [email protected]
are
queue-3.14/documentation-update-stable-address-in-chinese-and-japanese-translations.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html