Date: Sun, 8 Sep 2013 00:16:53 +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: r42628 - in translations/share: images/articles/releng misc mk pgpkeys security/advisories security/patches/EN-13:01 security/patches/EN-13:02 security/patches/EN-13:03 security/patches... Message-ID: <201309080016.r880Gr8m000788@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sun Sep 8 00:16:53 2013 New Revision: 42628 URL: http://svnweb.freebsd.org/changeset/doc/42628 Log: MFH: Merged /projects/ISBN_1-57176-407-0/share:r40727-42011 Merged /head/share:r41736-42626 Merged /projects/print2013/share:r40693-40726 Merged /projects/entities/share:r40180-42225 Approved by: doceng (implicit) Added: translations/share/pgpkeys/alc.key - copied unchanged from r42626, head/share/pgpkeys/alc.key translations/share/pgpkeys/br.key - copied unchanged from r42626, head/share/pgpkeys/br.key translations/share/pgpkeys/feld.key - copied unchanged from r42626, head/share/pgpkeys/feld.key translations/share/pgpkeys/loos.key - copied unchanged from r42626, head/share/pgpkeys/loos.key translations/share/pgpkeys/marino.key - copied unchanged from r42626, head/share/pgpkeys/marino.key translations/share/pgpkeys/markm.key - copied unchanged from r42626, head/share/pgpkeys/markm.key translations/share/pgpkeys/nemysis.key - copied unchanged from r42626, head/share/pgpkeys/nemysis.key translations/share/pgpkeys/qingli.key - copied unchanged from r42626, head/share/pgpkeys/qingli.key translations/share/pgpkeys/vg.key - copied unchanged from r42626, head/share/pgpkeys/vg.key translations/share/pgpkeys/zbb.key - copied unchanged from r42626, head/share/pgpkeys/zbb.key translations/share/security/advisories/FreeBSD-EN-13:01.fxp.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-EN-13:01.fxp.asc translations/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-EN-13:02.vtnet.asc translations/share/security/advisories/FreeBSD-EN-13:03.mfi.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-EN-13:03.mfi.asc translations/share/security/advisories/FreeBSD-SA-13:06.mmap.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:06.mmap.asc translations/share/security/advisories/FreeBSD-SA-13:07.bind.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:07.bind.asc translations/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:08.nfsserver.asc translations/share/security/advisories/FreeBSD-SA-13:09.ip_multicast.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:09.ip_multicast.asc translations/share/security/advisories/FreeBSD-SA-13:10.sctp.asc - copied unchanged from r42626, head/share/security/advisories/FreeBSD-SA-13:10.sctp.asc translations/share/security/patches/EN-13:01/ - copied from r42626, head/share/security/patches/EN-13:01/ translations/share/security/patches/EN-13:02/ - copied from r42626, head/share/security/patches/EN-13:02/ translations/share/security/patches/EN-13:03/ - copied from r42626, head/share/security/patches/EN-13:03/ translations/share/security/patches/SA-13:06/ - copied from r42626, head/share/security/patches/SA-13:06/ translations/share/security/patches/SA-13:07/ - copied from r42626, head/share/security/patches/SA-13:07/ translations/share/security/patches/SA-13:08/ - copied from r42626, head/share/security/patches/SA-13:08/ translations/share/security/patches/SA-13:09/ - copied from r42626, head/share/security/patches/SA-13:09/ translations/share/security/patches/SA-13:10/ - copied from r42626, head/share/security/patches/SA-13:10/ Deleted: translations/share/xml/developers.ent Modified: translations/share/images/articles/releng/branches-releng8.pic translations/share/misc/docbook.css translations/share/mk/doc.commands.mk translations/share/mk/doc.docbook.mk translations/share/pgpkeys/README translations/share/pgpkeys/addkey.sh translations/share/pgpkeys/gavin.key translations/share/pgpkeys/hrs.key translations/share/pgpkeys/pgj.key translations/share/pgpkeys/pgollucci.key translations/share/pgpkeys/pgpkeys-core.xml translations/share/pgpkeys/pgpkeys-developers.xml translations/share/pgpkeys/pgpkeys.ent translations/share/pgpkeys/rm.key translations/share/pgpkeys/tdb.key translations/share/xml/advisories.xml translations/share/xml/authors.ent translations/share/xml/catalog.xml translations/share/xml/events2013.xml translations/share/xml/freebsd.ent translations/share/xml/freebsd.sch translations/share/xml/header.ent translations/share/xml/man-refs.ent translations/share/xml/mirrors.xml translations/share/xml/navibar.ent translations/share/xml/news.xml translations/share/xml/notices.xml translations/share/xml/press.xml translations/share/xml/release.ent translations/share/xml/templates.events.xsl translations/share/xml/xhtml.xsl translations/share/xml/xhtml10-freebsd.dtd translations/share/xml/xslt10-freebsd.dtd translations/share/xsl/freebsd-common.xsl translations/share/xsl/freebsd-xhtml-common.xsl Directory Properties: translations/share/ (props changed) Modified: translations/share/images/articles/releng/branches-releng8.pic ============================================================================== --- translations/share/images/articles/releng/branches-releng8.pic Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/images/articles/releng/branches-releng8.pic Sun Sep 8 00:16:53 2013 (r42628) @@ -38,6 +38,14 @@ RELENG_8_3: box width .9 "\s-3RELENG_8_3\s+3" dashed line -> right from RELENG_8_3_0_RELEASE.e +RELENG_8_4_0_RELEASE: + ellipse width .9 "\s-28.4-RELEASE\s+2" + + line -> down from RELENG_8_4_0_RELEASE.s +RELENG_8_4: + box width .9 "\s-3releng/8.4\s+3" dashed + + line -> right from RELENG_8_4_0_RELEASE.e RELENG_8:box "\s-28-STABLE\s+2" .PE Modified: translations/share/misc/docbook.css ============================================================================== --- translations/share/misc/docbook.css Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/misc/docbook.css Sun Sep 8 00:16:53 2013 (r42628) @@ -107,6 +107,7 @@ body address { html body { margin: 1em 8% 1em 10%; line-height: 1.2; + font-family: sans-serif; } .legalnotice { @@ -186,7 +187,7 @@ body img.navheader { } ol { - margin: 0 0 0 5%; + margin: 0 0 0 1em; line-height: 1.2; } @@ -198,10 +199,11 @@ body pre { body td, body th { line-height: 1.2; + padding-right: 1.5em; } ul, body dir, body menu { - margin: 0 0 0 5%; + margin: 0 0 0 1em; line-height: 1.2; } @@ -238,6 +240,10 @@ div.screen { white-space: pre; font-family: monospace; padding: 1ex; + background-color: #edc; + border: 1px solid #ccc; + border-radius: 6px; + line-height: 1.1; } div.programlisting { @@ -262,7 +268,7 @@ div.programlisting { .note, .tip, .important, .warning, .caution, .example, div.procedure { border-radius: 6px; padding: 2ex 2ex; - margin: .75em 3em .75em 3em; + margin: .75em 3em .75em 1em; line-height: 1.3; } @@ -270,14 +276,14 @@ div.programlisting { color: #222; background: #eee; border: 1px solid #ccc; - width: 85%; + width: 90%; } .tip { color: #004F00; background: #d8ecd6; border: 1px solid green; - width: 85%; + width: 90%; } .important { @@ -290,14 +296,14 @@ div.programlisting { color: #9F1313; background: #f8e8e8; border: 1px solid #e59595; - width: 85%; + width: 90%; } .caution { color: #3E3535; background: #FFC; border: 1px solid #e59595; - width: 85%; + width: 90%; } .example { @@ -320,7 +326,7 @@ div.programlisting { margin-right: 0; } -.note p, .tip p, .important p, .warning p, .caution p, .example p { +.note p, .tip p, .important p, .warning p, .caution p, { display: inline; } @@ -338,9 +344,14 @@ div.programlisting { } .userinput { - font-weight: normal; + font-weight: bold; } pre.screen strong { font-weight: normal; } + +.procedure ol { + line-height: 1.2; + margin: 0 0 0 -1em; +} Modified: translations/share/mk/doc.commands.mk ============================================================================== --- translations/share/mk/doc.commands.mk Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/mk/doc.commands.mk Sun Sep 8 00:16:53 2013 (r42628) @@ -66,7 +66,7 @@ GROFF?= groff HTML2PDB?= ${PREFIX}/bin/iSiloBSD HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} -HTML2TXT?= ${PREFIX}/bin/w3m +HTML2TXT?= ${PREFIX}/bin/links HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} .if exists(${PREFIX}/bin/jade) && !defined(OPENJADE) Modified: translations/share/mk/doc.docbook.mk ============================================================================== --- translations/share/mk/doc.docbook.mk Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/mk/doc.docbook.mk Sun Sep 8 00:16:53 2013 (r42628) @@ -705,11 +705,7 @@ install-${_curformat}: ${DOC}.${_curform .endif @[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR} .if ${_cf} == "html-split" -.for f in ${_html_docs} -.if exists(${f}) - ${INSTALL_DOCS} ${f} ${DESTDIR} -.endif -.endfor + ${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR} .else ${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR} .endif Modified: translations/share/pgpkeys/README ============================================================================== --- translations/share/pgpkeys/README Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/pgpkeys/README Sun Sep 8 00:16:53 2013 (r42628) @@ -31,7 +31,7 @@ address. For instance, in my case: | or pgpkeys-core.xml). Remember to keep the list sorted by last name! | | <sect2 id="pgpkey-des"> -| <title>&a.des;</title> +| <title>&a.des.email;</title> | &pgpkey.des; | </sect2> | Modified: translations/share/pgpkeys/addkey.sh ============================================================================== --- translations/share/pgpkeys/addkey.sh Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/pgpkeys/addkey.sh Sun Sep 8 00:16:53 2013 (r42628) @@ -78,7 +78,7 @@ echo "pgpkeys-officers.xml or pgpkeys-co echo "Remember to keep the list sorted by last name!" echo echo " <sect2 id=\"pgpkey-${me}\">" -echo " <title>&a.${me};</title>" +echo " <title>&a.${me}.email;</title>" echo " &pgpkey.${me};" echo " </sect2>" echo Copied: translations/share/pgpkeys/alc.key (from r42626, head/share/pgpkeys/alc.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/pgpkeys/alc.key Sun Sep 8 00:16:53 2013 (r42628, copy of r42626, head/share/pgpkeys/alc.key) @@ -0,0 +1,62 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh alc 33E2893B; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 2048R/33E2893B 2013-06-15 + Key fingerprint = FC7C 93FD 2C2C ABA5 C1D1 3E74 8513 043C 33E2 893B +uid Alan Cox <alc@FreeBSD.org> +uid Alan Cox <alc@cs.rice.edu> +uid Alan Cox <alc@rice.edu> +sub 2048R/693757AA 2013-06-15 +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +R4j35/knbFRKVuPucYmycvk/fj5K+2wq +=dhg9 +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> Copied: translations/share/pgpkeys/br.key (from r42626, head/share/pgpkeys/br.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/pgpkeys/br.key Sun Sep 8 00:16:53 2013 (r42628, copy of r42626, head/share/pgpkeys/br.key) @@ -0,0 +1,41 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh br 10F5E66E; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 2048R/10F5E66E 2013-09-04 + Key fingerprint = 57DF DADB 15FE EF7A 14C9 1DF3 ABF4 AFEB 10F5 E66E +uid Ruslan Bukin <br@freebsd.org> +sub 2048R/A33057CA 2013-09-04 +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFIm+QEBCADVjtwGKebX8ovnb5tNqb8zkiepjvBjJyZNvbazhIccNmn0ZWLi +i6T/q/kUJsLEMIPr9wK/WdUQZRXcKpnmUB6otw0VDsXKhqMa89x1rk444YSfsSzO +lK9dRmJIVtXUZHGesQfMHoBtFJR9MGDhKnvgsRpDwV4X4SCioSAAmceSyKTa8mac +BBkjmHVWpFczqYE2HWmVjCv9i4Wtn26R6XvFSE9PheP1l77GJTrIKY5XlB4JhtQW +OrxdtWxPhbNiHfqts7psIIOMDo/qMUvv3Qun/jUV/HFpZ4An5mw/E0vCWrLDTnRH +ByLqS7G1/Zg7tiMoNkNxyWqYDRuedsO2B0LbABEBAAG0HVJ1c2xhbiBCdWtpbiA8 +YnJAZnJlZWJzZC5vcmc+iQE5BBMBAgAjBQJSJvkBAhsDBwsJCAcDAgEGFQgCCQoL +BBYCAwECHgECF4AACgkQq/Sv6xD15m6STwgAjzr0ThvhcsD6rFbGUMz1EMeFhlBQ +/z2A7rD1KlKorQxUOQ9J4gDOi40Aa+yRSzfU+6drsxcPJnOvRg52TZfCs8e0O4j5 +GwZh2Eo9AEyWLXTI5+sQ7ZZdFZuwpaQ53ZEj2r3OGpkV/41xYQaiQ9WoLyrmA9xa +Y7PqRGj9TajrViuVMVwIEI5ZnYiOW7G2UMWPOWOTt04Ici6i1TJE3a4lCDxb4KKH +fwWCTm3QYWFhNSHvxDmtVvqny+krx+ZrxF6hEnapbPKgs1/CR0K1pRv+wPFIDQu8 +3SHjXkq7j3HJks8+0LfkIl6ecT7FPEeYDyem4tFABqL/LEpopzs67qqdirkBDQRS +JvkBAQgA6fDUJPMXKqS+ntQzZULuurL6ju14lLkdNWI7apYubEvnfSPIA1nXfcPr ++jiSFQex0ME1OhRkbiVfF3E5vkrV0VQ/8j7srnkyXIeOohObvVQg3vjBxnzNcpDt +ynaIr9NzwGMuxu1Vql8/k7OSVjQNf6ee5vxI59isRrxSTIFpCdIMn10b1gUa0cbo +Bh5fiZMwH/b+impqn6ix3j+72/JE+DB2djBDhyQY1mTXwEaxCJzFA2GMKda3aRuh +iK+DyaUBTPDwZwWzjGwNtU1iIH+CaW41c9uNtWLPk0OX1PlFANT4W3NoiRlkZ71n +0n5QKza1WKBr6D55DZ/bOEXyK+l08QARAQABiQEfBBgBAgAJBQJSJvkBAhsMAAoJ +EKv0r+sQ9eZuK94H/3a4FRjRpW96YtSmyd6StzBItGT0ukOpuDb4fNuXkVrdcx1j +elf7Z8SdtaVfgxcutYK100ef27XN6J/O4T3iPfHz/+FStZ20gvJixlJ1iZlgFTvW +nBNzbfH272nUPfwzTHnCUTb3bmeNlT8/ndq2AH3GtqUuxAfPyLepJp0pFQ56asNk +IHDH2wSlQf9/4JSAu4JsvePwO7mFT1NhpDqe177qGovj0zgxixp7xz9ZBML8Jrax +7KMY+92j4sn8ErcQzwIesdyp3/4gz+H7EuqUrg4VwJTc/QZk4irevp20A0rexXNd +biC17sFJ06rowI0k5zzeFg910ujHQUwL4p6qTC8= +=ysoS +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> Copied: translations/share/pgpkeys/feld.key (from r42626, head/share/pgpkeys/feld.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ translations/share/pgpkeys/feld.key Sun Sep 8 00:16:53 2013 (r42628, copy of r42626, head/share/pgpkeys/feld.key) @@ -0,0 +1,41 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh feld E64C94FE; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 2048R/E64C94FE 2013-06-25 + Key fingerprint = 71ED 6A7F F4D7 430A BDF3 A180 BF01 619F E64C 94FE +uid Mark Felder <feld@freebsd.org> +sub 2048R/FDC20CA9 2013-06-25 +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFHJv/kBCADVITLtFPQSb11xYJ+Lot6h2KrJCg8EhuY3CwrvxTYKimQFBSA7 +tLmxrsLngQohwfy1mtN/wiyj6qWPGiYnQulHV1sda7GQU+oJywCk9mstGSQjZ9fF +4XEK6W63X3qVP7A0Dvq5yPGuceTdCxz2M41DTACiLYPYXU12319cJNcgWDDWPRyS +PU1Ljuh/jKoBp3alHVLT8tVplB8dqoQQVtxAZCo+CXVfhawHUFcT6x/esl7WYbYl +wCuGYr0j5bpdorDlOJRoOcp6XTkP1RZbctspESsjlQGCblk9gG/7thYUkXO/GTVS +KSRCcDZrZPOYIGdthB1jjs5K06auJ0wwvb3ZABEBAAG0Hk1hcmsgRmVsZGVyIDxm +ZWxkQGZyZWVic2Qub3JnPokBOAQTAQIAIgUCUcm/+QIbAwYLCQgHAwIGFQgCCQoL +BBYCAwECHgECF4AACgkQvwFhn+ZMlP4QpAgAmIAMBq+9qkgxXdYn5op70wBZjKOM +RL1axKZCdLUmfKhydASvFQ5SW9LRr1dDLQDlcL2oJ3WGkqtjWbUm9NCNSwiJ/BGe +JYCpezSHuazsW8ZO5kO4IMLxlUSxw8bKqXlHL4YI/sBs7G9mp5dRqRWKTnDSm97u +nXVmPgbdgqlMPMZDt6Nhfo7jSqBhjeFmUi6rjbKUDq391WqpzTUbbf5IF2uKNM2H +yANJDQ56Ncfjy28SBZr5crf8Na/v/7L1+KqeOhf9jsyALsDZ5H0R9skSseM83Mdj +6VGGNHm/ZCJsKA/y4pJxdT4lbjGsorjr79GS4xu1uZOFNK4X+um6vakpqbkBDQRR +yb/5AQgA0YBpsQICxBU7cyktmXAmC204cOvTjHnyeAusA9REltj8uEe91+E2udaY +f0KBoqdea0DotvbiZqHmmULvt2HHANpeLa/2Dz3d37PLbQUj0hZO+/WJlR9i0ASm +YC32l9pbj9BXP3Zgmp5YzWrfu6eEF4WfLjzzwmRmkWsrOIyB3jNkQjjKh1zzuMxv +qLYVnS/cLnE/7upcepS6hqIV1EQs2G/m/3do0OcNHn2y8QXIup/oeYp1ceGxTmOY +bL13T1bCDeR7P8cLISg9urOK0vMVcbLYv6CvloBVZQ59FYYHaqoPnop54edXgvwV +yWJ9mckEoq4puIOaUkl7ygq3w/72KwARAQABiQEfBBgBAgAJBQJRyb/5AhsMAAoJ +EL8BYZ/mTJT+2S0H/2CZoRibxN75bbSRP26ECjfFAMAEYl9+Vh+xxfgmvZfIfP1l +Wh3FoQMBlG00pJejCePBpgeM0YcsIcIC61+Wx/EpjbN/96Sy1J17I5/pHsbwyDRX +B0Vow56tpPuP6eC8IUteogdGLJ10AgXYeYytg22pNMyjcUg4Vx5Dl9ccufvEbdXf +G+Or9L+LyQHLzi3Txjlsc6p8OrUMX8FS/eRYRjPPgGakdA/+EOmEqu8dVDao4noR +PKuRIBVyR0iNScoD6+qzRd+G6CHvdNc7PGL9H8eUVpVaGkbtOrAfaOxO52g+2g26 +12JI6CW8+6DrikVGZHh7OnPTROpTIi/qkSs67DA= +=05Sq +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> Modified: translations/share/pgpkeys/gavin.key ============================================================================== --- translations/share/pgpkeys/gavin.key Sun Sep 8 00:16:29 2013 (r42627) +++ translations/share/pgpkeys/gavin.key Sun Sep 8 00:16:53 2013 (r42628) @@ -5,10 +5,11 @@ sh ./addkey.sh gavin A093262B; <programlisting role="pgpfingerprint"><![CDATA[ pub 1024D/A093262B 2005-02-18 Key fingerprint = 313A A79F 697D 3A5C 216A EDF5 935D EF44 A093 262B -uid Gavin Atkinson <gavin@16squared.co.uk> uid Gavin Atkinson (FreeBSD key) <gavin@FreeBSD.org> uid Gavin Atkinson (Work e-mail) <ga9@york.ac.uk> +uid Gavin Atkinson <gavin@16squared.co.uk> uid Gavin Atkinson <gavin.atkinson@ury.york.ac.uk> +uid Gavin Atkinson (Work e-mail) <gavin.atkinson@york.ac.uk> sub 2048g/58F40B3D 2005-02-18 ]]></programlisting> <programlisting role="pgpkey"><