From owner-svn-doc-projects@FreeBSD.ORG Sun Mar 31 14:44:56 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9C4C857D; Sun, 31 Mar 2013 14:44:56 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 77117F43; Sun, 31 Mar 2013 14:44:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VEiu6u078117; Sun, 31 Mar 2013 14:44:56 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VEiu8B078116; Sun, 31 Mar 2013 14:44:56 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303311444.r2VEiu8B078116@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 31 Mar 2013 14:44:56 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41328 - projects/sysctl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Mar 2013 14:44:56 -0000 Author: des Date: Sun Mar 31 14:44:55 2013 New Revision: 41328 URL: http://svnweb.freebsd.org/changeset/doc/41328 Log: Create a branch for my sysctl documentation work. Approved by: gjb@ Added: projects/sysctl/ - copied from r41327, head/ From owner-svn-doc-projects@FreeBSD.ORG Sun Mar 31 21:11:10 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CD3E2530; Sun, 31 Mar 2013 21:11:10 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B057BFEA; Sun, 31 Mar 2013 21:11:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VLBAhZ092278; Sun, 31 Mar 2013 21:11:10 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VLB7uR092255; Sun, 31 Mar 2013 21:11:07 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201303312111.r2VLB7uR092255@svn.freebsd.org> From: Gabor Kovesdan Date: Sun, 31 Mar 2013 21:11:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41330 - in projects/xml-tools: de_DE.ISO8859-1/books/handbook el_GR.ISO8859-7/books/handbook en_US.ISO8859-1/books/handbook es_ES.ISO8859-1/books/handbook fr_FR.ISO8859-1/books/handboo... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Mar 2013 21:11:10 -0000 Author: gabor Date: Sun Mar 31 21:11:07 2013 New Revision: 41330 URL: http://svnweb.freebsd.org/changeset/doc/41330 Log: Always build pdf from ps and remove related nits. This is what was already done with Handbook and building pdf directly does not seem to work correctly anyway. This change will help simplifying the build process and spare some image conversions. Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile projects/xml-tools/es_ES.ISO8859-1/books/handbook/Makefile projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile projects/xml-tools/pt_BR.ISO8859-1/books/handbook/Makefile projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -23,7 +23,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -44,7 +44,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -40,7 +40,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -37,7 +37,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -34,7 +34,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -45,7 +45,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile ============================================================================== --- projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -35,7 +35,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile ============================================================================== --- projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -42,7 +42,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -43,7 +43,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -43,7 +43,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile ============================================================================== --- projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -35,7 +35,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/pt_BR.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/pt_BR.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/pt_BR.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -36,7 +36,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -38,7 +38,6 @@ DOC?= book FORMATS?= html-split #HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/share/mk/doc.docbook.mk Sun Mar 31 21:11:07 2013 (r41330) @@ -452,31 +452,12 @@ ${DOC}.rtf: .if ${RENDERENGINE} == "jade" .if !defined(NO_TEX) -# -# This sucks, but there's no way round it. The PS and PDF formats need -# to use different image formats, which are chosen at the .tex stage. So, -# we need to create a different .tex file depending on our eventual output -# format, which will then lead on to a different .dvi file as well. -# - ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \ ${DOC}.parsed.xml ${JADE} -V tex-backend ${PRINTOPTS} \ ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml -${DOC}.tex-ps: ${DOC}.tex - ${LN} -f ${.ALLSRC} ${.TARGET} - -.if !target(${DOC}.tex-pdf) -${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \ - ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml - ${RM} -f ${.TARGET} - ${CAT} ${PDFTEX_DEF} > ${.TARGET} - ${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ - ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET} -.endif - .if !target(${DOC}.dvi) ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS} .for _curimage in ${LOCAL_IMAGES_EPS:M*share*} @@ -492,41 +473,23 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EP .endif .if !target(${DOC}.pdf) -.if !defined(USE_PS2PDF) -${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF} -.else ${DOC}.pdf: ${DOC}.ps ${IMAGES_PDF} -.endif -.for _curimage in ${IMAGES_PDF:M*share*} - ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} -.endfor -.if !defined(USE_PS2PDF) - ${PDFJADETEX_PREPROCESS} < ${DOC}.tex-pdf > ${DOC}.tex-pdf-tmp - @${ECHO} "==> PDFTeX pass 1/3" - -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}' - @${ECHO} "==> PDFTeX pass 2/3" - -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}' - @${ECHO} "==> PDFTeX pass 3/3" - -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}' -.else +#.for _curimage in ${IMAGES_PDF:M*share*} +# ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} +#.endfor ${PS2PDF} ${DOC}.ps ${.TARGET} .endif -.endif ${DOC}.ps: ${DOC}.dvi ${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC} .else # NO_TEX -${DOC}.tex ${DOC}.tex-ps ${DOC}.dvi ${DOC}.ps: +${DOC}.tex ${DOC}.dvi ${DOC}.ps: ${TOUCH} ${.TARGET} .if !target(${DOC}.pdf) ${DOC}.pdf: ${TOUCH} ${.TARGET} .endif -.if !target(${DOC}.tex-pdf) -${DOC}.tex-pdf: - ${TOUCH} ${.TARGET} -.endif .endif .elif ${RENDERENGINE} == "fop" Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile ============================================================================== --- projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -41,7 +41,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/zh_TW.Big5/books/handbook/Makefile ============================================================================== --- projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -34,7 +34,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= From owner-svn-doc-projects@FreeBSD.ORG Sun Mar 31 21:35:33 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 29C3F8A2; Sun, 31 Mar 2013 21:35:33 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0C862182; Sun, 31 Mar 2013 21:35:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VLZWFG098818; Sun, 31 Mar 2013 21:35:32 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VLZWK5098816; Sun, 31 Mar 2013 21:35:32 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201303312135.r2VLZWK5098816@svn.freebsd.org> From: Gabor Kovesdan Date: Sun, 31 Mar 2013 21:35:32 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41331 - projects/xml-tools/share/mk X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Mar 2013 21:35:33 -0000 Author: gabor Date: Sun Mar 31 21:35:32 2013 New Revision: 41331 URL: http://svnweb.freebsd.org/changeset/doc/41331 Log: - Remove more leftovers - Simplify image processing so that html always uses .png and printed formats always use .eps Modified: projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/mk/doc.images.mk Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Sun Mar 31 21:11:07 2013 (r41330) +++ projects/xml-tools/share/mk/doc.docbook.mk Sun Mar 31 21:35:32 2013 (r41331) @@ -115,7 +115,6 @@ KNOWN_FORMATS= html html.tar html-split epub txt rtf ps pdf tex dvi tar pdb CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css -PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS} @@ -254,9 +253,6 @@ CLEANFILES+= ${_curimage:T} ${_curimage: .elif ${_cf} == "pdf" CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \ ${DOC}.tex ${DOC}.fo -.for _curimage in ${IMAGES_PDF:M*share*} -CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} -.endfor .for _curimage in ${LOCAL_IMAGES_EPS:M*share*} CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T} .endfor @@ -474,9 +470,6 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EP .if !target(${DOC}.pdf) ${DOC}.pdf: ${DOC}.ps ${IMAGES_PDF} -#.for _curimage in ${IMAGES_PDF:M*share*} -# ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} -#.endfor ${PS2PDF} ${DOC}.ps ${.TARGET} .endif Modified: projects/xml-tools/share/mk/doc.images.mk ============================================================================== --- projects/xml-tools/share/mk/doc.images.mk Sun Mar 31 21:11:07 2013 (r41330) +++ projects/xml-tools/share/mk/doc.images.mk Sun Mar 31 21:35:32 2013 (r41331) @@ -71,33 +71,20 @@ _IMAGES_TXT+= ${LOCAL_IMAGES_EN:M*.txt} _IMAGES_PIC= ${IMAGES:M*.pic} _IMAGES_PIC+= ${LOCAL_IMAGES_EN:M*.pic} -IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/} -IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/} -IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$/.pdf/} -IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$/.png/} -IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$/.eps/} -IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$/.pdf/} -IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$/.txt/} -IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$/.png/} -IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$/.eps/} -IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$/.pdf/} -IMAGES_GEN_PDF+= ${IMAGES_PIC_PDF} ${IMAGES_SCR_PDF} - -CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF} -CLEANFILES+= ${IMAGES_SCR_PNG} ${IMAGES_SCR_EPS} ${IMAGES_SCR_TXT} -CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$/.ps/} - -IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG} -IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS} -IMAGES_TXT= ${_IMAGES_TXT} ${IMAGES_SCR_TXT} +IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/} ${_IMAGES_SCR:S/.scr$/.png/} ${_IMAGES_PIC:S/.pic$/.png/} +IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/} ${_IMAGES_SCR:S/.scr$/.eps/} ${_IMAGES_PIC:S/.pic$/.eps/} + +CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} + +IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} +IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} LOCAL_IMAGES= ${IMAGES} LOCAL_IMAGES_PNG= ${_IMAGES_PNG} LOCAL_IMAGES_EPS= ${_IMAGES_EPS} LOCAL_IMAGES_TXT= ${_IMAGES_TXT} -LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG} -LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS} -LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT} +LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG} +LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS} # The default resolution eps2png (82) assumes a 640x480 monitor, and is too # low for the typical monitor in use today. The resolution of 100 looks @@ -105,10 +92,6 @@ LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT} # a 640x480 monitor. EPS2PNM_RES?= 100 -# We need to list ${_IMAGES_PNG} here since the images might be in a -# shared image directory. -IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG} - # # Use suffix rules to convert .scr files to other formats .SUFFIXES: .scr .pic .png .ps .eps .txt @@ -142,9 +125,6 @@ IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_ -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/}` - \ | ${PNMTOPNG} > ${.TARGET} -.pic.ps: - ${PIC2PS} ${.ALLSRC} > ${.TARGET} - # When ghostscript built with A4=yes is used, ps2epsi's paper size also # becomes the A4 size. However, the ps2epsi fails to convert grops(1) # outputs, which is the letter size, and we cannot change ps2epsi's paper size @@ -178,25 +158,20 @@ IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_ # vice versa, leading to a loop in the dependency graph. Instead, build # the targets on the fly. -.for _curimage in ${IMAGES_GEN_PNG} -${_curimage}: ${_curimage:S/.png$/.eps/} +.for _curimage in ${_IMAGES_EPS:S/.eps$/.png/} +${_curimage}: ${_curimage:S/.png/.eps/} ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.ALLSRC} \ | ${EPS2PNM} ${EPS2PNMOPTS} \ -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.ALLSRC}` - \ | ${PNMTOPNG} > ${.TARGET} .endfor -.for _curimage in ${IMAGES_GEN_EPS} +.for _curimage in ${_IMAGES_EPS:S/.png$/.eps/} ${_curimage}: ${_curimage:S/.eps$/.png/} ${PNGTOPNM} ${PNGTOPNMOPTS} ${.ALLSRC} | \ ${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET} .endfor -.for _curimage in ${IMAGES_GEN_PDF} -${_curimage}: ${_curimage:S/.pdf$/.eps/} - ${EPSTOPDF} ${EPSTOPDFOPTS} --outfile=${.TARGET} ${.ALLSRC} -.endfor - .if ${.OBJDIR} != ${.CURDIR} .for _curimage in ${IMAGES} ${.OBJDIR}/${_curimage}: ${_curimage} From owner-svn-doc-projects@FreeBSD.ORG Mon Apr 1 08:16:11 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2C5A859E; Mon, 1 Apr 2013 08:16:11 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1C45B7D2; Mon, 1 Apr 2013 08:16:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r318GAs6085952; Mon, 1 Apr 2013 08:16:10 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r318G9Cj085943; Mon, 1 Apr 2013 08:16:09 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304010816.r318G9Cj085943@svn.freebsd.org> From: Gabor Kovesdan Date: Mon, 1 Apr 2013 08:16:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41332 - in projects/xml-tools/share: mk xml xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 08:16:11 -0000 Author: gabor Date: Mon Apr 1 08:16:09 2013 New Revision: 41332 URL: http://svnweb.freebsd.org/changeset/doc/41332 Log: - Remove some further unused leftovers - Make sure printed docs generated with DSSSL always use .eps images - And XSLT-based output always uses .png - Fix image conversion Modified: projects/xml-tools/share/mk/doc.images.mk projects/xml-tools/share/xml/freebsd-print.dsl projects/xml-tools/share/xml/freebsd.dtd projects/xml-tools/share/xml/freebsd45.dtd projects/xml-tools/share/xsl/freebsd-common.xsl projects/xml-tools/share/xsl/freebsd-fo.xsl Modified: projects/xml-tools/share/mk/doc.images.mk ============================================================================== --- projects/xml-tools/share/mk/doc.images.mk Sun Mar 31 21:35:32 2013 (r41331) +++ projects/xml-tools/share/mk/doc.images.mk Mon Apr 1 08:16:09 2013 (r41332) @@ -125,6 +125,9 @@ EPS2PNM_RES?= 100 -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/}` - \ | ${PNMTOPNG} > ${.TARGET} +.pic.ps: + ${PIC2PS} ${.ALLSRC} > ${.TARGET} + # When ghostscript built with A4=yes is used, ps2epsi's paper size also # becomes the A4 size. However, the ps2epsi fails to convert grops(1) # outputs, which is the letter size, and we cannot change ps2epsi's paper size @@ -166,7 +169,7 @@ ${_curimage}: ${_curimage:S/.png/.eps/} | ${PNMTOPNG} > ${.TARGET} .endfor -.for _curimage in ${_IMAGES_EPS:S/.png$/.eps/} +.for _curimage in ${_IMAGES_PNG:S/.png$/.eps/} ${_curimage}: ${_curimage:S/.eps$/.png/} ${PNGTOPNM} ${PNGTOPNMOPTS} ${.ALLSRC} | \ ${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET} Modified: projects/xml-tools/share/xml/freebsd-print.dsl ============================================================================== --- projects/xml-tools/share/xml/freebsd-print.dsl Sun Mar 31 21:35:32 2013 (r41331) +++ projects/xml-tools/share/xml/freebsd-print.dsl Mon Apr 1 08:16:09 2013 (r41332) @@ -3,10 +3,6 @@ - - - - ]> @@ -28,310 +24,6 @@ #f) ]]> - - - - - "))) - - (element filename - (pathwrap)) - - (element varname - (pathwrap)) - - ]]> - - - - - Modified: projects/xml-tools/share/xml/freebsd.dtd ============================================================================== --- projects/xml-tools/share/xml/freebsd.dtd Sun Mar 31 21:35:32 2013 (r41331) +++ projects/xml-tools/share/xml/freebsd.dtd Mon Apr 1 08:16:09 2013 (r41332) @@ -20,7 +20,6 @@ - Modified: projects/xml-tools/share/xml/freebsd45.dtd ============================================================================== --- projects/xml-tools/share/xml/freebsd45.dtd Sun Mar 31 21:35:32 2013 (r41331) +++ projects/xml-tools/share/xml/freebsd45.dtd Mon Apr 1 08:16:09 2013 (r41332) @@ -1,7 +1,6 @@ - - - - - - From owner-svn-doc-projects@FreeBSD.ORG Mon Apr 1 10:24:18 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B3953E28; Mon, 1 Apr 2013 10:24:18 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 96150134; Mon, 1 Apr 2013 10:24:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r31AOIoD023890; Mon, 1 Apr 2013 10:24:18 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r31AOHWM023883; Mon, 1 Apr 2013 10:24:17 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201304011024.r31AOHWM023883@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Mon, 1 Apr 2013 10:24:17 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41333 - projects/sysctl/share/tools/sysctl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 10:24:18 -0000 Author: des Date: Mon Apr 1 10:24:17 2013 New Revision: 41333 URL: http://svnweb.freebsd.org/changeset/doc/41333 Log: The first rough elements of the sysctl documentation harvesting system: - sysctlharvest is a Perl script that gathers information about sysctls from the system it runs on and outputs it as either a single XML file or one file per node. - sysctlfromelf is a C program that extracts information about sysctls from kernel and module binaries and outputs it as a single XML file. Still to do: - sysctlharvest should be able to read existing XML data, including both its own output and output from sysctlfromelf. - sysctlfromelf was written with the assumption that sysctl information can be read from modules independently. In fact, it needs to load the kernel first, then perform relocation on the modules to be able to resolve parent-child relationships. Nice to have: - sysctlharvest should be able to write XML data to a tar file. - sysctlharvest should be able to read XML data from a tar file. Added: projects/sysctl/share/tools/sysctl/ projects/sysctl/share/tools/sysctl/Makefile (contents, props changed) projects/sysctl/share/tools/sysctl/elfexplorer.c (contents, props changed) projects/sysctl/share/tools/sysctl/elfexplorer.h (contents, props changed) projects/sysctl/share/tools/sysctl/sysctlfromelf.c (contents, props changed) projects/sysctl/share/tools/sysctl/sysctlharvest.pl (contents, props changed) projects/sysctl/share/tools/sysctl/util.c (contents, props changed) projects/sysctl/share/tools/sysctl/util.h (contents, props changed) Added: projects/sysctl/share/tools/sysctl/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/share/tools/sysctl/Makefile Mon Apr 1 10:24:17 2013 (r41333) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +SCRIPTS = sysctlharvest.pl +PROG = sysctlfromelf +SRCS = sysctlfromelf.c elfexplorer.c util.c +MAN = +WARNS ?= 6 +LDADD = -lelf + +.include Added: projects/sysctl/share/tools/sysctl/elfexplorer.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/share/tools/sysctl/elfexplorer.c Mon Apr 1 10:24:17 2013 (r41333) @@ -0,0 +1,303 @@ +/*- + * Copyright (c) 2013 Dag-Erling Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id$ + */ + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "elfexplorer.h" +#include "util.h" + +/* + * Compare two sections by their names. + */ +static int +elfx_compare_sections_by_name(const void *ap, const void *bp) +{ + const elfx_section *a = ap, *b = bp; + + return (strcmp(a->name, b->name)); +} + +/* + * Compare two sections by their start addresses. + */ +static int +elfx_compare_sections_by_addr(const void *ap, const void *bp) +{ + const elfx_section *a = ap, *b = bp; + + /* no overlap allowed */ + assert(a == b || a->baddr == 0 || + a->eaddr < b->baddr || a->baddr > b->eaddr); + return (a->baddr < b->baddr ? -1 : a->baddr > b->baddr ? 1 : 0); +} + +/* + * Free memory that was allocated to store information about sections. + */ +static void +elfx_free_sections(elfx_file *ef) +{ + + if (ef == NULL) + return; + if (ef->sections != NULL) { + for (unsigned int i = 0; i < ef->nsections; ++i) + if (ef->sections[i].ptr && ef->sections[i].data && + ef->sections[i].ptr != ef->sections[i].data->d_buf) + free(ef->sections[i].ptr); + free(ef->sections); + ef->sections = NULL; + } + if (ef->sections_by_name != NULL) { + free(ef->sections_by_name); + ef->sections_by_name = NULL; + } + if (ef->sections_by_addr != NULL) { + free(ef->sections_by_addr); + ef->sections_by_addr = NULL; + } + ef->nsections = 0; +} + +/* + * Retrieve information about sections. + */ +static int +elfx_load_sections(elfx_file *ef) +{ + elfx_section *es; + size_t sections_size; + + /* get translated ELF header */ + if (gelf_getehdr(ef->elf, &ef->hdr) == NULL) + goto elf_error; + /* get number of sections in file */ + if (elf_getshdrnum(ef->elf, &ef->nsections) != ELF_E_NONE) + goto elf_error; + sections_size = ef->nsections * sizeof *ef->sections; + if ((ef->sections = calloc(sections_size, 1)) == NULL) + goto mem_error; + verbose("%4s %4s %8s %8s %s", "sect", "type", "start", "size", "name"); + /* iterate over sections */ + for (unsigned int i = 0; i < ef->nsections; ++i) { + es = &ef->sections[i]; + es->file = ef; + es->index = i; + /* get section from file */ + if ((es->scn = elf_getscn(ef->elf, i)) == NULL) + goto elf_error; + /* get translated section header */ + if ((gelf_getshdr(es->scn, &es->hdr)) == NULL) + goto elf_error; + /* get section name */ + if ((es->name = elf_strptr(ef->elf, ef->hdr.e_shstrndx, + es->hdr.sh_name)) == NULL) + goto elf_error; + verbose("%4d %4d %08x %08lx %s", elf_ndxscn(es->scn), + es->hdr.sh_type, (unsigned long)es->hdr.sh_addr, + (unsigned long)es->hdr.sh_size, es->name); + /* get data, if any */ + if ((es->data = elf_getdata(es->scn, NULL)) != NULL) { + assert(es->data->d_off == 0 && + es->data->d_size == es->hdr.sh_size); + if (es->hdr.sh_type == SHT_NOBITS) + es->ptr = calloc(es->hdr.sh_size, 1); + else + es->ptr = es->data->d_buf; + es->baddr = es->hdr.sh_addr; + es->eaddr = es->hdr.sh_addr + es->hdr.sh_size - 1; + es->size = es->hdr.sh_size; + /* only one data descriptor */ + assert(elf_getdata(es->scn, es->data) == NULL); + } + } + /* create copy of section list, sorted by name */ + if ((ef->sections_by_name = calloc(sections_size, 1)) == NULL) + goto mem_error; + memcpy(ef->sections_by_name, ef->sections, sections_size); + mergesort(ef->sections_by_name, ef->nsections, + sizeof *ef->sections_by_name, elfx_compare_sections_by_name); + /* create copy of section list, sorted by address */ + if ((ef->sections_by_addr = calloc(sections_size, 1)) == NULL) + goto mem_error; + memcpy(ef->sections_by_addr, ef->sections, sections_size); + mergesort(ef->sections_by_addr, ef->nsections, + sizeof *ef->sections_by_addr, elfx_compare_sections_by_addr); + return (ef->nsections); +elf_error: + info("%s: %s", ef->path, elf_errmsg(elf_errno())); +mem_error: + elfx_free_sections(ef); + return (-1); +} + +/* + * Open an ELF file and retrieve the information we need. + */ +elfx_file * +elfx_open(const char *path) +{ + elfx_file *ef; + struct stat sb; + + if ((ef = calloc(sizeof *ef, 1)) == NULL) + goto fail; + if (realpath(path, ef->path) == NULL) + goto fail; + if ((ef->fd = open(ef->path, O_RDONLY)) == -1) + goto fail; + if (fstat(ef->fd, &sb) != 0) + goto fail; + ef->size = sb.st_size; + if ((ef->map = mmap(NULL, ef->size, PROT_READ, MAP_PRIVATE, + ef->fd, 0)) == NULL) + goto fail; + if ((ef->elf = elf_memory(ef->map, ef->size)) == NULL) + goto fail; + if (elf_kind(ef->elf) != ELF_K_ELF) + goto fail; + if (elfx_load_sections(ef) < 0) + goto fail; + return (ef); +fail: + elfx_close(ef); + return (NULL); +} + +/* + * Close an ELF file and free all allocated memory. + */ +void +elfx_close(elfx_file *ef) +{ + + if (ef == NULL) + return; + elfx_free_sections(ef); + if (ef->elf != NULL) + elf_end(ef->elf); + if (ef->map != NULL) + munmap(ef->map, ef->size); + if (ef->fd <= 0) + close(ef->fd); + free(ef); +} + +/* + * Retrieve a section by its name. + */ +elfx_section * +elfx_get_section_by_name(elfx_file *ef, const char *name) +{ + elfx_section *es; + int lo, hi, mid; + int cmp; + + es = ef->sections_by_name; + lo = 0; + hi = ef->nsections - 1; + for (;;) { + mid = (lo + hi) / 2; +// verbose("(%d, %d, %d) %s == %s", +// lo, hi, mid, es[mid].name, name); + if ((cmp = strcmp(name, es[mid].name)) == 0) + return (&es[mid]); + else if (lo == hi) + return (NULL); + else if (cmp < 0) + hi = mid - 1; + else + lo = mid + 1; + } +} + +/* + * Retrieve the section that contains a specified address. + */ +elfx_section * +elfx_get_section_by_addr(elfx_file *ef, uintptr_t addr, elfx_section *hint) +{ + elfx_section *es; + int lo, hi, mid; + + if (hint != NULL && hint->baddr <= addr && addr <= hint->eaddr) + return (hint); + es = ef->sections_by_addr; + lo = 0; + hi = ef->nsections - 1; + for (;;) { + mid = (lo + hi) / 2; +// verbose("(%d, %d, %d) %08x <= %08x <= %08x", lo, mid, hi, +// es[mid].baddr, addr, es[mid].eaddr); + if (es[mid].baddr <= addr && addr <= es[mid].eaddr) + return (&es[mid]); + else if (lo == hi) + return (NULL); + else if (addr < es[mid].baddr) + hi = mid - 1; + else + lo = mid + 1; + } +} + +/* + * Look up a symbol in the symbol table + */ +uintptr_t +elfx_get_symbol(elfx_file *ef, const char *name) +{ + elfx_section *symtab; + GElf_Sym sym; + int nsyms; + char *symname; + + /* XXX cache symtab */ + if ((symtab = elfx_get_section_by_name(ef, ".symtab")) == NULL) + return (0); + nsyms = symtab->hdr.sh_size / symtab->hdr.sh_entsize; + for (int i = 0; i < nsyms; ++i) { + gelf_getsym(symtab->data, i, &sym); + if ((symname = elf_strptr(ef->elf, symtab->hdr.sh_link, + sym.st_name)) != NULL) { +// verbose("%08x %s", sym.st_value, symname); + if (strcmp(symname, name) == 0) { +// verbose("found %s at %08x", name, sym.st_value); + return (sym.st_value); + } + } + } + return (0); +} Added: projects/sysctl/share/tools/sysctl/elfexplorer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/share/tools/sysctl/elfexplorer.h Mon Apr 1 10:24:17 2013 (r41333) @@ -0,0 +1,72 @@ +/*- + * Copyright (c) 2013 Dag-Erling Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id$ + */ + +#ifndef ELFEXPLORER_H_INCLUDED +#define ELFEXPLORER_H_INCLUDED + +#include +#include + +typedef struct elfx_file { + char path[PATH_MAX]; + int fd; + size_t size; + void *map; + Elf *elf; + GElf_Ehdr hdr; + size_t nsections; + struct elfx_section *sections; + struct elfx_section *sections_by_name; + struct elfx_section *sections_by_addr; +} elfx_file; + +typedef struct elfx_section { + struct elfx_file *file; + int index; + Elf_Scn *scn; + GElf_Shdr hdr; + char *name; + Elf_Data *data; + uintptr_t baddr; + uintptr_t eaddr; + size_t size; + void *ptr; +} elfx_section; + + +elfx_file *elfx_open(const char *); +void elfx_close(elfx_file *); + +elfx_section *elfx_get_section_by_name(elfx_file *, const char *); +elfx_section *elfx_get_section_by_addr(elfx_file *, uintptr_t, elfx_section *); +#define elfx_get_data(s, a) \ + (void *)((char *)(s)->ptr + (uintptr_t)(a) - (s)->baddr) +uintptr_t elfx_get_symbol(elfx_file *, const char *); + + +#endif Added: projects/sysctl/share/tools/sysctl/sysctlfromelf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/share/tools/sysctl/sysctlfromelf.c Mon Apr 1 10:24:17 2013 (r41333) @@ -0,0 +1,266 @@ +/*- + * Copyright (c) 2012-2013 Dag-Erling Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +#include +#include + +#define _KERNEL +#include +#undef _KERNEL + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "elfexplorer.h" +#include "util.h" + +static void process_oid(const struct sysctl_oid *); + +/* + * Process an OID. + */ +static void +process_oid(const struct sysctl_oid *oid) +{ + const struct sysctl_oid_list *children; + const struct sysctl_oid *child; + + printf("\n", oid->oid_name); + if (oid->oid_descr) + printf("\n", + oid->oid_descr); +// printf("%08x\n", oid->oid_kind); + if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) { + children = (const struct sysctl_oid_list *)oid->oid_arg1; + SLIST_FOREACH(child, children, oid_link) + process_oid(child); + } + printf("\n"); +} + +/* + * Process an individual file. + */ +static int +process_file(const char *path) +{ + elfx_file *ef; + elfx_section *sect; + unsigned int nsysctls; + struct sysctl_oid_list *sysctl_root; + struct sysctl_oid *oid, **oids; + uintptr_t rootaddr; + + if ((ef = elfx_open(path)) == NULL) + return (-1); + /* find the root list */ + rootaddr = elfx_get_symbol(ef, "sysctl__children"); + sect = elfx_get_section_by_addr(ef, rootaddr, NULL); + assert(sect != NULL); + sysctl_root = elfx_get_data(sect, rootaddr); + /* find the sysctl linker set */ + if ((sect = elfx_get_section_by_name(ef, "set_sysctl_set")) == NULL) { + verbose("no sysctl linker set"); + elfx_close(ef); + return (0); + } + assert(sect->size % sizeof(uintptr_t) == 0); + nsysctls = sect->size / sizeof(uintptr_t); + oids = (struct sysctl_oid **)sect->ptr; + verbose("%zd sysctls found in section %d", nsysctls, sect->index); + /* retrieve OIDs and fix up various pointers */ + for (unsigned int i = 0; i < nsysctls; ++i) { + sect = elfx_get_section_by_addr(ef, (uintptr_t)oids[i], sect); + assert(sect != NULL); + oids[i] = oid = elfx_get_data(sect, oids[i]); + /* name */ + sect = elfx_get_section_by_addr(ef, + (uintptr_t)oid->oid_name, sect); + assert(sect != NULL); + oid->oid_name = elfx_get_data(sect, oid->oid_name); + /* descriptions */ + if (oid->oid_descr != NULL) { + sect = elfx_get_section_by_addr(ef, + (uintptr_t)oid->oid_descr, sect); + assert(sect != NULL); + oid->oid_descr = elfx_get_data(sect, oid->oid_descr); + } + /* siblings */ + if (oid->oid_link.sle_next != NULL) { + sect = elfx_get_section_by_addr(ef, + (uintptr_t)oid->oid_link.sle_next, sect); + assert(sect != NULL); + oid->oid_link.sle_next = elfx_get_data(sect, + oid->oid_link.sle_next); + } + /* children */ + if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE && + oid->oid_arg1 != 0) { + sect = elfx_get_section_by_addr(ef, + (uintptr_t)oid->oid_arg1, sect); + assert(sect != NULL); + oid->oid_arg1 = elfx_get_data(sect, + (uintptr_t)oid->oid_arg1); + } + /* parent */ + sect = elfx_get_section_by_addr(ef, + (uintptr_t)oid->oid_parent, sect); + assert(sect != NULL); + oid->oid_parent = elfx_get_data(sect, oid->oid_parent); + SLIST_INSERT_HEAD(oid->oid_parent, oid, oid_link); + } + /* list all OIDs! */ + printf("\n" + "\n"); + SLIST_FOREACH(oid, sysctl_root, oid_link) { + process_oid(oid); + } + printf("\n"); + elfx_close(ef); + return (0); +} + +/* + * Traverse a directory and process any file it named "kernel" or "*.ko". + */ +static int +process_directory(const char *path) +{ + DIR *dir; + struct dirent ent, *res; + char pathbuf[PATH_MAX]; + int ret; + + verbose("%s(%s)", __func__, path); + if ((dir = opendir(path)) == NULL) { + warn("%s", path); + return (-1); + } + ret = 0; + for (;;) { + if (readdir_r(dir, &ent, &res) != 0) { + warn("%s", path); + closedir(dir); + return (-1); + } + if (res == NULL) + break; + assert(res == &ent); + if (snprintf(pathbuf, sizeof(pathbuf), "%s/%s", path, ent.d_name) >= + (int)sizeof(pathbuf)) { + errno = ENAMETOOLONG; + warn("%s/%s", path, ent.d_name); + continue; + } + if (strcmp(ent.d_name, "kernel") == 0 || + (ent.d_namlen > 4 && + strcmp(ent.d_name + ent.d_namlen - 3, ".ko") == 0)) + if (process_file(pathbuf) != 0) + ret = -1; + } + closedir(dir); + return (ret); +} + +/* + * Check whether a path is a file or a directory and pass it on to the + * appropriate processing function. + */ +static int +process_path(const char *path) +{ + struct stat sb; + + verbose("%s(%s)", __func__, path); + if (stat(path, &sb) != 0) { + warn("%s", path); + return (-1); + } + switch (sb.st_mode & S_IFMT) { + case S_IFREG: + return (process_file(path)); + case S_IFDIR: + return (process_directory(path)); + default: + warnx("%s is neither a regular file nor a directory", path); + return (-1); + } +} + +/* + * Print usage message and exit. + */ +static int +usage(void) +{ + + fprintf(stderr, "usage: sysctlfromelf [-v] [path ...]\n"); + exit(1); +} + +/* + * Main loop + */ +int +main(int argc, char *argv[]) +{ + int opt; + + while ((opt = getopt(argc, argv, "v")) != -1) + switch (opt) { + case 'v': + ++opt_v; + break; + default: + usage(); + } + + argc -= optind; + argv += optind; + + if (elf_version(EV_CURRENT) == EV_NONE) + errx(1, "incorrect ELF library version"); + verbose("ELF library version %d", elf_version(EV_NONE)); + + if (argc == 0) + process_path("/boot/kernel"); + else + while (argc-- > 0) + process_path(*argv++); + + exit(0); +} Added: projects/sysctl/share/tools/sysctl/sysctlharvest.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/share/tools/sysctl/sysctlharvest.pl Mon Apr 1 10:24:17 2013 (r41333) @@ -0,0 +1,264 @@ +#!/usr/bin/perl -Tw +#- +# Copyright (c) 2012 Dag-Erling Smørgrav +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer +# in this position and unchanged. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +require v5.10; +use strict; +use warnings; +use utf8; +use Getopt::Long; +use Pod::Usage; +use constant SYSCTL_CMD => "/sbin/sysctl"; +use constant XML_PREAMBLE => "\n"; + +# Command-line options +our $from_sysctl; +our $from_binaries; +our $from_source; +our $source_path; +our $tunables; +our $output; +our $clobber; + +# Hashes of harvested sysctls and tunables +our %sysctl; +our %tunable; + +# Set of leaves +our %leaves; + +# +# Harvest from the output of the sysctl(1) command +# +sub harvest_from_sysctl() { + open(my $ph, "-|", SYSCTL_CMD, "-Ade") + or die("unable to execute @{[SYSCTL_CMD]}\n"); + while (<$ph>) { + next unless m/^([\w%-]+(?:\.[\w%-]+)*)=(.*?)\s*$/; + my ($name, $short) = ($1, $2); + + if ($name =~ m/^dev\.(\w+)\.\d+\.([\w%-]+(?:\.[\w%-]+)*)$/) { + # per-device + my ($device, $variable) = ($1, $2); + # skip the device metadata + next if $variable =~ m/^%/; + $name = "dev.$device.N.$variable"; + } elsif ($name =~ m/^dev\.(\w+)\.([\w%-]+(?:\.[\w%-]+)*)$/) { + # per-driver + my ($driver, $variable) = ($1, $2); + # skip the device metadata + next if $variable =~ m/^%/; + $name = "dev.$driver.$variable"; + } + + my @path = split(/\./, $name); + $leaves{$name} = [ @path ]; + my $node = \%sysctl; + foreach my $cnp (@path) { + $node->{$cnp} //= { "-name" => $cnp }; + $node = $node->{$cnp}; + } + $node->{"-leaf"} = 1; + $node->{"-short"} ||= $short; + } + close($ph); +} + +# Quote XML-unsafe characters +sub quote($) { $_[0] =~ s/([^\s\w.-])/&#@{[ord $1]};/gr; } + +# +# Output an XML fragment describing a particular sysctl node and all +# its descendents. The first argument is the file handle to write to; +# the second is a hashref to the node; the third is the indentation +# level; any subsequent arguments, if present, are interpreted as a +# path to a particular subtree (or leaf). +# +sub output_tree($$$;@); +sub output_tree($$$;@) { + my ($fh, $tree, $level, @path) = @_; + + print($fh XML_PREAMBLE, + "\n") + if $level == 1; + my $indent = " " x $level; + foreach (@path ? shift @path : sort keys %$tree) { + next if m/^-/; + my $node = $$tree{$_}; + print($fh "$indent\n"); + print($fh "$indent ", + quote($$node{"-short"} || "No description available"), + "\n") + if $$node{"-leaf"}; + output_tree($fh, $node, $level + 1, @path); + print($fh "$indent\n"); + } + print($fh "\n") + if $level == 1; +} + +# +# Top-level output routine +# +sub output() { + if (defined($output) && -d $output) { + foreach my $leaf (sort keys %leaves) { + my $fn = "$output/$leaf.xml"; + next if (!$clobber && -f $fn); + open(my $fh, ">", $fn) + or die("$fn: $!\n"); + output_tree($fh, \%sysctl, 1, @{$leaves{$leaf}}); + close($fh); + } + } else { + $output //= "/dev/stdout"; + open(my $fh, ">", $output) + or die("$output: $!\n"); + output_tree($fh, \%sysctl, 1); + close($fh); + } +} + +MAIN:{ + $ENV{PATH} = "/bin:/sbin:/usr/bin:/usr/sbin"; + $ENV{PERLDOC} = "-wcenter:'FreeBSD documentation tools'"; + GetOptions( + "sysctl+" => \$from_sysctl, + "binaries+" => \$from_binaries, + "source+" => \$from_source, + "sys=s" => \$source_path, + "tunables+" => \$tunables, + "output=s" => \$output, + "clobber+" => \$clobber, + "help" => sub { pod2usage(-exitval => 0, -verbose => 0); }, + "man" => sub { pod2usage(-exitval => 0, -verbose => 2); }) + or pod2usage(1); + + if (!$from_sysctl && !$from_binaries && !$from_source) { + $from_sysctl = 1; + } + + harvest_from_sysctl() + if $from_sysctl; +# harvest_from_binaries() +# if $from_binaries; +# harvest_from_source() +# if $from_source; + + # output the result + # XXX allow the user to specify which nodes / subtrees to output + # XXX through @ARGS + output(); +} + +=pod + +=encoding utf8 + +=head1 NAME + +sysctlharvest - Generate sysctl documentation stubs + +=head1 SYNOPSIS + +sysctlharvest [options] + + Options: + --help brief help message + --man complete documentation + --sysctl use sysctl tree + --binaries use kernel binaries + --source use kernel source + --sys=path path to kernel source + --tunables include tunables + --output=path output file or directory + --clobber overwrite existing files + +=head1 OPTIONS + +=over 8 + +=item B<--help> + +Print a brief help message and exits. + +=item B<--man> + +Print the complete documentation and exits. + +=item B<--sysctl> + +Harvest information from the sysctl tree of the current system. + +=item B<--source> + +Harvest information from a kernel source tree. + +=item B<--sys>=I + +Used with the B<--source> option to specify the location of the kernel +source tree. The default is to look first in the current directory, +then in a C subdirectory, then in C, and finally in +C. + +=item B<--tunables> + +When harvesting from a kernel source tree, include tunables. + +=item B<--output>=I + +Output path. If the path exists and is a directory, individual files +are created for each sysctl or tunable. If it does not exist, or it +exists and is a file, all the harvested information is written to a +single file. The default is to output all the information to stdout. + +=item B<--clobber> + +When writing individual files, overwrite any that already exist. + +=back + +=head1 DESCRIPTION + +The B utility gathers information about sysctl nodes +and generates documentation stubs based on that information. + +=head1 HISTORY + +The B utility and this manual page were written by +Dag-Erling Smørgrav . + +=cut + +1; Added: projects/sysctl/share/tools/sysctl/util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/share/tools/sysctl/util.c Mon Apr 1 10:24:17 2013 (r41333) @@ -0,0 +1,80 @@ +/*- + * Copyright (c) 2013 Dag-Erling Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id$ + */ + +#include +#include +#include +#include +#include + +#include "util.h" + +int opt_v; + +/* + * Print an informational message. + */ +void +info(const char *fmt, ...) +{ + va_list ap; + + fprintf(stderr, "%s: ", getprogname()); + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, "\n"); +} + +/* + * Print a hexdump + */ +void +hexdump(const void *datap, size_t len, unsigned long base) +{ + const uint8_t *data = datap; + int i, n; + + while (len > 0) { + n = (len > 16) ? 16 : len; + fprintf(stderr, "%08x |", (unsigned int)base); + for (i = 0; i < n; ++i) + fprintf(stderr, " %02x", data[i]); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Mon Apr 1 10:47:01 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F15B7536; Mon, 1 Apr 2013 10:47:01 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CB82F202; Mon, 1 Apr 2013 10:47:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r31Al1hA030067; Mon, 1 Apr 2013 10:47:01 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r31Al1uK030060; Mon, 1 Apr 2013 10:47:01 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201304011047.r31Al1uK030060@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Mon, 1 Apr 2013 10:47:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41334 - projects/sysctl/share/tools/sysctl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 10:47:02 -0000 Author: des Date: Mon Apr 1 10:47:00 2013 New Revision: 41334 URL: http://svnweb.freebsd.org/changeset/doc/41334 Log: Use the correct revision tag. Approved by: mentor (gjb) (implicit) Modified: projects/sysctl/share/tools/sysctl/elfexplorer.c projects/sysctl/share/tools/sysctl/elfexplorer.h projects/sysctl/share/tools/sysctl/util.c projects/sysctl/share/tools/sysctl/util.h Modified: projects/sysctl/share/tools/sysctl/elfexplorer.c ============================================================================== --- projects/sysctl/share/tools/sysctl/elfexplorer.c Mon Apr 1 10:24:17 2013 (r41333) +++ projects/sysctl/share/tools/sysctl/elfexplorer.c Mon Apr 1 10:47:00 2013 (r41334) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $FreeBSD$ */ #include Modified: projects/sysctl/share/tools/sysctl/elfexplorer.h ============================================================================== --- projects/sysctl/share/tools/sysctl/elfexplorer.h Mon Apr 1 10:24:17 2013 (r41333) +++ projects/sysctl/share/tools/sysctl/elfexplorer.h Mon Apr 1 10:47:00 2013 (r41334) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $FreeBSD$ */ #ifndef ELFEXPLORER_H_INCLUDED Modified: projects/sysctl/share/tools/sysctl/util.c ============================================================================== --- projects/sysctl/share/tools/sysctl/util.c Mon Apr 1 10:24:17 2013 (r41333) +++ projects/sysctl/share/tools/sysctl/util.c Mon Apr 1 10:47:00 2013 (r41334) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $FreeBSD$ */ #include Modified: projects/sysctl/share/tools/sysctl/util.h ============================================================================== --- projects/sysctl/share/tools/sysctl/util.h Mon Apr 1 10:24:17 2013 (r41333) +++ projects/sysctl/share/tools/sysctl/util.h Mon Apr 1 10:47:00 2013 (r41334) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $FreeBSD$ */ #ifndef SYSCTLFROMELF_UTIL_H_INCLUDED From owner-svn-doc-projects@FreeBSD.ORG Mon Apr 1 10:48:07 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4B632580; Mon, 1 Apr 2013 10:48:07 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 108E220C; Mon, 1 Apr 2013 10:48:06 +0000 (UTC) Received: from ds4.des.no (smtp.des.no [194.63.250.102]) by smtp-int.des.no (Postfix) with ESMTP id 7581EC4CA; Mon, 1 Apr 2013 10:48:05 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 3D5839471; Mon, 1 Apr 2013 12:48:05 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: doc-committers@freebsd.org Subject: Re: svn commit: r41333 - projects/sysctl/share/tools/sysctl References: <201304011024.r31AOHWM023883@svn.freebsd.org> Date: Mon, 01 Apr 2013 12:48:05 +0200 In-Reply-To: <201304011024.r31AOHWM023883@svn.freebsd.org> (Dag-Erling SmXXrgrav's message of "Mon, 1 Apr 2013 10:24:17 +0000 (UTC)") Message-ID: <86ppyeplwa.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-doc-projects@freebsd.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 10:48:07 -0000 I forgot to add: Approved by: mentor (gjb) (implicit) DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-doc-projects@FreeBSD.ORG Mon Apr 1 18:41:28 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2061A94A; Mon, 1 Apr 2013 18:41:28 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 02A96928; Mon, 1 Apr 2013 18:41:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r31IfRtP069571; Mon, 1 Apr 2013 18:41:27 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r31IfRf9069565; Mon, 1 Apr 2013 18:41:27 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201304011841.r31IfRf9069565@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Mon, 1 Apr 2013 18:41:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41340 - projects/sysctl/share/tools/sysctl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 18:41:28 -0000 Author: des Date: Mon Apr 1 18:41:26 2013 New Revision: 41340 URL: http://svnweb.freebsd.org/changeset/doc/41340 Log: Improve the Elf explorer API to make it easier to retrieve data: - Most of the time elfx_get_section_by_{name,addr}() is called, the caller is looking the same section as the last time, so cache it internally rather than have the caller pass in a hint. - Preload the symbol table and add an elfx_get_symbol_by_name() function that does what the name says. - Replace the elfx_get_data() macro with a function that takes care of the looking up which section the data is in, rather than have the caller look it up every time. This greatly simplifies the sysctl OID retrieval code. Approved by: mentor (gjb) (implicit) Modified: projects/sysctl/share/tools/sysctl/elfexplorer.c projects/sysctl/share/tools/sysctl/elfexplorer.h projects/sysctl/share/tools/sysctl/sysctlfromelf.c Modified: projects/sysctl/share/tools/sysctl/elfexplorer.c ============================================================================== --- projects/sysctl/share/tools/sysctl/elfexplorer.c Mon Apr 1 17:02:50 2013 (r41339) +++ projects/sysctl/share/tools/sysctl/elfexplorer.c Mon Apr 1 18:41:26 2013 (r41340) @@ -65,6 +65,17 @@ elfx_compare_sections_by_addr(const void } /* + * Compare two symbols by their names. + */ +static int +elfx_compare_symbols_by_name(const void *ap, const void *bp) +{ + const elfx_symbol *a = ap, *b = bp; + + return (strcmp(a->name, b->name)); +} + +/* * Free memory that was allocated to store information about sections. */ static void @@ -99,17 +110,18 @@ static int elfx_load_sections(elfx_file *ef) { elfx_section *es; - size_t sections_size; + size_t size; /* get translated ELF header */ if (gelf_getehdr(ef->elf, &ef->hdr) == NULL) goto elf_error; /* get number of sections in file */ - if (elf_getshdrnum(ef->elf, &ef->nsections) != ELF_E_NONE) + if (elf_getshdrnum(ef->elf, &size) != ELF_E_NONE) goto elf_error; - sections_size = ef->nsections * sizeof *ef->sections; - if ((ef->sections = calloc(sections_size, 1)) == NULL) - goto mem_error; + ef->nsections = size; + size *= sizeof *ef->sections; + if ((ef->sections = calloc(size, 1)) == NULL) + return (-1); verbose("%4s %4s %8s %8s %s", "sect", "type", "start", "size", "name"); /* iterate over sections */ for (unsigned int i = 0; i < ef->nsections; ++i) { @@ -145,26 +157,53 @@ elfx_load_sections(elfx_file *ef) } } /* create copy of section list, sorted by name */ - if ((ef->sections_by_name = calloc(sections_size, 1)) == NULL) - goto mem_error; - memcpy(ef->sections_by_name, ef->sections, sections_size); + if ((ef->sections_by_name = calloc(size, 1)) == NULL) + return (-1); + memcpy(ef->sections_by_name, ef->sections, size); mergesort(ef->sections_by_name, ef->nsections, sizeof *ef->sections_by_name, elfx_compare_sections_by_name); /* create copy of section list, sorted by address */ - if ((ef->sections_by_addr = calloc(sections_size, 1)) == NULL) - goto mem_error; - memcpy(ef->sections_by_addr, ef->sections, sections_size); + if ((ef->sections_by_addr = calloc(size, 1)) == NULL) + return (-1); + memcpy(ef->sections_by_addr, ef->sections, size); mergesort(ef->sections_by_addr, ef->nsections, sizeof *ef->sections_by_addr, elfx_compare_sections_by_addr); return (ef->nsections); elf_error: info("%s: %s", ef->path, elf_errmsg(elf_errno())); -mem_error: - elfx_free_sections(ef); return (-1); } /* + * Retrieve and sort the symbol table. + */ +static int +elfx_load_symbols(elfx_file *ef) +{ + elfx_section *symtab; + GElf_Sym sym; + size_t size; + + if ((symtab = elfx_get_section_by_name(ef, ".symtab")) == NULL) + return (-1); + ef->nsymbols = size = symtab->hdr.sh_size / symtab->hdr.sh_entsize; + size *= sizeof *ef->symbols; + if ((ef->symbols = calloc(size, 1)) == NULL) + return (-1); + for (unsigned int i = 0; i < ef->nsymbols; ++i) { + gelf_getsym(symtab->data, i, &sym); + ef->symbols[i].file = ef; + ef->symbols[i].name = elf_strptr(ef->elf, symtab->hdr.sh_link, + sym.st_name); + ef->symbols[i].addr = sym.st_value; + ef->symbols[i].size = sym.st_size; + } + mergesort(ef->symbols, ef->nsymbols, sizeof *ef->symbols, + elfx_compare_symbols_by_name); + return (0); +} + +/* * Open an ELF file and retrieve the information we need. */ elfx_file * @@ -191,6 +230,8 @@ elfx_open(const char *path) goto fail; if (elfx_load_sections(ef) < 0) goto fail; + if (elfx_load_symbols(ef) < 0) + goto fail; return (ef); fail: elfx_close(ef); @@ -226,6 +267,9 @@ elfx_get_section_by_name(elfx_file *ef, int lo, hi, mid; int cmp; + if (ef->last_section_by_name != 0 && + strcmp(name, ef->last_section_by_name->name) == 0) + return (ef->last_section_by_name); es = ef->sections_by_name; lo = 0; hi = ef->nsections - 1; @@ -234,7 +278,7 @@ elfx_get_section_by_name(elfx_file *ef, // verbose("(%d, %d, %d) %s == %s", // lo, hi, mid, es[mid].name, name); if ((cmp = strcmp(name, es[mid].name)) == 0) - return (&es[mid]); + return (ef->last_section_by_name = &es[mid]); else if (lo == hi) return (NULL); else if (cmp < 0) @@ -248,13 +292,15 @@ elfx_get_section_by_name(elfx_file *ef, * Retrieve the section that contains a specified address. */ elfx_section * -elfx_get_section_by_addr(elfx_file *ef, uintptr_t addr, elfx_section *hint) +elfx_get_section_by_addr(elfx_file *ef, uintptr_t addr) { elfx_section *es; int lo, hi, mid; - if (hint != NULL && hint->baddr <= addr && addr <= hint->eaddr) - return (hint); + if (ef->last_section_by_addr != NULL && + ef->last_section_by_addr->baddr <= addr && + addr <= ef->last_section_by_addr->eaddr) + return (ef->last_section_by_addr); es = ef->sections_by_addr; lo = 0; hi = ef->nsections - 1; @@ -263,7 +309,7 @@ elfx_get_section_by_addr(elfx_file *ef, // verbose("(%d, %d, %d) %08x <= %08x <= %08x", lo, mid, hi, // es[mid].baddr, addr, es[mid].eaddr); if (es[mid].baddr <= addr && addr <= es[mid].eaddr) - return (&es[mid]); + return (ef->last_section_by_addr = &es[mid]); else if (lo == hi) return (NULL); else if (addr < es[mid].baddr) @@ -274,30 +320,45 @@ elfx_get_section_by_addr(elfx_file *ef, } /* - * Look up a symbol in the symbol table + * Return a pointer to the data at the specified address. */ -uintptr_t -elfx_get_symbol(elfx_file *ef, const char *name) +void * +elfx_get_data(elfx_file *ef, uintptr_t addr) { - elfx_section *symtab; - GElf_Sym sym; - int nsyms; - char *symname; + elfx_section *es; - /* XXX cache symtab */ - if ((symtab = elfx_get_section_by_name(ef, ".symtab")) == NULL) - return (0); - nsyms = symtab->hdr.sh_size / symtab->hdr.sh_entsize; - for (int i = 0; i < nsyms; ++i) { - gelf_getsym(symtab->data, i, &sym); - if ((symname = elf_strptr(ef->elf, symtab->hdr.sh_link, - sym.st_name)) != NULL) { -// verbose("%08x %s", sym.st_value, symname); - if (strcmp(symname, name) == 0) { -// verbose("found %s at %08x", name, sym.st_value); - return (sym.st_value); - } - } + if ((es = elfx_get_section_by_addr(ef, addr)) == NULL) + return (NULL); + return ((char *)es->ptr + addr - es->baddr); +} + +/* + * Look up a symbol by name. + */ +elfx_symbol * +elfx_get_symbol_by_name(elfx_file *ef, const char *name) +{ + elfx_symbol *es; + int lo, hi, mid; + int cmp; + + if (ef->last_symbol_by_name != 0 && + strcmp(name, ef->last_symbol_by_name->name) == 0) + return (ef->last_symbol_by_name); + es = ef->symbols; + lo = 0; + hi = ef->nsymbols - 1; + for (;;) { + mid = (lo + hi) / 2; +// verbose("(%d, %d, %d) %s == %s", +// lo, hi, mid, es[mid].name, name); + if ((cmp = strcmp(name, es[mid].name)) == 0) + return (ef->last_symbol_by_name = &es[mid]); + else if (lo == hi) + return (NULL); + else if (cmp < 0) + hi = mid - 1; + else + lo = mid + 1; } - return (0); } Modified: projects/sysctl/share/tools/sysctl/elfexplorer.h ============================================================================== --- projects/sysctl/share/tools/sysctl/elfexplorer.h Mon Apr 1 17:02:50 2013 (r41339) +++ projects/sysctl/share/tools/sysctl/elfexplorer.h Mon Apr 1 18:41:26 2013 (r41340) @@ -39,10 +39,15 @@ typedef struct elfx_file { void *map; Elf *elf; GElf_Ehdr hdr; - size_t nsections; + unsigned int nsections; struct elfx_section *sections; struct elfx_section *sections_by_name; + struct elfx_section *last_section_by_name; struct elfx_section *sections_by_addr; + struct elfx_section *last_section_by_addr; + unsigned int nsymbols; + struct elfx_symbol *symbols; + struct elfx_symbol *last_symbol_by_name; } elfx_file; typedef struct elfx_section { @@ -58,15 +63,20 @@ typedef struct elfx_section { void *ptr; } elfx_section; +typedef struct elfx_symbol { + struct elfx_file *file; + char *name; + uintptr_t addr; + size_t size; +} elfx_symbol; elfx_file *elfx_open(const char *); void elfx_close(elfx_file *); elfx_section *elfx_get_section_by_name(elfx_file *, const char *); -elfx_section *elfx_get_section_by_addr(elfx_file *, uintptr_t, elfx_section *); -#define elfx_get_data(s, a) \ - (void *)((char *)(s)->ptr + (uintptr_t)(a) - (s)->baddr) -uintptr_t elfx_get_symbol(elfx_file *, const char *); +elfx_section *elfx_get_section_by_addr(elfx_file *, uintptr_t); +void *elfx_get_data(elfx_file *, uintptr_t); +elfx_symbol *elfx_get_symbol_by_name(elfx_file *, const char *); #endif Modified: projects/sysctl/share/tools/sysctl/sysctlfromelf.c ============================================================================== --- projects/sysctl/share/tools/sysctl/sysctlfromelf.c Mon Apr 1 17:02:50 2013 (r41339) +++ projects/sysctl/share/tools/sysctl/sysctlfromelf.c Mon Apr 1 18:41:26 2013 (r41340) @@ -80,18 +80,13 @@ process_file(const char *path) { elfx_file *ef; elfx_section *sect; + elfx_symbol *rootsym; unsigned int nsysctls; struct sysctl_oid_list *sysctl_root; struct sysctl_oid *oid, **oids; - uintptr_t rootaddr; if ((ef = elfx_open(path)) == NULL) return (-1); - /* find the root list */ - rootaddr = elfx_get_symbol(ef, "sysctl__children"); - sect = elfx_get_section_by_addr(ef, rootaddr, NULL); - assert(sect != NULL); - sysctl_root = elfx_get_data(sect, rootaddr); /* find the sysctl linker set */ if ((sect = elfx_get_section_by_name(ef, "set_sysctl_set")) == NULL) { verbose("no sysctl linker set"); @@ -101,46 +96,31 @@ process_file(const char *path) assert(sect->size % sizeof(uintptr_t) == 0); nsysctls = sect->size / sizeof(uintptr_t); oids = (struct sysctl_oid **)sect->ptr; - verbose("%zd sysctls found in section %d", nsysctls, sect->index); + verbose("%zd sysctls found in section %d", nsysctls, sect->index); + /* find the root list */ + rootsym = elfx_get_symbol_by_name(ef, "sysctl__children"); + assert(rootsym != NULL); + sysctl_root = elfx_get_data(ef, rootsym->addr); /* retrieve OIDs and fix up various pointers */ for (unsigned int i = 0; i < nsysctls; ++i) { - sect = elfx_get_section_by_addr(ef, (uintptr_t)oids[i], sect); - assert(sect != NULL); - oids[i] = oid = elfx_get_data(sect, oids[i]); + oids[i] = oid = elfx_get_data(ef, (uintptr_t)oids[i]); /* name */ - sect = elfx_get_section_by_addr(ef, - (uintptr_t)oid->oid_name, sect); - assert(sect != NULL); - oid->oid_name = elfx_get_data(sect, oid->oid_name); + oid->oid_name = elfx_get_data(ef, (uintptr_t)oid->oid_name); /* descriptions */ - if (oid->oid_descr != NULL) { - sect = elfx_get_section_by_addr(ef, - (uintptr_t)oid->oid_descr, sect); - assert(sect != NULL); - oid->oid_descr = elfx_get_data(sect, oid->oid_descr); - } + if (oid->oid_descr != NULL) + oid->oid_descr = elfx_get_data(ef, + (uintptr_t)oid->oid_descr); /* siblings */ - if (oid->oid_link.sle_next != NULL) { - sect = elfx_get_section_by_addr(ef, - (uintptr_t)oid->oid_link.sle_next, sect); - assert(sect != NULL); - oid->oid_link.sle_next = elfx_get_data(sect, - oid->oid_link.sle_next); - } + if (oid->oid_link.sle_next != NULL) + oid->oid_link.sle_next = elfx_get_data(ef, + (uintptr_t)oid->oid_link.sle_next); /* children */ if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE && - oid->oid_arg1 != 0) { - sect = elfx_get_section_by_addr(ef, - (uintptr_t)oid->oid_arg1, sect); - assert(sect != NULL); - oid->oid_arg1 = elfx_get_data(sect, + oid->oid_arg1 != 0) + oid->oid_arg1 = elfx_get_data(ef, (uintptr_t)oid->oid_arg1); - } /* parent */ - sect = elfx_get_section_by_addr(ef, - (uintptr_t)oid->oid_parent, sect); - assert(sect != NULL); - oid->oid_parent = elfx_get_data(sect, oid->oid_parent); + oid->oid_parent = elfx_get_data(ef, (uintptr_t)oid->oid_parent); SLIST_INSERT_HEAD(oid->oid_parent, oid, oid_link); } /* list all OIDs! */ From owner-svn-doc-projects@FreeBSD.ORG Tue Apr 2 09:50:12 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E61DA2FC; Tue, 2 Apr 2013 09:50:12 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 880B3689; Tue, 2 Apr 2013 09:50:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r329oCUh037713; Tue, 2 Apr 2013 09:50:12 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r329oBBq037704; Tue, 2 Apr 2013 09:50:11 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304020950.r329oBBq037704@svn.freebsd.org> From: Gabor Kovesdan Date: Tue, 2 Apr 2013 09:50:11 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41346 - in projects/xml-tools: de_DE.ISO8859-1/books/fdp-primer/sgml-markup de_DE.ISO8859-1/books/handbook/advanced-networking de_DE.ISO8859-1/books/handbook/basics de_DE.ISO8859-1/boo... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2013 09:50:13 -0000 Author: gabor Date: Tue Apr 2 09:50:10 2013 New Revision: 41346 URL: http://svnweb.freebsd.org/changeset/doc/41346 Log: - Do not specify image file extensions in documents; the proper extension is appended during rendering - For the same reason, do not specify format either - Add constraints to enforce this Modified: projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/basics/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml projects/xml-tools/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/basics/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/geom/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/install/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/mail/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/security/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml projects/xml-tools/en_US.ISO8859-1/articles/building-products/article.xml projects/xml-tools/en_US.ISO8859-1/articles/console-server/article.xml projects/xml-tools/en_US.ISO8859-1/articles/gjournal-desktop/article.xml projects/xml-tools/en_US.ISO8859-1/articles/releng/article.xml projects/xml-tools/en_US.ISO8859-1/articles/vm-design/article.xml projects/xml-tools/en_US.ISO8859-1/books/design-44bsd/book.xml projects/xml-tools/en_US.ISO8859-1/books/dev-model/book.xml projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/vinum/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml projects/xml-tools/es_ES.ISO8859-1/articles/releng/article.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/basics/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/security/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/articles/building-products/article.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml projects/xml-tools/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/install/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml projects/xml-tools/it_IT.ISO8859-15/articles/vm-design/article.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/basics/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/geom/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/install/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/mail/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml projects/xml-tools/ja_JP.eucJP/books/design-44bsd/book.xml projects/xml-tools/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml projects/xml-tools/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml projects/xml-tools/ja_JP.eucJP/books/handbook/install/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/basics/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/geom/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/install/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/mail/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/vinum/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml projects/xml-tools/no_NO.ISO8859-1/books/handbook/basics/chapter.xml projects/xml-tools/no_NO.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/install/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/security/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml projects/xml-tools/pt_BR.ISO8859-1/articles/building-products/article.xml projects/xml-tools/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml projects/xml-tools/ru_RU.KOI8-R/articles/console-server/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/releng/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/vm-design/article.xml projects/xml-tools/ru_RU.KOI8-R/books/design-44bsd/book.xml projects/xml-tools/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/basics/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/geom/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/install/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/mail/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/security/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml projects/xml-tools/share/xml/freebsd.sch projects/xml-tools/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml projects/xml-tools/zh_CN.GB2312/books/handbook/basics/chapter.xml projects/xml-tools/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml projects/xml-tools/zh_CN.GB2312/books/handbook/geom/chapter.xml projects/xml-tools/zh_CN.GB2312/books/handbook/install/chapter.xml projects/xml-tools/zh_CN.GB2312/books/handbook/mail/chapter.xml projects/xml-tools/zh_CN.GB2312/books/handbook/vinum/chapter.xml projects/xml-tools/zh_CN.GB2312/books/handbook/virtualization/chapter.xml projects/xml-tools/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml projects/xml-tools/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/basics/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/geom/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/install/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/mail/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/security/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/vinum/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/virtualization/chapter.xml Modified: projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml Mon Apr 1 22:30:00 2013 (r41345) +++ projects/xml-tools/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml Tue Apr 2 09:50:10 2013 (r41346) @@ -2616,7 +2616,7 @@ This is the file called 'foo2' <mediaobject> <imageobject> - <imagedata fileref="bild1.png"> + <imagedata fileref="bild1"> </imageobject> <textobject> <literallayout class="monospaced">+ - - - - - - - - - - - - - - -+ @@ -2730,7 +2730,7 @@ IMAGES+= bild3.png <mediaobject> <imageobject> - <imagedata fileref="kapitel1/bild1.png"> + <imagedata fileref="kapitel1/bild1"> </imageobject> … Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml Mon Apr 1 22:30:00 2013 (r41345) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml Tue Apr 2 09:50:10 2013 (r41346) @@ -365,7 +365,7 @@ host2.example.com link#1 - + @@ -580,7 +580,7 @@ host2.example.com link#1 - + @@ -5057,7 +5057,7 @@ cd /usr/src/etc; make distribution - + @@ -5096,7 +5096,7 @@ ISDN BRI Verbindung - + @@ -5217,7 +5217,7 @@ ISDN BRI Verbindung - + Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/basics/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/basics/chapter.xml Mon Apr 1 22:30:00 2013 (r41345) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/basics/chapter.xml Tue Apr 2 09:50:10 2013 (r41346) @@ -1191,7 +1191,7 @@ Old Password: - + @@ -1214,7 +1214,7 @@ Old Password: - + @@ -1249,7 +1249,7 @@ Old Password: - + @@ -1277,7 +1277,7 @@ Old Password: - + @@ -1303,7 +1303,7 @@ Old Password: - + @@ -1641,7 +1641,7 @@ Old Password: - + Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml Mon Apr 1 22:30:00 2013 (r41345) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml Tue Apr 2 09:50:10 2013 (r41346) @@ -725,8 +725,8 @@ Loading /boot/defaults/loader.conf Das &os;-Bootloader Men - + @@ -1016,7 +1016,7 @@ Trying to mount root from cd9660:/dev/is + fileref="bsdinstall/bsdinstall-choose-mode"/> @@ -1059,7 +1059,7 @@ Trying to mount root from cd9660:/dev/is Tastaturbelegung festlegen - + @@ -1073,7 +1073,7 @@ Trying to mount root from cd9660:/dev/is Tastaturauswahlbildschirm - + @@ -1103,7 +1103,7 @@ Trying to mount root from cd9660:/dev/is Festlegen des Rechnernamens - + @@ -1124,7 +1124,7 @@ Trying to mount root from cd9660:/dev/is Komponenten fr die Installation auswhlen - + @@ -1217,7 +1217,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1237,7 +1237,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1264,7 +1264,7 @@ Trying to mount root from cd9660:/dev/is Gefhrte oder manuelle Partitionierung auswhlen - + @@ -1279,7 +1279,7 @@ Trying to mount root from cd9660:/dev/is Aus mehreren Platten eine auswhlen - + @@ -1297,7 +1297,7 @@ Trying to mount root from cd9660:/dev/is Auswahl der gesamten Platte oder einer Partition - + @@ -1318,7 +1318,7 @@ Trying to mount root from cd9660:/dev/is berprfen der erstellen Partitionen - + @@ -1334,7 +1334,7 @@ Trying to mount root from cd9660:/dev/is Partitionen manuell erstellen - + @@ -1349,7 +1349,7 @@ Trying to mount root from cd9660:/dev/is Partitionen manuell anlegen - + @@ -1422,7 +1422,7 @@ Trying to mount root from cd9660:/dev/is Partitionen manuell erzeugen - + @@ -1601,7 +1601,7 @@ Trying to mount root from cd9660:/dev/is Letzte Besttigung - + @@ -1633,7 +1633,7 @@ Trying to mount root from cd9660:/dev/is Herunterladen der Distributionsdateien - + @@ -1647,7 +1647,7 @@ Trying to mount root from cd9660:/dev/is berprfen der Distributionsdateien - + @@ -1659,7 +1659,7 @@ Trying to mount root from cd9660:/dev/is Entpacken der Distributionsdateien - + @@ -1693,7 +1693,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1721,7 +1721,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1757,7 +1757,7 @@ Trying to mount root from cd9660:/dev/is Nach drahtlosen Access Points scannen - + @@ -1780,7 +1780,7 @@ Trying to mount root from cd9660:/dev/is Ein drahtloses Netzwerk auswhlen - + @@ -1798,7 +1798,7 @@ Trying to mount root from cd9660:/dev/is Verbindungsaufbau mit WPA2 - + @@ -1820,7 +1820,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1856,7 +1856,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1873,7 +1873,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1917,7 +1917,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1944,7 +1944,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -1962,7 +1962,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -2011,7 +2011,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -2035,7 +2035,7 @@ Trying to mount root from cd9660:/dev/is Lokale oder UTC-Zeit - + @@ -2052,7 +2052,7 @@ Trying to mount root from cd9660:/dev/is Das Gebiet auswhlen - + @@ -2065,7 +2065,7 @@ Trying to mount root from cd9660:/dev/is Das Land auswhlen - + @@ -2078,7 +2078,7 @@ Trying to mount root from cd9660:/dev/is Whlen einer Zeitzone - + @@ -2091,7 +2091,7 @@ Trying to mount root from cd9660:/dev/is Besttigen der Zeitzone - + @@ -2113,7 +2113,7 @@ Trying to mount root from cd9660:/dev/is Auswahl zustzlicher Dienste - + @@ -2162,7 +2162,7 @@ Trying to mount root from cd9660:/dev/is Aktivierung der Absturzaufzeichnung - + @@ -2187,7 +2187,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -2200,7 +2200,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -2303,7 +2303,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -2330,7 +2330,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -2387,7 +2387,7 @@ Trying to mount root from cd9660:/dev/is - + @@ -2405,7 +2405,7 @@ Trying to mount root from cd9660:/dev/is - + Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/geom/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/geom/chapter.xml Mon Apr 1 22:30:00 2013 (r41345) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/geom/chapter.xml Tue Apr 2 09:50:10 2013 (r41346) @@ -163,7 +163,7 @@ - + Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/install/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/install/chapter.xml Mon Apr 1 22:30:00 2013 (r41345) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/install/chapter.xml Tue Apr 2 09:50:10 2013 (r41346) @@ -1113,7 +1113,7 @@ Insert disk labelled "Kernel floppy 1" a - + @@ -1284,7 +1284,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1302,7 +1302,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1346,7 +1346,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1363,7 +1363,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1375,7 +1375,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1407,7 +1407,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1431,7 +1431,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1448,7 +1448,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1458,7 +1458,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1497,7 +1497,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1692,7 +1692,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1768,7 +1768,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1817,7 +1817,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1864,7 +1864,7 @@ Mounting root from ufs:/dev/md0c - + @@ -1896,7 +1896,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2170,7 +2170,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2200,7 +2200,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2228,7 +2228,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2248,7 +2248,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2266,7 +2266,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2284,7 +2284,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2310,7 +2310,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2368,7 +2368,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2427,7 +2427,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2464,7 +2464,7 @@ Mounting root from ufs:/dev/md0c - + @@ -2672,7 +2672,7 @@ installation menus to retry whichever op - + @@ -2725,7 +2725,7 @@ installation menus to retry whichever op - + @@ -2910,7 +2910,7 @@ use the current settings. - + @@ -3010,7 +3010,7 @@ use the current settings. - + @@ -3093,7 +3093,7 @@ use the current settings. - + @@ -3157,7 +3157,7 @@ Press [Enter] now to invoke an editor on - + @@ -3212,7 +3212,7 @@ Press [Enter] now to invoke an editor on - + @@ -3227,7 +3227,7 @@ Press [Enter] now to invoke an editor on - + @@ -3250,7 +3250,7 @@ Press [Enter] now to invoke an editor on - + @@ -3264,7 +3264,7 @@ Press [Enter] now to invoke an editor on - + @@ -3311,7 +3311,7 @@ Press [Enter] now to invoke an editor on - + @@ -3324,7 +3324,7 @@ Press [Enter] now to invoke an editor on - + @@ -3337,7 +3337,7 @@ Press [Enter] now to invoke an editor on - + @@ -3409,7 +3409,7 @@ Press [Enter] now to invoke an editor on - + @@ -3423,7 +3423,7 @@ Press [Enter] now to invoke an editor on - + @@ -3440,7 +3440,7 @@ Press [Enter] now to invoke an editor on - + @@ -3454,7 +3454,7 @@ Press [Enter] now to invoke an editor on - + @@ -3470,7 +3470,7 @@ Press [Enter] now to invoke an editor on - + @@ -3486,7 +3486,7 @@ Press [Enter] now to invoke an editor on - + @@ -3535,7 +3535,7 @@ Press [Enter] now to invoke an editor on - + @@ -3558,7 +3558,7 @@ Press [Enter] now to invoke an editor on - + @@ -3592,7 +3592,7 @@ Press [Enter] now to invoke an editor on - + @@ -3608,7 +3608,7 @@ Press [Enter] now to invoke an editor on - + @@ -3665,7 +3665,7 @@ Press [Enter] now to invoke an editor on - + @@ -3679,7 +3679,7 @@ Press [Enter] now to invoke an editor on - + @@ -3788,7 +3788,7 @@ Press [Enter] now to invoke an editor on - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Tue Apr 2 22:58:01 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C55FA187; Tue, 2 Apr 2013 22:58:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B61631E2; Tue, 2 Apr 2013 22:58:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r32Mw1IV083133; Tue, 2 Apr 2013 22:58:01 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r32Mw06Q083112; Tue, 2 Apr 2013 22:58:00 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201304022258.r32Mw06Q083112@svn.freebsd.org> From: Glen Barber Date: Tue, 2 Apr 2013 22:57:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41352 - in projects/ISBN_1-57176-407-0/share: pgpkeys security/advisories security/patches/SA-13:01 security/patches/SA-13:02 security/patches/SA-13:03 security/patches/SA-13:04 xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2013 22:58:01 -0000 Author: gjb Date: Tue Apr 2 22:57:59 2013 New Revision: 41352 URL: http://svnweb.freebsd.org/changeset/doc/41352 Log: MFH: - Merged /head/share:r40977-41351 Approved by: doceng (implicit) Added: projects/ISBN_1-57176-407-0/share/pgpkeys/girgen.key - copied unchanged from r41351, head/share/pgpkeys/girgen.key projects/ISBN_1-57176-407-0/share/pgpkeys/tmseck.key - copied unchanged from r41351, head/share/pgpkeys/tmseck.key projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-SA-13:01.bind.asc - copied unchanged from r41351, head/share/security/advisories/FreeBSD-SA-13:01.bind.asc projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-SA-13:02.libc.asc - copied unchanged from r41351, head/share/security/advisories/FreeBSD-SA-13:02.libc.asc projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-SA-13:03.openssl.asc - copied unchanged from r41351, head/share/security/advisories/FreeBSD-SA-13:03.openssl.asc projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-SA-13:04.bind.asc - copied unchanged from r41351, head/share/security/advisories/FreeBSD-SA-13:04.bind.asc projects/ISBN_1-57176-407-0/share/security/patches/SA-13:01/ - copied from r41351, head/share/security/patches/SA-13:01/ projects/ISBN_1-57176-407-0/share/security/patches/SA-13:02/ - copied from r41351, head/share/security/patches/SA-13:02/ projects/ISBN_1-57176-407-0/share/security/patches/SA-13:03/ - copied from r41351, head/share/security/patches/SA-13:03/ projects/ISBN_1-57176-407-0/share/security/patches/SA-13:04/ - copied from r41351, head/share/security/patches/SA-13:04/ Modified: projects/ISBN_1-57176-407-0/share/pgpkeys/beech.key (contents, props changed) projects/ISBN_1-57176-407-0/share/pgpkeys/des.key projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys-developers.xml projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys.ent projects/ISBN_1-57176-407-0/share/xml/advisories.xml projects/ISBN_1-57176-407-0/share/xml/authors.ent projects/ISBN_1-57176-407-0/share/xml/commercial.consult.xml projects/ISBN_1-57176-407-0/share/xml/developers.ent projects/ISBN_1-57176-407-0/share/xml/navibar.ent projects/ISBN_1-57176-407-0/share/xml/news.xml projects/ISBN_1-57176-407-0/share/xml/press.xml projects/ISBN_1-57176-407-0/share/xml/release.ent Directory Properties: projects/ISBN_1-57176-407-0/share/ (props changed) Modified: projects/ISBN_1-57176-407-0/share/pgpkeys/beech.key ============================================================================== --- projects/ISBN_1-57176-407-0/share/pgpkeys/beech.key Tue Apr 2 18:08:38 2013 (r41351) +++ projects/ISBN_1-57176-407-0/share/pgpkeys/beech.key Tue Apr 2 22:57:59 2013 (r41352) @@ -1,35 +1,50 @@ -sub 1024g/F1FD1C3D 2011-08-29 +sub 2048g/960F45D9 2013-02-26 ]]> Modified: projects/ISBN_1-57176-407-0/share/pgpkeys/des.key ============================================================================== --- projects/ISBN_1-57176-407-0/share/pgpkeys/des.key Tue Apr 2 18:08:38 2013 (r41351) +++ projects/ISBN_1-57176-407-0/share/pgpkeys/des.key Tue Apr 2 22:57:59 2013 (r41352) @@ -1,288 +1,232 @@ uid Dag-Erling Smørgrav uid Dag-Erling Smørgrav -uid Dag-Erling Smørgrav -uid [jpeg image of size 3315] -sub 2048g/920C3313 2006-11-11 [expires: 2012-12-31] +uid [jpeg image of size 4779] +sub 4096R/F4DE87F5 2013-02-15 [expires: 2015-01-01] ]]> Copied: projects/ISBN_1-57176-407-0/share/pgpkeys/girgen.key (from r41351, head/share/pgpkeys/girgen.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ISBN_1-57176-407-0/share/pgpkeys/girgen.key Tue Apr 2 22:57:59 2013 (r41352, copy of r41351, head/share/pgpkeys/girgen.key) @@ -0,0 +1,237 @@ + + + +uid [jpeg image of size 8260] +uid Palle Girgensohn +sub 2048R/6BC41243 2012-02-23 [expires: 2016-02-23] +]]> + Modified: projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys-developers.xml ============================================================================== --- projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys-developers.xml Tue Apr 2 18:08:38 2013 (r41351) +++ projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys-developers.xml Tue Apr 2 22:57:59 2013 (r41352) @@ -551,6 +551,11 @@ &pgpkey.pfg; + + &a.girgen; + &pgpkey.girgen; + + &a.pgollucci; &pgpkey.pgollucci; @@ -1516,6 +1521,11 @@ &pgpkey.matthew; + + &a.tmseck; + &pgpkey.tmseck; + + &a.stas; &pgpkey.stas; Modified: projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys.ent ============================================================================== --- projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys.ent Tue Apr 2 18:08:38 2013 (r41351) +++ projects/ISBN_1-57176-407-0/share/pgpkeys/pgpkeys.ent Tue Apr 2 22:57:59 2013 (r41352) @@ -134,6 +134,7 @@ + @@ -375,6 +376,7 @@ + Copied: projects/ISBN_1-57176-407-0/share/pgpkeys/tmseck.key (from r41351, head/share/pgpkeys/tmseck.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ISBN_1-57176-407-0/share/pgpkeys/tmseck.key Tue Apr 2 22:57:59 2013 (r41352, copy of r41351, head/share/pgpkeys/tmseck.key) @@ -0,0 +1,49 @@ + + + +uid Thomas-Martin Seck (Privat) +uid Thomas-Martin Seck (FreeBSD) +sub 2048g/3DC33B0F 2000-11-22 +]]> + Copied: projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-SA-13:01.bind.asc (from r41351, head/share/security/advisories/FreeBSD-SA-13:01.bind.asc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ISBN_1-57176-407-0/share/security/advisories/FreeBSD-SA-13:01.bind.asc Tue Apr 2 22:57:59 2013 (r41352, copy of r41351, head/share/security/advisories/FreeBSD-SA-13:01.bind.asc) @@ -0,0 +1,122 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +============================================================================= +FreeBSD-SA-13:01.bind Security Advisory + The FreeBSD Project + +Topic: BIND remote DoS with deliberately crafted DNS64 query + +Category: contrib +Module: bind +Announced: 2013-02-19 +Affects: FreeBSD 9.x and later +Corrected: 2013-01-08 09:05:09 UTC (stable/9, 9.1-STABLE) + 2013-02-19 13:27:20 UTC (releng/9.0, 9.0-RELEASE-p6) + 2013-02-19 13:27:20 UTC (releng/9.1, 9.1-RELEASE-p1) +CVE Name: CVE-2012-5688 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit . + +I. Background + +BIND 9 is an implementation of the Domain Name System (DNS) protocols. +The named(8) daemon is an Internet Domain Name Server. + +DNS64 is an IPv6 transition mechanism that will return a synthesized +AAAA response even if there is only an A record available. + +II. Problem Description + +Due to a software defect a crafted query can cause named(8) to crash +with an assertion failure. + +III. Impact + +If named(8) is configured to use DNS64, an attacker who can send it a +query can cause named(8) to crash, resulting in a denial of service. + +IV. Workaround + +No workaround is available, but systems not configured to use DNS64 +using the "dns64" configuration statement are not vulnerable. DNS64 +is not enabled in the default configuration on FreeBSD. + +V. Solution + +Perform one of the following: + +1) Upgrade your vulnerable system to a supported FreeBSD stable or +release / security branch (releng) dated after the correction date. + +Restart the named(8) daemon, or reboot your system. + +2) To update your vulnerable system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +# fetch http://security.FreeBSD.org/patches/SA-13:01/bind.patch +# fetch http://security.FreeBSD.org/patches/SA-13:01/bind.patch.asc +# gpg --verify bind.patch.asc + +b) Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +Recompile the operating system using buildworld and installworld as *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Tue Apr 2 22:58:28 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4FC8B1C3; Tue, 2 Apr 2013 22:58:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3E27C1E5; Tue, 2 Apr 2013 22:58:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r32MwSL0083235; Tue, 2 Apr 2013 22:58:28 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r32MwP9L083216; Tue, 2 Apr 2013 22:58:25 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201304022258.r32MwP9L083216@svn.freebsd.org> From: Glen Barber Date: Tue, 2 Apr 2013 22:58:25 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41353 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1: articles/bsdl-gpl articles/casestudy-argentina.com articles/committers-guide articles/compiz-fusion articles/contributors articl... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2013 22:58:28 -0000 Author: gjb Date: Tue Apr 2 22:58:24 2013 New Revision: 41353 URL: http://svnweb.freebsd.org/changeset/doc/41353 Log: MFH: - Merged /head/en_US.ISO8859-1:r40977-41351 Approved by: doceng (implicit) Added: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/porters-handbook/uses.xml - copied unchanged from r41351, head/en_US.ISO8859-1/books/porters-handbook/uses.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml - copied unchanged from r41351, head/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml - copied unchanged from r41351, head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml - copied unchanged from r41351, head/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/8.4R/ - copied from r41351, head/en_US.ISO8859-1/htdocs/releases/8.4R/ Deleted: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/availability.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/tutorials/ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/vendors.html Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/bsdl-gpl/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/compiz-fusion/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-questions/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-update-server/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/geom-class/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/hubs/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/p4-primer/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/portbuild/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/pr-guidelines/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/releng/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/wp-toolbox/article.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/arch-handbook/book.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/faq/book.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/book.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/book.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/install/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/introduction/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/l10n/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/printing/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/security/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/users/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/vinum/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/x11/chapter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/porters-handbook/Makefile projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/porters-handbook/book.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/Makefile projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/about.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/administration.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/advocacy/index.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/cgi/query-pr.cgi projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/developers/cvs.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/docs/books.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/features.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/gnome/index.xsl projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/index.xsl projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/internal/Makefile projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/internal/README.mirror (contents, props changed) projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/internal/about.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/internal/fortunes.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/internal/mirror.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/internal/new-account.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/layout/css/layout.css projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/2012-compromise.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/Makefile projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/README projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/news/status/status.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/platforms/amd64.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/projects/newbies.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/projects/projects.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/Makefile projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releases/index.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releng/charter.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/releng/index.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/search/sitemap.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/security/security.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/htdocs/where.xml projects/ISBN_1-57176-407-0/en_US.ISO8859-1/share/xml/release.l10n.ent (contents, props changed) Directory Properties: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/ (props changed) Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/bsdl-gpl/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/bsdl-gpl/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/bsdl-gpl/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -23,7 +23,6 @@ &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.general; Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -22,7 +22,6 @@ &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.xfree86; &tm-attrib.general; Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -33,7 +33,6 @@ &tm-attrib.freebsd; &tm-attrib.coverity; - &tm-attrib.cvsup; &tm-attrib.ibm; &tm-attrib.intel; &tm-attrib.sparc; @@ -316,9 +315,16 @@ r300894. There are mechanisms in place to automatically merge - changes back from the Subversion repository to the - CVS one, so regular users should not notice - a difference, however developers most certainly will. + changes back from the Subversion src + repository to the CVS repository for + some &os; branches (releng/6 through + releng/9), however this is purely to + support pre-existing end-user installs and should not be + relied upon, recommended or advertised. Future branches + will not be exported to CVS at all. The + ports repository was exported to CVS + for a period of time to aid end user migration, but as of + 28th February 2013 is no longer exported. Subversion is not that different from CVS when it comes to daily use, but there @@ -444,11 +450,11 @@ Checkout from a Mirror - You can check out a working copy from a mirror by simply + Check out a working copy from a mirror by substituting the mirror's URL for svn+ssh://svn.freebsd.org/base. This can - be an official mirror or a mirror you maintain yourself - using svnsync or similar. + be an official mirror or a mirror maintained by + using svnsync. There is a serious disadvantage to this method: every time something is to be committed, a svn switch @@ -459,8 +465,8 @@ the same UUID, some hacking of the local repository's UUID has to occur before it is possible to start using it. - Unlike with CVS and - csup, the hassle of a local + Unlike with CVS, + the hassle of a local svnsync mirror probably is not worth it unless the network connectivity situation or other factors demand it. If it is needed, see the end of this chapter for @@ -481,10 +487,16 @@ For the base repository, HEAD refers to the -CURRENT tree. For example, head/bin/ls is what would go into /usr/src/bin/ls in a - release. Some other key locations are: + release. Some key locations are: + /head/ + which corresponds to HEAD, also known as + -CURRENT. + + + /stable/n which corresponds to RELENG_n. @@ -678,10 +690,14 @@ It is possible to anonymously check out the &os; repository with Subversion. This will give access to a read-only tree that can be updated, but not committed - to. To do this, use one of the following commands: + to. To do this, use the following command: - &prompt.user; svn co svn://svn.freebsd.org/base/head /usr/src -&prompt.user; svn co http://svn.freebsd.org/base/head /usr/src + &prompt.user; svn co https://svn0.us-west.FreeBSD.org/base/head /usr/src + + Select the closest mirror and verify the mirror server + certificate from the list of Subversion + mirror sites. @@ -2300,32 +2316,19 @@ ControlPersist yes You can run a local copy of GNATS, and then integrate the FreeBSD - GNATS tree in to it using CVSup. Then you can run GNATS commands - locally. - This lets you query the PR database without needing to be connected to - the Internet. + GNATS tree by creating an rsync mirror. + Then you can run GNATS commands locally, allowing you to query the PR + database without an Internet connection. Mirroring the GNATS Tree - It is possible to mirror the GNATS database by adding this line - to your supfile. Note that since - GNATS is not under CVS control it has no tag, so if you are adding - it to your existing supfile it should appear - before any tag= entry as these remain active once set. - - gnats release=current prefix=/usr - - This will place the FreeBSD GNATS tree in - /usr/gnats. You can use a - refuse file to control which categories to - receive. For example, to only receive docs PRs, - put this line in - /usr/local/etc/cvsup/sup/refuse - The precise path depends on the *default - base setting in your - supfile. - . + It is possible to mirror the GNATS database by installing + net/rsync, and + executing: + + &prompt.user; rsync -va rsync://bit0.us-west.freebsd.org/FreeBSD-bit/gnats . + @@ -3707,7 +3710,7 @@ ControlPersist yes specifically permitted by portmgr. Complete details about what qualifies as a sweeping change can be found on the Portmgr + url="&url.base;/portmgr/implementation.html">Portmgr Implementation page. The benefit of a slush as opposed to a complete Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/compiz-fusion/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/compiz-fusion/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/compiz-fusion/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -138,9 +138,7 @@ Make sure to update your ports tree using your favorite method - (like csup, - CVSup or - portsnap) before you install any + (e.g., portsnap) before you install any application from the ports system. Graphics drivers and the desktop effects programs are under heavy development, and are updated regularly. Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -15,7 +15,6 @@ &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.sun; &tm-attrib.general; Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -844,6 +844,11 @@ + Andrew Romanenko + melanhit@gmail.com + + + Andrew S. Midthune amidthune@cableone.net @@ -2603,6 +2608,11 @@ + Dmitry Kazarov + d.y.kazarov@mail.ru + + + Dmitry Khrustalev dima@xyzzy.machaon.ru @@ -3570,6 +3580,11 @@ + Greg Kennedy + kennedy.greg@gmail.com + + + Greg Robinson greg@rosevale.com.au @@ -4403,6 +4418,11 @@ + Javad Kouhi + javad.kouhi@gmail.com + + + Javier Martin Rueda jmrueda@diatel.upm.es @@ -4908,6 +4928,11 @@ + John Mehr + jcm@visi.com + + + John Merryweather Cooper jmcoopr@webmail.bmi.net @@ -5327,6 +5352,11 @@ + Kai Wang + kaiwang27@gmail.com + + + Kaleb S. Keithley kaleb@ics.com @@ -7334,6 +7364,11 @@ + Nikolai Lifanov + lifanov@mail.lifanov.com + + + Nikos Kokkalis nickkokkalis@gmail.com @@ -7384,6 +7419,11 @@ + Nikola Kolev + koue@chaosophia.net + + + Nikos Ntarmos ntarmos@ceid.upatras.gr @@ -10073,11 +10113,6 @@ - Thomas-Martin Seck - tmseck@netcologne.de - - - Thorsten Greiner thorsten@tgreiner.net @@ -10243,6 +10278,11 @@ + Tomasz Walaszek + tmwalaszek@gmail.com + + + Tomaz Muraus kami@k5-storitve.net @@ -10378,6 +10418,11 @@ + Tzanetos Balitsaris + tzabal@it.teithe.gr + + + UMENO Takashi umeno@rr.iij4u.or.jp @@ -10684,6 +10729,11 @@ + Waitman Gobble + waitman@waitman.net + + + Walt Howard howard@ee.utah.edu Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -188,10 +188,6 @@ - &a.carvay; - - - &a.gahr; @@ -436,10 +432,6 @@ - &a.shige; - - - &a.gallatin; @@ -520,7 +512,7 @@ - &a.randi; + &a.smh; @@ -544,10 +536,6 @@ - &a.mux; - - - &a.wen; @@ -692,10 +680,6 @@ - &a.zack; - - - &a.jceel; @@ -1300,6 +1284,10 @@ + &a.tmseck; + + + &a.stas; @@ -1632,10 +1620,6 @@ - &a.keichii; - - - &a.joerg; Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -2,24 +2,29 @@ + - Doug Barton (2000 - 2012) + &a.randi; (2010 - 2012) - &a.wilko; (2000 - 2012) + &a.zack; (2010 - 2012) - &a.murray; (2000 - 2012) + &a.erik; (2008 - 2012) - &a.steve; (1996 - 2012) + &a.carvay; (2008 - 2012) - &a.erik; (2008 - 2012) + &a.lulf; (2007 - 2012) + + + + &a.mnag; (2005 - 2012) @@ -27,15 +32,19 @@ - &a.mnag; (2005 - 2012) + Doug Barton (2000 - 2012) - &a.lulf; (2007 - 2012) + &a.wilko; (2000 - 2012) - &a.niels; (2004 - 2011) + &a.murray; (2000 - 2012) + + + + &a.steve; (1996 - 2012) @@ -63,6 +72,10 @@ + &a.niels; (2004 - 2011) + + + &a.sergei; (2003 - 2011) @@ -71,6 +84,10 @@ + &a.mux; (2002 - 2011) + + + &a.hm; (1998 - 2011) @@ -87,6 +104,10 @@ + &a.cbzimmer; (2009 - 2010) + + + &a.bushman; (2007 - 2010) @@ -207,6 +228,10 @@ + &a.kishore; (2007 - 2008) + + + &a.twinterg; (2006 - 2008) @@ -259,6 +284,10 @@ + &a.sah; (2004 - 2008) + + + &a.rsm; (2003 - 2008) @@ -271,6 +300,10 @@ + &a.matk; (2003 - 2008) + + + &a.seanc; (2002 - 2008) @@ -339,6 +372,10 @@ + &a.shige; (1999 - 2008) + + + &a.hosokawa; (1998 - 2008) @@ -479,6 +516,10 @@ + &a.am; (2003 - 2006) + + + &a.scop; (2002 - 2006) @@ -499,6 +540,10 @@ + &a.keichii; (2001 - 2006) + + + &a.ue; (2001 - 2006) Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -3,6 +3,14 @@ + &a.beat; (2011 - 2013) + + + + &a.linimon; (2004 - 2013) + + + &a.pav; (2006 - 2012) Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-questions/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-questions/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-questions/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -22,7 +22,6 @@ &tm-attrib.freebsd; &tm-attrib.microsoft; - &tm-attrib.netscape; &tm-attrib.opengroup; &tm-attrib.qualcomm; &tm-attrib.general; @@ -312,10 +311,6 @@ your options page that will email your c - cc:Mail - - - &eudora; @@ -328,22 +323,11 @@ your options page that will email your c - µsoft; Internet Mail - - - µsoft; &outlook; - - - &netscape; - - As you can see, the mailers in the Microsoft world are frequent - offenders. If at all possible, use a &unix; mailer. If you must use a - mailer under Microsoft environments, make sure it is set up - correctly. Try not to use MIME: a lot of people + Try not to use MIME: a lot of people use mailers which do not get on very well with MIME. Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-update-server/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -22,6 +22,7 @@ 2009 2010 2011 + 2013 Jason Helfman @@ -40,8 +41,8 @@ This article describes building an internal &fbus.ap;. The freebsd-update-server software - is written by &a.cperciva;, current Security Officer of &os;. + url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server + software is written by &a.cperciva;, Security Officer Emeritus of &os;. For users that think it is convenient to update their systems against an official update server, building their own &fbus.ap; may help to extend its functionality by supporting manually-tweaked @@ -118,11 +119,11 @@ Configuration: Installation & Setup Download the freebsd-update-server - software as a tar archive, - or use &man.csup.1; and the projects-all - collection. + url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/"> + freebsd-update-server software by installing devel/subversion , and execute: + + &prompt.user; svn co http://svn.freebsd.org/base/user/cperciva/freebsd-update-build freebsd-update-server Update scripts/build.conf appropriately. It is sourced during all build operations. @@ -353,9 +354,9 @@ world|base|/usr/lib/libalias_ftp.a During this second build cycle, the network time protocol - daemon, &man.ntpd.8;, is turned off. Per &a.cperciva;, current - Security Officer of &os;, "the freebsd-update-server + daemon, &man.ntpd.8;, is turned off. Per &a.cperciva;, + Security Officer Emeritus of &os;, "the freebsd-update-server build code needs to identify timestamps which are stored in files so that they can be ignored when comparing builds to determine which files need to be updated. This timestamp-finding works by doing two @@ -778,7 +779,6 @@ the new builds. } - Adding flags to buildworld and @@ -801,28 +801,12 @@ the new builds. - - - - - Create a firewall - rule to block outgoing RST packets. Due to a bug noted in a posting - on the &a.stable; in April 2009, there may be - time-outs and failures when updating a system. - - - - Create an appropriate DNS SRV record for the update server, and put others behind it with variable weights. Using this facility will provide update - mirrors. + mirrors, however this tip is not necessary unless you wish to + provide a redundant service. _http._tcp.update.myserver.com. IN SRV 0 2 80 host1.myserver.com. SRV 0 1 80 host2.myserver.com. Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/geom-class/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/geom-class/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/geom-class/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -22,7 +22,6 @@ &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.general; Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/hubs/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/hubs/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/hubs/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -780,13 +780,6 @@ cvspserver stream tcp nowait root /usr/b - Look at available mirrors in your country. - The FreeBSD - Mirror Database can help you with this. - - - - Check for those which provide fastest access (number of hops, round-trip-times) and offer the services you intend to Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/p4-primer/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/p4-primer/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/p4-primer/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -37,7 +37,7 @@ The &os; project uses the Perforce version control system to manage experimental projects that are - not ready for the main CVS repository. + not ready for the main Subversion repository. Availability, Documentation, and Resources @@ -68,9 +68,9 @@ The &os; Perforce server is hosted on perforce.freebsd.org, port 1666. The repository is browsable - online at . + online at . Some portions of the repository are also automatically exported - to a number of CVSup servers. + to a number of legacy CVSup servers. @@ -334,7 +334,8 @@ with &os;. Frequent submits of changes to the server are also encouraged. - The Perforce repository (the + sSimilar to Subversion, the + Perforce repository (the depot) is a single flat tree. Every file, whether a unique creation or a derivative from a branch, is accessible via a simple path under the server - Interactions between &os; CVS and Perforce + Interactions between &os; Subversion and Perforce - The &os; Perforce and CVS - repositories are completely separate. However, changes to CVS are + The &os; Perforce and Subversion + repositories are completely separate. However, changes to Subversion are tracked at near-real-time in Perforce. - Every 2 minutes, the CVS server is polled for updates in the HEAD + Every 2 minutes, the Subversion server is polled for updates in the HEAD branch, and those updates are committed to Perforce in the //depot/vendor/freebsd/... tree. This @@ -822,10 +823,10 @@ should be done so that your tree stays up to date and avoids conflicts with mainline development. - The bridge between CVS and Perforce - is one-way; changes to CVS will be reflected in + The bridge between Subversion and Perforce + is one-way; changes to Subversion will be reflected in Perforce, but changes in Perforce will - not be reflected in CVS. On request, some parts of the + not be reflected in Subversion. On request, some parts of the Perforce repo can be exported to CVSup and made available for distribution that way. Contact the &os; Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/portbuild/article.xml Tue Apr 2 22:57:59 2013 (r41352) +++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/articles/portbuild/article.xml Tue Apr 2 22:58:24 2013 (r41353) @@ -631,19 +631,19 @@ PKG_BIN=/usr/local/sbin/pkg Update the i386-7 tree and do a complete build - &prompt.user; dopackages.wrapper i386 7 -nosrc -norestr -nofinish + &prompt.user; dopackages.wrapper i386 8 latest -nosrc -norestr -nofinish Restart an interrupted amd64-8 build without updating - &prompt.user; dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish + &prompt.user; dopackages.wrapper amd64 8 latest -nosrc -noports -norestr -continue -noindex -noduds -nofinish - Post-process a completed sparc64-7 tree + Post-process a completed sparc64-8 tree - &prompt.user; dopackages.wrapper sparc64 7 -finish + &prompt.user; dopackages.wrapper sparc64 8 -finish Hint: it is usually best to run the dopackages @@ -1361,7 +1361,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 The following command will set up the control branch for the partial build: - &prompt.user; /a/portbuild/scripts/dopackages.wrapper i386 8 -noportsvcs -nobuild -novcs -nofinish + &prompt.user; /a/portbuild/scripts/dopackages.wrapper i386 8 latest -noportsvcs -nobuild -novcs -nofinish The builds must be performed from the @@ -1501,6 +1501,14 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 command is no longer used. + + + Decide if you will be using a local + squid cache on the client, + instead of the server. It is more efficient to run it + on the server. If you are doing that, skip the "squid" + steps below.) + @@ -1627,12 +1635,21 @@ options NFSSERVER - Also add the following users: + If you are using ganglia + for monitoring, add the following user: - squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh -ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh + ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh - Add them to etc/group as well. + Add it to etc/group as well. + + + + If you are using a local squid + cache on the client, add the following user: + + squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh + + Add it to etc/group as well. @@ -1682,13 +1699,19 @@ nfs_client_enable="YES" ntpd_enable="YES" sendmail_enable="NONE" sshd_enable="YES" -sshd_program="/usr/local/sbin/sshd" +sshd_program="/usr/local/sbin/sshd" -gmond_enable="YES" -squid_enable="YES" -squid_chdir="/usr2/squid/logs" -squid_pidfile="/usr2/squid/logs/squid.pid" + If you are using ganglia + for monitoring, add the following + + gmond_enable="YES" + If you are using a local squid + cache on the client, add the following + + squid_enable="YES" +squid_chdir="/a/squid/logs" +squid_pidfile="/a/squid/logs/squid.pid" Required entries for VMWare-based nodes: vmware_guest_vmmemctl_enable="YES" @@ -1709,8 +1732,8 @@ sshd_program="/usr/local/sbin/sshd" gmond_enable="YES" squid_enable="YES" -squid_chdir="/usr2/squid/logs" -squid_pidfile="/usr2/squid/logs/squid.pid" +squid_chdir="/a/squid/logs" +squid_pidfile="/a/squid/logs/squid.pid" &man.ntpd.8; should not be enabled for VMWare instances. @@ -1718,7 +1741,7 @@ squid_pidfile="/u Also, it may be possible to leave squid disabled by default so as to not have - /usr2 + /a persistent (which should save instantiation time.) Work is still ongoing. @@ -1733,7 +1756,7 @@ squid_pidfile="/u Modify etc/sysctl.conf: 9a10,30 -> kern.corefile=/usr2/%N.core +> kern.corefile=/a/%N.core > kern.sugid_coredump=1 > #debug.witness_ddb=0 > #debug.witness_watch=0 @@ -1774,13 +1797,21 @@ squid_pidfile="/u Install the following ports: net/rsync -security/openssh-portable (with HPN on) -security/sudo -sysutils/ganglia-monitor-core (with GMETAD off) -www/squid (with SQUID_AUFS on) +security/sudo + + You may also wish to install: + + security/openssh-portable (with HPN on) + + If you are using ganglia + for monitoring, install the following: + + sysutils/ganglia-monitor-core (with GMETAD off) + + If you are using a local squid + cache on the client, install the following - There is a WIP to create a meta-port, but it is not yet - complete. + www/squid31 (with SQUID_AUFS on) @@ -1801,7 +1832,8 @@ www/squid (with SQUID_AUFS on) - Modify + If you are using ganglia, + modify usr/local/etc/gmond.conf: 21,22c21,22 @@ -1832,7 +1864,7 @@ www/squid (with SQUID_AUFS on)/usr2 +scratchdir=/a ln -sf ${scratchdir}/portbuild /var/ @@ -1849,7 +1881,8 @@ touch /tmp/.boot_finished - Modify + If you are using a local squid + cache, modify, usr/local/etc/squid/squid.conf: 288,290c288,290 @@ -1924,8 +1957,12 @@ portbuild ALL=(ALL) NOPASSWD: ALL

&prompt.root; mkdir portbuild &prompt.root; chown portbuild:portbuild portbuild *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Apr 3 00:01:10 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D4882B72; Wed, 3 Apr 2013 00:01:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C592C65B; Wed, 3 Apr 2013 00:01:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3301A78003029; Wed, 3 Apr 2013 00:01:10 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33019eE003020; Wed, 3 Apr 2013 00:01:09 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201304030001.r33019eE003020@svn.freebsd.org> From: Glen Barber Date: Wed, 3 Apr 2013 00:01:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41354 - in projects/entities/share: pgpkeys security/advisories security/patches/SA-13:01 security/patches/SA-13:02 security/patches/SA-13:03 security/patches/SA-13:04 xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 00:01:10 -0000 Author: gjb Date: Wed Apr 3 00:01:08 2013 New Revision: 41354 URL: http://svnweb.freebsd.org/changeset/doc/41354 Log: MFH: - Merged /head/share:r40992-41353 Approved by: doceng (implicit) Added: projects/entities/share/pgpkeys/girgen.key - copied unchanged from r41353, head/share/pgpkeys/girgen.key projects/entities/share/pgpkeys/tmseck.key - copied unchanged from r41353, head/share/pgpkeys/tmseck.key projects/entities/share/security/advisories/FreeBSD-SA-13:01.bind.asc - copied unchanged from r41353, head/share/security/advisories/FreeBSD-SA-13:01.bind.asc projects/entities/share/security/advisories/FreeBSD-SA-13:02.libc.asc - copied unchanged from r41353, head/share/security/advisories/FreeBSD-SA-13:02.libc.asc projects/entities/share/security/advisories/FreeBSD-SA-13:03.openssl.asc - copied unchanged from r41353, head/share/security/advisories/FreeBSD-SA-13:03.openssl.asc projects/entities/share/security/advisories/FreeBSD-SA-13:04.bind.asc - copied unchanged from r41353, head/share/security/advisories/FreeBSD-SA-13:04.bind.asc projects/entities/share/security/patches/SA-13:01/ - copied from r41353, head/share/security/patches/SA-13:01/ projects/entities/share/security/patches/SA-13:02/ - copied from r41353, head/share/security/patches/SA-13:02/ projects/entities/share/security/patches/SA-13:03/ - copied from r41353, head/share/security/patches/SA-13:03/ projects/entities/share/security/patches/SA-13:04/ - copied from r41353, head/share/security/patches/SA-13:04/ Modified: projects/entities/share/pgpkeys/beech.key (contents, props changed) projects/entities/share/pgpkeys/des.key projects/entities/share/pgpkeys/pgpkeys-developers.xml projects/entities/share/pgpkeys/pgpkeys.ent projects/entities/share/xml/advisories.xml projects/entities/share/xml/authors.ent projects/entities/share/xml/commercial.consult.xml projects/entities/share/xml/navibar.ent projects/entities/share/xml/news.xml projects/entities/share/xml/press.xml projects/entities/share/xml/release.ent Directory Properties: projects/entities/share/ (props changed) Modified: projects/entities/share/pgpkeys/beech.key ============================================================================== --- projects/entities/share/pgpkeys/beech.key Tue Apr 2 22:58:24 2013 (r41353) +++ projects/entities/share/pgpkeys/beech.key Wed Apr 3 00:01:08 2013 (r41354) @@ -1,35 +1,50 @@ -sub 1024g/F1FD1C3D 2011-08-29 +sub 2048g/960F45D9 2013-02-26 ]]> Modified: projects/entities/share/pgpkeys/des.key ============================================================================== --- projects/entities/share/pgpkeys/des.key Tue Apr 2 22:58:24 2013 (r41353) +++ projects/entities/share/pgpkeys/des.key Wed Apr 3 00:01:08 2013 (r41354) @@ -1,288 +1,232 @@ uid Dag-Erling Smørgrav uid Dag-Erling Smørgrav -uid Dag-Erling Smørgrav -uid [jpeg image of size 3315] -sub 2048g/920C3313 2006-11-11 [expires: 2012-12-31] +uid [jpeg image of size 4779] +sub 4096R/F4DE87F5 2013-02-15 [expires: 2015-01-01] ]]> Copied: projects/entities/share/pgpkeys/girgen.key (from r41353, head/share/pgpkeys/girgen.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/pgpkeys/girgen.key Wed Apr 3 00:01:08 2013 (r41354, copy of r41353, head/share/pgpkeys/girgen.key) @@ -0,0 +1,237 @@ + + + +uid [jpeg image of size 8260] +uid Palle Girgensohn +sub 2048R/6BC41243 2012-02-23 [expires: 2016-02-23] +]]> + Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml ============================================================================== --- projects/entities/share/pgpkeys/pgpkeys-developers.xml Tue Apr 2 22:58:24 2013 (r41353) +++ projects/entities/share/pgpkeys/pgpkeys-developers.xml Wed Apr 3 00:01:08 2013 (r41354) @@ -551,6 +551,11 @@ &pgpkey.pfg; + + &a.girgen; + &pgpkey.girgen; + + &a.pgollucci.email; &pgpkey.pgollucci; @@ -1516,6 +1521,11 @@ &pgpkey.matthew; + + &a.tmseck; + &pgpkey.tmseck; + + &a.stas.email; &pgpkey.stas; Modified: projects/entities/share/pgpkeys/pgpkeys.ent ============================================================================== --- projects/entities/share/pgpkeys/pgpkeys.ent Tue Apr 2 22:58:24 2013 (r41353) +++ projects/entities/share/pgpkeys/pgpkeys.ent Wed Apr 3 00:01:08 2013 (r41354) @@ -134,6 +134,7 @@ + @@ -375,6 +376,7 @@ + Copied: projects/entities/share/pgpkeys/tmseck.key (from r41353, head/share/pgpkeys/tmseck.key) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/pgpkeys/tmseck.key Wed Apr 3 00:01:08 2013 (r41354, copy of r41353, head/share/pgpkeys/tmseck.key) @@ -0,0 +1,49 @@ + + + +uid Thomas-Martin Seck (Privat) +uid Thomas-Martin Seck (FreeBSD) +sub 2048g/3DC33B0F 2000-11-22 +]]> + Copied: projects/entities/share/security/advisories/FreeBSD-SA-13:01.bind.asc (from r41353, head/share/security/advisories/FreeBSD-SA-13:01.bind.asc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/entities/share/security/advisories/FreeBSD-SA-13:01.bind.asc Wed Apr 3 00:01:08 2013 (r41354, copy of r41353, head/share/security/advisories/FreeBSD-SA-13:01.bind.asc) @@ -0,0 +1,122 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +============================================================================= +FreeBSD-SA-13:01.bind Security Advisory + The FreeBSD Project + +Topic: BIND remote DoS with deliberately crafted DNS64 query + +Category: contrib +Module: bind +Announced: 2013-02-19 +Affects: FreeBSD 9.x and later +Corrected: 2013-01-08 09:05:09 UTC (stable/9, 9.1-STABLE) + 2013-02-19 13:27:20 UTC (releng/9.0, 9.0-RELEASE-p6) + 2013-02-19 13:27:20 UTC (releng/9.1, 9.1-RELEASE-p1) +CVE Name: CVE-2012-5688 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit . + +I. Background + +BIND 9 is an implementation of the Domain Name System (DNS) protocols. +The named(8) daemon is an Internet Domain Name Server. + +DNS64 is an IPv6 transition mechanism that will return a synthesized +AAAA response even if there is only an A record available. + +II. Problem Description + +Due to a software defect a crafted query can cause named(8) to crash +with an assertion failure. + +III. Impact + +If named(8) is configured to use DNS64, an attacker who can send it a +query can cause named(8) to crash, resulting in a denial of service. + +IV. Workaround + +No workaround is available, but systems not configured to use DNS64 +using the "dns64" configuration statement are not vulnerable. DNS64 +is not enabled in the default configuration on FreeBSD. + +V. Solution + +Perform one of the following: + +1) Upgrade your vulnerable system to a supported FreeBSD stable or +release / security branch (releng) dated after the correction date. + +Restart the named(8) daemon, or reboot your system. + +2) To update your vulnerable system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +# fetch http://security.FreeBSD.org/patches/SA-13:01/bind.patch +# fetch http://security.FreeBSD.org/patches/SA-13:01/bind.patch.asc +# gpg --verify bind.patch.asc + +b) Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +Recompile the operating system using buildworld and installworld as *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Apr 3 00:01:37 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 822F1BAE; Wed, 3 Apr 2013 00:01:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7283065D; Wed, 3 Apr 2013 00:01:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3301bqO003139; Wed, 3 Apr 2013 00:01:37 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3301YOR003115; Wed, 3 Apr 2013 00:01:34 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201304030001.r3301YOR003115@svn.freebsd.org> From: Glen Barber Date: Wed, 3 Apr 2013 00:01:34 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41355 - in projects/entities/en_US.ISO8859-1: articles/bsdl-gpl articles/casestudy-argentina.com articles/committers-guide articles/compiz-fusion articles/contributors articles/freebsd... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 00:01:37 -0000 Author: gjb Date: Wed Apr 3 00:01:34 2013 New Revision: 41355 URL: http://svnweb.freebsd.org/changeset/doc/41355 Log: MFH: - Merged /head/en_US.ISO8859-1:r40992-41353 Approved by: doceng (implicit) Added: projects/entities/en_US.ISO8859-1/books/porters-handbook/uses.xml - copied unchanged from r41353, head/en_US.ISO8859-1/books/porters-handbook/uses.xml projects/entities/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml - copied unchanged from r41353, head/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml - copied unchanged from r41353, head/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml - copied unchanged from r41353, head/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml projects/entities/en_US.ISO8859-1/htdocs/releases/8.4R/ - copied from r41353, head/en_US.ISO8859-1/htdocs/releases/8.4R/ Deleted: projects/entities/en_US.ISO8859-1/htdocs/availability.xml projects/entities/en_US.ISO8859-1/htdocs/vendors.html Modified: projects/entities/en_US.ISO8859-1/articles/bsdl-gpl/article.xml projects/entities/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml projects/entities/en_US.ISO8859-1/articles/compiz-fusion/article.xml projects/entities/en_US.ISO8859-1/articles/contributors/article.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml projects/entities/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml projects/entities/en_US.ISO8859-1/articles/freebsd-questions/article.xml projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml projects/entities/en_US.ISO8859-1/articles/geom-class/article.xml projects/entities/en_US.ISO8859-1/articles/hubs/article.xml projects/entities/en_US.ISO8859-1/articles/p4-primer/article.xml projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml projects/entities/en_US.ISO8859-1/articles/pr-guidelines/article.xml projects/entities/en_US.ISO8859-1/articles/releng/article.xml projects/entities/en_US.ISO8859-1/articles/wp-toolbox/article.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/book.xml projects/entities/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml projects/entities/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml projects/entities/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml projects/entities/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml projects/entities/en_US.ISO8859-1/books/faq/book.xml projects/entities/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/entities/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml projects/entities/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/audit/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/book.xml projects/entities/en_US.ISO8859-1/books/handbook/config/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/install/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/introduction/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/l10n/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/printing/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/security/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/users/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/vinum/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml projects/entities/en_US.ISO8859-1/books/handbook/x11/chapter.xml projects/entities/en_US.ISO8859-1/books/porters-handbook/Makefile projects/entities/en_US.ISO8859-1/books/porters-handbook/book.xml projects/entities/en_US.ISO8859-1/htdocs/Makefile projects/entities/en_US.ISO8859-1/htdocs/about.xml projects/entities/en_US.ISO8859-1/htdocs/administration.xml projects/entities/en_US.ISO8859-1/htdocs/advocacy/index.xml projects/entities/en_US.ISO8859-1/htdocs/cgi/query-pr.cgi projects/entities/en_US.ISO8859-1/htdocs/developers/cvs.xml projects/entities/en_US.ISO8859-1/htdocs/docs/books.xml projects/entities/en_US.ISO8859-1/htdocs/features.xml projects/entities/en_US.ISO8859-1/htdocs/gnome/index.xsl projects/entities/en_US.ISO8859-1/htdocs/index.xsl projects/entities/en_US.ISO8859-1/htdocs/internal/Makefile projects/entities/en_US.ISO8859-1/htdocs/internal/README.mirror (contents, props changed) projects/entities/en_US.ISO8859-1/htdocs/internal/about.xml projects/entities/en_US.ISO8859-1/htdocs/internal/fortunes.xml projects/entities/en_US.ISO8859-1/htdocs/internal/mirror.xml projects/entities/en_US.ISO8859-1/htdocs/internal/new-account.xml projects/entities/en_US.ISO8859-1/htdocs/layout/css/layout.css projects/entities/en_US.ISO8859-1/htdocs/news/2012-compromise.xml projects/entities/en_US.ISO8859-1/htdocs/news/status/Makefile projects/entities/en_US.ISO8859-1/htdocs/news/status/README projects/entities/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml projects/entities/en_US.ISO8859-1/htdocs/news/status/status.xml projects/entities/en_US.ISO8859-1/htdocs/platforms/amd64.xml projects/entities/en_US.ISO8859-1/htdocs/projects/newbies.xml projects/entities/en_US.ISO8859-1/htdocs/projects/projects.xml projects/entities/en_US.ISO8859-1/htdocs/releases/Makefile projects/entities/en_US.ISO8859-1/htdocs/releases/index.xml projects/entities/en_US.ISO8859-1/htdocs/releng/charter.xml projects/entities/en_US.ISO8859-1/htdocs/releng/index.xml projects/entities/en_US.ISO8859-1/htdocs/search/sitemap.xml projects/entities/en_US.ISO8859-1/htdocs/security/security.xml projects/entities/en_US.ISO8859-1/htdocs/where.xml projects/entities/en_US.ISO8859-1/share/xml/release.l10n.ent (contents, props changed) Directory Properties: projects/entities/en_US.ISO8859-1/ (props changed) Modified: projects/entities/en_US.ISO8859-1/articles/bsdl-gpl/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/bsdl-gpl/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/bsdl-gpl/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -23,7 +23,6 @@ &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.general; Modified: projects/entities/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -22,7 +22,6 @@ &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.xfree86; &tm-attrib.general; Modified: projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -33,7 +33,6 @@ &tm-attrib.freebsd; &tm-attrib.coverity; - &tm-attrib.cvsup; &tm-attrib.ibm; &tm-attrib.intel; &tm-attrib.sparc; @@ -316,9 +315,16 @@ r300894. There are mechanisms in place to automatically merge - changes back from the Subversion repository to the - CVS one, so regular users should not notice - a difference, however developers most certainly will. + changes back from the Subversion src + repository to the CVS repository for + some &os; branches (releng/6 through + releng/9), however this is purely to + support pre-existing end-user installs and should not be + relied upon, recommended or advertised. Future branches + will not be exported to CVS at all. The + ports repository was exported to CVS + for a period of time to aid end user migration, but as of + 28th February 2013 is no longer exported. Subversion is not that different from CVS when it comes to daily use, but there @@ -444,11 +450,11 @@ Checkout from a Mirror - You can check out a working copy from a mirror by simply + Check out a working copy from a mirror by substituting the mirror's URL for svn+ssh://svn.freebsd.org/base. This can - be an official mirror or a mirror you maintain yourself - using svnsync or similar. + be an official mirror or a mirror maintained by + using svnsync. There is a serious disadvantage to this method: every time something is to be committed, a svn switch @@ -459,8 +465,8 @@ the same UUID, some hacking of the local repository's UUID has to occur before it is possible to start using it. - Unlike with CVS and - csup, the hassle of a local + Unlike with CVS, + the hassle of a local svnsync mirror probably is not worth it unless the network connectivity situation or other factors demand it. If it is needed, see the end of this chapter for @@ -481,10 +487,16 @@ For the base repository, HEAD refers to the -CURRENT tree. For example, head/bin/ls is what would go into /usr/src/bin/ls in a - release. Some other key locations are: + release. Some key locations are: + /head/ + which corresponds to HEAD, also known as + -CURRENT. + + + /stable/n which corresponds to RELENG_n. @@ -678,10 +690,14 @@ It is possible to anonymously check out the &os; repository with Subversion. This will give access to a read-only tree that can be updated, but not committed - to. To do this, use one of the following commands: + to. To do this, use the following command: - &prompt.user; svn co svn://svn.freebsd.org/base/head /usr/src -&prompt.user; svn co http://svn.freebsd.org/base/head /usr/src + &prompt.user; svn co https://svn0.us-west.FreeBSD.org/base/head /usr/src + + Select the closest mirror and verify the mirror server + certificate from the list of Subversion + mirror sites. @@ -2295,32 +2311,19 @@ ControlPersist yes You can run a local copy of GNATS, and then integrate the FreeBSD - GNATS tree in to it using CVSup. Then you can run GNATS commands - locally. - This lets you query the PR database without needing to be connected to - the Internet. + GNATS tree by creating an rsync mirror. + Then you can run GNATS commands locally, allowing you to query the PR + database without an Internet connection. Mirroring the GNATS Tree - It is possible to mirror the GNATS database by adding this line - to your supfile. Note that since - GNATS is not under CVS control it has no tag, so if you are adding - it to your existing supfile it should appear - before any tag= entry as these remain active once set. - - gnats release=current prefix=/usr - - This will place the FreeBSD GNATS tree in - /usr/gnats. You can use a - refuse file to control which categories to - receive. For example, to only receive docs PRs, - put this line in - /usr/local/etc/cvsup/sup/refuse - The precise path depends on the *default - base setting in your - supfile. - . + It is possible to mirror the GNATS database by installing + net/rsync, and + executing: + + &prompt.user; rsync -va rsync://bit0.us-west.freebsd.org/FreeBSD-bit/gnats . + @@ -3702,7 +3705,7 @@ ControlPersist yes specifically permitted by portmgr. Complete details about what qualifies as a sweeping change can be found on the Portmgr + url="&url.base;/portmgr/implementation.html">Portmgr Implementation page. The benefit of a slush as opposed to a complete Modified: projects/entities/en_US.ISO8859-1/articles/compiz-fusion/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/compiz-fusion/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/compiz-fusion/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -138,9 +138,7 @@ Make sure to update your ports tree using your favorite method - (like csup, - CVSup or - portsnap) before you install any + (e.g., portsnap) before you install any application from the ports system. Graphics drivers and the desktop effects programs are under heavy development, and are updated regularly. Modified: projects/entities/en_US.ISO8859-1/articles/contributors/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/contributors/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -15,7 +15,6 @@ &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.sun; &tm-attrib.general; Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -843,6 +843,11 @@ + Andrew Romanenko + melanhit@gmail.com + + + Andrew S. Midthune amidthune@cableone.net @@ -3572,6 +3577,11 @@ + Greg Kennedy + kennedy.greg@gmail.com + + + Greg Robinson greg@rosevale.com.au @@ -4404,6 +4414,11 @@ + Javad Kouhi + javad.kouhi@gmail.com + + + Javier Martin Rueda jmrueda@diatel.upm.es @@ -4908,6 +4923,11 @@ + John Mehr + jcm@visi.com + + + John Merryweather Cooper jmcoopr@webmail.bmi.net @@ -5327,6 +5347,11 @@ + Kai Wang + kaiwang27@gmail.com + + + Kaleb S. Keithley kaleb@ics.com @@ -7334,6 +7359,11 @@ + Nikolai Lifanov + lifanov@mail.lifanov.com + + + Nikos Kokkalis nickkokkalis@gmail.com @@ -7384,6 +7414,11 @@ + Nikola Kolev + koue@chaosophia.net + + + Nikos Ntarmos ntarmos@ceid.upatras.gr @@ -10073,11 +10108,6 @@ - Thomas-Martin Seck - tmseck@netcologne.de - - - Thorsten Greiner thorsten@tgreiner.net @@ -10243,6 +10273,11 @@ + Tomasz Walaszek + tmwalaszek@gmail.com + + + Tomaz Muraus kami@k5-storitve.net @@ -10378,6 +10413,11 @@ + Tzanetos Balitsaris + tzabal@it.teithe.gr + + + UMENO Takashi umeno@rr.iij4u.or.jp @@ -10684,6 +10724,11 @@ + Waitman Gobble + waitman@waitman.net + + + Walt Howard howard@ee.utah.edu Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -524,6 +524,10 @@ + &a.smh.email; + + + &a.ehaupt.email; @@ -1304,6 +1308,10 @@ + &a.tmseck.email; + + + &a.hselasky.email; Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -2,24 +2,29 @@ + - &a.wilko.email; (2000 - 2012) + &a.randi.email; (2010 - 2012) - &a.dougb.email; (2000 - 2012) + &a.zack.email; (2010 - 2012) - &a.murray.email; (2000 - 2012) + &a.erik.email; (2008 - 2012) - &a.steve.email; (1996 - 2012) + &a.carvay.email; (2008 - 2012) - &a.erik.email; (2008 - 2012) + &a.lulf.email; (2007 - 2012) + + + + &a.mnag.email; (2005 - 2012) @@ -27,15 +32,19 @@ - &a.mnag.email; (2005 - 2012) + Doug Barton (2000 - 2012) - &a.lulf.email; (2007 - 2012) + &a.wilko.email; (2000 - 2012) - &a.niels.email; (2004 - 2011) + &a.murray.email; (2000 - 2012) + + + + &a.steve.email; (1996 - 2012) @@ -63,6 +72,10 @@ + &a.niels.email; (2004 - 2011) + + + &a.sergei.email; (2003 - 2011) @@ -71,6 +84,10 @@ + &a.mux.email; (2002 - 2011) + + + &a.hm.email; (1998 - 2011) @@ -87,6 +104,10 @@ + &a.cbzimmer.email; (2009 - 2010) + + + &a.bushman.email; (2007 - 2010) @@ -207,6 +228,10 @@ + &a.kishore.email; (2007 - 2008) + + + &a.twinterg.email; (2006 - 2008) @@ -259,6 +284,10 @@ + &a.sah.email; (2004 - 2008) + + + &a.rsm.email; (2003 - 2008) @@ -271,6 +300,10 @@ + &a.matk.email; (2003 - 2008) + + + &a.seanc.email; (2002 - 2008) @@ -339,6 +372,10 @@ + &a.shige.email; (1999 - 2008) + + + &a.hosokawa.email; (1998 - 2008) @@ -479,6 +516,10 @@ + &a.am.email; (2003 - 2006) + + + &a.scop.email; (2002 - 2006) @@ -499,6 +540,10 @@ + &a.keichii.email; (2001 - 2006) + + + &a.ue.email; (2001 - 2006) Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -3,6 +3,14 @@ + &a.beat.email; (2011 - 2013) + + + + &a.linimon.email; (2004 - 2013) + + + &a.pav.email; (2006 - 2012) Modified: projects/entities/en_US.ISO8859-1/articles/freebsd-questions/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/freebsd-questions/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/freebsd-questions/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -22,7 +22,6 @@ &tm-attrib.freebsd; &tm-attrib.microsoft; - &tm-attrib.netscape; &tm-attrib.opengroup; &tm-attrib.qualcomm; &tm-attrib.general; @@ -312,10 +311,6 @@ your options page that will email your c - cc:Mail - - - &eudora; @@ -328,22 +323,11 @@ your options page that will email your c - µsoft; Internet Mail - - - µsoft; &outlook; - - - &netscape; - - As you can see, the mailers in the Microsoft world are frequent - offenders. If at all possible, use a &unix; mailer. If you must use a - mailer under Microsoft environments, make sure it is set up - correctly. Try not to use MIME: a lot of people + Try not to use MIME: a lot of people use mailers which do not get on very well with MIME. Modified: projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/freebsd-update-server/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -22,6 +22,7 @@ 2009 2010 2011 + 2013 Jason Helfman @@ -40,8 +41,8 @@ This article describes building an internal &fbus.ap;. The freebsd-update-server software - is written by &a.cperciva.email;, current Security Officer of &os;. + url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server + is written by &a.cperciva.email;, Security Officer Emeritus of &os;. For users that think it is convenient to update their systems against an official update server, building their own &fbus.ap; may help to extend its functionality by supporting manually-tweaked @@ -118,11 +119,11 @@ Configuration: Installation & Setup Download the freebsd-update-server - software as a tar archive, - or use &man.csup.1; and the projects-all - collection. + url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/"> + freebsd-update-server software by installing devel/subversion , and execute: + + &prompt.user; svn co http://svn.freebsd.org/base/user/cperciva/freebsd-update-build freebsd-update-server Update scripts/build.conf appropriately. It is sourced during all build operations. @@ -353,9 +354,9 @@ world|base|/usr/lib/libalias_ftp.a During this second build cycle, the network time protocol - daemon, &man.ntpd.8;, is turned off. Per &a.cperciva.email;, current - Security Officer of &os;, "the freebsd-update-server + daemon, &man.ntpd.8;, is turned off. Per &a.cperciva.email;, + Security Officer Emeritus of &os;, "the freebsd-update-server build code needs to identify timestamps which are stored in files so that they can be ignored when comparing builds to determine which files need to be updated. This timestamp-finding works by doing two @@ -778,7 +779,6 @@ the new builds. } - Adding flags to buildworld and @@ -801,28 +801,12 @@ the new builds. - - - - - Create a firewall - rule to block outgoing RST packets. Due to a bug noted in a posting - on the &a.stable; in April 2009, there may be - time-outs and failures when updating a system. - - - - Create an appropriate DNS SRV record for the update server, and put others behind it with variable weights. Using this facility will provide update - mirrors. + mirrors, however this tip is not necessary unless you wish to + provide a redundant service. _http._tcp.update.myserver.com. IN SRV 0 2 80 host1.myserver.com. SRV 0 1 80 host2.myserver.com. Modified: projects/entities/en_US.ISO8859-1/articles/geom-class/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/geom-class/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/geom-class/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -22,7 +22,6 @@ &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.general; Modified: projects/entities/en_US.ISO8859-1/articles/hubs/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/hubs/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/hubs/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -780,13 +780,6 @@ cvspserver stream tcp nowait root /usr/b - Look at available mirrors in your country. - The FreeBSD - Mirror Database can help you with this. - - - - Check for those which provide fastest access (number of hops, round-trip-times) and offer the services you intend to Modified: projects/entities/en_US.ISO8859-1/articles/p4-primer/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/p4-primer/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/p4-primer/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -37,7 +37,7 @@ The &os; project uses the Perforce version control system to manage experimental projects that are - not ready for the main CVS repository. + not ready for the main Subversion repository. Availability, Documentation, and Resources @@ -68,9 +68,9 @@ The &os; Perforce server is hosted on perforce.freebsd.org, port 1666. The repository is browsable - online at . + online at . Some portions of the repository are also automatically exported - to a number of CVSup servers. + to a number of legacy CVSup servers. @@ -334,7 +334,8 @@ with &os;. Frequent submits of changes to the server are also encouraged. - The Perforce repository (the + sSimilar to Subversion, the + Perforce repository (the depot) is a single flat tree. Every file, whether a unique creation or a derivative from a branch, is accessible via a simple path under the server - Interactions between &os; CVS and Perforce + Interactions between &os; Subversion and Perforce - The &os; Perforce and CVS - repositories are completely separate. However, changes to CVS are + The &os; Perforce and Subversion + repositories are completely separate. However, changes to Subversion are tracked at near-real-time in Perforce. - Every 2 minutes, the CVS server is polled for updates in the HEAD + Every 2 minutes, the Subversion server is polled for updates in the HEAD branch, and those updates are committed to Perforce in the //depot/vendor/freebsd/... tree. This @@ -822,10 +823,10 @@ should be done so that your tree stays up to date and avoids conflicts with mainline development. - The bridge between CVS and Perforce - is one-way; changes to CVS will be reflected in + The bridge between Subversion and Perforce + is one-way; changes to Subversion will be reflected in Perforce, but changes in Perforce will - not be reflected in CVS. On request, some parts of the + not be reflected in Subversion. On request, some parts of the Perforce repo can be exported to CVSup and made available for distribution that way. Contact the &os; Modified: projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml Wed Apr 3 00:01:08 2013 (r41354) +++ projects/entities/en_US.ISO8859-1/articles/portbuild/article.xml Wed Apr 3 00:01:34 2013 (r41355) @@ -631,19 +631,19 @@ PKG_BIN=/usr/local/sbin/pkg Update the i386-7 tree and do a complete build - &prompt.user; dopackages.wrapper i386 7 -nosrc -norestr -nofinish + &prompt.user; dopackages.wrapper i386 8 latest -nosrc -norestr -nofinish Restart an interrupted amd64-8 build without updating - &prompt.user; dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish + &prompt.user; dopackages.wrapper amd64 8 latest -nosrc -noports -norestr -continue -noindex -noduds -nofinish - Post-process a completed sparc64-7 tree + Post-process a completed sparc64-8 tree - &prompt.user; dopackages.wrapper sparc64 7 -finish + &prompt.user; dopackages.wrapper sparc64 8 -finish Hint: it is usually best to run the dopackages @@ -1361,7 +1361,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 The following command will set up the control branch for the partial build: - &prompt.user; /a/portbuild/scripts/dopackages.wrapper i386 8 -noportsvcs -nobuild -novcs -nofinish + &prompt.user; /a/portbuild/scripts/dopackages.wrapper i386 8 latest -noportsvcs -nobuild -novcs -nofinish The builds must be performed from the @@ -1501,6 +1501,14 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 command is no longer used. + + + Decide if you will be using a local + squid cache on the client, + instead of the server. It is more efficient to run it + on the server. If you are doing that, skip the "squid" + steps below.) + @@ -1627,12 +1635,21 @@ options NFSSERVER - Also add the following users: + If you are using ganglia + for monitoring, add the following user: - squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh -ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh + ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh - Add them to etc/group as well. + Add it to etc/group as well. + + + + If you are using a local squid + cache on the client, add the following user: + + squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh + + Add it to etc/group as well. @@ -1682,13 +1699,19 @@ nfs_client_enable="YES" ntpd_enable="YES" sendmail_enable="NONE" sshd_enable="YES" -sshd_program="/usr/local/sbin/sshd" +sshd_program="/usr/local/sbin/sshd" -gmond_enable="YES" -squid_enable="YES" -squid_chdir="/usr2/squid/logs" -squid_pidfile="/usr2/squid/logs/squid.pid" + If you are using ganglia + for monitoring, add the following + + gmond_enable="YES" + If you are using a local squid + cache on the client, add the following + + squid_enable="YES" +squid_chdir="/a/squid/logs" +squid_pidfile="/a/squid/logs/squid.pid" Required entries for VMWare-based nodes: vmware_guest_vmmemctl_enable="YES" @@ -1709,8 +1732,8 @@ sshd_program="/usr/local/sbin/sshd" gmond_enable="YES" squid_enable="YES" -squid_chdir="/usr2/squid/logs" -squid_pidfile="/usr2/squid/logs/squid.pid" +squid_chdir="/a/squid/logs" +squid_pidfile="/a/squid/logs/squid.pid" &man.ntpd.8; should not be enabled for VMWare instances. @@ -1718,7 +1741,7 @@ squid_pidfile="/u Also, it may be possible to leave squid disabled by default so as to not have - /usr2 + /a persistent (which should save instantiation time.) Work is still ongoing. @@ -1733,7 +1756,7 @@ squid_pidfile="/u Modify etc/sysctl.conf: 9a10,30 -> kern.corefile=/usr2/%N.core +> kern.corefile=/a/%N.core > kern.sugid_coredump=1 > #debug.witness_ddb=0 > #debug.witness_watch=0 @@ -1774,13 +1797,21 @@ squid_pidfile="/u Install the following ports: net/rsync -security/openssh-portable (with HPN on) -security/sudo -sysutils/ganglia-monitor-core (with GMETAD off) -www/squid (with SQUID_AUFS on) +security/sudo + + You may also wish to install: + + security/openssh-portable (with HPN on) + + If you are using ganglia + for monitoring, install the following: + + sysutils/ganglia-monitor-core (with GMETAD off) + + If you are using a local squid + cache on the client, install the following - There is a WIP to create a meta-port, but it is not yet - complete. + www/squid31 (with SQUID_AUFS on) @@ -1801,7 +1832,8 @@ www/squid (with SQUID_AUFS on) - Modify + If you are using ganglia, + modify usr/local/etc/gmond.conf: 21,22c21,22 @@ -1832,7 +1864,7 @@ www/squid (with SQUID_AUFS on)/usr2 +scratchdir=/a ln -sf ${scratchdir}/portbuild /var/ @@ -1849,7 +1881,8 @@ touch /tmp/.boot_finished - Modify + If you are using a local squid + cache, modify, usr/local/etc/squid/squid.conf: 288,290c288,290 @@ -1924,8 +1957,12 @@ portbuild ALL=(ALL) NOPASSWD: ALL

&prompt.root; mkdir portbuild &prompt.root; chown portbuild:portbuild portbuild &prompt.root; mkdir pkgbuild -&prompt.root; chown portbuild:portbuild pkgbuild -&prompt.root; mkdir squid +&prompt.root; chown portbuild:portbuild pkgbuild + + If you are using a local squid + cache: + + &prompt.root; mkdir squid &prompt.root; mkdir squid/cache &prompt.root; mkdir squid/logs &prompt.root; chown -R squid:squid squid @@ -1946,7 +1983,8 @@ portbuild ALL=(ALL) NOPASSWD: ALL

- As root, initialize the squid + If you are using a local squid + cache, as root, initialize the squid directories: squid -z @@ -2033,8 +2071,6 @@ MASTER_SITE_OVERRIDE= \ Suggested values: disconnected=1 -http_proxy="http://localhost:3128/" -squid_dir=/usr2/squid scratchdir=/usr2/pkgbuild client_user=portbuild sudo_cmd="sudo -H" @@ -2043,6 +2079,18 @@ rsync_gzip=-z infoseek_host=localhost infoseek_port=${tunelled-tcp-port} + If you will be using squid + on the client: + + http_proxy="http://localhost:3128/" +squid_dir=/usr2/squid + + If, instead, you will be using squid + on the server: + + +http_proxy="http://servername:3128/" + Possible other values: use_md_swap=1 @@ -2064,7 +2112,8 @@ ssh_cmd="/usr/local/bin/ssh" - Add an appropriate data_source entry to + If you are using ganglia, + add an appropriate data_source entry to /usr/local/etc/gmetad.conf: data_source "arch/location Package Build Cluster" 30 hostname @@ -2110,7 +2159,7 @@ ssh_cmd="/usr/local/bin/ssh" This step needs to be taken by a portmgr - acting as root: *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Apr 3 00:07:06 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6244AC7E; Wed, 3 Apr 2013 00:07:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 531D9692; Wed, 3 Apr 2013 00:07:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33076bn003931; Wed, 3 Apr 2013 00:07:06 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33074BO003916; Wed, 3 Apr 2013 00:07:04 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201304030007.r33074BO003916@svn.freebsd.org> From: Glen Barber Date: Wed, 3 Apr 2013 00:07:04 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41356 - in projects/sysctl/en_US.ISO8859-1: articles/freebsd-questions books/faq books/handbook books/handbook/basics books/handbook/cutting-edge books/handbook/desktop books/handbook/... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 00:07:06 -0000 Author: gjb Date: Wed Apr 3 00:07:03 2013 New Revision: 41356 URL: http://svnweb.freebsd.org/changeset/doc/41356 Log: MFH: - Merged /head/en_US.ISO8859-1:r41328-41355 Approved by: doceng (implicit) Modified: projects/sysctl/en_US.ISO8859-1/articles/freebsd-questions/article.xml projects/sysctl/en_US.ISO8859-1/books/faq/book.xml projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/book.xml projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/x11/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml projects/sysctl/en_US.ISO8859-1/htdocs/security/security.xml Directory Properties: projects/sysctl/en_US.ISO8859-1/ (props changed) Modified: projects/sysctl/en_US.ISO8859-1/articles/freebsd-questions/article.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/articles/freebsd-questions/article.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/articles/freebsd-questions/article.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -22,7 +22,6 @@ &tm-attrib.freebsd; &tm-attrib.microsoft; - &tm-attrib.netscape; &tm-attrib.opengroup; &tm-attrib.qualcomm; &tm-attrib.general; @@ -312,10 +311,6 @@ your options page that will email your c - cc:Mail - - - &eudora; @@ -328,22 +323,11 @@ your options page that will email your c - µsoft; Internet Mail - - - µsoft; &outlook; - - - &netscape; - - As you can see, the mailers in the Microsoft world are frequent - offenders. If at all possible, use a &unix; mailer. If you must use a - mailer under Microsoft environments, make sure it is set up - correctly. Try not to use MIME: a lot of people + Try not to use MIME: a lot of people use mailers which do not get on very well with MIME. Modified: projects/sysctl/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/faq/book.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/faq/book.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -23,7 +23,7 @@ Frequently Asked Questions for &os; - &rel2.relx;, and &rel.relx; + &rel2.relx;, and &rel.relx; The &os; Documentation Project @@ -71,7 +71,7 @@ This is the FAQ for &os; versions &rel2.relx; and - &rel.relx;. Every effort has been made to make this FAQ as + &rel.relx;. Every effort has been made to make this FAQ as informative as possible; if you have any suggestions as to how it may be improved, please feel free to mail them to the &a.doc;. @@ -83,7 +83,7 @@ url="book.html">HTML file with HTTP or as a variety of other formats from the &os; FTP - server. + server. @@ -334,7 +334,7 @@ &rel2.relx; series was the one known as -STABLE. However, as of &rel.head.relx;, the - &rel2.relx;. branch will be designated for + &rel2.relx; branch will be designated for an extended support status and receive only fixes for major problems, such as security-related fixes. + @@ -4703,10 +4703,10 @@ options SYSVMSG # enable for How much free memory is available? - + There are a couple of kinds of free - memory. One kind is the amount of memory + memory. One kind is the amount of memory immediately available without paging anything else out. That is approximately the size of cache queue + size of free queue (with a derating factor, depending upon system @@ -4746,7 +4746,7 @@ options SYSVMSG # enable for I just changed /etc/newsyslog.conf. How can I check - if it does what I expect? + if it does what I expect? @@ -4793,7 +4793,7 @@ options SYSVMSG # enable for Many implementations are available for different architectures and operating systems. An implementation of the server-side code is properly known as an X - server. + server. @@ -4950,7 +4950,7 @@ EndSection - + My laptop has a Synaptics touchpad. Can I use it in X? @@ -5030,7 +5030,7 @@ EndSection (hold down Alt and press F2), and you will find a login prompt waiting for you on the second virtual - console! When you want to go back to the original + console! When you want to go back to the original session, do AltF1. @@ -5067,7 +5067,7 @@ ttyvb "/usr/libexec/getty Pc" cons25 terminal type, and not xterm. Existing entries in /etc/ttys can be used on which to - base new additions. + base new additions. @@ -5197,7 +5197,7 @@ ttyvb "/usr/libexec/getty Pc" Why do I get Couldn't open - console when I run + console when I run xconsole? @@ -5249,7 +5249,11 @@ ttyvb "/usr/libexec/getty Pc" If this happens, disable the synchronization check code by setting the driver flags for the PS/2 mouse driver to 0x100. This can be easiest achieved - by adding hint.psm.0.flags="0x100" to + by adding + + hint.psm.0.flags="0x100" + + to /boot/loader.conf and rebooting. @@ -5431,13 +5435,13 @@ Key F15 A A Menu Wo Diskless booting means that the &os; box is booted over a network, and reads the necessary files from a server instead of its hard disk. For full - details, please read the Handbook entry on diskless booting. - - + details, please read the Handbook entry on diskless booting. + + - - + + Can a &os; box be used as a dedicated network router? @@ -5522,7 +5526,7 @@ Key F15 A A Menu Wo If the alias is on the same subnet as an address already configured on the interface, then add netmask - 0xffffffff to your &man.ifconfig.8; command-line, + 0xffffffff to your &man.ifconfig.8; command-line, as in the following: &prompt.root; ifconfig ed0 alias 192.0.2.2 netmask 0xffffffff @@ -5609,7 +5613,7 @@ Key F15 A A Menu Wo Why do I get an error, Permission - denied, for all networking operations? + denied, for all networking operations? @@ -5712,7 +5716,7 @@ Key F15 A A Menu Wo Why do I get /dev/bpf0: device not - configured? + configured? @@ -5742,7 +5746,7 @@ Key F15 A A Menu Wo What are these messages about: Limiting - icmp/open port/closed port response in my log + icmp/open port/closed port response in my log files? @@ -5799,7 +5803,7 @@ Key F15 A A Menu Wo What are these arp: unknown hardware address - format error messages? + format error messages? @@ -5816,7 +5820,7 @@ Key F15 A A Menu Wo Why do I keep seeing messages like: 192.168.0.10 is on - fxp1 but got reply from 00:15:17:67:cf:82 on rl0, and how do I + fxp1 but got reply from 00:15:17:67:cf:82 on rl0, and how do I disable it? @@ -6414,7 +6418,7 @@ deny pred1 deflate deflate24 protocomp a Occasionally, just after connecting, you may see messages in the log that say Magic is - same. Sometimes, these messages are harmless, + same. Sometimes, these messages are harmless, and sometimes one side or the other exits. Most PPP implementations cannot survive this problem, and even if the link seems to come up, you will see repeated configure @@ -6639,7 +6643,7 @@ set dfilter 3 permit 0/0 0/0-bd -q30m, telling it to run the queue every 30 minutes) or until a sendmail - is done (perhaps from your + is done (perhaps from your ppp.linkup). @@ -7029,7 +7033,7 @@ ATDT1234567 This section answers common questions about serial communications with &os;. PPP is covered in the Networking section. + linkend="networking">Networking section. @@ -7473,7 +7477,7 @@ hint.sio.7.irq="12" He does not have one, and is just called the BSD - daemon. If you insist upon using a name, call him + daemon. If you insist upon using a name, call him beastie. Note that beastie is pronounced BSD. @@ -7547,7 +7551,7 @@ hint.sio.7.irq="12" long argument about whether &man.sleep.1; should take fractional second arguments, &a.phk; posted a long message entitled A bike shed (any color will do) on greener grass.... + url="http://www.FreeBSD.org/cgi/getmsg.cgi?fetch=506636+517178+/usr/local/www/db/text/1999/freebsd-hackers/19991003.freebsd-hackers">A bike shed (any color will do) on greener grass.... The appropriate portions of that message are quoted below. @@ -7561,11 +7565,11 @@ hint.sio.7.irq="12" It is a long story, or rather it is an old story, but it is quite short actually. C. Northcote Parkinson wrote a book in the early 1960s, called Parkinson's - Law, which contains a lot of insight into the + Law, which contains a lot of insight into the dynamics of management. [snip a bit of commentary on the - book] + book] In the specific example involving the bike shed, the other vital component is an atomic power-plant, I guess @@ -7594,10 +7598,10 @@ hint.sio.7.irq="12" here. In Denmark we call it setting your - fingerprint. It is about personal pride and + fingerprint. It is about personal pride and prestige, it is about being able to point somewhere and say There! I did - that. It is a strong trait in politicians, but + that. It is a strong trait in politicians, but present in most people given the chance. Just think about footsteps in wet cement. @@ -7699,7 +7703,7 @@ hint.sio.7.irq="12" Three to submit PRs about it, one of which is misfiled under doc and consists only of it's - dark; + dark; One to commit an untested lightbulb which breaks buildworld, then back it out five minutes later; @@ -7761,8 +7765,8 @@ hint.sio.7.irq="12" -chat and unsubscribe in protest; Thirteen to post unsubscribe, How - do I unsubscribe?, or Please remove me from - the list, followed by the usual footer; + do I unsubscribe?, or Please remove me from + the list, followed by the usual footer; One to commit a working lightbulb while everybody is too busy flaming everybody else to notice; @@ -7776,7 +7780,7 @@ hint.sio.7.irq="12" fairings; Nine (including the PR originators) to ask what - is MFC?; + is MFC?; Fifty-seven to complain about the lights being out two weeks after the bulb has been changed. @@ -7784,18 +7788,18 @@ hint.sio.7.irq="12" &a.nik; adds: I was laughing quite hard at - this. + this. And then I thought, Hang on, shouldn't - there be '1 to document it.' in that list - somewhere? + there be '1 to document it.' in that list + somewhere? And then I was enlightened - :-) + :-) &a.tabthorpe; says: None, - real &os; hackers are not afraid of the - dark! + real &os; hackers are not afraid of the + dark! @@ -7936,7 +7940,7 @@ hint.sio.7.irq="12" HEAD is not an actual branch tag, like the others; it is simply a symbolic constant for the current, non-branched development - stream which we simply refer to as + stream which we simply refer to as -CURRENT. Right now, -CURRENT is the @@ -8128,7 +8132,7 @@ panic: page fault it recover the crash dump to another directory where you have more room. It is possible to limit the size of the crash dump by using options - MAXMEM=N where + MAXMEM=N where N is the size of kernel's memory usage in KBs. For example, if you have 1 GB of RAM, you can limit the kernel's memory usage to Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -1869,7 +1869,6 @@ root 5211 0.0 0.2 3620 1724 2 298 p0 Ss 0:01.10 tcsh 7078 p0 S 2:40.88 xemacs mdoc.xsl (xemacs-21.1.14) 37393 p0 I 0:03.11 xemacs freebsd.dsl (xemacs-21.1.14) -48630 p0 S 2:50.89 /usr/local/lib/netscape-linux/navigator-linux-4.77.bi 72210 p0 R+ 0:00.00 ps 390 p1 Is 0:01.14 tcsh 7059 p2 Is+ 1:36.18 /usr/local/bin/mutt -y @@ -1922,7 +1921,6 @@ Swap: 256M Total, 38M Used, 217M Free, 1 7078 nik 2 0 15280K 10960K select 2:54 0.88% 0.88% xemacs-21.1.14 281 nik 2 0 18636K 7112K select 5:36 0.73% 0.73% XF86_SVGA 296 nik 2 0 3240K 1644K select 0:12 0.05% 0.05% xterm -48630 nik 2 0 29816K 9148K select 3:18 0.00% 0.00% navigator-linu 175 root 2 0 924K 252K select 1:41 0.00% 0.00% syslogd 7059 nik 2 0 7260K 4644K poll 1:38 0.00% 0.00% mutt ... @@ -1944,9 +1942,9 @@ Swap: 256M Total, 38M Used, 217M Free, 1 columns: one for total size and one for resident size. Total size is how much memory the application has needed and the resident size is how much it is actually using at the moment. - In this example, &netscape; has - required almost 30 MB of RAM, but is currently only using - 9 MB. + In this example, mutt has + required almost 8 MB of RAM, but is currently only using + 5 MB. &man.top.1; automatically updates the display every two seconds. A different interval can be specified with Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/book.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/book.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/book.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -71,7 +71,6 @@ &tm-attrib.m-systems; &tm-attrib.macromedia; &tm-attrib.microsoft; - &tm-attrib.netscape; &tm-attrib.nexthop; &tm-attrib.opengroup; &tm-attrib.oracle; Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -2617,7 +2617,7 @@ Script done, … &prompt.root; diff /etc/shells /var/tmp/root/etc/shells This command will show the differences between the - existing /etc/shellsand the new + existing /etc/shells and the new /var/tmp/root/etc/shells. Review the differences to decide whether to merge in custom changes or to replace the existing file with the new one. Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -200,9 +200,9 @@ For information on how to configure a multimedia - environment, refer to . For + environment, refer to . For information on how to set up and use electronic mail, refer to - . + . @@ -222,7 +222,7 @@ The KDE and GNOME desktop environments include - their own HTML browser. Refer to + their own HTML browser. Refer to for more information on how to set up these complete desktops. @@ -572,7 +572,7 @@ To install &java; plugin support, follow the instructions - in . + in . Once &java; support is installed, start Chromium, and enter Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -1741,6 +1741,15 @@ usr.bin/ + RELENG_9_1 + + + The release branch for &os;-9.1, used only for + security advisories and other critical fixes. + + + + RELENG_9_0 @@ -1759,6 +1768,15 @@ usr.bin/ + RELENG_8_4 + + + The release branch for &os;-8.4, used only for + security advisories and other critical fixes. + + + + RELENG_8_3 @@ -2097,6 +2115,14 @@ usr.bin/ + RELENG_9_1_0_RELEASE + + + &os; 9.1 + + + + RELENG_9_0_0_RELEASE Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -1292,7 +1292,7 @@ Deinstalling ca_root_nss-3.13.5... done< up-to-date Ports Collection and check for security issues related to your port. If ports-mgmt/portaudit) is + role="package">ports-mgmt/portaudit is installed, run portaudit -F before installing a new port, to fetch the current vulnerabilities database. A security audit and an update of the database Modified: projects/sysctl/en_US.ISO8859-1/books/handbook/x11/chapter.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/handbook/x11/chapter.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/handbook/x11/chapter.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -824,7 +824,7 @@ EndSection The default fonts that ship with X11 are less than ideal for typical desktop publishing applications. Large presentation fonts show up jagged and unprofessional looking, - and small fonts in &netscape; are + and small fonts are almost completely unintelligible. However, there are several free, high quality Type1 (&postscript;) fonts available which can be readily used with X11. For instance, the URW font @@ -921,9 +921,8 @@ EndSection or add a FontPath line to the xorg.conf file. - That's it. Now &netscape;, - Gimp, - &staroffice;, and all of the + That's it. Now Gimp, + Apache OpenOffice, and all of the other X applications should now recognize the installed &truetype; fonts. Extremely small fonts (as with text in a high resolution display on a web page) and extremely large Modified: projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -15410,6 +15410,19 @@ Reference: <http://www.freebsd.org/po + 804000 + March 28, 2013 + releng/8.4 (RELENG_8_4) branch point. + + + + 804500 + March 28, 2013 + 8.4-STABLE after branching releng/8.4 + (RELENG_8_4). + + + 900000 August 22, 2009 9.0-CURRENT. Modified: projects/sysctl/en_US.ISO8859-1/htdocs/security/security.xml ============================================================================== --- projects/sysctl/en_US.ISO8859-1/htdocs/security/security.xml Wed Apr 3 00:01:34 2013 (r41355) +++ projects/sysctl/en_US.ISO8859-1/htdocs/security/security.xml Wed Apr 3 00:07:03 2013 (r41356) @@ -276,13 +276,6 @@ last release + 2 years - RELENG_9_0 - 9.0-RELEASE - Normal - January 10, 2012 - March 31, 2013 - - RELENG_9_1 9.1-RELEASE Extended @@ -474,6 +467,13 @@ February 24, 2011 July 31, 2012 + + RELENG_9_0 + 9.0-RELEASE + Normal + January 10, 2012 + March 31, 2013 + From owner-svn-doc-projects@FreeBSD.ORG Wed Apr 3 00:07:29 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1702FCB8; Wed, 3 Apr 2013 00:07:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EEA45694; Wed, 3 Apr 2013 00:07:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3307SxH004024; Wed, 3 Apr 2013 00:07:28 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3307S7v004021; Wed, 3 Apr 2013 00:07:28 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201304030007.r3307S7v004021@svn.freebsd.org> From: Glen Barber Date: Wed, 3 Apr 2013 00:07:28 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41357 - in projects/sysctl/share: security/advisories security/patches/SA-13:03 security/patches/SA-13:04 xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 00:07:29 -0000 Author: gjb Date: Wed Apr 3 00:07:28 2013 New Revision: 41357 URL: http://svnweb.freebsd.org/changeset/doc/41357 Log: MFH: - Merged /head/share:r41328-41355 Approved by: doceng (implicit) Added: projects/sysctl/share/security/advisories/FreeBSD-SA-13:03.openssl.asc - copied unchanged from r41355, head/share/security/advisories/FreeBSD-SA-13:03.openssl.asc projects/sysctl/share/security/advisories/FreeBSD-SA-13:04.bind.asc - copied unchanged from r41355, head/share/security/advisories/FreeBSD-SA-13:04.bind.asc projects/sysctl/share/security/patches/SA-13:03/ - copied from r41355, head/share/security/patches/SA-13:03/ projects/sysctl/share/security/patches/SA-13:04/ - copied from r41355, head/share/security/patches/SA-13:04/ Modified: projects/sysctl/share/xml/advisories.xml Directory Properties: projects/sysctl/share/ (props changed) Copied: projects/sysctl/share/security/advisories/FreeBSD-SA-13:03.openssl.asc (from r41355, head/share/security/advisories/FreeBSD-SA-13:03.openssl.asc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/share/security/advisories/FreeBSD-SA-13:03.openssl.asc Wed Apr 3 00:07:28 2013 (r41357, copy of r41355, head/share/security/advisories/FreeBSD-SA-13:03.openssl.asc) @@ -0,0 +1,126 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +============================================================================= +FreeBSD-SA-13:03.openssl Security Advisory + The FreeBSD Project + +Topic: OpenSSL multiple vulnerabilities + +Category: contrib +Module: openssl +Announced: 2013-04-02 +Affects: All supported versions of FreeBSD. +Corrected: 2013-03-08 17:28:40 UTC (stable/8, 8.3-STABLE) + 2013-04-02 17:34:42 UTC (releng/8.3, 8.3-RELEASE-p7) + 2013-03-14 17:48:07 UTC (stable/9, 9.1-STABLE) + 2013-04-02 17:34:42 UTC (releng/9.0, 9.0-RELEASE-p7) + 2013-04-02 17:34:42 UTC (releng/9.1, 9.1-RELEASE-p2) +CVE Name: CVE-2013-0166, CVE-2013-0169 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit . + +I. Background + +FreeBSD includes software from the OpenSSL Project. The OpenSSL Project is +a collaborative effort to develop a robust, commercial-grade, full-featured +Open Source toolkit implementing the Secure Sockets Layer (SSL v2/v3) +and Transport Layer Security (TLS v1) protocols as well as a full-strength +general purpose cryptography library. + +II. Problem Description + +A flaw in the OpenSSL handling of OCSP response verification could be exploited +to cause a denial of service attack. [CVE-2013-0166] + +OpenSSL has a weakness in the handling of CBC ciphersuites in SSL, TLS and +DTLS. The weakness could reveal plaintext in a timing attack. [CVE-2013-0169] + +III. Impact + +The Denial of Service could be caused in the OpenSSL server application by +using an invalid key. [CVE-2013-0166] + +A remote attacker could recover sensitive information by conducting +an attack via statistical analysis of timing data with crafted packets. +[CVE-2013-0169] + +IV. Workaround + +No workaround is available. + +V. Solution + +Perform one of the following: + +1) Upgrade your vulnerable system to a supported FreeBSD stable or +release / security branch (releng) dated dated after the correction +date. + +2) To update your vulnerable system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +[FreeBSD 8.3 and 9.0] +# fetch http://security.FreeBSD.org/patches/SA-13:03/openssl.patch +# fetch http://security.FreeBSD.org/patches/SA-13:03/openssl.patch.asc +# gpg --verify openssl.patch.asc + +[FreeBSD 9.1] +# fetch http://security.FreeBSD.org/patches/SA-13:03/openssl-9.1.patch +# fetch http://security.FreeBSD.org/patches/SA-13:03/openssl-9.1.patch.asc +# gpg --verify openssl-9.1.patch.asc + +b) Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +Recompile the operating system using buildworld and installworld as +described in . + +Restart the all deamons using the library, or reboot your the system. + +3) To update your vulnerable system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the i386 or amd64 +platforms can be updated via the freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install + +VI. Correction details + +The following list contains the revision numbers of each file that was +corrected in FreeBSD. + +Branch/path Revision +- ------------------------------------------------------------------------- +stable/8/ r248057 +releng/8.3/ r249029 +stable/9/ r248272 +releng/9.0/ r249029 +releng/9.1/ r249029 +- ------------------------------------------------------------------------- + +VII. References + +CVE Name: +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-0169 +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-0166 + +The latest revision of this advisory is available at +http://security.FreeBSD.org/advisories/FreeBSD-SA-13:03.openssl.asc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (FreeBSD) + +iEYEARECAAYFAlFbGXYACgkQFdaIBMps37ISqACcCovc+NpuH57guiROqIbTfw3P +4RMAn22ppeZnRVfje8up3cyOx/D8CCmI +=rQqV +-----END PGP SIGNATURE----- Copied: projects/sysctl/share/security/advisories/FreeBSD-SA-13:04.bind.asc (from r41355, head/share/security/advisories/FreeBSD-SA-13:04.bind.asc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/share/security/advisories/FreeBSD-SA-13:04.bind.asc Wed Apr 3 00:07:28 2013 (r41357, copy of r41355, head/share/security/advisories/FreeBSD-SA-13:04.bind.asc) @@ -0,0 +1,112 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +============================================================================= +FreeBSD-SA-13:04.bind Security Advisory + The FreeBSD Project + +Topic: BIND remote denial of service + +Category: contrib +Module: bind +Announced: 2013-04-02 +Credits: Matthew Horsfall of Dyn, Inc. +Affects: FreeBSD 8.4-BETA1 and FreeBSD 9.x +Corrected: 2013-03-28 05:35:46 UTC (stable/8, 8.4-BETA1) + 2013-03-28 05:39:45 UTC (stable/9, 9.1-STABLE) + 2013-04-02 17:34:42 UTC (releng/9.0, 9.0-RELEASE-p7) + 2013-04-02 17:34:42 UTC (releng/9.1, 9.1-RELEASE-p2) +CVE Name: CVE-2013-2266 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit . + +I. Background + +BIND 9 is an implementation of the Domain Name System (DNS) protocols. +The named(8) daemon is an Internet Domain Name Server. The libdns +library is a library of DNS protocol support functions. + +II. Problem Description + +A flaw in a library used by BIND allows an attacker to deliberately +cause excessive memory consumption by the named(8) process. This +affects both recursive and authoritative servers. + +III. Impact + +A remote attacker can cause the named(8) daemon to consume all available +memory and crash, resulting in a denial of service. Applications linked +with the libdns library, for instance dig(1), may also be affected. + +IV. Workaround + +No workaround is available, but systems not running named(8) service +and not using base system DNS utilities are not affected. + +V. Solution + +Perform one of the following: + +1) Upgrade your vulnerable system to a supported FreeBSD stable or +release / security branch (releng) dated after the correction date. + +2) To update your vulnerable system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +# fetch http://security.FreeBSD.org/patches/SA-13:04/bind.patch +# fetch http://security.FreeBSD.org/patches/SA-13:04/bind.patch.asc +# gpg --verify bind.patch.asc + +b) Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +Recompile the operating system using buildworld and installworld as +described in . + +Restart the named daemon, or reboot the system. + +3) To update your vulnerable system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the i386 or amd64 +platforms can be updated via the freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install + +VI. Correction details + +The following list contains the revision numbers of each file that was +corrected in FreeBSD. + +Branch/path Revision +- ------------------------------------------------------------------------- +stable/8/ r248807 +stable/9/ r248808 +releng/9.0/ r249029 +releng/9.1/ r249029 +- ------------------------------------------------------------------------- + +VII. References + +https://kb.isc.org/article/AA-00871 + +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-2266 + +The latest revision of this advisory is available at +http://security.FreeBSD.org/advisories/FreeBSD-SA-13:04.bind.asc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (FreeBSD) + +iEYEARECAAYFAlFbGYYACgkQFdaIBMps37J4eACeNzJtWElzKJZCqXdzhrHEB+pu +1eoAn0oD7xcjoPOnB7H3xZbIeHldgGcI +=BX1M +-----END PGP SIGNATURE----- Modified: projects/sysctl/share/xml/advisories.xml ============================================================================== --- projects/sysctl/share/xml/advisories.xml Wed Apr 3 00:07:03 2013 (r41356) +++ projects/sysctl/share/xml/advisories.xml Wed Apr 3 00:07:28 2013 (r41357) @@ -8,6 +8,22 @@ 2013 + 4 + + + 2 + + + FreeBSD-SA-13:04.bind + + + + FreeBSD-SA-13:03.openssl + + + + + 2 From owner-svn-doc-projects@FreeBSD.ORG Wed Apr 3 08:51:20 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CA311349; Wed, 3 Apr 2013 08:51:20 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A4BF4DAB; Wed, 3 Apr 2013 08:51:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r338pKhX059865; Wed, 3 Apr 2013 08:51:20 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r338pKUQ059861; Wed, 3 Apr 2013 08:51:20 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201304030851.r338pKUQ059861@svn.freebsd.org> From: Rene Ladan Date: Wed, 3 Apr 2013 08:51:20 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41359 - in projects/entities/share: pgpkeys xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 08:51:20 -0000 Author: rene Date: Wed Apr 3 08:51:19 2013 New Revision: 41359 URL: http://svnweb.freebsd.org/changeset/doc/41359 Log: Small post-merge fixups. Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml projects/entities/share/xml/freebsd.ent Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml ============================================================================== --- projects/entities/share/pgpkeys/pgpkeys-developers.xml Wed Apr 3 08:47:11 2013 (r41358) +++ projects/entities/share/pgpkeys/pgpkeys-developers.xml Wed Apr 3 08:51:19 2013 (r41359) @@ -372,7 +372,7 @@ - &a.carl; + &a.carl.email; &pgpkey.carl; @@ -552,7 +552,7 @@ - &a.girgen; + &a.girgen.email; &pgpkey.girgen; @@ -947,7 +947,7 @@ - &a.dru; + &a.dru.email; &pgpkey.dru; @@ -997,7 +997,7 @@ - &a.achim; + &a.achim.email; &pgpkey.achim; @@ -1037,7 +1037,7 @@ - &a.pclin; + &a.pclin.email; &pgpkey.pclin; @@ -1252,7 +1252,7 @@ - &a.dbn; + &a.dbn.email; &pgpkey.dbn; @@ -1522,7 +1522,7 @@ - &a.tmseck; + &a.tmseck.email; &pgpkey.tmseck; Modified: projects/entities/share/xml/freebsd.ent ============================================================================== --- projects/entities/share/xml/freebsd.ent Wed Apr 3 08:47:11 2013 (r41358) +++ projects/entities/share/xml/freebsd.ent Wed Apr 3 08:51:19 2013 (r41359) @@ -98,9 +98,6 @@ used in both environments. - - - [ OK ]"> [ Cancel ]"> From owner-svn-doc-projects@FreeBSD.ORG Wed Apr 3 10:56:15 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E8DF438D; Wed, 3 Apr 2013 10:56:15 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CBA98630; Wed, 3 Apr 2013 10:56:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33AuFTe095843; Wed, 3 Apr 2013 10:56:15 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33AuFQK095841; Wed, 3 Apr 2013 10:56:15 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304031056.r33AuFQK095841@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 3 Apr 2013 10:56:15 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41361 - in projects/xml-tools/share: mk xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 10:56:16 -0000 Author: gabor Date: Wed Apr 3 10:56:14 2013 New Revision: 41361 URL: http://svnweb.freebsd.org/changeset/doc/41361 Log: - Allow foreign elements in Schematron - Add some embedded XSLT to improve the input of validation failures Modified: projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/xml/freebsd.sch Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Wed Apr 3 09:05:13 2013 (r41360) +++ projects/xml-tools/share/mk/doc.docbook.mk Wed Apr 3 10:56:14 2013 (r41361) @@ -338,7 +338,7 @@ NO_RTF= yes schxslts+= ${sch}.xsl ${sch}.xsl: ${sch} - ${XSLTPROC} ${XSLSCH} ${.ALLSRC} > ${.TARGET} + ${XSLTPROC} --param allow-foreign "true" ${XSLSCH} ${.ALLSRC} > ${.TARGET} .endfor .endif Modified: projects/xml-tools/share/xml/freebsd.sch ============================================================================== --- projects/xml-tools/share/xml/freebsd.sch Wed Apr 3 09:05:13 2013 (r41360) +++ projects/xml-tools/share/xml/freebsd.sch Wed Apr 3 10:56:14 2013 (r41361) @@ -2,11 +2,17 @@ - + - Image references cannot have an extension; the proper format is inferred by the output type to generate. - Image format must not be specified; it is inferred by the output type to generate. + Image reference () cannot have an extension; the proper format is inferred by the output type to generate. + Image reference () format must not be specified; it is inferred by the output type to generate. + + + + + + Link () element must have a content; or use xref to auto-generate the linking text. @@ -20,10 +26,10 @@ - The edition attribute can only be set to 'online' or "print". + Invalid edition value (); must be either 'online' or "print". - The os attribute can only be set to 'freebsd8', 'freebsd9' or 'freebsd10'. + Invalid os value (); must be either 'freebsd8', 'freebsd9' or 'freebsd10'. From owner-svn-doc-projects@FreeBSD.ORG Wed Apr 3 11:33:22 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 43C85611; Wed, 3 Apr 2013 11:33:22 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 339B180D; Wed, 3 Apr 2013 11:33:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33BXM1b007729; Wed, 3 Apr 2013 11:33:22 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33BXIJf007704; Wed, 3 Apr 2013 11:33:18 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304031133.r33BXIJf007704@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 3 Apr 2013 11:33:18 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41362 - in projects/xml-tools: de_DE.ISO8859-1/books/handbook/disks en_US.ISO8859-1/articles/pam en_US.ISO8859-1/books/handbook/desktop en_US.ISO8859-1/books/handbook/disks en_US.ISO88... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 11:33:22 -0000 Author: gabor Date: Wed Apr 3 11:33:18 2013 New Revision: 41362 URL: http://svnweb.freebsd.org/changeset/doc/41362 Log: - Replace misused (empty) link elements with xref Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/disks/chapter.xml projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/l10n/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/users/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/vinum/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml projects/xml-tools/ja_JP.eucJP/books/handbook/desktop/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/users/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -1078,8 +1078,8 @@ umass0: detached Welches Tool Sie zum Brennen von CDs benutzen, hngt davon ab, ob Ihr CD-Brenner ein ATAPI-Gert ist oder nicht. - Mit ATAPI-CD-Brennern wird - burncd benutzt, das Teil des Basissystems ist. + Mit ATAPI-CD-Brennern wird burncd benutzt, + das Teil des Basissystems ist. SCSI- und USB-CD-Brenner werden mit cdrecord aus sysutils/cdrtools benutzt. Modified: projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -834,8 +834,7 @@ sshd password required pam_permit.soBreakdown of a configuration line - As explained in the section, each line in + As explained in , each line in /etc/pam.conf consists of four or more fields: the service name, the facility name, the control flag, the module name, and zero or more module arguments. @@ -852,13 +851,10 @@ sshd password required pam_permit.so The facility is one of the four facility keywords - described in the - section. + described in . Likewise, the control flag is one of the four keywords - described in the section, + described in , describing how to interpret the return code from the module. Linux-PAM supports an alternate syntax that lets you specify the action to associate with each possible return code, but @@ -1228,9 +1224,8 @@ sshd password required pam_permit.so appendix is a good + implement; the one presented in is a good starting point, but should not be used in real-world applications. Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/desktop/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -200,9 +200,9 @@ For information on how to configure a multimedia - environment, refer to . For + environment, refer to . For information on how to set up and use electronic mail, refer to - . + . @@ -222,7 +222,7 @@ The KDE and GNOME desktop environments include - their own HTML browser. Refer to + their own HTML browser. Refer to for more information on how to set up these complete desktops. @@ -572,7 +572,7 @@ To install &java; plugin support, follow the instructions - in . + in . Once &java; support is installed, start Chromium, and enter Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/disks/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/disks/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -613,7 +613,7 @@ bsdlabel -e ad3 storage. &man.vinum.4; implements the RAID-0, RAID-1 and RAID-5 models, both individually and in combination. - Refer to for more + Refer to for more information about &man.vinum.4;. @@ -824,7 +824,7 @@ da0: 126MB (258048 512 byte sectors: 64H <Generic Traveling Disk 1.11> at scbus0 target 0 lun 0 (da0,pass0) If the drive comes with a file system, it can be mounted. - Refer to for + Refer to for instructions on how to format and create partitions on the USB drive. @@ -1201,8 +1201,8 @@ scsibus1: &prompt.user; cdrecord -v dev=2,0 -dao -useinfo *.wav Make sure that 2,0 is set - appropriately, as described in . + appropriately, as described in . @@ -1503,7 +1503,7 @@ cd0: Attempt to query device size failed as a removable hard drive. However, this media is not compatible with most DVD-ROM drives and DVD-Video players as only a few DVD writers support the DVD-RAM format. - Refer to for more + Refer to for more information on DVD-RAM use. @@ -1547,7 +1547,7 @@ cd0: Attempt to query device size failed therefore ATAPI/CAM support must be loaded or statically compiled into the kernel. This support is not needed if the burner uses the USB interface. - Refer to for more details + Refer to for more details on USB device configuration. DMA access must also be enabled for ATAPI devices, by @@ -3035,8 +3035,8 @@ Filesystem 1K-blocks Used Avail Capacity The GENERIC kernel does not have this enabled by default, so a custom kernel must be - compiled in order to use disk quotas. Refer to for more information on + compiled in order to use disk quotas. Refer to for more information on kernel configuration. Next, enable disk quotas in @@ -3338,7 +3338,7 @@ Password: Add the New Hard Drive Install the new drive to the system as explained in - . For the purposes + . For the purposes of this example, a new hard drive partition has been added as /dev/ad4s1c and /dev/ad0s1* @@ -4298,7 +4298,7 @@ Device 1K-blocks Used Av other, and both are configured as primary nodes, the condition is called split-brain. To troubleshoot this situation, follow the steps described in - . + . Verify the result by running &man.hastctl.8; on each @@ -4354,7 +4354,7 @@ Device 1K-blocks Used Av same network segment to share an IP address. Set up CARP on both nodes of the cluster according to the documentation available in - . After setup, each node will + . After setup, each node will have its own carp0 interface with a shared IP address of 172.16.0.254. The primary Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -660,7 +660,7 @@ ipnat_rules="/etc/ipnat.rules" # rule There is a way to build IPF rules that utilize the power of script symbolic substitution. For more information, see - . + . @@ -2194,7 +2194,7 @@ ipfw add deny out If the machine is acting as a gateway providing NAT using &man.natd.8;, - refer to for information + refer to for information regarding the required /etc/rc.conf options. Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -291,8 +291,8 @@ following line in &man.loader.conf.5;: If /usr/src/ does not exist or it is empty, source has not been installed. The easiest way to install source is to use - svn as described in . One should also create a symlink to + svn as described in . One should also create a symlink to /usr/src/sys/: &prompt.root; ln -s /usr/src/sys /sys @@ -614,7 +614,7 @@ cpu I686_CPU This option enables kernel support for access control lists (ACLs). This relies on the use of extended attributes and UFS2, and the feature is - described in detail in . + described in detail in . ACLs are enabled by default and should not be disabled in the kernel if they have been used previously on a file system, as this will remove the ACLs, changing the way Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/l10n/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -638,7 +638,7 @@ keychange="fkey_number sequ Although Xorg is not installed with &os;, it can be installed from the Ports Collection. - Refer to for more information on + Refer to for more information on how to do this. This section discusses how to localize Xorg once it is installed. Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -134,8 +134,8 @@ Id Refs Address Size Name Users who prefer to statically link &linux; binary compatibility into the kernel should add options COMPAT_LINUX to the custom kernel configuration - file. Compile and install the new kernel as described in . + file. Compile and install the new kernel as described in . Installing Libraries Manually @@ -686,7 +686,7 @@ FEATURE Maple maplelmg 2000.0831 permane 6.5 onto a &os; system. It works quite well, with the exception of the &java.virtual.machine; which is - described further in . + described further in . The &linux; version of &matlab; can be purchased and licensed from Configuration of /etc/ttys - is covered in . + is covered in . Configuration for modems is similar, but a different argument is passed to getty and a different terminal type is specified. The general format @@ -2103,7 +2103,7 @@ raisechar=^^ developers who want to debug the kernel or device drivers. - As described in , &os; employs + As described in , &os; employs a three stage bootstrap. The first two stages are in the boot block code which is stored at the beginning of the &os; slice on the boot disk. The boot block then loads and runs @@ -2166,8 +2166,8 @@ raisechar=^^ null-modem cable Use either a null-modem cable or a standard serial - cable and a null-modem adapter. See for a discussion + cable and a null-modem adapter. See for a discussion on serial cables. @@ -2482,7 +2482,7 @@ boot: During the third stage of the boot process, one can still switch between the internal console and the serial console by setting appropriate environment variables in the boot loader. - See for more + See for more information. @@ -2635,8 +2635,8 @@ boot: Recompile the boot blocks with BOOT_COMCONSOLE_SPEED set to the - new console speed. See for detailed + new console speed. See for detailed instructions about building and installing new boot blocks. @@ -2686,8 +2686,8 @@ console="comconsole,vidconsole" - Get the kernel source as described in . + Get the kernel source as described in . @@ -2844,8 +2844,8 @@ ttyu3 "/usr/libexec/getty std.9600" unkn The boot loader needs to be compiled in order to use a serial port other than sio0 for the - serial console. Follow the procedure described in . + serial console. Follow the procedure described in . Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/users/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/users/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/users/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -594,7 +594,7 @@ Other information: &man.ypchsh.1;. NIS support is automatic, so specifying the yp before the command is not necessary. How to configure NIS is - covered in . + covered in . @@ -685,8 +685,8 @@ passwd: done disk quotas Disk quotas limit the amount of disk space available to users and provide a way to quickly check that usage without - calculating it every time. Quotas are discussed in . + calculating it every time. Quotas are discussed in . The other resource limits include ways to limit the amount of CPU, memory, and other resources a user may consume. These Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/vinum/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/vinum/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/vinum/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -142,7 +142,7 @@ relationships. It works well when the access to the virtual disk is spread evenly about its address space. When access is concentrated on a smaller area, the improvement is less marked. - illustrates the sequence in + illustrates the sequence in which storage units are allocated in a concatenated organization. @@ -179,7 +179,7 @@ somewhat more effort to locate the data, and it can cause additional I/O load where a transfer is spread over multiple disks, but it can also provide a more constant load across the - disks. illustrates the + disks. illustrates the sequence in which storage units are allocated in a striped organization. @@ -379,7 +379,7 @@ - summarizes the + summarizes the advantages and disadvantages of each plex organization. @@ -512,8 +512,8 @@ S myvol.p0.s0 State: up PO: 0 B Size: 512 MBThis output shows the brief listing format of - &man.gvinum.8;. It is represented graphically in . + &man.gvinum.8;. It is represented graphically in .
@@ -579,7 +579,7 @@ S mirror.p0.s0 State: up PO: 0 B Size: 512 MB S mirror.p1.s0 State: empty PO: 0 B Size: 512 MB - shows the + shows the structure graphically. @@ -658,8 +658,8 @@
- This volume is represented in . The darkness of the + This volume is represented in . The darkness of the stripes indicates the position within the plex address space, where the lightest stripes come first and the darkest last. @@ -693,7 +693,7 @@ writes do not go to the same subdisks even if a transfer goes over two drives. - represents the + represents the structure of this volume. @@ -1134,8 +1134,8 @@ Subdisk root.p1.s0: within the vinum partition h, and the offset of this partition within the device or slice. This is a typical setup that is - necessary to avoid the problem described in . The entire + necessary to avoid the problem described in . The entire a partition is completely within the h partition containing all the vinum data for this device. @@ -1232,8 +1232,8 @@ Subdisk root.p1.s0: Similarly, if the above situation has been recovered, by booting from a Fixit media, and the bootstrap has been re-installed using - bsdlabel -B as described in , the bootstrap will trash the + bsdlabel -B as described in , the bootstrap will trash the vinum header, and vinum will no longer find its disk(s). Though no actual vinum Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -270,8 +270,8 @@ the host &mac;. This can be accomplished by adding ifconfig_ed0="DHCP" to /etc/rc.conf. More advanced - networking setups are described in . + networking setups are described in . @@ -780,8 +780,8 @@ xenbr1 8000.feffffffffff no the µsoft.windows; host. This can be accomplished by adding ifconfig_de0="DHCP" to /etc/rc.conf. More advanced - networking setups are described in . + networking setups are described in . @@ -983,8 +983,8 @@ xenbr1 8000.feffffffffff no the host &mac;. This can be accomplished by adding ifconfig_em0="DHCP" to /etc/rc.conf. More advanced - networking setups are described in . + networking setups are described in . Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -827,9 +827,8 @@ sshd password required pam_permit.soBreakdown of a configuration line - Comme expliqu dans la section , chaque ligne de + Comme expliqu dans , chaque ligne de pam.conf consiste en quatre champs ou plus: le nom de service, le nom du mcanisme, le drapeau de contrle, le nom du module et la prsence ou non d'arguments pour le module. @@ -848,13 +847,11 @@ sshd password required pam_permit.so - Le mcanisme est l'un des quatre mots clef dcrit dans la - section + Le mcanisme est l'un des quatre mots clef dcrit dans + . De mme, le drapeau de contrle est l'un des quatre mots - clef dcrits dans la section et dcrit comment + clef dcrits dans et dcrit comment le module doit interprter le code de retour du module. Linux-PAM supporte une syntaxe alternative qui vous laisse spcifier l'action à associer à chaque code de retour @@ -1212,8 +1209,8 @@ sshd password required pam_permit.so est un bon point de + + est un bon point de dpart, mais ne devrait pas tre utilise dans des applications relles. Modified: projects/xml-tools/ja_JP.eucJP/books/handbook/desktop/chapter.xml ============================================================================== --- projects/xml-tools/ja_JP.eucJP/books/handbook/desktop/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/ja_JP.eucJP/books/handbook/desktop/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -234,7 +234,7 @@ GNOME ǥȥå״Ķˤϡ 줾 HTML ֥饦ѰդƤޤ Υǥȥå״Ķꤹ뤿ξˤĤƤ - 򻲾ȤƤ + 򻲾ȤƤ ̤ʥ֥饦ȤƤϡ www/dillo2, @@ -591,7 +591,7 @@ &java; ץ饰򥤥󥹥ȡ뤹ˤϡ - + ˽񤫤Ƥ˽äƤ &java; ΥݡȤ򥤥󥹥ȡ뤷顢 Modified: projects/xml-tools/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -1349,7 +1349,7 @@ vq|VH57600|Very High Speed Modem at 5760 /etc/ttys файлын тохиргоо - хэсэгт яригдсан байгаа. + хэсэгт яригдсан байгаа. Модемуудын тохиргоо төстэй боловч бид өөр терминалын төрлийг заахын тулд getty уруу өөр нэмэлт өгөгдлүүдийг дамжуулах ёстой. Түгжигдсэн хурдтай болон таарах хурдтай тохиргоонуудын ерөнхий хэлбэр нь @@ -1999,7 +1999,7 @@ raisechar=^^ хүссэн системийн администраторууд болон цөм эсвэл төхөөрөмжийн драйверуудыг дибаг хийхийг хүссэн хөгжүүлэгчид юм. - -т тайлбарласнаар &os; нь гурван шаттай эхлүүлэгчийг + -т тайлбарласнаар &os; нь гурван шаттай эхлүүлэгчийг хэрэглэдэг. Эхний хоёр шат нь ачаалах диск дээрх &os;-ийн зүсмэлийн эхлэл дээр хадгалагддаг ачаалах блокийн кодод байдаг. Ачаалах блок нь ачаалагч дуудагчийг (/boot/loader) гурав дахь шатны код болгон дуудаж @@ -2059,7 +2059,7 @@ raisechar=^^ Танд null-модем кабель эсвэл стандарт цуваа кабель болон null-модем хувиргагч хэрэгтэй болно. Цуваа кабелиудын тухай хэлэлцүүлгийг - хэсгээс үзнэ үү. + хэсгээс үзнэ үү. @@ -2347,7 +2347,7 @@ boot: Ачаалагч дуудагч дуудагдсаны дараа та ачаалах процессийн гурав дахь шатанд байгаа бол ачаалагч дуудагчид зохих орчны хувьсагчуудыг тохируулж дотоод консол болон цуваа консолын хооронд та шилжиж чадсан хэвээр байх - болно. -г үзнэ үү. + болно. -г үзнэ үү. @@ -2500,7 +2500,7 @@ boot: Ачаалах блокуудыг консолын шинэ хурд заагдсан BOOT_COMCONSOLE_SPEED хувьсагчтай цуг дахин эмхэтгэнэ. Шинэ ачаалах блокуудыг бүтээж суулгах талаар - дэлгэрэнгүй заавруудыг -с + дэлгэрэнгүй заавруудыг -с үзнэ үү. Хэрэв цуваа консол нь тохируулгатайгаар @@ -2552,7 +2552,7 @@ console="comconsole,vidconsole" - Цөмийн эхийг авна. ( бүлгийг үзнэ үү) + Цөмийн эхийг авна. ( бүлгийг үзнэ үү) Modified: projects/xml-tools/mn_MN.UTF-8/books/handbook/users/chapter.xml ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/books/handbook/users/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/mn_MN.UTF-8/books/handbook/users/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -570,7 +570,7 @@ Other information: &man.ypchfn.1;, болон &man.ypchsh.1; нартай ижилхэн холбоос. NIS дэмжлэг автоматаар хийгдсэн байгаа. Тийм болохоор тушаалын урд нь yp угтвар залгах шаардлагагүй. - NIS хэрхэн тохируулах талаар + NIS хэрхэн тохируулах талаар хэсэгт тайлбарлагдах болно. @@ -659,8 +659,8 @@ passwd: done дискний хуваарилалт Дискийн хуваарилалт нь хэрэглэгчийн диск хэрэглэх хэмжээг зааглаж өгдөг бөгөөд тухай бүрд уг хэмжээг тооцож бодолгүй - шуурхай шалгах боломж өгдөг. Хуваарилалт нь бүлэгт авч хэлэлцэгдсэн. + шуурхай шалгах боломж өгдөг. Хуваарилалт нь бүлэгт авч хэлэлцэгдсэн. Бусад нөөцийн хязгаарлалтуудад Процессор, санах ойн хэмжээ болон бусад хэрэглэгчийн хэрэглэх нөөцүүд Modified: projects/xml-tools/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -270,8 +270,8 @@ ижил локал сүлжээнд виртуал машиныг холбохын тулд DHCP-г ашиглах явдал юм. Үүнийг /etc/rc.conf файлд ifconfig_ed0="DHCP" гэж - нэмэн хийж болно. Сүлжээний илүү нарийн тохиргоонууд -д тайлбарлагдсан + нэмэн хийж болно. Сүлжээний илүү нарийн тохиргоонууд -д тайлбарлагдсан байгаа. @@ -765,7 +765,7 @@ xenbr1 8000.feffffffffff no DHCP-ийг ашиглах явдал юм. ifconfig_de0="DHCP" мөрийг /etc/rc.conf файлд нэмж үүнийг хийнэ. Сүлжээний илүү нарийн тохиргоонуудын - талаар дээр + талаар дээр тайлбарласан байгаа болно. @@ -963,7 +963,7 @@ xenbr1 8000.feffffffffff no юм. /etc/rc.conf файлд ifconfig_em0="DHCP" мөрийг нэмснээр үүнийг хийж болно. Сүлжээний илүү дэлгэрэнгүй тохиргоонуудын - талаар -д тайлбарласан + талаар -д тайлбарласан байгаа. Modified: projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml Wed Apr 3 10:56:14 2013 (r41361) +++ projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml Wed Apr 3 11:33:18 2013 (r41362) @@ -849,8 +849,8 @@ sshd password required p
- , + , + /etc/pam.conf ң : , , , , @@ -867,12 +867,11 @@ sshd password required p . ң , - . + . ң - , , , + , , + , . Linux-PAM , , , @@ -1268,8 +1267,8 @@ sshd password required p PAM, . ģ - ; , , + ; , , + , . From owner-svn-doc-projects@FreeBSD.ORG Thu Apr 4 11:39:29 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CBAFD946; Thu, 4 Apr 2013 11:39:29 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AE6308E5; Thu, 4 Apr 2013 11:39:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r34BdTlr033327; Thu, 4 Apr 2013 11:39:29 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r34BdSu5033322; Thu, 4 Apr 2013 11:39:28 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304041139.r34BdSu5033322@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 4 Apr 2013 11:39:28 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41365 - projects/xml-tools/share/xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2013 11:39:29 -0000 Author: gabor Date: Thu Apr 4 11:39:28 2013 New Revision: 41365 URL: http://svnweb.freebsd.org/changeset/doc/41365 Log: - sectX author rendering needs the same customization as used for chapter authors Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl projects/xml-tools/share/xsl/freebsd-xhtml-titlepage.xsl projects/xml-tools/share/xsl/titlepage.templates.xml Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Thu Apr 4 02:38:21 2013 (r41364) +++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Thu Apr 4 11:39:28 2013 (r41365) @@ -75,7 +75,7 @@ - + @@ -108,11 +108,27 @@ - + + + + + + + + + + + + + + + + + Modified: projects/xml-tools/share/xsl/freebsd-xhtml-titlepage.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-titlepage.xsl Thu Apr 4 02:38:21 2013 (r41364) +++ projects/xml-tools/share/xsl/freebsd-xhtml-titlepage.xsl Thu Apr 4 11:39:28 2013 (r41365) @@ -2159,13 +2159,15 @@
- + +
- + +
@@ -2346,13 +2348,15 @@
- + +
- + +
@@ -2533,13 +2537,15 @@
- + +
- + +
@@ -2720,13 +2726,15 @@
- + +
- + +
@@ -2907,13 +2915,15 @@
- + +
- + +
@@ -3094,13 +3104,15 @@
- + +
- + +
@@ -3298,13 +3310,15 @@
- + +
- + +
Modified: projects/xml-tools/share/xsl/titlepage.templates.xml ============================================================================== --- projects/xml-tools/share/xsl/titlepage.templates.xml Thu Apr 4 02:38:21 2013 (r41364) +++ projects/xml-tools/share/xsl/titlepage.templates.xml Thu Apr 4 11:39:28 2013 (r41365) @@ -383,8 +383,8 @@ <subtitle/> <corpauthor/> - <authorgroup/> - <author/> + <authorgroup t:named-template="section.authorgroup"/> + <author t:named-template="section.author"/> <othercredit/> <releaseinfo/> <copyright/> @@ -414,8 +414,8 @@ <title/> <subtitle/> <corpauthor/> - <authorgroup/> - <author/> + <authorgroup t:named-template="section.authorgroup"/> + <author t:named-template="section.author"/> <othercredit/> <releaseinfo/> <copyright/> @@ -445,8 +445,8 @@ <title/> <subtitle/> <corpauthor/> - <authorgroup/> - <author/> + <authorgroup t:named-template="section.authorgroup"/> + <author t:named-template="section.author"/> <othercredit/> <releaseinfo/> <copyright/> @@ -476,8 +476,8 @@ <title/> <subtitle/> <corpauthor/> - <authorgroup/> - <author/> + <authorgroup t:named-template="section.authorgroup"/> + <author t:named-template="section.author"/> <othercredit/> <releaseinfo/> <copyright/> @@ -507,8 +507,8 @@ <title/> <subtitle/> <corpauthor/> - <authorgroup/> - <author/> + <authorgroup t:named-template="section.authorgroup"/> + <author t:named-template="section.author"/> <othercredit/> <releaseinfo/> <copyright/> @@ -538,8 +538,8 @@ <title/> <subtitle/> <corpauthor/> - <authorgroup/> - <author/> + <authorgroup t:named-template="section.authorgroup"/> + <author t:named-template="section.author"/> <othercredit/> <releaseinfo/> <copyright/> @@ -569,8 +569,8 @@ <title/> <subtitle/> <corpauthor/> - <authorgroup/> - <author/> + <authorgroup t:named-template="section.authorgroup"/> + <author t:named-template="section.author"/> <othercredit/> <releaseinfo/> <copyright/> From owner-svn-doc-projects@FreeBSD.ORG Thu Apr 4 11:41:04 2013 Return-Path: <owner-svn-doc-projects@FreeBSD.ORG> Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DC6D99B0; Thu, 4 Apr 2013 11:41:04 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CCF6C8FD; Thu, 4 Apr 2013 11:41:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r34Bf4qi035183; Thu, 4 Apr 2013 11:41:04 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r34BewWn035125; Thu, 4 Apr 2013 11:40:58 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304041140.r34BewWn035125@svn.freebsd.org> From: Gabor Kovesdan <gabor@FreeBSD.org> Date: Thu, 4 Apr 2013 11:40:58 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41366 - in projects/xml-tools: de_DE.ISO8859-1/books/handbook/geom de_DE.ISO8859-1/books/handbook/printing el_GR.ISO8859-7/books/handbook/advanced-networking el_GR.ISO8859-7/books/hand... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees <svn-doc-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects> List-Post: <mailto:svn-doc-projects@freebsd.org> List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 04 Apr 2013 11:41:04 -0000 Author: gabor Date: Thu Apr 4 11:40:58 2013 New Revision: 41366 URL: http://svnweb.freebsd.org/changeset/doc/41366 Log: - Reduce the misuse of role attribute; role="directory" should actually be class="directory" - Add constraint to enforce this Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/de_DE.ISO8859-1/books/handbook/printing/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/audit/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/disks/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/ports/chapter.xml projects/xml-tools/el_GR.ISO8859-7/books/handbook/security/chapter.xml projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/jails/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/es_ES.ISO8859-1/books/handbook/security/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/install/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/security/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml projects/xml-tools/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml projects/xml-tools/it_IT.ISO8859-15/articles/committers-guide/article.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/geom/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/install/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/jails/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml projects/xml-tools/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml projects/xml-tools/ja_JP.eucJP/books/handbook/eresources/chapter.xml projects/xml-tools/ja_JP.eucJP/books/handbook/mirrors/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/eresources/chapter.xml projects/xml-tools/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml projects/xml-tools/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml projects/xml-tools/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml projects/xml-tools/ru_RU.KOI8-R/articles/committers-guide/article.xml projects/xml-tools/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/audit/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml projects/xml-tools/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml projects/xml-tools/share/xml/freebsd.sch projects/xml-tools/zh_CN.GB2312/books/handbook/audit/chapter.xml projects/xml-tools/zh_TW.Big5/articles/cvs-freebsd/article.xml projects/xml-tools/zh_TW.Big5/articles/nanobsd/article.xml projects/xml-tools/zh_TW.Big5/articles/remote-install/article.xml projects/xml-tools/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/audit/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/disks/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/geom/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/jails/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/linuxemu/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/mirrors/chapter.xml projects/xml-tools/zh_TW.Big5/books/handbook/ports/chapter.xml Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/geom/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/geom/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/geom/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -108,7 +108,7 @@ — Master Boot Records, <acronym>BSD</acronym>-Label usw. — durch die Nutzung von Datentrgern (Providern) oder den besonderen Dateien in <filename - role="directory">/dev</filename>. Verschiedene Software + class="directory">/dev</filename>. Verschiedene Software <acronym>RAID</acronym>-Konfigurationen untersttzend, wird GEOM Ihnen transparenten Zugriff auf das Betriebssystem und System-Dienstprogramme gewhren.</para> @@ -187,7 +187,7 @@ existiert. Falls dieser Datentrger eine Root-Partition werden soll, dann nutzen Sie zeitweise einen anderen Mount-Punkt, beispielsweise <filename - role="directory">/mnt</filename>:</para> + class="directory">/mnt</filename>:</para> <screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen> </step> Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/printing/chapter.xml ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/printing/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/printing/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -1313,7 +1313,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4 identifiziert und angelegt haben, mssen Sie dem <application>LPD</application>-System mitteilen, welche Gertedatei im Verzeichnis <filename - role="directory">/dev</filename> es fr die + class="directory">/dev</filename> es fr die Datenbertragung zum Drucker verwenden soll.</para> <para>Geben Sie die Gertedatei durch das Attribut Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -2908,7 +2908,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 <filename>pxeboot</filename>, not the kernel. There are other interesting possibilities, like loading <filename>pxeboot</filename> from a &os; CD-ROM - <filename role="directory">/boot</filename> directory (as + <filename class="directory">/boot</filename> directory (as &man.pxeboot.8; can load a <filename>GENERIC</filename> kernel, this makes it possible to use <acronym>PXE</acronym> to boot from a remote CD-ROM).</para> Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/audit/chapter.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/audit/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/audit/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -232,7 +232,7 @@ <title>Audit Configuration All configuration files for security audit are found in - /etc/security. The following + /etc/security. The following files must be present before the audit daemon is started: Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/disks/chapter.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/disks/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/disks/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -3898,7 +3898,7 @@ device crypto The following example will describe how to generate a key file, which will be used as part of the Master Key for the encrypted provider mounted under - /private. The key + /private. The key file will provide some random data used to encrypt the Master Key. The Master Key will be protected by a passphrase as well. Provider's sector size will be 4kB big. @@ -3970,7 +3970,7 @@ Filesystem Size Used Avail Capaci Unmounting and Detaching the Provider Once the work on the encrypted partition is done, and - the /private partition + the /private partition is no longer needed, it is prudent to consider unmounting and detaching the geli encrypted partition from the kernel. Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -1585,7 +1585,7 @@ Ports (/usr/ports) + class="directory">/usr/ports) &os; . , Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -3104,7 +3104,7 @@ dhcpd_ifaces="dc0" org., as org. is more specific than the root zone. The layout of each part of a hostname is much like a file system: the - /dev directory falls + /dev directory falls within the root, and so on. @@ -3188,7 +3188,7 @@ dhcpd_ifaces="dc0" - /etc/namedb + /etc/namedb Directory where BIND zone information resides. @@ -3202,10 +3202,10 @@ dhcpd_ifaces="dc0" Depending on how a given zone is configured on the server, the files related to that zone can be found in the master, slave, or dynamic subdirectories of the - /etc/namedb directory. + class="directory">master, slave, or dynamic subdirectories of the + /etc/namedb directory. These files contain the DNS information that will be given out by the name server in response to queries. @@ -3253,7 +3253,7 @@ dhcpd_ifaces="dc0" Configuration files for named currently reside in - /etc/namedb directory and + /etc/namedb directory and will need modification before use, unless all that is needed is a simple resolver. This is where most of the configuration will be performed. @@ -3262,7 +3262,7 @@ dhcpd_ifaces="dc0" Using <command>make-localhost</command> To configure a master zone for the localhost visit the - /etc/namedb directory + /etc/namedb directory and run the following command: &prompt.root; sh make-localhost Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/ports/chapter.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/ports/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/ports/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -679,7 +679,7 @@ docbook = - /usr/ports + /usr/ports csup ! Ports , csup Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/security/chapter.xml ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/security/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/security/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -2693,7 +2693,7 @@ kadmind5_server_enable="YES"This is done because the applications for MIT kerberos installs binaries in the - /usr/local + /usr/local hierarchy. Modified: projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -79,11 +79,11 @@ The scripts that control all of this live in either - /a/portbuild/scripts/ or. - /a/portbuild/admin/scripts/. + /a/portbuild/scripts/ or. + /a/portbuild/admin/scripts/. These are the checked-out copies from the Subversion repository at - base/projects/portbuild/ + base/projects/portbuild/ . Typically, incremental builds are done that use previous Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/eresources/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/eresources/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/eresources/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -1613,7 +1613,7 @@ Important news for developers, porters, and users of the Ports Collection (/usr/ports), including + class="directory">/usr/ports), including architecture/infrastructure changes, new capabilities, critical upgrade instructions, and release engineering information. This is a low-volume mailing list, Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -806,7 +806,7 @@ Certificate information: the server, and the verification step will be repeated on the next connection. Accepting the certificate permanently will store the authentication credentials in - ~/.subversion/auth/ and + ~/.subversion/auth/ and the user will not be asked to verify the fingerprint again until the certificate expires. Modified: projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/es_ES.ISO8859-1/articles/nanobsd/article.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -120,7 +120,7 @@ La particin que contiene los ficheros de configuracin, que puede montarse bajo - /cfg durante el + /cfg durante el funcionamiento del sistema. @@ -128,20 +128,20 @@ Estas particiones se montan normalmente en modo de slo lectura. - Los directorios /etc - y /var son discos + Los directorios /etc + y /var son discos &man.md.4; (malloc). La particin de los ficheros de configuracin permanece bajo el - directorio /cfg. Este + directorio /cfg. Este directorio contiene ficheros que usa el - directorio /etc y se + directorio /etc y se monta en modo de slo lectura inmediatamente despus del arranque; por lo tanto, es necesario que los ficheros que se modifiquen - en /etc se copien - en /cfg si se desea que + en /etc se copien + en /cfg si se desea que los cambios perduren despus del reinicio del sistema. @@ -158,13 +158,13 @@ La particin que contiene el - directorio /cfg + directorio /cfg debera montarse nicamente en el arranque y mientras se sobreescriben los ficheros de configuracin. No es buena idea montar siempre el - directorio /cfg, + directorio /cfg, especialmente si el sistema NanoBSD se ejecuta en un dispositivo de almacenamiento masivo que pueda verse @@ -181,7 +181,7 @@ Una imagen de NanoBSD se genera usando el sencillo script de shell nanobsd.sh, ubicado en el - directorio /usr/src/tools/tools/nanobsd. + directorio /usr/src/tools/tools/nanobsd. El script crea una imagen que se deber copiar al medio de almacenamiento mediante la utilidad &man.dd.1;. @@ -327,7 +327,7 @@ customize_cmd cust_foo A continuacin vemos un ejemplo ms til de funcin personalizada, que cambia el tamao por omisin del directorio - /etc de 5MB a 30MB: + /etc de 5MB a 30MB: cust_etc_size () ( cd ${NANO_WORLDDIR}/conf @@ -357,7 +357,7 @@ customize_cmd cust_etc_size cust_install_files : Instala ficheros de configuracin desde el - directorio nanobsd/files, + directorio nanobsd/files, que contiene scripts tiles para la administracin del sistema. @@ -494,7 +494,7 @@ customize_cmd cust_nobeastieNanoBSD en funcionamiento dispone de los scripts updatep1 y updatep2, ubicados en el directorio - /root. La + /root. La eleccin de uno u otro script depende de qu particin est ejecutando el sistema, la primera o la segunda. Modified: projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/es_ES.ISO8859-1/articles/p4-primer/article.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -250,7 +250,7 @@ Esto asociar por completo el repositorio Perforce al directorio - Root + Root del cliente. NO USE ESTE VALOR POR DEFECTO. El repositorio de &os; es enorme e intentar asociarlo y sincronizarse con dicho repositorio tardar muchsimo y @@ -258,7 +258,7 @@ slamente la seccin del repositorio en la que va a trabajar. Por ejemplo, hay un rbol para el proyecto smpng en //depot/projects/smpng. Una + class="directory">//depot/projects/smpng. Una asociacin en ese caso sera algo as: //depot/projects/smpng/... //cliente/... @@ -355,7 +355,7 @@ Puede sincronizarse parte del rbol o del cliente especificando una ruta relativa a la orden sync. Por ejemplo, para sincronizar slo el directorio - ufs + ufs del proyecto smpng ejecute lo siguiente: @@ -393,7 +393,7 @@ es un nico rbol plano. Se accede a cada fichero a travs de una sencilla ruta bajo el directorio //depot, tanto si se trata de un + class="directory">//depot, tanto si se trata de un fichero de nueva creacin como si proviene de una ramificacin. Esto supone una gran diferencia con respecto a sistemas como CVS, @@ -912,7 +912,7 @@ servidor de CVS sobre cambios realizados en la rama HEAD, y dichos cambios se entregan a Perforce dentro del rbol //depot/vendor/freebsd/.... + class="directory">//depot/vendor/freebsd/.... De este modo este rbol permite la ramificacin y la integracin de proyectos derivados. Cualquier proyecto que implique la modificacin del cdigo fuente de @@ -969,7 +969,7 @@ La mayora de los proyectos de &os; dentro del programa Google Summer of Code estn en //depot/projects/soc2005/nombre_del_proyecto/... + class="directory">//depot/projects/soc2005/nombre_del_proyecto/... en el servidor &os; de Perforce. Entre las responsabilidades del mentor del proyecto Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -3172,7 +3172,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 ncleo, lo hace pxeboot. Existen otras posibilidades interesantes, como cargar pxeboot desde el directorio - /boot + /boot de una unidad de CD-ROM de &os; (ya que &man.pxeboot.8; puede cargar un ncleo GENERIC surge la posibilidad de utilizar @@ -3522,7 +3522,7 @@ options BOOTP_NFSROOT # NFS mount r mtodo de configuracin distinto del que se utiliza en clone_root y en los scripts del sistema de /etc, que resultan ser un tanto + class="directory">/etc, que resultan ser un tanto confusos. No obstante se pueden utilizar a modo de referencia, excepto si se prefiere utilizar el mtodo que se describe en ellos, en cuyo caso se necesitar modificar y Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/geom/chapter.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/geom/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/geom/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -100,7 +100,7 @@ GEOM permite el acceso y control de clases —sectores de arranque maestros (MBR), etiquetas BSD, etc— por medio del uso de proveedores, o de los ficheros especiales de - /dev. + /dev. Capaz de trabajar con varias configuraciones de RAID por software, GEOM proporcionar transparentemente acceso al sistema operativo y las utilidades del mismo. @@ -171,7 +171,7 @@ Asegrese de que existe un punto de montaje adecuado. Si este volumen se convertir en una particin raz, utilice temporalmente otro punto de montaje, como /mnt. + class="directory">/mnt. &prompt.root; mkdir /mnt @@ -209,7 +209,7 @@ XXX: What message? Put it inside the sc Aadems del dispositivo st0, este proceso debera haber creado otros dos dispositivos en el directorio - /dev/stripe, incluyendo + /dev/stripe, incluyendo st0a y st0c. Ahora se debe crear un sistema de ficheros en el dispositivo st0a usando la siguiente orden @@ -273,7 +273,7 @@ XXX: What message? Put it inside the sc particiones. Una debera ser una particin de intercambio, de dos veces el tamao de la RAM, y todo el espacio restante se dedicar al sistema de ficheros raz - (/). + (/). Es posible tener particiones aparte para otros puntos de montajes; sin embargo, esto multiplicar por diez el nivel de dificultad, debido a la alteracin manual de las opciones de &man.bsdlabel.8; y @@ -300,7 +300,7 @@ Done. Esta orden debera haber creado en el directorio - /dev/mirror los nodos de + /dev/mirror los nodos de dispositivo gm0, gm0s1, gm0s1a, y gm0s1c. @@ -332,7 +332,7 @@ Done. informacin y un puado de nmeros. Esto es bueno. Examine la pantalla por si hay algn mensaje de error y monte el dispositivo en el punto de montaje - /mnt: + /mnt: &prompt.root; mount /dev/mirror/gm0s1a /mnt Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/install/chapter.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/install/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/install/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -4901,7 +4901,7 @@ Please press any key to reboot. &prompt.root; mount /dev/fd0 /mnt Una vez montado el disquete entre en el directorio - /mnt : + /mnt : &prompt.root; cd /mnt Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/jails/chapter.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/jails/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/jails/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -281,11 +281,11 @@ no es necesario en &os; 6.0 y versiones El mejor punto de partida es la eleccin del punto del sistema de ficheros del servidor donde estar fsicamente ubicada la jaula. /usr/jail/nombredelajaula + class="directory">/usr/jail/nombredelajaula es un buen sitio. nombredelajaula es el nombre de mquina que identifica a la jaula. El sistema de ficheros /usr/ suele tener espacio + class="directory">/usr/ suele tener espacio suficiente para albergar el sistema de ficheros de la jaula que, cuando se trata de jaulas completas, es esencialmente lo necesario para alojar todos y cada uno de @@ -308,10 +308,10 @@ no es necesario en &os; 6.0 y versiones make se instalan todos los ficheros de configuracin necesarios. En pocas palabras, instala cada fichero instalable que haya en - /usr/src/etc/ en el - directorio /etc de la + /usr/src/etc/ en el + directorio /etc de la jaula, es decir, en - $D/etc/. + $D/etc/. @@ -661,10 +661,10 @@ jail_www_devf Cada jaula se montar bajo /home/j. + class="directory">/home/j. - /home/j/mroot + /home/j/mroot ser la plantilla para cada jaula y la particin de slo lectura para todas las jaulas. @@ -672,29 +672,29 @@ jail_www_devf Se crear un directorio vaco para cada jaula bajo el directorio /home/j. + class="directory">/home/j. Cada jaula tendr un directorio /s que estar enlazado + class="directory">/s que estar enlazado con la parte de lectura-escritura del sistema. Cada jaula tendr su propio sistema en modo lectura-escritura basado en /home/j/skel. + class="directory">/home/j/skel. Cada parte de lectura-escritura correspondiente a cada jaula se crear en /home/js. + class="directory">/home/js. Se asume que las jaulas se instalarn bajo la particin /home. Por supuesto esto no + class="directory">/home. Por supuesto esto no es en absoluto obligatorio, pero hay que tener en cuenta que debe hacerse el mismo cambio en cada uno de los ejemplos que se muestran ms adelante. @@ -775,7 +775,7 @@ jail_www_devf ficheros de slo lectura. Por favor, asegrese de que los enlaces simblicos se crean en las ubicaciones correctas: s/. Si se usan directorios + class="directory">s/. Si se usan directorios reales o directorios errneos la instalacin no funcionar. @@ -871,12 +871,12 @@ jail_www_devfs_enable="YES": La razn por la que jail_nombre_rootdir contiene /usr/home y no - /home es que la ruta + class="directory">/usr/home y no + /home es que la ruta fsica del directorio/home en una instalacin + class="directory">/home en una instalacin de &os; por omisin es /usr/home. La variable + class="directory">/usr/home. La variable jail_nombre_rootdir no debe apuntar a una ruta que contenga un enlace simblico porque sera @@ -959,7 +959,7 @@ jail_www_devfs_enable="YES"El primer paso es actualizar el servidor que aloja las jaulas de la forma habitual. Despus creamos una plantilla de slo lectura temporal en /home/j/mroot2. + class="directory">/home/j/mroot2. &prompt.root; mkdir /home/j/mroot2 &prompt.root; cd /usr/src @@ -1008,7 +1008,7 @@ jail_www_devfs_enable="YES" Los sistemas de ficheros de lectura-escritura cuelgan del sistema de slo lectura /s y por tanto deben + class="directory">/s y por tanto deben desmontarse antes. Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/mail/chapter.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/mail/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/mail/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -2031,7 +2031,7 @@ sasl_pwcheck_program="/usr/local/sbin/pw &prompt.user; mail El contenido de la carpeta de usuario en el directorio - /var/mail se leen + /var/mail se leen automticamente. Si la carpeta se encuentra vaca la aplicacin termina su ejecucin con un mensaje que indica que no ha podido @@ -2179,7 +2179,7 @@ EOT mutt lee automticamente el contenido de la carpeta de correo del usuario dentro del directorio - /var/mail y muestra por pantalla + /var/mail y muestra por pantalla su contenido. Si el directorio est vaco mutt quedar a la espera de los comandos que pueda pasarle el @@ -2302,7 +2302,7 @@ EOT El directorio por defecto que pine intenta abrir es inbox. Para ver el ndice de + class="directory">inbox. Para ver el ndice de todos los mensajes recibidos pulse la tecla I o seleccione la opcin de men denominada Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/security/chapter.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/security/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/security/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -5333,7 +5333,7 @@ drwxr-xr-x 2 robert robert 512 Nov 10 Despus de la instalacin un administrador debe actualizar la base de datos alojada en local en - /var/db/portaudit + /var/db/portaudit mediante: &prompt.root; portaudit -F Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/nanobsd/article.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -143,19 +143,19 @@ seule. Les rpertoires /etc et /var sont des disques &man.md.4; + class="directory">/etc et /var sont des disques &man.md.4; (malloc). La partition de configuration est monte sur le - rpertoire /cfg. + rpertoire /cfg. Elle contient les fichiers du rpertoire /etc et est brivement + class="directory">/etc et est brivement monte en lecture seule juste aprs le dmarrage du systme, par consquent il est ncessaire de recopier les fichiers modifis - de /etc vers le - rpertoire /cfg + de /etc vers le + rpertoire /cfg si l'on souhaite que les changements soient encore effectifs aprs le redmarrage du systme. @@ -172,11 +172,11 @@ La partition qui abrite /cfg doit tre + class="directory">/cfg doit tre monte uniquement au dmarrage et lors de la copie des fichiers de configuration. - Garder /cfg + Garder /cfg mont en permanence n'est pas une bonne ide, en particulier si le systme NanoBSD tourne sur un @@ -195,7 +195,7 @@ cre à l'aide d'une simple procdure nanobsd.sh, qui peut tre trouve dans le rpertoire /usr/src/tools/tools/nanobsd. + class="directory">/usr/src/tools/tools/nanobsd. Ce programme cre une image, qui peut tre copie sur le support de stockage à l'aide de &man.dd.1;. @@ -352,7 +352,7 @@ customize_cmd cust_foo Un exemple plus utile de fonction de personnalisation est le suivant, qui change la taille par dfaut du - rpertoire /etc + rpertoire /etc de 5Mo à 30Mo: cust_etc_size () ( @@ -384,7 +384,7 @@ customize_cmd cust_etc_size cust_install_files — Installe les fichiers du rpertoire nanobsd/Files, qui contient + class="directory">nanobsd/Files, qui contient des programmes utiles pour l'administration systme. @@ -508,7 +508,7 @@ customize_cmd cust_nobeastieupdatep1 ou updatep2 situe dans le rpertoire /root, en fonction de la partition + class="directory">/root, en fonction de la partition qui est en cours d'utilisation sur le systme. En fonction des services disponibles sur la machine qui Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -2131,7 +2131,7 @@ Success, response: OK, Success (0x20)/var/spool/obex. Le serveur OBEX + class="directory">/var/spool/obex. Le serveur OBEX enregistrera automatiquement le service OBEX Object Push auprs du “daemon” SDP local. L'exemple ci-dessous montre comment dmarrer le serveur @@ -2508,7 +2508,7 @@ net.link.ether.bridge_ipfw=1 Des fichiers de dmarrage du systme existent dans le rpertoire /etc pour dtecter et + class="directory">/etc pour dtecter et supporter le dmarrage d'un systme sans disque dur. @@ -2811,7 +2811,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 intressantes, comme le chargement de pxeboot à partir du rpertoire /boot d'un CD-ROM &os; + class="directory">/boot d'un CD-ROM &os; (comme &man.pxeboot.8; peut charger un noyau GENERIC cela rend possible l'utilisation de PXE pour @@ -2909,7 +2909,7 @@ margaux:ha=0123456789ab:tc=.def100 o vous avez install Etherboot, puis rendez-vous dans le rpertoire src de l'arborescence + class="directory">src de l'arborescence Etherboot et tapez: @@ -2977,7 +2977,7 @@ margaux:ha=0123456789ab:tc=.def100 Crez un rpertoire à partir duquel tftpd proposera les fichiers, e.g. /tftpboot. + class="directory">/tftpboot. @@ -3004,7 +3004,7 @@ margaux:ha=0123456789ab:tc=.def100 Le rpertoire tftpboot peut tre + class="directory">tftpboot peut tre plac n'importe o sur le serveur. Assurez-vous que son emplacement est dfini dans les fichiers inetd.conf et @@ -3161,14 +3161,14 @@ options BOOTP_NFSROOT # NFS mount r Les fichiers README dans le rpertoire /usr/share/examples/diskless + class="directory">/usr/share/examples/diskless contiennent beaucoup d'information de fond, mais, avec les autres exemples du rpertoire diskless, ils documentent une + class="directory">diskless, ils documentent une mthode de configuration qui est distincte de celle utilise par clone_root et les procdures de dmarrage du systme de - /etc, ce qui est un + /etc, ce qui est un peu à l'origine de confusions. Utilisez-les comme rfrence uniquement, à moins que vous prfriez la mthode qu'ils @@ -3337,7 +3337,7 @@ host margaux { configure pour excuter X, you devrez ajuster le fichier de configuration de XDM, qui envoie le journal - d'erreurs sur /usr + d'erreurs sur /usr par dfaut. @@ -3353,7 +3353,7 @@ host margaux { Dans cette situation, il y a parfois des problmes avec les fichiers spciaux de priphriques dans /dev, en raison de + class="directory">/dev, en raison de diffrences de taille sur les entiers. Une solution à ce problme est d'exporter un rpertoire à partir du serveur non-&os;, de @@ -3478,7 +3478,7 @@ host margaux { Pour de la documentation sur isdn4bsd, consultez le rpertoire /usr/share/examples/isdn/ sur + class="directory">/usr/share/examples/isdn/ sur votre systme &os; ou sur la page web d'isdn4bsd qui propose galement des astuces, Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -96,7 +96,7 @@ Boot Records), labels BSD, etc. — par l'intermdiaire d'interfaces, ou de fichiers spciaux du rpertoire /dev. En supportant plusieurs + class="directory">/dev. En supportant plusieurs configurations RAID logicielles, GEOM offrira un accs transparent au systme d'exploitation et à ses utilitaires. @@ -176,7 +176,7 @@ Assurez-vous de l'existence d'un point de montage. Si ce volume doit devenir une partition racine, utilisez alors un autre point de montage comme /mnt. + class="directory">/mnt. &prompt.root; mkdir /mnt @@ -212,7 +212,7 @@ XXX: What message? Put it inside the sc Cette opration doit avoir cr deux autres priphriques dans le rpertoire /dev/stripe en plus du + class="directory">/dev/stripe en plus du priphrique st0: st0a et st0c. A ce stade, un systme de fichiers @@ -285,7 +285,7 @@ XXX: What message? Put it inside the sc partitions. Une partition sera la partition de pagination d'une taille double à celle de la RAM et l'espace restant sera allou au systme de - fichiers racine (/). Il + fichiers racine (/). Il est possible d'avoir des partitions spares pour les autres points de montage, cependant cela augmentera normment le niveau de difficult en @@ -317,7 +317,7 @@ Done. Cette commande devrait crer le fichier spcial de priphrique gm0 sous le rpertoire - /dev/mirror. + /dev/mirror. Installez un label fdisk et un code de @@ -350,7 +350,7 @@ Done. d'informations et de nombres. C'est bon signe. Contrlez l'affichage à la recherche de messages d'erreur et montez le priphrique sur le point de montage /mnt: + class="directory">/mnt: &prompt.root; mount /dev/mirror/gm0s1a /mnt @@ -513,7 +513,7 @@ ggate0 A partir d'ici, on peut accder au priphrique par l'intermdiaire du point - de montage /mnt. + de montage /mnt. Il est à noter que toutes ces oprations Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/install/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/install/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/install/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -799,7 +799,7 @@ pqb0.0.1.4.0 PQB0 sur votre mdia d'installation dans le rpertoire floppies/ et peuvent galement tre tlcharges par FTP depuis le - rpertoire floppies, + rpertoire floppies, ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<arch>/<version>-RELEASE/floppies/. Remplacez <arch> et <version> avec Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -328,10 +328,10 @@ o l'environnement jail se trouvera dans le systme de fichiers de la machine hte. Un bon choix peut tre /usr/jail/jailname, + class="directory">/usr/jail/jailname, o jailname est le nom de machine identifiant l'environnement jail. Le systme - de fichiers /usr/ + de fichiers /usr/ dispose gnralement de suffisamment d'espace pour le systme de fichiers de l'environnement jail, qui est pour les environnements complets, @@ -356,10 +356,10 @@ configuration ncessaires. Ou pour faire simple, cette commande installe tous les fichiers installables du rpertoire /usr/src/etc/ vers le - rpertoire /etc + class="directory">/usr/src/etc/ vers le + rpertoire /etc de l'environnement jail: $D/etc/. + class="directory">$D/etc/. Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -352,7 +352,7 @@ Le nouveau noyau sera copi dans le rpertoire - /boot/kernel avec le nom + /boot/kernel avec le nom /boot/kernel/kernel et l'ancien noyau sera renomm en /boot/kernel.old/kernel. Maintenant, arrtez le systme et redmarrez pour utiliser votre Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -1507,7 +1507,7 @@ freefall MX 20 who.cdrom.com/usr/src/usr.sbin/sendmail/cf. + class="directory">/usr/src/usr.sbin/sendmail/cf. Si vous n'avez pas install toutes les sources du systme, l'ensemble des fichiers de configuration de @@ -1521,7 +1521,7 @@ freefall MX 20 who.cdrom.comCette extraction ne donne lieu qu'à une centaine de kilo-octets. Le fichier README dans le - rpertoire cf + rpertoire cf pourra faire office d'une introduction à la configuration &man.m4.1;. @@ -1534,7 +1534,7 @@ freefall MX 20 who.cdrom.comTout d'abord, vous devez crer votre fichier .mc. Le rpertoire /usr/src/usr.sbin/sendmail/cf/cf + class="directory">/usr/src/usr.sbin/sendmail/cf/cf contient quelques exemples. En supposant que vous avez appel votre fichier foo.mc, tout ce dont vous avez besoin de faire pour le convertir en un fichier @@ -1738,7 +1738,7 @@ hostname=_HOSTNAME_ mail/ssmtp dispose d'autres options. Consultez le fichier de configuration d'exemple dans le rpertoire /usr/local/etc/ssmtp ou la page de + class="directory">/usr/local/etc/ssmtp ou la page de manuel de ssmtp pour quelques exemples et plus d'informations. @@ -2084,7 +2084,7 @@ sasl_pwcheck_program="/usr/local/sbin/pw &prompt.user; mail Le contenu de la bote aux lettres de l'utilisateur - dans /var/mail est + dans /var/mail est automatiquement lu par l'utilitaire mail. Si la bote est vide, l'utilitaire rend la main avec un message indiquant qu'aucun courrier lectronique ne @@ -2241,7 +2241,7 @@ EOT mutt lira automatiquement le contenu de la bote aux lettres de l'utilisateur dans - /var/mail et en affiche + /var/mail et en affiche le contenu le cas chant. Si aucun message n'est trouv dans cette bote, alors mutt attendra une commande de @@ -2381,7 +2381,7 @@ EOT Le rpertoire ouvert par dfaut par pine est inbox. Pour afficher l'index des + class="directory">inbox. Pour afficher l'index des messages, appuyez sur I, ou slectionnez l'option MESSAGE INDEX comme montr ci-dessous: Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Apr 4 11:39:28 2013 (r41365) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) @@ -2691,11 +2691,11 @@ doc/zh_* Portsnap ne met pas à jour le catalogue des logiciels ports directement dans le rpertoire /usr/ports; le logiciel travaille + class="directory">/usr/ports; le logiciel travaille plutt par dfaut sur une version compresse de l'arborescence des logiciels ports dans le rpertoire /var/db/portsnap. Cette copie + class="directory">/var/db/portsnap. Cette copie compresse est ensuite utilise pour mettre à jour le catalogue des logiciels ports. @@ -2704,8 +2704,8 @@ doc/zh_* install à partir du catalogue des logiciels ports de &os;, alors l'emplacement par dfaut pour son instantan compress sera /usr/local/portsnap au lieu de - /var/db/portsnap. + class="directory">/usr/local/portsnap au lieu de + /var/db/portsnap. @@ -2754,8 +2754,8 @@ doc/zh_* instantan compress de l'intgralit de l'arborescence des logiciels ports dans /var/db/portsnap (ou /usr/local/portsnap si + class="directory">/var/db/portsnap (ou /usr/local/portsnap si Portsnap a t install à partir du catalogue des logiciels ports). Au dbut de l'anne 2006, cela @@ -2768,7 +2768,7 @@ doc/zh_* t rcupr, une copie utilisable de l'arborescence des logiciels ports peut tre extraite dans le rpertoire /usr/ports. Cela est + class="directory">/usr/ports. Cela est ncessaire mme si une arborescence a djà t cre dans ce rpertoire (par exemple en utilisant *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Thu Apr 4 12:10:49 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 55927233; Thu, 4 Apr 2013 12:10:49 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 47535AAB; Thu, 4 Apr 2013 12:10:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r34CAn0l042493; Thu, 4 Apr 2013 12:10:49 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r34CAmJe042489; Thu, 4 Apr 2013 12:10:48 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304041210.r34CAmJe042489@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 4 Apr 2013 12:10:48 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41367 - in projects/xml-tools/fr_FR.ISO8859-1/books/handbook: cutting-edge l10n linuxemu X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2013 12:10:49 -0000 Author: gabor Date: Thu Apr 4 12:10:48 2013 New Revision: 41367 URL: http://svnweb.freebsd.org/changeset/doc/41367 Log: - Reduce the misuse of role attribute; role="directory" should actually be class="directory" Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml projects/xml-tools/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml Thu Apr 4 12:10:48 2013 (r41367) @@ -1034,7 +1034,7 @@ Fetching 133 new ports or files... done. avec le fichier supfile nomm standard-supfile disponible dans le rpertoire /usr/share/examples/cvsup. + class='directory'>/usr/share/examples/cvsup. C'est la mthode recommande, puisqu'elle permet de rcuprer la totalit des sources la premire fois et par la suite @@ -1292,7 +1292,7 @@ Fetching 133 new ports or files... done. avec le fichier supfile nomm stable-supfile disponible dans le rpertoire /usr/share/examples/cvsup. + class='directory'>/usr/share/examples/cvsup. C'est la mthode recommande, puisqu'elle permet de rcuprer la totalit des sources la premire fois et par la suite Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml Thu Apr 4 12:10:48 2013 (r41367) @@ -900,10 +900,10 @@ font8x8="cp866-8x8" utilise, et fixe la table de conversion de caractres. Pour utiliser l'option assurez-vous de monter /usr avant la partition &ms-dos;, + class='directory'>/usr avant la partition &ms-dos;, car en effet les tables de conversion sont situes dans le rpertoire /usr/libdata/msdosfs. Pour plus + class='directory'>/usr/libdata/msdosfs. Pour plus d'informations, consultez la page de manuel &man.mount.msdosfs.8;. Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml Thu Apr 4 11:40:58 2013 (r41366) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml Thu Apr 4 12:10:48 2013 (r41367) @@ -1829,7 +1829,7 @@ export PATH /dev/da0s1a 1.016.303 1 - / + / @@ -1843,35 +1843,35 @@ export PATH /dev/da0s1e 2.032.623 2 - /var + /var /dev/da0s1f 8.205.339 8 - /usr + /usr /dev/da1s1e 45.734.361 45 - /compat/linux/oracle + /compat/linux/oracle /dev/da1s1f 2.032.623 2 - /compat/linux/sapmnt + /compat/linux/sapmnt /dev/da1s1g 2.032.623 2 - /compat/linux/usr/sap + /compat/linux/usr/sap @@ -2014,17 +2014,17 @@ pam-0.68-7.i386.rpm
- /compat/linux/oracle + /compat/linux/oracle 45 Go - /compat/linux/sapmnt + /compat/linux/sapmnt 2 Go - /compat/linux/usr/sap + /compat/linux/usr/sap 2 Go @@ -2216,7 +2216,7 @@ Shell: bash (/compat/linux/bin/bash)

orasid. Ce seront tous les rpertoires du type - /oracle/SID: + /oracle/SID:&prompt.root; su - orasid &prompt.root; cd /oracle/SID @@ -2239,7 +2239,7 @@ Shell: bash (/compat/linux/bin/bash)

mkdir 817_32Le rpertoire client/80x_32 est + class='directory'>client/80x_32 est cr tel quel. Ne remplacez pas le x par quelque chose d'autre. @@ -2422,7 +2422,7 @@ options SEMUME=100 #number of UNDO Excuter la procdure d'installationTout d'abord, vous devez prparer un rpertoire - install: + install:&prompt.root; cd /oracle/SID/sapreorg &prompt.root; mkdir install @@ -2431,7 +2431,7 @@ options SEMUME=100 #number of UNDO Ensuite la procdure d'installation est lance, qui copiera tous fichiers correspondant dans le rpertoire install: + class='directory'>install: &prompt.root; /oracle/SID/sapreorg/KERNEL/UNIX/INSTTOOL.SH @@ -2447,7 +2447,7 @@ options SEMUME=100 #number of UNDO IDES, on doit donc copier le fichier CENTRDB.R3S correspondant du rpertoire EXPORT1, sinon + class='directory'>EXPORT1, sinon R3SETUP ne demandera que trois CDs EXPORT. @@ -2958,7 +2958,7 @@ options SEMUME=100 #number of UNDO avez produite à partir du rpertoire d'installation sur un systme Linux, et dsarchivez-la dans le rpertoire /oracle/SID/817_32/. + class='directory'>/oracle/SID/817_32/. @@ -3713,7 +3713,7 @@ drwxrwxr-x 11 idsadm sapsys 512 May 4 14 consultez les fichiers journaux correspondants qui peuvent tre trouvs dans le rpertoire /usr/sap/SID/DVEBMGSnr/work/. + class='directory'>/usr/sap/SID/DVEBMGSnr/work/. Les fichiers à consulter sont dev_ms et dev_disp. @@ -3865,11 +3865,11 @@ options SHMMAXPGS=393216 unionfs!) de montage des systmes de fichiers. Tout d'abord, une tentative est faite pour rechercher le fichier dans le rpertoire /compat/linux/chemin-origine, + class='directory'>/compat/linux/chemin-origine, puis uniquement si cela choue, la recherche est effectue dans le rpertoire /chemin-origine. + class='directory'>/chemin-origine. Cela permet de s'assurer que les binaires ncessitant d'autres binaires puissent s'excuter (par exemple, l'ensemble des outils Linux peuvent tourner sous l'ABI Linux). @@ -3877,7 +3877,7 @@ options SHMMAXPGS=393216 charger et excuter les binaires &os;, s'il n'y a pas de binaires Linux correspondant prsents, et vous pourriez placer une commande &man.uname.1; dans l'arborescence - /compat/linux pour vous + /compat/linux pour vous assurer que les binaires Linux ne puissent pas dire qu'ils ne tournent pas sous Linux. From owner-svn-doc-projects@FreeBSD.ORG Thu Apr 4 12:11:44 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 888BB293; Thu, 4 Apr 2013 12:11:44 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7ACB7ABA; Thu, 4 Apr 2013 12:11:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r34CBicu044244; Thu, 4 Apr 2013 12:11:44 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r34CBiM6044242; Thu, 4 Apr 2013 12:11:44 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304041211.r34CBiM6044242@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 4 Apr 2013 12:11:44 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41368 - projects/xml-tools/share/xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2013 12:11:44 -0000 Author: gabor Date: Thu Apr 4 12:11:43 2013 New Revision: 41368 URL: http://svnweb.freebsd.org/changeset/doc/41368 Log: - Backport some constraints from DocBook 5.0; this will help keeping things consistent and facilitate a future technology upgrade Modified: projects/xml-tools/share/xml/freebsd.sch Modified: projects/xml-tools/share/xml/freebsd.sch ============================================================================== --- projects/xml-tools/share/xml/freebsd.sch Thu Apr 4 12:10:48 2013 (r41367) +++ projects/xml-tools/share/xml/freebsd.sch Thu Apr 4 12:11:43 2013 (r41368) @@ -38,4 +38,173 @@ Invalid os value (); must be either 'freebsd8', 'freebsd9' or 'freebsd10'. + + + + + + @linkend on firstterm must point to a glossentry. + + + + + + @linkend on footnoteref must point to a footnote. + + + + + + @linkend on glossterm must point to a glossentry. + + + + + + @linkend on synopfragmentref must point to a synopfragment. + + + + + + @otherterm on glosssee must point to a glossentry. + + + + + + @otherterm on glossseealso must point to a glossentry. + + + + + + A termdef must contain exactly one firstterm + + + + + + The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist + + + + + + annotation must not occur in the descendants of annotation + + + caution must not occur in the descendants of caution + important must not occur in the descendants of caution + note must not occur in the descendants of caution + tip must not occur in the descendants of caution + warning must not occur in the descendants of caution + + + caution must not occur in the descendants of important + important must not occur in the descendants of important + note must not occur in the descendants of important + tip must not occur in the descendants of important + warning must not occur in the descendants of important + + + caution must not occur in the descendants of note + important must not occur in the descendants of note + note must not occur in the descendants of note + tip must not occur in the descendants of note + warning must not occur in the descendants of note + + + caution must not occur in the descendants of tip + important must not occur in the descendants of tip + note must not occur in the descendants of tip + tip must not occur in the descendants of tip + warning must not occur in the descendants of tip + + + caution must not occur in the descendants of warning + important must not occur in the descendants of warning + note must not occur in the descendants of warning + tip must not occur in the descendants of warning + warning must not occur in the descendants of warning + + + caution must not occur in the descendants of caption + equation must not occur in the descendants of caption + example must not occur in the descendants of caption + figure must not occur in the descendants of caption + important must not occur in the descendants of caption + note must not occur in the descendants of caption + sidebar must not occur in the descendants of caption + table must not occur in the descendants of caption + task must not occur in the descendants of caption + tip must not occur in the descendants of caption + warning must not occur in the descendants of caption + + + caution must not occur in the descendants of equation + equation must not occur in the descendants of equation + example must not occur in the descendants of equation + figure must not occur in the descendants of equation + important must not occur in the descendants of equation + note must not occur in the descendants of equation + table must not occur in the descendants of equation + tip must not occur in the descendants of equation + warning must not occur in the descendants of equation + + + caution must not occur in the descendants of example + equation must not occur in the descendants of example + example must not occur in the descendants of example + figure must not occur in the descendants of example + important must not occur in the descendants of example + note must not occur in the descendants of example + table must not occur in the descendants of example + tip must not occur in the descendants of example + warning must not occur in the descendants of example + + + caution must not occur in the descendants of figure + equation must not occur in the descendants of figure + example must not occur in the descendants of figure + figure must not occur in the descendants of figure + important must not occur in the descendants of figure + note must not occur in the descendants of figure + table must not occur in the descendants of figure + tip must not occur in the descendants of figure + warning must not occur in the descendants of figure + + + caution must not occur in the descendants of table + equation must not occur in the descendants of table + example must not occur in the descendants of table + figure must not occur in the descendants of table + important must not occur in the descendants of table + informaltable must not occur in the descendants of table + note must not occur in the descendants of table + tip must not occur in the descendants of table + warning must not occur in the descendants of table + + + caution must not occur in the descendants of footnote + epigraph must not occur in the descendants of footnote + equation must not occur in the descendants of footnote + example must not occur in the descendants of footnote + figure must not occur in the descendants of footnote + footnote must not occur in the descendants of footnote + important must not occur in the descendants of footnote + indexterm must not occur in the descendants of footnote + note must not occur in the descendants of footnote + sidebar must not occur in the descendants of footnote + table must not occur in the descendants of footnote + task must not occur in the descendants of footnote + tip must not occur in the descendants of footnote + warning must not occur in the descendants of footnote + + + sidebar must not occur in the descendants of sidebar + + From owner-svn-doc-projects@FreeBSD.ORG Fri Apr 5 13:11:12 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D06717CC; Fri, 5 Apr 2013 13:11:12 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C209C680; Fri, 5 Apr 2013 13:11:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35DBCXQ089124; Fri, 5 Apr 2013 13:11:12 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35DBBjL089119; Fri, 5 Apr 2013 13:11:11 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304051311.r35DBBjL089119@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 5 Apr 2013 13:11:11 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41372 - in projects/xml-tools: en_US.ISO8859-1/books/handbook share/xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2013 13:11:12 -0000 Author: gabor Date: Fri Apr 5 13:11:11 2013 New Revision: 41372 URL: http://svnweb.freebsd.org/changeset/doc/41372 Log: - Use more human-friendly pubdate and releaseinfo renderings - Merge copyright years into intervals - Try to produce cleaner XHTML Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml projects/xml-tools/share/xsl/freebsd-common.xsl projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl projects/xml-tools/share/xsl/freebsd-xhtml-titlepage.xsl projects/xml-tools/share/xsl/titlepage.templates.xml Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml Fri Apr 5 10:22:55 2013 (r41371) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/book.xml Fri Apr 5 13:11:11 2013 (r41372) @@ -19,7 +19,7 @@ The FreeBSD Documentation Project - February 1999 + $FreeBSD$ $FreeBSD$ Modified: projects/xml-tools/share/xsl/freebsd-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-common.xsl Fri Apr 5 10:22:55 2013 (r41371) +++ projects/xml-tools/share/xsl/freebsd-common.xsl Fri Apr 5 13:11:11 2013 (r41372) @@ -12,7 +12,13 @@ - + + + + + + Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Fri Apr 5 10:22:55 2013 (r41371) +++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Fri Apr 5 13:11:11 2013 (r41372) @@ -5,6 +5,8 @@ @@ -21,6 +23,11 @@ + + + + +

This, and other documents, can be downloaded @@ -32,19 +39,28 @@ For questions about this documentation, e-mail <doc@FreeBSD.org>.

 - + + + + - http://svnweb.freebsd.org/base?view=revision&revision= - + + + + - + + + + + http://www.FreeBSD.org/cgi/man.cgi?query= @@ -131,4 +147,29 @@ + + + + + Current Revision: + + + + + + + + + + + by + + + + + + + + Last modified on . + Modified: projects/xml-tools/share/xsl/freebsd-xhtml-titlepage.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-titlepage.xsl Fri Apr 5 10:22:55 2013 (r41371) +++ projects/xml-tools/share/xsl/freebsd-xhtml-titlepage.xsl Fri Apr 5 13:11:11 2013 (r41372) @@ -168,7 +168,8 @@
- + +
@@ -186,7 +187,8 @@
- + +
@@ -355,7 +357,8 @@
- + +
@@ -373,7 +376,8 @@
- + +
@@ -542,7 +546,8 @@
- + +
@@ -560,7 +565,8 @@
- + +
@@ -729,7 +735,8 @@
- + +
@@ -747,7 +754,8 @@
- + +
@@ -933,7 +941,8 @@
- + +
@@ -951,7 +960,8 @@
- + +
@@ -1137,7 +1147,8 @@
- + +
@@ -1155,7 +1166,8 @@
- + +
@@ -1580,7 +1592,8 @@
- + +
@@ -1598,7 +1611,8 @@
- + +
@@ -1786,7 +1800,8 @@
- + +
@@ -1804,7 +1819,8 @@
- + +
@@ -1990,7 +2006,8 @@
- + +
@@ -2008,7 +2025,8 @@
- + +
@@ -2179,7 +2197,8 @@
- + +
@@ -2197,7 +2216,8 @@
- + +
@@ -2368,7 +2388,8 @@
- + +
@@ -2386,7 +2407,8 @@
- + +
@@ -2557,7 +2579,8 @@
- + +
@@ -2575,7 +2598,8 @@
- + +
@@ -2746,7 +2770,8 @@
- + +
@@ -2764,7 +2789,8 @@
- + +
@@ -2935,7 +2961,8 @@
- + +
@@ -2953,7 +2980,8 @@
- + +
@@ -3124,7 +3152,8 @@
- + +
@@ -3142,7 +3171,8 @@
- + +
@@ -3330,7 +3360,8 @@
- + +
@@ -3348,7 +3379,8 @@
- + +
Modified: projects/xml-tools/share/xsl/titlepage.templates.xml ============================================================================== --- projects/xml-tools/share/xsl/titlepage.templates.xml Fri Apr 5 10:22:55 2013 (r41371) +++ projects/xml-tools/share/xsl/titlepage.templates.xml Fri Apr 5 13:11:11 2013 (r41372) @@ -22,10 +22,10 @@ - + - + @@ -55,10 +55,10 @@ - + - + @@ -88,10 +88,10 @@ - + - + @@ -124,10 +124,10 @@ - + - + @@ -154,10 +154,10 @@ - + - + @@ -186,10 +186,10 @@ - + - + @@ -290,10 +290,10 @@ - + - + @@ -322,10 +322,10 @@ - + - + @@ -354,10 +354,10 @@ - + - + @@ -386,10 +386,10 @@ - + - + @@ -417,10 +417,10 @@ - + - + @@ -448,10 +448,10 @@ - + - + @@ -479,10 +479,10 @@ - + - + @@ -510,10 +510,10 @@ - + - + @@ -541,10 +541,10 @@ - + - + @@ -572,10 +572,10 @@ - + - + From owner-svn-doc-projects@FreeBSD.ORG Fri Apr 5 20:14:53 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id ADCA2559; Fri, 5 Apr 2013 20:14:53 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9053BB1E; Fri, 5 Apr 2013 20:14:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35KEqNw012958; Fri, 5 Apr 2013 20:14:52 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35KEqYr012957; Fri, 5 Apr 2013 20:14:52 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304052014.r35KEqYr012957@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 5 Apr 2013 20:14:52 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41379 - projects/xml-tools/share/xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2013 20:14:53 -0000 Author: gabor Date: Fri Apr 5 20:14:52 2013 New Revision: 41379 URL: http://svnweb.freebsd.org/changeset/doc/41379 Log: - Better support I18N Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Fri Apr 5 18:57:46 2013 (r41378) +++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Fri Apr 5 20:14:52 2013 (r41379) @@ -29,6 +29,14 @@ + + + + + + + +

This, and other documents, can be downloaded from ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/

@@ -151,7 +159,11 @@ - Current Revision: + + + + : + @@ -162,7 +174,7 @@ - by + @@ -170,6 +182,30 @@ - Last modified on . + + + + + + + + + + + + + + + + Last modified on + + + + + + + + + . From owner-svn-doc-projects@FreeBSD.ORG Sat Apr 6 16:40:33 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 650F26A1; Sat, 6 Apr 2013 16:40:33 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 58373676; Sat, 6 Apr 2013 16:40:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r36GeXWc055742; Sat, 6 Apr 2013 16:40:33 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r36GeXYe055741; Sat, 6 Apr 2013 16:40:33 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304061640.r36GeXYe055741@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 6 Apr 2013 16:40:33 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41387 - projects/xml-tools/share/xsl X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Apr 2013 16:40:33 -0000 Author: gabor Date: Sat Apr 6 16:40:32 2013 New Revision: 41387 URL: http://svnweb.freebsd.org/changeset/doc/41387 Log: - Make bridgehead actually render as specified in the renderas attribute Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl ============================================================================== --- projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Sat Apr 6 15:43:09 2013 (r41386) +++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl Sat Apr 6 16:40:32 2013 (r41387) @@ -47,6 +47,72 @@ For questions about this documentation, e-mail <doc@FreeBSD.org>.

 + + + + + + + 1 + + + + + + + + + + + + 1 + + + + + + + 2 + 3 + 4 + 5 + 6 + + + + + + + + title + + + + + + + From owner-svn-doc-projects@FreeBSD.ORG Sat Apr 6 16:41:30 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5B0576EF; Sat, 6 Apr 2013 16:41:30 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4CE7567E; Sat, 6 Apr 2013 16:41:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r36GfUPV057462; Sat, 6 Apr 2013 16:41:30 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r36GfU81057461; Sat, 6 Apr 2013 16:41:30 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201304061641.r36GfU81057461@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 6 Apr 2013 16:41:30 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41388 - projects/xml-tools/share/misc X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Apr 2013 16:41:30 -0000 Author: gabor Date: Sat Apr 6 16:41:29 2013 New Revision: 41388 URL: http://svnweb.freebsd.org/changeset/doc/41388 Log: - Render corpauthor in the same way as author - Use more consistent styling for Table of Contents, and List of Foobar headers Modified: projects/xml-tools/share/misc/docbook.css Modified: projects/xml-tools/share/misc/docbook.css ============================================================================== --- projects/xml-tools/share/misc/docbook.css Sat Apr 6 16:40:32 2013 (r41387) +++ projects/xml-tools/share/misc/docbook.css Sat Apr 6 16:41:29 2013 (r41388) @@ -72,7 +72,11 @@ div.procedure p b { } h1.title, h2.title, h3.title, h4.title, h5.title, h6.title, -h3.author { +h3.author, .corpauthor, .abstract p.title, +div.toc p:first-child, +div.list-of-figures p:first-child, +div.list-of-tables p:first-child, +div.list-of-examples p:first-child { line-height: 1.3; margin-left: 0; color: #990000;