From owner-p4-projects@FreeBSD.ORG Sat Oct 1 08:00:00 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8790F16A421; Sat, 1 Oct 2005 07:59:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5921916A41F for ; Sat, 1 Oct 2005 07:59:59 +0000 (GMT) (envelope-from soc-emily@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08D5943D48 for ; Sat, 1 Oct 2005 07:59:59 +0000 (GMT) (envelope-from soc-emily@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j917xwKO032334 for ; Sat, 1 Oct 2005 07:59:58 GMT (envelope-from soc-emily@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j917xvdh032331 for perforce@freebsd.org; Sat, 1 Oct 2005 07:59:58 GMT (envelope-from soc-emily@freebsd.org) Date: Sat, 1 Oct 2005 07:59:58 GMT Message-Id: <200510010759.j917xvdh032331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-emily@freebsd.org using -f From: soc-emily To: Perforce Change Reviews Cc: Subject: PERFORCE change 84599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Oct 2005 08:00:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=84599 Change 84599 by soc-emily@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 @@ - + @@ -117,17 +117,23 @@ null-modem cable - A null-modem cable passes some signals, such as signal - ground, straight through, but switches other signals. For - example, the send data pin on one end goes to the - receive data pin on the other end. + A null-modem cable passes some signals, such as Signal + Ground, straight through, but switches other signals. For + example, the Transmitted Data pin on one end goes to the + Received Data pin on the other end. - 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. + You can also construct your own null-modem cable for use with + terminals (e.g., for quality purposes). This table shows the RS-232C + signals and the pin + numbers on a DB-25 connector. Note that the standard also calls for a + straight-through pin 1 to pin 1 Protective Ground + 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. - + + DB-25 to DB-25 Null-Modem Cable + @@ -189,11 +195,11 @@ + DTR + 20 + connects to + 8 DCD - 8 - - 6 - DSR @@ -203,25 +209,220 @@ 20 DTR + + + DCD + 8 + connects to + 20 + DTR + - +
+ Here are two other schemes more common nowadays. + + + DB-9 to DB-9 Null-Modem Cable + + + + + Signal + Pin # + + Pin # + Signal + + + + + + RD + 2 + connects to + 3 + TD + + + + TD + 3 + connects to + 2 + RD + + + + DTR + 4 + connects to + 6 + DSR + + + + DTR + 4 + connects to + 1 + DCD + + + + SG + 5 + connects to + 5 + SG + + + + DSR + 6 + connects to + 4 + DTR + + + + DCD + 1 + connects to + 4 + DTR + + + + RTS + 7 + connects to + 8 + CTS + + + + CTS + 8 + connects to + 7 + RTS + + + +
+ + + DB-9 to DB-25 Null-Modem Cable + + + + + Signal + Pin # + + Pin # + Signal + + + + + + RD + 2 + connects to + 2 + TD + + + + TD + 3 + connects to + 3 + RD + + + + DTR + 4 + connects to + 6 + DSR + + + + DTR + 4 + connects to + 8 + DCD + + + + SG + 5 + connects to + 7 + SG + + + + DSR + 6 + connects to + 20 + DTR + + + + DCD + 1 + connects to + 20 + DTR + + + + RTS + 7 + connects to + 5 + CTS + + + + CTS + 8 + connects to + 4 + RTS + + + +
+ - Connect Data Set Ready (DSR) and - Data Carrier Detect (DCD) internally in the - connector hood, and then to Data Terminal - Ready (DTR) in the remote hood. + 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. + + The above designs seems to be the most popular. In another + variation (explained in the book RS-232 Made + Easy) SG connects to SG, TD connects to RD, RTS and + CTS connect to DCD, DTR connects to DSR, and vice-versa. Standard RS-232C Cables RS-232C cables - A standard serial cable passes all the RS-232C signals - straight-through. That is, the send data pin on one - end of the cable goes to the send data pin on the + A standard serial cable passes all of the RS-232C signals + straight through. That is, the Transmitted Data pin on one + end of the cable goes to the Transmitted Data 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. @@ -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. - Most terminals will have DB25 ports. Personal computers, - including PCs running FreeBSD, will have DB25 or DB9 ports. If you + 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. @@ -976,42 +1177,63 @@ cable should suffice as long as all of the normal signals are wired: - - - Transmitted Data (TD) - - - - Received Data (RD) - - - - Request to Send (RTS) - - - - Clear to Send (CTS) - - - - Data Set Ready (DSR) - - - - Data Terminal Ready (DTR) - - - - Carrier Detect (CD) - - - - Signal Ground (SG) - - + + Signal Names + + + + + Acronyms + Names + + + + + + RD + Received Data + + + + TD + Transmitted Data + + + + DTR + Data Terminal Ready + + + + DSR + Data Set Ready + + + + DCD + Data Carrier Detect (RS-232's Received Line + Signal Detector) + + + + SG + Signal Ground + + + + RTS + Request to Send + + + + CTS + Clear to Send + + +
FreeBSD needs the RTS and - CTS signals for flow-control at speeds above + CTS signals for flow control at speeds above 2400 bps, the CD signal to detect when a call has been answered or the line has been hung up, and the DTR 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 @@ WITH_* and WITHOUT_* options you used to build this port! + + When the user runs make config (or runs + make build for the first time), the framework will + check for + /var/db/ports/portname/options. + If that file does not exist, it will use the values of + OPTIONS 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. + + Use make showconfig to see the saved + configuration. Use make rmconfig to remove the + saved configuration. @@ -3711,25 +3725,23 @@ OFF. Multiple repetitions of these three fields are allowed. - When the user runs make config (or runs - make build for the first time), the framework will - check for /var/db/ports/portname - /options. - If that file does not exist, it will use the values of - OPTIONS 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. - - Use make showconfig to see the saved - configuration. Use make rmconfig to remove the - saved configuration. + OPTIONS definition must appear before + the inclusion of bsd.port.pre.mk. + The WITH_* and WITHOUT_* + variables can only be tested after the inclusion of + bsd.port.pre.mk. Due to a deficiency + in the infrastructure, you can only test + WITH_* variables for options, which are + ON by default, and + WITHOUT_* variables for options, which + defaults to OFF. Example Simple use of <makevar>OPTIONS</makevar> - OPTIONS= FOO "Enable option foo" On \ - BAR "Support feature bar" Off + OPTIONS= FOO "Enable option foo" On \ + BAR "Support feature bar" Off .include <bsd.port.pre.mk> @@ -3750,12 +3762,8 @@ Brokenness - make index does not follow - OPTIONS yet (ports/75727) - - - PACKAGE_BUILDING is ignoring - OPTIONS (ports/75727?) + OPTIONS are ignored in + BATCH mode. ==== //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 @@ - + %navincludes; %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

AMD64 desktop: ASUS SK8N motherboard, ==== //depot/projects/soc2005/www/freebsd/en/donations/wantlist.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + %navincludes; @@ -212,7 +212,7 @@ joel Sweden - Laptop (1,2GHz CPU+, 256MB RAM+, 30GB HDD+) + Laptop 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 @@ - + @@ -247,6 +247,10 @@ /releases/R/errata.html /releases/R/hardware.html + + /releases/R/installation.html + + /releases/R/migration-guide.html /releases/R/early-adopter.html ==== //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 @@ - + @@ -66,6 +66,7 @@ list all regions in a usergroup database --> + @@ -107,43 +108,75 @@ generate-id() = generate-id(key('html-usergroups-regions-key', @continent)[1])]"> - + -

+

+ - +

- + - + - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - -
+
-

- - -
- -

- - +

==== //depot/projects/soc2005/www/freebsd/share/sgml/transtable-common.xsl#3 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -9,31 +9,31 @@ + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + +