Date: Fri, 19 Oct 2012 11:46:35 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org Subject: svn commit: r39772 - in translations/share: misc mk pgpkeys xml Message-ID: <201210191146.q9JBkZ71080348@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Oct 19 11:46:35 2012 New Revision: 39772 URL: http://svn.freebsd.org/changeset/doc/39772 Log: Merge r39645 through r39760 from ^/head/share to bring translations branch up to date. Deleted: translations/share/pgpkeys/dougb.key Modified: translations/share/misc/docbook.css translations/share/mk/doc.docbook.mk translations/share/pgpkeys/pgpkeys-developers.xml translations/share/pgpkeys/pgpkeys.ent translations/share/pgpkeys/sbruno.key translations/share/pgpkeys/tabthorpe.key translations/share/xml/bibliography.xml translations/share/xml/developers.ent translations/share/xml/events2005.xml translations/share/xml/events2013.xml translations/share/xml/header.ent translations/share/xml/news.xml translations/share/xml/release.ent Directory Properties: translations/share/ (props changed) Modified: translations/share/misc/docbook.css ============================================================================== --- translations/share/misc/docbook.css Fri Oct 19 11:45:15 2012 (r39771) +++ translations/share/misc/docbook.css Fri Oct 19 11:46:35 2012 (r39772) @@ -184,9 +184,6 @@ svnref { } blockquote, .example, .programlisting { - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - -khtml-border-radius: 6px; border-radius: 6px; } Modified: translations/share/mk/doc.docbook.mk ============================================================================== --- translations/share/mk/doc.docbook.mk Fri Oct 19 11:45:15 2012 (r39771) +++ translations/share/mk/doc.docbook.mk Fri Oct 19 11:46:35 2012 (r39772) @@ -31,7 +31,7 @@ # # Variables used by both users and documents: # -# SGMLFLAGS Additional options to pass to various SGML +# XMLFLAGS Additional options to pass to various XML # processors (e.g., jade, nsgmls). Typically # used to define "IGNORE" entities to "INCLUDE" # with "-i<entity-name>" @@ -44,7 +44,7 @@ # used to set "-raw" flag to handle 8bit characters. # # EXTRA_CATALOGS Additional catalog files that should be used by -# any SGML processing applications. +# any XML processing applications. # # NO_TIDY If you do not want to use tidy, set this to "YES". # @@ -176,8 +176,8 @@ IMAGES_LIB?= CATALOGS+= -c ${c} .endif .endfor -SGMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} -JADEOPTS= ${JADEFLAGS} ${SGMLFLAGS} ${CATALOGS} +XMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} +JADEOPTS= ${JADEFLAGS} ${XMLFLAGS} ${CATALOGS} XSLTPROCOPTS= ${XSLTPROCFLAGS} KNOWN_FORMATS= html html.tar html-split html-split.tar \ Modified: translations/share/pgpkeys/pgpkeys-developers.xml ============================================================================== --- translations/share/pgpkeys/pgpkeys-developers.xml Fri Oct 19 11:45:15 2012 (r39771) +++ translations/share/pgpkeys/pgpkeys-developers.xml Fri Oct 19 11:46:35 2012 (r39772) @@ -104,11 +104,6 @@ &pgpkey.barner; </sect2> - <sect2 id="pgpkey-dougb"> - <title>&a.dougb;</title> - &pgpkey.dougb; - </sect2> - <sect2 id="pgpkey-art"> <title>&a.art;</title> &pgpkey.art; Modified: translations/share/pgpkeys/pgpkeys.ent ============================================================================== --- translations/share/pgpkeys/pgpkeys.ent Fri Oct 19 11:45:15 2012 (r39771) +++ translations/share/pgpkeys/pgpkeys.ent Fri Oct 19 11:46:35 2012 (r39772) @@ -100,7 +100,6 @@ <!ENTITY pgpkey.dhn SYSTEM "dhn.key"> <!ENTITY pgpkey.dim SYSTEM "dim.key"> <!ENTITY pgpkey.dinoex SYSTEM "dinoex.key"> -<!ENTITY pgpkey.dougb SYSTEM "dougb.key"> <!ENTITY pgpkey.dryice SYSTEM "dryice.key"> <!ENTITY pgpkey.dwmalone SYSTEM "dwmalone.key"> <!ENTITY pgpkey.eadler SYSTEM "eadler.key"> Modified: translations/share/pgpkeys/sbruno.key ============================================================================== --- translations/share/pgpkeys/sbruno.key Fri Oct 19 11:45:15 2012 (r39771) +++ translations/share/pgpkeys/sbruno.key Fri Oct 19 11:46:35 2012 (r39772) @@ -1,41 +1,42 @@ <!-- $FreeBSD$ --> <!-- -sh addkey.sh sbruno 9F4CBB4E; +sh addkey.sh sbruno 08E81687; --> <programlisting role="pgpfingerprint"><![CDATA[ -pub 2048R/9F4CBB4E 2011-10-19 - Key fingerprint = BD78 EB48 FD8C D981 D959 AAE9 BD94 1F06 9F4C BB4E -uid Sean Bruno (sbruno) <sbruno@freebsd.org> -sub 2048R/3A48F987 2011-10-19 +pub 2048R/08E81687 2012-10-15 + Key fingerprint = B9F9 138F 349C D3B2 2AA4 1398 1909 45DC 08E8 1687 +uid Sean Bruno (clusteradm and developer key) <sbruno@freebsd.org> +sub 2048R/BCC23981 2012-10-15 ]]></programlisting> <programlisting role="pgpkey"><![CDATA[ -----BEGIN PGP PUBLIC KEY BLOCK----- -mQENBE6fRskBCADiNjKHZo8mR9lJeQWWlMfvHjzelpFNL45WTzNTAiG6gzrViWh4 -PhwXtcvcNndmrdnuNfX+KrKY0TXbtplXcscyxXRLJiX7dLuSNp4++cl8rhrvFgxr -3+JlnkthNswNRiGnIFocjEiYONnadgfwKPZ9VsOASmTWMCm4/lD7DqHJrJB5XEBc -GP+YudGB8gAAFtBCq6GDDVT+30t/RL1EkBj3tjozWPxL1C6DW4kFKfmdeQNzaWDl -tRj+i2m+BePW3hMIZ2eqbAfX5shgPxyM00I8C5SGbIh6UlD5ex317fzW5KVlffR/ -xceR6MxXEbX9ZOVT2HXP202MlJZRINsMlo8LABEBAAG0KFNlYW4gQnJ1bm8gKHNi -cnVubykgPHNicnVub0BmcmVlYnNkLm9yZz6JATgEEwECACIFAk6fRskCGwMGCwkI -BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEL2UHwafTLtOXuYH/A2SH3gxIXnQI+f1 -Xp6NjW1avSRmqJqlpgFT1Ni5qmwmXA/1VfwhiVonRL+N4LEq3wbIzm6h5SRn+7h5 -H7F/kkiEjdRIdwQR/+3MfaLzLX3crklK+ICsfLWuqw+8M/SrDhEFU199btscX3kH -xXKoUeNFXCy1zh5hvGCE66roo7m1T4R9xBicJ25ILn/3AC16gRwWVhb063UWgiep -Q6qvI0uuYPbs1mbvRQVY9WwYQCSi/VT/RVXG0D2BSJwniqfxQTFcyr6WxFLlfo// -/6ISNuOtSikbuSjYt7im/jHC3vsVX4xj9oNQg9uI6X1V0C3URKdF6h6RMCLrQaph -nJ67FAu5AQ0ETp9GyQEIALZ/AhHdy6ulGQzgFtXmLHaAt49RpFiL97G6RUCzh56O -aajKFWLZQ/AXb4sGHxU1LMty6glvsVEeLLJaQsHu+qE701Rks47f9FZaTo8Pt5Zj -0UjmiBBxxvmO2kSkHPU0CDwDko/LM1pc+N7e1X5oPad99FpdZxHIISFey8wF/H0T -EKgMKOWoRYUJ+MM/kSMP95LtyUE6SLXwNLx57KfVGsWjSYD6fWkADBMUuhv2GVWp -Tqk3pSgGqPDEKkxGbW/ntSKgS1jT2aI1+t5ZqJ+L6UKaGmP5KX49EmyDgvOqV8i0 -5XoQC+UIVQNEGdkP0X3bNmA+wfIiRqPflJsry+KAWFcAEQEAAYkBHwQYAQIACQUC -Tp9GyQIbDAAKCRC9lB8Gn0y7ToLbB/0YfYQfm8KWFG94Oed23AxEMul+HEIS4Ygb -GuRqve4zzIfgPupeLNQ9yZHU7efuVs6JgxjO/q6Dc1auMLBJsMWwtt0cfUN6lXt3 -lEK413FjyHYKnoI/TrEDBYQgU33UsKt6YdHMyPepVTWZc87zHd4t1UUvq7s2Wgs3 -+LOB8YA6y7SfONrUxLTqZjh4VuniQrTxSK+aiskg/fo2lKO+EVvyMcd5RSHXX79k -nYKQuKMmxptBDNlGsJguvzeT6uBI0PdvWr0VC1LV++2avQ2N6yhyGzpn6S4q4AKf -6qe2xSuyms98HCnzEBC1IjbgnsYuR5jGek+8PHWxz70e4Eg8dPQh -=3Y+2 +mQENBFB8Jw0BCACYRC4xwboUcSZTAMO941WSdPDQoqefN9m6mbel9JwskGlCGnfO ++H+AIZUW0eKzG8tywaXhcqoMrW6Ie9wOce7qF0+W3DnFsWk6XRf2guHAu5aqiD5h +Q/0pMrgQZ+yiBsvqKZr5A0IDscm6v0Hu3brzyoLdKqLGHr1vSIZNv8d2irqjDtoZ +6y3EdDJXpMpUsagHdTl55uWZkkwLRQY83KLwemjU4qF2lxozHmjhD3dKTs8+NhQe +K+0vJDaPyjhARDrTl1HBwlbqqy5tmh8QeNkgltW3tnSzC3d9xqU1cDcnTkgGJtkH +G99/5/4WG/wLcAORjm/t7igvq/2shWnmhzGNABEBAAG0PlNlYW4gQnJ1bm8gKGNs +dXN0ZXJhZG0gYW5kIGRldmVsb3BlciBrZXkpIDxzYnJ1bm9AZnJlZWJzZC5vcmc+ +iQE4BBMBAgAiBQJQfCcNAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAZ +CUXcCOgWh2jwB/9WEMzPw/xIcn47xg3uyawWiY8XZWvhrUUNdACzLw9xpNhSIYf1 +rfbYdW9IW1wWVXyiGOunhLf7eylhdatQkjNPHH3rCATQVwfQbk/ONMP3OVy9hEhW +SF1r1aWQZsdSEwvQNF4jlQ9un45YcgS8AqfnbRUgOhMfyaCk2f26sfZlsqcZnFto +/aBx53hHT82+2KckvWBySOO58EKMVHV2MtuCQGUVikKKnNdWn617tyMhjcNd/UFL +eZ9le0RQVGKjhCGP/o7TKDyHd68CVeUb4SKVQmIo5AnvNbGB7ZlmgsO5+xsq7PEg +4mzP65ivXhqhvAYek8zWELWQUlqjBbDr9MP3uQENBFB8Jw0BCAD8kd0hCt9bhAAF +fS0vY7mt5n/r0AlP2mQ4H+/fj3AxY1v/zF8qyzDA1JKzgUUQSAA10J8F/AJFtlXi +c/T4kVEIBMxW6OLv2mhaEHXM4Sxgoro91xk9VXZptsCX6qcqlrTaAKAhs2QlfepO +dxeG1LI0Jr6gunzV7+geVEY4apDPcVzkA+hZruM2BQ31MsSSOaJG4CxfY4OE1Hzw +d+/pYrqzBoog2/2G2N7mcLuGtfjp5cN4K7/X14b2fqyn/HUvQA6VbuCW5zWgO5Yi +viEv6alhU1StaF30qLr0zh25U6P0PIho5L9nefO1NXTiuuZAiJEmjlXD5MRvM9gO +e+PWRdkbABEBAAGJAR8EGAECAAkFAlB8Jw0CGwwACgkQGQlF3AjoFof9rQf/UKgT +03FSToSRn2VeIBost9JIuiYiOiTnT+7kyRxNkhAYS9vSWmicTXvHGxl7TzSyB4qN +3TzltJOXvjiWeZ4kymt/1EiIIh3gz4QHjtB/2sJSTDTLacx13ZlM+Mk89sAnzMIe +z11ENGFXFGcBQ4kTxJqenZwy1TZ2xQQoU30Yx9tHq/Nhlva+HUzL5y+MNsZefyN0 +BK4THdSDa1R1d5NikagUIknxt/ildP0GA2sUDLc91+dIbvqRMHXfteTRMGgu3EUy +U+n4GrVj3+u3Ex1I3KJJplKYhKa5zQ5uNIbqL2ntOldwO9HiaI8Xxb16Xqv7kvlH +IPDYZOY+KgLZ7L/TOg== +=egdB -----END PGP PUBLIC KEY BLOCK----- ]]></programlisting> Modified: translations/share/pgpkeys/tabthorpe.key ============================================================================== --- translations/share/pgpkeys/tabthorpe.key Fri Oct 19 11:45:15 2012 (r39771) +++ translations/share/pgpkeys/tabthorpe.key Fri Oct 19 11:46:35 2012 (r39772) @@ -6,8 +6,10 @@ sh addkey.sh tabthorpe A473C990; pub 2048R/A473C990 2010-05-28 Key fingerprint = D883 2D7C EB78 944A 69FC 36A6 D937 1097 A473 C990 uid Thomas Abthorpe (FreeBSD Committer) <tabthorpe@FreeBSD.org> -uid Thomas Abthorpe <thomas@goodking.ca> +uid Thomas Abthorpe <tabthorpe@abthorpe.org> +uid Thomas Abthorpe <tabthorpe@goodking.ca> uid Thomas Abthorpe <tabthorpe@goodking.org> +uid Thomas Abthorpe <thomas@goodking.ca> sub 2048R/8CA60EE0 2010-05-28 ]]></programlisting> <programlisting role="pgpkey"><