3 files changed, 107 insertions, 107 deletions

diff --git a/Documentation/zh_CN/SubmitChecklist b/Documentation/zh_CN/SubmitChecklist
index 951415bbab0c..4c741d6bc048 100644
--- a/Documentation/zh_CN/SubmitChecklist
+++ b/Documentation/zh_CN/SubmitChecklist
@@ -67,7 +67,7 @@ Linux内核提交清单
 
 12：已经通过CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,
     CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,
-    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_SPINLOCK_SLEEP测试，并且同时都
+    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP测试，并且同时都
     使能。
 
 13：已经都构建并且使用或者不使用 CONFIG_SMP 和 CONFIG_PREEMPT测试执行时间。
diff --git a/Documentation/zh_CN/email-clients.txt b/Documentation/zh_CN/email-clients.txt
index 5d65e323d060..b9a1a3e6c78d 100644
--- a/Documentation/zh_CN/email-clients.txt
+++ b/Documentation/zh_CN/email-clients.txt
@@ -1,4 +1,4 @@
-閿�?Chinese translated version of Documentation/email-clients.txt
+锘緾hinese translated version of Documentation/email-clients.txt
 
 If you have any comment or update to the content, please contact the
 original document maintainer directly.  However, if you have a problem
@@ -8,203 +8,203 @@ or if there is a problem with the translation.
 
 Chinese maintainer: Harry Wei <harryxiyou@gmail.com>
 ---------------------------------------------------------------------
-Documentation/email-clients.txt ???娑�????缂堟槒??
+Documentation/email-clients.txt 鐨勪腑鏂囩炕璇�
 
-婵�??????瀹�??鐠佺儤????瀛�?鐗�???????????鐎圭櫢??鐠囬?瀛�?銉�??缁?????濡楋絿??缂佸瓨?銈�?????婵�????娴�?娴ｈ法?銊�?杈�??
-娴溿倖???????浼�?鍓�??鐠�?閿�?娑�????娴犮儱??娑�???????缂佸瓨?銈�??濮�???鈹�??婵�???????缂堟槒????瀛�?棰�???????鑸�?????缂�?
-鐠�?鐎�???銊�??妫�?閿�?鐠囩柉??缁鑵�??????缂佸瓨?銈�?????
+濡傛灉鎯宠瘎璁烘垨鏇存柊鏈枃鐨勫唴瀹癸紝璇风洿鎺ヨ仈绯诲師鏂囨。鐨勭淮鎶よ�呫�傚鏋滀綘浣跨敤鑻辨枃
+浜ゆ祦鏈夊洶闅剧殑璇濓紝涔熷彲浠ュ悜涓枃鐗堢淮鎶よ�呮眰鍔┿�傚鏋滄湰缈昏瘧鏇存柊涓嶅強鏃舵垨鑰呯炕
+璇戝瓨鍦ㄩ棶棰橈紝璇疯仈绯讳腑鏂囩増缁存姢鑰呫��
 
-娑�???????缂佸瓨?銈�??閿�? 鐠愭儳??婵�?  Harry Wei <harryxiyou@gmail.com>
-娑�???????缂堟槒?????閿�? 鐠愭儳??婵�?  Harry Wei <harryxiyou@gmail.com>
-娑�?????????陇?????閿�? Yinglin Luan <synmyth@gmail.com>
+涓枃鐗堢淮鎶よ�咃細 璐惧▉濞�  Harry Wei <harryxiyou@gmail.com>
+涓枃鐗堢炕璇戣�咃細 璐惧▉濞�  Harry Wei <harryxiyou@gmail.com>
+涓枃鐗堟牎璇戣�咃細 Yinglin Luan <synmyth@gmail.com>
 		Xiaochen Wang <wangxiaochen0@gmail.com>
 		yaxinsn <yaxinsn@163.com>
 
-娴犮儰??娑撶儤?锝�??
+浠ヤ笅涓烘鏂�
 ---------------------------------------------------------------------
 
-Linux???娴犺泛?銏�?椋�?????缂�?娣団剝??
+Linux閭欢瀹㈡埛绔厤缃俊鎭�
 ======================================================================
 
-?????????缂�?
+鏅�氶厤缃�
 ----------------------------------------------------------------------
-Linux?????姝屗夋稉???????鏉�????娴犳儼?????娴溿倗??閿�????婵傝姤??鐞涖儰??娴�?娑撴椽??娴犳湹????????瀹�?????????????娴�?缂佸瓨?銈�??
-??銉�?鍫�??娴犺??娴�???????娴犲墎?????鐎硅?鐓�??鎼�?鐠囥儲??"text/plain"?????鎯�??閿�????娴犳湹????????娑�?鐠�???????閿�?
-???娑撻缚??娴�?娴ｈ儻藟娑�????瀵�???銊�?銊�????銊�??鐠侀缚??缁�?娑�???????瀵�???浼�?淇�??
+Linux鍐呮牳琛ヤ竵鏄�氳繃閭欢琚彁浜ょ殑锛屾渶濂芥妸琛ヤ竵浣滀负閭欢浣撶殑鍐呭祵鏂囨湰銆傛湁浜涚淮鎶よ��
+鎺ユ敹闄勪欢锛屼絾鏄檮浠剁殑鍐呭鏍煎紡搴旇鏄�"text/plain"銆傜劧鑰岋紝闄勪欢涓�鑸槸涓嶈禐鎴愮殑锛�
+鍥犱负杩欎細浣胯ˉ涓佺殑寮曠敤閮ㄥ垎鍦ㄨ瘎璁鸿繃绋嬩腑鍙樼殑寰堝洶闅俱��
 
-??銊�?銉�?????Linux?????姝屗夋稉???????娴犺泛?銏�?椋�????銊�?????鐞涖儰????璺�??鐠囥儱??娴�?????????????婵�???鑸�?????娓�?婵�?閿�?
-娴�?娴�?娑�???鑺�?鐟�?????????????銈�?鎯般�冪粭???????缁岀儤?纭�???????铏�????銊�??娑�?鐞�????瀵�?婢跺瓨?????缂�?鐏忎勘??
+鐢ㄦ潵鍙戦�丩inux鍐呮牳琛ヤ竵鐨勯偖浠跺鎴风鍦ㄥ彂閫佽ˉ涓佹椂搴旇澶勪簬鏂囨湰鐨勫師濮嬬姸鎬併�備緥濡傦紝
+浠栦滑涓嶈兘鏀瑰彉鎴栬�呭垹闄ゅ埗琛ㄧ鎴栬�呯┖鏍硷紝鐢氳嚦鏄湪姣忎竴琛岀殑寮�澶存垨鑰呯粨灏俱��
 
-娑�?鐟�????鏉�?"format=flowed"濡��????????鐞涖儰?????鏉�???铚�??瀵�?鐠ц渹?????妫�????娴犮儱?????鐎瑰磭?????鐞�????
+涓嶈閫氳繃"format=flowed"妯″紡鍙戦�佽ˉ涓併�傝繖鏍蜂細寮曡捣涓嶅彲棰勬湡浠ュ強鏈夊鐨勬柇琛屻��
 
-娑�?鐟�?鐠佲晙????????娴犺泛?銏�?椋�??鏉�?鐞�??????銊�?銏�?????鏉�???铚�??娴�???鏉�??娴�????鐞涖儰?????
+涓嶈璁╀綘鐨勯偖浠跺鎴风杩涜鑷姩鎹㈣銆傝繖鏍蜂篃浼氱牬鍧忎綘鐨勮ˉ涓併��
 
-???娴犺泛?銏�?椋�??娑�???鑺�?鐟�???????????鐎�?缁�????缂�??????鐟�?????鐟�??????????鐞涖儰???????鑺�??ASCII??????UTF-8缂�??????鐟�??閿�?
-婵�????娴�?娴ｈ法??UTF-8缂�??????鐟�???????????娴犺????锝�??娴�?鐏�?娴�???鍨�??娑�?娴�??????钘�????????鐎�?缁�???????妫�????
+閭欢瀹㈡埛绔笉鑳芥敼鍙樻枃鏈殑瀛楃闆嗙紪鐮佹柟寮忋�傝鍙戦�佺殑琛ヤ竵鍙兘鏄疉SCII鎴栬�匲TF-8缂栫爜鏂瑰紡锛�
+濡傛灉浣犱娇鐢║TF-8缂栫爜鏂瑰紡鍙戦�侀偖浠讹紝閭ｄ箞浣犲皢浼氶伩鍏嶄竴浜涘彲鑳藉彂鐢熺殑瀛楃闆嗛棶棰樸��
 
-???娴犺泛?銏�?椋�??鎼�?鐠囥儱鑸�???楠炴湹??娣�???? References: ?????? In-Reply-To: ???妫�?閿�???锝�??
-???娴犳儼??妫�?鐏忓彉??娴�?娑�???????
+閭欢瀹㈡埛绔簲璇ュ舰鎴愬苟涓斾繚鎸� References: 鎴栬�� In-Reply-To: 鏍囬锛岄偅涔�
+閭欢璇濋灏变笉浼氫腑鏂��
 
-婢�???鍓�??鐢�?(?????????鐠愬??鐢�?)???鐢晲????鐣�?銊�??鐞涖儰??閿�????娑撳搫?鎯般�冪粭?娴�?鏉�????娑撹櫣鈹�??绗�??娴ｈ法??xclipboard, xclip
-??????xcutsel娑�?鐠佺ǹ??娴犮儻??娴�???????婵傝姤??鐠�?娑�?娑�?????????鍨�??娴ｈ法?銊�????鍓�??鐢�????
+澶嶅埗绮樺笘(鎴栬�呭壀璐寸矘甯�)閫氬父涓嶈兘鐢ㄤ簬琛ヤ竵锛屽洜涓哄埗琛ㄧ浼氳浆鎹负绌烘牸銆備娇鐢▁clipboard, xclip
+鎴栬�厁cutsel涔熻鍙互锛屼絾鏄渶濂芥祴璇曚竴涓嬫垨鑰呴伩鍏嶄娇鐢ㄥ鍒剁矘甯栥��
 
-娑�?鐟�???銊ゅ▏???PGP/GPG缂冩彃????????娴犳湹鑵�??????鐞涖儰?????鏉�???铚�??娴ｅ灝??瀵�?婢�???????娑�???鍊�?璇�??????????銊�??娴�????鐞涖儰?????
-閿�?鏉�?娑�????妫�?鎼�?鐠囥儲?????娴犮儰鎱ㄦ径????閿�?
+涓嶈鍦ㄤ娇鐢≒GP/GPG缃插悕鐨勯偖浠朵腑鍖呭惈琛ヤ竵銆傝繖鏍蜂細浣垮緱寰堝鑴氭湰涓嶈兘璇诲彇鍜岄�傜敤浜庝綘鐨勮ˉ涓併��
+锛堣繖涓棶棰樺簲璇ユ槸鍙互淇鐨勶級
 
-??銊�???????鎼�??娴犺泛??鐞涖劌?????鐞涖儰??娑�????閿�?缂�????瀹稿崬?????娑�?娑�?鐞涖儰?????娑�?娑�???????娑撶粯??閿�?娣�?鐎�???銉�?璺�?鎵�??
-???娴犺??鐏�?鐞涖儰?????'patch'??鎴掓姢???娑�?閿�?婵�??????????娴�?閿�????缂�??????鎼�??娴犺泛??鐞涖劌????????
+鍦ㄧ粰鍐呮牳閭欢鍒楄〃鍙戦�佽ˉ涓佷箣鍓嶏紝缁欒嚜宸卞彂閫佷竴涓ˉ涓佹槸涓笉閿欑殑涓绘剰锛屼繚瀛樻帴鏀跺埌鐨�
+閭欢锛屽皢琛ヤ竵鐢�'patch'鍛戒护鎵撲笂锛屽鏋滄垚鍔熶簡锛屽啀缁欏唴鏍搁偖浠跺垪琛ㄥ彂閫併��
 
 
-娑�?娴�????娴犺泛?銏�?椋�?????缁�?
+涓�浜涢偖浠跺鎴风鎻愮ず
 ----------------------------------------------------------------------
-鏉�????缂�???杞�??娴�?鐠�?缂�????MUA???缂�????缁�鐚�?????娴犮儳?銊�??缂�?Linux?????绋�?????鐞涖儰?????鏉�?娴�?楠炴湹???????铏�??
-?????????鏉�?娴犺泛?????缂�???鑽�?????
+杩欓噷缁欏嚭涓�浜涜缁嗙殑MUA閰嶇疆鎻愮ず锛屽彲浠ョ敤浜庣粰Linux鍐呮牳鍙戦�佽ˉ涓併�傝繖浜涘苟涓嶆剰鍛虫槸
+鎵�鏈夌殑杞欢鍖呴厤缃�荤粨銆�
 
-鐠囧瓨??閿�?
-TUI = 娴犮儲?????娑撳搫?铏�???????銊�?閿�?銉�??
-GUI = ??鎯ц埌?????銏�?銊�?閿�?銉�??
+璇存槑锛�
+TUI = 浠ユ枃鏈负鍩虹鐨勭敤鎴锋帴鍙�
+GUI = 鍥惧舰鐣岄潰鐢ㄦ埛鎺ュ彛
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Alpine (TUI)
 
-???缂�????妞ょ櫢??
-???"Sending Preferences"??銊�??閿�?
+閰嶇疆閫夐」锛�
+鍦�"Sending Preferences"閮ㄥ垎锛�
 
-- "Do Not Send Flowed Text"韫�?妞よ?????
-- "Strip Whitespace Before Sending"韫�?妞よ?鎶�??
+- "Do Not Send Flowed Text"蹇呴』寮�鍚�
+- "Strip Whitespace Before Sending"蹇呴』鍏抽棴
 
-瑜�???????娴犺埖?璁�????????鎼�?鐠囥儲?鎯�?銊ㄋ夋稉?娴�???铏�?鎵�????鐗�?鐧�????璺�?????娑�?CTRL-R缂�???????閿�?娴ｆ寧??鐎�????
-鐞涖儰?????娴犺泛????銉�?浼�??娴犳湹鑵�???
+褰撳啓閭欢鏃讹紝鍏夋爣搴旇鏀惧湪琛ヤ竵浼氬嚭鐜扮殑鍦版柟锛岀劧鍚庢寜涓婥TRL-R缁勫悎閿紝浣挎寚瀹氱殑
+琛ヤ竵鏂囦欢宓屽叆鍒伴偖浠朵腑銆�
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Evolution (GUI)
 
-娑�?娴�?瀵�????????????????娴ｈ法?銊�????????鐞涖儰??
+涓�浜涘紑鍙戣�呮垚鍔熺殑浣跨敤瀹冨彂閫佽ˉ涓�
 
-瑜�??????鈺�??娴犲爼??妞ょ櫢??Preformat
-  娴�?Format->Heading->Preformatted (Ctrl-7)??????瀹搞儱?閿�??
+褰撻�夋嫨閭欢閫夐」锛歅reformat
+  浠嶧ormat->Heading->Preformatted (Ctrl-7)鎴栬�呭伐鍏锋爮
 
-??璺�??娴ｈ法??閿�?
-  Insert->Text File... (Alt-n x)?????銉ㄋ夋稉????娴犺翰??
+鐒跺悗浣跨敤锛�
+  Insert->Text File... (Alt-n x)鎻掑叆琛ヤ竵鏂囦欢銆�
 
-娴�?鏉�????娴�?"diff -Nru old.c new.c | xclip"閿�???????Preformat閿�???璺�??娴ｈ法?銊よ厬??鎾�??鏉�?鐞�?缁�?鐢�????
+浣犺繕鍙互"diff -Nru old.c new.c | xclip"锛岄�夋嫨Preformat锛岀劧鍚庝娇鐢ㄤ腑闂撮敭杩涜绮樺笘銆�
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Kmail (GUI)
 
-娑�?娴�?瀵�????????????????娴ｈ法?銊�????????鐞涖儰?????
+涓�浜涘紑鍙戣�呮垚鍔熺殑浣跨敤瀹冨彂閫佽ˉ涓併��
 
-姒�?鐠併倛?鍓х枂娑�?娑�?HTML??鐓�??????????????閿�?娑�?鐟�??????銊�?????
+榛樿璁剧疆涓嶄负HTML鏍煎紡鏄悎閫傜殑锛涗笉瑕佸惎鐢ㄥ畠銆�
 
-瑜�?娑�????娑�?鐏�????娴犲墎????璺�??閿�???銊�??妞ら��?????娑�?鐟�??????鈺�????銊�?銏�????????娑�????缂傝櫣?鐟版皑???娴�???銊�??娴犳湹鑵戞潏???銉�??娴犺????????
-??鎴�??娴�?鐞�??????銊�?銏�??閿�????濮濄倓??韫�?妞よ?銊�?????鐞涖儰??娑�?????????銊�?銏�????????缁�?????????瑙�??鐏忚鲸???????銊�????銊�?銏�????銉ゅ姛??????娴犺??
-??璺�?????鐎�?娣�?鐎�?娑撻缚??缁嬭￥??娑�????娴�???銊�??缁嬪じ鑵�???濞嗏剝??瀵�?鐎�?閿�?鐎�?瀹歌尙????銊�?銊�????銊�?銏�??娴�?閿�???锝�??娴�???????娴犳儼?鐣�?鑸电梾???
-?????鈺�????銊�?銏�??閿�?娴�????鏉�?娑�?娴�?婢跺崬?璇插嚒???????????銊�?銏�?????
+褰撲功鍐欎竴灏侀偖浠剁殑鏃跺�欙紝鍦ㄩ�夐」涓嬮潰涓嶈閫夋嫨鑷姩鎹㈣銆傚敮涓�鐨勭己鐐瑰氨鏄綘鍦ㄩ偖浠朵腑杈撳叆鐨勪换浣曟枃鏈�
+閮戒笉浼氳鑷姩鎹㈣锛屽洜姝や綘蹇呴』鍦ㄥ彂閫佽ˉ涓佷箣鍓嶆墜鍔ㄦ崲琛屻�傛渶绠�鍗曠殑鏂规硶灏辨槸鍚敤鑷姩鎹㈣鏉ヤ功鍐欓偖浠讹紝
+鐒跺悗鎶婂畠淇濆瓨涓鸿崏绋裤�備竴鏃︿綘鍦ㄨ崏绋夸腑鍐嶆鎵撳紑瀹冿紝瀹冨凡缁忓叏閮ㄨ嚜鍔ㄦ崲琛屼簡锛岄偅涔堜綘鐨勯偖浠惰櫧鐒舵病鏈�
+閫夋嫨鑷姩鎹㈣锛屼絾鏄繕涓嶄細澶卞幓宸叉湁鐨勮嚜鍔ㄦ崲琛屻��
 
-??銊�??娴犲墎??鎼�????閿�??????銉ㄋ夋稉?娑�????閿�???鍙�??鐢摜?銊�??鐞涖儰??鐎�????缁�?閿�?娑�?娑�?鏉�?鐎�????(---)???
+鍦ㄩ偖浠剁殑搴曢儴锛屾彃鍏ヨˉ涓佷箣鍓嶏紝鏀句笂甯哥敤鐨勮ˉ涓佸畾鐣岀锛氫笁涓繛瀛楀彿(---)銆�
 
-??璺�?????"Message"????????锛�??閿�??????鈺�????銉�??娴犺????銉�????????娴�????鐞涖儰?????娴犺翰??鏉�????娑�?娑�?妫�?婢�???????妞ょ櫢??娴�????娴�?
-???鏉�?鐎�????缂�?娴�???????娴犺泛缂撶粩?瀹搞儱?閿�????????閿�?鏉�????娴犮儱鐢稉?"insert file"??鐐�?????
+鐒跺悗鍦�"Message"鑿滃崟鏉＄洰锛岄�夋嫨鎻掑叆鏂囦欢锛屾帴鐫�閫夊彇浣犵殑琛ヤ竵鏂囦欢銆傝繕鏈変竴涓澶栫殑閫夐」锛屼綘鍙互
+閫氳繃瀹冮厤缃綘鐨勯偖浠跺缓绔嬪伐鍏锋爮鑿滃崟锛岃繕鍙互甯︿笂"insert file"鍥炬爣銆�
 
-娴�????娴犮儱????銊�?浼�??鏉�?GPG???鐠佷即??娴犺??娴�???????瀹�?鐞涖儰?????婵傛垝??鐟�?娴ｈ法??GPG???鐠佹澘??娴�????娴�?娑撳搫??瀹�??????????缁涙儳??鐞涖儰??閿�?
-瑜�?娴�?GPG娑�???????7娴�?缂�??????鏈�??娴ｅじ??娴�?????????鏉�??婢�???????
+浣犲彲浠ュ畨鍏ㄥ湴閫氳繃GPG鏍囪闄勪欢锛屼絾鏄唴宓岃ˉ涓佹渶濂戒笉瑕佷娇鐢℅PG鏍囪瀹冧滑銆備綔涓哄唴宓屾枃鏈殑绛惧彂琛ヤ竵锛�
+褰撲粠GPG涓彁鍙�7浣嶇紪鐮佹椂浼氫娇浠栦滑鍙樼殑鏇村姞澶嶆潅銆�
 
-婵�????娴�????鐟�?娴犮儵??娴犲墎??瑜般垹????????鐞涖儰??閿�???锝�??鐏忓崬?鎶�????鐟�?濠�??娴犺????璺�?????娑�?鐏�???褝??缁�????"Suggest automatic
-display"閿�?鏉�???宄�??瀹�????娴犺埖?鏉�?瑙�??鐠佲晞?鏄�???????鑸�??
+濡傛灉浣犻潪瑕佷互闄勪欢鐨勫舰寮忓彂閫佽ˉ涓侊紝閭ｄ箞灏卞彸閿偣鍑婚檮浠讹紝鐒跺悗閫変腑灞炴�э紝绐佸嚭"Suggest automatic
+display"锛岃繖鏍峰唴宓岄檮浠舵洿瀹规槗璁╄鑰呯湅鍒般��
 
-瑜�?娴�?鐟�?娣�?鐎�?鐏�?鐟�?????????????瀹�???????鐞涖儰??閿�?娴�????娴犮儰??濞�???????鐞涖劎????濂�????鈺�?????鐞涖儰????????娴犺????璺�????鍐�?濠�?????
-"save as"???娴�????娴犮儰濞�??銊�??娑�?濞屸剝????瀛�?鍦�????????鐞涖儰????????娴犺??婵�????鐎�????娴犮儲?锝団��???瑜般垹??缂�???????瑜�?娴�?濮濓絿????銊�??
-???瀹歌京??缁�???锝�??娑�?鐎�????閿�???锝�?鑸电梾??????妞ょ懓??娴犮儰??鐎�????娴�?--瀹歌尙?????娑�?娑�?鏉�???椋�??bug鐞�?濮�???銉�?棰�??kmail???bugzilla
-楠炴湹??鐢�????鏉�?鐏�?娴�?鐞�?婢�??????????娴犺埖??娴犮儱?????鐎佃??娑�???銊�?宄�??鐠囪???????????鐞�?娣�?鐎�????閿�????娴犮儱?????娴�???铏�?????娴犺泛????璺�?鏉�?鏈�????鐗�?鐧�??
-娴�?娑�?瀵�?娑�????娴�?娴�????????????閫涜礋缂�?????????缈�?????鐠囨眹??
+褰撲綘瑕佷繚瀛樺皢瑕佸彂閫佺殑鍐呭祵鏂囨湰琛ヤ竵锛屼綘鍙互浠庢秷鎭垪琛ㄧ獥鏍奸�夋嫨鍖呭惈琛ヤ竵鐨勯偖浠讹紝鐒跺悗鍙冲嚮閫夋嫨
+"save as"銆備綘鍙互浣跨敤涓�涓病鏈夋洿鏀圭殑鍖呭惈琛ヤ竵鐨勯偖浠讹紝濡傛灉瀹冩槸浠ユ纭殑褰㈠紡缁勬垚銆傚綋浣犳鐪熷湪瀹�
+鑷繁鐨勭獥鍙ｄ箣涓嬪療鐪嬶紝閭ｆ椂娌℃湁閫夐」鍙互淇濆瓨閭欢--宸茬粡鏈変竴涓繖鏍风殑bug琚眹鎶ュ埌浜唊mail鐨刡ugzilla
+骞朵笖甯屾湜杩欏皢浼氳澶勭悊銆傞偖浠舵槸浠ュ彧閽堝鏌愪釜鐢ㄦ埛鍙鍐欑殑鏉冮檺琚繚瀛樼殑锛屾墍浠ュ鏋滀綘鎯虫妸閭欢澶嶅埗鍒板叾浠栧湴鏂癸紝
+浣犱笉寰椾笉鎶婁粬浠殑鏉冮檺鏀逛负缁勬垨鑰呮暣浣撳彲璇汇��
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Lotus Notes (GUI)
 
-娑�?鐟�?娴ｈ法?銊�?????
+涓嶈浣跨敤瀹冦��
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Mutt (TUI)
 
-瀵�?婢�?Linux瀵�????娴滃搫??娴ｈ法??mutt鐎广垺?椋�??閿�????娴犮儴?????鐎�????鐎�?瀹搞儰????????鐢憡??娴�????
+寰堝Linux寮�鍙戜汉鍛樹娇鐢╩utt瀹㈡埛绔紝鎵�浠ヨ瘉鏄庡畠鑲畾宸ヤ綔鐨勯潪甯告紓浜��
 
-Mutt娑�????鐢�?缂�?鏉�????閿�????娴犮儰??缁犫��??娴ｈ法?銊�??娑�?缂�?鏉�???銊�?鎴�??鎼�?鐠囥儱鐢�????????銊�??鐞�????婢堆�????鎵�??鏉�???銊�?钘夌敨???
-娑�?娑�?"insert file"???妞ょ櫢??鐎�????娴犮儵??鏉�?娑�???鐟�?????娴犺泛??鐎瑰湱????鐟�???????銉�??娴犺翰??
+Mutt涓嶈嚜甯︾紪杈戝櫒锛屾墍浠ヤ笉绠′綘浣跨敤浠�涔堢紪杈戝櫒閮戒笉搴旇甯︽湁鑷姩鏂銆傚ぇ澶氭暟缂栬緫鍣ㄩ兘甯︽湁
+涓�涓�"insert file"閫夐」锛屽畠鍙互閫氳繃涓嶆敼鍙樻枃浠跺唴瀹圭殑鏂瑰紡鎻掑叆鏂囦欢銆�
 
-'vim'娴�?娑�?mutt???缂�?鏉�????閿�?
+'vim'浣滀负mutt鐨勭紪杈戝櫒锛�
   set editor="vi"
 
-  婵�????娴ｈ法??xclip閿�???鎻�?銉や簰娑�???鎴掓姢
+  濡傛灉浣跨敤xclip锛屾暡鍏ヤ互涓嬪懡浠�
   :set paste
-  ???娑�????娑�??????????shift-insert??????娴ｈ法??
+  鎸変腑閿箣鍓嶆垨鑰卻hift-insert鎴栬�呬娇鐢�
   :r filename
 
-婵�??????瀹�?????鐞涖儰??娴�?娑撳搫??瀹�??????????
-(a)ttach瀹搞儰?????瀵�?婵傛枻??娑�?鐢�????"set paste"???
+濡傛灉鎯宠鎶婅ˉ涓佷綔涓哄唴宓屾枃鏈��
+(a)ttach宸ヤ綔鐨勫緢濂斤紝涓嶅甫鏈�"set paste"銆�
 
-???缂�????妞ょ櫢??
-鐎�?鎼�?鐠囥儰浜掓?鐠併倛?鍓х枂???瑜般垹??瀹搞儰?????
-??鎯�??閿�????"send_charset"鐠佸墽鐤嗘稉?"us-ascii::utf-8"娑�????娑�?娑�?娑�???????娑撶粯?????
+閰嶇疆閫夐」锛�
+瀹冨簲璇ヤ互榛樿璁剧疆鐨勫舰寮忓伐浣溿��
+鐒惰�岋紝鎶�"send_charset"璁剧疆涓�"us-ascii::utf-8"涔熸槸涓�涓笉閿欑殑涓绘剰銆�
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Pine (TUI)
 
-Pine鏉�???缁�??娑�?娴�?缁岀儤?鐓�????????妫�?閿�?娴�????鏉�?娴�???鏉�?銊�??鐠囥儵?鍊�??娣�?婢�?娴�????
+Pine杩囧幓鏈変竴浜涚┖鏍煎垹鍑忛棶棰橈紝浣嗘槸杩欎簺鐜板湪搴旇閮借淇浜嗐��
 
-婵�???????娴犮儻??鐠囪渹濞�???alpine(pine???缂佈�?鑳�??)
+濡傛灉鍙互锛岃浣跨敤alpine(pine鐨勭户鎵胯��)
 
-???缂�????妞ょ櫢??
-- ???鏉�?????????????鐟�?濞�???銈�??缁�???????
-- "no-strip-whitespace-before-send"???妞ら��????????鐟�???????
+閰嶇疆閫夐」锛�
+- 鏈�杩戠殑鐗堟湰闇�瑕佹秷闄ゆ祦绋嬫枃鏈�
+- "no-strip-whitespace-before-send"閫夐」涔熸槸闇�瑕佺殑銆�
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Sylpheed (GUI)
 
-- ???瀹�??????????娴犮儱??婵傜晫??瀹搞儰??閿�???????娴ｈ法?銊�??娴犺?????
-- ???鐠侀晲濞�??銊�????銊�??缂�?鏉�???銊�??
-- 鐎甸��?????瑜�?鏉�?婢�???鍫�??鐢憡?????
-- 婵�???????鏉�?non-SSL鏉�???銉�?????濞�?娴ｈ法??TLS SMTP?????????
-- ??銊�?????缁�???锝勮厬???娑�?娑�?瀵�??????銊�??ruler bar???
-- 缂�???鏉�?????娑�?濞ｈ????鏉�??鐏忓彉??娴�?濮濓絿鈥�???娴�?鐟欙絾?鍓с仛??????
+- 鍐呭祵鏂囨湰鍙互寰堝ソ鐨勫伐浣滐紙鎴栬�呬娇鐢ㄩ檮浠讹級銆�
+- 鍏佽浣跨敤澶栭儴鐨勭紪杈戝櫒銆�
+- 瀵逛簬鐩綍杈冨鏃堕潪甯告參銆�
+- 濡傛灉閫氳繃non-SSL杩炴帴锛屾棤娉曚娇鐢═LS SMTP鎺堟潈銆�
+- 鍦ㄧ粍鎴愮獥鍙ｄ腑鏈変竴涓緢鏈夌敤鐨剅uler bar銆�
+- 缁欏湴鍧�鏈腑娣诲姞鍦板潃灏变笉浼氭纭殑浜嗚В鏄剧ず鍚嶃��
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Thunderbird (GUI)
 
-姒�?鐠併倖????鍏�??閿�?thunderbird瀵�?鐎硅??????????????閿�?娴�????鏉�????娑�?娴�???瑙�?????娴犮儱宸�??璺�?????瀵�???鏉戙偨???
+榛樿鎯呭喌涓嬶紝thunderbird寰堝鏄撴崯鍧忔枃鏈紝浣嗘槸杩樻湁涓�浜涙柟娉曞彲浠ュ己鍒跺畠鍙樺緱鏇村ソ銆�
 
-- ??銊�?銊�?宄�????鐤�?鍓х枂???閿�?缂�???????鐎佃??閿�?娑�?鐟�???????"Compose messages in HTML format"???
+- 鍦ㄧ敤鎴峰笎鍙疯缃噷锛岀粍鎴愬拰瀵诲潃锛屼笉瑕侀�夋嫨"Compose messages in HTML format"銆�
 
-- 缂�?鏉�?娴�????Thunderbird???缂�?鐠佸墽鐤�??銉ゅ▏鐎�?娑�?鐟�????鐞�?娴ｈ法??閿�?user_pref("mailnews.wraplength", 0);
+- 缂栬緫浣犵殑Thunderbird閰嶇疆璁剧疆鏉ヤ娇瀹冧笉瑕佹媶琛屼娇鐢細user_pref("mailnews.wraplength", 0);
 
-- 缂�?鏉�?娴�????Thunderbird???缂�?鐠佸墽鐤嗛敍?娴ｅ灝??娑�?鐟�?娴ｈ法??"format=flowed"??鐓�??閿�?user_pref("mailnews.
+- 缂栬緫浣犵殑Thunderbird閰嶇疆璁剧疆锛屼娇瀹冧笉瑕佷娇鐢�"format=flowed"鏍煎紡锛歶ser_pref("mailnews.
   send_plaintext_flowed", false);
 
-- 娴�????鐟�?娴�?Thunderbird???娑撴椽???????鐓�????鐟�??閿�?
-  婵�????姒�?鐠併倖????鍏�??娴�?娑�??????????HTML??鐓�??閿�???锝�?????瀵�???淇�??娴�?娴�?娴�????妫�???????娑�????濡�?娑�???????"Preformat"??鐓�?????
-  婵�????姒�?鐠併倖????鍏�??娴�?娑�??????????????????鐓�??閿�?娴�?娑�?瀵�????鐎�???閫涜礋HTML??鐓�??閿�?娴�?娴�?娴�?娑撹桨??濞嗏剝?褏??閿�???銉ゅ姛?????鎵�??濞�????閿�?
-  ??璺�??瀵搫?鏈靛▏鐎�??????鐗�???????鐓�??閿�???????鐎�?鐏忓彉?????鐞�????鐟�?鐎�???鏉�??閿�???銊�??娣囷紕????鐐�??娑�?娴ｈ法??shift?????銉ゅ▏鐎�????娑�?HTML
-  ??鐓�??閿�???璺�?????妫�???????娑�????濡�?娑�???????"Preformat"??鐓�?????
+- 浣犻渶瑕佷娇Thunderbird鍙樹负棰勫厛鏍煎紡鏂瑰紡锛�
+  濡傛灉榛樿鎯呭喌涓嬩綘涔﹀啓鐨勬槸HTML鏍煎紡锛岄偅涓嶆槸寰堥毦銆備粎浠呬粠鏍囬鏍忕殑涓嬫媺妗嗕腑閫夋嫨"Preformat"鏍煎紡銆�
+  濡傛灉榛樿鎯呭喌涓嬩綘涔﹀啓鐨勬槸鏂囨湰鏍煎紡锛屼綘涓嶅緱鎶婂畠鏀逛负HTML鏍煎紡锛堜粎浠呬綔涓轰竴娆℃�х殑锛夋潵涔﹀啓鏂扮殑娑堟伅锛�
+  鐒跺悗寮哄埗浣垮畠鍥炲埌鏂囨湰鏍煎紡锛屽惁鍒欏畠灏变細鎷嗚銆傝瀹炵幇瀹冿紝鍦ㄥ啓淇＄殑鍥炬爣涓婁娇鐢╯hift閿潵浣垮畠鍙樹负HTML
+  鏍煎紡锛岀劧鍚庢爣棰樻爮鐨勪笅鎷夋涓�夋嫨"Preformat"鏍煎紡銆�
 
-- ???鐠侀晲濞�??銊�????銊�??缂�?鏉�????閿�?
-  ???鐎�?Thunderbird???鐞涖儰?????缁�?????????瑙�??鐏忚鲸??娴ｈ法?銊�??娑�?"external editor"??鈺�??閿�???璺�??娴ｈ法?銊�????????濞嗐垻??
-  $EDITOR??銉�?璇�???????????楠炴儼藟娑�???鐗�?????娑�????鐟�?鐎�???鏉�??閿�????娴犮儰??鏉炶棄鑻熸稉?鐎�?鐟�?鏉�?娑�???鈺�??閿�???璺�??濞ｈ??娑�?娑�?娴ｈ法?銊�?????
-  ??????View->Toolbars->Customize...??????瑜�?娴�?娑�????娣団剝???????璺�??娴�?娴�???鐟�?璇�??鐏忓崬??娴犮儰?????
+- 鍏佽浣跨敤澶栭儴鐨勭紪杈戝櫒锛�
+  閽堝Thunderbird鎵撹ˉ涓佹渶绠�鍗曠殑鏂规硶灏辨槸浣跨敤涓�涓�"external editor"鎵╁睍锛岀劧鍚庝娇鐢ㄤ綘鏈�鍠滄鐨�
+  $EDITOR鏉ヨ鍙栨垨鑰呭悎骞惰ˉ涓佸埌鏂囨湰涓�傝瀹炵幇瀹冿紝鍙互涓嬭浇骞朵笖瀹夎杩欎釜鎵╁睍锛岀劧鍚庢坊鍔犱竴涓娇鐢ㄥ畠鐨�
+  鎸夐敭View->Toolbars->Customize...鏈�鍚庡綋浣犱功鍐欎俊鎭殑鏃跺�欎粎浠呯偣鍑诲畠灏卞彲浠ヤ簡銆�
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 TkRat (GUI)
 
-???娴犮儰濞�??銊�?????娴ｈ法??"Insert file..."??????婢�???銊�??缂�?鏉�???銊�??
+鍙互浣跨敤瀹冦�備娇鐢�"Insert file..."鎴栬�呭閮ㄧ殑缂栬緫鍣ㄣ��
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Gmail (Web GUI)
 
-娑�?鐟�?娴ｈ法?銊�????????鐞涖儰?????
+涓嶈浣跨敤瀹冨彂閫佽ˉ涓併��
 
-Gmail缂�?妞ら潧?銏�?椋�???????銊�?鐗�????鎯般�冪粭?鏉�????娑撹櫣鈹�??绗�??
+Gmail缃戦〉瀹㈡埛绔嚜鍔ㄥ湴鎶婂埗琛ㄧ杞崲涓虹┖鏍笺��
 
-??鐣�?璺�?鎯般�冪粭?鏉�????娑撹櫣鈹�??濂�??妫�????娴犮儴??婢�???銊�??鏉�???銊ㄐ�??绛�???????璺�??鏉�?娴�?娴ｈ法?銊�??鏉�???銏�?????濮�?鐞�???????娑�?78娑�?鐎�?缁�????
+铏界劧鍒惰〃绗﹁浆鎹负绌烘牸闂鍙互琚閮ㄧ紪杈戝櫒瑙ｅ喅锛屽悓鏃跺畠杩樹細浣跨敤鍥炶溅鎹㈣鎶婃瘡琛屾媶鍒嗕负78涓瓧绗︺��
 
-???娑�?娑�????妫�????Gmail鏉�?娴�????娴犺??娑�????ASCII???鐎�?缁�????娣団剝????閫涜礋base64缂�???????鐎�????娑�?鐟楀灝????????濞喲勫簥娴滆櫣?????鐎�????
+鍙︿竴涓棶棰樻槸Gmail杩樹細鎶婁换浣曚笉鏄疉SCII鐨勫瓧绗︾殑淇℃伅鏀逛负base64缂栫爜銆傚畠鎶婁笢瑗垮彉鐨勫儚娆ф床浜虹殑鍚嶅瓧銆�
 
                                 ###
diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt
index 4c4ce853577b..c278f412dc65 100644
--- a/Documentation/zh_CN/magic-number.txt
+++ b/Documentation/zh_CN/magic-number.txt
@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h
 RISCOM8_MAGIC         0x0907      riscom_port       drivers/char/riscom8.h
 SPECIALIX_MAGIC       0x0907      specialix_port    drivers/char/specialix_io8.h
 HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c
-APM_BIOS_MAGIC        0x4101      apm_user          arch/i386/kernel/apm.c
+APM_BIOS_MAGIC        0x4101      apm_user          arch/x86/kernel/apm_32.c
 CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h
 DB_MAGIC              0x4442      fc_info           drivers/net/iph5526_novram.c
 DL_MAGIC              0x444d      fc_info           drivers/net/iph5526_novram.c