From 302d6b4a0f7bfae7c8888e47e41c06356f1fb228 Mon Sep 17 00:00:00 2001 From: Warren Block Date: Wed, 3 Jul 2013 13:57:18 +0000 Subject: [PATCH 01/11] Extend the ulink external page example, leaving out the link text to show the actual URL. --- .../books/fdp-primer/docbook-markup/chapter.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml index 376d37ab16..8c5573a646 100644 --- a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml +++ b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml @@ -2243,6 +2243,19 @@ IMAGES= chapter1/fig1.png GUID Partition Tables. + + The link text can be omitted to show the actual + URL: + + Wikipedia has an excellent reference on + GUID Partition Tables: .]]> + + Appearance: + + Wikipedia has an excellent reference on + GUID Partition Tables: . From a63667a48270c82fa738b154dcd7eee06b2b1bc0 Mon Sep 17 00:00:00 2001 From: Ryusuke SUZUKI Date: Wed, 3 Jul 2013 15:03:23 +0000 Subject: [PATCH 02/11] - Merge the following from the English version: r41773 -> r42112 head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml --- .../books/handbook/cutting-edge/chapter.xml | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml index b345e36fe2..8a814f5f08 100644 --- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml +++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r41773 + Original revision: r42112 $FreeBSD$ --> @@ -1252,7 +1252,7 @@ Fetching 133 new ports or files... done. &os.current; ってなに? - &os.current; は &os; の最新の、そして作業進行中のソースです。 + &os.current; は &os; の最新のソースコードです。 中には現在開発途上のソフトウェア、 実験的な変更、あるいは過渡的な機能などが含まれています。 また、この中に入っている機能がすべて、 @@ -1311,6 +1311,7 @@ Fetching 133 new ports or files... done. バグを修正するための素早い方法。 + いかなるコミットは、 元からあるバグを修正するのと同じく、 新しいバグを生み出すおそれがあります。 @@ -1488,7 +1489,7 @@ Fetching 133 new ports or files... done. このような理由から、盲目的に &os.stable; を追いかけるべきではありません。 - 特に、最初に開発環境でコードを十分に試験せずに、 + 特に、最初に開発環境もしくはテスト環境でコードを十分に試験せずに、 プロダクション品質が要求されるサーバを &os.stable; にアップグレードしてはいけません。 @@ -1515,7 +1516,7 @@ Fetching 133 new ports or files... done. 提案された変更に関して問題が生じるかどうかを返答する機会をユーザに与えます。 追いかけているブランチに関連する - SVN メーリングリストに参加してください。 + svn メーリングリストに参加してください。 たとえば、9-STABLE ブランチを追いかけているユーザは &a.svn-src-stable-9.name; メーリングリストに参加してください。 このリストでは、 @@ -1532,8 +1533,7 @@ Fetching 133 new ports or files... done. 毎月公開されている &os.stable; - からビルドされたスナップショットを走らせるために、 - 新しいシステムをインストールするには、 + からビルドされたスナップショットの新しいシステムをインストールするには、 詳細について、 スナップショット をご覧ください。 @@ -1593,14 +1593,6 @@ Fetching 133 new ports or files... done. - - ソースに迅速でオンデマンドなアクセスが必要で、 - 接続のバンド幅が問題でなければ、 - Subversion を使いましょう。 - そうでない場合は CTM - を使いましょう。 - - -STABLE From 658ba1303dcc801b7f013ccd0a4dd17d85ce5769 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Wed, 3 Jul 2013 15:06:52 +0000 Subject: [PATCH 03/11] The last UK cvsup server is going away, so remove all its aliases. --- .../books/handbook/mirrors/chapter.xml | 23 ------------------- share/xml/mirrors.xml | 16 ------------- 2 files changed, 39 deletions(-) diff --git a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml index 158fb5953c..4bd27c8e3e 100644 --- a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml +++ b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml @@ -4177,29 +4177,6 @@ src-all - - Reino Unido - - - - - cvsup.uk.FreeBSD.org (responsvel - ftp-admin@plig.net) - - - - cvsup2.uk.FreeBSD.org (responsvel - brian@FreeBSD.org) - - - - cvsup3.uk.FreeBSD.org (responsvel - ben.hughes@uk.easynet.net) - - - - - Repblica Eslovaca diff --git a/share/xml/mirrors.xml b/share/xml/mirrors.xml index 66138f579e..1ff3dc2bd1 100644 --- a/share/xml/mirrors.xml +++ b/share/xml/mirrors.xml @@ -2004,22 +2004,6 @@ ftp://ftp6.uk.FreeBSD.org/pub/FreeBSD/ - - cvsup.uk.FreeBSD.org - - - - cvsup2.uk.FreeBSD.org - - - - cvsup3.uk.FreeBSD.org - - - - cvsup4.uk.FreeBSD.org - - hostmaster@uk.FreeBSD.org From 7557cbb0011c6c1fa5c81a4c00ff0fd932cf1478 Mon Sep 17 00:00:00 2001 From: Ryusuke SUZUKI Date: Wed, 3 Jul 2013 15:12:52 +0000 Subject: [PATCH 04/11] - Merge the following from the English version: r41635 -> r42116 head/ja_JP.eucJP/share/xml/navibar.l10n.ent --- ja_JP.eucJP/share/xml/navibar.l10n.ent | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ja_JP.eucJP/share/xml/navibar.l10n.ent b/ja_JP.eucJP/share/xml/navibar.l10n.ent index 678512a2f0..a4bbb4df6e 100644 --- a/ja_JP.eucJP/share/xml/navibar.l10n.ent +++ b/ja_JP.eucJP/share/xml/navibar.l10n.ent @@ -1,7 +1,7 @@ - + @@ -74,6 +74,7 @@
  • ウェブ上の情報
  • 初めての方向けの情報
  • ドキュメンテーションプロジェクト
    • +
  • アーカイブ
    • '> From dc83bd92bd9955a5327f747cb66812ed4863af53 Mon Sep 17 00:00:00 2001 From: Ryusuke SUZUKI Date: Wed, 3 Jul 2013 15:38:46 +0000 Subject: [PATCH 05/11] - Merge the following from the English version: r41710 -> r42118 head/ja_JP.eucJP/books/handbook/Makefile r41824 -> r42118 head/ja_JP.eucJP/books/handbook/book.xml r21771 -> r42118 head/ja_JP.eucJP/books/handbook/chapters.ent r42018 -> r42118 head/ja_JP.eucJP/books/handbook/disks/chapters.xml r41912 -> r42118 head/ja_JP.eucJP/books/handbook/preface.xml --- ja_JP.eucJP/books/handbook/Makefile | 10 +--------- ja_JP.eucJP/books/handbook/book.xml | 3 +-- ja_JP.eucJP/books/handbook/chapters.ent | 8 ++++++-- ja_JP.eucJP/books/handbook/disks/chapter.xml | 4 ---- ja_JP.eucJP/books/handbook/preface/preface.xml | 9 --------- 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile index 1a252ed428..683c12b036 100644 --- a/ja_JP.eucJP/books/handbook/Makefile +++ b/ja_JP.eucJP/books/handbook/Makefile @@ -3,7 +3,7 @@ # # Build the FreeBSD Handbook (Japanese). # -# Original revision: r41710 +# Original revision: r42118 # # ------------------------------------------------------------------------ @@ -180,13 +180,6 @@ IMAGES_EN+= install/example-dir5.eps #IMAGES_EN+= security/ipsec-crypt-pkt.pic #IMAGES_EN+= security/ipsec-encap-pkt.pic #IMAGES_EN+= security/ipsec-out-pkt.pic -#IMAGES_EN+= vinum/vinum-concat.pic -#IMAGES_EN+= vinum/vinum-mirrored-vol.pic -#IMAGES_EN+= vinum/vinum-raid10-vol.pic -#IMAGES_EN+= vinum/vinum-raid5-org.pic -#IMAGES_EN+= vinum/vinum-simple-vol.pic -#IMAGES_EN+= vinum/vinum-striped-vol.pic -#IMAGES_EN+= vinum/vinum-striped.pic IMAGES_EN+= virtualization/parallels-freebsd1.png IMAGES_EN+= virtualization/parallels-freebsd2.png IMAGES_EN+= virtualization/parallels-freebsd3.png @@ -286,7 +279,6 @@ SRCS+= printing/chapter.xml SRCS+= security/chapter.xml SRCS+= serialcomms/chapter.xml SRCS+= users/chapter.xml -#SRCS+= vinum/chapter.xml #SRCS+= virtualization/chapter.xml SRCS+= x11/chapter.xml diff --git a/ja_JP.eucJP/books/handbook/book.xml b/ja_JP.eucJP/books/handbook/book.xml index 6bae74ef2d..95ba020938 100644 --- a/ja_JP.eucJP/books/handbook/book.xml +++ b/ja_JP.eucJP/books/handbook/book.xml @@ -11,7 +11,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r41824 + Original revision: r42118 $FreeBSD$ --> @@ -247,7 +247,6 @@ &chap.disks; &chap.l10n; diff --git a/ja_JP.eucJP/books/handbook/chapters.ent b/ja_JP.eucJP/books/handbook/chapters.ent index a8690771db..01afb164f4 100644 --- a/ja_JP.eucJP/books/handbook/chapters.ent +++ b/ja_JP.eucJP/books/handbook/chapters.ent @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: 1.28 + Original revision: r42118 $FreeBSD$ Creates entities for each chapter in the FreeBSD Handbook. Each entity @@ -38,10 +38,12 @@ + + - + @@ -50,6 +52,8 @@ + + diff --git a/ja_JP.eucJP/books/handbook/disks/chapter.xml b/ja_JP.eucJP/books/handbook/disks/chapter.xml index 1bd3106faa..a5b39ccbdc 100644 --- a/ja_JP.eucJP/books/handbook/disks/chapter.xml +++ b/ja_JP.eucJP/books/handbook/disks/chapter.xml @@ -3335,10 +3335,6 @@ Filesystem Size Used Avail Capacity Mounted on &prompt.root; gbde detach /dev/ad4s1c - &man.vinum.4; は &man.geom.4; サブシステムを使用しないので、 - vinum ボリュームと - gbde - を併用できないことにも注意してください。 diff --git a/ja_JP.eucJP/books/handbook/preface/preface.xml b/ja_JP.eucJP/books/handbook/preface/preface.xml index 44078b6854..db1ee3e69d 100644 --- a/ja_JP.eucJP/books/handbook/preface/preface.xml +++ b/ja_JP.eucJP/books/handbook/preface/preface.xml @@ -229,15 +229,6 @@ ネットワークファイルシステムなどです。     - , 地域化 From a0158d2a4d4176d3c065ec1561b0804a2253f8f2 Mon Sep 17 00:00:00 2001 From: Ryusuke SUZUKI Date: Wed, 3 Jul 2013 15:48:41 +0000 Subject: [PATCH 06/11] - Merge the following from the English version: r42055 -> r42115 head/ja_JP.eucJP/share/xml/news.xml --- ja_JP.eucJP/share/xml/news.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ja_JP.eucJP/share/xml/news.xml b/ja_JP.eucJP/share/xml/news.xml index 3e6742b72b..598be086c3 100644 --- a/ja_JP.eucJP/share/xml/news.xml +++ b/ja_JP.eucJP/share/xml/news.xml @@ -20,7 +20,7 @@ the contents of will be preferred over <p>. $FreeBSD$ - Original revision: r42055 + Original revision: r42115 --> <news> <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> @@ -30,6 +30,22 @@ <year> <name>2013</name> + <month> + <name>7</name> + + <day> + <name>2</name> + + <event> + <title>BSDCan 2013 DevSummit リポート +

    BSDCan 2013 &os; 開発者サミットのスペシャルレポート + (6 エントリ) が 公開 + されました。

    + + + + 6 From e819151e4597298490d8fa752e7a66cd256041fb Mon Sep 17 00:00:00 2001 From: Gabor Kovesdan Date: Wed, 3 Jul 2013 17:35:46 +0000 Subject: [PATCH 07/11] - Fix the cases when the specified column number does not match the real one - Add a constraint for this --- de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml | 2 +- de_DE.ISO8859-1/books/porters-handbook/book.xml | 1 + el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml | 2 +- en_US.ISO8859-1/books/handbook/desktop/chapter.xml | 2 +- en_US.ISO8859-1/books/pmake/gods/chapter.xml | 2 +- en_US.ISO8859-1/books/porters-handbook/book.xml | 3 ++- hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml | 2 +- hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml | 2 +- it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml | 2 +- .../books/unix-introduction/system-resource/chapter.xml | 2 ++ ja_JP.eucJP/books/handbook/desktop/chapter.xml | 2 +- ja_JP.eucJP/books/porters-handbook/book.xml | 2 ++ mn_MN.UTF-8/books/handbook/firewalls/chapter.xml | 2 +- nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml | 2 +- pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml | 2 +- ru_RU.KOI8-R/books/porters-handbook/book.xml | 4 ++++ share/xml/freebsd.sch | 5 ++++- zh_CN.GB2312/books/handbook/firewalls/chapter.xml | 2 +- zh_CN.GB2312/books/porters-handbook/book.xml | 2 ++ zh_TW.Big5/books/handbook/firewalls/chapter.xml | 2 +- zh_TW.Big5/books/handbook/serialcomms/chapter.xml | 2 +- zh_TW.Big5/books/porters-handbook/book.xml | 2 ++ 22 files changed, 33 insertions(+), 16 deletions(-) diff --git a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml index 5a679c9224..2a0307233a 100644 --- a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml +++ b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml @@ -1834,7 +1834,7 @@ block in log first quick on dc0 all Internet:     - + diff --git a/de_DE.ISO8859-1/books/porters-handbook/book.xml b/de_DE.ISO8859-1/books/porters-handbook/book.xml index b0a5203477..0b816bcf25 100644 --- a/de_DE.ISO8859-1/books/porters-handbook/book.xml +++ b/de_DE.ISO8859-1/books/porters-handbook/book.xml @@ -6050,6 +6050,7 @@ PLIST_SUB+= NLS="@comment " Nur lesbare Variablen + Bedeutung diff --git a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml index c58f023aaf..93dcfee68e 100644 --- a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml +++ b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml @@ -1823,7 +1823,7 @@ block in log first quick on dc0 all Internet: - + diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml index cf3a14b4e8..b26d01401e 100644 --- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml @@ -41,7 +41,7 @@ desktop applications: - + Type of Application diff --git a/en_US.ISO8859-1/books/pmake/gods/chapter.xml b/en_US.ISO8859-1/books/pmake/gods/chapter.xml index 6bca57995b..c2360b3226 100644 --- a/en_US.ISO8859-1/books/pmake/gods/chapter.xml +++ b/en_US.ISO8859-1/books/pmake/gods/chapter.xml @@ -386,7 +386,7 @@ still more lines They are as follows: - + ifdef diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml index f4911631a2..e606873275 100644 --- a/en_US.ISO8859-1/books/porters-handbook/book.xml +++ b/en_US.ISO8859-1/books/porters-handbook/book.xml @@ -5958,6 +5958,7 @@ PLIST_SUB+= NLS="@comment " Read only variables + Means @@ -17022,7 +17023,7 @@ pre-install: Values of <makevar>USES</makevar> - + Feature diff --git a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml index ec1793e84a..e0d50b6e89 100644 --- a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml +++ b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml @@ -2360,7 +2360,7 @@ block in log first quick on dc0 all kijutni az internetre: - + diff --git a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml index 5599112f6b..d7a6ccf918 100644 --- a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml +++ b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml @@ -2063,7 +2063,7 @@ export PATH lthatjuk): - + llomnyrendszer diff --git a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml index c26f7aeddc..5068131fdc 100644 --- a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml +++ b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml @@ -1374,7 +1374,7 @@ ttyd5 "/usr/libexec/getty std.19200" vt100 on insecure
    Nomi dei Segnali - + Acronimi diff --git a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml index 9613715563..e339c48781 100644 --- a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml +++ b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml @@ -280,6 +280,8 @@ peri:/acs/peri/2 BSD SVR4 + + diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml index 4048e318d7..15b17588c3 100644 --- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml +++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml @@ -44,7 +44,7 @@ 以下のデスクトップアプリケーションのインストール方法について説明します。 - + 分野 diff --git a/ja_JP.eucJP/books/porters-handbook/book.xml b/ja_JP.eucJP/books/porters-handbook/book.xml index a2635fce50..27e7d68f46 100644 --- a/ja_JP.eucJP/books/porters-handbook/book.xml +++ b/ja_JP.eucJP/books/porters-handbook/book.xml @@ -3827,6 +3827,8 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar 読み取り専用変数 + + 意味 diff --git a/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml index 4816cab684..f7083cf8ca 100644 --- a/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml @@ -1578,7 +1578,7 @@ DSL 仄仂亟亠仄仂亶 亞仍亞亟亳亶仆 于亟 仄仂亟亠仄仂仂 舒舒 弍仂仍仂仄亢仂亶, 亟亞 IP 亰 亞舒亟舒舒亟 仆亠仆 亞舒舒亞勵亶 弍仂仍仆仂: - + diff --git a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml index 9d53ed0e9e..4c90194566 100644 --- a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml @@ -1385,7 +1385,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure
    Signaalnamen - + Acroniemen diff --git a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml index 29bf44fccc..09f6ecf083 100644 --- a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml +++ b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml @@ -1704,7 +1704,7 @@ block in log first quick on dc0 all Internet: - + diff --git a/ru_RU.KOI8-R/books/porters-handbook/book.xml b/ru_RU.KOI8-R/books/porters-handbook/book.xml index 6537f7538f..a97cb079ec 100644 --- a/ru_RU.KOI8-R/books/porters-handbook/book.xml +++ b/ru_RU.KOI8-R/books/porters-handbook/book.xml @@ -5138,6 +5138,8 @@ IGNORE= may not be redistributed because of licensing reasons. Please vi 霤凖妖領叢 + + 料淌良 @@ -5622,6 +5624,8 @@ PLIST_SUB+= NLS="@comment " 霤凖妖領拇 塹蒙墨 通 湟杜頻 + + 料淌良 diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch index 2d03a8e400..0e57d554e2 100644 --- a/share/xml/freebsd.sch +++ b/share/xml/freebsd.sch @@ -60,10 +60,13 @@ - + You cannot use both colname and spanname attributes on table entries. + + The number of columns does not match the specified value (in section ). + + + +sub 2048R/9D089395 2013-07-03 +]]> + diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml index ed042732f8..62c8f2dcb5 100644 --- a/share/pgpkeys/pgpkeys-developers.xml +++ b/share/pgpkeys/pgpkeys-developers.xml @@ -1686,6 +1686,11 @@ &pgpkey.ssouhlal; + + &a.loos; + &pgpkey.loos; + + &a.uqs; &pgpkey.uqs; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index 24b8a392e9..c56fdd90df 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -227,6 +227,7 @@ + From 2d1250250c1192f4514c093f8b1d82b74e8fa0e6 Mon Sep 17 00:00:00 2001 From: Ryusuke SUZUKI Date: Thu, 4 Jul 2013 10:53:13 +0000 Subject: [PATCH 11/11] - Merge the following from the English version: r42115 -> r42144 head/ja_JP.eucJP/share/xml/news.xml --- ja_JP.eucJP/share/xml/news.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ja_JP.eucJP/share/xml/news.xml b/ja_JP.eucJP/share/xml/news.xml index 598be086c3..853a430ef5 100644 --- a/ja_JP.eucJP/share/xml/news.xml +++ b/ja_JP.eucJP/share/xml/news.xml @@ -20,7 +20,7 @@ the contents of will be preferred over <p>. $FreeBSD$ - Original revision: r42115 + Original revision: r42144 --> <news> <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> @@ -33,6 +33,15 @@ <month> <name>7</name> + <day> + <name>3</name> + + <event> + <p>新コミッタ就任: + <a href="mailto:loos@FreeBSD.org">Luiz Otavio O Souza</a> (src)</p> + </event> + </day> + <day> <name>2</name>