From owner-svn-doc-translations@FreeBSD.ORG Sun Sep 8 00:16:55 2013 Return-Path: Delivered-To: svn-doc-translations@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A915370B; Sun, 8 Sep 2013 00:16:55 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9346F2C6B; Sun, 8 Sep 2013 00:16:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r880Gtkk000812; Sun, 8 Sep 2013 00:16:55 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r880Gr8m000788; Sun, 8 Sep 2013 00:16:53 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201309080016.r880Gr8m000788@svn.freebsd.org> From: Glen Barber Date: Sun, 8 Sep 2013 00:16:53 +0000 (UTC) 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... X-SVN-Group: doc-translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-translations@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc translations trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 00:16:55 -0000 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! | | -| &a.des; +| &a.des.email; | &pgpkey.des; | | 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 " " -echo " &a.${me};" +echo " &a.${me}.email;" echo " &pgpkey.${me};" echo " " 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 @@ + + + +uid Alan Cox +uid Alan Cox +sub 2048R/693757AA 2013-06-15 +]]> + 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 @@ + + + +sub 2048R/A33057CA 2013-09-04 +]]> + 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 @@ + + + +sub 2048R/FDC20CA9 2013-06-25 +]]> + 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; uid Gavin Atkinson (FreeBSD key) uid Gavin Atkinson (Work e-mail) +uid Gavin Atkinson uid Gavin Atkinson +uid Gavin Atkinson (Work e-mail) sub 2048g/58F40B3D 2005-02-18 ]]>