diff options
| author | Gabor Kovesdan <gabor@FreeBSD.org> | 2013-07-04 19:03:44 +0000 |
|---|---|---|
| committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2013-07-04 19:03:44 +0000 |
| commit | 57cba96872f125b25e6bb1ac3b6d32d2abac9b23 (patch) | |
| tree | b434f8e4884f5777158d62fe99517f5d5befc9fb | |
| parent | 2de4169711fa6ffd3c542d04febd77bcb9d50dd2 (diff) | |
| parent | 2d1250250c1192f4514c093f8b1d82b74e8fa0e6 (diff) | |
| download | doc-57cba96872f125b25e6bb1ac3b6d32d2abac9b23.tar.gz doc-57cba96872f125b25e6bb1ac3b6d32d2abac9b23.zip | |
- MFH
Notes
Notes:
svn path=/projects/db5/; revision=42147
42 files changed, 164 insertions, 101 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:</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="2"> + <tgroup cols="3"> <colspec colwidth="1*"/> <colspec colwidth="1*"/> 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 " <thead> <row> <entry>Nur lesbare Variablen</entry> + <entry>Bedeutung</entry> </row> </thead> 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:</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="2"> + <tgroup cols="3"> <colspec colwidth="1*"/> <colspec colwidth="1*"/> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml index f16e19054b..889848027c 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml @@ -5969,11 +5969,6 @@ </listitem> <listitem> - <para>Luiz Otavio O Souza - <email>loos.br@gmail.com</email></para> - </listitem> - - <listitem> <para>Lukasz Stelmach <email>lukasz.stelmach@iem.pw.edu.pl</email></para> </listitem> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml index b46c0bf44b..3fcedcc145 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml @@ -1404,6 +1404,10 @@ </listitem> <listitem> + <para>&a.loos;</para> + </listitem> + + <listitem> <para>&a.uqs;</para> </listitem> 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 <ulink url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID Partition Tables</ulink>.</para> + + <para>The link text can be omitted to show the actual + URL:</para> + + <programlisting><![CDATA[<para>Wikipedia has an excellent reference on + GUID Partition Tables: <ulink + url="http://en.wikipedia.org/wiki/GUID_Partition_Table"></ulink>.</para>]]></programlisting> + + <para>Appearance:</para> + + <para>Wikipedia has an excellent reference on + GUID Partition Tables: <ulink + url="http://en.wikipedia.org/wiki/GUID_Partition_Table"></ulink>.</para> </example> </sect3> </sect2> 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:</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="3"> + <tgroup cols="4"> <thead> <row> <entry>Type of Application</entry> 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:</para> <informaltable frame="none"> - <tgroup cols="3"> + <tgroup cols="2"> <tbody> <row> <entry><literal>ifdef</literal></entry> 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 " <thead> <row> <entry>Read only variables</entry> + <entry>Means</entry> </row> </thead> @@ -17022,7 +17023,7 @@ pre-install: <table frame="none"> <title>Values of <makevar>USES</makevar></title> - <tgroup cols="2"> + <tgroup cols="3"> <thead> <row> <entry>Feature</entry> diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml b/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml index f654353757..9bfbe5ee01 100644 --- a/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml +++ b/en_US.ISO8859-1/htdocs/news/status/report-2013-04-2013-06.xml @@ -536,6 +536,14 @@ </name> <email>rpaulo@FreeBSD.org</email> </person> + + <person> + <name> + <given>Kevin</given> + <common>Lo</common> + </name> + <email>kevlo@FreeBSD.org</email> + </person> </contact> <body> 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:</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="2"> + <tgroup cols="3"> <colspec colwidth="1*"/> <colspec colwidth="1*"/> <colspec colwidth="1*"/> diff --git a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml index abdc06089f..2d08bc4a4d 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</programlisting> l嫢hatjuk):</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="4"> + <tgroup cols="3"> <thead> <row> <entry>翼lom嫕yrendszer</entry> 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</programlisting> <table frame="none" pgwide="1" id="serialcomms-signal-names"> <title>Nomi dei Segnali</title> - <tgroup cols="5"> + <tgroup cols="2"> <thead> <row> <entry align="left">Acronimi</entry> 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 <entry>BSD</entry> <entry>SVR4</entry> + + <entry/> </row> </thead> 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 5af8ce933a..a3f89a080e 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.filesystems; - &chap.vinum; &chap.virtualization; --> &chap.l10n; diff --git a/ja_JP.eucJP/books/handbook/chapters.ent b/ja_JP.eucJP/books/handbook/chapters.ent index 3354161101..b1ee8ab0c9 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 @@ <!ENTITY chap.users SYSTEM "users/chapter.xml"> <!ENTITY chap.security SYSTEM "security/chapter.xml"> <!ENTITY chap.jails SYSTEM "jails/chapter.xml"> +<!-- <!ENTITY chap.mac SYSTEM "mac/chapter.xml"> --> <!ENTITY chap.audit SYSTEM "audit/chapter.xml"> <!ENTITY chap.disks SYSTEM "disks/chapter.xml"> +<!-- <!ENTITY chap.geom SYSTEM "geom/chapter.xml"> --> <!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml"> - <!ENTITY chap.vinum SYSTEM "vinum/chapter.xml"> +<!-- <!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml"> --> <!ENTITY chap.l10n SYSTEM "l10n/chapter.xml"> <!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml"> <!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml"> @@ -50,6 +52,8 @@ <!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml"> <!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml"> <!ENTITY chap.mail SYSTEM "mail/chapter.xml"> +<!-- <!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml"> --> +<!-- <!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml"> --> <!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml"> <!-- Part Five (appendices) --> 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.</screen> <sect3> <title>&os.current; 勻化卅卞?</title> - <para>&os.current; 反 &os; 及瘉蕙及﹜公仄化綜僅褡墊醱及末□旦匹允﹝ + <para>&os.current; 反 &os; 及瘉蕙及末□旦戊□玉匹允﹝ 醱卞反蜇箕釩級蚞憭峊膝掍它尼失﹜ 撢董讀卅庍凳﹜丐月中反聊欐讀卅窗Х卅升互殖引木化中引允﹝ 引凶﹜仇及醱卞ェ勻化中月窗Х互允屯化﹜ @@ -1311,6 +1311,7 @@ Fetching 133 new ports or files... done.</screen> <listitem> <para>田弘毛膜懇允月凶戶及豳鍍中杅芊﹝ + 中井卅月戊立永玄反﹜ 葭井日丐月田弘毛膜懇允月及午き元仁﹜ 蕙仄中田弘毛戲心請允云公木互丐曰引允﹝</para> </listitem> @@ -1488,7 +1489,7 @@ Fetching 133 new ports or files... done.</screen> <para>仇及方丹卅咥苀井日﹜枎杴讀卞 &os.stable; 毛馨中井仃月屯五匹反<emphasis>丐曰引六氏</emphasis>﹝ - た卞﹜瘉賡卞釩秩譯迨ル部憧氻羷褊洶侄賹酗誘漱芊 + た卞﹜瘉賡卞釩秩譯迨滮楔砟洏ぁ馴棕雁匹戊□玉毛蝸坌卞魂董六內卞﹜ 皿伕母弁扑亦件圴撙互邰菲今木月扔□田毛 &os.stable; 卞失永皿弘伊□玉仄化反中仃引六氏﹝</para> @@ -1515,7 +1516,7 @@ Fetching 133 new ports or files... done.</screen> 羼副今木凶庍凳卞楮仄化杽鎖互戲元月井升丹井毛忒蠶允月窗莘毛交□扒卞芨尹引允﹝</para> <para>馨中井仃化中月皮仿件民卞楮洘允月 - <application>SVN</application> 丟□伉件弘伉旦玄卞輔笛仄化仁分今中﹝ + <application>svn</application> 丟□伉件弘伉旦玄卞輔笛仄化仁分今中﹝ 凶午尹壬﹜9-STABLE 皮仿件民毛馨中井仃化中月交□扒反 &a.svn-src-stable-9.name; 丟□伉件弘伉旦玄卞輔笛仄化仁分今中﹝ 仇及伉旦玄匹反﹜ @@ -1532,8 +1533,7 @@ Fetching 133 new ports or files... done.</screen> <listitem> <para>咍畸跤釩今木化中月 &os.stable; - 井日申伙玉今木凶旦瓜永皿扑亦永玄毛雖日六月凶戶卞﹜ - 蕙仄中扑旦氾丞毛奶件旦玄□伙允月卞反﹜ + 井日申伙玉今木凶旦瓜永皿扑亦永玄及蕙仄中扑旦氾丞毛奶件旦玄□伙允月卞反﹜ 擇稱卞勾中化﹜ <ulink url="&url.base;/snapshots/">旦瓜永皿扑亦永玄</ulink> 毛仍厖仁分今中﹝ @@ -1594,14 +1594,6 @@ Fetching 133 new ports or files... done.</screen> </listitem> <listitem> - <para>末□旦卞謂簧匹左件犯穴件玉卅失弁本旦互优邰匹﹜ - 濤糧及田件玉汔互杽鎖匹卅仃木壬﹜ - <command>Subversion</command> 毛銀中引仄斤丹﹝ - 公丹匹卅中樺寧反 <application>CTM</application> - 毛銀中引仄斤丹﹝</para> - </listitem> - - <listitem> <indexterm> <primary>-STABLE</primary> <secondary>厭蹲﹜戊件由奶伙</secondary> 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 @@ 動票及犯旦弁玄永皿失皿伉弗□扑亦件及奶件旦玄□伙杅芊卞勾中化濩抸仄引允﹝</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="3"> + <tgroup cols="4"> <thead> <row> <entry>坌沓</entry> diff --git a/ja_JP.eucJP/books/handbook/disks/chapter.xml b/ja_JP.eucJP/books/handbook/disks/chapter.xml index 06eda9d4d6..3b2928c5eb 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 <screen>&prompt.root; <userinput>gbde detach /dev/ad4s1c</userinput></screen> - <para>&man.vinum.4; 反 &man.geom.4; 扔皮扑旦氾丞毛銀迕仄卅中及匹﹜ - <application>vinum</application> 示伉亙□丞午 - <application>gbde</application> - 毛妡迕匹五卅中仇午卞手鏜啦仄化仁分今中﹝</para> </sect2> </sect1> </chapter> 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 @@ 生永玄伐□弁白央奶伙扑旦氾丞卅升匹允﹝</para> </listitem> </varlistentry> - <!-- XXX: to be commented in when handbook/vinum is translated. - <varlistentry> - <term><emphasis><xref linkend="vinum-vinum"/>, Vinum</emphasis></term> - <para>犯田奶旦饇苂舅庌櫛犯奴旦弁午末白玄它尼失 RAID-0, - RAID-1, RAID-5 毛羼間允月狨咥示伉亙□丞棟咥末白玄它尼失 - Vinum 及銀中杅毛濩抸仄化中引允﹝</para> - </listitem> - </varlistentry> - --> <varlistentry> <term><emphasis><xref linkend="l10n"/>, 譁啗祭</emphasis></term> <listitem> 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</programlisting> <thead> <row> <entry>づ心潸曰燬迕庍醒</entry> + + <entry>啦怗</entry> </row> </thead> 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 @@ <?xml version='1.0' encoding='euc-jp'?> <!-- $FreeBSD$ --> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r41635 --> +<!-- Original revision: r42116 --> <!ENTITY nav.about ' <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav"> @@ -74,6 +74,7 @@ <li><a href="&base;/docs/webresources.html">它尼皮曉及樹扷</a></li> <li><a href="&base;/projects/newbies.html">賡戶化及杅輊仃及樹扷</a></li> <li><a href="&base;/docproj/">玉平亙丟件氾□扑亦件皿伕斥尼弁玄</a></li> +<li><a href="http://docs.freebsd.org/doc/">失□市奶皮</a></li> </ul> </div> <!-- SIDENAV --> '> diff --git a/ja_JP.eucJP/share/xml/news.xml b/ja_JP.eucJP/share/xml/news.xml index 3e6742b72b..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 <title> will be preferred over <p>. $FreeBSD$ - Original revision: r42055 + Original revision: r42144 --> <news> <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> @@ -31,6 +31,31 @@ <name>2013</name> <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> + + <event> + <title>BSDCan 2013 DevSummit 伉禾□玄</title> + <p>BSDCan 2013 &os; 釩紡唹等艄疇及旦矢扑乓伙伊禾□玄 + (6 巨件玄伉) 互 <a + href="&enbase;/news/status/report-2013-05-devsummit.html">跤釩</a> + 今木引仄凶﹝</p> + </event> + </day> + </month> + + <month> <name>6</name> <day> 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 郱 迣訄迡訄訄迡 郇迮郇 迣訄訄迣玼邿 訇郋郅郇郋:</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="2"> + <tgroup cols="3"> <colspec colwidth="1*"/> <colspec colwidth="1*"/> 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</programlisting> <table frame="none" pgwide="1" id="serialcomms-signal-names"> <title>Signaalnamen</title> - <tgroup cols="5"> + <tgroup cols="2"> <thead> <row> <entry align="left">Acroniemen</entry> 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:</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="2"> + <tgroup cols="3"> <colspec colwidth="1*"/> <colspec colwidth="1*"/> 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 @@ -4178,29 +4178,6 @@ src-all</programlisting> </varlistentry> <varlistentry> - <term>Reino Unido</term> - - <listitem> - <itemizedlist> - <listitem> - <para>cvsup.uk.FreeBSD.org (respons嫛el - <email>ftp-admin@plig.net</email>)</para> - </listitem> - - <listitem> - <para>cvsup2.uk.FreeBSD.org (respons嫛el - <email>brian@FreeBSD.org</email>)</para> - </listitem> - - <listitem> - <para>cvsup3.uk.FreeBSD.org (respons嫛el - <email>ben.hughes@uk.easynet.net</email>)</para> - </listitem> - </itemizedlist> - </listitem> - </varlistentry> - - <varlistentry> <term>Repblica Eslovaca</term> <listitem> 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 <thead> <row> <entry>蟔疻芶恄蹊</entry> + + <entry>恔畷恌</entry> </row> </thead> @@ -5622,6 +5624,8 @@ PLIST_SUB+= NLS="@comment " <thead> <row> <entry>蟔疻芶恄棸 婘杻冾 騷 痽曬奷</entry> + + <entry>恔畷恌</entry> </row> </thead> diff --git a/share/pgpkeys/loos.key b/share/pgpkeys/loos.key new file mode 100644 index 0000000000..f910278287 --- /dev/null +++ b/share/pgpkeys/loos.key @@ -0,0 +1,41 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh loos 39165690; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 2048R/39165690 2013-07-03 + Key fingerprint = ABC9 71D9 016E 8D4A 936D D748 6252 872F 3916 5690 +uid Luiz Otavio O Souza <loos@freebsd.org> +sub 2048R/9D089395 2013-07-03 +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFHUilMBCACqcCv/yJ+TWGdG4tGCd2yJWEdzBKRx3UqyFoR5ulbWOmQLe3n/ +YdZ/hSNV9RY9zYkoRCAWe6TxSyN8OD50II8pJIublAp5KWr1RaAwdmykeqxg7TaB +V0D82x3KO8BLSW9lm99Jr6KCN58sW4yjW2n5YmwQTDg+6SAIu/vyo8HZ0zzNLqkr +gZf5bLisgJzrYvVTmPpaADZaycoQCXtd36sGVYxat+mm6UMp7/CzQ6s0jQZuIbJp +Rb9aPD7Lkz4XWp26ln8541c+lk7sWHyFcKmDaUGtP2Uym64uBdexqM5CM5ax2Bqj +uANU5Cq6Q0YKM+kEXxgLzb3P3FDw4ao0nfinABEBAAG0Jkx1aXogT3RhdmlvIE8g +U291emEgPGxvb3NAZnJlZWJzZC5vcmc+iQE5BBMBAgAjBQJR1IpTAhsDBwsJCAcD +AgEGFQgCCQoLBBYCAwECHgECF4AACgkQYlKHLzkWVpCkWwf+JYatTmHdRp7WxiUO +65nFi5TVCmh6oV2F2+p9Vq2DtPuXSDsp4c8WKI9LmeX40ph6Op0DHIyaKdvCKLcz +3r2tcu4py9HggwEqe9iVK9DqVkzmM8yzCHOVcVWDJVdL6nqEI3C06tX292L5flCB +Qbm2L52bKOjEXXyuomEzOSAzCMUG9gyAtoLROQTUNCveklRiEoYGo98Rsky+HPxK +Yxs44O0ZhUlcxHHn7iH9WfRjFSlv/9NP0A9QXtcpsffAXlAuzbLR7HilEKhBQy48 +MJmvUfrNXRnR6kLxCPm8JwQ47aqnUKXSYn2TOJ3V472U/AFJXtqq4TfU15YIVUJK ++btz5rkBDQRR1IpTAQgAqaU5en+u0jsYoHy9GRIKJTnRI7RmReAkASelAHPutfsW +F4vsNUQHEA/+8Swznt68hcicmY+HgbOtpNjYmeAh0o0p0ICzH0Kv0XeNEG/6MBV5 +FFHpLSrIGMDxVC9kxcb7J5+UhaRqAKcsHCJ9D0UXwsNqGe1MipHWWKMY03v6saww +0Uhwbt6LH/nHIO1ye7eP3jRH78zezC1n7PuDtjlzkTGUG2geIgMHoHq1AmaSTGwt +xq+bYnM8IqiTyS1j7ecgN6rz/jYY/sp9t4Ib4FSuC5LbXKkdz5b9G4buILwJ6sgk +P/LpZiMdQ1O3qf8nxe1aCOkZs5h9w1iy9cmliG1sgQARAQABiQEfBBgBAgAJBQJR +1IpTAhsMAAoJEGJShy85FlaQjGAH/1QEQrH3sVg1JjYzfBXR5OCeTXwRBFTJCEcb +7mFGVU81QNq99WaNtf7QU8HsPTiUOd7j62MA8qr4BEztP6n+6EnGKbeo00g3kiXb +6/qK2k6tna5tF1/bTs7g4RtTs1Hq3rZr+6oMYucb2rV/ojCJ4Dqx2El5fOs+lNn+ +/v4Rl/SKoPjN394F5xQo7exxkajxSrGLa+kFblrr6qDEgnlVGiLJ6gaykA8TXytT +2UGe3jfxtk+HZPwaatwqYS+iYeFyJiur2I89a1suFsUVpPqkzKZi60xuB+n5Fy3o +sKvxasroAo6ubzkg/xBRHfZBY/n+TyOvdVcnXxbFUKdH2kIb52M= +=UF7c +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml index b77a95c292..ed9b6ddbe9 100644 --- a/share/pgpkeys/pgpkeys-developers.xml +++ b/share/pgpkeys/pgpkeys-developers.xml @@ -1686,6 +1686,11 @@ &pgpkey.ssouhlal; </sect2> + <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-loos"> + <title>&a.loos;</title> + &pgpkey.loos; + </sect2> + <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-uqs"> <title>&a.uqs;</title> &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 @@ <!ENTITY pgpkey.lme SYSTEM "lme.key"> <!ENTITY pgpkey.loader SYSTEM "loader.key"> <!ENTITY pgpkey.lofi SYSTEM "lofi.key"> +<!ENTITY pgpkey.loos SYSTEM "loos.key"> <!ENTITY pgpkey.lth SYSTEM "lth.key"> <!ENTITY pgpkey.lulf SYSTEM "lulf.key"> <!ENTITY pgpkey.luoqi SYSTEM "luoqi.key"> diff --git a/share/xml/authors.ent b/share/xml/authors.ent index 6771b46878..ebcf22ee6b 100644 --- a/share/xml/authors.ent +++ b/share/xml/authors.ent @@ -808,6 +808,8 @@ <!ENTITY a.logo "Valentino Vaschetto <email xmlns='http://docbook.org/ns/docbook'>logo@FreeBSD.org</email>"> +<!ENTITY a.loos "Luiz Otavio O Souza <email xmlns='http://docbook.org/ns/docbook'>loos@FreeBSD.org</email>"> + <!ENTITY a.lstewart "Lawrence Stewart <email xmlns='http://docbook.org/ns/docbook'>lstewart@FreeBSD.org</email>"> <!ENTITY a.lth "Lars Thegler <email xmlns='http://docbook.org/ns/docbook'>lth@FreeBSD.org</email>"> diff --git a/share/xml/developers.ent b/share/xml/developers.ent index 9dfaf6873e..f2b528f015 100644 --- a/share/xml/developers.ent +++ b/share/xml/developers.ent @@ -386,6 +386,7 @@ $FreeBSD$ <!ENTITY a.loader "Fukang Chen"> <!ENTITY a.lofi "Michael Nottebrock"> <!ENTITY a.logo "Valentino Vaschetto"> +<!ENTITY a.loos "Luiz Otavio O Souza"> <!ENTITY a.lstewart "Lawrence Stewart"> <!ENTITY a.lth "Lars Thegler"> <!ENTITY a.luigi "Luigi Rizzo"> diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch index 77ec962b79..3d39ef9009 100644 --- a/share/xml/freebsd.sch +++ b/share/xml/freebsd.sch @@ -51,6 +51,15 @@ </rule> </pattern> + <pattern name="Check tables"> + <rule context="//db:entry"> + <report test="@colname and @spanname">You cannot use both colname and spanname attributes on table entries.</report> + </rule> + <rule context="//db:tgroup"> + <report test="@cols != count((db:thead/db:row|db:tbody/db:row)[1]//db:entry)">The number of columns does not match the specified value (in section <xsl:value-of select="(ancestor::db:sect5[last()]|ancestor::db:sect4[last()]|ancestor::db:sect3[last()]|ancestor::db:sect2[last()]|ancestor::db:sect1[last()]|ancestor::db:chapter[last()])[last()]/@xml:id"/>).</report> + </rule> + </pattern> + <!-- DB 5.0 constraints --> <pattern name="Glossary 'firstterm' type constraint"> 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 @@ <url proto="ftp">ftp://ftp6.uk.FreeBSD.org/pub/FreeBSD/</url> </host> - <host type="cvsup"> - <name>cvsup.uk.FreeBSD.org</name> - </host> - - <host type="cvsup"> - <name>cvsup2.uk.FreeBSD.org</name> - </host> - - <host type="cvsup"> - <name>cvsup3.uk.FreeBSD.org</name> - </host> - - <host type="cvsup"> - <name>cvsup4.uk.FreeBSD.org</name> - </host> - <email>hostmaster@uk.FreeBSD.org</email> </entry> diff --git a/share/xml/news.xml b/share/xml/news.xml index 2ac2970e07..0c1976ca97 100644 --- a/share/xml/news.xml +++ b/share/xml/news.xml @@ -34,6 +34,15 @@ <name>7</name> <day> + <name>3</name> + + <event> + <p>New committer: + <a href="mailto:loos@FreeBSD.org">Luiz Otavio O Souza</a> (src)</p> + </event> + </day> + + <day> <name>2</name> <event> diff --git a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml index 2e0c3be2be..33ad977d8b 100644 --- a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml +++ b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml @@ -1556,7 +1556,7 @@ block in log first quick on dc0 all 坳蠅祥頗婓 Internet 鼠厙奻繚蚕ㄩ</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="2"> + <tgroup cols="3"> <colspec colwidth="1*"/> <colspec colwidth="1*"/> diff --git a/zh_CN.GB2312/books/porters-handbook/book.xml b/zh_CN.GB2312/books/porters-handbook/book.xml index e4c533738f..fc76127c3c 100644 --- a/zh_CN.GB2312/books/porters-handbook/book.xml +++ b/zh_CN.GB2312/books/porters-handbook/book.xml @@ -5008,6 +5008,8 @@ PLIST_SUB+= NLS="@comment " <thead> <row> <entry>硐黍曹講</entry> + + <entry>砩砱</entry> </row> </thead> diff --git a/zh_TW.Big5/books/handbook/firewalls/chapter.xml b/zh_TW.Big5/books/handbook/firewalls/chapter.xml index ac4dcd058f..5deafe418e 100644 --- a/zh_TW.Big5/books/handbook/firewalls/chapter.xml +++ b/zh_TW.Big5/books/handbook/firewalls/chapter.xml @@ -1675,7 +1675,7 @@ block in log first quick on dc0 all Internet:</para> <informaltable frame="none" pgwide="1"> - <tgroup cols="2"> + <tgroup cols="3"> <colspec colwidth="1*"/> <colspec colwidth="1*"/> diff --git a/zh_TW.Big5/books/handbook/serialcomms/chapter.xml b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml index 5725f9b081..1f131746aa 100644 --- a/zh_TW.Big5/books/handbook/serialcomms/chapter.xml +++ b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml @@ -1192,7 +1192,7 @@ ttyd5 "/usr/libexec/getty std.19200" vt100 on insecure <table frame="none" pgwide="1" id="serialcomms-signal-names"> <title>Signal Names</title> - <tgroup cols="5"> + <tgroup cols="2"> <thead> <row> <entry align="left">Acronyms</entry> diff --git a/zh_TW.Big5/books/porters-handbook/book.xml b/zh_TW.Big5/books/porters-handbook/book.xml index 5906438a2b..33b8b97784 100644 --- a/zh_TW.Big5/books/porters-handbook/book.xml +++ b/zh_TW.Big5/books/porters-handbook/book.xml @@ -4953,6 +4953,8 @@ PLIST_SUB+= NLS="@comment " <thead> <row> <entry>Read only variables</entry> + + <entry>Means</entry> </row> </thead> |