Date: Tue, 14 Jan 2014 23:58:51 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r260657 - in releng/10.0/release/doc: de_DE.ISO8859-1 en_US.ISO8859-1/errata en_US.ISO8859-1/hardware en_US.ISO8859-1/readme en_US.ISO8859-1/relnotes en_US.ISO8859-1/share/xml fr_FR.ISO... Message-ID: <201401142358.s0ENwp77031045@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Tue Jan 14 23:58:50 2014 New Revision: 260657 URL: http://svnweb.freebsd.org/changeset/base/260657 Log: - MFC 260656: * Purge old translations. * Add missing footer due to DSSSL->XSLT migration and use XML catalog to resolve URI. * Add missing arch= and revision= support. * Update release.ent and fix release number in Errata. - Trim copyright year. - Trim merged= attr. It is useless for release branch. - Move entities into release.ent. - Update footer for a release. - Document rc.d/sendmail certification support[1]. - Update BIND removal entry to mention NLnet Labs[2]. Submitted by: jmg[1] Suggested by: erwin[2] Approved by: re (implicitly) Added: releng/10.0/release/doc/en_US.ISO8859-1/share/xml/catalog.xml - copied unchanged from r260656, stable/10/release/doc/en_US.ISO8859-1/share/xml/catalog.xml releng/10.0/release/doc/en_US.ISO8859-1/share/xml/release.xsl - copied, changed from r260656, stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl releng/10.0/release/doc/share/xml/release.xsl - copied unchanged from r260656, stable/10/release/doc/share/xml/release.xsl Deleted: releng/10.0/release/doc/de_DE.ISO8859-1/ releng/10.0/release/doc/en_US.ISO8859-1/share/xml/catalog releng/10.0/release/doc/en_US.ISO8859-1/share/xml/release.dsl releng/10.0/release/doc/fr_FR.ISO8859-1/ releng/10.0/release/doc/ja_JP.eucJP/ releng/10.0/release/doc/ru_RU.KOI8-R/ releng/10.0/release/doc/share/xml/catalog releng/10.0/release/doc/share/xml/default.dsl releng/10.0/release/doc/share/xml/release.dsl releng/10.0/release/doc/zh_CN.GB2312/ Modified: releng/10.0/release/doc/en_US.ISO8859-1/errata/article.xml releng/10.0/release/doc/en_US.ISO8859-1/hardware/article.xml releng/10.0/release/doc/en_US.ISO8859-1/readme/article.xml releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml releng/10.0/release/doc/share/mk/doc.relnotes.mk releng/10.0/release/doc/share/xml/catalog.xml releng/10.0/release/doc/share/xml/release.ent Modified: releng/10.0/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/errata/article.xml Tue Jan 14 23:15:53 2014 (r260656) +++ releng/10.0/release/doc/en_US.ISO8859-1/errata/article.xml Tue Jan 14 23:58:50 2014 (r260657) @@ -26,20 +26,6 @@ <pubdate>$FreeBSD$</pubdate> <copyright> - <year>2000</year> - <year>2001</year> - <year>2002</year> - <year>2003</year> - <year>2004</year> - <year>2005</year> - <year>2006</year> - <year>2007</year> - <year>2008</year> - <year>2009</year> - <year>2010</year> - <year>2011</year> - <year>2012</year> - <year>2013</year> <year>2014</year> <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> Modified: releng/10.0/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Jan 14 23:15:53 2014 (r260656) +++ releng/10.0/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Jan 14 23:58:50 2014 (r260657) @@ -15,20 +15,6 @@ <pubdate>$FreeBSD$</pubdate> <copyright> - <year>2000</year> - <year>2001</year> - <year>2002</year> - <year>2003</year> - <year>2004</year> - <year>2005</year> - <year>2006</year> - <year>2007</year> - <year>2008</year> - <year>2009</year> - <year>2010</year> - <year>2011</year> - <year>2012</year> - <year>2013</year> <year>2014</year> <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> Modified: releng/10.0/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/readme/article.xml Tue Jan 14 23:15:53 2014 (r260656) +++ releng/10.0/release/doc/en_US.ISO8859-1/readme/article.xml Tue Jan 14 23:58:50 2014 (r260657) @@ -21,20 +21,6 @@ <pubdate>$FreeBSD$</pubdate> <copyright> - <year>2000</year> - <year>2001</year> - <year>2002</year> - <year>2003</year> - <year>2004</year> - <year>2005</year> - <year>2006</year> - <year>2007</year> - <year>2008</year> - <year>2009</year> - <year>2010</year> - <year>2011</year> - <year>2012</year> - <year>2013</year> <year>2014</year> <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Jan 14 23:15:53 2014 (r260656) +++ releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Jan 14 23:58:50 2014 (r260657) @@ -3,23 +3,6 @@ "../../../share/xml/freebsd50.dtd" [ <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent"> %release; - -<!-- local entities not available in doc/release/10.0.0 tag --> -<!ENTITY man.drill.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>drill</refentrytitle><manvolnum>1</manvolnum></citerefentry>">; -<!ENTITY man.freebsd-version.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>freebsd-version</refentrytitle><manvolnum>1</manvolnum></citerefentry>">; -<!ENTITY man.jemalloc.3 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>jemalloc</refentrytitle><manvolnum>3</manvolnum></citerefentry>">; -<!ENTITY man.bhyve.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>bhyve</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; -<!ENTITY man.nvme.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>nvme</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; -<!ENTITY man.virtio.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>virtio</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; -<!ENTITY man.virtio_balloon.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>virtio_balloon</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; -<!ENTITY man.virtio_blk.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>virtio_blk</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; -<!ENTITY man.virtio_scsi.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>virtio_scsi</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; -<!ENTITY man.vmx.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>vmx</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; -<!ENTITY man.pkg.7 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg</refentrytitle><manvolnum>7</manvolnum></citerefentry>">; -<!ENTITY man.bhyve.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>bhyve</refentrytitle><manvolnum>8</manvolnum></citerefentry>">; -<!ENTITY man.gptboot.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>gptboot</refentrytitle><manvolnum>8</manvolnum></citerefentry>">; -<!ENTITY man.bsdconfig.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>bsdconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry>">; -<!ENTITY man.unbound.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>unbound</refentrytitle><manvolnum>8</manvolnum></citerefentry>">; ]> <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> <info><title>&os; &release.current; Release Notes</title> @@ -29,19 +12,6 @@ <pubdate>$FreeBSD$</pubdate> <copyright> - <year>2000</year> - <year>2001</year> - <year>2002</year> - <year>2003</year> - <year>2004</year> - <year>2005</year> - <year>2006</year> - <year>2007</year> - <year>2008</year> - <year>2009</year> - <year>2010</year> - <year>2011</year> - <year>2012</year> <year>2013</year> <year>2014</year> <holder role="mailto:doc@FreeBSD.org">The &os; Documentation @@ -80,21 +50,7 @@ available online at <uri xlink:href="&release.url;10.0R/relnotes.html">&release.url;10.0R/relnotes.html</uri>.</para> - <para releasetype="current">The &release.type; distribution to which - these release notes apply represents the latest point along the - &release.branch; development branch since &release.branch; was - created. Information regarding pre-built, binary &release.type; - distributions along this branch can be found at <uri - xlink:href="&release.url;">&release.url;</uri>.</para> - - <para releasetype="snapshot">The &release.type; distribution to - which these release notes apply represents a point along the - &release.branch; development branch between &release.prev; and the - future &release.next;. Information regarding pre-built, binary - &release.type; distributions along this branch can be found at - <uri xlink:href="&release.url;">&release.url;</uri>.</para> - - <para releasetype="release">This distribution of &os; + <para>This distribution of &os; &release.current; is a &release.type; distribution. It can be found at <uri xlink:href="&release.url;">&release.url;</uri> or any of its mirrors. More information on obtaining this (or other) @@ -116,9 +72,7 @@ <title>What's New</title> <para>This section describes the most user-visible new or changed - features in &os; since &release.prev;. In general, changes - described here are unique to the &release.branch; branch unless - specifically marked as &merged; features.</para> + features in &os; since &release.prev;.</para> <para>Typical release note items document recent security advisories issued after &release.prev;, new drivers or hardware support, new @@ -211,20 +165,20 @@ &man.cpuset.1; userland utility has been added to allow manipulation of processor sets.</para> - <para role="merged">The &man.ddb.4; kernel debugger now has an + <para>The &man.ddb.4; kernel debugger now has an output capture facility. Input and output from &man.ddb.4; can now be captured to a memory buffer for later inspection using &man.sysctl.8; or a textdump. The new <command>capture</command> command controls this feature.</para> - <para role="merged">The &man.ddb.4; debugger now supports a simple + <para>The &man.ddb.4; debugger now supports a simple scripting facility, which supports a set of named scripts consisting of a set of &man.ddb.4; commands. These commands can be managed from within &man.ddb.4; or with the use of the new &man.ddb.8; utility. More details can be found in the &man.ddb.4; manual page.</para> - <para role="merged">The kernel now supports a new textdump format + <para>The kernel now supports a new textdump format of kernel dumps. A textdump provides higher-level information via mechanically generated/extracted debugging output, rather than a simple memory dump. This facility can be used to @@ -251,7 +205,7 @@ <para arch="amd64">The &os; kernel now has support for large memory page mappings (<quote>superpages</quote>).</para> - <para arch="amd64,i386,ia64,powerpc" role="merged">The ULE + <para arch="amd64,i386,ia64,powerpc">The ULE scheduler is now the default process scheduler in <filename>GENERIC</filename> kernels.</para> @@ -340,12 +294,12 @@ hv_vmbus_load="YES"</programlisting> <sect3 xml:id="boot"> <title>Boot Loader Changes</title> - <para arch="amd64,i386" role="merged">The BTX kernel used by the + <para arch="amd64,i386">The BTX kernel used by the boot loader has been changed to invoke BIOS routines from real mode. This change makes it possible to boot &os; from USB devices.</para> - <para arch="amd64,i386" role="merged">A new &man.gptboot.8; boot + <para arch="amd64,i386">A new &man.gptboot.8; boot loader has been added to support booting from a GPT labeled disk. A new <command>boot</command> command has been added to &man.gpart.8;, which makes a GPT disk bootable by writing the @@ -356,13 +310,13 @@ hv_vmbus_load="YES"</programlisting> <sect3 xml:id="proc"> <title>Hardware Support</title> - <para role="merged">The &man.cmx.4; driver, a driver for Omnikey + <para>The &man.cmx.4; driver, a driver for Omnikey CardMan 4040 PCMCIA smartcard readers, has been added.</para> <para>The &man.syscons.4; driver now supports the Colemak keyboard layout.</para> - <para role="merged">The &man.uslcom.4; driver, a driver for + <para>The &man.uslcom.4; driver, a driver for Silicon Laboratories CP2101/CP2102-based USB serial adapters, has been imported from OpenBSD.</para> @@ -411,7 +365,7 @@ hv_vmbus_load="YES"</programlisting> number of outstanding issues. It also now works on all architectures.</para> - <para arch="amd64,i386" role="merged">The &man.wpi.4; driver has + <para arch="amd64,i386">The &man.wpi.4; driver has been updated to include a number of stability fixes.</para> <para revision="248925">The &man.cxgbe.4; driver has been @@ -478,7 +432,7 @@ hv_vmbus_load="YES"</programlisting> <sect3 xml:id="disks"> <title>Disks and Storage</title> - <para role="merged">The &man.aac.4; driver now supports volumes + <para>The &man.aac.4; driver now supports volumes larger than 2TB in size.</para> <para>The &man.ata.4; driver now supports a spindown command for @@ -488,7 +442,7 @@ hv_vmbus_load="YES"</programlisting> supports a <command>spindown</command> command to configure this feature.</para> - <para role="merged">The &man.hptrr.4; driver has been updated to + <para>The &man.hptrr.4; driver has been updated to version 1.2 from Highpoint.</para> <para revision="240616">&man.nvme.4; has been added and provides @@ -568,12 +522,17 @@ hv_vmbus_load="YES"</programlisting> xlink:href="http://llvm.org/releases/3.3/tools/clang/docs/ReleaseNotes.html">; Clang 3.3 Release Notes</link>.</para> - <para role="merged" revision="255949">BIND has been replaced by - &man.unbound.8; for local DNS resolution in the base system. + <para revision="255949"><application>BIND</application> has been + removed from the base system. &man.unbound.8;, which is + maintained by NLnet Labs, has been imported to support local DNS + resolution functionality with DNSSEC. Note that it is not a + replacement of <application>BIND</application> and the latest + versions of <application>BIND</application> is still available + in the Ports Collection. With this change, nslookup and dig are no longer a part of the base system. Users should instead use &man.host.1; and &man.drill.1; Alternatively, nslookup and dig can be obtained by - installing the dns/bind-tools port.</para> + installing <filename>dns/bind-tools</filename> port.</para> <para revision="225937">sysinstall has been removed from the base system. Auxiliary libraries and tools used by sysinstall such @@ -607,7 +566,7 @@ hv_vmbus_load="YES"</programlisting> <quote>Portable</quote> BSD make tool (bmake) from NetBSD.</para> - <para role="merged">The &man.adduser.8; utility now supports + <para>The &man.adduser.8; utility now supports a <option>-M</option> option to set the mode of a new user's home directory.</para> @@ -618,7 +577,7 @@ hv_vmbus_load="YES"</programlisting> <para>BSD-licensed versions of &man.bc.1; and &man.dc.1; have replaced their GNU counterparts.</para> - <para role="merged">&man.chflags.1; now supports + <para>&man.chflags.1; now supports a <option>-v</option> flag for verbose output and a <option>-f</option> flag to ignore errors with the same semantics as (for example) &man.chmod.1;.</para> @@ -641,7 +600,7 @@ hv_vmbus_load="YES"</programlisting> <para>The &man.fdopendir.3; library function has been added.</para> - <para role="merged">The &man.fetch.3; library now supports HTTP + <para>The &man.fetch.3; library now supports HTTP 1.1 If-Modified-Since behavior. The &man.fetch.1; program now supports <option>-i <replaceable>filename</replaceable></option> which will only download the specified HTTP URL if the content @@ -673,7 +632,7 @@ hv_vmbus_load="YES"</programlisting> <para>The &man.procstat.1; utility has been added to display detailed information about processes.</para> - <para role="merged">The &man.realpath.1; utility now supports + <para>The &man.realpath.1; utility now supports a <option>-q</option> flag to suppress warnings; it now also accepts multiple paths on its command line.</para> @@ -723,6 +682,16 @@ hv_vmbus_load="YES"</programlisting> <sect3 xml:id="rc-scripts"> <title><filename>/etc/rc.d</filename> Scripts</title> + <para revision="256773"><filename>rc.d/sendmail</filename> now + generates and uses an SSL certificate by default when + <literal>sendmail_enable="YES"</literal>. This will allow + remote MTA to use STARTTLS to encrypt incoming email. The + certification is signed with a key that is thrown away and is + not a substitute for generating your own properly if you need + to use STARTTLS authentication. Options to control the + certificate generation is documented in + <filename>rc.d/sendmail</filename>.</para> + <para>The followoing &man.rc.8; scripts have been added:</para> <informaltable frame="none" pgwide="0"> @@ -828,14 +797,14 @@ hv_vmbus_load="YES"</programlisting> xlink:href="http://www.facebook.com/jemalloc/">this link</link> for more details.</para> - <para role="merged"><application>AMD</application> has been + <para><application>AMD</application> has been updated from 6.0.10 to 6.1.5.</para> - <para role="merged"><application>awk</application> has been + <para><application>awk</application> has been updated from the 1 May 2007 release to the 23 October 2007 release.</para> - <para role="merged"><application>bzip2</application> has been + <para><application>bzip2</application> has been updated from 1.0.4 to 1.0.5.</para> <para revision="251794"><application>CVS</application> has been @@ -863,16 +832,16 @@ hv_vmbus_load="YES"</programlisting> <para><application>ncurses</application> has been updated to 5.7-20081102.</para> - <para role="merged"><application>OpenSSH</application> has been + <para><application>OpenSSH</application> has been updated to 6.4.</para> <para revision="236109"><application>OpenPAM</application> has been updated to the Micrampelis release.</para> - <para role="merged"><application>sendmail</application> has been + <para><application>sendmail</application> has been updated from 8.14.1 to 8.14.7.</para> - <para role="merged">The timezone database has been updated from + <para>The timezone database has been updated from the <application>tzdata2008h</application> release to the <application>tzdata2009m</application> release.</para> @@ -886,10 +855,10 @@ hv_vmbus_load="YES"</programlisting> <para revision="252726"><application>WPA Supplicant</application> has been updated to 2.0.</para> - <para role="merged"><application>xz</application> has been updated + <para><application>xz</application> has been updated from snapshot as of 12 April 2010 to 5.0.0.</para> - <para revision="258231" role="merged">&man.nvi.1; has been updated + <para revision="258231">&man.nvi.1; has been updated to 2.1.2.</para> <para revision="254225">&man.nvi.1; supports wide-character @@ -909,7 +878,7 @@ hv_vmbus_load="YES"</programlisting> <sect2 xml:id="releng"> <title>Release Engineering and Integration</title> - <para role="merged">The supported version of + <para>The supported version of the <application>GNOME</application> desktop environment (<package>x11/gnome2</package>) has been updated from 2.20.1 to 2.22.</para> Copied: releng/10.0/release/doc/en_US.ISO8859-1/share/xml/catalog.xml (from r260656, stable/10/release/doc/en_US.ISO8859-1/share/xml/catalog.xml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/10.0/release/doc/en_US.ISO8859-1/share/xml/catalog.xml Tue Jan 14 23:58:50 2014 (r260657, copy of r260656, stable/10/release/doc/en_US.ISO8859-1/share/xml/catalog.xml) @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">; + +<!-- $FreeBSD$ --> + +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <rewriteSystem systemIdStartString="http://www.FreeBSD.org/release/XML/lang/" + rewritePrefix="../../"/> + <rewriteURI uriStartString="http://www.FreeBSD.org/release/XML/lang/" + rewritePrefix="../../"/> +</catalog> Copied and modified: releng/10.0/release/doc/en_US.ISO8859-1/share/xml/release.xsl (from r260656, stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl) ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl Tue Jan 14 23:15:53 2014 (r260656, copy source) +++ releng/10.0/release/doc/en_US.ISO8859-1/share/xml/release.xsl Tue Jan 14 23:58:50 2014 (r260657) @@ -17,8 +17,8 @@ <a href="http://www.FreeBSD.org/docs.html">documentation</a>; before contacting <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.</small></p> - <p align="center"><small>All users of FreeBSD <xsl:value-of select="$release.branch"/> should - subscribe to the <<a href="mailto:current@FreeBSD.org">current@FreeBSD.org</a>> + <p align="center"><small>All users of FreeBSD release should + subscribe to the <<a href="mailto:stable@FreeBSD.org">stable@FreeBSD.org</a>> mailing list.</small></p> <p align="center"><small>For questions about this documentation, Modified: releng/10.0/release/doc/share/mk/doc.relnotes.mk ============================================================================== --- releng/10.0/release/doc/share/mk/doc.relnotes.mk Tue Jan 14 23:15:53 2014 (r260656) +++ releng/10.0/release/doc/share/mk/doc.relnotes.mk Tue Jan 14 23:58:50 2014 (r260657) @@ -4,6 +4,8 @@ DOC_PREFIX?= ${RELN_ROOT}/../../../doc # XXX RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|' +RELEASEURL!= grep -o 'release.url \"[^\"]*\"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|' +RELEASEBRANCH!= grep -o 'release.branch "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|' .if ${RELEASETYPE} == "current" PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'" .elif ${RELEASETYPE} == "snapshot" @@ -11,13 +13,14 @@ PROFILING+= --param profile.attribute "' .elif ${RELEASETYPE} == "release" PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'release'" .endif +XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'" +XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'" # Find the RELNOTESng document catalogs EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \ - file://${RELN_ROOT}/share/xml/catalog.xml + file://${RELN_ROOT}/share/xml/catalog.xml -# Use the appropriate architecture-dependent RELNOTESng stylesheet -DSLPRINT?= ${RELN_ROOT}/share/xml/default.dsl +XSLXHTML= http://www.FreeBSD.org/release/XML/share/xml/release.xsl # # Automatic device list generation: Modified: releng/10.0/release/doc/share/xml/catalog.xml ============================================================================== --- releng/10.0/release/doc/share/xml/catalog.xml Tue Jan 14 23:15:53 2014 (r260656) +++ releng/10.0/release/doc/share/xml/catalog.xml Tue Jan 14 23:58:50 2014 (r260657) @@ -1,6 +1,11 @@ <?xml version="1.0"?> <!-- $FreeBSD$ --> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <rewriteSystem systemIdStartString="http://www.FreeBSD.org/release/XML/" + rewritePrefix="../../"/> + <rewriteURI uriStartString="http://www.FreeBSD.org/release/XML/" + rewritePrefix="../../"/> + <public publicId="-//FreeBSD//ENTITIES Release Specification//EN" uri="release.ent"/> <public publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" uri="dev-auto.ent"/> </catalog> Modified: releng/10.0/release/doc/share/xml/release.ent ============================================================================== --- releng/10.0/release/doc/share/xml/release.ent Tue Jan 14 23:15:53 2014 (r260656) +++ releng/10.0/release/doc/share/xml/release.ent Tue Jan 14 23:58:50 2014 (r260657) @@ -11,7 +11,7 @@ <!-- The previous version used for comparison in the "What's New" section. For -CURRENT, we might point back to the last branchpoint. --> -<!ENTITY release.prev "10.0-CURRENT"> +<!ENTITY release.prev "9.2-RELEASE"> <!-- The previous stable release, useful for pointing user's at the release they SHOULD be running if they don't want the bleeding @@ -31,28 +31,15 @@ or "release" --> <!-- WARNING: Do not forget to also change the release type in doc.relnotes.mk when updating this --> -<!ENTITY release.type "snapshot"> -<!ENTITY % release.type.current "INCLUDE"> -<!ENTITY % release.type.snapshot "IGNORE"> -<!ENTITY % release.type.release "IGNORE"> - -<![%release.type.current;[ -<!ENTITY release '&release.current;'> -]]> -<![%release.type.snapshot;[ -<!ENTITY release '&release.prev;'> -]]> -<![%release.type.release;[ +<!ENTITY release.type "release"> <!ENTITY release '&release.current;'> -]]> -<!ENTITY release ''> <!-- The manpaths for man page references --> <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">; <!ENTITY release.manpath.xorg "7.5.1"> <!ENTITY release.manpath.netbsd "5.1"> <!ENTITY release.manpath.freebsd-ports "Ports"> -<!ENTITY release.manpath.freebsd "10-current"> +<!ENTITY release.manpath.freebsd "10.0-RELEASE"> <!-- Text constants which probably don't need to be changed.--> @@ -71,5 +58,19 @@ <!ENTITY arch.powerpc "powerpc"> <!ENTITY arch.sparc64 "sparc64"> -<!-- The marker for MFCs. --> -<!ENTITY merged "MERGED"> +<!-- local entities not available in doc/release/10.0.0 tag --> +<!ENTITY man.drill.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>drill</refentrytitle><manvolnum>1</manvolnum></citerefentry>">; +<!ENTITY man.freebsd-version.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>freebsd-version</refentrytitle><manvolnum>1</manvolnum></citerefentry>">; +<!ENTITY man.jemalloc.3 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>jemalloc</refentrytitle><manvolnum>3</manvolnum></citerefentry>">; +<!ENTITY man.bhyve.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>bhyve</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; +<!ENTITY man.nvme.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>nvme</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; +<!ENTITY man.virtio.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>virtio</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; +<!ENTITY man.virtio_balloon.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>virtio_balloon</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; +<!ENTITY man.virtio_blk.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>virtio_blk</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; +<!ENTITY man.virtio_scsi.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>virtio_scsi</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; +<!ENTITY man.vmx.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>vmx</refentrytitle><manvolnum>4</manvolnum></citerefentry>">; +<!ENTITY man.pkg.7 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg</refentrytitle><manvolnum>7</manvolnum></citerefentry>">; +<!ENTITY man.bhyve.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>bhyve</refentrytitle><manvolnum>8</manvolnum></citerefentry>">; +<!ENTITY man.gptboot.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>gptboot</refentrytitle><manvolnum>8</manvolnum></citerefentry>">; +<!ENTITY man.bsdconfig.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>bsdconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry>">; +<!ENTITY man.unbound.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>unbound</refentrytitle><manvolnum>8</manvolnum></citerefentry>">; Copied: releng/10.0/release/doc/share/xml/release.xsl (from r260656, stable/10/release/doc/share/xml/release.xsl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/10.0/release/doc/share/xml/release.xsl Tue Jan 14 23:58:50 2014 (r260657, copy of r260656, stable/10/release/doc/share/xml/release.xsl) @@ -0,0 +1,60 @@ +<?xml version="1.0"?> +<!-- $FreeBSD$ --> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:db="http://docbook.org/ns/docbook" + exclude-result-prefixes="db"> + + <xsl:import href="http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml.xsl"/>; + + <xsl:import href="http://www.FreeBSD.org/release/XML/lang/share/xml/release.xsl"/>; + + <xsl:param name="release.url"/> + <xsl:param name="release.branch"/> + + <xsl:template name="paragraph"> + <xsl:param name="class" select="''"/> + <xsl:param name="content"/> + + <xsl:variable name="p"> + <p> + <xsl:choose> + <xsl:when test="$class != ''"> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="class" select="$class"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="locale.html.attributes"/> + </xsl:otherwise> + </xsl:choose> + <xsl:if test="@arch"> + <xsl:value-of select="concat('[', @arch, ']')"/> + <xsl:value-of select='" "'/> + </xsl:if> + <xsl:copy-of select="$content"/> + <xsl:value-of select='" "'/> + <xsl:if test="@revision"> + <xsl:element name="a"> + <xsl:attribute name="href"> + <xsl:value-of select="concat('http://svn.freebsd.org/viewvc/base?view=revision&revision=', @revision)"/> + </xsl:attribute> + <xsl:value-of select="concat('[r', @revision, ']')"/> + </xsl:element> + </xsl:if> + </p> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$html.cleanup != 0"> + <xsl:call-template name="unwrap.p"> + <xsl:with-param name="p" select="$p"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$p"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> +</xsl:stylesheet>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401142358.s0ENwp77031045>