PERFORCE change 84599 for review
soc-emily
soc-emily at FreeBSD.org
Sat Oct 1 01:00:00 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=84599
Change 84599 by soc-emily at soc-emily_beastie on 2005/10/01 07:59:46
Fix up conflicts.
Affected files ...
.. //depot/projects/soc2005/www/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 integrate
.. //depot/projects/soc2005/www/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate
.. //depot/projects/soc2005/www/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 integrate
.. //depot/projects/soc2005/www/freebsd/en/Makefile#5 edit
.. //depot/projects/soc2005/www/freebsd/en/donations/donors.sgml#4 integrate
.. //depot/projects/soc2005/www/freebsd/en/donations/wantlist.sgml#4 integrate
.. //depot/projects/soc2005/www/freebsd/es/includes.xsl#7 integrate
.. //depot/projects/soc2005/www/freebsd/share/mk/doc.xml.mk#2 edit
.. //depot/projects/soc2005/www/freebsd/share/mk/web.site.mk#5 edit
.. //depot/projects/soc2005/www/freebsd/share/sgml/includes.misc.xsl#5 integrate
.. //depot/projects/soc2005/www/freebsd/share/sgml/transtable-common.xsl#3 integrate
Differences ...
==== //depot/projects/soc2005/www/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.456 2005/09/28 13:59:59 jkoshy Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.457 2005/09/30 17:19:53 garga Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -7430,8 +7430,8 @@
</listitem>
<listitem>
- <para>Ryan T. Dean
- <email>rtdean at cytherianage.net</email></para>
+ <para>Ryan Grove
+ <email>ryan at wonko.com</email></para>
</listitem>
<listitem>
@@ -7440,6 +7440,11 @@
</listitem>
<listitem>
+ <para>Ryan T. Dean
+ <email>rtdean at cytherianage.net</email></para>
+ </listitem>
+
+ <listitem>
<para>Ryan Thompson
<email>ryan at sasknow.com</email></para>
</listitem>
==== //depot/projects/soc2005/www/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.100 2005/07/26 09:44:46 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.101 2005/09/30 18:03:50 garys Exp $
-->
<chapter id="serialcomms">
@@ -117,17 +117,23 @@
<indexterm>
<primary>null-modem cable</primary>
</indexterm>
- <para>A null-modem cable passes some signals, such as <quote>signal
- ground</quote>, straight through, but switches other signals. For
- example, the <quote>send data</quote> pin on one end goes to the
- <quote>receive data</quote> pin on the other end.</para>
+ <para>A null-modem cable passes some signals, such as <quote>Signal
+ Ground</quote>, straight through, but switches other signals. For
+ example, the <quote>Transmitted Data</quote> pin on one end goes to the
+ <quote>Received Data</quote> pin on the other end.</para>
- <para>If you like making your own cables, you can construct
- a null-modem cable for use with
- terminals. This table shows the RS-232C signal names and the pin
- numbers on a DB-25 connector.</para>
+ <para>You can also construct your own null-modem cable for use with
+ terminals (e.g., for quality purposes). This table shows the RS-232C
+ <link linkend="serialcomms-signal-names">signals</link> and the pin
+ numbers on a DB-25 connector. Note that the standard also calls for a
+ straight-through pin 1 to pin 1 <emphasis>Protective Ground</emphasis>
+ line, but it is often omitted. Some terminals work OK using only
+ pins 2, 3 and 7, while others require different configurations than
+ the examples shown below.</para>
- <informaltable frame="none" pgwide="1">
+ <table frame="none" pgwide="1">
+ <title>DB-25 to DB-25 Null-Modem Cable</title>
+
<tgroup cols="5">
<thead>
<row>
@@ -189,11 +195,11 @@
</row>
<row>
+ <entry>DTR</entry>
+ <entry>20</entry>
+ <entry>connects to</entry>
+ <entry>8</entry>
<entry>DCD</entry>
- <entry>8</entry>
- <entry></entry>
- <entry>6</entry>
- <entry>DSR</entry>
</row>
<row>
@@ -203,25 +209,220 @@
<entry>20</entry>
<entry>DTR</entry>
</row>
+
+ <row>
+ <entry>DCD</entry>
+ <entry>8</entry>
+ <entry>connects to</entry>
+ <entry>20</entry>
+ <entry>DTR</entry>
+ </row>
</tbody>
</tgroup>
- </informaltable>
+ </table>
+ <para>Here are two other schemes more common nowadays.</para>
+
+ <table frame="none" pgwide="1">
+ <title>DB-9 to DB-9 Null-Modem Cable</title>
+
+ <tgroup cols="5">
+ <thead>
+ <row>
+ <entry>Signal</entry>
+ <entry>Pin #</entry>
+ <entry></entry>
+ <entry>Pin #</entry>
+ <entry>Signal</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>RD</entry>
+ <entry>2</entry>
+ <entry>connects to</entry>
+ <entry>3</entry>
+ <entry>TD</entry>
+ </row>
+
+ <row>
+ <entry>TD</entry>
+ <entry>3</entry>
+ <entry>connects to</entry>
+ <entry>2</entry>
+ <entry>RD</entry>
+ </row>
+
+ <row>
+ <entry>DTR</entry>
+ <entry>4</entry>
+ <entry>connects to</entry>
+ <entry>6</entry>
+ <entry>DSR</entry>
+ </row>
+
+ <row>
+ <entry>DTR</entry>
+ <entry>4</entry>
+ <entry>connects to</entry>
+ <entry>1</entry>
+ <entry>DCD</entry>
+ </row>
+
+ <row>
+ <entry>SG</entry>
+ <entry>5</entry>
+ <entry>connects to</entry>
+ <entry>5</entry>
+ <entry>SG</entry>
+ </row>
+
+ <row>
+ <entry>DSR</entry>
+ <entry>6</entry>
+ <entry>connects to</entry>
+ <entry>4</entry>
+ <entry>DTR</entry>
+ </row>
+
+ <row>
+ <entry>DCD</entry>
+ <entry>1</entry>
+ <entry>connects to</entry>
+ <entry>4</entry>
+ <entry>DTR</entry>
+ </row>
+
+ <row>
+ <entry>RTS</entry>
+ <entry>7</entry>
+ <entry>connects to</entry>
+ <entry>8</entry>
+ <entry>CTS</entry>
+ </row>
+
+ <row>
+ <entry>CTS</entry>
+ <entry>8</entry>
+ <entry>connects to</entry>
+ <entry>7</entry>
+ <entry>RTS</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table frame="none" pgwide="1">
+ <title>DB-9 to DB-25 Null-Modem Cable</title>
+
+ <tgroup cols="5">
+ <thead>
+ <row>
+ <entry>Signal</entry>
+ <entry>Pin #</entry>
+ <entry></entry>
+ <entry>Pin #</entry>
+ <entry>Signal</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>RD</entry>
+ <entry>2</entry>
+ <entry>connects to</entry>
+ <entry>2</entry>
+ <entry>TD</entry>
+ </row>
+
+ <row>
+ <entry>TD</entry>
+ <entry>3</entry>
+ <entry>connects to</entry>
+ <entry>3</entry>
+ <entry>RD</entry>
+ </row>
+
+ <row>
+ <entry>DTR</entry>
+ <entry>4</entry>
+ <entry>connects to</entry>
+ <entry>6</entry>
+ <entry>DSR</entry>
+ </row>
+
+ <row>
+ <entry>DTR</entry>
+ <entry>4</entry>
+ <entry>connects to</entry>
+ <entry>8</entry>
+ <entry>DCD</entry>
+ </row>
+
+ <row>
+ <entry>SG</entry>
+ <entry>5</entry>
+ <entry>connects to</entry>
+ <entry>7</entry>
+ <entry>SG</entry>
+ </row>
+
+ <row>
+ <entry>DSR</entry>
+ <entry>6</entry>
+ <entry>connects to</entry>
+ <entry>20</entry>
+ <entry>DTR</entry>
+ </row>
+
+ <row>
+ <entry>DCD</entry>
+ <entry>1</entry>
+ <entry>connects to</entry>
+ <entry>20</entry>
+ <entry>DTR</entry>
+ </row>
+
+ <row>
+ <entry>RTS</entry>
+ <entry>7</entry>
+ <entry>connects to</entry>
+ <entry>5</entry>
+ <entry>CTS</entry>
+ </row>
+
+ <row>
+ <entry>CTS</entry>
+ <entry>8</entry>
+ <entry>connects to</entry>
+ <entry>4</entry>
+ <entry>RTS</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
<note>
- <para>Connect <quote>Data Set Ready</quote> (DSR) and
- <quote>Data Carrier Detect</quote> (DCD) internally in the
- connector hood, and then to <quote>Data Terminal
- Ready</quote> (DTR) in the remote hood.</para>
+ <para>When one pin at one end connects to a pair of pins
+ at the other end, it is usually implemented with one short
+ wire between the pair of pins in their connector and a
+ long wire to the other single pin.</para>
</note>
+
+ <para>The above designs seems to be the most popular. In another
+ variation (explained in the book <emphasis>RS-232 Made
+ Easy</emphasis>) SG connects to SG, TD connects to RD, RTS and
+ CTS connect to DCD, DTR connects to DSR, and vice-versa.</para>
</sect4>
<sect4 id="term-cables-std">
<title>Standard RS-232C Cables</title>
<indexterm><primary>RS-232C cables</primary></indexterm>
- <para>A standard serial cable passes all the RS-232C signals
- straight-through. That is, the <quote>send data</quote> pin on one
- end of the cable goes to the <quote>send data</quote> pin on the
+ <para>A standard serial cable passes all of the RS-232C signals
+ straight through. That is, the <quote>Transmitted Data</quote> pin on one
+ end of the cable goes to the <quote>Transmitted Data</quote> pin on the
other end. This is the type of cable to use to connect a modem to your
FreeBSD system, and is also appropriate for some
terminals.</para>
@@ -243,8 +444,8 @@
construct a cable, you need to make sure it will fit the ports on
your terminal and on the FreeBSD system.</para>
- <para>Most terminals will have DB25 ports. Personal computers,
- including PCs running FreeBSD, will have DB25 or DB9 ports. If you
+ <para>Most terminals will have DB-25 ports. Personal computers,
+ including PCs running FreeBSD, will have DB-25 or DB-9 ports. If you
have a multiport serial card for your PC, you may have RJ-12 or
RJ-45 ports.</para>
@@ -976,42 +1177,63 @@
cable should suffice as long as all of the normal signals
are wired:</para>
- <itemizedlist>
- <listitem>
- <para>Transmitted Data (<acronym>TD</acronym>)</para>
- </listitem>
-
- <listitem>
- <para>Received Data (<acronym>RD</acronym>)</para>
- </listitem>
-
- <listitem>
- <para>Request to Send (<acronym>RTS</acronym>)</para>
- </listitem>
-
- <listitem>
- <para>Clear to Send (<acronym>CTS</acronym>)</para>
- </listitem>
-
- <listitem>
- <para>Data Set Ready (<acronym>DSR</acronym>)</para>
- </listitem>
-
- <listitem>
- <para>Data Terminal Ready (<acronym>DTR</acronym>)</para>
- </listitem>
-
- <listitem>
- <para>Carrier Detect (<acronym>CD</acronym>)</para>
- </listitem>
-
- <listitem>
- <para>Signal Ground (<acronym>SG</acronym>)</para>
- </listitem>
- </itemizedlist>
+ <table frame="none" pgwide="1" id="serialcomms-signal-names">
+ <title>Signal Names</title>
+
+ <tgroup cols="5">
+ <thead>
+ <row>
+ <entry>Acronyms</entry>
+ <entry>Names</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><acronym>RD</acronym></entry>
+ <entry>Received Data</entry>
+ </row>
+
+ <row>
+ <entry><acronym>TD</acronym></entry>
+ <entry>Transmitted Data</entry>
+ </row>
+
+ <row>
+ <entry><acronym>DTR</acronym></entry>
+ <entry>Data Terminal Ready</entry>
+ </row>
+
+ <row>
+ <entry><acronym>DSR</acronym></entry>
+ <entry>Data Set Ready</entry>
+ </row>
+
+ <row>
+ <entry><acronym>DCD</acronym></entry>
+ <entry>Data Carrier Detect (RS-232's Received Line
+ Signal Detector)</entry>
+ </row>
+
+ <row>
+ <entry><acronym>SG</acronym></entry>
+ <entry>Signal Ground</entry>
+ </row>
+
+ <row>
+ <entry><acronym>RTS</acronym></entry>
+ <entry>Request to Send</entry>
+ </row>
+
+ <row>
+ <entry><acronym>CTS</acronym></entry>
+ <entry>Clear to Send</entry>
+ </row>
+ </tbody>
+ </table>
<para>FreeBSD needs the <acronym>RTS</acronym> and
- <acronym>CTS</acronym> signals for flow-control at speeds above
+ <acronym>CTS</acronym> signals for flow control at speeds above
2400 bps, the <acronym>CD</acronym> signal to detect when a call has
been answered or the line has been hung up, and the
<acronym>DTR</acronym> signal to reset the modem after a session is
==== //depot/projects/soc2005/www/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.617 2005/09/22 08:13:51 pav Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.618 2005/09/30 07:58:34 pav Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -3698,6 +3698,20 @@
<makevar>WITH_<replaceable>*</replaceable></makevar> and
<makevar>WITHOUT_<replaceable>*</replaceable></makevar> options you
used to build this port!</para>
+
+ <para>When the user runs <command>make config</command> (or runs
+ <command>make build</command> for the first time), the framework will
+ check for
+ <filename>/var/db/ports/<replaceable>portname</replaceable>/options</filename>.
+ If that file does not exist, it will use the values of
+ <makevar>OPTIONS</makevar> to create a dialogbox where the options
+ can be enabled or disabled. Then the
+ <filename>options</filename> file is saved and the selected
+ variables will be used when building the port.</para>
+
+ <para>Use <command>make showconfig</command> to see the saved
+ configuration. Use <command>make rmconfig</command> to remove the
+ saved configuration.</para>
</sect3>
<sect3>
@@ -3711,25 +3725,23 @@
<literal>OFF</literal>. Multiple repetitions of these three fields
are allowed.</para>
- <para>When the user runs <command>make config</command> (or runs
- <command>make build</command> for the first time), the framework will
- check for <filename>/var/db/ports/<replaceable>portname</replaceable>
- /options</filename>.
- If that file does not exist, it will use the values of
- <makevar>OPTIONS</makevar> to create a dialogbox where the options
- can be enabled or disabled. Then the options file is saved and the
- selected variables will be used when building the port.</para>
-
- <para>Use <command>make showconfig</command> to see the saved
- configuration. Use <command>make rmconfig</command> to remove the
- saved configuration.</para>
+ <para><makevar>OPTIONS</makevar> definition must appear before
+ the inclusion of <filename>bsd.port.pre.mk</filename>.
+ The <makevar>WITH_*</makevar> and <makevar>WITHOUT_*</makevar>
+ variables can only be tested after the inclusion of
+ <filename>bsd.port.pre.mk</filename>. Due to a deficiency
+ in the infrastructure, you can only test
+ <makevar>WITH_*</makevar> variables for options, which are
+ <literal>ON</literal> by default, and
+ <makevar>WITHOUT_*</makevar> variables for options, which
+ defaults to <literal>OFF</literal>.</para>
<sect3>
<title>Example</title>
<example id="ports-options-simple-use">
<title>Simple use of <makevar>OPTIONS</makevar></title>
- <para><programlisting>OPTIONS= FOO "Enable option foo" On \
- BAR "Support feature bar" Off
+ <para><programlisting>OPTIONS= FOO "Enable option foo" On \
+ BAR "Support feature bar" Off
.include <bsd.port.pre.mk>
@@ -3750,12 +3762,8 @@
<title>Brokenness</title>
<itemizedlist>
<listitem>
- <para><command>make index</command> does not follow
- <makevar>OPTIONS</makevar> yet (ports/75727)</para>
- </listitem>
- <listitem>
- <para><makevar>PACKAGE_BUILDING</makevar> is ignoring
- <makevar>OPTIONS</makevar> (ports/75727?)</para>
+ <para><makevar>OPTIONS</makevar> are ignored in
+ <makevar>BATCH</makevar> mode.</para>
</listitem>
</itemizedlist>
</sect3>
==== //depot/projects/soc2005/www/freebsd/en/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/Makefile,v 1.123 2005/07/16 09:58:16 hrs Exp $
+# $FreeBSD: www/en/Makefile,v 1.124 2005/09/18 04:33:45 hrs Exp $
.if exists(Makefile.conf)
.include "Makefile.conf"
@@ -9,11 +9,9 @@
# These are turned into validated, normalized HTML files.
-DOCS= about.sgml
-DOCS+= applications.sgml
+DOCS= applications.sgml
DOCS+= art.sgml
DOCS+= availability.sgml
-DOCS+= community.sgml
DOCS+= docs.sgml
DOCS+= features.sgml
DOCS+= internet.sgml
@@ -25,6 +23,14 @@
DOCS+= where.sgml
DOCS+= y2kbug.sgml
+XMLDOCS= index:xsl:${XML_NEWS_NEWS}:${XML_EVENTS_EVENTS}:
+DEPENDSET.index=transtable mirrors news press events \
+ navigation advisories notices
+
+XMLDOCS+= usergroups:${XSL_USERGROUPS}:${XML_USERGROUPS}:
+DEPENDSET.usergroups=transtable usergroups
+PARAMS.usergroups= --param pagename "'FreeBSD User Groups'"
+
# These will be directly installed.
DATA= favicon.ico
@@ -89,46 +95,4 @@
WEBDIR?= data
-# these files are generated by using separate rules.
-DATA+= index.html usergroups.html
-CLEANFILES+= index.html usergroups.html
-
.include "${WEB_PREFIX}/share/mk/web.site.mk"
-
-index.html: index.xsl ${XML_INCLUDES}\
- ${XML_NEWS_INCLUDES} \
- ${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
- ${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
- ${XML_EVENTS_EVENTS} ${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_CURDATE} \
- ${XML_MIRRORS} ${XML_TRANSTABLE} \
- ${XML_ADVISORIES} ${XML_NOTICES} \
- ${XML_NAVIGATION}
- ${XSLTPROC} ${XSLTPROCOPTS} \
- -o $@ \
- --param advisories.xml "'${XML_ADVISORIES}'" \
- --param mirrors.xml "'${XML_MIRRORS}'" \
- --param navigation.xml "'${XML_NAVIGATION}'" \
- --param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
- --param news.press.xml "'${XML_NEWS_PRESS}'" \
- --param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
- --param news.project.xml "'${XML_NEWS_NEWS}'" \
- --param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
- --param events.xml "'${XML_EVENTS_EVENTS}'" \
- --param curdate.xml "'${XML_EVENTS_CURDATE}'" \
- --param notices.xml "'${XML_NOTICES}'" \
- --param transtable.xml "'${XML_TRANSTABLE}'" \
- ${.CURDIR}/index.xsl ${XML_NEWS_NEWS} ${XML_EVENTS_EVENTS} ${XML_EVENTS_CURDATE}
-.if !defined(NO_TIDY)
- -${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-usergroups.html: ${XML_INCLUDES} ${XML_TRANSTABLE} \
- ${XSL_USERGROUPS} ${XML_USERGROUPS}
- ${XSLTPROC} ${XSLTPROCOPTS} \
- -o $@ \
- --param pagename "'FreeBSD User Groups'" \
- --param transtable.xml "'${XML_TRANSTABLE}'" \
- ${XSL_USERGROUPS} ${XML_USERGROUPS}
-.if !defined(NO_TIDY)
- -${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
==== //depot/projects/soc2005/www/freebsd/en/donations/donors.sgml#4 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.278 2005/07/26 18:21:13 wilko Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.282 2005/09/30 16:33:21 joel Exp $">
<!ENTITY title "Hardware Donors Page">
<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
@@ -1378,7 +1378,8 @@
Hardware for laptop:
Pentium III Mobile 600MHz CPU,
2 128MB PC100 SODIMM RAM,
- new battery
+ new battery,
+ Netgear WG511T CardBus adapter
<p>
AMD64 desktop:
ASUS SK8N motherboard,
==== //depot/projects/soc2005/www/freebsd/en/donations/wantlist.sgml#4 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.348 2005/08/18 06:30:08 jmallett Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.352 2005/09/30 18:41:48 joel Exp $">
<!ENTITY title "FreeBSD Developers Want List">
<!ENTITY email 'donations'>
<!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
@@ -212,7 +212,7 @@
<tr>
<td>joel</td>
<td>Sweden</td>
- <td>Laptop (1,2GHz CPU+, 256MB RAM+, 30GB HDD+)</td>
+ <td>Laptop</td>
<td>Writing new manual pages and handbook chapters, documentation
work, improving our website and various bugfixing. I travel a
lot, but I don't have a laptop, so I can't work on FreeBSD as
==== //depot/projects/soc2005/www/freebsd/es/includes.xsl#7 (text+ko) ====
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $FreeBSD: www/es/includes.xsl,v 1.6 2005/06/29 20:40:28 jcamou Exp $ -->
+<!-- $FreeBSD: www/es/includes.xsl,v 1.7 2005/09/30 17:07:09 jesusr Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -247,6 +247,10 @@
<xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
<xsl:variable name="u.rel.hardware">
<xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/hardware.html</xsl:variable>
+ <xsl:variable name="u.rel.installation">
+ <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/installation.html</xsl:variable>
+ <xsl:variable name="u.rel.migration">
+ <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/migration-guide.html</xsl:variable>
<xsl:variable name="u.rel.early">
<xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/early-adopter.html</xsl:variable>
==== //depot/projects/soc2005/www/freebsd/share/mk/doc.xml.mk#2 (text+ko) ====
@@ -11,7 +11,7 @@
# Variables used in DEPENDSET
_DEPENDSET.all= wwwstd transtable mirrors usergroups \
- news press navigation advisories notices
+ news press events navigation advisories notices
# DEPENDSET: wwwstd .........................................................
_DEPENDSET.wwwstd= ${XML_INCLUDES}
@@ -120,6 +120,16 @@
XML_NEWS_PRESS_MASTER= ${WEB_PREFIX}/en/news/press.xml
XML_NEWS_PRESS= ${WEB_PREFIX}/${WWW_LANGCODE}/news/press.xml
+# DEPENDSET: events ..........................................................
+_DEPENDSET.events= ${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
+ ${XML_EVENTS_CURDATE} ${XML_INCLUDES}
+_PARAMS.events= --param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
+ --param events.xml "'${XML_EVENTS_EVENTS}'" \
+ --param curdate.xml "'${XML_EVENTS_CURDATE}'"
+XML_EVENTS_EVENTS_MASTER= ${WEB_PREFIX}/en/events/events.xml
+XML_EVENTS_EVENTS= ${WEB_PREFIX}/${WWW_LANGCODE}/events/events.xml
+XML_EVENTS_CURDATE= ${WEB_PREFIX}/en/events/curdate.xml
+
# DEPENDSET: navigation .....................................................
_DEPENDSET.navigation= ${XML_NAVIGATION} ${XML_INCLUDES}
_PARAMS.navigation= --param navigation.xml "'${XML_NAVIGATION}'"
==== //depot/projects/soc2005/www/freebsd/share/mk/web.site.mk#5 (text+ko) ====
@@ -150,29 +150,6 @@
.endif
.endif # !defined(WITHOUT_DOC)
-XML_ADVISORIES?= ${WEB_PREFIX}/share/sgml/advisories.xml
-XML_NOTICES?= ${WEB_PREFIX}/share/sgml/notices.xml
-
-XML_NEWS_NEWS_MASTER= ${WEB_PREFIX}/en/news/news.xml
-XML_NEWS_NEWS= ${WEB_PREFIX}/${WWW_LANGCODE}/news/news.xml
-XML_NEWS_PRESS_MASTER= ${WEB_PREFIX}/en/news/press.xml
-XML_NEWS_PRESS= ${WEB_PREFIX}/${WWW_LANGCODE}/news/press.xml
-XML_NEWS_INCLUDES_MASTER= ${WEB_PREFIX}/en/news/includes.xsl
-XML_NEWS_INCLUDES= ${WEB_PREFIX}/${WWW_LANGCODE}/news/includes.xsl
-
-XML_EVENTS_EVENTS_MASTER= ${WEB_PREFIX}/en/events/events.xml
-XML_EVENTS_EVENTS= ${WEB_PREFIX}/${WWW_LANGCODE}/events/events.xml
-XML_EVENTS_CURDATE= ${WEB_PREFIX}/en/events/curdate.xml
-
-XML_NAVIGATION= ${WEB_PREFIX}/${WWW_LANGCODE}/navigation.xml
-
-XML_INCLUDES= ${WEB_PREFIX}/${WWW_LANGCODE}/includes.xsl
-XML_INCLUDES+= ${WEB_PREFIX}/share/sgml/includes.header.xsl
-XML_INCLUDES+= ${WEB_PREFIX}/share/sgml/includes.misc.xsl
-XML_INCLUDES+= ${WEB_PREFIX}/share/sgml/includes.release.xsl
-XML_INCLUDES+= ${WEB_PREFIX}/share/sgml/transtable-common.xsl
-XML_INCLUDES+= ${WEB_PREFIX}/share/sgml/includes.xsl
-
SGML_INCLUDES= ${WEB_PREFIX}/${WWW_LANGCODE}/includes.sgml
SGML_INCLUDES+= ${WEB_PREFIX}/${WWW_LANGCODE}/includes.navabout.sgml
SGML_INCLUDES+= ${WEB_PREFIX}/${WWW_LANGCODE}/includes.navcommunity.sgml
==== //depot/projects/soc2005/www/freebsd/share/sgml/includes.misc.xsl#5 (text+ko) ====
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.23 2005/09/18 06:25:01 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.24 2005/09/30 18:12:58 hrs Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -66,6 +66,7 @@
list all regions in a usergroup database -->
<xsl:key name="html-usergroups-regions-key" match="entry" use="@continent" />
+ <xsl:key name="html-usergroups-id-key" match="entry" use="@id" />
<xsl:template name="html-usergroups-list-regions">
<xsl:param name="usergroups.xml" select="'usergroups.xml'" />
@@ -107,43 +108,75 @@
generate-id() =
generate-id(key('html-usergroups-regions-key', @continent)[1])]">
- <xsl:param name="id" select="
+ <xsl:param name="continent" select="@continent" />
+ <xsl:param name="continent-lc" select="
translate(@continent,
' ,ABCDEFGHIJKLMNOPQRSTUVWXYZ',
'--abcdefghijklmnopqrstuvwxyz')" />
- <h3><a name="{$id}" id="{$id}"><xsl:call-template name="transtable-lookup">
+ <h3><a name="{$continent-lc}" id="{$continent-lc}">
+ <xsl:call-template name="transtable-lookup">
<xsl:with-param name="word-group" select="'continents'" />
- <xsl:with-param name="word" select="@continent" />
+ <xsl:with-param name="word" select="$continent" />
</xsl:call-template></a></h3>
<dl>
- <xsl:for-each select="key('html-usergroups-regions-key', @continent)">
+ <xsl:for-each select="key('html-usergroups-regions-key', $continent)">
<xsl:sort select="name" order="ascending"/>
- <xsl:param name="origid"><xsl:value-of select="@id" /></xsl:param>
+ <xsl:param name="id"><xsl:value-of select="@id" /></xsl:param>
- <!-- XXX: need optimization -->
- <xsl:param name="lname">
- <xsl:copy-of select="document($usergroups-local.xml)//*[@id=$origid]/name" />
+ <xsl:param name="name">
+ <xsl:for-each select="document($usergroups-local.xml)">
+ <xsl:choose>
+ <!-- $p[count(.|$q) = count($q)] means product set of $p and $q-->
+ <xsl:when test="
+ key('html-usergroups-regions-key', string($continent))
+ [count(.|key('html-usergroups-id-key', string($id)))
+ = count(key('html-usergroups-id-key', string($id)))]
+ ">
+ <xsl:copy-of select="
+ key('html-usergroups-regions-key', string($continent))
+ [count(.|key('html-usergroups-id-key', string($id)))
+ = count(key('html-usergroups-id-key', string($id)))]/name/node()
+ " />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="document($usergroups.xml)">
+ <xsl:copy-of select="key('html-usergroups-id-key', string($id))/name/node()" />
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
</xsl:param>
- <xsl:param name="ldesc">
- <xsl:copy-of select="document($usergroups-local.xml)//*[@id=$origid]/description" />
+ <xsl:param name="desc">
+ <xsl:for-each select="document($usergroups-local.xml)">
+ <xsl:choose>
+ <!-- $p[count(.|$q) = count($q)] means product set of $p and $q-->
+ <xsl:when test="
+ key('html-usergroups-regions-key', string($continent))
+ [count(.|key('html-usergroups-id-key', string($id)))
+ = count(key('html-usergroups-id-key', string($id)))]
+ ">
+ <xsl:copy-of select="
+ key('html-usergroups-regions-key', string($continent))
+ [count(.|key('html-usergroups-id-key', string($id)))
+ = count(key('html-usergroups-id-key', string($id)))]/description/node()
+ " />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="document($usergroups.xml)">
+ <xsl:copy-of select="key('html-usergroups-id-key', string($id))/description/node()" />
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
</xsl:param>
- <xsl:choose>
- <xsl:when test="$lname">
- <dt><a name="{$id}-{@id}" href="{url}"><xsl:value-of select="$lname" /></a></dt>
+ <dt><a name="{$continent-lc}-{$id}" href="{url}"><xsl:copy-of select="$name" /></a></dt>
- <dd><p><xsl:value-of select="$ldesc" /></p></dd>
- </xsl:when>
- <xsl:otherwise>
- <dt><a name="{$id}-{@id}" href="{url}"><xsl:value-of select="name" /></a></dt>
-
- <dd><p><xsl:value-of select="description" /></p></dd>
- </xsl:otherwise>
- </xsl:choose>
+ <dd><p><xsl:copy-of select="$desc" /></p></dd>
</xsl:for-each>
</dl>
</xsl:for-each>
==== //depot/projects/soc2005/www/freebsd/share/sgml/transtable-common.xsl#3 (text+ko) ====
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $FreeBSD: www/share/sgml/transtable-common.xsl,v 1.3 2005/09/18 05:40:09 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/transtable-common.xsl,v 1.4 2005/09/30 16:51:54 hrs Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -9,31 +9,31 @@
<xsl:param name="transtable-sortkey.xml" select="'./transtable-sortkey.xml'" />
<xsl:key name="transtable-lookup-key" match="word" use="orig" />
+ <xsl:key name="transtable-lookup-group" match="group/word" use="../@id" />
<xsl:key name="transtable-sortkey-lookup-key" match="word" use="@orig" />
<xsl:template name="transtable-lookup">
<xsl:param name="word" select="''"/>
<xsl:param name="word-group" select="''"/>
- <xsl:choose>
- <xsl:when test="document($transtable.xml)/transtable/group[@id = $word-group]">
- <xsl:for-each select="document($transtable.xml)/transtable/group[@id = $word-group]">
- <xsl:choose>
- <xsl:when test="key('transtable-lookup-key', string($word))[../@id = $word-group]">
- <xsl:for-each select="key('transtable-lookup-key', string($word))[../@id = $word-group]">
- <xsl:value-of select="tran" />
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$word" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$word" />
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:for-each select="document($transtable.xml)">
+ <xsl:choose>
+ <!-- $p[count(.|$q) = count($q)] means product set of $p and $q-->
+ <xsl:when test="
+ key('transtable-lookup-group', string($word-group))
+ [count(.|key('transtable-lookup-key', string($word)))
+ = count(key('transtable-lookup-key', string($word)))]
+ ">
+ <xsl:value-of select="
+ key('transtable-lookup-group', string($word-group))
+ [count(.|key('transtable-lookup-key', string($word)))
+ = count(key('transtable-lookup-key', string($word)))]/tran" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$word" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
</xsl:template>
<xsl:template name="transtable-sortkey-lookup">
More information about the p4-projects
mailing list