svn commit: r45314 - in head/en_US.ISO8859-1/books/porters-handbook: . makefiles uses versions
Warren Block
wblock at FreeBSD.org
Wed Jul 16 18:44:07 UTC 2014
Author: wblock
Date: Wed Jul 16 18:44:06 2014
New Revision: 45314
URL: http://svnweb.freebsd.org/changeset/doc/45314
Log:
Move Uses and Versions files into self-contained chapters.
Fix some IDs in the makefiles chapter to avoid overlap.
Note to translators: the content of the two tables has not changed,
this just reorganizes the files.
Added:
head/en_US.ISO8859-1/books/porters-handbook/uses/
head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
- copied, changed from r45312, head/en_US.ISO8859-1/books/porters-handbook/uses.xml
head/en_US.ISO8859-1/books/porters-handbook/versions/
head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml
- copied, changed from r45312, head/en_US.ISO8859-1/books/porters-handbook/versions.xml
Deleted:
head/en_US.ISO8859-1/books/porters-handbook/uses.xml
head/en_US.ISO8859-1/books/porters-handbook/versions.xml
Modified:
head/en_US.ISO8859-1/books/porters-handbook/Makefile
head/en_US.ISO8859-1/books/porters-handbook/book.xml
head/en_US.ISO8859-1/books/porters-handbook/chapters.ent
head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
Modified: head/en_US.ISO8859-1/books/porters-handbook/Makefile
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/Makefile Wed Jul 16 17:46:43 2014 (r45313)
+++ head/en_US.ISO8859-1/books/porters-handbook/Makefile Wed Jul 16 18:44:06 2014 (r45314)
@@ -34,9 +34,8 @@ SRCS+= security/chapter.xml
SRCS+= porting-dads/chapter.xml
SRCS+= porting-samplem/chapter.xml
SRCS+= keeping-up/chapter.xml
-SRCS+= appendices/chapter.xml
-SRCS+= uses.xml
-SRCS+= versions.xml
+SRCS+= uses/chapter.xml
+SRCS+= versions/chapter.xml
# Images from the cross-document image library
IMAGES_LIB+= callouts/1.png
Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml Wed Jul 16 17:46:43 2014 (r45313)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Wed Jul 16 18:44:06 2014 (r45314)
@@ -74,5 +74,6 @@
&chap.porting-dads;
&chap.porting-samplem;
&chap.keeping-up;
- &chap.appendices;
+ &chap.uses;
+ &chap.versions;
</book>
Modified: head/en_US.ISO8859-1/books/porters-handbook/chapters.ent
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/chapters.ent Wed Jul 16 17:46:43 2014 (r45313)
+++ head/en_US.ISO8859-1/books/porters-handbook/chapters.ent Wed Jul 16 18:44:06 2014 (r45314)
@@ -24,4 +24,5 @@
<!ENTITY chap.porting-dads SYSTEM "porting-dads/chapter.xml">
<!ENTITY chap.porting-samplem SYSTEM "porting-samplem/chapter.xml">
<!ENTITY chap.keeping-up SYSTEM "keeping-up/chapter.xml">
-<!ENTITY chap.appendices SYSTEM "appendices/chapter.xml">
+<!ENTITY chap.uses SYSTEM "uses/chapter.xml">
+<!ENTITY chap.versions SYSTEM "versions/chapter.xml">
Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Wed Jul 16 17:46:43 2014 (r45313)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Wed Jul 16 18:44:06 2014 (r45314)
@@ -3118,7 +3118,7 @@ ALWAYS_KEEP_DISTFILES= yes
is the same as <varname>DEPENDS_TARGET</varname>.</para>
</sect2>
- <sect2 xml:id="uses">
+ <sect2 xml:id="makefile-uses">
<title><varname>USES</varname></title>
<para>Parameters can be added to define different features and
@@ -3136,7 +3136,7 @@ ALWAYS_KEEP_DISTFILES= yes
</warning>
</sect2>
- <sect2 xml:id="use-vars">
+ <sect2 xml:id="makefile-use-vars">
<title><varname>USE_<replaceable>*</replaceable></varname></title>
<para>Several variables exist to define common dependencies
@@ -3163,7 +3163,7 @@ ALWAYS_KEEP_DISTFILES= yes
<literal>lang/gccXY</literal> itself!</para>
</note>
- <table frame="none" xml:id="use-vars-table">
+ <table frame="none" xml:id="makefile-use-vars-table">
<title>The
<varname>USE_<replaceable>*</replaceable></varname>
Variables</title>
Copied and modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml (from r45312, head/en_US.ISO8859-1/books/porters-handbook/uses.xml)
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml Wed Jul 16 17:42:42 2014 (r45312, copy source)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml Wed Jul 16 18:44:06 2014 (r45314)
@@ -1,8 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
+ The FreeBSD Documentation Project
- The FreeBSD Documentation Project
+ $FreeBSD$
- $FreeBSD$
+-->
+
+<!--
This file documents the values of the USES make variable. The
format is easy to grasp from the already-added entries below (or use
@@ -15,6 +19,24 @@
</row>
-->
+<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink=
+ "http://www.w3.org/1999/xlink" version="5.0" xml:id="uses">
+
+ <title xml:id="uses-values">Values of <varname>USES</varname></title>
+
+ <table xml:id="uses-values-table">
+ <title>Values of <varname>USES</varname></title>
+
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>Feature</entry>
+ <entry>Arguments</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+
+ <tbody valign="top">
<row xml:id="uses-ada">
<entry><literal>ada</literal></entry>
@@ -945,3 +967,8 @@ GSSAPI_NONE_CONFIGURE_ON= --without-gssa
that a specific version of <application>zope</application> shall
be used.</entry>
</row>
+
+ </tbody>
+ </tgroup>
+ </table>
+</chapter>
Copied and modified: head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml (from r45312, head/en_US.ISO8859-1/books/porters-handbook/versions.xml)
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/versions.xml Wed Jul 16 17:42:42 2014 (r45312, copy source)
+++ head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml Wed Jul 16 18:44:06 2014 (r45314)
@@ -1,5 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!--
+ The FreeBSD Documentation Project
+ $FreeBSD$
+-->
+
+<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink=
+ "http://www.w3.org/1999/xlink" version="5.0" xml:id="appendices">
+
<!--
- $FreeBSD$
This file documents the values of the OSVERSION make variable. The format is
easy to grasp from the already-added entries below (or use this scheme
@@ -13,6 +22,26 @@
-->
+ <title xml:id="freebsd-versions"><literal>__FreeBSD_version</literal> Values</title>
+
+ <para>Here is a convenient list of
+ <literal>__FreeBSD_version</literal> values as defined in
+ <link
+ xlink:href="http://svnweb.FreeBSD.org/base/head/sys/sys/param.h?view=markup">sys/param.h</link>:</para>
+
+ <table frame="none" xml:id="freebsd-versions-table">
+ <title><literal>__FreeBSD_version</literal> Values</title>
+
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>Value</entry>
+ <entry>Date</entry>
+ <entry>Release</entry>
+ </row>
+ </thead>
+
+ <tbody>
<row>
<entry>119411</entry>
<entry></entry>
@@ -5242,3 +5271,20 @@ it was never committed:
<entry>11.0-CURRENT after FreeBSD-SA-14:17.kmem
(rev <revnumber>268431</revnumber>).</entry>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <note>
+ <para>Note that 2.2-STABLE sometimes identifies itself as
+ <quote>2.2.5-STABLE</quote> after the 2.2.5-RELEASE. The
+ pattern used to be year followed by the month, but we decided
+ to change it to a more straightforward major/minor system
+ starting from 2.2. This is because the parallel development
+ on several branches made it infeasible to classify the
+ releases simply by their real release dates. If you are
+ making a port now, you do not have to worry about old
+ -CURRENTs; they are listed here just for your
+ reference.</para>
+ </note>
+</chapter>
More information about the svn-doc-all
mailing list