diff options
199 files changed, 9439 insertions, 9900 deletions
diff --git a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml index b1063e6ab0..e526d3d612 100644 --- a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml +++ b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml @@ -4,8 +4,8 @@ The FreeBSD German Documentation Project $FreeBSD$ - $FreeBSDde: de-docproj/books/handbook/geom/chapter.xml,v 1.20 2011/12/19 15:25:08 bcr Exp $ - basiert auf: 1.51 + $FreeBSDde$ + basiert auf: r39631 --> <chapter id="GEOM"> @@ -831,7 +831,7 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen> über alle Dateisystemtransaktionen angelegt, inklusive aller Veränderungen, aus denen ein kompletter Schreibvorgang besteht, bevor diese Änderungen (Metadaten - sowie tatsächliche Schreibvorgänge) physikalisch auf + sowie tatsächliche Schreibvorgänge) physisch auf der Festplatte ausgeführt werden. Dieses Protokoll kann später erneut aufgerufen werden, um diese Vorgänge zu wiederholen (beispielsweise um Systeminkonsistenzen zu diff --git a/de_DE.ISO8859-1/htdocs/index.xsl b/de_DE.ISO8859-1/htdocs/index.xsl index c013e7645a..54f2027004 100644 --- a/de_DE.ISO8859-1/htdocs/index.xsl +++ b/de_DE.ISO8859-1/htdocs/index.xsl @@ -5,8 +5,8 @@ ]> <!-- $FreeBSD$ - $FreeBSDde: de-www/index.xsl,v 1.94 2012/02/23 17:35:11 jkois Exp $ - basiert auf: 1.178 + $FreeBSDde$ + basiert auf: 41116 --> <xsl:stylesheet version="1.0" @@ -56,7 +56,7 @@ Sicherheitsfunktionen und eine exzellente Performance und wird deswegen beispielsweise von einigen der größten <a - href="&enbase;/doc/&url.doc.langcode;/books/handbook/nutshell.html#INTRODUCTION-NUTSHELL-USERS"> + href="&enbase;/doc/&url.doc.langcode;/books/handbook/nutshell.html#introduction-nutshell-users"> Internet-Seiten</a> und von zahlreichen Anbietern eingebetteter Netzwerk- und Speichergeräte eingesetzt.</p> @@ -81,11 +81,10 @@ <h2><a href="&base;/releases/">AKTUELLE VERSIONEN</a></h2> <ul id="frontreleaseslist"> <li> - Produktion: <a href="&u.rel.announce;">&rel.current;</a>, - <a href="&u.rel2.announce;"> &rel2.current;</a> + Produktion: <a href="&u.rel.announce;">&rel.current;</a> </li> <li> - Produktion (alt): <a href="&u.rel3.announce;">&rel3.current;</a> + Produktion (alt): <a href="&u.rel2.announce;">&rel2.current;</a> </li> <xsl:if test="'&beta.testing;' != 'IGNORE'"> <li> @@ -318,4 +317,15 @@ </div> <!-- FRONTMAIN --> </div> <!-- FRONTCONTAINER --> </xsl:template> + + <xsl:template name="process.footer"> + ©right; + + Die Marke FreeBSD ist eine eingetragene Marke der FreeBSD + Foundation und wird vom FreeBSD Project mit freundlicher Genehmigung + der <a + href="http://www.freebsdfoundation.org/documents/Guidelines.shtml"> + FreeBSD Foundation</a> verwendet. + <a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a> + </xsl:template> </xsl:stylesheet> diff --git a/de_DE.ISO8859-1/htdocs/where.xml b/de_DE.ISO8859-1/htdocs/where.xml index c7c07adca9..ea5a390df7 100644 --- a/de_DE.ISO8859-1/htdocs/where.xml +++ b/de_DE.ISO8859-1/htdocs/where.xml @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN" "http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [ <!ENTITY dedate "$FreeBSDde$"> -<!ENTITY reference "basiert auf: r40536"> +<!ENTITY reference "basiert auf: r41232"> <!ENTITY title "FreeBSD Bezugsquellen"> <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases"> ]> @@ -146,6 +146,7 @@ <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> + <!-- <tr> <td colspan="2">FreeBSD &rel3.current;-RELEASE</td> <td colspan="2"></td> @@ -157,27 +158,28 @@ <tr> <td></td> <td>amd64</td> - <!--<td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distribution]</a></td> <td colspan="2" align="right"><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>i386</td> - <!--<td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td> <td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>pc98</td> - <!--<td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td> <td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>sparc64</td> - <!--<td><<a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td><<a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td> <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> + --> </tbody> </table> diff --git a/de_DE.ISO8859-1/share/xml/header.l10n.ent b/de_DE.ISO8859-1/share/xml/header.l10n.ent index f4a92a6602..838adf6c94 100644 --- a/de_DE.ISO8859-1/share/xml/header.l10n.ent +++ b/de_DE.ISO8859-1/share/xml/header.l10n.ent @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $FreeBSD$ $FreeBSDde$ - basiert auf: r39675 + basiert auf: r40575 --> <!-- Components making up the standard headers and footers. --> <!-- Override in the prolog <em>before</em> including this --> <!-- file if necessary.--> -<!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/search/index-site.html">Sitemap</a> | <a href="&enbase;/copyright/">Legal Notices</a> | © 1995–2012 The FreeBSD Project. Alle Rechte vorbehalten.</span>'> +<!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/search/index-site.html">Sitemap</a> | <a href="&enbase;/copyright/">Legal Notices</a> | © 1995–2013 The FreeBSD Project. Alle Rechte vorbehalten.</span>'> <!ENTITY author '<a href="&base;/index.html">Startseite</a> | <a href="&base;/mailto.html">Ansprechpartner</a> | <a href="&enbase;/copyright/index.html">Legal</a> | @@ -31,6 +31,7 @@ <li><a href="&base;/features.html">Eigenschaften</a></li> <li><a href="&enbase;/advocacy/">Advocacy</a></li> <li><a href="&enbase;/marketing/">Marketing</a></li> + <li><a href="&enbase;/privacy.html">Privacy Policy</a></li> </ul> </li> </ul> @@ -68,7 +69,6 @@ <ul> <li><a href="http://wiki.FreeBSD.org/IdeasPage">Projektideen</a></li> <li><a href="http://svnweb.FreeBSD.org">SVN-Repository</a></li> - <li><a href="http://cvsweb.FreeBSD.org">CVS-Repository</a></li> <li><a href="http://p4web.FreeBSD.org">Perforce-Repository</a></li> </ul> </li> @@ -87,7 +87,8 @@ <ul> <li><a href="http://www.freebsdfoundation.org/">Foundation</a> <ul> - <li><a href="http://www.freebsdfoundation.org/donate/">Spenden</a></li> + <li><a href="http://www.freebsdfoundation.org/donate/">Geldspende</a></li> + <li><a href="&enbase;/donations/">Hardwarespende</a></li> </ul> </li> </ul> @@ -108,15 +109,17 @@ <div id="headerlogoright"> <h2 class="blockhide">Externe Links</h2> - <div id="SEARCHNAV"> - <ul id="SEARCHNAVLIST"> + <div id="searchnav"> + <ul id="searchnavlist"> + <!-- <li><a href="&enbase;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li> <li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li> + --> </ul> </div> <!-- SEARCHNAV --> - <div id="SEARCH"> + <div id="search"> <form action="&cgibase;/search.cgi" method="get"> <div> <h2 class="blockhide"><label for="WORDS">&header2.word.search;</label></h2> @@ -135,4 +138,4 @@ <!-- macro for webbuild paper --> <!ENTITY webbuild ' <p xmlns="http://www.w3.org/1999/xhtml">Dieses Dokument beschreibt, wie man die FreeBSD Webseiten von Hand -mittels des CVS Repository aktualisiert und übersetzt.</p>'> +aus dem Subversion-Repository aktualisiert und übersetzt.</p>'> diff --git a/de_DE.ISO8859-1/share/xml/navibar.l10n.ent b/de_DE.ISO8859-1/share/xml/navibar.l10n.ent index 6de7503216..bfbf2fcf00 100644 --- a/de_DE.ISO8859-1/share/xml/navibar.l10n.ent +++ b/de_DE.ISO8859-1/share/xml/navibar.l10n.ent @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $FreeBSD$ - $FreeBSDde: de-www/share/xml/navibar.l10n.ent,v 1.33 2012/01/14 10:37:19 jkois Exp $ - basiert auf: 1.37 + $FreeBSDde$ + basiert auf: r41115 --> <!ENTITY nav.about ' @@ -101,10 +101,11 @@ <li><a href="&base;/where.html">FreeBSD Bezugsquellen</a></li> <li><a href="&base;/releases/">Release Informationen</a> <ul> - <li>Produktivversion: <a href="&u.rel.announce;">&rel.current;</a> + <li>Produktivversion:<br /> + <a href="&u.rel.announce;">&rel.current;</a></li> + <li>Alte Produktivversion:<br/> <a href="&u.rel2.announce;">&rel2.current;</a></li> - <li>Alte Produktivversion:<br/> <a href="&u.rel3.announce;">&rel3.current;</a></li> - <li><a href="&base;/snapshots/">Snapshots</a></li> +<!-- <li><a href="&base;/snapshots/">Snapshots</a></li>--> &beta.listitem; &beta2.listitem; </ul> diff --git a/de_DE.ISO8859-1/share/xml/news.xml b/de_DE.ISO8859-1/share/xml/news.xml index fc6fe51cac..38460194a4 100644 --- a/de_DE.ISO8859-1/share/xml/news.xml +++ b/de_DE.ISO8859-1/share/xml/news.xml @@ -4,7 +4,7 @@ <!-- $FreeBSD$ $FreeBSDde$ - basiert auf: r40903 + basiert auf: r41225 --> <!-- Simple schema for FreeBSD Project news. @@ -39,6 +39,81 @@ <name>2013</name> <month> + <name>3</name> + + <day> + <name>14</name> + + <event> + <title>Neuer technischer Mitarbeiter für die &os; Foundation: + Konstantin Belousov</title> + + <p>Die &os; Foundation freut sich, bekanntgeben zu dürfen, + dass Konstantin Belousov als erster technischer Mitarbeiter + in Vollzeit für die Foundation tätig sein wird. Dies ist + ein wichtiger Meilenstein auf unserem Weg, FreeBSD auch 2013 + zu unterstützen.</p> + + <p>Weitere Informationen hierzu finden Sie <a + href="http://freebsdfoundation.blogspot.com/2013/03/foundation-announces-new-technical.html">hier</a>.</p> + </event> + </day> + + <day> + <name>12</name> + + <event> + <p>Neues Mitglied im Ports Management Team: <a + href="mailto:bdrewery@FreeBSD.org">Bryan Drewery</a></p> + </event> + </day> + + <day> + <name>3</name> + + <event> + <title>Statusreport Oktober-Dezember 2012</title> + + <p>Der Statusreport für die Monate Oktober bis Dezember 2012 + mit 27 Einträgen ist <a + href="&enbase;/news/status/report-2012-10-2012-12.html"> + verfügbar</a>.</p> + </event> + + <event> + <title>Statusreport Juli-September 2012</title> + + <p>Der Statusreport für die Monate Juli bis September 2012 + mit 12 Einträgen ist <a + href="&enbase;/news/status/report-2012-07-2012-09.html"> + verfügbar</a>.</p> + </event> + </day> + </month> + + <month> + <name>2</name> + + <day> + <name>10</name> + + <event> + <p>Neuer Committer: <a + href="mailto:pclin@FreeBSD.org">Po-Chien Lin</a> (ports)</p> + </event> + </day> + + <day> + <name>1</name> + + <event> + <p>Neuer Committer: <a + href="mailto:tmseck@FreeBSD.org">Thomas-Martin Seck</a> (ports)</p> + </event> + </day> + </month> + + <month> <name>1</name> <day> @@ -221,8 +296,13 @@ <p>Das PC-BSD Team hat PC-BSD 9.1 <a href="http://blog.pcbsd.org/2012/12/pc-bsd-9-1-now-available/">veröffentlicht</a>.</p> </event> - </day> - + + <event> + <p>Neuer Committer: <a + href="mailto:smh@FreeBSD.org">Steven Hartland</a> (src)</p> + </event> + </day> + <day> <name>17</name> diff --git a/de_DE.ISO8859-1/share/xml/press.xml b/de_DE.ISO8859-1/share/xml/press.xml index 3004a9beb9..19898ce5f5 100644 --- a/de_DE.ISO8859-1/share/xml/press.xml +++ b/de_DE.ISO8859-1/share/xml/press.xml @@ -7,7 +7,7 @@ "freefall:/c/www/bsddoc/press/". $FreeBSD$ $FreeBSDde$ - basiert auf: r40864 + basiert auf: r41004 --> <press> @@ -17,6 +17,21 @@ <year> <name>2013</name> + <month> + <name>2</name> + + <story> + <name>2012 - A BSD Year in Retrospective</name> + <url>http://www.osnews.com/story/26787/2012_a_BSD_year_in_retrospective</url> + <site-name>OSnews</site-name> + <site-url>http://www.osnews.com/</site-url> + <date>14. Februar 2013</date> + <author>Julian Djamil</author> + <p>Ein Rückblick auf die aufregenden Entwicklungen, die 2012 in der + BSD-Betriebssystemfamilie stattgefunden haben. Näher eingegangen + wird dabei auf FreeBSD, NetBSD, OpenBSD sowie DragonflyBSD.</p> + </story> + </month> <month> <name>1</name> diff --git a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml index b655014b69..b8c54d75a1 100644 --- a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml +++ b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml @@ -13,24 +13,24 @@ <article lang="el"> <title>Ãéáôß íá ÷ñçóéìïðïéÞóåôå ôçí Üäåéá BSD ãéá ôï ëïãéóìéêü óáò</title> - <articleinfo> + <articleinfo> <authorgroup> <author> - <firstname>Bruce</firstname> - <!-- middle initial: R. --> - <surname>Montague</surname> - <affiliation> - <address><email>brucem@alumni.cse.ucsc.edu</email></address> - </affiliation> + <firstname>Bruce</firstname> + <!-- middle initial: R. --> + <surname>Montague</surname> + <affiliation> + <address><email>brucem@alumni.cse.ucsc.edu</email></address> + </affiliation> <contrib>Áñ÷éêüò óõããñáöÝáò</contrib> </author> <author> - <firstname>Ãéþñãïò</firstname> - <surname>Êåñáìßäáò</surname> - <affiliation> - <address><email>keramida@FreeBSD.org</email></address> - </affiliation> + <firstname>Ãéþñãïò</firstname> + <surname>Êåñáìßäáò</surname> + <affiliation> + <address><email>keramida@FreeBSD.org</email></address> + </affiliation> <contrib>ÌåôÜöñáóç</contrib> </author> </authorgroup> @@ -114,7 +114,7 @@ Ïé âáóéêïß ëüãïé ãéá ôç äçìïôéêüôçôá ôïõ Unix Þôáí üôé Ýôñå÷å óå PDP-11, Ýíá ðïëý öôçíü õðïëïãéóôÞ 16-bit, êáé üôé Þôáí ãñáììÝíï óå ìéá ãëþóóá õøçëïý åðéðÝäïõ, ç ïðïßá Þôáí åìöáíþò êáëÞ ãéá ðñïãñáììáôéóìü - óõóôçìÜôùí. Ïé õðïëïãéóôÝò PDP-11 ôçò DEC åß÷áí, ïõóéáóôéêÜ, Ýíá áíïé÷ôü + óõóôçìÜôùí. Ïé õðïëïãéóôÝò PDP-11 ôçò DEC åß÷áí, ïõóéáóôéêÜ, Ýíá áíïé÷ôü interface õëéêïý, ó÷åäéáóìÝíï áêñéâþò ãéá íá ìðïñïýí ïé ðåëÜôåò íá ãñÜøïõí ôï äéêü ôïõò ëåéôïõñãéêü óýóôçìá. Ðïëëïß ëïéðüí Ýêáíáí áêñéâþò áõôü. ¼ðùò Ý÷åé ðåé ï Ken Olsen, éäñõôÞò ôçò @@ -231,8 +231,7 @@ <para> <quote>ÁõôÞ ç ÃåíéêÞ Äçìüóéá ¶äåéá äåí åðéôñÝðåé ôçí åíóùìÜôùóç ôïõ - ðñïãñÜììáôüò óáò óå åìðïñéêÜ ðñïãñÜììáôá.</quote>[1] - </para> + ðñïãñÜììáôüò óáò óå åìðïñéêÜ ðñïãñÜììáôá.</quote>[1]</para> <para>Ç Üäåéá <ulink url="http://www.opensource.org/licenses/gpl-license.php">GPL</ulink> @@ -691,8 +690,7 @@ <sect1 id="addenda"> <title>ÁíáöïñÝò</title> - <programlisting> -[1] http://www.gnu.org/licenses/gpl.html + <programlisting>[1] http://www.gnu.org/licenses/gpl.html [2] http://archives.cnn.com/2000/TECH/computing/03/28/cyberpatrol.mirrors/ diff --git a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml index 4a64e0bafc..04eaf8029f 100644 --- a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml +++ b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="iso-8859-7"?> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" - "../../../share/xml/freebsd45.dtd"> + "../../../share/xml/freebsd45.dtd" [ +<!ENTITY nvidia "nVidia"> +]> <!-- @@ -54,7 +56,7 @@ Ý÷åôå ôá ðëÝïí ðñüóöáôá ôñéóäéÜóôáôá åöÝ ðïõ ðñïóöÝñåé ôï <application>Compiz Fusion</application> ÷ñçóéìïðïéþíôáò (áí ÷ñåéÜæåôáé) êáé ôçí êáôÜëëçëç Ýêäïóç ôùí ðñïãñáììÜôùí ïäÞãçóçò - ãñáöéêþí ôçò nVidia.</para> + ãñáöéêþí ôçò &nvidia;.</para> </abstract> </articleinfo> @@ -66,7 +68,7 @@ ×ñåéÜæïíôáé, üìùò, êáé êÜðïéåò åðéðëÝïí ñõèìßóåéò, ïé ïðïßåò äåí ðåñéãñÜöïíôáé óôçí ôåêìçñßùóç ôïõ port. Ôï Üñèñï áõôü èá óáò âïçèÞóåé íá ñõèìßóåôå ôïí <application>&xorg;</application> server ãéá - ôñéóäéÜóôáôç ëåéôïõñãßá, íá ñõèìßóåôå ôçí nVidia êÜñôá ãñáöéêþí óáò, + ôñéóäéÜóôáôç ëåéôïõñãßá, íá ñõèìßóåôå ôçí &nvidia; êÜñôá ãñáöéêþí óáò, êáé ôåëéêÜ íá åãêáôáóôÞóåôå êáé íá åêôåëÝóåôå ôçí åöáñìïãÞ <command>compiz</command>.</para> @@ -74,7 +76,7 @@ <itemizedlist> <listitem> - <para>Ðùò íá ñõèìßóåôå ôï ðéï ðñüóöáôï ðñüãñáììá ïäÞãçóçò ôçò nVidia + <para>Ðùò íá ñõèìßóåôå ôï ðéï ðñüóöáôï ðñüãñáììá ïäÞãçóçò ôçò &nvidia; (áí áðáéôåßôáé) ãéá ôï óýóôçìá óáò.</para> </listitem> @@ -97,11 +99,11 @@ </sect1> <sect1 id="nvidia-setup"> - <title>Ñýèìéóç ôùí ðñïãñáììÜôùí ïäÞãçóçò ôçò nVidia ãéá ôï &os;</title> + <title>Ñýèìéóç ôùí ÐñïãñáììÜôùí ÏäÞãçóçò ôçò &nvidia; Ãéá Ôï &os;</title> <para>Ôá ôñéóäéÜóôáôá åöÝ áðáéôïýí áñêåôÞ éó÷ý åðåîåñãáóßáò áðü ôçí êÜñôá ãñáöéêþí óáò. Áí ÷ñçóéìïðïéåßôå êÜðïéá êÜñôá ãñáöéêþí ðïõ - âáóßæåôáé óå êõêëþìáôá ôçò nVidia, èá ðñÝðåé íá åãêáôáóôÞóåôå êáé íá + âáóßæåôáé óå êõêëþìáôá ôçò &nvidia;, èá ðñÝðåé íá åãêáôáóôÞóåôå êáé íá ñõèìßóåôå ôï ðñüãñáììá ïäÞãçóçò ðïõ ðáñÝ÷åôáé áðü ôçí åôáéñßá ãéá ôï &os;, ÷ñçóéìïðïéþíôáò ôçí Ýêäïóç ðïõ åßíáé êáôÜëëçëç ãéá ôï óýóôçìá óáò. Áí ÷ñçóéìïðïéåßôå êÜðïéá Üëëç êÜñôá, ðïõ üìùò ãíùñßæåôå üôé ìðïñåß @@ -112,18 +114,18 @@ <sect2 id="determine-driver"> <title>Ðñïóäéïñßóôå ôï óùóôü ðñüãñáììá ïäÞãçóçò</title> - <para>ÕðÜñ÷ïõí äéÜöïñåò åêäüóåéò ôùí ðñïãñáììÜôùí ïäÞãçóçò ôçò nVidia + <para>ÕðÜñ÷ïõí äéÜöïñåò åêäüóåéò ôùí ðñïãñáììÜôùí ïäÞãçóçò ôçò &nvidia; óôç óõëëïãÞ ôùí ports. Ç åðéëïãÞ ôïõ óùóôïý ðñïãñÜììáôïò ãéá ôï óýóôçìá óáò, åîáñôÜôáé áðü ôï ìïíôÝëï (êáé ôçí ðáëáéüôçôá) ôçò êÜñôáò ãñáöéêþí óáò:</para> <itemizedlist> <listitem> - <para>Ïé ôåëåõôáßåò åêäüóåéò ôùí êáñôþí nVidia, õðïóôçñßæïíôáé áðü + <para>Ïé ôåëåõôáßåò åêäüóåéò ôùí êáñôþí &nvidia;, õðïóôçñßæïíôáé áðü ôï port <filename role="package">x11/nvidia-driver</filename>.</para> </listitem> <listitem> - <para>ÊÜñôåò ôçò nVidia ðïõ áíÞêïõí óôéò óåéñÝò GeForce 2MX/3/4 + <para>ÊÜñôåò ôçò &nvidia; ðïõ áíÞêïõí óôéò óåéñÝò GeForce 2MX/3/4 õðïóôçñßæïíôáé áðü ôá ðñïãñÜììáôá ïäÞãçóçò ôçò óåéñÜò 96 ôá ïðïßá äéáôßèåíôáé ìÝóù ôïõ port <filename role="package">x11/nvidia-driver-96xx</filename>.</para> @@ -136,14 +138,14 @@ </listitem> </itemizedlist> - <para>Óôçí ðñáãìáôéêüôçôá, ç nVidia ðáñÝ÷åé ëåðôïìåñåßò ðëçñïöïñßåò + <para>Óôçí ðñáãìáôéêüôçôá, ç &nvidia; ðáñÝ÷åé ëåðôïìåñåßò ðëçñïöïñßåò ó÷åôéêÜ ìå ôï ðïéá êÜñôá õðïóôçñßæåôáé áðü ðïéï ðñüãñáììá ïäÞãçóçò. Ïé ðëçñïöïñßåò áõôÝò äéáôßèåíôáé áðåõèåßáò áðü ôï äéêôõáêü ôïõò ôüðï: <ulink url="http://www.nvidia.com/object/IO_32667.html"></ulink>.</para> </sect2> <sect2 id="install-driver"> - <title>ÅãêáôÜóôáóç ôïõ ðñïãñÜììáôïò ïäÞãçóçò ôçò nVidia</title> + <title>ÅãêáôÜóôáóç ôïõ ðñïãñÜììáôïò ïäÞãçóçò ôçò &nvidia;</title> <para>Áöïý êáèïñßóåôå ôï óùóôü ðñüãñáììá ïäÞãçóçò ãéá ôçí êÜñôá óáò, ç åãêáôÜóôáóç åßíáé ôï ßäéï áðëÞ ìå ïðïéïäÞðïôå Üëëç åöáñìïãÞ ôçò @@ -197,7 +199,7 @@ <programlisting>Driver "nvidia"</programlisting> <para>¼ôáí îåêéíÞóåôå ôï ãñáöéêü ðåñéâÜëëïí ìå ôï óõíÞèç ôñüðï, èá äåßôå - ôçí ïèüíç ÷áéñåôéóìïý ôçò nVidia. ¼ëá èá ðñÝðåé íá ëåéôïõñãïýí + ôçí ïèüíç ÷áéñåôéóìïý ôçò &nvidia;. ¼ëá èá ðñÝðåé íá ëåéôïõñãïýí êáíïíéêÜ. Óçìåéþóôå ùóôüóï, üôé óôï óçìåßï áõôü äåí Ý÷åé áêüìá ñõèìéóôåß ôï <application>&xorg;</application> ãéá ôñéóäéÜóôáôá åöÝ. Ç ñýèìéóç áõôÞ ðåñéãñÜöåôáé ðáñáêÜôù.</para> @@ -217,7 +219,7 @@ </sect1> <sect1 id="xorg-configuration"> - <title>Ñýèìéóç ôïõ xorg.conf ãéá ôñéóäéÜóôáôá åöÝ</title> + <title>Ñýèìéóç ôïõ <filename>xorg.conf</filename> ãéá ÔñéóäéÜóôáôá ÅöÝ</title> <para>Ðñéí åãêáôáóôÞóåôå êáé åêôåëÝóåôå ôï <application>Compiz Fusion</application>, èá ðñÝðåé íá ðñïóèÝóåôå @@ -280,13 +282,13 @@ Load "glx" ìðïñåßôå íá êÜíåôå ôéò ðåñéóóüôåñåò áðü ôéò ðáñáðÜíù ñõèìßóåéò äßíïíôáò ôéò áêüëïõèåò åíôïëÝò (ùò root):</para> - <screen>&prompt.root; <userinput>nvidia-xconfig --add-argb-glx-visuals</userinput> + <screen>&prompt.root; <userinput>nvidia-xconfig --add-argb-glx-visuals</userinput> &prompt.root; <userinput>nvidia-xconfig --composite</userinput> &prompt.root; <userinput>nvidia-xconfig --depth=24</userinput></screen> - <para>Áí èÝëåôå íá äåßôå üëåò ôéò äõíáôüôçôåò ôïõ ðáñáðÜíù - ðñïãñÜììáôïò, äþóôå ôçí åíôïëÞ - <command>nvidia-xconfig -A | more</command>.</para> + <para>Áí èÝëåôå íá äåßôå üëåò ôéò äõíáôüôçôåò ôïõ ðáñáðÜíù + ðñïãñÜììáôïò, äþóôå ôçí åíôïëÞ + <command>nvidia-xconfig -A | more</command>.</para> </note> </sect1> diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml index 8f9bb5f693..f1043f3ed3 100644 --- a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml +++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml @@ -20,7 +20,6 @@ <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.general; </legalnotice> diff --git a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml index 3f1e4c7121..0e2156becd 100644 --- a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml +++ b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml @@ -19,7 +19,6 @@ <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.xfree86; &tm-attrib.general; diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index 2e51b5c269..090c1064d1 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -30,7 +30,6 @@ <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; &tm-attrib.coverity; - &tm-attrib.cvsup; &tm-attrib.ibm; &tm-attrib.intel; &tm-attrib.sparc; @@ -313,9 +312,16 @@ <emphasis>r300894</emphasis>.</para> <para>There are mechanisms in place to automatically merge - changes back from the Subversion repository to the - <acronym>CVS</acronym> one, so regular users should not notice - a difference, however developers most certainly will.</para> + changes back from the Subversion <literal>src</literal> + repository to the <acronym>CVS</acronym> repository for + some &os; branches (<literal>releng/6</literal> through + <literal>releng/9</literal>), 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 + <literal>ports</literal> 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.</para> <para>Subversion is not that different from <acronym>CVS</acronym> when it comes to daily use, but there @@ -441,11 +447,11 @@ <sect3> <title>Checkout from a Mirror</title> - <para>You can check out a working copy from a mirror by simply + <para>Check out a working copy from a mirror by substituting the mirror's <acronym>URL</acronym> for <literal>svn+ssh://svn.freebsd.org/base</literal>. This can - be an official mirror or a mirror you maintain yourself - using <command>svnsync</command> or similar.</para> + be an official mirror or a mirror maintained by + using <command>svnsync</command>.</para> <para>There is a serious disadvantage to this method: every time something is to be committed, a <command>svn switch @@ -456,8 +462,8 @@ the same UUID, some hacking of the local repository's UUID has to occur before it is possible to start using it.</para> - <para>Unlike with <acronym>CVS</acronym> and - <acronym>csup</acronym>, the hassle of a local + <para>Unlike with <acronym>CVS</acronym>, + the hassle of a local <command>svnsync</command> 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 @@ -478,10 +484,16 @@ <para>For the base repository, HEAD refers to the -CURRENT tree. For example, <filename>head/bin/ls</filename> is what would go into <filename>/usr/src/bin/ls</filename> in a - release. Some other key locations are:</para> + release. Some key locations are:</para> <itemizedlist> <listitem> + <para><emphasis>/head/</emphasis> + which corresponds to <literal>HEAD</literal>, also known as + <literal>-CURRENT</literal>. + </para> + </listitem> + <listitem> <para><emphasis>/stable/<replaceable>n</replaceable></emphasis> which corresponds to <literal>RELENG_<replaceable>n</replaceable></literal>.</para> @@ -675,10 +687,14 @@ <para>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:</para> + to. To do this, use the following command:</para> - <screen>&prompt.user; <userinput>svn co svn://svn.freebsd.org/base/head /usr/src</userinput> -&prompt.user; <userinput>svn co http://svn.freebsd.org/base/head /usr/src</userinput></screen> + <screen>&prompt.user; <userinput>svn co <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/base/head /usr/src</userinput></screen> + + <para>Select the closest mirror and verify the mirror server + certificate from the list of <ulink + url="&url.books.handbook;/svn-mirrors.html">Subversion + mirror sites</ulink>.</para> </sect3> <sect3> @@ -2297,32 +2313,19 @@ ControlPersist yes</screen> </itemizedlist> <para>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.</para> + GNATS tree by creating an <application>rsync</application> mirror. + Then you can run GNATS commands locally, allowing you to query the PR + database without an Internet connection.</para> <sect2> <title>Mirroring the GNATS Tree</title> - <para>It is possible to mirror the GNATS database by adding this line - to your <filename>supfile</filename>. Note that since - GNATS is not under CVS control it has no tag, so if you are adding - it to your existing <filename>supfile</filename> it should appear - before any <quote>tag=</quote> entry as these remain active once set.</para> - - <programlisting>gnats release=current prefix=/usr</programlisting> - - <para>This will place the FreeBSD GNATS tree in - <filename>/usr/gnats</filename>. You can use a - <emphasis>refuse</emphasis> file to control which categories to - receive. For example, to only receive <literal>docs</literal> PRs, - put this line in - <filename>/usr/local/etc/cvsup/sup/refuse</filename><footnote> - <para>The precise path depends on the <literal>*default - base</literal> setting in your - <filename>supfile</filename>.</para> - </footnote>.</para> + <para>It is possible to mirror the GNATS database by installing + <filename role="package">net/rsync</filename>, and + executing:</para> + + <screen>&prompt.user; <userinput>rsync -va rsync://bit0.us-west.freebsd.org/FreeBSD-bit/gnats .</userinput></screen> + </sect2> <sect2 id="gnatstools"> diff --git a/en_US.ISO8859-1/articles/compiz-fusion/article.xml b/en_US.ISO8859-1/articles/compiz-fusion/article.xml index 3c30a2b898..951829cb0a 100644 --- a/en_US.ISO8859-1/articles/compiz-fusion/article.xml +++ b/en_US.ISO8859-1/articles/compiz-fusion/article.xml @@ -135,9 +135,7 @@ <note> <para>Make sure to update your ports tree using your favorite method - (like <application>csup</application>, - <application>CVSup</application> or - <application>portsnap</application>) before you install any + (e.g., <application>portsnap</application>) before you install any application from the ports system. Graphics drivers and the desktop effects programs are under heavy development, and are updated regularly.</para> diff --git a/en_US.ISO8859-1/articles/contributors/article.xml b/en_US.ISO8859-1/articles/contributors/article.xml index 895a9633f1..c7c0a6fa95 100644 --- a/en_US.ISO8859-1/articles/contributors/article.xml +++ b/en_US.ISO8859-1/articles/contributors/article.xml @@ -12,7 +12,6 @@ <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.sun; &tm-attrib.general; </legalnotice> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml index 81c863ffe8..a695819954 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml @@ -4408,6 +4408,11 @@ </listitem> <listitem> + <para>Javad Kouhi + <email>javad.kouhi@gmail.com</email></para> + </listitem> + + <listitem> <para>Javier Martin Rueda <email>jmrueda@diatel.upm.es</email></para> </listitem> @@ -4913,6 +4918,11 @@ </listitem> <listitem> + <para>John Mehr + <email>jcm@visi.com</email></para> + </listitem> + + <listitem> <para>John Merryweather Cooper <email>jmcoopr@webmail.bmi.net</email></para> </listitem> @@ -5332,6 +5342,11 @@ </listitem> <listitem> + <para>Kai Wang + <email>kaiwang27@gmail.com</email></para> + </listitem> + + <listitem> <para>Kaleb S. Keithley <email>kaleb@ics.com</email></para> </listitem> @@ -7339,6 +7354,11 @@ </listitem> <listitem> + <para>Nikolai Lifanov + <email>lifanov@mail.lifanov.com</email></para> + </listitem> + + <listitem> <para>Nikos Kokkalis <email>nickkokkalis@gmail.com</email></para> </listitem> @@ -10078,11 +10098,6 @@ </listitem> <listitem> - <para>Thomas-Martin Seck - <email>tmseck@netcologne.de</email></para> - </listitem> - - <listitem> <para>Thorsten Greiner <email>thorsten@tgreiner.net</email></para> </listitem> @@ -10248,6 +10263,11 @@ </listitem> <listitem> + <para>Tomasz Walaszek + <email>tmwalaszek@gmail.com</email></para> + </listitem> + + <listitem> <para>Tomaz<!-- ž not rendered?--> Muraus <email>kami@k5-storitve.net</email></para> </listitem> @@ -10689,6 +10709,11 @@ </listitem> <listitem> + <para>Waitman Gobble + <email>waitman@waitman.net</email></para> + </listitem> + + <listitem> <para>Walt Howard <email>howard@ee.utah.edu</email></para> </listitem> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml index 0270efaa68..e680c609b8 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml @@ -188,10 +188,6 @@ </listitem> <listitem> - <para>&a.carvay;</para> - </listitem> - - <listitem> <para>&a.gahr;</para> </listitem> @@ -436,10 +432,6 @@ </listitem> <listitem> - <para>&a.shige;</para> - </listitem> - - <listitem> <para>&a.gallatin;</para> </listitem> @@ -520,10 +512,6 @@ </listitem> <listitem> - <para>&a.randi;</para> - </listitem> - - <listitem> <para>&a.smh;</para> </listitem> @@ -548,10 +536,6 @@ </listitem> <listitem> - <para>&a.mux;</para> - </listitem> - - <listitem> <para>&a.wen;</para> </listitem> @@ -696,10 +680,6 @@ </listitem> <listitem> - <para>&a.zack;</para> - </listitem> - - <listitem> <para>&a.jceel;</para> </listitem> @@ -1304,6 +1284,10 @@ </listitem> <listitem> + <para>&a.tmseck;</para> + </listitem> + + <listitem> <para>&a.stas;</para> </listitem> @@ -1636,10 +1620,6 @@ </listitem> <listitem> - <para>&a.keichii;</para> - </listitem> - - <listitem> <para>&a.joerg;</para> </listitem> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml index e11b6ff7f4..319651d9d9 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml @@ -2,24 +2,29 @@ <!-- $FreeBSD$ --> <itemizedlist> + <listitem> - <para>Doug Barton (2000 - 2012)</para> + <para>&a.randi; (2010 - 2012)</para> </listitem> <listitem> - <para>&a.wilko; (2000 - 2012)</para> + <para>&a.zack; (2010 - 2012)</para> </listitem> <listitem> - <para>&a.murray; (2000 - 2012)</para> + <para>&a.erik; (2008 - 2012)</para> </listitem> <listitem> - <para>&a.steve; (1996 - 2012)</para> + <para>&a.carvay; (2008 - 2012)</para> </listitem> <listitem> - <para>&a.erik; (2008 - 2012)</para> + <para>&a.lulf; (2007 - 2012)</para> + </listitem> + + <listitem> + <para>&a.mnag; (2005 - 2012)</para> </listitem> <listitem> @@ -27,15 +32,19 @@ </listitem> <listitem> - <para>&a.mnag; (2005 - 2012)</para> + <para>Doug Barton (2000 - 2012)</para> </listitem> <listitem> - <para>&a.lulf; (2007 - 2012)</para> + <para>&a.wilko; (2000 - 2012)</para> </listitem> <listitem> - <para>&a.niels; (2004 - 2011)</para> + <para>&a.murray; (2000 - 2012)</para> + </listitem> + + <listitem> + <para>&a.steve; (1996 - 2012)</para> </listitem> <listitem> @@ -63,6 +72,10 @@ </listitem> <listitem> + <para>&a.niels; (2004 - 2011)</para> + </listitem> + + <listitem> <para>&a.sergei; (2003 - 2011)</para> </listitem> @@ -71,6 +84,10 @@ </listitem> <listitem> + <para>&a.mux; (2002 - 2011)</para> + </listitem> + + <listitem> <para>&a.hm; (1998 - 2011)</para> </listitem> @@ -87,6 +104,10 @@ </listitem> <listitem> + <para>&a.cbzimmer; (2009 - 2010)</para> + </listitem> + + <listitem> <para>&a.bushman; (2007 - 2010)</para> </listitem> @@ -207,6 +228,10 @@ </listitem> <listitem> + <para>&a.kishore; (2007 - 2008)</para> + </listitem> + + <listitem> <para>&a.twinterg; (2006 - 2008)</para> </listitem> @@ -259,6 +284,10 @@ </listitem> <listitem> + <para>&a.sah; (2004 - 2008)</para> + </listitem> + + <listitem> <para>&a.rsm; (2003 - 2008)</para> </listitem> @@ -271,6 +300,10 @@ </listitem> <listitem> + <para>&a.matk; (2003 - 2008)</para> + </listitem> + + <listitem> <para>&a.seanc; (2002 - 2008)</para> </listitem> @@ -339,6 +372,10 @@ </listitem> <listitem> + <para>&a.shige; (1999 - 2008)</para> + </listitem> + + <listitem> <para>&a.hosokawa; (1998 - 2008)</para> </listitem> @@ -479,6 +516,10 @@ </listitem> <listitem> + <para>&a.am; (2003 - 2006)</para> + </listitem> + + <listitem> <para>&a.scop; (2002 - 2006)</para> </listitem> @@ -499,6 +540,10 @@ </listitem> <listitem> + <para>&a.keichii; (2001 - 2006)</para> + </listitem> + + <listitem> <para>&a.ue; (2001 - 2006)</para> </listitem> diff --git a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml index f9cb424f6c..9cb8441e21 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml @@ -3,6 +3,14 @@ <itemizedlist> <listitem> + <para>&a.beat; (2011 - 2013)</para> + </listitem> + + <listitem> + <para>&a.linimon; (2004 - 2013)</para> + </listitem> + + <listitem> <para>&a.pav; (2006 - 2012)</para> </listitem> diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml index 7f1aff1ba7..8c2ff9996a 100644 --- a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml +++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml @@ -20,6 +20,7 @@ <year>2009</year> <year>2010</year> <year>2011</year> + <year>2013</year> <holder role="mailto:jgh@FreeBSD.org">Jason Helfman</holder> </copyright> @@ -38,8 +39,8 @@ <abstract> <para>This article describes building an internal &fbus.ap;. The <ulink - url="&url.base;/cgi/cvsweb.cgi/projects/freebsd-update-server/">freebsd-update-server</ulink> 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</ulink> + 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 @@ -116,11 +117,11 @@ <title>Configuration: Installation & Setup</title> <para>Download the <ulink - url="&url.base;/cgi/cvsweb.cgi/projects/freebsd-update-server/">freebsd-update-server</ulink> - software as a <ulink - url="&url.base;/cgi/cvsweb.cgi/projects/freebsd-update-server/freebsd-update-server.tar.gz?tarball=1">tar archive</ulink>, - or use &man.csup.1; and the <literal>projects-all</literal> - collection.</para> + url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/"> + freebsd-update-server</ulink> software by installing <filename + role="package">devel/subversion </filename>, and execute:</para> + + <screen>&prompt.user; <userinput>svn co http://svn.freebsd.org/base/user/cperciva/freebsd-update-build freebsd-update-server</userinput></screen> <para>Update <filename>scripts/build.conf</filename> appropriately. It is sourced during all build operations.</para> @@ -351,9 +352,9 @@ world|base|/usr/lib/libalias_ftp.a <warning> <para>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 <ulink - url="&url.base;/cgi/cvsweb.cgi/projects/freebsd-update-server/">freebsd-update-server</ulink> + daemon, &man.ntpd.8;, is turned off. Per &a.cperciva;, + Security Officer Emeritus of &os;, "the <ulink + url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server</ulink> 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 @@ -776,7 +777,6 @@ the new builds.</screen> } </screen> </listitem> - <!-- this tip will speed up your build process, however it is not necessary --> <listitem> <para>Adding <option>-j <replaceable>NUMBER</replaceable></option> flags to <maketarget>buildworld</maketarget> and @@ -799,28 +799,12 @@ the new builds.</screen> </listitem> <listitem> -<!-- Parse error. I don't understand what this paragraph suggests or - recommends. Also, why do we need to block RSTs? I don't really - like gratuitous blocking of RST, ICMP or other packets. Our - kernel can rate-limit most of the "strange" packets alredy. --> - -<!-- there is a bug in earlier versions of the software that get the updates, and not blocking them will result in failure to update systems --> - - <para>Create a <ulink - url="&url.books.handbook;/firewalls.html">firewall</ulink> - rule to block outgoing RST packets. Due to a bug noted <ulink - url="http://lists.freebsd.org/pipermail/freebsd-stable/2009-April/049578.html">in a posting</ulink> - on the &a.stable; in April 2009, there may be - time-outs and failures when updating a system.</para> - </listitem> - - <!-- this tip is not necessary, however if you wish to retain mirrors and redundancy, this tip will help you. --> - <listitem> <para>Create an appropriate <ulink url="&url.books.handbook;/network-dns.html">DNS</ulink> SRV record for the update server, and put others behind it with variable weights. Using this facility will provide update - mirrors.</para> + mirrors, however this tip is not necessary unless you wish to + provide a redundant service.</para> <screen> _http._tcp.update.myserver.com. IN SRV 0 2 80 host1.myserver.com. SRV 0 1 80 host2.myserver.com. diff --git a/en_US.ISO8859-1/articles/geom-class/article.xml b/en_US.ISO8859-1/articles/geom-class/article.xml index bb33aaaf8d..e089c2b054 100644 --- a/en_US.ISO8859-1/articles/geom-class/article.xml +++ b/en_US.ISO8859-1/articles/geom-class/article.xml @@ -19,7 +19,6 @@ <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.general; </legalnotice> diff --git a/en_US.ISO8859-1/articles/hubs/article.xml b/en_US.ISO8859-1/articles/hubs/article.xml index c523a24e29..7fdcbabe7f 100644 --- a/en_US.ISO8859-1/articles/hubs/article.xml +++ b/en_US.ISO8859-1/articles/hubs/article.xml @@ -777,13 +777,6 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all <procedure> <step> <para> - Look at available mirrors in your country. - The <ulink url="http://mirrorlist.FreeBSD.org/">FreeBSD - Mirror Database</ulink> can help you with this. - </para> - </step> - <step> - <para> Check for those which provide fastest access (number of hops, round-trip-times) and offer the services you intend to diff --git a/en_US.ISO8859-1/articles/p4-primer/article.xml b/en_US.ISO8859-1/articles/p4-primer/article.xml index 7d91e1212c..06f11f62c6 100644 --- a/en_US.ISO8859-1/articles/p4-primer/article.xml +++ b/en_US.ISO8859-1/articles/p4-primer/article.xml @@ -34,7 +34,7 @@ <para>The &os; project uses the <application>Perforce</application> version control system to manage experimental projects that are - not ready for the main CVS repository.</para> + not ready for the main Subversion repository.</para> <sect2 id="resources"> <title>Availability, Documentation, and Resources</title> @@ -65,9 +65,9 @@ <para>The &os; <application>Perforce</application> server is hosted on <hostid role="fqdn">perforce.freebsd.org</hostid>, port <literal>1666</literal>. The repository is browsable - online at <ulink url="http://perforce.freebsd.org"></ulink>. + online at <ulink url="http://p4web.freebsd.org"></ulink>. Some portions of the repository are also automatically exported - to a number of <application>CVSup</application> servers.</para> + to a number of legacy <application>CVSup</application> servers.</para> </sect2> </sect1> @@ -331,7 +331,8 @@ with &os;. Frequent submits of changes to the server are also encouraged.</para> - <para>The <application>Perforce</application> repository (the + <para>sSimilar to <application>Subversion</application>, the + <application>Perforce</application> repository (the <quote>depot</quote>) 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 <filename @@ -803,12 +804,12 @@ </sect1> <sect1 id="freebsd-cvs-and-p4"> - <title>Interactions between &os; CVS and Perforce</title> + <title>Interactions between &os; Subversion and Perforce</title> - <para>The &os; <application>Perforce</application> and CVS - repositories are completely separate. However, changes to CVS are + <para>The &os; <application>Perforce</application> and <application>Subversion</application> + repositories are completely separate. However, changes to Subversion are tracked at near-real-time in <application>Perforce</application>. - 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 <application>Perforce</application> in the <filename class="directory">//depot/vendor/freebsd/...</filename> tree. This @@ -819,10 +820,10 @@ should be done so that your tree stays up to date and avoids conflicts with mainline development.</para> - <para>The bridge between CVS and <application>Perforce</application> - is one-way; changes to CVS will be reflected in + <para>The bridge between Subversion and <application>Perforce</application> + is one-way; changes to Subversion will be reflected in <application>Perforce</application>, 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 <application>Perforce</application> repo can be exported to <application>CVSup</application> and made available for distribution that way. Contact the &os; diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml index 26919228f6..dc635b1f72 100644 --- a/en_US.ISO8859-1/articles/portbuild/article.xml +++ b/en_US.ISO8859-1/articles/portbuild/article.xml @@ -1498,6 +1498,14 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed! command is no longer used.</para> </note> </step> + + <step> + <para>Decide if you will be using a local + <application>squid</application> 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.)</para> + </step> </procedure> </sect2> @@ -1624,12 +1632,21 @@ options NFSSERVER # Network Filesystem Server</programlist </listitem> <listitem> - <para>Also add the following users:</para> + <para>If you are using <application>ganglia</application> + for monitoring, add the following user:</para> + + <programlisting>ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh</programlisting> + + <para>Add it to <filename>etc/group</filename> as well.</para> + </listitem> + + <listitem> + <para>If you are using a local <application>squid</application> + cache on the client, add the following user:</para> - <programlisting>squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh -ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh</programlisting> + <programlisting>squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh</programlisting> - <para>Add them to <filename>etc/group</filename> as well.</para> + <para>Add it to <filename>etc/group</filename> as well.</para> </listitem> <listitem> @@ -1679,13 +1696,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"</programlisting> -gmond_enable="YES" -squid_enable="YES" + <para>If you are using <application>ganglia</application> + for monitoring, add the following</para> + + <programlisting>gmond_enable="YES"</programlisting> + + <para>If you are using a local <application>squid</application> + cache on the client, add the following</para> + + <programlisting>squid_enable="YES" squid_chdir="<filename>/<replaceable>usr2</replaceable>/squid/logs</filename>" squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"</programlisting> - <para>Required entries for VMWare-based nodes:</para> <programlisting>vmware_guest_vmmemctl_enable="YES" @@ -1771,13 +1794,21 @@ squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</ <para>Install the following ports:</para> <programlisting>net/rsync -security/openssh-portable (with HPN on) -security/sudo -sysutils/ganglia-monitor-core (with GMETAD off) -www/squid (with SQUID_AUFS on)</programlisting> +security/sudo</programlisting> + + <para>You may also wish to install:</para> + + <programlisting>security/openssh-portable (with HPN on)</programlisting> + + <para>If you are using <application>ganglia</application> + for monitoring, install the following:</para> + + <programlisting>sysutils/ganglia-monitor-core (with GMETAD off)</programlisting> - <para>There is a WIP to create a meta-port, but it is not yet - complete.</para> + <para>If you are using a local <application>squid</application> + cache on the client, install the following</para> + + <programlisting>www/squid (with SQUID_AUFS on)</programlisting> </step> <step> @@ -1798,7 +1829,8 @@ www/squid (with SQUID_AUFS on)</programlisting> <itemizedlist> <listitem> - <para>Modify + <para>If you are using <application>ganglia</application>, + modify <filename>usr/local/etc/gmond.conf</filename>:</para> <screen>21,22c21,22 @@ -1846,7 +1878,8 @@ touch /tmp/.boot_finished</programlisting> </listitem> <listitem> - <para>Modify + <para>If you are using a local <application>squid</application> + cache, modify, <filename>usr/local/etc/squid/squid.conf</filename>:</para> <screen>288,290c288,290 @@ -1921,8 +1954,12 @@ portbuild ALL=(ALL) NOPASSWD: ALL</programlisting> <screen>&prompt.root; <userinput>mkdir portbuild</userinput> &prompt.root; <userinput>chown portbuild:portbuild portbuild</userinput> &prompt.root; <userinput>mkdir pkgbuild</userinput> -&prompt.root; <userinput>chown portbuild:portbuild pkgbuild</userinput> -&prompt.root; <userinput>mkdir squid</userinput> +&prompt.root; <userinput>chown portbuild:portbuild pkgbuild</userinput></screen> + + <para>If you are using a local <application>squid</application> + cache:</para> + + <screen>&prompt.root; <userinput>mkdir squid</userinput> &prompt.root; <userinput>mkdir squid/cache</userinput> &prompt.root; <userinput>mkdir squid/logs</userinput> &prompt.root; <userinput>chown -R squid:squid squid</userinput></screen> @@ -1943,7 +1980,8 @@ portbuild ALL=(ALL) NOPASSWD: ALL</programlisting> </step> <step> - <para>As root, initialize the <command>squid</command> + <para>If you are using a local <application>squid</application> + cache, as root, initialize the <command>squid</command> directories:</para> <screen><userinput>squid -z</userinput></screen> @@ -2030,8 +2068,6 @@ MASTER_SITE_OVERRIDE= \ <para>Suggested values:</para> <programlisting>disconnected=1 -http_proxy="http://localhost:3128/" -squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename> scratchdir=<filename>/<replaceable>usr2</replaceable>/pkgbuild</filename> client_user=portbuild sudo_cmd="sudo -H" @@ -2040,6 +2076,18 @@ rsync_gzip=-z infoseek_host=localhost infoseek_port=<replaceable>${tunelled-tcp-port}</replaceable></programlisting> + <para>If you will be using <application>squid</application> + on the client:</para> + + <programlisting>http_proxy="http://localhost:3128/" +squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename></programlisting> + + <para>If, instead, you will be using <application>squid</application> + on the server:</para> + + <programlisting> +http_proxy="http://<replaceable>servername</replaceable>:3128/"</programlisting> + <para>Possible other values:</para> <programlisting>use_md_swap=1 @@ -2061,7 +2109,8 @@ ssh_cmd="/usr/local/bin/ssh"</programlisting> </step> <step> - <para>Add an appropriate <literal>data_source</literal> entry to + <para>If you are using <application>ganglia</application>, + add an appropriate <literal>data_source</literal> entry to <filename>/usr/local/etc/gmetad.conf</filename>:</para> <programlisting>data_source "<replaceable>arch</replaceable>/<replaceable>location</replaceable> Package Build Cluster" 30 <replaceable>hostname</replaceable></programlisting> @@ -2107,7 +2156,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlisting> </procedure> <para>This step needs to be taken by a <literal>portmgr</literal> - acting as <literal>root</literal>:</para> + acting as <literal>portbuild</literal>:</para> <procedure> <step> @@ -2348,7 +2397,7 @@ zfs destroy -r a/snap/src-<replaceable>old-branch</replaceable></screen> <listitem> <para>As the <literal>portbuild</literal> user, run</para> - <screen>&prompt.user; /a/portbuild/admin/tools/addarch <replaceable>arch</replaceable></screen> + <screen>&prompt.user; /a/portbuild/tools/addarch <replaceable>arch</replaceable></screen> </listitem> </itemizedlist> @@ -2477,9 +2526,6 @@ zfs destroy -r a/snap/src-<replaceable>old-branch</replaceable></screen> <sect1 id="new-head-node"> <title>How to configure a new head node (pointyhat instance)</title> - <para>Please talk to Mark Linimon before making any changes - to this section.</para> - <sect2 id="pointyhat-basics"> <title>Basic installation</title> @@ -2534,8 +2580,6 @@ fsck_y_enable="YES" apache22_enable="YES" apache_flags="" apache_pidfile="/var/run/httpd.pid" -gmetad_enable="YES" -gmond_enable="YES" inetd_enable="YES" inetd_flags="-l -w" mountd_enable="YES" @@ -2548,6 +2592,17 @@ rpc_lockd_enable="NO" rpc_statd_enable="YES" sendmail_enable="NONE" smartd_enable="YES"</programlisting> + + <para>If you are using <application>ganglia</application>, + add:</para> + + <programlisting>gmetad_enable="YES" +gmond_enable="YES"</programlisting> + + <para>If you will be using a <application>squid</application> + cache on the server, rather than the clients:</para> + + <programlisting>squid_enable="YES"</programlisting> </step> <step> @@ -2600,8 +2655,6 @@ devel/py-setuptools devel/subversion net/nc net/rsync -sysutils/ganglia-monitor-core (with GMETAD off) -sysutils/ganglia-webfrontend (compile with -DWITHOUT_X11) www/apache22 (with EXT_FILTER)</programlisting> <para>Expect those to bring in, among others:</para> @@ -2610,6 +2663,17 @@ www/apache22 (with EXT_FILTER)</programlisting> lang/perl-5.14 (or successor) lang/python27 (or sucessor)</programlisting> + <para>If you are using <application>ganglia</application>, + add:</para> + + <programlisting>sysutils/ganglia-monitor-core (with GMETAD off) +sysutils/ganglia-webfrontend (compile with -DWITHOUT_X11)</programlisting> + + <para>If you will be using a <application>squid</application> + cache on the server, rather than the clients:</para> + + <programlisting>www/squid (with SQUID_AUFS on)</programlisting> + <para>The following ports (or their latest successors) are strongly suggested:</para> <programlisting>devel/ccache @@ -2732,7 +2796,7 @@ sh -x ./tmp/mkportbuild <step> <para>Select an <application>svn</application> repository and export it. See the - <ulink url="&url.books.handbook;/mirrors-svn.html">&os; Handbook</ulink> + <ulink url="&url.books.handbook;/svn-mirrors.html">&os; Handbook</ulink> for the currently supported list.</para> <screen>&prompt.root; export VCS_REPOSITORY=<replaceable>svn://svn0.us-east.FreeBSD.org</replaceable></screen> @@ -3015,7 +3079,7 @@ qmanager</programlisting> </step> <step> - <para>Install <filename>/a/srcbuild/admin/crontabs/portbuild</filename> as + <para>Install <filename>/a/portbuild/admin/crontabs/srcbuild</filename> as the <username>srcbuild</username> crontab via <command>crontab -u srcbuild -e</command>.</para> </step> diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.xml b/en_US.ISO8859-1/articles/pr-guidelines/article.xml index 8fcf1d2b9e..0333091503 100644 --- a/en_US.ISO8859-1/articles/pr-guidelines/article.xml +++ b/en_US.ISO8859-1/articles/pr-guidelines/article.xml @@ -900,7 +900,7 @@ <listitem> <para>When completing the &man.send-pr.1; template, the submitter set Confidential to <literal>yes</literal>. (Since we allow - anyone to mirror GNATS via <application>cvsup</application>, + anyone to mirror GNATS via <application>rsync</application>, our PRs are public information. Security alerts should therefore not be sent via GNATS but instead via email to the Security Team.)</para> diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml index f6d53836ef..777969ced9 100644 --- a/en_US.ISO8859-1/articles/releng/article.xml +++ b/en_US.ISO8859-1/articles/releng/article.xml @@ -9,7 +9,9 @@ <articleinfo> <!-- This paper was presented at BSDCon Europe in Brighton, UK on - November 11, 2001 --> + November 11, 2001. --> + <!-- The content in this paper was updated in March 2013 to + reflect the current FreeBSD Release process. --> <confgroup> <confdates>November 2001</confdates> <conftitle>BSDCon Europe</conftitle> @@ -45,6 +47,16 @@ <releaseinfo>$FreeBSD$</releaseinfo> <abstract> + <para> + <warning> + <para>2013/02/26: This document is outdated and does not + accurately describe the current release procedures of the + &os; Release Engineering team. The &os; Release + Engineering team is currently reviewing this document and + will publish updated content soon. + </para> + </warning> + </para> <para>This paper describes the approach used by the &os; release engineering team to make production quality releases of the &os; Operating System. It details the methodology @@ -62,8 +74,14 @@ <para>The development of &os; is a very open process. &os; is comprised of contributions from thousands of people around the - world. The &os; Project provides anonymous - <acronym>CVS</acronym>[1] access to the general public so that + world. The &os; Project provides + Subversion + <footnote> + <simpara> + Subversion, <ulink url="http://subversion.apache.org"></ulink> + </simpara> + </footnote> + access to the general public so that others can have access to log messages, diffs (patches) between development branches, and other productivity enhancements that formal source code management provides. This has been a huge help @@ -71,9 +89,20 @@ think everyone would agree that chaos would soon manifest if write access was opened up to everyone on the Internet. Therefore only a <quote>select</quote> group of nearly 300 people are given write - access to the <acronym>CVS</acronym> repository. These - <emphasis>committers[5]</emphasis> are responsible for the bulk of - &os; development. An elected <emphasis>core-team[6]</emphasis> + access to the Subversion repository. These + <ulink url="&url.articles.contributors;/article.html#staff-committers">committers</ulink> + <footnote> + <simpara> + <ulink url="&url.articles.contributors;/article.html#staff-committers">FreeBSD committers</ulink> + </simpara> + </footnote> + are responsible for the bulk of &os; development. An elected + <ulink url="&url.base;/administration.html#t-core">Core Team</ulink> + <footnote> + <simpara> + <ulink url="&url.base;/administration.html#t-core">&os; Core Team</ulink> + </simpara> + </footnote> of very senior developers provides some level of direction over the project.</para> @@ -82,16 +111,15 @@ for polishing the development system into a production quality release. To solve this dilemma, development continues on two parallel tracks. The main development branch is the - <emphasis>HEAD</emphasis> or <emphasis>trunk</emphasis> of our CVS + <emphasis>HEAD</emphasis> or <emphasis>trunk</emphasis> of our Subversion tree, known as <quote>&os;-CURRENT</quote> or <quote>-CURRENT</quote> for short.</para> <para>A more stable branch is maintained, known as <quote>&os;-STABLE</quote> or <quote>-STABLE</quote> for short. - Both branches live in a master CVS repository in California and - are replicated via <application - class="software">CVSup</application>[2] to mirrors all over the - world. &os;-CURRENT[7] is the <quote>bleeding-edge</quote> of + Both branches live in a master Subversion repository on a machine + maintained by the &os; Project. + &os;-CURRENT is the <quote>bleeding-edge</quote> of &os; development where all new changes first enter the system. &os;-STABLE is the development branch from which major releases are made. Changes go into this branch at a different pace, and @@ -105,52 +133,64 @@ class="resource">ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/</systemitem>. The widespread availability of binary release snapshots, and the tendency of our user community to keep up with -STABLE development - with CVSup and <quote><command>make</command> - <maketarget>world</maketarget></quote>[7] helps to keep + with Subversion and <quote><command>make</command> + <maketarget>buildworld</maketarget></quote> + <footnote> + <simpara> + <ulink url="&url.books.handbook;/makeworld.html">Rebuilding "world"</ulink> + </simpara> + </footnote> + helps to keep &os;-STABLE in a very reliable condition even before the quality assurance activities ramp up pending a major release.</para> <para>Bug reports and feature requests are continuously submitted by users throughout the release cycle. Problems reports are entered into our - <application class="software">GNATS</application>[8] database + <application class="software">GNATS</application> database + <footnote> + <simpara> + GNATS: The GNU Bug Tracking System + <ulink url="http://www.gnu.org/software/gnats"></ulink> + </simpara> + </footnote> through email, the &man.send-pr.1; application, or via the web interface provided at <ulink url="http://www.FreeBSD.org/send-pr.html"></ulink>.</para> - + <para>To service our most conservative users, individual release branches were introduced with &os; 4.3. These release branches are created shortly before a final release is made. After the release goes out, only the most critical security fixes and additions are merged onto the release branch. - In addition to source updates via CVS, binary patchkits are + In addition to source updates via Subversion, binary patchkits are available to keep systems on the <emphasis>RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></emphasis> branches updated.</para> - + <sect2> <title>What this article describes</title> - + <para>The following sections of this article describe:</para> - + <variablelist> <varlistentry> <term><xref linkend="release-proc"/></term> - + <listitem> <para>The different phases of the release engineering process leading up to the actual system build.</para> </listitem> </varlistentry> - + <varlistentry> <term><xref linkend="release-build"/></term> - + <listitem> <para>The actual build process.</para> </listitem> </varlistentry> - + <varlistentry> <term><xref linkend="extensibility"/></term> @@ -158,7 +198,7 @@ <para>How the base release may be extended by third parties.</para> </listitem> </varlistentry> - + <varlistentry> <term><xref linkend="lessons-learned"/></term> @@ -252,42 +292,38 @@ <sect3 id="rel-branch"> <title>Creating the Release Branch</title> - <para>As described in the introduction, the - <literal>RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></literal> - release branch is a relatively new addition to our release - engineering - methodology. The first step in creating this branch is to - ensure that you are working with the newest version of the - <literal>RELENG_<replaceable>X</replaceable></literal> sources - that you want to branch <emphasis>from</emphasis>.</para> - - <screen>/usr/src&prompt.root; <userinput>cvs update -rRELENG_4 -P -d</userinput></screen> + <note> + <para>In all examples below, <literal>$FSVN</literal> + refers to the location of the &os; Subversion repository, + <literal>svn+ssh://svn.freebsd.org/base/</literal>.</para> + </note> - <para>The next step is to create a branch point - <emphasis>tag</emphasis>, so that diffs against the start of - the branch are easier with CVS:</para> + <para>The layout of &os; branches in Subversion is + described in the <ulink url="&url.articles.committers-guide;/subversion-primer.html#subversion-primer-base-layout">Committer's Guide</ulink>. + The first step in creating a branch is to + identify the revision of the + <literal>stable/<replaceable>X</replaceable></literal> sources + that you want to branch <emphasis>from</emphasis>.</para> - <screen>/usr/src&prompt.root; <userinput>cvs rtag -rRELENG_4 RELENG_4_8_BP src</userinput></screen> + <screen>&prompt.root; <userinput>svn log -v $FSVN/stable/9</userinput></screen> - <para>And then a new branch tag is created with:</para> + <para>The next step is to create the <emphasis>release branch</emphasis> + </para> + + <screen>&prompt.root; <userinput>svn cp $FSVN/stable/9@REVISION $FSVN/releng/9.2</userinput></screen> - <screen>/usr/src&prompt.root; <userinput>cvs rtag -b -rRELENG_4_8_BP RELENG_4_8 src</userinput></screen> + <para>This branch can be checked out:</para> + + <screen>&prompt.root; <userinput>svn co $FSVN/releng/9.2 src</userinput></screen> <note> - <para><emphasis>The - <literal>RELENG_<replaceable>*</replaceable></literal> tags - are restricted for use by the CVS-meisters and release - engineers.</emphasis></para> + <para>Creating <literal>releng</literal> branch and <literal>release</literal> + tags are restricted to + <ulink url="&url.base;/administration.html#t-subversion">Subversion administrators</ulink> + and the <ulink url="&url.base;/administration.html#t-re">Release Engineering Team</ulink>. + </para> </note> - <sidebar> - <para>A <quote><emphasis>tag</emphasis></quote> is CVS - vernacular for a label that identifies the source at a specific point - in time. By tagging the tree, we ensure that future release builders - will always be able to use the same source we used to create the - official &os; Project releases.</para> - </sidebar> - <mediaobject> <imageobject> <imagedata fileref="branches-head.pic" align="center"/> @@ -467,7 +503,14 @@ <para><application>Sysinstall</application> should be updated to note the number of available ports and the amount of disk space required - for the Ports Collection[4]. This information is currently kept in + for the Ports Collection. + <footnote> + <simpara> + &os; Ports Collection + <ulink url="http://www.FreeBSD.org/ports"></ulink> + </simpara> + </footnote> + This information is currently kept in <filename>src/usr.sbin/sysinstall/dist.c</filename>.</para> <para>After the release has been built, a number of file should @@ -514,47 +557,29 @@ </sect3> - <sect3 id="versionbump-major"> - <title>Preparing a new major release branch - (RELENG_<replaceable>X</replaceable>)</title> - - <para>When a new major release branch, such as - <literal>RELENG_6</literal> is branched from HEAD, some - additional files must be updated before releases can be made - from this new branch.</para> - - <itemizedlist> - <listitem> - <para><filename>src/share/examples/cvsup/stable-supfile</filename> -- must be updated to point to the new -STABLE branch, when -applicable.</para> - </listitem> - </itemizedlist> - - </sect3> - <sect3> - <title>Creating Release Tags</title> + <title>Creating the Release Tag</title> <para>When the final release is ready, the following command - will create the <literal>RELENG_4_8_0_RELEASE</literal> + will create the <literal>release/9.2.0</literal> tag.</para> - <screen>/usr/src&prompt.root; <userinput>cvs rtag -rRELENG_4_8 RELENG_4_8_0_RELEASE src</userinput></screen> + <screen>&prompt.root; <userinput>svn cp $FSVN/releng/9.2 $FSVN/release/9.2.0</userinput></screen> <para>The Documentation and Ports managers are responsible for - tagging the respective trees with the <literal>RELEASE_4_8_0</literal> + tagging their respective trees with the <literal>tags/RELEASE_9_2_0</literal> tag.</para> - <para>Occasionally, a last minute fix may be required - <emphasis>after</emphasis> the final tags have been created. - In practice this is not a problem, since <acronym>CVS</acronym> - allows tags to be manipulated with <command>cvs - tag -d <replaceable>tagname filename</replaceable></command>. - It is very important that any last minute changes be tagged - appropriately as part of the release. &os; releases must - always be reproducible. Local hacks in the release - engineer's environment are not acceptable.</para> + <sidebar> + <para>When the Subversion <command>svn cp</command> command + is used to create a <emphasis>release tag</emphasis>, + this identifies the source at a specific point in time. + By creating tags, we ensure that future release builders + will always be able to use the exact same source we used to create the + official &os; Project releases.</para> + </sidebar> + + </sect3> </sect2> </sect1> @@ -565,79 +590,38 @@ applicable.</para> <para>&os; <quote>releases</quote> can be built by anyone with a fast machine and access to a source repository. (That should be - everyone, since we offer anonymous CVS! See The Handbook for + everyone, since we offer Subversion access ! + See the + <ulink url="&url.books.handbook;/svn.html">Subversion section + in the Handbook</ulink> for details.) The <emphasis>only</emphasis> special requirement is that the &man.md.4; device must be available. If the device is not loaded into your kernel, then the kernel module should be automatically loaded when &man.mdconfig.8; is executed during the boot media creation phase. All of the tools necessary - to build a release are available from the CVS repository in + to build a release are available from the Subversion repository in <filename>src/release</filename>. These tools aim to provide a consistent way to build &os; releases. A complete release can actually be built with only a single command, including the creation of <acronym>ISO</acronym> images suitable for burning to - CDROM, installation floppies, and an FTP install directory. This - command is aptly named <command>make - release</command>.</para> + CDROM or DVD, and an FTP install directory. &man.release.7; fully + documents the <command>src/release/generate-release.sh</command> + script which is used to build a release. <command>generate-release.sh</command> + is a wrapper around the Makefile target: <command>make release</command>.</para> <sect2> - <title><command>make release</command></title> + <title>Building a Release</title> - <para>To successfully build a release, you must first populate - <filename>/usr/obj</filename> by running <command>make - world</command> or simply - <command>make - buildworld</command>. The release - target requires several variables be set properly to build a - release:</para> + <para>&man.release.7; documents the exact commands required to + build a &os; release. The following sequences of commands can build + an 9.2.0 release:</para> - <itemizedlist> - <listitem> - <para><makevar>CHROOTDIR</makevar> - The directory to be used as the - chroot environment for the entire release build.</para> - </listitem> + <screen>&prompt.root; <userinput>cd /usr/src/release</userinput></screen> + <screen>&prompt.root; <userinput>sh generate-release.sh release/9.2.0 /local3/release</userinput></screen> - <listitem> - <para><makevar>BUILDNAME</makevar> - The name of the release to be - built.</para> - </listitem> - - <listitem> - <para><makevar>CVSROOT</makevar> - The location of a CVS Repository. - </para> - </listitem> - - <listitem> - <para><makevar>RELEASETAG</makevar> - The CVS tag corresponding to the - release you would like to build.</para> - </listitem> - </itemizedlist> - - <para>If you do not already have access to a local CVS - repository, then you may mirror one with <ulink - url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/synching.html#CVSUP">CVSup</ulink>. - The supplied supfile, - <filename>/usr/share/examples/cvsup/cvs-supfile</filename>, is - a useful starting point for mirroring the CVS - repository.</para> - - <para>If <makevar>RELEASETAG</makevar> is omitted, then the - release will be built from the <literal>HEAD</literal> (aka -CURRENT) branch. - Releases built from this branch are normally referred to as - <quote>-CURRENT snapshots</quote>.</para> - - <para>There are many other variables available to customize the - release build. Most of these variables are documented at the - top of <filename>src/release/Makefile</filename>. The exact - command used to build the official &os; 4.7 (x86) release - was:</para> - - <screen><command>make <literal>release CHROOTDIR=/local3/release \ - BUILDNAME=4.7-RELEASE \ - CVSROOT=/host/cvs/usr/home/ncvs \ - RELEASETAG=RELENG_4_7_0_RELEASE</literal> - </command> - </screen> + <para>After running these commands, all prepared release + files are available in <filename>/local3/release/R</filename> + directory.</para> <para>The release <filename>Makefile</filename> can be broken down into several distinct steps.</para> @@ -651,7 +635,7 @@ applicable.</para> </listitem> <listitem> - <para>Checkout from CVS of a clean version of the system source, + <para>Checkout from Subversion of a clean version of the system source, documentation, and ports into the release build hierarchy.</para> </listitem> @@ -697,20 +681,11 @@ applicable.</para> </listitem> <listitem> - <para>Build of the <quote>crunched</quote> binaries used for - installation floppies.</para> - </listitem> - - <listitem> <para>Package up distribution tarballs of the binaries and sources. </para> </listitem> <listitem> - <para>Create the boot media and a <quote>fixit</quote> floppy.</para> - </listitem> - - <listitem> <para>Create FTP installation hierarchy.</para> </listitem> @@ -940,63 +915,19 @@ applicable.</para> be expected to answer questions about it.</para> <sect2> - <title>Creating Customized Boot floppies</title> - - <para>Many sites have complex requirements that may require - additional kernel modules or userland tools be added to the - installation floppies. The <quote>quick and dirty</quote> way - to accomplish this would be to modify the staging directory of - an existing <command>make release</command> build hierarchy:</para> - - <itemizedlist> - <listitem> - <para>Apply patches or add additional files inside the chroot - release build directory.</para> - </listitem> - - <listitem> - <para><command>rm - ${CHROOTDIR}/usr/obj/usr/src/release/release.[59]</command></para> - </listitem> - - <listitem> - <para>rebuild &man.sysinstall.8;, the kernel, or whatever - parts of the system your change affected.</para> - </listitem> - - <listitem> - <para><command>chroot ${CHROOTDIR} ./mk floppies - </command></para> - </listitem> - - </itemizedlist> - - <para>New release floppies will be located in - <filename>${CHROOTDIR}/R/stage/floppies</filename>.</para> - - <para>Alternatively, the - <filename>boot.flp</filename> make - target can be called, or the filesystem - creating script, - <filename>src/release/scripts/doFS.sh</filename>, may be invoked - directly.</para> - - <para>Local patches may also be supplied to the release build by - defining the <makevar>LOCAL_PATCH</makevar> variable in <command>make - release</command>. - </para> - </sect2> - - <sect2> <title>Scripting <command>sysinstall</command></title> <para>The &os; system installation and configuration tool, &man.sysinstall.8;, can be scripted to provide automated installs for large sites. This functionality can be used in conjunction - with &intel; PXE[12] to bootstrap systems from the network, or - via custom boot floppies with a sysinstall script. An example - sysinstall script is available in the CVS tree as - <filename>src/usr.sbin/sysinstall/install.cfg</filename>.</para> + with &intel; PXE + <footnote> + <simpara> + <ulink url="&url.books.handbook;/network-pxe-nfs.html"></ulink> + </simpara> + </footnote> + to bootstrap systems from the network. + </para> </sect2> </sect1> @@ -1088,59 +1019,31 @@ applicable.</para> community. I would also like to thank &a.rgrimes;, &a.phk;, and others who worked on the release engineering tools in the very early days of &os;. This article was influenced by release engineering - documents from the CSRG[13], the NetBSD Project[10], and John - Baldwin's proposed release engineering process notes[11].</para> -</sect1> - -<!-- Reference / Biblio Section --> -<sect1 id="biblio"> - <title>References</title> - <para>[1] CVS - Concurrent Versions System - <ulink url="http://www.cvshome.org"></ulink></para> - - <para>[2] CVSup - The CVS-Optimized General Purpose Network File Distribution - System <ulink url="http://www.polstra.com/projects/freeware/CVSup"></ulink> - </para> - - <para>[3] <ulink url="http://pointyhat.FreeBSD.org"></ulink></para> - - <para>[4] &os; Ports Collection - <ulink url="http://www.FreeBSD.org/ports"></ulink></para> - - <para>[5] &os; Committers <ulink - url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html"></ulink> - </para> - - <para>[6] &os; Core Team - <ulink url="&url.base;/administration.html#t-core"></ulink></para> - - <para>[7] &os; Handbook - <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook"></ulink> - </para> - - <para>[8] GNATS: The GNU Bug Tracking System - <ulink url="http://www.gnu.org/software/gnats"></ulink> - </para> - - <para>[9] &os; PR Statistics - <ulink url="http://www.FreeBSD.org/prstats/index.html"></ulink></para> - - <para>[10] NetBSD Developer Documentation: Release Engineering - <ulink url="http://www.NetBSD.org/developers/releng/index.html"></ulink> - </para> - - <para>[11] John Baldwin's &os; Release Engineering Proposal - <ulink url="http://people.FreeBSD.org/~jhb/docs/releng.txt"></ulink> - </para> - - <para>[12] PXE Jumpstart Guide - <ulink - url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/pxe/index.html"></ulink> - </para> - - <para>[13] Marshall Kirk McKusick, Michael J. Karels, and Keith Bostic: - <ulink url="http://docs.FreeBSD.org/44doc/papers/releng.html"> -<emphasis>The Release Engineering of 4.3BSD</emphasis></ulink> + documents from the CSRG + <footnote> + <simpara> + Marshall Kirk McKusick, Michael J. Karels, and Keith Bostic: + <ulink url="http://docs.FreeBSD.org/44doc/papers/releng.html"> + <emphasis>The Release Engineering of 4.3BSD</emphasis></ulink> + </simpara> + </footnote> + , + the NetBSD Project , + <footnote> + <simpara> + NetBSD Developer Documentation: Release Engineering + <ulink url="http://www.NetBSD.org/developers/releng/index.html"></ulink> + </simpara> + </footnote> + , and John + Baldwin's proposed release engineering process notes. + <footnote> + <simpara> + John Baldwin's &os; Release Engineering Proposal + <ulink url="http://people.FreeBSD.org/~jhb/docs/releng.txt"></ulink> + </simpara> + </footnote> </para> </sect1> + </article> diff --git a/en_US.ISO8859-1/articles/wp-toolbox/article.xml b/en_US.ISO8859-1/articles/wp-toolbox/article.xml index 5b8dc58946..ac6460d6a3 100644 --- a/en_US.ISO8859-1/articles/wp-toolbox/article.xml +++ b/en_US.ISO8859-1/articles/wp-toolbox/article.xml @@ -24,7 +24,6 @@ <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.intel; &tm-attrib.microsoft; &tm-attrib.symantec; diff --git a/en_US.ISO8859-1/books/arch-handbook/book.xml b/en_US.ISO8859-1/books/arch-handbook/book.xml index 086e76ef60..e471d87bef 100644 --- a/en_US.ISO8859-1/books/arch-handbook/book.xml +++ b/en_US.ISO8859-1/books/arch-handbook/book.xml @@ -40,20 +40,20 @@ <releaseinfo>$FreeBSD$</releaseinfo> <abstract> - <para>Welcome to the &os; Architecture Handbook. This manual is a + <para>Welcome to the &os; Architecture Handbook. This manual is + a <emphasis>work in progress</emphasis> and is the work of many individuals. Many sections do not yet exist and some of those that do exist need to be updated. If you are interested in helping with this project, send email to the &a.doc;.</para> <para>The latest version of this document is always available - from the <ulink url="&url.base;/index.html">FreeBSD World - Wide Web server</ulink>. It may also be downloaded in a - variety of formats and compression options from the <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP - server</ulink> or one of the numerous <ulink - url="&url.books.handbook;/mirrors-ftp.html">mirror - sites</ulink>.</para> + from the <ulink url="&url.base;/index.html">FreeBSD World + Wide Web server</ulink>. It may also be downloaded in a + variety of formats and compression options from the <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP server</ulink> + or one of the numerous <ulink + url="&url.books.handbook;/mirrors-ftp.html">mirror sites</ulink>.</para> </abstract> </bookinfo> @@ -94,14 +94,7 @@ <title>* I386</title> <para>Talk about <literal>i386</literal> specific &os; - architecture.</para> - </chapter> - - <chapter id="alpha"> - <title>* Alpha</title> - - <para>Talk about the architectural specifics of - FreeBSD/alpha.</para> + architecture.</para> </chapter> <chapter id="ia64"> @@ -116,21 +109,21 @@ <title>* SPARC64</title> <para>Talk about <literal>SPARC64</literal> specific &os; - architecture.</para> + architecture.</para> </chapter> <chapter id="amd64"> <title>* AMD64</title> <para>Talk about <literal>AMD64</literal> specific &os; - architecture.</para> + architecture.</para> </chapter> <chapter id="powerpc"> <title>* PowerPC</title> <para>Talk about <literal>PowerPC</literal> specific &os; - architecture.</para> + architecture.</para> </chapter> </part> --> @@ -138,41 +131,48 @@ <part id="appendices"> <title>Appendices</title> - <bibliography> + <bibliography> <biblioentry xreflabel="1"> - <authorgroup> - <author> - <firstname>Marshall</firstname> - <othername role="Middle">Kirk</othername> - <surname>McKusick</surname> - </author> - <author> - <firstname>Keith</firstname> - <surname>Bostic</surname> - </author> - <author> - <firstname>Michael</firstname> - <othername role="MI">J</othername> - <surname>Karels</surname> - </author> - <author> - <firstname>John</firstname> - <othername role="MI">S</othername> - <surname>Quarterman</surname> - </author> - </authorgroup> - <copyright><year>1996</year><holder>Addison-Wesley Publishing Company, - Inc.</holder></copyright> - <isbn>0-201-54979-4</isbn> - <publisher> - <publishername>Addison-Wesley Publishing Company, Inc.</publishername> - </publisher> - <title>The Design and Implementation of the 4.4 BSD Operating System</title> - <pagenums>1-2</pagenums> + <authorgroup> + <author> + <firstname>Marshall</firstname> + <othername role="Middle">Kirk</othername> + <surname>McKusick</surname> + </author> + <author> + <firstname>Keith</firstname> + <surname>Bostic</surname> + </author> + <author> + <firstname>Michael</firstname> + <othername role="MI">J</othername> + <surname>Karels</surname> + </author> + <author> + <firstname>John</firstname> + <othername role="MI">S</othername> + <surname>Quarterman</surname> + </author> + </authorgroup> + + <copyright> + <year>1996</year> + <holder>Addison-Wesley Publishing Company, Inc.</holder> + </copyright> + + <isbn>0-201-54979-4</isbn> + + <publisher> + <publishername>Addison-Wesley Publishing Company, Inc.</publishername> + </publisher> + + <title>The Design and Implementation of the 4.4 BSD Operating System</title> + + <pagenums>1-2</pagenums> </biblioentry> - </bibliography> + </bibliography> </part> &chap.index; diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml index cd05304c0d..2815b30aa8 100644 --- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml +++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml @@ -188,7 +188,7 @@ KMOD=skeleton #include <sys/uio.h> /* uio struct */ #include <sys/malloc.h> -#define BUFFERSIZE 256 +#define BUFFERSIZE 255 /* Function prototypes */ static d_open_t echo_open; @@ -207,7 +207,7 @@ static struct cdevsw echo_cdevsw = { }; struct s_echo { - char msg[BUFFERSIZE]; + char msg[BUFFERSIZE + 1]; int len; }; @@ -222,7 +222,6 @@ MALLOC_DEFINE(M_ECHOBUF, "echobuffer", "buffer for echo module"); * This function is called by the kld[un]load(2) system calls to * determine what actions to take when a module is loaded or unloaded. */ - static int echo_loader(struct module *m __unused, int what, void *arg __unused) { @@ -241,8 +240,8 @@ echo_loader(struct module *m __unused, int what, void *arg __unused) if (error != 0) break; - /* kmalloc memory for use by this driver */ - echomsg = malloc(sizeof(*echomsg), M_ECHOBUF, M_WAITOK); + echomsg = malloc(sizeof(*echomsg), M_ECHOBUF, M_WAITOK | + M_ZERO); printf("Echo device loaded.\n"); break; case MOD_UNLOAD: @@ -258,7 +257,8 @@ echo_loader(struct module *m __unused, int what, void *arg __unused) } static int -echo_open(struct cdev *dev __unused, int oflags __unused, int devtype __unused, struct thread *p __unused) +echo_open(struct cdev *dev __unused, int oflags __unused, int devtype __unused, + struct thread *td __unused) { int error = 0; @@ -267,7 +267,8 @@ echo_open(struct cdev *dev __unused, int oflags __unused, int devtype __unused, } static int -echo_close(struct cdev *dev __unused, int fflag __unused, int devtype __unused, struct thread *p __unused) +echo_close(struct cdev *dev __unused, int fflag __unused, int devtype __unused, + struct thread *td __unused) { uprintf("Closing device \"echo\".\n"); @@ -279,19 +280,20 @@ echo_close(struct cdev *dev __unused, int fflag __unused, int devtype __unused, * echo_write() and returns it to userland for accessing. * uio(9) */ - static int echo_read(struct cdev *dev __unused, struct uio *uio, int ioflag __unused) { - int error, amt; + size_t amt; + int error; /* * How big is this read operation? Either as big as the user wants, - * or as big as the remaining data + * or as big as the remaining data. Note that the 'len' does not + * include the trailing null character. */ + amt = MIN(uio->uio_resid, uio->uio_offset >= echomsg->len + 1 ? 0 : + echomsg->len + 1 - uio->uio_offset); - amt = MIN(uio->uio_resid, echomsg->len - uio->uio_offset); - uio->uio_offset += amt; if ((error = uiomove(echomsg->msg, amt, uio)) != 0) uprintf("uiomove failed!\n"); @@ -302,13 +304,11 @@ echo_read(struct cdev *dev __unused, struct uio *uio, int ioflag __unused) * echo_write takes in a character string and saves it * to buf for later accessing. */ - static int echo_write(struct cdev *dev __unused, struct uio *uio, int ioflag __unused) { - int error, amt; - - /* Copy the string in from user memory to kernel memory */ + size_t amt; + int error; /* * We either write from the beginning or are appending -- do @@ -317,32 +317,25 @@ echo_write(struct cdev *dev __unused, struct uio *uio, int ioflag __unused) if (uio->uio_offset != 0 && (uio->uio_offset != echomsg->len)) return (EINVAL); - /* - * This is new message, reset length - */ + /* This is a new message, reset length */ if (uio->uio_offset == 0) echomsg->len = 0; - /* NULL character should be overridden */ - if (echomsg->len != 0) - echomsg->len--; - /* Copy the string in from user memory to kernel memory */ amt = MIN(uio->uio_resid, (BUFFERSIZE - echomsg->len)); error = uiomove(echomsg->msg + uio->uio_offset, amt, uio); - /* Now we need to null terminate, then record the length */ - echomsg->len += amt + 1; - uio->uio_offset += amt + 1; - echomsg->msg[echomsg->len - 1] = 0; + /* Now we need to null terminate and record the length */ + echomsg->len = uio->uio_offset; + echomsg->msg[echomsg->len] = 0; if (error != 0) uprintf("Write failed: bad address!\n"); return (error); } -DEV_MODULE(echo,echo_loader,NULL);</programlisting> +DEV_MODULE(echo, echo_loader, NULL);</programlisting> </example> <para>With this driver loaded try:</para> diff --git a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml index cced92ce05..1dbc259899 100644 --- a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml +++ b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml @@ -240,7 +240,7 @@ printf(getstr(1)); #include <err.h> ... if (!S_ISDIR(st.st_mode)) - err(1, "argument is not a directory"); + errx(1, "argument is not a directory"); </programlisting> <para>This can be transformed to print an error message by diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml index 900dd32483..fe14d6d59b 100644 --- a/en_US.ISO8859-1/books/faq/book.xml +++ b/en_US.ISO8859-1/books/faq/book.xml @@ -16,18 +16,12 @@ <!ENTITY rel2.releng "<symbol>RELENG_8</symbol>"> <!ENTITY rel2.relengdate "August 2009"> <!ENTITY rel2.packages "packages-8-stable"> -<!ENTITY rel3.current "7.4"> -<!ENTITY rel3.relx "7.<replaceable>X</replaceable>"> -<!ENTITY rel3.stable "<emphasis>7-STABLE</emphasis>"> -<!ENTITY rel3.releng "<symbol>RELENG_7</symbol>"> -<!ENTITY rel3.relengdate "October 2007"> -<!ENTITY rel3.packages "packages-7-stable"> ]> <book lang='en'> <bookinfo> <title>Frequently Asked Questions for &os; - &rel3.relx;, &rel2.relx;, and &rel.relx;</title> + &rel2.relx;, and &rel.relx;</title> <corpauthor>The &os; Documentation Project</corpauthor> @@ -64,11 +58,9 @@ &tm-attrib.intel; &tm-attrib.linux; &tm-attrib.microsoft; - &tm-attrib.mips; + &tm-attrib.netbsd; &tm-attrib.opengroup; - &tm-attrib.oracle; &tm-attrib.sgi; - &tm-attrib.sparc; &tm-attrib.sun; &tm-attrib.general; </legalnotice> @@ -76,41 +68,26 @@ <releaseinfo>$FreeBSD$</releaseinfo> <abstract> - <para>This is the FAQ for &os; versions - &rel3.relx;, &rel2.relx; and &rel.relx;. - All entries are assumed to be - relevant to &os; &rel3.relx; and later, - unless otherwise noted. If you are interested in helping with - this project, send email to the &a.doc;. The latest version of + <para>This is the FAQ for &os; versions &rel2.relx; and + &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;.</para> + + <para>The latest version of this document is always available from the <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os; website</ulink>. It may also be downloaded as one large <ulink url="book.html">HTML</ulink> file with HTTP or as a variety of other formats from the <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">&os; FTP - server</ulink>. You may also want to <ulink - url="&url.base;/search/index.html">Search the FAQ</ulink>.</para> + server</ulink>.</para> </abstract> </bookinfo> <chapter id="introduction"> <title>Introduction</title> - <para>Welcome to the &os; - &rel3.relx; -, &rel2.relx; - and &rel.relx; - - FAQ!</para> - - <para>As is usual with Usenet FAQs, this document aims to cover the - most frequently asked questions concerning the &os; operating - system (and of course answer them!). Although originally intended - to reduce bandwidth and avoid the same old questions being asked - over and over again, FAQs have become recognized as valuable - information resources.</para> - - <para>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;.</para> - <qandaset> <qandaentry> <question id="what-is-FreeBSD"> @@ -331,7 +308,7 @@ </listitem> <listitem> - <para>DragonFlyBSD is a fork of &os; 4.8 that has + <para>DragonFly BSD is a fork of &os; 4.8 that has since developed many interesting features of its own, including the HAMMER file system and support for user-mode <quote>vkernels</quote>.</para> @@ -351,14 +328,15 @@ made from the &rel.stable; branch, and &rel2.relx; releases are made from the &rel2.stable; branch.</para> - <para>Up until the release of 8.0, the - &rel3.relx; series was the one known as - <emphasis>-STABLE</emphasis>. However, as of 8.0, the - &rel3.relx; branch will be designated for + <para>Up until the release of 9.0, the + &rel2.relx; series was the one known as + <emphasis>-STABLE</emphasis>. However, as of + &rel.head.relx;, the + &rel2.relx;. branch will be designated for an <quote>extended support</quote> status and receive only fixes for major problems, such as security-related fixes. There will be no more releases made from the - &rel3.stable; branch, and it is considered a + &rel2.stable; branch, and it is considered a <quote>legacy</quote> branch and most current work will only become a part of &rel.stable; and &rel2.stable;.</para> @@ -978,18 +956,6 @@ <itemizedlist> <listitem> - <para>Channel <literal>#FreeBSD</literal> on <ulink - url="http://www.efnet.org/index.php">EFNet</ulink> is - a &os; forum, but do not go there for tech support or - try to get folks there to help you avoid the pain of - reading manual pages or doing your own research. It is - a chat channel, first and foremost, and topics there are - just as likely to involve sex, sports or nuclear weapons - as they are &os;. You Have Been Warned! Available at - server <hostid>irc.efnet.org</hostid>.</para> - </listitem> - - <listitem> <para>Channel <literal>#FreeBSDhelp</literal> on <ulink url="http://www.efnet.org/index.php">EFNet</ulink> is a channel dedicated to helping &os; users. They are @@ -1124,7 +1090,8 @@ <answer> <para>&arch.amd64; is the term &os; uses for 64-bit - compatible x86 architectures. Most modern computers + compatible x86 architectures (also known as "x86-64" + or "x64"). Most modern computers should use &arch.amd64;. Older hardware should use &arch.i386;. If you are installing on a non-x86-compatible architecture select the platform @@ -1170,7 +1137,7 @@ <row> <entry><filename>memstick.img</filename></entry> - <entry>A bootable image sufficient for copying to a + <entry>A bootable image sufficient for writing to a USB stick.</entry> </row> @@ -1190,7 +1157,7 @@ <filename>floppies/kern2.flp</filename>, and <filename>floppies/mfsroot1.flp</filename>. These images need - to be copied onto floppies by tools like + to be written onto floppies by tools like &man.dd.1;.</para> <para>Full instructions on this procedure and a little bit @@ -1693,7 +1660,7 @@ <answer> <para>Yes. &os; divides support into multiple tiers. Tier 1 architectures, such as i386 or amd64; are - fully supported. Tiers 2 and 3 are supported on a + fully supported. Tiers 2 and 3 are supported on an if-possible basis. A full explanation of the tier system is available in the <ulink @@ -1719,7 +1686,8 @@ <para>&os; will take advantage of HyperThreading (HTT) support on &intel; CPUs that support this feature. A kernel - with the <literal>options SMP</literal> feature enabled + with the <literal>options SMP</literal> option, enabled + by default, will automatically detect the additional logical processors.</para> @@ -1967,26 +1935,8 @@ bindkey ^[[3~ delete-char # for xterm</programlisting> </qandaset> </sect1> - <sect1 id="compatibility-networking"> - <title>Networking</title> - - <qandaset> - <qandaentry> - <question id="support-broadcom"> - <para>Is there a native driver for the Broadcom 43xx - cards?</para> - </question> - - <answer> - <para>Yes, many Broadcom 43xx cards are supported by the - &man.bwn.4; and &man.bwi.4; drivers.</para> - </answer> - </qandaentry> - </qandaset> - </sect1> - - <sect1 id="compatibility-sound"> - <title>Sound Devices</title> + <sect1 id="compatibility-other"> + <title>Other Hardware</title> <qandaset> <qandaentry> @@ -2003,13 +1953,7 @@ bindkey ^[[3~ delete-char # for xterm</programlisting> <screen>&prompt.root; <userinput>mixer pcm 100 vol 100 cd 100</userinput></screen> </answer> </qandaentry> - </qandaset> - </sect1> - - <sect1 id="compatibility-other"> - <title>Other Hardware</title> - <qandaset> <qandaentry> <question id="power-management-support"> <para>Does &os; support power management on my @@ -2491,9 +2435,38 @@ kern.timecounter.hardware: TSC -> i8254</screen> </question> <answer> - <para>An answer for this question can be found in the &os; - Glossary, see <ulink - url="&url.books.handbook;/freebsd-glossary.html#lor-glossary">LOR</ulink>.</para> + <para>The &os; kernel uses a number of resource locks to + arbitrate contention for certain resources. When multiple + kernel threads try to obtain multiple resource locks, + there's always the potential for a deadlock, + where two threads have each obtained one of the locks and + blocks forever waiting for the other thread to release one + of the other locks. This sort of locking problem can be + avoided if all threads obtain the locks in the same + order.</para> + + <para>A run-time lock diagnostic system called &man.witness.4;, + enabled in &os.current; and disabled by default for stable + branches and releases, detects the potential for deadlocks due to + locking errors, including errors caused by obtaining multiple + resource locks with a different order from different parts of the + kernel. The &man.witness.4; framework tries to detect this + problem as it happens, and reports it by printing a message to the + system console about a <errorname>lock order reversal</errorname> + (often referred to also as <acronym>LOR</acronym>).</para> + + <para>It is possible to get false positives, as &man.witness.4; + is conservative. A true positive report <emphasis>does + not</emphasis> mean that a system is dead-locked; instead + it should be understood as a warning of the form <quote>if + you were unlucky, a deadlock would have happened + here</quote>.</para> + + <note> + <para>Problematic <acronym>LOR</acronym>s tend to get fixed + quickly, so check &a.current.url; before posting to the + mailing lists.</para> + </note> </answer> </qandaentry> @@ -2571,7 +2544,7 @@ kern.timecounter.hardware: TSC -> i8254</screen> periodic updates on new entries.</para> <para>Most ports should work on the - &rel3.relx;, &rel2.relx;, and &rel.relx; branches. + &rel2.relx;, and &rel.relx; branches. Each time a &os; release is made, a snapshot of the ports tree at the time of release in also included in the <filename class="directory">ports/</filename> @@ -2596,15 +2569,6 @@ kern.timecounter.hardware: TSC -> i8254</screen> <variablelist> <varlistentry> - <term>for &rel3.relx; -RELEASE/&rel3.stable;</term> - - <listitem> - <para><ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;</ulink></para> - </listitem> - </varlistentry> - - <varlistentry> <term>for &rel2.relx; -RELEASE/&rel2.stable;</term> <listitem> @@ -2677,7 +2641,7 @@ kern.timecounter.hardware: TSC -> i8254</screen> <qandaentry> <question id="ports-4x"> <para>Why can I not build this port on my - &rel3.relx; -, &rel2.relx; -, or + &rel2.relx; -, or &rel.relx; -STABLE machine?</para> </question> @@ -3271,55 +3235,6 @@ kern.sched.name: ULE</screen> </qandaentry> <qandaentry> - <question id="inappropriate-ccd"> - <para>What is inappropriate about my &man.ccd.4;?</para> - </question> - - <answer> - <para>The symptom of this is:</para> - - <screen>&prompt.root; <userinput>ccdconfig -C</userinput> -ccdconfig: ioctl (CCDIOCSET): /dev/<replaceable>ccd0c</replaceable>: Inappropriate file type or format</screen> - - <para>This usually happens when you are trying to concatenate - the <literal>c</literal> partitions, which default to type - <literal>unused</literal>. The &man.ccd.4; driver requires - the underlying partition type to be - <literal>FS_BSDFFS</literal>. Edit the disk label of the - disks you are trying to concatenate and change the types of - partitions to <literal>4.2BSD</literal>.</para> - </answer> - </qandaentry> - - <qandaentry> - <question id="ccd-disk-label"> - <para>Why can I not edit the disk label on my - &man.ccd.4;?</para> - </question> - - <answer> - <para>The symptom of this is:</para> - - <screen>&prompt.root; <userinput>disklabel <replaceable>ccd0</replaceable></userinput> -(it prints something sensible here, so let us try to edit it) -&prompt.root; <userinput>disklabel -e <replaceable>ccd0</replaceable></userinput> -(edit, save, quit) -disklabel: ioctl DIOCWDINFO: No disk label on disk; -use "disklabel -r" to install initial label</screen> - - <para>This is because the disk label returned by &man.ccd.4; - is actually a <quote>fake</quote> one that is not really on - the disk. You can solve this problem by writing it back - explicitly, as in:</para> - - <screen>&prompt.root; <userinput>disklabel <replaceable>ccd0</replaceable> > <replaceable>/tmp/disklabel.tmp</replaceable></userinput> -&prompt.root; <userinput>disklabel -Rr <replaceable>ccd0</replaceable> <replaceable>/tmp/disklabel.tmp</replaceable></userinput> -&prompt.root; <userinput>disklabel -e <replaceable>ccd0</replaceable></userinput> -(this will work now)</screen> - </answer> - </qandaentry> - - <qandaentry> <question id="mount-foreign-fs"> <para>Can I mount other foreign file systems under &os;?</para> @@ -3830,10 +3745,6 @@ C:\="DOS"</programlisting> <command>more</command> session, <command>du</command> and <command>df</command> will agree.</para> - <para>Note that Soft Updates can delay the freeing of disk - space; you might need to wait up to 30 seconds for the - change to be visible!</para> - <para>This situation is common on web servers. Many people set up a &os; web server and forget to rotate the log files. The access log fills up <filename class="directory">/var</filename>. The new @@ -3842,6 +3753,10 @@ C:\="DOS"</programlisting> restarting the web server program would free the file, allowing the system to release the disk space. To prevent this from happening, set up &man.newsyslog.8;.</para> + + <para>Note that Soft Updates can delay the freeing of disk + space; you might need to wait up to 30 seconds for the + change to be visible!</para> </answer> </qandaentry> @@ -4208,7 +4123,9 @@ C:\="DOS"</programlisting> <para>If you intend to use a full screen editor such as &man.vi.1; or &man.emacs.1;, you may also need to run - <command>export TERM=cons25</command> so that these editors + <command>export TERM=xterm</command> on &os; 9.0+, or + <command>export TERM=cons25</command> on &os; 8.X + so that these editors can load the correct data from the &man.termcap.5; database.</para> @@ -4327,9 +4244,12 @@ C:\="DOS"</programlisting> <answer> <para>Yes, &os; supports System V-style IPC, including shared memory, messages and semaphores, in the - <filename>GENERIC</filename> kernel. In a custom kernel, - enable this support by adding the following lines to your - kernel config.</para> + <filename>GENERIC</filename> kernel. With a custom kernel, + support may be loaded with the <filename>sysvshm.ko</filename>, + <filename>sysvsem.ko</filename> and <filename> + sysvmsg.ko</filename> kernel modules, or + enabled in the custom kernel by adding the following lines to your + kernel config:</para> <programlisting>options SYSVSHM # enable shared memory options SYSVSEM # enable for semaphores @@ -4489,42 +4409,6 @@ options SYSVMSG # enable for messaging</programlisting> </qandaentry> <qandaentry> - <question id="uninstall-kerberos"> - <para>How do I uninstall - <application>Kerberos</application>?</para> - </question> - - <answer> - <para>To remove <application>Kerberos</application> from the - system, reinstall the <literal>base</literal> distribution - for the release you are running. If you have the CD-ROM, - you can mount it (we will assume on <filename - class="directory">/cdrom</filename>) and run the commands - below:</para> - - <screen>&prompt.root; <userinput>cd /cdrom/base</userinput> -&prompt.root; <userinput>./install.sh</userinput></screen> - - <para>Alternately, you can include the - <makevar>NO_KERBEROS</makevar> option in your - <filename>/etc/make.conf</filename> and rebuild - world.</para> - </answer> - </qandaentry> - <qandaentry> - <question id="add-pty"> - <para>How do I add pseudoterminals to the system?</para> - </question> - - <answer> - <para>If you have a lot of <command>telnet</command>, - <command>ssh</command>, X, or <command>screen</command> - users, you might run out of pseudoterminals. By default, - &os; supports 512 pseudoterminals.</para> - </answer> - </qandaentry> - - <qandaentry> <question id="reread-rc"> <para>How do I re-read <filename>/etc/rc.conf</filename> and re-start <filename>/etc/rc</filename> without a @@ -4564,8 +4448,8 @@ options SYSVMSG # enable for messaging</programlisting> the same way as <emphasis>-PRERELEASE</emphasis>.)</para> <para>Long answer: &os; derives its releases from one of two - places. Major, dot-zero, releases, such as 7.0-RELEASE and - 8.0-RELEASE, are branched from the head of the development + places. Major, dot-zero, releases, such as 9.0-RELEASE + are branched from the head of the development stream, commonly referred to as <link linkend="current">-CURRENT</link>. Minor releases, such as 6.3-RELEASE or 5.2-RELEASE, have been snapshots of the @@ -5165,10 +5049,10 @@ EndSection</programlisting> <programlisting># Edit the existing entry for ttyv8 in /etc/ttys and change # "off" to "on". -ttyv8 "/usr/libexec/getty Pc" cons25 on secure -ttyv9 "/usr/libexec/getty Pc" cons25 on secure -ttyva "/usr/libexec/getty Pc" cons25 on secure -ttyvb "/usr/libexec/getty Pc" cons25 on secure</programlisting> +ttyv8 "/usr/libexec/getty Pc" xterm on secure +ttyv9 "/usr/libexec/getty Pc" xterm on secure +ttyva "/usr/libexec/getty Pc" xterm on secure +ttyvb "/usr/libexec/getty Pc" xterm on secure</programlisting> <para>Use as many or as few as you want. The more virtual terminals you have, the more resources that are used; this @@ -5176,6 +5060,14 @@ ttyvb "/usr/libexec/getty Pc" cons25 on secure</programlisting> also want to change the <literal>secure</literal> to <literal>insecure</literal>.</para> + <note> + <para>Versions of &os; prior to 9.0 used the <quote> + cons25</quote> terminal type, and not <quote> + xterm</quote>. Existing entries in + <filename>/etc/ttys</filename> can be used on which to + base new additions.</para> + </note> + <important> <para>If you want to run an X server you <emphasis>must</emphasis> leave at least one virtual @@ -5191,18 +5083,18 @@ ttyvb "/usr/libexec/getty Pc" cons25 on secure</programlisting> allocation mentioned above and you wanted to run X, you would change settings for virtual terminal 12 from:</para> - <programlisting>ttyvb "/usr/libexec/getty Pc" cons25 on secure</programlisting> + <programlisting>ttyvb "/usr/libexec/getty Pc" xterm on secure</programlisting> <para>to:</para> - <programlisting>ttyvb "/usr/libexec/getty Pc" cons25 off secure</programlisting> + <programlisting>ttyvb "/usr/libexec/getty Pc" xterm off secure</programlisting> <para>If your keyboard has only ten function keys, you would end up with:</para> - <programlisting>ttyv9 "/usr/libexec/getty Pc" cons25 off secure -ttyva "/usr/libexec/getty Pc" cons25 off secure -ttyvb "/usr/libexec/getty Pc" cons25 off secure</programlisting> + <programlisting>ttyv9 "/usr/libexec/getty Pc" xterm off secure +ttyva "/usr/libexec/getty Pc" xterm off secure +ttyvb "/usr/libexec/getty Pc" xterm off secure</programlisting> <para>(You could also just delete these lines.)</para> @@ -5354,17 +5246,9 @@ ttyvb "/usr/libexec/getty Pc" cons25 off secure</programlisting> <para>If this happens, disable the synchronization check code by setting the driver flags for the PS/2 mouse driver to - <literal>0x100</literal>. Enter - <emphasis>UserConfig</emphasis> by giving the - <option>-c</option> option at the boot prompt:</para> - - <screen>boot: <userinput>-c</userinput></screen> - - <para>Then, in the <emphasis>UserConfig</emphasis> command - line, type:</para> - - <screen>UserConfig> <userinput>flags psm0 0x100</userinput> -UserConfig> <userinput>quit</userinput></screen> + <literal>0x100</literal>. This can be easiest achieved + by adding <screen>hint.psm.0.flags="0x100"</screen> to + <filename>/boot/loader.conf</filename> and rebooting.</para> </answer> </qandaentry> @@ -5652,24 +5536,6 @@ Key F15 A A Menu Workplace Nop</programlisting> </qandaentry> <qandaentry> - <question id="port-3c503"> - <para>How do I get my 3C503 to use the other network - port?</para> - </question> - - <answer> - <para>If you want to use the other ports, you will have to - specify an additional parameter on the &man.ifconfig.8; - command line. The default port is <literal>link0</literal>. - To use the AUI port instead of the BNC one, use - <literal>link2</literal>. These flags should be specified - using the ifconfig_* variables in - <filename>/etc/rc.conf</filename> (see - &man.rc.conf.5;).</para> - </answer> - </qandaentry> - - <qandaentry> <question id="nfs-linux"> <para>Why can I not NFS-mount from a &linux; box?</para> </question> @@ -5723,13 +5589,6 @@ Key F15 A A Menu Workplace Nop</programlisting> programs are now available in the &os; Ports Collection as <filename role="package">net/mrouted</filename>.</para> </note> - - <para>MBONE tools are available in their own ports category, - <ulink - url="http://www.FreeBSD.org/ports/mbone.html">mbone</ulink>. - If you are looking for the conference tools - <command>vic</command> and <command>vat</command>, look - there!</para> </answer> </qandaentry> @@ -6043,9 +5902,7 @@ Key F15 A A Menu Workplace Nop</programlisting> <para>Every &unix; process is completely firewalled off from every other &unix; process. One process cannot modify the - address space of another. This is unlike &windows; where a - process can easily overwrite the address space of any other, - leading to a crash.</para> + address space of another.</para> <para>A &unix; process is owned by a particular userid. If the user ID is not the <username>root</username> user, @@ -6139,7 +5996,7 @@ Key F15 A A Menu Workplace Nop</programlisting> search the archives <ulink url="&url.base;/search/index.html">here</ulink> for an extensive discussion. A more fine-grained mechanism - is preffered.</para> + is preferred.</para> </warning> </answer> </qandaentry> @@ -8058,11 +7915,6 @@ hint.sio.7.irq="12"</programlisting> <itemizedlist> <listitem> - <para>&rel3.releng; AKA - &rel3.stable;</para> - </listitem> - - <listitem> <para>&rel2.releng; AKA &rel2.stable;</para> </listitem> diff --git a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml index c62fbc470e..f3a36601a3 100644 --- a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml +++ b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml @@ -137,11 +137,11 @@ <para>The documentation for the web site, &os; Handbook, and FAQ are available in the <literal>doc/</literal> Subversion repository, which is located at - <literal>svn://svn.FreeBSD.org/doc/</literal>.</para> + <literal>https://svn.FreeBSD.org/doc/</literal>.</para> <para>Manual pages are available in the <literal>src/</literal> Subversion repository, which is available at - <literal>svn://svn.FreeBSD.org/base/</literal>.</para> + <literal>https://svn.FreeBSD.org/base/</literal>.</para> <para>This means that the logs of changes to these files are visible to anyone, and anyone can use @@ -205,13 +205,23 @@ <screen>&prompt.user; <userinput>mkdir -p head/share</userinput> &prompt.user; <userinput>mkdir -p head/en_US.ISO8859-1/share</userinput> -&prompt.user; <userinput>svn checkout svn://svn.FreeBSD.org/doc/head/share head/share</userinput> -&prompt.user; <userinput>svn checkout svn://svn.FreeBSD.org/doc/head/en_US.ISO8859-1/share head/en_US.ISO8859-1/share</userinput></screen> +&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/share head/share</userinput> +&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/share head/en_US.ISO8859-1/share</userinput></screen> <para>If you have plenty of disk space then you could check out everything.</para> - <screen>&prompt.user; <userinput>svn checkout svn://svn.FreeBSD.org/doc/head head</userinput></screen> + <screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head head</userinput></screen> + + <note> + <para><ulink + url="https://svn0.us-east.FreeBSD.org/">svn0.us-east.FreeBSD.org</ulink> + is a public <literal>SVN</literal> server. + Select the closest mirror and verify the mirror server + certificate from the list of <ulink + url="&url.books.handbook;/svn-mirrors.html">Subversion + mirror sites</ulink>.</para> + </note> </step> <step> @@ -229,7 +239,7 @@ <para>Check out the <filename>articles</filename> directory.</para> - <screen>&prompt.user; <userinput>svn checkout svn://svn.FreeBSD.org/doc/head/en_US.ISO8859-1/articles</userinput></screen> + <screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/articles</userinput></screen> </step> <step> @@ -248,7 +258,7 @@ <filename>head/en_US.ISO8859-1/books/faq</filename> you would check it out of the repository like this.</para> - <screen>&prompt.user; <userinput>svn checkout svn://svn.FreeBSD.org/doc/head/en_US.ISO8859-1/books/faq</userinput></screen> + <screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/en_US.ISO8859-1/books/faq</userinput></screen> </step> <step> diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml index c72ecfa11a..6d7fa06c8f 100644 --- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml +++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml @@ -68,7 +68,15 @@ <para>To check out the full source files for the &os; website, run:</para> - <screen>&prompt.root; <userinput><command>svn checkout svn://svn.FreeBSD.org/doc/head/ <replaceable>/usr/build</replaceable></command></userinput></screen> + <screen>&prompt.root; <userinput><command>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/ <replaceable>/usr/build</replaceable></command></userinput></screen> + + <para><ulink + url="https://svn0.us-east.FreeBSD.org/">svn0.us-east.FreeBSD.org</ulink> + is a public <literal>SVN</literal> server. + Select the closest mirror and verify the mirror server + certificate from the list of <ulink + url="&url.books.handbook;/svn-mirrors.html">Subversion + mirror sites</ulink>.</para> <tip> <para>If <command>svn</command> is not run as diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml index 2219e73282..056b41ffce 100644 --- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml +++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml @@ -137,7 +137,15 @@ copy of the FreeBSD Subversion repository (at least the documentation part). This can be done by running:</para> - <screen>&prompt.user; <userinput><command>svn</command> checkout svn://svn.FreeBSD.org/doc/head/ head</userinput></screen> + <screen>&prompt.user; <userinput><command>svn</command> checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/ head</userinput></screen> + + <para><ulink + url="https://svn0.us-east.FreeBSD.org/">svn0.us-east.FreeBSD.org</ulink> + is a public <literal>SVN</literal> server. + Select the closest mirror and verify the mirror server + certificate from the list of <ulink + url="&url.books.handbook;/svn-mirrors.html">Subversion + mirror sites</ulink>.</para> <note> <para>This will require the <filename diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml index 63642effc3..b4dc3f8b59 100644 --- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml @@ -867,22 +867,6 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting> wrapper.</para> </note> - <para>Under &os; 7.X, with a device driver you need to - also bring in the 802.11 networking support required by the - driver. For the &man.ath.4; driver these are at least the - &man.wlan.4;, <literal>wlan_scan_ap</literal> and - <literal>wlan_scan_sta</literal> modules; the &man.wlan.4; - module is automatically loaded with the wireless device - driver, the remaining modules must be loaded at boot time - in <filename>/boot/loader.conf</filename>:</para> - - <programlisting>wlan_scan_ap_load="YES" -wlan_scan_sta_load="YES"</programlisting> - - <para>Since &os; 8.0, these modules are part of the - base &man.wlan.4; driver which is dynamically loaded with - the adapter driver.</para> - <para>With that, you will need the modules that implement cryptographic support for the security protocols you intend to use. These are intended to be dynamically loaded on @@ -922,13 +906,6 @@ device ath_hal # pci/cardbus chip support options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath</programlisting> - <para>Both following lines are also required by - &os; 7.X, other &os; versions do not need - them:</para> - - <programlisting>device wlan_scan_ap # 802.11 AP mode scanning -device wlan_scan_sta # 802.11 STA mode scanning</programlisting> - <para>With this information in the kernel configuration file, recompile the kernel and reboot your &os; machine.</para> @@ -979,21 +956,6 @@ freebsdap 00:11:95:c3:0d:ac 1 54M -83:96 100 EPS WPA</screen> require you to mark the interface up again.</para> </note> - <note> - <para>Under &os; 7.X, the adapter device, for example - <devicename><replaceable>ath0</replaceable></devicename>, - is used directly instead of the - <devicename>wlan<replaceable>0</replaceable></devicename> - device. This requires you to replace the both previous - lines with:</para> - - <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput></screen> - - <para>In the rest of this document, &os; 7.X users - will need to change the command and configuration lines - according to that scheme.</para> - </note> - <para>The output of a scan request lists each BSS/IBSS network found. Beside the name of the network, <literal>SSID</literal>, we find the @@ -1096,13 +1058,6 @@ freebsdap 00:11:95:c3:0d:ac 1 54M -83:96 100 EPS WPA</screen> <programlisting>wlans_ath0="wlan0" ifconfig_wlan0="DHCP"</programlisting> - <note> - <para>As previously mentioned, &os; 7.X will only - require a line related to the adapter device:</para> - - <programlisting>ifconfig_ath0="DHCP"</programlisting> - </note> - <para>If there are multiple access points and you want to select a specific one, you can select it by its SSID:</para> @@ -1319,7 +1274,7 @@ ifconfig_wlan0="WPA DHCP"</programlisting> <para>Then we can bring up the interface:</para> - <screen>&prompt.root; <userinput><filename>service netif</filename> start</userinput> + <screen>&prompt.root; <userinput>service netif start</userinput> Starting wpa_supplicant. DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5 DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6 @@ -2234,8 +2189,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS</screen> can enable debugging messages in the 802.11 protocol support layer using the <command>wlandebug</command> program found in - <filename>/usr/src/tools/tools/net80211</filename>. For - example:</para> + <filename class="directory">/usr/src/tools/tools/net80211</filename>. + For example:</para> <screen>&prompt.root; <userinput>wlandebug -i <replaceable>ath0</replaceable> +scan+auth+debug+assoc</userinput> net.wlan.0.debug: 0 => 0xc80000<assoc,auth,scan></screen> @@ -2805,7 +2760,8 @@ Success, response: OK, Success (0x20)</screen> <para>In order to provide OBEX Object Push service, &man.sdpd.8; server must be running. A root folder, where all incoming objects will be stored, must be created. The default path to - the root folder is <filename>/var/spool/obex</filename>. + the root folder + is <filename class="directory">/var/spool/obex</filename>. Finally, start OBEX server on valid RFCOMM channel number. The OBEX server will automatically register OBEX Object Push service with the local SDP daemon. The example below shows @@ -3734,9 +3690,9 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover </listitem> <listitem> - <para>Standard system startup files exist in - <filename>/etc</filename> to detect and support a diskless - system startup.</para> + <para>Standard system startup files exist + in <filename class="directory">/etc</filename> + to detect and support a diskless system startup.</para> </listitem> <listitem> @@ -3755,8 +3711,9 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover <itemizedlist> <listitem> <para>The diskless workstations use a shared read-only - <filename>/</filename> file system, and a shared - read-only <filename>/usr</filename>.</para> + <filename class="directory">/</filename> file system, + and a shared read-only + <filename class="directory">/usr</filename>.</para> <para>The root file system is a copy of a standard FreeBSD root (typically the server's), with some configuration files @@ -4079,8 +4036,9 @@ margaux:ha=0123456789ab:tc=.def100</programlisting> <para>To make a boot floppy, insert a floppy in the drive on the machine where you installed <application>Etherboot</application>, then change your - current directory to the <filename>src</filename> directory - in the <application>Etherboot</application> tree and + current directory to + the <filename class="directory">src</filename> + directory in the <application>Etherboot</application> tree and type:</para> <screen>&prompt.root; <userinput>gmake bin32/<replaceable>devicetype</replaceable>.fd0</userinput></screen> @@ -4138,7 +4096,7 @@ margaux:ha=0123456789ab:tc=.def100</programlisting> <step> <para>Create a directory from which <application>tftpd</application> will serve the files, - e.g., <filename>/tftpboot</filename>.</para> + e.g., <filename class="directory">/tftpboot</filename>.</para> </step> <step> @@ -4168,7 +4126,8 @@ margaux:ha=0123456789ab:tc=.def100</programlisting> </step> </procedure> - <para>You can place the <filename>tftpboot</filename> + <para>You can place + the <filename class="directory">tftpboot</filename> directory anywhere on the server. Make sure that the location is set in both <filename>inetd.conf</filename> and <filename>dhcpd.conf</filename>.</para> @@ -4331,7 +4290,7 @@ cd /usr/src/etc; make distribution</programlisting> <sect4> <title>Running with a Read-only - <filename>/usr</filename></title> + <filename class="directory">/usr</filename></title> <indexterm> <primary>diskless operation</primary> @@ -4341,7 +4300,8 @@ cd /usr/src/etc; make distribution</programlisting> <para>If the diskless workstation is configured to run X, you will have to adjust the <application>XDM</application> configuration file, which - puts the error log on <filename>/usr</filename> by + puts the error log + on <filename class="directory">/usr</filename> by default.</para> </sect4> @@ -4355,7 +4315,8 @@ cd /usr/src/etc; make distribution</programlisting> <command>cpio</command>.</para> <para>In this situation, there are sometimes problems with - the special files in <filename>/dev</filename>, due to + the special files + in <filename class="directory">/dev</filename>, due to differing major/minor integer sizes. A solution to this problem is to export a directory from the non-FreeBSD server, mount this directory onto a FreeBSD machine, and @@ -4415,7 +4376,7 @@ cd /usr/src/etc; make distribution</programlisting> <para>Choose a directory which will have a &os; installation which will be NFS mountable. For example, a directory such as - <filename>/b/tftpboot/FreeBSD/install</filename> can be + <filename class="directory">/b/tftpboot/FreeBSD/install</filename> can be used.</para> <screen>&prompt.root; <userinput>export NFSROOTDIR=/b/tftpboot/FreeBSD/install</userinput> @@ -4545,8 +4506,10 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro <filename>/etc/rc</filename> detects that you booted over NFS and runs the <filename>/etc/rc.initdiskless</filename> script. Read the comments in this script to understand what is going - on. We need to make <filename>/etc</filename> and - <filename>/var</filename> memory backed file systems because + on. We need to + make <filename class="directory">/etc</filename> + and <filename class="directory">/var</filename> + memory backed file systems because these directories need to be writable, but the NFS root directory is read-only.</para> @@ -4555,8 +4518,9 @@ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro &prompt.root; <userinput>tar -c -v -f conf/base/etc.cpio.gz --format cpio --gzip etc</userinput> &prompt.root; <userinput>tar -c -v -f conf/base/var.cpio.gz --format cpio --gzip var</userinput></screen> - <para>When the system boots, memory file systems for - <filename>/etc</filename> and <filename>/var</filename> will + <para>When the system boots, memory file systems + for <filename class="directory">/etc</filename> + and <filename class="directory">/var</filename> will be created and mounted, and the contents of the <filename>cpio.gz</filename> files will be copied into them.</para> diff --git a/en_US.ISO8859-1/books/handbook/audit/chapter.xml b/en_US.ISO8859-1/books/handbook/audit/chapter.xml index ae55c41d2a..5d5540e5f6 100644 --- a/en_US.ISO8859-1/books/handbook/audit/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/audit/chapter.xml @@ -104,7 +104,7 @@ requirements. --> Administrators should take into account disk space requirements associated with high volume audit configurations. For example, it may be desirable to dedicate a file system to - the <filename>/var/audit</filename> tree so that other file + the <filename class="directory">/var/audit</filename> tree so that other file systems are not affected if the audit file system becomes full.</para> </warning> @@ -630,7 +630,7 @@ trailer,133</programlisting> <para>Members of the <groupname>audit</groupname> group are given permission to read audit trails in - <filename>/var/audit</filename>; by default, this group is + <filename class="directory">/var/audit</filename>; by default, this group is empty, so only the <username>root</username> user may read audit trails. Users may be added to the <groupname>audit</groupname> group in order to delegate audit diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml index 56dd5d180a..aac296771e 100644 --- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml @@ -961,21 +961,25 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen> class="directory">/usr/local/</filename></entry> <entry>Local executables and libraries. Also used as the default destination for the &os; ports - framework. Within <filename>/usr/local</filename>, - the general layout sketched out by &man.hier.7; for - <filename>/usr</filename> should be used. Exceptions - are the man directory, which is directly under - <filename>/usr/local</filename> rather than under - <filename>/usr/local/share</filename>, and the ports - documentation is in - <filename>share/doc/<replaceable>port</replaceable></filename>.</entry> + framework. Within + <filename class="directory">/usr/local</filename>, the + general layout sketched out by &man.hier.7; for + <filename class="directory">/usr</filename> should be + used. Exceptions are the man directory, which is + directly under + <filename class="directory">/usr/local</filename> + rather than under + <filename class="directory">/usr/local/share</filename>, + and the ports documentation is in + <filename class="directory">share/doc/<replaceable>port</replaceable></filename>.</entry> </row> <row> <entry><filename class="directory">/usr/obj/</filename></entry> <entry>Architecture-specific target tree produced by - building the <filename>/usr/src</filename> + building the + <filename class="directory">/usr/src</filename> tree.</entry> </row> @@ -1075,9 +1079,9 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen> directory name, followed by a forward slash, <literal>/</literal>, followed by any other directory names that are necessary. For example, if the directory - <filename>foo</filename> contains a directory - <filename>bar</filename> which contains the file - <filename>readme.txt</filename>, the full name, or + <filename class="directory">foo</filename> contains a directory + <filename class="directory">bar</filename> which contains the + file <filename>readme.txt</filename>, the full name, or <firstterm>path</firstterm>, to the file is <filename>foo/bar/readme.txt</filename>. Note that this is different from &windows; which uses @@ -1152,11 +1156,13 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen> <para>Any files that are in the <literal>B1</literal> or <literal>B2</literal> directories can be reached with the path - <filename>/A1/B1</filename> or <filename>/A1/B2</filename> as - necessary. Any files that were in <filename>/A1</filename> have + <filename class="directory">/A1/B1</filename> or + <filename class="directory">/A1/B2</filename> as + necessary. Any files that were in + <filename class="directory">/A1</filename> have been temporarily hidden. They will reappear if <literal>B</literal> is <firstterm>unmounted</firstterm> from - A.</para> + <literal>A</literal>.</para> <para>If <literal>B</literal> had been mounted on <literal>A2</literal> then the diagram would look like @@ -1180,8 +1186,10 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen> </textobject> </mediaobject> - <para>and the paths would be <filename>/A2/B1</filename> and - <filename>/A2/B2</filename> respectively.</para> + <para>and the paths would be + <filename class="directory">/A2/B1</filename> and + <filename class="directory">/A2/B2</filename> + respectively.</para> <para>File systems can be mounted on top of one another. Continuing the last example, the <literal>C</literal> file @@ -1257,9 +1265,9 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen> file system can be mounted read-only, making it impossible for users to inadvertently delete or edit a critical file. Separating user-writable file systems, such as - <filename>/home</filename>, from other file systems allows - them to be mounted <firstterm>nosuid</firstterm>. This - option prevents the + <filename class="directory">/home</filename>, from other + file systems allows them to be mounted + <firstterm>nosuid</firstterm>. This option prevents the <firstterm>suid</firstterm>/<firstterm>guid</firstterm> bits on executables stored on the file system from taking effect, possibly improving security.</para> @@ -2153,8 +2161,6 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse configuration. Here is a list of common environment variables and their meanings:</para> - <indexterm><primary>environment variables</primary></indexterm> - <informaltable frame="none" pgwide="1"> <tgroup cols="2"> <thead> @@ -2389,7 +2395,7 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse <para>Most devices in a &os; must be accessed through special files called device nodes, which are located in - <filename>/dev</filename>.</para> + <filename class="directory">/dev</filename>.</para> <sect2> <title>Creating Device Nodes</title> @@ -2637,7 +2643,8 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse equivalent to using &man.apropos.1;.</para> <para>To determine what the commands in - <filename>/usr/bin</filename> do, type:</para> + <filename class="directory">/usr/bin</filename> do, + type:</para> <screen>&prompt.user; <userinput>cd /usr/bin</userinput> &prompt.user; <userinput>man -f *</userinput></screen> diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml index 182fc3ac07..fba2a7c58b 100644 --- a/en_US.ISO8859-1/books/handbook/config/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml @@ -711,7 +711,7 @@ $sshd_enable=YES</screen> <username>root</username> console.</para> </note> - <para>To determine if a service is running, use + <para>To determine whether or not a service is running, use <option>status</option>. For instance, to verify that <command>sshd</command> is running:</para> @@ -1111,8 +1111,8 @@ lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> metric 0 mtu 16384 <listitem> <para>The status of the link (<literal>status</literal>) is - <literal>active</literal>, indicating that the carrier is - detected. For <devicename>dc1</devicename>, the + <literal>active</literal>, indicating that the carrier + signal is detected. For <devicename>dc1</devicename>, the <literal>status: no carrier</literal> status is normal when an Ethernet cable is not plugged into the card.</para> @@ -1133,8 +1133,8 @@ lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> metric 0 mtu 16384 <para>To configure the card, you will need <username>root</username> privileges. The network card configuration can be performed from the command line with - &man.ifconfig.8; but will not persist after a reboot. - Instead, add the network card's configuration to + &man.ifconfig.8; but will not persist after a reboot unless + the network card's configuration is also added to <filename>/etc/rc.conf</filename> using an editor. Add a line for each network card present on the system, as seen in this example:</para> diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml index efb890c4cb..22ae2e6433 100644 --- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml @@ -378,7 +378,7 @@ MergeChanges /etc/ /var/named/etc/</programlisting> on the version of &os;.</para> <sect4 id="freebsd-update-custom-kernel-8x"> - <title>Custom Kernels with &os; 8.X and Earlier</title> + <title>Custom Kernels with &os; 8.X</title> <para>A copy of the <filename>GENERIC</filename> kernel is needed, and should be placed in <filename @@ -1738,8 +1738,8 @@ Fetching 133 new ports or files... done.</screen> up-to-date, refer to <xref linkend="synching"/> for detailed help about synchronizing to a newer version.</para> - <para>Updating the system from source is a more subtle than - it might initially seem to be, and the &os; developers have + <para>Updating the system from source is a more subtle process + than it might initially seem to be, and the &os; developers have found it necessary over the years to change the recommended approach fairly dramatically as new kinds of unavoidable dependencies come to light. The rest of this section @@ -1783,7 +1783,7 @@ Fetching 133 new ports or files... done.</screen> </listitem> <listitem> - <para>Some configuration changes must be done before the new + <para>Some configuration changes must be made before the new world is installed, but others might break the old world. Hence, two different configuration upgrade steps are generally needed.</para> @@ -1871,7 +1871,7 @@ Fetching 133 new ports or files... done.</screen> <para><command>mergemaster</command></para> <para>Repeated to update the remaining configuration files, - not that the new world is on disk.</para> + now that the new world is on disk.</para> </listitem> <listitem> @@ -2142,7 +2142,7 @@ Script done, …</screen> <para><emphasis>Do not</emphasis> save the output in <filename class="directory">/tmp</filename> as this directory may be cleared at next reboot. A better place to save the file is - <filename class="directory">/var/tmp</filename>or in + <filename class="directory">/var/tmp</filename> or in <username>root</username>'s home directory.</para> </sect3> @@ -2159,8 +2159,7 @@ Script done, …</screen> <para>To rebuild the world, use &man.make.1;. This command reads instructions from the <filename>Makefile</filename>, which describes how the programs that comprise &os; should - be rebuilt and the order in which they should be - built.</para> + be built and the order in which they should be built.</para> <para>The general format of the command is as follows:</para> @@ -2467,7 +2466,7 @@ Script done, …</screen> <sect3> <title>Manual Update</title> - <para>To instead perform the update manually, do not just copy + <para>To perform the update manually instead, do not just copy over the files from <filename class="directory">/usr/src/etc</filename> to <filename class="directory">/etc</filename> and expect it to @@ -2503,11 +2502,9 @@ Script done, …</screen> files.</para> </warning> - <para>Next, build a dummy set of directories to install the - new <filename class="directory">/etc</filename> and other - files into. <filename - class="directory">/var/tmp/root</filename> is a reasonable - choice:</para> + <para>Build a temporary set of directories into which the new + <filename class="directory">/etc</filename> and other files + can be installed:</para> <screen>&prompt.root; <userinput>mkdir /var/tmp/root</userinput> &prompt.root; <userinput>cd /usr/src/etc</userinput> @@ -2823,7 +2820,7 @@ Building everything.. <listitem> <para>Turn off profiling by setting <quote>NO_PROFILE=true</quote> in - <filename>/etc/make.conf</filename>).</para> + <filename>/etc/make.conf</filename>.</para> </listitem> <listitem> diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml index 2cfaf2b55d..fdbff70c96 100644 --- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml @@ -176,6 +176,7 @@ </row> <row> + <entry>Finance</entry> <entry><application>KMyMoney</application></entry> <entry><literal>kmymoney-kde4</literal></entry> <entry><filename @@ -251,8 +252,7 @@ <entry><application>Firefox</application></entry> <entry>medium</entry> <entry>heavy</entry> - <entry><application>&os; and &linux; versions are - available</application></entry> + <entry>&os; and &linux; versions are available</entry> </row> <row> @@ -266,7 +266,7 @@ <entry><application>Konqueror</application></entry> <entry>medium</entry> <entry>heavy</entry> - <entry><application>Requires KDE</application> + <entry>Requires <application>KDE</application> libraries</entry> </row> @@ -274,7 +274,7 @@ <entry><application>Chromium</application></entry> <entry>medium</entry> <entry>heavy</entry> - <entry><application>Requires Gtk+</application></entry> + <entry>Requires <application>Gtk+</application></entry> </row> </tbody> </tgroup> @@ -403,9 +403,10 @@ <screen>&prompt.user; <userinput>nspluginwrapper -v -a -u</userinput></screen> - <para>Start the browser, enter <literal>about:plugins</literal> - in the location bar and press <keycap>Enter</keycap>. A list - should appear with all the currently available plugins.</para> + <para>Start the browser, enter + <literal>about:plugins</literal> in the location bar and + press <keycap>Enter</keycap>. A list should appear with + all the currently available plugins.</para> </step> </procedure> @@ -613,8 +614,8 @@ of the installed desktop environment.</para> <para>This section demonstrates how to install the following - popular web browsers and indicates if the application is - resource-heavy, takes time to compile from ports, or has any + popular productivity software and indicates if the application + is resource-heavy, takes time to compile from ports, or has any major dependencies.</para> <informaltable frame="none" pgwide="1"> diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml index da199f90b6..3042f6b3b8 100644 --- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml @@ -3040,13 +3040,7 @@ Filesystem 1K-blocks Used Avail Capacity Mounted on kernel configuration.</para> <para>Next, enable disk quotas in - <filename>/etc/rc.conf</filename>. On &os; 7.X and - earlier, this is done by adding the line:</para> - - <programlisting>enable_quotas="YES"</programlisting> - - <para>On &os; 8.0-RELEASE and later, add the following - line instead:</para> + <filename>/etc/rc.conf</filename>:</para> <programlisting>quota_enable="YES"</programlisting> @@ -4028,10 +4022,6 @@ Device 1K-blocks Used Avail Capacity linkend="network-communication">&os; networking</link>.</para> </listitem> - - <listitem> - <para>Use &os; 8.1-RELEASE or newer.</para> - </listitem> </itemizedlist> <para>The <acronym>HAST</acronym> project was sponsored by The diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml index 860935c5fc..781d5a065c 100644 --- a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml @@ -94,7 +94,7 @@ <row> <entry>&a.announce.name;</entry> - <entry>Important events and project milestones</entry> + <entry>Important events and project milestones (moderated)</entry> </row> <row> @@ -150,7 +150,7 @@ <row> <entry>&a.security-notifications.name;</entry> - <entry>Security notifications</entry> + <entry>Security notifications (moderated)</entry> </row> <row> @@ -202,7 +202,7 @@ <row> <entry>&a.amd64.name;</entry> - <entry>Porting FreeBSD to AMD64 systems</entry> + <entry>Porting FreeBSD to AMD64 systems (moderated)</entry> </row> <row> @@ -458,7 +458,7 @@ <row> <entry>&a.ports-announce.name;</entry> <entry>Important news and instructions about the Ports - Collection</entry> + Collection (moderated)</entry> </row> <row> @@ -635,11 +635,6 @@ </row> <row> - <entry>&a.vendors.name;</entry> - <entry>Vendors pre-release coordination</entry> - </row> - - <row> <entry>&a.wip-status.name;</entry> <entry>FreeBSD Work-In-Progress Status</entry> </row> @@ -649,13 +644,6 @@ <entry>Discussions of 802.11 stack, tools, device driver development</entry> </row> - - <row> - <entry>&a.www.name;</entry> - <entry>Maintainers of - <ulink - url="&url.base;/index.html">www.FreeBSD.org</ulink></entry> - </row> </tbody> </tgroup> </informaltable> @@ -1518,7 +1506,7 @@ changes and issues related to the FreeBSD.org project infrastructure.</para> - <para>This list is strictly for announcements: no replies, + <para>This moderated list is strictly for announcements: no replies, requests, discussions, or opinions.</para> </listitem> </varlistentry> @@ -1859,18 +1847,6 @@ </varlistentry> <varlistentry> - <term>&a.vendors.name;</term> - - <listitem> - <para><emphasis>Vendors</emphasis></para> - - <para>Coordination discussions between The FreeBSD - Project and Vendors of software and hardware for - FreeBSD.</para> - </listitem> - </varlistentry> - - <varlistentry> <term>&a.virtualization.name;</term> <listitem> diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml index efb1ce7f49..0a08053a70 100644 --- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml @@ -350,8 +350,8 @@ pflog_flags="" # additional flags for pflogd startup</programli url="http://www.openbsd.org/faq/pf/">PF FAQ</ulink>, keep in mind that different versions of &os; contain different versions of PF. Currently, - &os; 8.<replaceable>X</replaceable> and prior is using - the same version of <acronym>PF</acronym> as + &os; 8.<replaceable>X</replaceable> is using the + same version of <acronym>PF</acronym> as OpenBSD 4.1. &os; 9.<replaceable>X</replaceable> and later is using the same version of <acronym>PF</acronym> as OpenBSD 4.5.</para> diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml index 92fcf25a8d..9515660d8c 100644 --- a/en_US.ISO8859-1/books/handbook/install/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml @@ -176,14 +176,14 @@ <sect2 id="install-inventory"> <title>Inventory Your Computer</title> - <para>Before installing FreeBSD you should attempt to inventory the - components in your computer. The FreeBSD installation routines will + <para>Before installing &os; you should attempt to inventory the + components in your computer. The &os; installation routines will show you the components (hard disks, network cards, CDROM drives, and - so forth) with their model number and manufacturer. FreeBSD will also + so forth) with their model number and manufacturer. &os; will also attempt to determine the correct configuration for these devices, which includes information about IRQ and IO port usage. Due to the vagaries of PC hardware this process is not always completely - successful, and you may need to correct FreeBSD's determination of + successful, and you may need to correct &os;'s determination of your configuration.</para> <para>If you already have another operating system installed, such as @@ -195,7 +195,7 @@ hexadecimal numbers, such as 0x330.</para> <para>We recommend you print or write down this information before - installing FreeBSD. It may help to use a table, like this:</para> + installing &os;. It may help to use a table, like this:</para> <table pgwide="1" frame="none"> <title>Sample Device Inventory</title> @@ -293,22 +293,22 @@ <sect2> <title>Backup Your Data</title> - <para>If the computer you will be installing FreeBSD on contains + <para>If the computer you will be installing &os; on contains valuable data, then ensure you have it backed up, and that you have - tested the backups before installing FreeBSD. The FreeBSD + tested the backups before installing &os;. The &os; installation routine will prompt you before writing any data to your disk, but once that process has started it cannot be undone.</para> </sect2> <sect2 id="install-where"> - <title>Decide Where to Install FreeBSD</title> + <title>Decide Where to Install &os;</title> - <para>If you want FreeBSD to use your entire hard disk, then there is nothing + <para>If you want &os; to use your entire hard disk, then there is nothing more to concern yourself with at this point — you can skip this section.</para> - <para>However, if you need FreeBSD to co-exist with other operating + <para>However, if you need &os; to co-exist with other operating systems then you need to have a rough understanding of how data is laid out on the disk, and how this affects you.</para> @@ -320,7 +320,7 @@ &os; internally also has partitions, the naming can become confusing very quickly, therefore these disk chunks are referred to as disk slices or simply slices - in &os; itself. For example, the FreeBSD utility + in &os; itself. For example, the &os; utility <command>fdisk</command> which operates on the PC disk partitions, refers to slices instead of partitions. By design, the PC only supports four partitions per disk. These partitions are called @@ -332,7 +332,7 @@ extended partition.</para> <para>Each partition has a <firstterm>partition ID</firstterm>, which is - a number used to identify the type of data on the partition. FreeBSD + a number used to identify the type of data on the partition. &os; partitions have the partition ID of <literal>165</literal>.</para> <para>In general, each operating system that you use will identify @@ -341,16 +341,16 @@ <firstterm>drive letter</firstterm>, starting with <devicename>C:</devicename>.</para> - <para>FreeBSD must be installed into a primary partition. FreeBSD can + <para>&os; must be installed into a primary partition. &os; can keep all its data, including any files that you create, on this one partition. However, if you have multiple disks, then you can create a - FreeBSD partition on all, or some, of them. When you install FreeBSD, + &os; partition on all, or some, of them. When you install &os;, you must have one partition available. This might be a blank partition that you have prepared, or it might be an existing partition that contains data that you no longer care about.</para> <para>If you are already using all the partitions on all your disks, then - you will have to free one of them for FreeBSD using the tools + you will have to free one of them for &os; using the tools provided by the other operating systems you use (e.g., <command>fdisk</command> on &ms-dos; or &windows;).</para> @@ -358,7 +358,7 @@ may need to shrink one or more of your existing partitions first.</para> - <para>A minimal installation of FreeBSD takes as little as 100 MB + <para>A minimal installation of &os; takes as little as 100 MB of disk space. However, that is a <emphasis>very</emphasis> minimal install, leaving almost no space for your own files. A more realistic minimum @@ -404,7 +404,7 @@ <para>This means that your disk has two partitions on it, one per drive letter. You can copy all your existing data from <devicename>D:</devicename> to <devicename>C:</devicename>, which - will free up the second partition, ready for FreeBSD.</para> + will free up the second partition, ready for &os;.</para> </example> <example> @@ -414,10 +414,10 @@ that already has a version of &windows; installed. When you installed &windows; you created one large partition, giving you a <devicename>C:</devicename> drive that is 4 GB in size. You are - currently using 1.5 GB of space, and want FreeBSD to have 2 GB + currently using 1.5 GB of space, and want &os; to have 2 GB of space.</para> - <para>In order to install FreeBSD you will need to either:</para> + <para>In order to install &os; you will need to either:</para> <orderedlist> <listitem> @@ -439,12 +439,12 @@ <sect2> <title>Collect Your Network Configuration Details</title> - <para>If you intend to connect to a network as part of your FreeBSD + <para>If you intend to connect to a network as part of your &os; installation (for example, if you will be installing from an FTP site or an NFS server), then you need to know your network configuration. You will be prompted for this information during the installation so that - FreeBSD can connect to the network to complete the install.</para> + &os; can connect to the network to complete the install.</para> <sect3> <title>Connecting to an Ethernet Network or Cable/DSL Modem</title> @@ -485,7 +485,7 @@ <title>Connecting Using a Modem</title> <para>If you dial up to an ISP using a regular modem then you can - still install FreeBSD over the Internet, it will just take a very + still install &os; over the Internet, it will just take a very long time.</para> <para>You will need to know:</para> @@ -506,14 +506,14 @@ </sect3> </sect2> <sect2> - <title>Check for FreeBSD Errata</title> + <title>Check for &os; Errata</title> - <para>Although the FreeBSD project strives to ensure that each release - of FreeBSD is as stable as possible, bugs do occasionally creep into + <para>Although the &os; project strives to ensure that each release + of &os; is as stable as possible, bugs do occasionally creep into the process. On very rare occasions those bugs affect the installation process. As these problems are discovered and fixed, they - are noted in the <ulink url="http://www.FreeBSD.org/releases/&rel.current;R/errata.html">FreeBSD Errata</ulink>, - which is found on the FreeBSD web site. You + are noted in the <ulink url="http://www.FreeBSD.org/releases/&rel.current;R/errata.html">&os; Errata</ulink>, + which is found on the &os; web site. You should check the errata before installing to make sure that there are no late-breaking problems which you should be aware of.</para> @@ -523,13 +523,13 @@ url="&url.base;/releases/index.html">release information</ulink> section of the <ulink - url="&url.base;/index.html">FreeBSD web site</ulink>.</para> + url="&url.base;/index.html">&os; web site</ulink>.</para> </sect2> <sect2> - <title>Obtain the FreeBSD Installation Files</title> + <title>Obtain the &os; Installation Files</title> - <para>The FreeBSD installation process can install FreeBSD from files + <para>The &os; installation process can install &os; from files located in any of the following places:</para> <itemizedlist> @@ -573,13 +573,13 @@ </listitem> </itemizedlist> - <para>If you have purchased FreeBSD on CD or DVD then you already have + <para>If you have purchased &os; on CD or DVD then you already have everything you need, and should proceed to the next section (<xref linkend="install-boot-media"/>).</para> - <para>If you have not obtained the FreeBSD installation files you should + <para>If you have not obtained the &os; installation files you should skip ahead to <xref linkend="install-diff-media"/> which explains how - to prepare to install FreeBSD from any of the above. After reading + to prepare to install &os; from any of the above. After reading that section, you should come back here, and read on to <xref linkend="install-boot-media"/>.</para> </sect2> @@ -587,21 +587,20 @@ <sect2 id="install-boot-media"> <title>Prepare the Boot Media</title> - <para>The FreeBSD installation process is started by booting your - computer into the FreeBSD installer—it is not a program you run - within another operating system. Your computer normally boots using - the operating system installed on your hard disk, but it can also be - configured to use a <quote>bootable</quote> floppy disk. - Most modern computers can also - boot from a CDROM in the CDROM drive or from a USB disk.</para> + <para>The &os; installation process is started by booting the + computer into the &os; installer—it is not a program you run + within another operating system. The computer normally boots + using the operating system installed on the hard disk, but it + can also be configured to boot from a CDROM or from a USB + disk.</para> <tip> - <para>If you have FreeBSD on CDROM or DVD (either one you purchased + <para>If you have &os; on CDROM or DVD (either one you purchased or you prepared yourself), and your computer allows you to boot from the CDROM or DVD (typically a BIOS option called <quote>Boot Order</quote> or similar), then you can skip this section. The - FreeBSD CDROM and DVD images are bootable and can be used to install - FreeBSD without any other special preparation.</para> + &os; CDROM and DVD images are bootable and can be used to install + &os; without any other special preparation.</para> </tip> <para>To create a bootable memory stick, follow these @@ -650,7 +649,7 @@ <title>Write The Image File to the Memory Stick</title> <procedure> - <title>Using FreeBSD To Write the Image</title> + <title>Using &os; To Write the Image</title> <warning> <para>The example below @@ -718,43 +717,27 @@ </step> </procedure> - <para>To create boot floppy images, follow these steps:</para> + <para>To create the boot floppy images for a &os;/&arch.pc98; + installation, follow these steps:</para> <procedure> <step> <title>Acquire the Boot Floppy Images</title> - <important> - <para>Please note, as of &os; 8.<replaceable>X</replaceable>, floppy disk images are - no longer available. Please see above for instructions - on how to install &os; using a USB memory stick or just - use a CDROM or a DVD.</para> - </important> - - <para>The boot disks are available on your installation media - in the <filename>floppies/</filename> directory, and - can also be downloaded from the floppies directory, - <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable>arch</replaceable>/<replaceable>version</replaceable>-RELEASE/floppies/</literal>. - Replace <replaceable>arch</replaceable> and - <replaceable>version</replaceable> - with the architecture and the version number - which you want to install, respectively. - For example, the boot floppy images for - &os;/&arch.i386; &rel2.current;-RELEASE are available - from <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/floppies/"></ulink>.</para> - - <para>The floppy images have a <filename>.flp</filename> extension. - The <filename>floppies/</filename> directory contains a number of - different images, and the ones you will need to use depends on the - version of FreeBSD you are installing, and in some cases, the - hardware you are installing to. - In most cases you will need four - floppies, <filename>boot.flp</filename>, - <filename>kern1.flp</filename>, - <filename>kern2.flp</filename>, and - <filename>kern3.flp</filename>. Check - <filename>README.TXT</filename> in the same directory for the - most up to date information about these floppy images.</para> + <para>The &os;/&arch.pc98; boot disks + can be downloaded from the floppies directory, + <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/<replaceable>version</replaceable>-RELEASE/floppies/</literal>. + Replace <replaceable>version</replaceable> with the + version number to install.</para> + + <para>The floppy images have a <filename>.flp</filename> + extension. <filename + class="directory">floppies/</filename> contains a number + of different images. Download + <filename>boot.flp</filename> as well as the number of + files associated with the type of installation, such as + <literal>kern.small*</literal> or + <literal>kern*</literal>.</para> <important> <para>Your FTP program must use <emphasis>binary mode</emphasis> @@ -768,7 +751,7 @@ <step> <title>Prepare the Floppy Disks</title> - <para>You must prepare one floppy disk per image file you had to + <para>Prepare one floppy disk per image file you had to download. It is imperative that these disks are free from defects. The easiest way to test this is to format the disks for yourself. Do not trust pre-formatted floppies. The format @@ -778,9 +761,9 @@ floppies if choosing this installation route.</para> <important> - <para>If you try to install FreeBSD and the installation + <para>If you try to install &os; and the installation program crashes, freezes, or otherwise misbehaves, one of - the first things to suspect is the floppies. Try writing + the first things to suspect is the floppies. Write the floppy image files to new disks and try again.</para> </important> @@ -816,16 +799,16 @@ the CDROM, then <command>fdimage</command> can be downloaded from the <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/"><filename class="directory">tools</filename> - directory</ulink> on the FreeBSD FTP site.</para> + directory</ulink> on the &os; FTP site.</para> <para>If you are writing the floppies on a &unix; system (such as - another FreeBSD system) you can use the &man.dd.1; command to - write the image files directly to disk. On FreeBSD, you would + another &os; system) you can use the &man.dd.1; command to + write the image files directly to disk. On &os;, you would run:</para> <screen>&prompt.root; <userinput>dd if=boot.flp of=/dev/fd0</userinput></screen> - <para>On FreeBSD, <filename>/dev/fd0</filename> refers to the + <para>On &os;, <filename>/dev/fd0</filename> refers to the first floppy disk (the <devicename>A:</devicename> drive). <filename>/dev/fd1</filename> would be the <devicename>B:</devicename> drive, and so on. Other &unix; @@ -835,7 +818,7 @@ </step> </procedure> - <para>You are now ready to start installing FreeBSD.</para> + <para>You are now ready to start installing &os;.</para> </sect2> </sect1> @@ -913,12 +896,12 @@ We can take no responsibility for lost disk contents!</literallayout> opportunity.</para> <note> - <para>For &os; 7.<replaceable>X</replaceable>, installation - boot floppies are available and can be prepared as - described in <xref linkend="install-boot-media"/>. One of - them will be the first boot disc: - <filename>boot.flp</filename>. Put this disc in your - floppy drive and boot the computer.</para> + <para>For &os;/&arch.pc98;, installation boot floppies are + available and can be prepared as described in <xref + linkend="install-boot-media"/>. The first floppy + disc will contain <filename>boot.flp</filename>. Put + this floppy in the floppy drive to boot into the + installer.</para> </note> <para>If your computer starts up as normal and loads your existing @@ -944,7 +927,7 @@ We can take no responsibility for lost disk contents!</literallayout> </step> <step> - <para>FreeBSD will start to boot. If you are booting from CDROM you + <para>&os; will start to boot. If you are booting from CDROM you will see a display similar to this (version information omitted):</para> @@ -1150,7 +1133,7 @@ Mounting root from ufs:/dev/md0c /stand/sysinstall running as init on vty0</screen> </figure> - <para>Check the probe results carefully to make sure that FreeBSD found + <para>Check the probe results carefully to make sure that &os; found all the devices you expected. If a device was not found, then it will not be listed. A <link linkend="kernelconfig">custom kernel</link> allows you to add in support for devices which are not in the @@ -1197,7 +1180,7 @@ Mounting root from ufs:/dev/md0c <title>Introducing Sysinstall</title> <para>The <application>sysinstall</application> utility is the installation - application provided by the FreeBSD Project. It is console based and is + application provided by the &os; Project. It is console based and is divided into a number of menus and screens that you can use to configure and control the installation process.</para> @@ -1354,7 +1337,7 @@ Mounting root from ufs:/dev/md0c <title>Begin a Standard Installation</title> <para>The <guimenuitem>Standard</guimenuitem> installation is the - option recommended for those new to &unix; or FreeBSD. Use the arrow + option recommended for those new to &unix; or &os;. Use the arrow keys to select <guimenuitem>Standard</guimenuitem> and then press <keycap>Enter</keycap> to start the installation.</para> @@ -1373,15 +1356,15 @@ Mounting root from ufs:/dev/md0c <sect1 id="install-steps"> <title>Allocating Disk Space</title> - <para>Your first task is to allocate disk space for FreeBSD, and label + <para>Your first task is to allocate disk space for &os;, and label that space so that <application>sysinstall</application> can prepare - it. In order to do this you need to know how FreeBSD expects to find + it. In order to do this you need to know how &os; expects to find information on the disk.</para> <sect2 id="install-drive-bios-numbering"> <title>BIOS Drive Numbering</title> - <para>Before you install and configure FreeBSD on your system, there is an + <para>Before you install and configure &os; on your system, there is an important subject that you should be aware of, especially if you have multiple hard drives.</para> @@ -1410,14 +1393,14 @@ Mounting root from ufs:/dev/md0c fashion for up to seven drives.</para> <para>A user who is accustomed to taking advantage of these features may - become surprised when the results with FreeBSD are not as expected. - FreeBSD does not use the BIOS, and does not know the <quote>logical BIOS + become surprised when the results with &os; are not as expected. + &os; does not use the BIOS, and does not know the <quote>logical BIOS drive mapping</quote>. This can lead to very perplexing situations, especially when drives are physically identical in geometry, and have also been made as data clones of one another.</para> - <para>When using FreeBSD, always restore the BIOS to natural drive - numbering before installing FreeBSD, and then leave it that way. If you + <para>When using &os;, always restore the BIOS to natural drive + numbering before installing &os;, and then leave it that way. If you need to switch drives around, then do so, but do it the hard way, and open the case and move the jumpers and cables.</para> @@ -1425,9 +1408,9 @@ Mounting root from ufs:/dev/md0c <title>An Illustration from the Files of Bill and Fred's Exceptional Adventures:</title> - <para>Bill breaks-down an older Wintel box to make another FreeBSD box + <para>Bill breaks-down an older Wintel box to make another &os; box for Fred. Bill installs a single SCSI drive as SCSI unit zero and - installs FreeBSD on it.</para> + installs &os; on it.</para> <para>Fred begins using the system, but after several days notices that the older SCSI drive is reporting numerous soft errors and reports @@ -1442,21 +1425,21 @@ Mounting root from ufs:/dev/md0c that the new drive is installed and functioning nicely, Bill decides that it is a good idea to start using it, so he uses features in the SCSI BIOS to re-order the disk drives so that the system boots from - SCSI unit four. FreeBSD boots and runs just fine.</para> + SCSI unit four. &os; boots and runs just fine.</para> <para>Fred continues his work for several days, and soon Bill and Fred decide that it is time for a new adventure — time to upgrade to a - newer version of FreeBSD. Bill removes SCSI unit zero because it was + newer version of &os;. Bill removes SCSI unit zero because it was a bit flaky and replaces it with another identical disk drive from the <quote>archive</quote>. Bill then installs the new version of - FreeBSD onto the new SCSI unit zero using Fred's magic Internet FTP + &os; onto the new SCSI unit zero using Fred's magic Internet FTP floppies. The installation goes well.</para> - <para>Fred uses the new version of FreeBSD for a few days, and certifies + <para>Fred uses the new version of &os; for a few days, and certifies that it is good enough for use in the engineering department. It is time to copy all of his work from the old version. So Fred mounts - SCSI unit four (the latest copy of the older FreeBSD version). Fred + SCSI unit four (the latest copy of the older &os; version). Fred is dismayed to find that none of his precious work is present on SCSI unit four.</para> @@ -1466,11 +1449,11 @@ Mounting root from ufs:/dev/md0c SCSI unit four, unit four became the <quote>new clone</quote>. When Bill re-ordered the SCSI BIOS so that he could boot from SCSI unit four, he was only fooling himself. - FreeBSD was still running on SCSI unit zero. + &os; was still running on SCSI unit zero. Making this kind of BIOS change will cause some or all of the Boot and Loader code to be fetched from the selected BIOS drive, but when the - FreeBSD kernel drivers take-over, the BIOS drive numbering will be - ignored, and FreeBSD will transition back to normal drive numbering. + &os; kernel drivers take-over, the BIOS drive numbering will be + ignored, and &os; will transition back to normal drive numbering. In the illustration at hand, the system continued to operate on the original SCSI unit zero, and all of Fred's data was there, not on SCSI unit four. The fact that the system appeared to be running on SCSI @@ -1538,7 +1521,7 @@ Mounting root from ufs:/dev/md0c <para>Consider what would happen if you had two IDE hard disks, one as the master on the first IDE controller, and one as the master on - the second IDE controller. If FreeBSD numbered these as it found + the second IDE controller. If &os; numbered these as it found them, as <devicename>ad0</devicename> and <devicename>ad1</devicename> then everything would work.</para> @@ -1548,7 +1531,7 @@ Mounting root from ufs:/dev/md0c <devicename>ad2</devicename>. Because device names (such as <devicename>ad1s1a</devicename>) are used to find filesystems, you may suddenly discover that some of your filesystems no longer - appear correctly, and you would need to change your FreeBSD + appear correctly, and you would need to change your &os; configuration.</para> <para>To work around this, the kernel can be configured to name IDE @@ -1559,13 +1542,13 @@ Mounting root from ufs:/dev/md0c <devicename>ad0</devicename> or <devicename>ad1</devicename> devices.</para> - <para>This configuration is the default for the FreeBSD kernel, which + <para>This configuration is the default for the &os; kernel, which is why this display shows <devicename>ad0</devicename> and <devicename>ad2</devicename>. The machine on which this screenshot was taken had IDE disks on both master channels of the IDE controllers, and no disks on the slave channels.</para> - <para>You should select the disk on which you want to install FreeBSD, + <para>You should select the disk on which you want to install &os;, and then press &gui.ok;. <application>FDisk</application> will start, with a display similar to that shown in <xref linkend="sysinstall-fdisk1"/>.</para> @@ -1574,11 +1557,11 @@ Mounting root from ufs:/dev/md0c sections.</para> <para>The first section, covering the first two lines of the display, - shows details about the currently selected disk, including its FreeBSD + shows details about the currently selected disk, including its &os; name, the disk geometry, and the total size of the disk.</para> <para>The second section shows the slices that are currently on the - disk, where they start and end, how large they are, the name FreeBSD + disk, where they start and end, how large they are, the name &os; gives them, and their description and sub-type. This example shows two small unused slices, which are artifacts of disk layout schemes on the PC. It also shows one large <acronym>FAT</acronym> slice, which @@ -1602,15 +1585,15 @@ Mounting root from ufs:/dev/md0c <para>What you do now will depend on how you want to slice up your disk.</para> - <para>If you want to use FreeBSD for the entire disk (which will delete + <para>If you want to use &os; for the entire disk (which will delete all the other data on this disk when you confirm that you want <application>sysinstall</application> to continue later in the installation process) then you can press <keycap>A</keycap>, which corresponds to the <guimenuitem>Use Entire Disk</guimenuitem> option. The existing slices will be removed, and replaced with a small area flagged as <literal>unused</literal> (again, an artifact of PC disk - layout), and then one large slice for FreeBSD. If you do this, then - you should select the newly created FreeBSD slice using the arrow + layout), and then one large slice for &os;. If you do this, then + you should select the newly created &os; slice using the arrow keys, and press <keycap>S</keycap> to mark the slice as being bootable. The screen will then look very similar to <xref linkend="sysinstall-fdisk2"/>. Note the @@ -1619,7 +1602,7 @@ Mounting root from ufs:/dev/md0c booted from.</para> <para>If you will be deleting an existing slice to make space for - FreeBSD then you should select the slice using the arrow keys, and + &os; then you should select the slice using the arrow keys, and then press <keycap>D</keycap>. You can then press <keycap>C</keycap>, and be prompted for size of slice you want to create. Enter the appropriate figure and press <keycap>Enter</keycap>. The default @@ -1627,7 +1610,7 @@ Mounting root from ufs:/dev/md0c make, which could be the largest contiguous block of unallocated space or the size of the entire hard disk.</para> - <para>If you have already made space for FreeBSD (perhaps by using a + <para>If you have already made space for &os; (perhaps by using a tool such as <application>&partitionmagic;</application>) then you can press <keycap>C</keycap> to create a new slice. Again, you will be prompted for the size of slice you would like to create.</para> @@ -1651,26 +1634,26 @@ Mounting root from ufs:/dev/md0c <title>Install a Boot Manager</title> <para>You now have the option to install a boot manager. In general, - you should choose to install the FreeBSD boot manager if:</para> + you should choose to install the &os; boot manager if:</para> <itemizedlist> <listitem> - <para>You have more than one drive, and have installed FreeBSD onto + <para>You have more than one drive, and have installed &os; onto a drive other than the first one.</para> </listitem> <listitem> - <para>You have installed FreeBSD alongside another operating system - on the same disk, and you want to choose whether to start FreeBSD + <para>You have installed &os; alongside another operating system + on the same disk, and you want to choose whether to start &os; or the other operating system when you start the computer.</para> </listitem> </itemizedlist> - <para>If FreeBSD is going to be the only operating system on + <para>If &os; is going to be the only operating system on this machine, installed on the first hard disk, then the <guimenuitem>Standard</guimenuitem> boot manager will suffice. Choose <guimenuitem>None</guimenuitem> if you are using a - third-party boot manager capable of booting FreeBSD.</para> + third-party boot manager capable of booting &os;.</para> <para>Make your choice and press <keycap>Enter</keycap>.</para> @@ -1694,13 +1677,13 @@ Mounting root from ufs:/dev/md0c <para>If there is more than one drive, it will return to the Select Drives screen after the boot manager selection. If you wish to - install FreeBSD on to more than one disk, then you can select another + install &os; on to more than one disk, then you can select another disk here and repeat the slice process using <application>FDisk</application>.</para> <important> - <para>If you are installing FreeBSD on a drive other than your - first, then the FreeBSD boot manager needs to be installed on + <para>If you are installing &os; on a drive other than your + first, then the &os; boot manager needs to be installed on both drives.</para> </important> @@ -1737,10 +1720,10 @@ Mounting root from ufs:/dev/md0c <para>Certain applications can benefit from particular partition schemes, especially if you are laying out partitions across more than - one disk. However, for this, your first FreeBSD installation, you do + one disk. However, for this, your first &os; installation, you do not need to give too much thought to how you partition the disk. It - is more important that you install FreeBSD and start learning how to - use it. You can always re-install FreeBSD to change your partition + is more important that you install &os; and start learning how to + use it. You can always re-install &os; to change your partition scheme when you are more familiar with the operating system.</para> <para>This scheme features four partitions—one for swap space, and @@ -1778,11 +1761,11 @@ Mounting root from ufs:/dev/md0c <entry>This is the root filesystem. Every other filesystem will be mounted somewhere under this one. 1 GB is a reasonable size for this filesystem. You will not be storing - too much data on it, as a regular FreeBSD install will put + too much data on it, as a regular &os; install will put about 128 MB of data here. The remaining space is for temporary data, and also leaves expansion space if future versions of - FreeBSD need more space in <filename>/</filename>.</entry> + &os; need more space in <filename>/</filename>.</entry> </row> <row> @@ -1802,7 +1785,7 @@ Mounting root from ufs:/dev/md0c the swap amount to 64 MB.</para><para> If you have more than one disk then you can put swap - space on each disk. FreeBSD will then use each disk for + space on each disk. &os; will then use each disk for swap, which effectively speeds up the act of swapping. In this case, calculate the total amount of swap you need (e.g., 128 MB), and then divide this by the number of @@ -1822,8 +1805,8 @@ Mounting root from ufs:/dev/md0c files that are constantly varying; log files, and other administrative files. Many of these files are read-from or written-to extensively during - FreeBSD's day-to-day running. Putting these files on another - filesystem allows FreeBSD to optimize the access of these + &os;'s day-to-day running. Putting these files on another + filesystem allows &os; to optimize the access of these files without affecting other files in other directories that do not have the same access pattern.</entry> </row> @@ -1849,7 +1832,7 @@ Mounting root from ufs:/dev/md0c Defaults</literal> by the &os; partition editor.</para> </warning> - <para>If you will be installing FreeBSD on to more than one disk then + <para>If you will be installing &os; on to more than one disk then you must also create partitions in the other slices that you configured. The easiest way to do this is to create two partitions on each disk, one for the swap space, and one for a filesystem.</para> @@ -2078,7 +2061,7 @@ Mounting root from ufs:/dev/md0c <filename>/usr</filename>, you can leave the suggested size as is, to use the rest of the slice.</para> - <para>Your final FreeBSD DiskLabel Editor screen will appear similar to + <para>Your final &os; DiskLabel Editor screen will appear similar to <xref linkend="sysinstall-label4"/>, although your values chosen may be different. Press <keycap>Q</keycap> to finish.</para> @@ -2104,7 +2087,7 @@ Mounting root from ufs:/dev/md0c on the intended use of the system and the amount of disk space available. The predefined options range from installing the smallest possible configuration to everything. Those who are - new to &unix; and/or FreeBSD should almost certainly select one + new to &unix; and/or &os; should almost certainly select one of these canned options. Customizing a distribution set is typically for the more experienced user.</para> @@ -2149,7 +2132,7 @@ Mounting root from ufs:/dev/md0c <title>Installing the Ports Collection</title> <para>After selecting the desired distribution, an opportunity to - install the FreeBSD Ports Collection is presented. The ports + install the &os; Ports Collection is presented. The ports collection is an easy and convenient way to install software. The Ports Collection does not contain the source code necessary to compile the software. Instead, it is a collection of files which @@ -2160,10 +2143,10 @@ Mounting root from ufs:/dev/md0c <para>The installation program does not check to see if you have adequate space. Select this option only if you have - adequate hard disk space. As of FreeBSD &rel.current;, the FreeBSD + adequate hard disk space. As of &os; &rel.current;, the &os; Ports Collection takes up about &ports.size; of disk space. You can safely assume a larger value for more recent versions - of FreeBSD.</para> + of &os;.</para> <screen> User Confirmation Requested Would you like to install the FreeBSD ports collection? @@ -2392,7 +2375,7 @@ installation menus to retry whichever operations have failed. <para>Configuration of various options follows the successful installation. An option can be configured by re-entering the - configuration options before booting the new FreeBSD + configuration options before booting the new &os; system or after installation using <command>sysinstall</command> and selecting @@ -2406,7 +2389,7 @@ installation menus to retry whichever operations have failed. above.</para> <para>For detailed information on Local Area Networks and - configuring FreeBSD as a gateway/router refer to the + configuring &os; as a gateway/router refer to the <link linkend="advanced-networking">Advanced Networking</link> chapter.</para> @@ -3060,31 +3043,6 @@ Press [Enter] now to invoke an editor on /etc/exports the post-installation configuration.</para> </sect2> - <sect2 id="linuxcomp"> - <title>Linux Compatibility</title> - - <note> - <para>This part only applies to &os; 7.<replaceable>X</replaceable> - installation, if you install &os; 8.<replaceable>X</replaceable> - this screen will not be proposed.</para> - </note> - - <screen> User Confirmation Requested - Would you like to enable Linux binary compatibility? - - [ Yes ] No</screen> - - <para>Selecting &gui.yes; and pressing - <keycap>Enter</keycap> will allow - running Linux software on FreeBSD. The install will add - the appropriate packages for Linux compatibility.</para> - - <para>If installing by FTP, the machine will need to be connected to - the Internet. Sometimes a remote ftp site will not have all the - distributions like the Linux binary compatibility. This can - be installed later if necessary.</para> - </sect2> - <sect2 id="mouse"> <title>Mouse Settings</title> @@ -3961,7 +3919,7 @@ Password:</screen> </sect2> <sect2 id="shutdown"> - <title>FreeBSD Shutdown</title> + <title>&os; Shutdown</title> <para>It is important to properly shutdown the operating system. Do not just turn off power. First, become a superuser by @@ -4001,7 +3959,7 @@ Please press any key to reboot.</screen> </indexterm> <para>The following section covers basic installation troubleshooting, such as common problems people have reported. There are also a few - questions and answers for people wishing to dual-boot FreeBSD with + questions and answers for people wishing to dual-boot &os; with &ms-dos; or &windows;.</para> <sect2> @@ -4318,11 +4276,11 @@ Please press any key to reboot.</screen> <title>Advanced Installation Guide</title> - <para>This section describes how to install FreeBSD in exceptional + <para>This section describes how to install &os; in exceptional cases.</para> <sect2 id="headless-install"> - <title>Installing FreeBSD on a System without a Monitor or + <title>Installing &os; on a System without a Monitor or Keyboard</title> <indexterm> @@ -4332,7 +4290,7 @@ Please press any key to reboot.</screen> <indexterm><primary>serial console</primary></indexterm> <para>This type of installation is called a <quote>headless install</quote>, because the machine that you are trying to install - FreeBSD on either does not have a monitor attached to it, or does not + &os; on either does not have a monitor attached to it, or does not even have a VGA output. How is this possible you ask? Using a serial console. A serial console is basically using another machine to act as the main display and keyboard for a @@ -4355,8 +4313,8 @@ Please press any key to reboot.</screen> <primary><command>mount</command></primary> </indexterm> <para>If you were to boot into the USB stick that you just - made, FreeBSD would boot into its normal install mode. We - want FreeBSD to boot into a serial console for our + made, &os; would boot into its normal install mode. We + want &os; to boot into a serial console for our install. To do this, you have to mount the USB disk onto your &os; system using the &man.mount.8; command.</para> @@ -4466,11 +4424,6 @@ Please press any key to reboot.</screen> <screen>&prompt.root; <userinput>cu -l /dev/cuau0</userinput></screen> - <para>On &os; 7.<replaceable>X</replaceable> use the following command - instead:</para> - - <screen>&prompt.root; <userinput>cu -l /dev/cuad0</userinput></screen> - </step> </procedure> @@ -4478,7 +4431,7 @@ Please press any key to reboot.</screen> through your <command>cu</command> session. It will load the kernel and then it will come up with a selection of what kind of terminal to use. Select the - FreeBSD color console and proceed with your install!</para> + &os; color console and proceed with your install!</para> </sect2> </sect1> @@ -4487,13 +4440,13 @@ Please press any key to reboot.</screen> <title>Preparing Your Own Installation Media</title> <note> - <para>To prevent repetition, <quote>FreeBSD disc</quote> in this context - means a FreeBSD CDROM or DVD that you have purchased or produced + <para>To prevent repetition, <quote>&os; disc</quote> in this context + means a &os; CDROM or DVD that you have purchased or produced yourself.</para> </note> <para>There may be some situations in which you need to create your own - FreeBSD installation media and/or source. This might be physical media, + &os; installation media and/or source. This might be physical media, such as a tape, or a source that <application>sysinstall</application> can use to retrieve the files, such as a local FTP site, or an &ms-dos; partition.</para> @@ -4503,16 +4456,16 @@ Please press any key to reboot.</screen> <itemizedlist> <listitem> <para>You have many machines connected to your local network, and one - FreeBSD disc. You want to create a local FTP site using the - contents of the FreeBSD disc, and then have your machines use this + &os; disc. You want to create a local FTP site using the + contents of the &os; disc, and then have your machines use this local FTP site instead of needing to connect to the Internet.</para> </listitem> <listitem> - <para>You have a FreeBSD disc, and FreeBSD does not recognize your + <para>You have a &os; disc, and &os; does not recognize your CD/DVD drive, but &ms-dos; / &windows; does. You want to copy the - FreeBSD installation files to a &ms-dos; partition on the same - computer, and then install FreeBSD using those files.</para> + &os; installation files to a &ms-dos; partition on the same + computer, and then install &os; using those files.</para> </listitem> <listitem> @@ -4524,19 +4477,19 @@ Please press any key to reboot.</screen> <listitem> <para>You want to create a tape that can be used to install - FreeBSD.</para> + &os;.</para> </listitem> </itemizedlist> <sect2 id="install-cdrom"> <title>Creating an Installation CDROM</title> - <para>As part of each release, the FreeBSD project makes available at + <para>As part of each release, the &os; project makes available at least two CDROM images (<quote>ISO images</quote>) per supported architecture. These images can be written (<quote>burned</quote>) to CDs if you have a CD writer, and then used - to install FreeBSD. If you have a CD writer, and bandwidth is cheap, - then this is the easiest way to install FreeBSD.</para> + to install &os;. If you have a CD writer, and bandwidth is cheap, + then this is the easiest way to install &os;.</para> <procedure> <step> @@ -4549,7 +4502,7 @@ Please press any key to reboot.</screen> <para>That directory will normally contain the following images:</para> <table frame="none"> - <title>FreeBSD 7.<replaceable>X</replaceable> and 8.<replaceable>X</replaceable> + <title>&os; 8.<replaceable>X</replaceable> ISO Image Names and Meanings</title> <tgroup cols="2"> @@ -4576,7 +4529,7 @@ Please press any key to reboot.</screen> <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-dvd1.iso.gz</filename></entry> <entry>This DVD image contains everything necessary to - install the base FreeBSD operating system, a + install the base &os; operating system, a collection of pre-built packages, and the documentation. It also supports booting into a <quote>livefs</quote> based rescue mode.</entry> @@ -4590,7 +4543,7 @@ Please press any key to reboot.</screen> off USB drives. It also supports booting into a <quote>livefs</quote> based rescue mode. The documentation packages are provided but no other - packages. This image is not available for &os; 7.<replaceable>X</replaceable>.</entry> + packages.</entry> </row> <row> @@ -4635,14 +4588,6 @@ Please press any key to reboot.</screen> </tgroup> </table> - <note> - <para>&os; 7.<replaceable>X</replaceable> releases before - &os; 7.3 and &os; 8.0 used a - different naming convention. The names of their ISO - images are not prefixed with - <literal>&os;-</literal>.</para> - </note> - <para>You <emphasis>must</emphasis> download one of either the <literal>bootonly</literal> ISO image, or the image of <literal>disc1</literal>. Do not download @@ -4670,7 +4615,7 @@ Please press any key to reboot.</screen> <title>Write the CDs</title> <para>You must then write the CD images to disc. If you will be - doing this on another FreeBSD system then see + doing this on another &os; system then see <xref linkend="creating-cds"/> for more information (in particular, <xref linkend="burncd"/> and <xref linkend="cdrecord"/>).</para> @@ -4683,14 +4628,14 @@ Please press any key to reboot.</screen> </procedure> <note><para>If you are interested in building a customized - release of FreeBSD, please see the <ulink + release of &os;, please see the <ulink url="&url.articles.releng;">Release Engineering Article</ulink>.</para></note> </sect2> <sect2 id="install-ftp"> - <title>Creating a Local FTP Site with a FreeBSD Disc</title> + <title>Creating a Local FTP Site with a &os; Disc</title> <indexterm> <primary>installation</primary> @@ -4698,13 +4643,13 @@ Please press any key to reboot.</screen> <tertiary>FTP</tertiary> </indexterm> - <para>FreeBSD discs are laid out in the same way as the FTP site. This + <para>&os; discs are laid out in the same way as the FTP site. This makes it very easy for you to create a local FTP site that can be used - by other machines on your network when installing FreeBSD.</para> + by other machines on your network when installing &os;.</para> <procedure> <step> - <para>On the FreeBSD computer that will host the FTP site, ensure + <para>On the &os; computer that will host the FTP site, ensure that the CDROM is in the drive, and mounted on <filename>/cdrom</filename>.</para> @@ -4782,7 +4727,7 @@ Please press any key to reboot.</screen> the use of improperly formatted media, which is why we are making a point of it now.</para> - <para>If you are creating the floppies on another FreeBSD machine, + <para>If you are creating the floppies on another &os; machine, a format is still not a bad idea, though you do not need to put a &ms-dos; filesystem on each floppy. You can use the <command>bsdlabel</command> and <command>newfs</command> @@ -4835,7 +4780,7 @@ Please press any key to reboot.</screen> reproduced within this directory, so we suggest using the &ms-dos; <command>xcopy</command> command if you are copying it from a CD. For example, to prepare for a minimal installation of - FreeBSD:</para> + &os;:</para> <screen><prompt>C:\></prompt> <userinput>md c:\freebsd</userinput> <prompt>C:\></prompt> <userinput>xcopy e:\bin c:\freebsd\bin\ /s</userinput> @@ -4914,12 +4859,12 @@ Please press any key to reboot.</screen> Parallel port (PLIP (laplink cable)).</para> <para>For the fastest possible network installation, an - Ethernet adapter is always a good choice! FreeBSD supports most + Ethernet adapter is always a good choice! &os; supports most common PC Ethernet cards; a table of supported cards (and their required settings) is provided in the Hardware Notes for each - release of FreeBSD. If you are using one of the supported PCMCIA + release of &os;. If you are using one of the supported PCMCIA Ethernet cards, also be sure that it is plugged in - <emphasis>before</emphasis> the laptop is powered on! FreeBSD does + <emphasis>before</emphasis> the laptop is powered on! &os; does not, unfortunately, currently support hot insertion of PCMCIA cards during installation.</para> @@ -4957,7 +4902,7 @@ Please press any key to reboot.</screen> If you have problems, logging can be directed to the screen using the command <command>set log local ...</command>.</para> - <para>If a hard-wired connection to another FreeBSD + <para>If a hard-wired connection to another &os; machine is available, you might also consider installing over a <quote>laplink</quote> parallel port cable. The data rate over the parallel port is much higher than what is typically @@ -4973,7 +4918,7 @@ Please press any key to reboot.</screen> <tertiary>NFS</tertiary> </indexterm> <para>The NFS installation is fairly straight-forward. Simply - copy the FreeBSD distribution files you want onto an NFS server + copy the &os; distribution files you want onto an NFS server and then point the NFS media selection at it.</para> <para>If this server supports only <quote>privileged port</quote> @@ -4988,14 +4933,14 @@ Please press any key to reboot.</screen> <para>In order for NFS installation to work, the server must support subdir mounts, for example, if your - FreeBSD &rel.current; distribution directory lives on: + &os; &rel.current; distribution directory lives on: <filename>ziggy:/usr/archive/stuff/FreeBSD</filename>, then <hostid>ziggy</hostid> will have to allow the direct mounting of <filename>/usr/archive/stuff/FreeBSD</filename>, not just <filename>/usr</filename> or <filename>/usr/archive/stuff</filename>.</para> - <para>In FreeBSD's <filename>/etc/exports</filename> file, this + <para>In &os;'s <filename>/etc/exports</filename> file, this is controlled by the <option>-alldirs</option> options. Other NFS servers may have different conventions. If you are getting <errorname>permission denied</errorname> messages from the diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml index 7d6484e492..91f3cf6293 100644 --- a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml @@ -818,7 +818,7 @@ <variablelist> <varlistentry> - <term>The SVN and CVS repositories<anchor + <term>The SVN repositories<anchor id="development-cvs-repository"/></term> <listitem> <indexterm> @@ -862,35 +862,13 @@ Project and Ports Collection repositories also moved from <application>CVS</application> to <application>SVN</application> in May 2012 and July - 2012, respectively.</para> - - <para>While the <literal>src/</literal> and - <literal>ports/</literal> repositories now use - <application>SVN</application>, client side tools like - <application>csup</application> that depend on the older - <application>CVS</application> infrastructure, continue - to work normally — changes in the - <application>SVN</application> repository are backported - to <application>CVS</application> for this purpose. - Unlike <literal>src/</literal> and - <literal>ports/</literal>, - the documentation <application>SVN</application> - repository is not backported to - <application>CVS</application>.</para> - - <para>The primary <application>CVS</application> - <ulink - url="http://www.FreeBSD.org/cgi/cvsweb.cgi">repository</ulink> - resides on a machine in Santa Clara CA, USA - from where it is replicated to numerous mirror machines - throughout the world. The - <application>SVN</application> tree, which contains the - <link linkend="current">-CURRENT</link> and <link - linkend="stable">-STABLE</link> trees, can all be - easily replicated to your own machine as well. Please + 2012, respectively. Please refer to the <link linkend="synching">Synchronizing your source tree</link> section for more information on - doing this.</para> + obtaining the &os; <literal>src/</literal> repository + and <link linkend="ports-using">Using the Ports + Collection</link> for details on obtaining the &os; + Ports Collection.</para> </listitem> </varlistentry> diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml index 266d0b2b3c..6916d30bfc 100644 --- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml @@ -603,7 +603,7 @@ cpu I686_CPU</programlisting> <para>This option enables Soft Updates in the kernel which helps to speed up write access on the disks. Even when this functionality is provided by the kernel, it must be turned on - for specific disks. Review the output so &man.mount.8; to + for specific disks. Review the output of &man.mount.8; to determine if Soft Updates is enabled. If the <literal>soft-updates</literal> option is not in the output, it can be activated using &man.tunefs.8; for existing file systems @@ -1019,17 +1019,6 @@ device sc</programlisting> enable support for AGP and AGP GART for boards which have these features.</para> - <indexterm> - <primary>APM</primary> - </indexterm> - - <programlisting># Power management support (see NOTES for more options) -#device apm</programlisting> - - <para>Advanced Power Management (<acronym>APM</acronym> support. - Useful for laptops, although this is disabled in - <filename>GENERIC</filename> by default.</para> - <programlisting># Add suspend/resume support for the i8254. device pmtimer</programlisting> diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml index 96715bb8d3..a2a1fa0f94 100644 --- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml @@ -28,7 +28,7 @@ </authorgroup> </chapterinfo> - <title>Linux Binary Compatibility</title> + <title>&linux; Binary Compatibility</title> <sect1 id="linuxemu-synopsis"> <title>Synopsis</title> @@ -40,58 +40,40 @@ <secondary>Linux</secondary> </indexterm> - <para>FreeBSD provides binary compatibility with several other - &unix; like operating systems, including Linux. At this point, - you may be asking yourself why exactly, does - FreeBSD need to be able to run Linux binaries? The answer to - that question is quite simple. Many companies and developers - develop only for Linux, since it is the latest <quote>hot - thing</quote> in the computing world. That leaves the rest - of us FreeBSD users bugging these same companies and developers - to put out native FreeBSD versions of their applications. The - problem is, that most of these companies do not really realize - how many people would use their product if there were FreeBSD - versions too, and most continue to only develop for Linux. - So what is a FreeBSD user to do? This is where the Linux binary - compatibility of FreeBSD comes into play.</para> - - <para>In a nutshell, the compatibility allows FreeBSD users to - run about 90% of all Linux applications without modification. - This includes applications such as - <application>&staroffice;</application>, the Linux version of - <application>&adobe; &acrobat;</application>, - <application>&realplayer;</application>, - <application>&oracle;</application>, - <application>Doom</application>, - <application>Quake</application>, and more. It is also reported - that in some situations, Linux binaries perform better on - FreeBSD than they do under Linux.</para> - - <para>There are, however, some Linux-specific operating system - features that are not supported under FreeBSD. Linux binaries - will not work on FreeBSD if they overly use &i386; specific + <para>&os; provides binary compatibility with &linux;, allowing + users to install and run &linux; binaries on a &os; system. + Many companies and developers develop only for &linux;, and + binary compatibility allows &os; users to run about 90% of all + &linux; applications without modification. This includes + productivity applications, games, and more. It has even been + reported that, in some situations, &linux; binaries perform + better on &os; than they do on &linux;.</para> + + <para>However, some &linux;-specific operating system features + are not supported under &os;. For example, &linux; binaries + will not work on &os; if they overly use &i386; specific calls, such as enabling virtual 8086 mode.</para> <para>After reading this chapter, you will know:</para> <itemizedlist> <listitem> - <para>How to enable Linux binary compatibility on your + <para>How to enable &linux; binary compatibility on a &os; system.</para> </listitem> <listitem> - <para>How to install additional Linux shared + <para>How to install additional &linux; shared libraries.</para> </listitem> <listitem> - <para>How to install Linux applications on your FreeBSD + <para>How to install &linux; applications on a &os; system.</para> </listitem> <listitem> - <para>The implementation details of Linux compatibility in - FreeBSD.</para> + <para>The implementation details of &linux; compatibility in + &os;.</para> </listitem> </itemizedlist> @@ -99,8 +81,8 @@ <itemizedlist> <listitem> - <para>Know how to install additional third-party - software (<xref linkend="ports"/>).</para> + <para>Know how to install <link linkend="ports">additional + third-party software</link>.</para> </listitem> </itemizedlist> @@ -109,25 +91,35 @@ <sect1 id="linuxemu-lbc-install"> <title>Installation</title> - <indexterm><primary>KLD (kernel loadable - object)</primary></indexterm> + <indexterm><primary>Ports Collection</primary></indexterm> - <para>Linux binary compatibility is not turned on by default. The - easiest way to enable this functionality is to load the - <literal>linux</literal> KLD object (<quote>Kernel LoaDable - object</quote>). You can load this module by typing the - following as <username>root</username>:</para> + <para>&linux; libararies are not installed on &os; by default + and &linux; binary compatibility is not enabled by default. + &linux; libraries can be installed using the &os; Ports + Collection. Alternately, &linux; libraries can be installed + <link linkend="linuxemu-libs-manually">manually</link>.</para> - <screen>&prompt.root; <userinput>kldload linux</userinput></screen> + <para>Using the Ports Collection is by far the easiest way to + install &linux; libraries:</para> - <para>If you would like Linux compatibility to always be enabled, - then you should add the following line to + <screen>&prompt.root; <userinput>cd +/usr/ports/emulators/linux_base-f10</userinput> &prompt.root; <userinput>make install distclean</userinput></screen> + + <para>Once the port is installed, enable &linux; binary + compatibility by loading the <literal>linux</literal> + module. Type the following as + <username>root</username>:</para> + + <screen>&prompt.root; <userinput>kldload linux</userinput></screen> + + <para>In order for &linux; compatibility to always be enabled at + boot time, add the following line to <filename>/etc/rc.conf</filename>:</para> <programlisting>linux_enable="YES"</programlisting> - <para>The &man.kldstat.8; command can be used to verify that the - KLD is loaded:</para> + <para>To verify that the module is loaded, use + &man.kldstat.8;:</para> <screen>&prompt.user; <userinput>kldstat</userinput> Id Refs Address Size Name @@ -139,112 +131,59 @@ Id Refs Address Size Name <secondary>COMPAT_LINUX</secondary> </indexterm> - <para>If for some reason you do not want to or cannot load the - KLD, then you may statically link Linux binary compatibility - into the kernel by adding <literal>options - COMPAT_LINUX</literal> to your kernel configuration file. - Then install your new kernel as described in - <xref linkend="kernelconfig"/>.</para> - - <sect2> - <title>Installing Linux Runtime Libraries</title> - - <indexterm> - <primary>Linux</primary> - <secondary>installing Linux libraries</secondary> - </indexterm> - - <para>This can be done one of two ways, either by using the - <link linkend="linuxemu-libs-port">linux_base</link> port, or - by installing them <link - linkend="linuxemu-libs-manually">manually</link>.</para> - - <sect3 id="linuxemu-libs-port"> - <title>Installing Using the linux_base Port</title> - - <indexterm><primary>Ports Collection</primary></indexterm> - - <para>This is by far the easiest method to use when installing - the runtime libraries. It is just like installing any other - port from the <link linkend="ports">Ports - Collection</link>:</para> - - <screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base-f10</userinput> -&prompt.root; <userinput>make install distclean</userinput></screen> - - <note> - <para>On &os; systems prior to &os; 8.0, you will have - to use the <filename - role="package">emulators/linux_base-fc4</filename> port - instead of <filename - role="package">emulators/linux_base-f10</filename>.</para> - </note> - - <para>You should now have working Linux binary compatibility. - Some programs may complain about incorrect minor versions - of the system libraries. In general, however, this does - not seem to be a problem.</para> - - <note><para>There may be multiple versions of the <filename - role="package">emulators/linux_base</filename> port - available, corresponding to different versions of various - Linux distributions. You should install the port most - closely resembling the requirements of the Linux - applications you would like to install.</para></note> - - </sect3> - - <sect3 id="linuxemu-libs-manually"> - <title>Installing Libraries Manually</title> - - <para>If you do not have the <quote>ports</quote> collection - installed, you can install the libraries by hand instead. - You will need the Linux shared libraries that the program - depends on and the runtime linker. Also, you will need to - create a <quote>shadow root</quote> directory, - <filename>/compat/linux</filename>, for Linux libraries - on your FreeBSD system. Any shared libraries opened by - Linux programs run under FreeBSD will look in this tree - first. So, if a Linux program loads, for example, - <filename>/lib/libc.so</filename>, FreeBSD will first try - to open <filename>/compat/linux/lib/libc.so</filename>, - and if that does not exist, it will then try - <filename>/lib/libc.so</filename>. Shared libraries should - be installed in the shadow tree - <filename>/compat/linux/lib</filename> rather than the paths - that the Linux <command>ld.so</command> reports.</para> - - <para>Generally, you will need to look for the shared - libraries that Linux binaries depend on only the first few - times that you install a Linux program on your FreeBSD - system. After a while, you will have a sufficient set of - Linux shared libraries on your system to be able to run - newly imported Linux binaries without any extra work.</para> - </sect3> + <para>Users who prefer to statically link &linux; binary + compatibility into the kernel should add <literal>options + COMPAT_LINUX</literal> to the custom kernel configuration + file. Compile and install the new kernel as described in <link + linkend="kernelconfig"></link>.</para> + + <sect2 id="linuxemu-libs-manually"> + <title>Installing Libraries Manually</title> + + <para>While using the Ports Collection is recommended, &linux; + libraries can be installed manually. The &linux; shared + libraries required by a program and the runtime linker + should be copied to <filename + class="directory">/compat/linux</filename>. Any shared + libraries opened by &linux; programs run under &os; will + look in this directory first. For example, if a &linux; + program loads <filename>/lib/libc.so</filename>, &os; will + first try to open + <filename>/compat/linux/lib/libc.so</filename>, and if that + does not exist, it will then try + <filename>/lib/libc.so</filename>. Shared libraries should + be installed to <filename + class="directory">/compat/linux/lib</filename> rather than + to the paths that the &linux; <command>ld.so</command> + reports.</para> + + <para>Generally, one will need to look for the shared + libraries that &linux; binaries depend on only the first few + times that a &linux; program is installed on &os;. After a + while, there will be a sufficient set of &linux; shared + libraries on the system to be able to run newly imported + &linux; binaries without any extra work.</para> <sect3> <title>How to Install Additional Shared Libraries</title> <indexterm><primary>shared libraries</primary></indexterm> - <para>What if you install the <filename>linux_base</filename> - port and your application still complains about missing - shared libraries? How do you know which shared libraries - Linux binaries need, and where to get them? Basically, - there are 2 possibilities (when following these instructions - you will need to be <username>root</username> on your - FreeBSD system).</para> + <para>If the <literal>linux_base</literal> port is installed + and an application still complains about missing shared + libraries, there are two methods <username>root</username> + can use to determine which shared libraries the &linux; + binaries need.</para> - <para>If you have access to a Linux system, see what shared - libraries the application needs, and copy them to your - FreeBSD system. Look at the following example:</para> + <para>If a &linux; system is available, determine which shared + libraries the application needs, and copy them to the &os; + system.</para> <informalexample> - <para>Let us assume you used FTP to get the Linux binary - of <application>Doom</application>, and put it on a Linux - system you have access to. You then can check which - shared libraries it needs by running - <command>ldd linuxdoom</command>, like so:</para> + <para>In this example, FTP was used to download the &linux; + binary of <application>Doom</application> on a &linux; + system . To check which shared libraries it needs, run + <command>ldd linuxdoom</command>:</para> <screen>&prompt.user; <userinput>ldd linuxdoom</userinput> libXt.so.3 (DLL Jump 3.1) => /usr/X11/lib/libXt.so.3.1.0 @@ -252,12 +191,11 @@ libX11.so.3 (DLL Jump 3.1) => /usr/X11/lib/libX11.so.3.1.0 libc.so.4 (DLL Jump 4.5pl26) => /lib/libc.so.4.6.29</screen> <indexterm><primary>symbolic links</primary></indexterm> - <para>You would need to get all the files from the last - column, and put them under - <filename>/compat/linux</filename>, with the names in - the first column as symbolic links pointing to them. - This means you eventually have these files on your - FreeBSD system:</para> + <para>Copy all the files in the last column into + <filename class="directory">/compat/linux</filename> on + the &os; system, with the names in the first column as + symbolic links pointing to them. This example will result + in the following files on the &os; system:</para> <screen>/compat/linux/usr/X11/lib/libXt.so.3.1.0 /compat/linux/usr/X11/lib/libXt.so.3 -> libXt.so.3.1.0 @@ -268,33 +206,31 @@ libc.so.4 (DLL Jump 4.5pl26) => /lib/libc.so.4.6.29</screen> <blockquote> <note> - <para>Note that if you already have a Linux shared - library with a matching major revision number to the - first column of the <command>ldd</command> output, - you will not need to copy the file named in the last - column to your system, the one you already have should - work. It is advisable to copy the shared library - anyway if it is a newer version, though. You can - remove the old one, as long as you make the symbolic - link point to the new one. So, if you have these - libraries on your system:</para> + <para>If a &linux; shared library already exists with a + matching major revision number to the first column of + the <command>ldd</command> output, it does not need to + be copied to the file named in the last column, as the + existing library should work. It is advisable to copy + the shared library if it is a newer version, though. + The old one can be removed, as long as the symbolic + link points to the new one. For example, these + libraries exist on the system:</para> <screen>/compat/linux/lib/libc.so.4.6.27 /compat/linux/lib/libc.so.4 -> libc.so.4.6.27</screen> - <para>and you find a new binary that claims to require a - later version according to the output of + <para>and a binary claims to require a later version + according to the output of <command>ldd</command>:</para> <screen>libc.so.4 (DLL Jump 4.5pl26) -> libc.so.4.6.29</screen> <para>If it is only one or two versions out of date - in the trailing digit then do not worry about copying - <filename>/lib/libc.so.4.6.29</filename> too, because + in the trailing digit, do not worry about copying + <filename>/lib/libc.so.4.6.29</filename>, because the program should work fine with the slightly older - version. However, if you like, you can decide to - replace the <filename>libc.so</filename> anyway, and - that should leave you with:</para> + version. However, it is safe to replace the + <filename>libc.so</filename>:</para> <screen>/compat/linux/lib/libc.so.4.6.29 /compat/linux/lib/libc.so.4 -> libc.so.4.6.29</screen> @@ -304,10 +240,9 @@ libc.so.4 (DLL Jump 4.5pl26) => /lib/libc.so.4.6.29</screen> <blockquote> <note> <para>The symbolic link mechanism is - <emphasis>only</emphasis> needed for Linux binaries. - The FreeBSD runtime linker takes care of looking for - matching major revision numbers itself and you do not - need to worry about it.</para> + <emphasis>only</emphasis> needed for &linux; binaries + as the &os; runtime linker takes care of looking for + matching major revision numbers.</para> </note> </blockquote> </informalexample> @@ -315,7 +250,7 @@ libc.so.4 (DLL Jump 4.5pl26) => /lib/libc.so.4.6.29</screen> </sect2> <sect2> - <title>Installing Linux ELF Binaries</title> + <title>Installing &linux; ELF Binaries</title> <indexterm> <primary>Linux</primary> @@ -323,69 +258,71 @@ libc.so.4 (DLL Jump 4.5pl26) => /lib/libc.so.4.6.29</screen> </indexterm> <para>ELF binaries sometimes require an extra step of - <quote>branding</quote>. If you attempt to run an unbranded - ELF binary, you will get an error message like the + <quote>branding</quote>. If an unbranded ELF binary is + executed, it will generate an error message like the following:</para> <screen>&prompt.user; <userinput>./my-linux-elf-binary</userinput> ELF binary type not known Abort</screen> - <para>To help the FreeBSD kernel distinguish between a FreeBSD - ELF binary and a Linux binary, use the &man.brandelf.1; - utility.</para> + <para>To help the &os; kernel distinguish between a &os; + ELF binary and a &linux; binary, use &man.brandelf.1;:</para> <screen>&prompt.user; <userinput>brandelf -t Linux my-linux-elf-binary</userinput></screen> <indexterm><primary>GNU toolchain</primary></indexterm> - <para>The GNU toolchain now places the appropriate branding - information into ELF binaries automatically, so this step - should become increasingly unnecessary in the future.</para> + <para>Since the GNU toolchain places the appropriate branding + information into ELF binaries automatically, this step is + usually not necessary.</para> </sect2> <sect2> - <title>Installing a Random Linux RPM Based Application</title> + <title>Installing a &linux; RPM Based Application</title> - <para>FreeBSD has its own package database and it is used to - track all ports (&linux; ports as well). So the &linux; RPM - database is not used (not supported).</para> + <para>&os; uses its own package database to track all software + installed from the Ports Collection. However, the &linux; RPM + database is not supported.</para> - <para>However if you need to install a random &linux; - RPM-based application it can be achieved by:</para> + <para>In order to install a &linux; RPM-based application, first + install the <filename + role="package">archivers/rpm2cpio</filename> package or + port. Once installed, <username>root</username> can use this + command to install a <filename>.rpm</filename> as + follows:</para> <screen>&prompt.root; <userinput>cd /compat/linux</userinput> &prompt.root; <userinput>rpm2cpio -q < /path/to/linux.archive.rpm | cpio -id</userinput></screen> - <para>Then brandelf installed ELF binaries (not libraries!). - You will not be able to do a clean uninstall, but it may - help you to do tests.</para> + <para>If necessary, <command>brandelf</command> the installed + ELF binaries, but <emphasis>not</emphasis> the libraries. + Note that this will prevent a clean uninstall.</para> </sect2> <sect2> <title>Configuring the Hostname Resolver</title> - <para>If DNS does not work or you get this message:</para> + <para>If DNS does not work or this error appears:</para> <screen>resolv+: "bind" is an invalid keyword resolv+: "hosts" is an invalid keyword</screen> - <para>You will need to configure a - <filename>/compat/linux/etc/host.conf</filename> file - containing:</para> + <para>Configure + <filename>/compat/linux/etc/host.conf</filename> as + follows:</para> <programlisting>order hosts, bind multi on</programlisting> - <para>The order here specifies that + <para>This order specifies that <filename>/etc/hosts</filename> is searched first and DNS is searched second. When - <filename>/compat/linux/etc/host.conf</filename> is not - installed, Linux applications find FreeBSD's + <filename>/compat/linux/etc/host.conf</filename> does not + exist, &linux; applications use <filename>/etc/host.conf</filename> and complain about the - incompatible FreeBSD syntax. You should remove - <literal>bind</literal> if you have not configured a name - server using the <filename>/etc/resolv.conf</filename> - file.</para> + incompatible &os; syntax. Remove + <literal>bind</literal> if a name server is not configured + using <filename>/etc/resolv.conf</filename>.</para> </sect2> </sect1> @@ -406,47 +343,46 @@ multi on</programlisting> <secondary><application>Mathematica</application></secondary> </indexterm> - <para>This document describes the process of installing the Linux - version of <application>&mathematica; 5.X</application> onto - a FreeBSD system.</para> - - <para>The Linux version of - <application>&mathematica;</application> - or <application>&mathematica; for Students</application> can - be ordered directly from Wolfram at - <ulink url="http://www.wolfram.com/"></ulink>.</para> + <para>This section describes the process of installing the + &linux; version of <application>&mathematica; 5.X</application> + onto a &os; system. <application>&mathematica;</application> + is a commercial, computational software program used in + scientific, engineering, and mathematical fields. It is + available from <ulink + url="http://www.wolfram.com/mathematica/">Wolfram + Research</ulink>.</para> <sect2> <title>Running the &mathematica; Installer</title> - <para>First, you have to tell &os; that - <application>&mathematica;</application>'s Linux - binaries use the Linux ABI. The easiest way to do so is to - set the default ELF brand - to Linux for all unbranded binaries with the command:</para> + <para>First, tell &os; that + <application>&mathematica;</application>'s &linux; + binaries use the &linux; Application Binary Interface + <acronym>ABI</acronym>. The easiest way to do this is to + set the default ELF brand to &linux; for all unbranded + binaries with the command:</para> <screen>&prompt.root; <userinput>sysctl kern.fallback_elf_brand=3</userinput></screen> - <para>This will make &os; assume that unbranded ELF binaries - use the Linux ABI and so you should be able to run the - installer straight from the CDROM.</para> + <para>&os; will now assume that unbranded ELF binaries + use the &linux; <acronym>ABI</acronym> which should allow the + installer to execute from the CDROM.</para> - <para>Now, copy the file <filename>MathInstaller</filename> to - your hard drive:</para> + <para>Copy the <filename>MathInstaller</filename> to the hard + drive:</para> <screen>&prompt.root; <userinput>mount /cdrom</userinput> &prompt.root; <userinput>cp /cdrom/Unix/Installers/Linux/MathInstaller /localdir/</userinput></screen> - <para>and in this file, replace <literal>/bin/sh</literal> in - the first line by <literal>/compat/linux/bin/sh</literal>. - This makes sure that the installer is executed by the Linux + <para>In this file, replace <literal>/bin/sh</literal> in + the first line with <literal>/compat/linux/bin/sh</literal>. + This ensures that the installer is executed by the &linux; version of &man.sh.1;. Next, replace all occurrences of - <literal>Linux)</literal> by <literal>FreeBSD)</literal> with - a text editor or the script below in the next section. This - tells the <application>&mathematica;</application> installer, - who calls <command>uname -s</command> to determine the - operating system, to treat &os; as a Linux-like operating - system. Invoking <command>MathInstaller</command> will now + <literal>Linux)</literal> with <literal>FreeBSD)</literal> + using a text editor or the script below in the next section. + This tells the <application>&mathematica;</application> + installer, to treat &os; as a &linux;-like operating + system. Invoking <command>MathInstaller</command> should now install <application>&mathematica;</application>.</para> </sect2> @@ -455,17 +391,17 @@ multi on</programlisting> <para>The shell scripts that <application>&mathematica;</application> created during - installation have to be modified before you can use them. - If you chose <filename + installation have to be modified before use. When using + <filename class="directory">/usr/local/bin</filename> as the directory - to place the - <application>&mathematica;</application> executables in, you - will find symlinks in this directory to files called - <filename>math</filename>, <filename>mathematica</filename>, + for the <application>&mathematica;</application> + executables, symlinks in this directory will point to files + called <filename>math</filename>, + <filename>mathematica</filename>, <filename>Mathematica</filename>, and <filename>MathKernel</filename>. In each of these, replace - <literal>Linux)</literal> by <literal>FreeBSD)</literal> with - a text editor or the following shell script:</para> + <literal>Linux)</literal> with <literal>FreeBSD)</literal> + using a text editor or the following shell script:</para> <programlisting>#!/bin/sh cd /usr/local/bin @@ -478,90 +414,85 @@ done</programlisting> </sect2> <sect2> - <title>Obtaining Your &mathematica; Password</title> + <title>Obtaining a &mathematica; Password</title> <indexterm> <primary>Ethernet</primary> <secondary>MAC address</secondary> </indexterm> - <para>When you start <application>&mathematica;</application> - for the first time, you will be asked for a password. If you - have not yet obtained a password from Wolfram, run the program + <para>When <application>&mathematica;</application> is started + for the first time, it will ask for a password. If a password + had not yet been obtained from Wolfram Research, run <command>mathinfo</command> in the installation directory to - obtain your <quote>machine ID</quote>. This machine ID is - based solely on the MAC address of your first Ethernet card, - so you cannot run your copy of - <application>&mathematica;</application> on different - machines.</para> - - <para>When you register with Wolfram, either by email, phone - or fax, you will give them the <quote>machine ID</quote> and - they will respond with a corresponding password consisting - of groups of numbers.</para> + obtain the <quote>machine ID</quote>. This machine ID is + based solely on the MAC address of the first Ethernet card, + as the copy of <application>&mathematica;</application> cannot + run on different machines.</para> + + <para>When registering with Wolfram Research, provide the + <quote>machine ID</quote> and they will respond with a + corresponding password consisting of groups of numbers.</para> </sect2> <sect2> <title>Running the &mathematica; Frontend over a Network</title> <para><application>&mathematica;</application> uses some special - fonts to display characters not - present in any of the standard font sets (integrals, sums, - Greek letters, etc.). The X protocol requires these fonts - to be install <emphasis>locally</emphasis>. This means you - will have to copy these fonts from the CDROM or from a host - with <application>&mathematica;</application> installed to - your local machine. These fonts are normally stored in - <filename>/cdrom/Unix/Files/SystemFiles/Fonts</filename> on - the CDROM, or - <filename>/usr/local/mathematica/SystemFiles/Fonts</filename> - on your hard drive. The actual fonts are in the - subdirectories <filename>Type1</filename> and - <filename>X</filename>. There are several ways to use them, - as described below.</para> - - <para>The first way is to copy them into one of the existing - font directories in - <filename>/usr/X11R6/lib/X11/fonts</filename>. This will - require editing the <filename>fonts.dir</filename> file, - adding the font names to it, and changing the number of fonts - on the first line. Alternatively, you should also just be - able to run &man.mkfontdir.1; in the directory you have copied - them to.</para> + fonts to display characters not present in any of the standard + font sets. <application>Xorg</application> requires these + fonts to be installed locally. This means that these fonts + need to be copied from the CDROM or from a host with + <application>&mathematica;</application> installed to the + local machine. These fonts are normally stored in + <filename + class="directory">/cdrom/Unix/Files/SystemFiles/Fonts</filename> + on the CDROM, or <filename + class="directory">/usr/local/mathematica/SystemFiles/Fonts</filename> + on the hard drive. The actual fonts are in the subdirectories + <filename class="directory">Type1</filename> and + <filename class="directory">X</filename>. There are several + ways to use them, as described below.</para> + + <para>The first way is to copy the fonts into one of the + existing font directories in <filename + class="directory">/usr/local/lib/X11/fonts</filename> then + running &man.mkfontdir.1; within the directory containing the + new fonts.</para> <para>The second way to do this is to copy the directories to - <filename>/usr/X11R6/lib/X11/fonts</filename>:</para> + <filename + class="directory">/usr/local/lib/X11/fonts</filename>:</para> - <screen>&prompt.root; <userinput>cd /usr/X11R6/lib/X11/fonts</userinput> + <screen>&prompt.root; <userinput>cd /usr/local/lib/X11/fonts</userinput> &prompt.root; <userinput>mkdir X</userinput> &prompt.root; <userinput>mkdir MathType1</userinput> &prompt.root; <userinput>cd /cdrom/Unix/Files/SystemFiles/Fonts</userinput> -&prompt.root; <userinput>cp X/* /usr/X11R6/lib/X11/fonts/X</userinput> -&prompt.root; <userinput>cp Type1/* /usr/X11R6/lib/X11/fonts/MathType1</userinput> -&prompt.root; <userinput>cd /usr/X11R6/lib/X11/fonts/X</userinput> +&prompt.root; <userinput>cp X/* /usr/local/lib/X11/fonts/X</userinput> +&prompt.root; <userinput>cp Type1/* /usr/local/lib/X11/fonts/MathType1</userinput> +&prompt.root; <userinput>cd /usr/local/lib/X11/fonts/X</userinput> &prompt.root; <userinput>mkfontdir</userinput> &prompt.root; <userinput>cd ../MathType1</userinput> &prompt.root; <userinput>mkfontdir</userinput></screen> - <para>Now add the new font directories to your font path:</para> + <para>Now add the new font directories to the font path:</para> - <screen>&prompt.root; <userinput>xset fp+ /usr/X11R6/lib/X11/fonts/X</userinput> -&prompt.root; <userinput>xset fp+ /usr/X11R6/lib/X11/fonts/MathType1</userinput> + <screen>&prompt.root; <userinput>xset fp+ /usr/local/lib/X11/fonts/X</userinput> +&prompt.root; <userinput>xset fp+ /usr/local/lib/X11/fonts/MathType1</userinput> &prompt.root; <userinput>xset fp rehash</userinput></screen> - <para>If you are using the <application>&xorg;</application> - server, you can have these font directories loaded - automatically by adding them to your - <filename>xorg.conf</filename> file.</para> + <para>When using the <application>&xorg;</application> server, + these font directories can be loaded automatically by adding + them to <filename>/etc/X11/xorg.conf</filename>.</para> <indexterm><primary>fonts</primary></indexterm> - <para>If you <emphasis>do not</emphasis> already have a - directory called - <filename>/usr/X11R6/lib/X11/fonts/Type1</filename>, you - can change the name of the <filename>MathType1</filename> - directory in the example above to - <filename>Type1</filename>.</para> + <para>If <filename + class="directory">/usr/local/lib/X11/fonts/Type1</filename> + does not already exist, change the name of the <filename + class="directory">MathType1</filename> directory in the + example above to <filename + class="directory">Type1</filename>.</para> </sect2> </sect1> @@ -593,11 +524,11 @@ done</programlisting> <para><application>&maple;</application> is a commercial mathematics program similar to - <application>&mathematica;</application>. You must purchase - this software from <ulink - url="http://www.maplesoft.com/"></ulink> and then register - there for a license file. To install this software on FreeBSD, - please follow these simple steps.</para> + <application>&mathematica;</application>. This software must be + purchased and licensed from <ulink + url="http://www.maplesoft.com/products/maple/">Maplesoft</ulink>. + To install the &linux; version of this software on &os;, follow + these steps.</para> <procedure> <step><para>Execute the <filename>INSTALL</filename> shell @@ -607,23 +538,25 @@ done</programlisting> might be <filename class="directory">/usr/local/maple</filename>.</para></step> - <step><para>If you have not done so, order a license for - <application>&maple;</application> from Maple Waterloo - Software (<ulink - url="http://register.maplesoft.com/"></ulink>) and copy it - to - <filename>/usr/local/maple/license/license.dat</filename>.</para></step> + <step> + <para>Copy the license to + <filename>/usr/local/maple/license/license.dat</filename>.</para> + </step> - <step><para>Install the <application>FLEXlm</application> - license manager by running the + <step> + <para>Install the <application>FLEXlm</application> license + manager by running the <filename>INSTALL_LIC</filename> install shell script that - comes with <application>&maple;</application>. Specify the - primary hostname for your machine for the license - server.</para></step> + comes with <application>&maple;</application>. Specify + the primary hostname for the machine for the license + server.</para> + </step> - <step><para>Patch the + <step> + <para>Patch <filename>/usr/local/maple/bin/maple.system.type</filename> - file with the following:</para> + with the following:</para> + <programlisting> ----- snip ------------------ *** maple.system.type.orig Sun Jul 8 16:35:33 2001 --- maple.system.type Sun Jul 8 16:35:51 2001 @@ -639,12 +572,11 @@ done</programlisting> # We have two Linux implementations, one for Red Hat and ----- snip end of patch -----</programlisting> - <para>Please note that after the - <literal>"FreeBSD"|\</literal> no other whitespace should - be present.</para> + <para>Note that no whitespace should be present after + <literal>"FreeBSD"|\</literal>.</para> <para>This patch instructs <application>&maple;</application> - to recognize <quote>FreeBSD</quote> as a type of Linux + to recognize &os; as a type of &linux; system. The <filename>bin/maple</filename> shell script calls the <filename>bin/maple.system.type</filename> shell script which in turn calls <command>uname -a</command> to @@ -660,7 +592,7 @@ done</programlisting> <programlisting> ----- snip ------------ #! /bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin PATH=${PATH}:/usr/local/maple/bin:/usr/local/maple/FLEXlm/UNIX/LINUX export PATH @@ -685,14 +617,14 @@ exit 0 ----- snip ------------</programlisting></step> - <step><para>Test-start - <application>&maple;</application>:</para> + <step><para>Test that + <application>&maple;</application> starts:</para> <screen>&prompt.user; <userinput>cd /usr/local/maple/bin</userinput> &prompt.user; <userinput>./xmaple</userinput></screen> - <para>You should be up and running. Make sure to write - Maplesoft to let them know you would like a native FreeBSD + <para>Once everything is working, consider writing + Maplesoft to let them know you would like a native &os; version!</para></step> </procedure> @@ -700,14 +632,8 @@ exit 0 <title>Common Pitfalls</title> <itemizedlist> - <listitem><para>The <application>FLEXlm</application> - license manager can be a difficult tool to work with. - Additional documentation on the subject can be found at - <ulink - url="http://www.globetrotter.com/"></ulink>.</para></listitem> - - <listitem><para><command>lmgrd</command> is known to be very - picky about the license file and to core dump if there + <listitem><para><command>lmgrd</command> is known to be + picky about the license file and to dump core if there are any problems. A correct license file should look like this:</para> @@ -724,12 +650,15 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \ ISSUED=11-may-2000 NOTICE=" Technische Universitat Wien" \ SN=XXXXXXXXX</programlisting> - <note><para>Serial number and key 'X''ed out. - <hostid>chillig</hostid> is a hostname.</para></note> + <note> + <para>In this example, the serial number and key were + replaced with <literal>X</literal>. + <hostid>chillig</hostid> is the hostname.</para> + </note> - <para>Editing the license file works as long as you do not - touch the <quote>FEATURE</quote> line (which is protected - by the license key).</para></listitem> + <para>Editing the license file works as long as the + <quote>FEATURE</quote> line is not edited. That line is + protected by the license key.</para></listitem> </itemizedlist> </sect2> </sect1> @@ -752,41 +681,38 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \ <secondary><application>MATLAB</application></secondary> </indexterm> - <para>This document describes the process of installing the Linux - version of <application>&matlab; version 6.5</application> onto - a &os; system. It works quite well, with the exception of the - <application>&java.virtual.machine;</application> (see - <xref linkend="matlab-jre"/>).</para> + <para>This document describes the process of installing the + &linux; version of <application>&matlab; version + 6.5</application> onto a &os; system. It works quite well, + with the exception of the + <application>&java.virtual.machine;</application> which is + described further in <link linkend="matlab-jre"></link>.</para> - <para>The Linux version of <application>&matlab;</application> - can be ordered directly from The MathWorks at <ulink - url="http://www.mathworks.com"></ulink>. Make sure you also - get the license file or instructions how to create it. While - you are there, let them know you would like a native &os; - version of their software.</para> + <para>The &linux; version of <application>&matlab;</application> + can be purchased and licensed from <ulink + url="http://www.mathworks.com/products/matlab/"> + MathWorks</ulink>. Consider letting the company know that + you would like a native &os; version of this software.</para> <sect2> <title>Installing &matlab;</title> - <para>To install <application>&matlab;</application>, do the - following:</para> + <para>To install <application>&matlab;</application>:</para> <procedure> <step> - <para>Insert the installation CD and mount it. - Become <username>root</username>, as recommended by the - installation script. To start the installation script - type:</para> + <para>Become <username>root</username>, as recommended by + the installation script. Insert the installation CD and + mount it. To start the installation script type:</para> <screen>&prompt.root; <userinput>/compat/linux/bin/sh /cdrom/install</userinput></screen> <tip> - <para>The installer is graphical. If you get errors about - not being able to open a display, type - <command>setenv HOME + <para>The installer is graphical. If it is not able to + open a display, type <command>setenv HOME ~<replaceable>USER</replaceable></command>, - where <replaceable>USER</replaceable> is the user you - did a &man.su.1; as.</para> + where <replaceable>USER</replaceable> is the user who + ran &man.su.1;.</para> </tip> </step> @@ -798,22 +724,20 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \ <tip> <para>For easier typing on the rest of the installation - process, type this at your shell prompt: - <command>set - MATLAB=/compat/linux/usr/local/matlab</command></para> + process, type this at the shell prompt: <command>set + MATLAB=/compat/linux/usr/local/matlab</command>.</para> </tip> </step> <step> - <para>Edit the license file as instructed when - obtaining the <application>&matlab;</application> - license.</para> + <para>Edit the license file as instructed when obtaining + the <application>&matlab;</application> license.</para> <tip> - <para>You can prepare this file in advance using your - favorite editor, and copy it to + <para>This file can be prepared in advance using an + editor, and copied to <filename>$MATLAB/license.dat</filename> before the - installer asks you to edit it.</para> + installer asks to edit it.</para> </tip> </step> @@ -822,9 +746,9 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \ </step> </procedure> - <para>At this point your <application>&matlab;</application> + <para>At this point the <application>&matlab;</application> installation is complete. The following steps apply - <quote>glue</quote> to connect it to your &os; system.</para> + <quote>glue</quote> to connect it to the &os; system.</para> </sect2> <sect2> @@ -840,12 +764,12 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \ </step> <step> - <para>Create a startup file at + <para>Create a startup file named <filename>/usr/local/etc/rc.d/flexlm</filename>. The example below is a modified version of the distributed <filename>$MATLAB/etc/rc.lm.glnx86</filename>. The - changes are file locations, and startup of the license - manager under Linux emulation.</para> + changes are file locations and startup of the license + manager under &linux; emulation.</para> <programlisting>#!/bin/sh case "$1" in @@ -872,10 +796,9 @@ exit 0</programlisting> <screen>&prompt.root; <userinput>chmod +x /usr/local/etc/rc.d/flexlm</userinput></screen> - <para>You must also replace - <replaceable>username</replaceable> above with the name - of a valid user on your system (and not - <username>root</username>).</para> + <para>Replace <replaceable>username</replaceable> with the + name of a valid user on the system which is not + <username>root</username>.</para> </important> </step> @@ -891,7 +814,8 @@ exit 0</programlisting> <title>Linking the &java; Runtime Environment</title> <para>Change the <application>&java;</application> Runtime - Environment (JRE) link to one working under &os;:</para> + Environment (<acronym>JRE</acronym>) link to one working under + &os;:</para> <screen>&prompt.root; <userinput>cd $MATLAB/sys/java/jre/glnx86/</userinput> &prompt.root; <userinput>unlink jre; ln -s ./jre1.1.8 ./jre</userinput></screen> @@ -903,30 +827,29 @@ exit 0</programlisting> <procedure> <step> <para>Place the following startup script in - <filename>/usr/local/bin/matlab</filename>:</para> + <filename + class="directory">/usr/local/bin/matlab</filename>:</para> <programlisting>#!/bin/sh /compat/linux/bin/sh /compat/linux/usr/local/matlab/bin/matlab "$@"</programlisting> </step> <step> - <para>Then type the command + <para>Then, type the command <command>chmod +x /usr/local/bin/matlab</command>.</para> </step> </procedure> <tip> - <para>Depending on your version of - <filename role="package">emulators/linux_base</filename>, - you may run into errors when running this script. To avoid - that, edit the file + <para>Depending on the version of <filename + role="package">emulators/linux_base</filename>, running + this script may result in errors. To avoid errors, edit <filename>/compat/linux/usr/local/matlab/bin/matlab</filename>, and change the line that says:</para> <programlisting>if [ `expr "$lscmd" : '.*->.*'` -ne 0 ]; then</programlisting> - <para>(in version 13.0.1 it is on line 410) to this - line:</para> + <para>to this line:</para> <programlisting>if test -L $newbase; then</programlisting> </tip> @@ -940,9 +863,9 @@ exit 0</programlisting> <procedure> <step> - <para>Create a file - <filename>$MATLAB/toolbox/local/finish.m</filename>, and - in it put the single line:</para> + <para>Create + <filename>$MATLAB/toolbox/local/finish.m</filename> + containing the single line:</para> <programlisting>! $MATLAB/bin/finish.sh</programlisting> @@ -950,18 +873,18 @@ exit 0</programlisting> literal.</para></note> <tip> - <para>In the same directory, you will find the files + <para>The same directory contains <filename>finishsav.m</filename> and - <filename>finishdlg.m</filename>, which let you save - your workspace before quitting. If you use either of - them, insert the line above immediately after the + <filename>finishdlg.m</filename>, which allow the + workspace to be saved before quitting. If either file + is used, insert the line above immediately after the <literal>save</literal> command.</para></tip> </step> <step> - <para>Create a file - <filename>$MATLAB/bin/finish.sh</filename>, which will - contain the following:</para> + <para>Create + <filename>$MATLAB/bin/finish.sh</filename> which + contains the following:</para> <programlisting>#!/compat/linux/bin/sh (sleep 5; killall -1 matlab_helper) & @@ -979,8 +902,8 @@ exit 0</programlisting> <sect2 id="matlab-using"> <title>Using &matlab;</title> - <para>At this point you are ready to type - <command>matlab</command> and start using it.</para> + <para>At this point, <command>matlab</command> is ready for + use.</para> </sect2> </sect1> @@ -1002,48 +925,36 @@ exit 0</programlisting> <secondary><application>Oracle</application></secondary> </indexterm> - <sect2> - <title>Preface</title> - - <para>This document describes the process of installing - <application>&oracle; 8.0.5</application> and - <application>&oracle; 8.0.5.1 Enterprise Edition</application> - for Linux onto a FreeBSD machine.</para> - </sect2> + <para>This document describes the process of installing + <application>&oracle; 8.0.5</application> and + <application>&oracle; 8.0.5.1 Enterprise Edition</application> + for &linux; onto a &os; machine.</para> <sect2> - <title>Installing the Linux Environment</title> + <title>Installing the &linux; Environment</title> - <para>Make sure you have both <filename + <para>Make sure both <filename role='package'>emulators/linux_base</filename> and <filename role='package'>devel/linux_devtools</filename> - from the Ports Collection installed. If you run into - difficulties with these ports, you may have to use the - packages or older versions available in the Ports - Collection.</para> - - <para>If you want to run the intelligent agent, you will - also need to install the Red Hat Tcl package: - <filename>tcl-8.0.3-20.i386.rpm</filename>. The general - command for installing packages with the official - <application>RPM</application> port (<filename - role='package'>archivers/rpm</filename>) is:</para> + are installed from the Ports Collection.</para> + + <para>To run the intelligent agent, install the Red Hat Tcl + package: <filename>tcl-8.0.3-20.i386.rpm</filename>. The + general command for installing RPMs with the <filename + role='package'>archivers/rpm</filename> port is:</para> <screen>&prompt.root; <userinput>rpm -i --ignoreos --root /compat/linux --dbpath /var/lib/rpm <replaceable>package</replaceable></userinput></screen> - <para>Installation of the <replaceable>package</replaceable> - should not generate any errors.</para> + <para>This command should not generate any errors.</para> </sect2> <sect2> <title>Creating the &oracle; Environment</title> - <para>Before you can install - <application>&oracle;</application>, you need to set up a - proper environment. This document only describes what to do - <emphasis>specially</emphasis> to run - <application>&oracle;</application> for Linux on FreeBSD, not - what has been described in the + <para>Before installing <application>&oracle;</application>, set + up a proper environment. This section only describes how to + install <application>&oracle;</application> for &linux; on + &os;, not what has been described in the <application>&oracle;</application> installation guide.</para> <sect3 id="linuxemu-kernel-tuning"> @@ -1052,11 +963,10 @@ exit 0</programlisting> <indexterm><primary>kernel tuning</primary></indexterm> <para>As described in the <application>&oracle;</application> - installation guide, you need to set the maximum size of - shared memory. Do not use <literal>SHMMAX</literal> under - FreeBSD. <literal>SHMMAX</literal> is merely calculated - out of <literal>SHMMAXPGS</literal> and - <literal>PGSIZE</literal>. Therefore define + installation guide, the maximum size of shared memory needs + to be set. Do not use <literal>SHMMAX</literal> under &os; + as it is calculated from <literal>SHMMAXPGS</literal> and + <literal>PGSIZE</literal>. Therefore, define <literal>SHMMAXPGS</literal>. All other options can be used as described in the guide. For example:</para> @@ -1067,10 +977,10 @@ options SEMMNS=200 options SEMMNI=70 options SEMMSL=61</programlisting> - <para>Set these options to suit your intended use of + <para>Set these options to suit the intended use of <application>&oracle;</application>.</para> - <para>Also, make sure you have the following options in your + <para>Also, make sure the following options are in the kernel configuration file:</para> <programlisting>options SYSVSHM #SysV shared memory @@ -1082,10 +992,8 @@ options SYSVMSG #SysV interprocess communication</programlisting> <title>&oracle; Account</title> - <para>Create an <username>oracle</username> account just as - you would create any other account. The - <username>oracle</username> account is special only that - you need to give it a Linux shell. Add + <para>Create a user account to be used as the + <username>oracle</username> account. Add <literal>/compat/linux/bin/bash</literal> to <filename>/etc/shells</filename> and set the shell for the <username>oracle</username> account to @@ -1097,7 +1005,7 @@ options SYSVMSG #SysV interprocess communication</programlisting> <para>Besides the normal <application>&oracle;</application> variables, such as <envar>ORACLE_HOME</envar> and - <envar>ORACLE_SID</envar> you must set the following + <envar>ORACLE_SID</envar> set the following environment variables:</para> <informaltable frame="none" pgwide="1"> @@ -1136,15 +1044,14 @@ options SYSVMSG #SysV interprocess communication</programlisting> /usr/bin /usr/sbin /usr/local/bin - $ORACLE_HOME/bin</literal></entry> + $ORACLE_HOME/bin</literal></entry> </row> </tbody> </tgroup> </informaltable> <para>It is advised to set all the environment variables in - <filename>.profile</filename>. A complete example - is:</para> + <filename>~/.profile</filename> as follows:</para> <programlisting>ORACLE_BASE=/oracle; export ORACLE_BASE ORACLE_HOME=/oracle; export ORACLE_HOME @@ -1164,21 +1071,19 @@ export PATH</programlisting> <sect2> <title>Installing &oracle;</title> - <para>Due to a slight inconsistency in the Linux emulator, - you need to create a directory named - <filename>.oracle</filename> in <filename>/var/tmp</filename> - before you start the installer. Let it be owned by the - <username>oracle</username> user. You should be able to - install <application>&oracle;</application> without any - problems. If you have problems, check your - <application>&oracle;</application> distribution and/or - configuration first! After you have installed - <application>&oracle;</application>, apply the patches - described in the next two subsections.</para> - - <para>A frequent problem is that the TCP protocol adapter is - not installed right. As a consequence, you cannot start any - TCP listeners. The following actions help solve this + <para>Before starting the installer, create a directory named + <filename class="directory">/var/tmp/.oracle</filename> which + is owned by the <username>oracle</username> user. The + installation of <application>&oracle;</application> should + work without any problems. If errors are encountered, check + the <application>&oracle;</application> distribution and + configuration. Once <application>&oracle;</application> is + installed, apply the patches described in the next two + subsections.</para> + + <para>A frequent error is that the TCP protocol adapter is not + installed correctly. As a consequence, no TCP listeners can + be started. The following actions help to solve this problem:</para> <screen>&prompt.root; <userinput>cd $ORACLE_HOME/network/lib</userinput> @@ -1188,21 +1093,21 @@ export PATH</programlisting> &prompt.root; <userinput>cd $ORACLE_HOME/network/lib</userinput> &prompt.root; <userinput>make -f ins_network.mk install</userinput></screen> - <para>Do not forget to run <filename>root.sh</filename> - again!</para> + <para>Do not forget to run <filename>root.sh</filename> + again.</para> <sect3 id="linuxemu-patch-root"> - <title>Patching root.sh</title> + <title>Patching <filename>root.sh</filename></title> <para>When installing <application>&oracle;</application>, some actions, which need to be performed as <username>root</username>, are recorded in a shell script called <filename>root.sh</filename>. This script is - written in the <filename>orainst</filename> directory. - Apply the following patch to <filename>root.sh</filename>, - to have it use to proper location of - <command>chown</command> or alternatively run the script - under a Linux native shell.</para> + found in <filename class="directory">orainst</filename>. + Apply the following patch to <filename>root.sh</filename> + so that it can find the &os; location of + <command>chown</command>. Alternatively, run the script + under a &linux; native shell.</para> <programlisting>*** orainst/root.sh.orig Tue Oct 6 21:57:33 1998 --- orainst/root.sh Mon Dec 28 15:58:53 1998 @@ -1222,21 +1127,20 @@ export PATH</programlisting> # # Define variables to be used in this script</programlisting> - <para>When you do not install - <application>&oracle;</application> from CD, you can patch - the source for <filename>root.sh</filename>. It is called - <filename>rthd.sh</filename> and is located in the - <filename>orainst</filename> directory in the source + <para>If <application>&oracle;</application> is not installed + from CD, patch the source for <filename>root.sh</filename>. + It is called <filename>rthd.sh</filename> and is located in + <filename class="directory">orainst</filename> in the source tree.</para> </sect3> <sect3 id="linuxemu-patch-tcl"> - <title>Patching genclntsh</title> + <title>Patching <filename>genclntsh</filename></title> <para>The script <command>genclntsh</command> is used to - create a single shared client library. It is used when - building the demos. Apply the following patch to comment - out the definition of <envar>PATH</envar>:</para> + create a single shared client library when building the + demos. Apply the following patch to comment out the + definition of <envar>PATH</envar>:</para> <programlisting>*** bin/genclntsh.orig Wed Sep 30 07:37:19 1998 --- bin/genclntsh Tue Dec 22 15:36:49 1998 @@ -1245,14 +1149,14 @@ export PATH</programlisting> # # Explicit path to ensure that we're using the correct commands #PATH=/usr/bin:/usr/ccs/bin export PATH -! PATH=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin export PATH +! PATH=/usr/local/bin:/bin:/usr/bin export PATH # # each product MUST provide a $PRODUCT/admin/shrept.lst --- 32,38 ---- # # Explicit path to ensure that we're using the correct commands #PATH=/usr/bin:/usr/ccs/bin export PATH -! #PATH=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin export PATH +! #PATH=/usr/local/bin:/bin:/usr/bin: export PATH # # each product MUST provide a $PRODUCT/admin/shrept.lst</programlisting> </sect3> @@ -1261,78 +1165,61 @@ export PATH</programlisting> <sect2> <title>Running &oracle;</title> - <para>When you have followed the instructions, you should be - able to run <application>&oracle;</application> as if it was - run on Linux itself.</para> + <para>After following these instructions, + <application>&oracle;</application> should run as if it was + running on &linux;.</para> </sect2> </sect1> <sect1 id="linuxemu-advanced"> <title>Advanced Topics</title> - <para>If you are curious as to how the Linux binary compatibility - works, this is the section you want to read. Most of what - follows is based heavily on an email written to &a.chat; by + <para>This section describes how &linux; binary compatibility + works and is based on an email written to &a.chat; by Terry Lambert <email>tlambert@primenet.com</email> (Message ID: <literal><199906020108.SAA07001@usr09.primenet.com></literal>).</para> - <sect2> - <title>How Does It Work?</title> - - <indexterm><primary>execution class loader</primary></indexterm> - - <para>FreeBSD has an abstraction called an <quote>execution - class loader</quote>. This is a wedge into the - &man.execve.2; system call.</para> - - <para>What happens is that FreeBSD has a list of loaders, - instead of a single loader with a fallback to the - <literal>#!</literal> loader for running any shell - interpreters or shell scripts.</para> - - <para>Historically, the only loader on the &unix; platform - examined the magic number (generally the first 4 or 8 bytes - of the file) to see if it was a binary known to the system, - and if so, invoked the binary loader.</para> - - <para>If it was not the binary type for the system, the - &man.execve.2; call returned a failure, and the shell - attempted to start executing it as shell commands.</para> - - <para>The assumption was a default of <quote>whatever the - current shell is</quote>.</para> - - <para>Later, a hack was made for &man.sh.1; to examine the - first two characters, and if they were <literal>:\n</literal>, - then it invoked the &man.csh.1; shell instead (we believe SCO - first made this hack).</para> - - <para>What FreeBSD does now is go through a list of loaders, - with a generic <literal>#!</literal> loader that knows about - interpreters as the characters which follow to the next - whitespace next to last, followed by a fallback to - <filename>/bin/sh</filename>.</para> - <indexterm><primary>ELF</primary></indexterm> - - <para>For the Linux ABI support, FreeBSD sees the magic number - as an ELF binary (it makes no distinction between FreeBSD, - &solaris;, Linux, or any other OS which has an ELF image type, - at this point).</para> - <indexterm><primary>Solaris</primary></indexterm> - - <para>The ELF loader looks for a specialized - <emphasis>brand</emphasis>, which is a comment section in - the ELF image, and which is not present on SVR4/&solaris; - ELF binaries.</para> - - <para>For Linux binaries to function, they must be - <emphasis>branded</emphasis> as type <literal>Linux</literal> - from &man.brandelf.1;:</para> - - <screen>&prompt.root; <userinput>brandelf -t Linux file</userinput></screen> - - <para>When this is done, the ELF loader will see the - <literal>Linux</literal> brand on the file.</para> + <indexterm><primary>execution class loader</primary></indexterm> + + <para>&os; has an abstraction called an <quote>execution class + loader</quote>. This is a wedge into the &man.execve.2; + system call.</para> + + <para>Historically, the &unix; loader examined the magic number + (generally the first 4 or 8 bytes of the file) to see if it was + a binary known to the system, and if so, invoked the binary + loader.</para> + + <para>If it was not the binary type for the system, the + &man.execve.2; call returned a failure, and the shell + attempted to start executing it as shell commands. The + assumption was a default of <quote>whatever the current shell + is</quote>.</para> + + <para>Later, a hack was made for &man.sh.1; to examine the first + two characters, and if they were <literal>:\n</literal>, it + invoked the &man.csh.1; shell instead.</para> + + <para>&os; has a list of loaders, instead of a single loader, with + a fallback to the <literal>#!</literal> loader for running shell + interpreters or shell scripts.</para> + + <indexterm><primary>ELF</primary></indexterm> + + <indexterm><primary>Solaris</primary></indexterm> + + <para>For the &linux; <acronym>ABI</acronym> support, &os; sees + the magic number as an ELF binary. The ELF loader looks for a + specialized <emphasis>brand</emphasis>, which is a comment + section in the ELF image, and which is not present on + SVR4/&solaris; ELF binaries.</para> + + <para>For &linux; binaries to function, they must be + <emphasis>branded</emphasis> as type <literal>Linux</literal> + using &man.brandelf.1;:</para> + + <screen>&prompt.root; <userinput>brandelf -t Linux file</userinput></screen> + <indexterm> <primary>ELF</primary> <secondary>branding</secondary> @@ -1341,79 +1228,57 @@ export PATH</programlisting> <para>When the ELF loader sees the <literal>Linux</literal> brand, the loader replaces a pointer in the <literal>proc</literal> structure. All system calls are - indexed through this pointer (in a traditional &unix; system, - this would be the <literal>sysent[]</literal> structure array, - containing the system calls). In addition, the process is + indexed through this pointer. In addition, the process is flagged for special handling of the trap vector for the signal trampoline code, and several other (minor) fix-ups that are - handled by the Linux kernel module.</para> + handled by the &linux; kernel module.</para> - <para>The Linux system call vector contains, among other + <para>The &linux; system call vector contains, among other things, a list of <literal>sysent[]</literal> entries whose addresses reside in the kernel module.</para> - <para>When a system call is called by the Linux binary, the + <para>When a system call is called by the &linux; binary, the trap code dereferences the system call function pointer off - the <literal>proc</literal> structure, and gets the Linux, - not the FreeBSD, system call entry points.</para> - - <para>In addition, the Linux mode dynamically - <emphasis>reroots</emphasis> lookups; this is, in effect, - what the <option>union</option> option to file system mounts - (<emphasis>not</emphasis> the <literal>unionfs</literal> - file system type!) does. First, an attempt is made to lookup - the file in the - <filename>/compat/linux/<replaceable>original-path</replaceable></filename> - directory, <emphasis>then</emphasis> only if that fails, the - lookup is done in the - <filename>/<replaceable>original-path</replaceable></filename> - directory. This makes sure that binaries that require other - binaries can run (e.g., the Linux toolchain can all run under - Linux ABI support). It also means that the Linux binaries - can load and execute FreeBSD binaries, if there are no - corresponding Linux binaries present, and that you could place - a &man.uname.1; command in the - <filename>/compat/linux</filename> directory tree to ensure - that the Linux binaries could not tell they were not running - on Linux.</para> - - <para>In effect, there is a Linux kernel in the FreeBSD kernel; - the various underlying functions that implement all of the + the <literal>proc</literal> structure, and gets the &linux;, + not the &os;, system call entry points.</para> + + <para>&linux; mode dynamically <emphasis>reroots</emphasis> + lookups. This is, in effect, equivalent to the + <option>union</option> option to file system mounts. First, + an attempt is made to lookup the file in <filename + class="directory">/compat/linux/<replaceable>original-path</replaceable></filename>. + If that fails, the lookup is done in + <filename + class="directory">/<replaceable>original-path</replaceable></filename>. + This makes sure that binaries that require other binaries can + run. For example, the &linux; toolchain can all run under + &linux; <acronym>ABI</acronym> support. It also means that + the &linux; binaries can load and execute &os; binaries, if + there are no corresponding &linux; binaries present, and that + a &man.uname.1; command can be placed in the + <filename class="directory">/compat/linux</filename> directory + tree to ensure that the &linux; binaries can not tell they are + not running on &linux;.</para> + + <para>In effect, there is a &linux; kernel in the &os; kernel. + The various underlying functions that implement all of the services provided by the kernel are identical to both the - FreeBSD system call table entries, and the Linux system call + &os; system call table entries, and the &linux; system call table entries: file system operations, virtual memory - operations, signal delivery, System V IPC, etc… The - only difference is that FreeBSD binaries get the FreeBSD - <emphasis>glue</emphasis> functions, and Linux binaries get - the Linux <emphasis>glue</emphasis> functions (most older OS's - only had their own <emphasis>glue</emphasis> functions: - addresses of functions in a static global - <literal>sysent[]</literal> structure array, instead of - addresses of functions dereferenced off a dynamically - initialized pointer in the <literal>proc</literal> structure - of the process making the call).</para> - - <para>Which one is the native FreeBSD ABI? It does not matter. - Basically the only difference is that (currently; this could - easily be changed in a future release, and probably will be - after this) the FreeBSD <emphasis>glue</emphasis> functions - are statically linked into the kernel, and the Linux - <emphasis>glue</emphasis> functions can be statically linked, - or they can be accessed via a kernel module.</para> - - <para>Yeah, but is this really emulation? No. It is an ABI - implementation, not an emulation. There is no emulator (or - simulator, to cut off the next question) involved.</para> - - <para>So why is it sometimes called <quote>Linux - emulation</quote>? To make it hard to sell FreeBSD! - Really, it is because the historical implementation was done - at a time when there was really no word other than that to - describe what was going on; saying that FreeBSD ran Linux - binaries was not true, if you did not compile the code in or - load a module, and there needed to be a word to describe what - was being loaded—hence <quote>the Linux - emulator</quote>.</para> - </sect2> - </sect1> -</chapter> + operations, signal delivery, and System V IPC. The only + difference is that &os; binaries get the &os; + <emphasis>glue</emphasis> functions, and &linux; binaries get + the &linux; <emphasis>glue</emphasis> functions. The &os; + <emphasis>glue</emphasis> functions are statically linked into + the kernel, and the &linux; <emphasis>glue</emphasis> + functions can be statically linked, or they can be accessed + via a kernel module.</para> + + <para>Technically, this is not really emulation, it is an + <acronym>ABI</acronym> implementation. It is sometimes called + <quote>&linux; emulation</quote> because the implementation + was done at a time when there was no other word to describe + what was going on. Saying that &os; ran &linux; binaries was + not true, since the code was not compiled in.</para> + </sect1> + </chapter> diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml index 4fd080609a..24db837db4 100644 --- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml @@ -151,7 +151,8 @@ <warning> <para>CVS has been deprecated by the project, and its use is - not recommended. <application>Subversion</application> + not recommended. + <ulink url="&url.books.handbook;/svn.html">Subversion</ulink> should be used instead.</para> </warning> </sect2> @@ -236,7 +237,7 @@ <application>CTM</application> distribution lists. &a.ctm-cvs-cur.name; supports the entire CVS tree. &a.ctm-src-cur.name; supports the head of the development - branch. &a.ctm-src-7.name; supports the 7.X release branch, + branch. &a.ctm-src-9.name; supports the 9.X release branch, etc.. (If you do not know how to subscribe yourself to a list, click on the list name above or go to &a.mailman.lists.link; and click on the list that you wish to @@ -854,17 +855,6 @@ Certificate information: <command>cvsupd</command> which runs at each of the &os; mirror sites.</para> - <para>As you read the &os; documentation and mailing lists, you - may see references to <application>sup</application>. - <application>Sup</application> was the predecessor of - <application>CVSup</application>, and it served a similar - purpose. <application>CVSup</application> is used much in the - same way as sup and, in fact, uses configuration files which - are backward-compatible with <command>sup</command>'s. - <application>Sup</application> is no longer used in the &os; - project, because <application>CVSup</application> is both - faster and more flexible.</para> - <note> <para>The <application>csup</application> utility is a rewrite of the <application>CVSup</application> software in C. Its @@ -1219,23 +1209,10 @@ src-all</programlisting> In the default configuration, the <application>CVSup</application> client will take every file associated with the collection and tag you chose in the - configuration file. However, this is not always what you - want, especially if you are synching the - <filename>doc</filename>, <filename>ports</filename>, or - <filename>www</filename> trees — most people cannot - read four or five languages, and therefore they do not need - to download the language-specific files. If you are - <application>CVSup</application>ing the Ports Collection, - you can get around this by specifying each collection - individually (e.g., <emphasis>ports-astrology</emphasis>, - <emphasis>ports-biology</emphasis>, etc instead of simply - saying <emphasis>ports-all</emphasis>). However, since the - <filename>doc</filename> and <filename>www</filename> trees - do not have language-specific collections, you must use one - of <application>CVSup</application>'s many nifty features: - the <filename>refuse</filename> file.</para> - - <para>The <filename>refuse</filename> file essentially tells + configuration file. In order to download a partial tree, + use the <filename>refuse</filename> file.</para> + + <para>The <filename>refuse</filename> file tells <application>CVSup</application> that it should not take every single file from a collection; in other words, it tells the client to <emphasis>refuse</emphasis> certain @@ -1252,39 +1229,14 @@ src-all</programlisting> <para>The <filename>refuse</filename> file has a very simple format; it simply contains the names of files or directories - that you do not wish to download. For example, if you - cannot speak any languages other than English and some - German, and you do not feel the need to read the German - translation of documentation, you can put the following in - your <filename>refuse</filename> file:</para> - - <programlisting>doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_*</programlisting> - - <para>and so forth for the other languages (you can find the - full list by browsing the - <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">&os; CVS - repository</ulink>).</para> - - <para>With this very useful feature, those users who are on + that you do not wish to download. For example:</para> + + <programlisting>bin/ +usr.bin/</programlisting> + + <para>Users who are on slow links or pay by the minute for their Internet - connection will be able to save valuable time as they will + connection will be able to save time as they will no longer need to download files that they will never use. For more information on <filename>refuse</filename> files and other neat features of <application>CVSup</application>, @@ -1376,11 +1328,8 @@ doc/zh_*</programlisting> hierarchical relationships among collections are reflected by the use of indentation in the list below.</para> - <para>The most commonly used collections are - <literal>src-all</literal>, and - <literal>ports-all</literal>. The other collections are used - only by small groups of people for specialized purposes, and - some mirror sites may not carry all of them.</para> + <para>The most commonly used collection is + <literal>src-all</literal>. </para> <variablelist> <varlistentry> @@ -1401,630 +1350,6 @@ doc/zh_*</programlisting> </varlistentry> <varlistentry> - <term><literal>ports-all release=cvs</literal></term> - - <listitem> - <para>The &os; Ports Collection.</para> - - <important id="cvsup-collec-pbase-warn"> - <para>If you do not want to update the whole of - <literal>ports-all</literal> (the whole ports - tree), but use one of the subcollections listed - below, make sure that you - <emphasis>always</emphasis> update the - <literal>ports-base</literal> subcollection! - Whenever something changes in the ports build - infrastructure represented by - <literal>ports-base</literal>, it is virtually - certain that those changes will be used by - <quote>real</quote> ports real soon. Thus, if - you only update the <quote>real</quote> ports - and they use some of the new features, there is - a very high chance that their build will fail - with some mysterious error message. The - <emphasis>very first</emphasis> thing to do in - this case is to make sure that your - <literal>ports-base</literal> subcollection is - up to date.</para> - </important> - - <important id="cvsup-collec-index-warn"> - <para>If you are going to be building your own - local copy of <filename>ports/INDEX</filename>, - you <emphasis>must</emphasis> accept - <literal>ports-all</literal> (the whole ports - tree). Building - <filename>ports/INDEX</filename> with a partial - tree is not supported. See the <ulink - url="&url.books.faq;/applications.html#MAKE-INDEX"> - FAQ</ulink>.</para> - </important> - - <variablelist> - <varlistentry> - <term><literal>ports-accessibility - release=cvs</literal></term> - - <listitem> - <para>Software to help disabled users.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-arabic - release=cvs</literal></term> - - <listitem> - <para>Arabic language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-archivers - release=cvs</literal></term> - - <listitem> - <para>Archiving tools.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-astro - release=cvs</literal></term> - - <listitem> - <para>Astronomical ports.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-audio - release=cvs</literal></term> - - <listitem> - <para>Sound support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-base - release=cvs</literal></term> - - <listitem> - <para>The Ports Collection build - infrastructure - various files located in - the <filename>Mk/</filename> and - <filename>Tools/</filename> subdirectories - of <filename>/usr/ports</filename>.</para> - - <note> - <para>Please see the <link - linkend="cvsup-collec-pbase-warn">important - warning above</link>: you should - <emphasis>always</emphasis> update this - subcollection, whenever you update any - part of the &os; Ports Collection!</para> - </note> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-benchmarks - release=cvs</literal></term> - - <listitem> - <para>Benchmarks.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-biology - release=cvs</literal></term> - - <listitem> - <para>Biology.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-cad - release=cvs</literal></term> - - <listitem> - <para>Computer aided design tools.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-chinese - release=cvs</literal></term> - - <listitem> - <para>Chinese language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-comms - release=cvs</literal></term> - - <listitem> - <para>Communication software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-converters - release=cvs</literal></term> - - <listitem> - <para>character code converters.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-databases - release=cvs</literal></term> - - <listitem> - <para>Databases.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-deskutils - release=cvs</literal></term> - - <listitem> - <para>Things that used to be on the desktop - before computers were invented.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-devel - release=cvs</literal></term> - - <listitem> - <para>Development utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-dns - release=cvs</literal></term> - - <listitem> - <para>DNS related software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-editors - release=cvs</literal></term> - - <listitem> - <para>Editors.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-emulators - release=cvs</literal></term> - - <listitem> - <para>Emulators for other operating - systems.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-finance - release=cvs</literal></term> - - <listitem> - <para>Monetary, financial and related - applications.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ftp - release=cvs</literal></term> - - <listitem> - <para>FTP client and server utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-games - release=cvs</literal></term> - - <listitem> - <para>Games.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-german - release=cvs</literal></term> - - <listitem> - <para>German language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-graphics - release=cvs</literal></term> - - <listitem> - <para>Graphics utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-hebrew - release=cvs</literal></term> - - <listitem> - <para>Hebrew language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-hungarian - release=cvs</literal></term> - - <listitem> - <para>Hungarian language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-irc - release=cvs</literal></term> - - <listitem> - <para>Internet Relay Chat utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-japanese - release=cvs</literal></term> - - <listitem> - <para>Japanese language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-java - release=cvs</literal></term> - - <listitem> - <para>&java; utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-korean - release=cvs</literal></term> - - <listitem> - <para>Korean language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-lang - release=cvs</literal></term> - - <listitem> - <para>Programming languages.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-mail - release=cvs</literal></term> - - <listitem> - <para>Mail software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-math - release=cvs</literal></term> - - <listitem> - <para>Numerical computation software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-misc - release=cvs</literal></term> - - <listitem> - <para>Miscellaneous utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-multimedia - release=cvs</literal></term> - - <listitem> - <para>Multimedia software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net - release=cvs</literal></term> - - <listitem> - <para>Networking software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-im - release=cvs</literal></term> - - <listitem> - <para>Instant messaging software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-mgmt - release=cvs</literal></term> - - <listitem> - <para>Network management software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-p2p - release=cvs</literal></term> - - <listitem> - <para>Peer to peer networking.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-news - release=cvs</literal></term> - - <listitem> - <para>USENET news software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-palm - release=cvs</literal></term> - - <listitem> - <para>Software support for - <trademark class="trade">Palm</trademark> - series.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-polish - release=cvs</literal></term> - - <listitem> - <para>Polish language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ports-mgmt - release=cvs</literal></term> - - <listitem> - <para>Utilities to manage ports and - packages.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-portuguese - release=cvs</literal></term> - - <listitem> - <para>Portuguese language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-print - release=cvs</literal></term> - - <listitem> - <para>Printing software.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-russian - release=cvs</literal></term> - - <listitem> - <para>Russian language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-science - release=cvs</literal></term> - - <listitem> - <para>Science.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-security - release=cvs</literal></term> - - <listitem> - <para>Security utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-shells - release=cvs</literal></term> - - <listitem> - <para>Command line shells.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-sysutils - release=cvs</literal></term> - - <listitem> - <para>System utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-textproc - release=cvs</literal></term> - - <listitem> - <para>text processing utilities (does not - include desktop publishing).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ukrainian - release=cvs</literal></term> - - <listitem> - <para>Ukrainian language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-vietnamese - release=cvs</literal></term> - - <listitem> - <para>Vietnamese language support.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-www - release=cvs</literal></term> - - <listitem> - <para>Software related to the World Wide - Web.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11 - release=cvs</literal></term> - - <listitem> - <para>Ports to support the X window - system.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-clocks - release=cvs</literal></term> - - <listitem> - <para>X11 clocks.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-drivers - release=cvs</literal></term> - - <listitem> - <para>X11 drivers.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-fm - release=cvs</literal></term> - - <listitem> - <para>X11 file managers.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-fonts - release=cvs</literal></term> - - <listitem> - <para>X11 fonts and font utilities.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-toolkits - release=cvs</literal></term> - - <listitem> - <para>X11 toolkits.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-servers - release=cvs</literal></term> - - <listitem> - <para>X11 servers.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-themes - release=cvs</literal></term> - - <listitem> - <para>X11 themes.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-wm - release=cvs</literal></term> - - <listitem> - <para>X11 window managers.</para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - </varlistentry> - - <varlistentry> <term> <literal>projects-all release=cvs</literal> </term> @@ -2330,15 +1655,6 @@ doc/zh_*</programlisting> <para>&os; mailing list archive.</para> </listitem> </varlistentry> - - <varlistentry> - <term><literal>www release=current</literal></term> - - <listitem> - <para>The pre-processed &os; WWW site files (not the - source files). Used by WWW mirror sites.</para> - </listitem> - </varlistentry> </variablelist> </sect2> diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml index 3dee59a408..c884ce14e5 100644 --- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml @@ -1677,10 +1677,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting> <application>SANE</application> has a <ulink url="http://www.sane-project.org/sane-supported-devices.html">supported devices</ulink> list that can provide you with information - about the support for a scanner and its status. On systems - prior to &os; 8.X the - &man.uscanner.4; manual page also provides a list of supported - USB scanners.</para> + about the support for a scanner and its status.</para> </sect2> <sect2> @@ -1704,16 +1701,6 @@ device uhci device ohci device ehci</programlisting> - <para>On systems prior to &os; 8.X, the following line is - also needed:</para> - - <programlisting>device uscanner</programlisting> - - <para>On these versions of &os;, the &man.uscanner.4; device - driver provides support for the USB scanners. Since - &os; 8.0, this support is directly provided by - the &man.libusb.3; library.</para> - <para>After rebooting with the correct kernel, plug in your USB scanner. A line showing the detection of your @@ -1722,14 +1709,9 @@ device ehci</programlisting> <screen>ugen0.2: <EPSON> at usbus0</screen> - <para>or on a &os; 7.X system:</para> - - <screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen> - <para>These messages show that our scanner is using - either <filename>/dev/ugen0.2</filename> or - <filename>/dev/uscanner0</filename> as device node according - to the &os; version we run. For this example, a + either <filename>/dev/ugen0.2</filename> + as device node. For this example, a &epson.perfection; 1650 USB scanner was used.</para> </sect3> @@ -1973,22 +1955,6 @@ device `epson:/dev/uscanner0' is a Epson GT-8200 flatbed scanner</screen> add path ugen0.2 mode 0660 group usb add path usb/0.2.0 mode 0666 group usb</programlisting> - <para>&os; 7.X users will probably need the following - lines with the correct device node - <filename>/dev/uscanner0</filename>:</para> - - <programlisting>[system=5] -add path uscanner0 mode 660 group usb</programlisting> - - <para>Then add the following to - <filename>/etc/rc.conf</filename> and reboot the - machine:</para> - - <programlisting>devfs_system_ruleset="system"</programlisting> - - <para>More information regarding these lines can be found in the - &man.devfs.8; manual page.</para> - <para>Now, one will just have to add users to the <groupname><replaceable>usb</replaceable></groupname> group to allow the access to the scanner:</para> diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.xml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml index 80a88030c8..29f63e6902 100644 --- a/en_US.ISO8859-1/books/handbook/ports/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml @@ -119,7 +119,7 @@ <emphasis>dependencies</emphasis>. If &man.pkg.add.1; or the Ports Collection is used to install an application and a dependent library is not already installed, the library will - automatically be installaed first.</para> + automatically be installed first.</para> <para>While the two technologies are quite similar, packages and ports each have their own strengths. Select the technology that @@ -259,7 +259,7 @@ <screen>&prompt.root; <userinput>whereis lsof</userinput> lsof: /usr/ports/sysutils/lsof</screen> - <para>Alternately, a &man.echo.1; statement can be + <para>Alternately, an &man.echo.1; statement can be used:</para> <screen>&prompt.root; <userinput>echo /usr/ports/*/*lsof*</userinput> @@ -627,13 +627,6 @@ docbook = <screen>&prompt.root; <userinput>pkg_add -r pkg</userinput></screen> - <note> - <para>The <application>pkgng</application> package management - utility is not supported on - &os; 7.<replaceable>X</replaceable> or - &os; 8.0.</para> - </note> - <para>Existing &os; installations require conversion of the <application>pkg_install</application> package database to the new format. To convert the package database, run:</para> @@ -1024,14 +1017,17 @@ Deinstalling ca_root_nss-3.13.5... done</screen> <filename class="directory">/usr/ports</filename>:</para> <screen>&prompt.root; <userinput>portsnap extract</userinput></screen> + </step> + <step> <para>After the first use of <application>Portsnap</application> has been completed as shown above, <filename class="directory">/usr/ports</filename> can be updated with:</para> - <screen>&prompt.root; <userinput>portsnap update</userinput></screen> + <screen>&prompt.root; <userinput>portsnap fetch</userinput> +&prompt.root; <userinput>portsnap update</userinput></screen> </step> </procedure> @@ -1072,16 +1068,16 @@ Deinstalling ca_root_nss-3.13.5... done</screen> <step> <para>Check out a copy of the ports tree. Use a specific <ulink - url="&url.books.handbook;/mirrors-svn.html">Subversion + url="&url.books.handbook;/svn-mirrors.html">Subversion mirror</ulink> close to your geographic location instead - of <replaceable>svn.FreeBSD.org</replaceable> in the + of <replaceable>svn0.us-east.FreeBSD.org</replaceable> in the command below for better performance. Committers should read the <ulink url="&url.articles.committers-guide;/subversion-primer.html">Subversion Primer</ulink> first to be sure the correct protocol is chosen.</para> - <screen>&prompt.root; <userinput>svn checkout svn://<replaceable>svn.FreeBSD.org</replaceable>/ports/head /usr/ports</userinput></screen> + <screen>&prompt.root; <userinput>svn checkout https://<replaceable>svn0.us-east.FreeBSD.org</replaceable>/ports/head /usr/ports</userinput></screen> </step> <step> diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml index c91498b7f9..86d0c65702 100644 --- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml @@ -139,18 +139,6 @@ <title>Using User PPP</title> - <warning> - <para>As of &os; 8.0, device nodes for serial ports have been - renamed from - <filename>/dev/cuad<replaceable>N</replaceable></filename> to - <filename>/dev/cuau<replaceable>N</replaceable></filename> and - from - <filename>/dev/ttyd<replaceable>N</replaceable></filename> to - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> - <sect2> <title>User PPP</title> @@ -1881,19 +1869,6 @@ exit 1 <secondary>troubleshooting</secondary> </indexterm> - <warning> - <para>As of &os; 8.0, the &man.uart.4; driver replaces the - &man.sio.4; driver. Device nodes for serial ports have been - renamed from - <filename>/dev/cuad<replaceable>N</replaceable></filename> to - <filename>/dev/cuau<replaceable>N</replaceable></filename> and - from - <filename>/dev/ttyd<replaceable>N</replaceable></filename> to - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> - <para>This section covers a few issues which may arise when using PPP over a modem connection. For instance, perhaps you need to know exactly what prompts the system you are dialing diff --git a/en_US.ISO8859-1/books/handbook/printing/chapter.xml b/en_US.ISO8859-1/books/handbook/printing/chapter.xml index 1ba81f0076..287b8a454e 100644 --- a/en_US.ISO8859-1/books/handbook/printing/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/printing/chapter.xml @@ -179,7 +179,7 @@ <title>Why You Should Use the Spooler</title> <para>The spooler still provides benefit on a single-user system - and should be used because:</para> + and should be used because:</para> <itemizedlist> <listitem> @@ -212,15 +212,6 @@ <sect1 id="printing-intro-setup"> <title>Basic Setup</title> - <warning> - <para>As of &os; 8.0, device nodes for serial ports have been - renamed from - <filename>/dev/ttyd<replaceable>N</replaceable></filename> to - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> - <para>To use printers with the <application>LPD</application> spooling system, you will need to set up both your printer hardware and the <application>LPD</application> software. This @@ -1465,15 +1456,6 @@ $%&'()*+,-./01234567 <sect1 id="printing-advanced"> <title>Advanced Printer Setup</title> - <warning> - <para>As of &os; 8.0, device nodes for serial ports have been - renamed from - <filename>/dev/ttyd<replaceable>N</replaceable></filename> to - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> - <para>This section describes filters for printing specially formatted files, header pages, printing across networks, and restricting and accounting for printer usage.</para> diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.xml b/en_US.ISO8859-1/books/handbook/security/chapter.xml index b10a4ab2db..99223339db 100644 --- a/en_US.ISO8859-1/books/handbook/security/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/security/chapter.xml @@ -645,8 +645,7 @@ turned off, and access to raw devices will be denied. Higher levels restrict even more operations. For a full description of the effect of various secure levels, please read the - &man.security.7; manual page (or the manual page of - &man.init.8; in releases older than &os; 7.0).</para> + &man.security.7; manual page.</para> <note> <para>Bumping the secure level to 1 or higher may cause a few diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml index 5ed8d17942..53d1e21e03 100644 --- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml @@ -13,31 +13,28 @@ <indexterm><primary>serial communications</primary></indexterm> - <para>&unix; has always had support for serial communications. In - fact, the very first &unix; machines relied on serial lines for - user input and output. Things have changed a lot from the days - when the average <quote>terminal</quote> consisted of a - 10-character-per-second serial printer and a keyboard. This - chapter will cover some of the ways in which FreeBSD uses serial - communications.</para> + <para>&unix; has always had support for serial communications as + the very first &unix; machines relied on serial lines for user + input and output. Things have changed a lot from the days + when the average terminal consisted of a 10-character-per-second + serial printer and a keyboard. This chapter covers some of the + ways serial communications can be used on &os;.</para> <para>After reading this chapter, you will know:</para> <itemizedlist> <listitem> - <para>How to connect terminals to your FreeBSD - system.</para> + <para>How to connect terminals to a &os; system.</para> </listitem> <listitem> - <para>How to use a modem to dial out to remote - hosts.</para> + <para>How to use a modem to dial out to remote hosts.</para> </listitem> <listitem> - <para>How to allow remote users to login to your - system with a modem.</para> + <para>How to allow remote users to login to a &os; system + with a modem.</para> </listitem> <listitem> - <para>How to boot your system from a serial console.</para> + <para>How to boot a &os; system from a serial console.</para> </listitem> </itemizedlist> @@ -45,17 +42,16 @@ <itemizedlist> <listitem> - <para>Know how to configure and install a new kernel (<xref - linkend="kernelconfig"/>).</para> + <para>Know how to <link linkend="kernelconfig"> configure and + install a custom kernel</link>.</para> </listitem> <listitem> - <para>Understand &unix; permissions and processes (<xref - linkend="basics"/>).</para> + <para>Understand <link linkend="basics"> &os; permissions + and processes</link>.</para> </listitem> <listitem> <para>Have access to the technical manual for the serial - hardware (modem or multi-port card) that you would like to - use with FreeBSD.</para> + hardware to be used with &os;.</para> </listitem> </itemizedlist> </sect1> @@ -63,17 +59,6 @@ <sect1 id="serial"> <title>Introduction</title> - <warning> - <para>As of &os; 8.0, device nodes for serial ports have been - renamed from - <filename>/dev/cuad<replaceable>N</replaceable></filename> to - <filename>/dev/cuau<replaceable>N</replaceable></filename> and - from - <filename>/dev/ttyd<replaceable>N</replaceable></filename> to - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> <!-- XXX Write me! --> <sect2 id="serial-terminology"> @@ -82,30 +67,30 @@ <variablelist> <indexterm><primary>bits-per-second</primary></indexterm> <varlistentry> - <term>bps</term> + <term><acronym>bps</acronym></term> <listitem> - <para>Bits per Second — the rate at which data is - transmitted</para> + <para>Bits per Second (<acronym>bps</acronym>) is the rate + at which data is transmitted.</para> </listitem> </varlistentry> <varlistentry> - <term>DTE</term> + <term><acronym>DTE</acronym></term> <listitem> <indexterm><primary>DTE</primary></indexterm> - <para>Data Terminal Equipment — for example, your - computer</para> + <para>An example of a Data Terminal Equipment + (<acronym>DTE</acronym>) is a computer.</para> </listitem> </varlistentry> <varlistentry> - <term>DCE</term> + <term><acronym>DCE</acronym></term> <listitem> <indexterm><primary>DCE</primary></indexterm> - <para>Data Communications Equipment — your - modem</para> + <para>An example of a Data Communications Equipment + (<acronym>DTE</acronym>) is a modem.</para> </listitem> </varlistentry> @@ -115,8 +100,9 @@ <listitem> <indexterm><primary>RS-232C cables</primary></indexterm> - <para>EIA standard for hardware serial - communications</para> + <para>The original standard for hardware serial + communications. It is now usually referred to as + <acronym>TIA</acronym>-232</para> </listitem> </varlistentry> </variablelist> @@ -124,28 +110,26 @@ <para>When talking about communications data rates, this section does not use the term <quote>baud</quote>. Baud refers to the number of electrical state transitions that may be made in a - period of time, while <quote>bps</quote> (bits per second) is - the <emphasis>correct</emphasis> term to use (at least it does - not seem to bother the curmudgeons quite as much).</para> + period of time, while <acronym>bps</acronym> is the + <emphasis>correct</emphasis> term to use.</para> </sect2> <sect2 id="serial-cables-ports"> <title>Cables and Ports</title> - <para>To connect a modem or terminal to your FreeBSD system, you - will need a serial port on your computer and the proper cable - to connect to your serial device. If you are already familiar - with your hardware and the cable it requires, you can safely - skip this section.</para> + <para>To connect a modem or serial terminal to a &os; system, a + serial port on the computer and the proper cable to connect to + the serial device are needed. Users who are already familiar + with serial hardware and cabling can safely skip this + section.</para> <sect3 id="term-cables"> <title>Cables</title> <para>There are several different kinds of serial cables. The - two most common types for our purposes are null-modem cables - and standard (<quote>straight</quote>) RS-232 cables. The - documentation for your hardware should describe the type of - cable required.</para> + two most common types are null-modem cables and standard + RS-232 cables. The documentation for the hardware should + describe the type of cable required.</para> <sect4 id="term-cables-null"> <title>Null-modem Cables</title> @@ -160,16 +144,15 @@ <quote>Transmitted Data</quote> pin on one end goes to the <quote>Received Data</quote> pin on the other end.</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> + <para>A null-modem cable can be constructed for use with + terminals. The following table shows the RS-232C <link + linkend="serialcomms-signal-names">signal names</link> + and the pin numbers on a DB-25 connector. While the + standard calls for a straight-through pin 1 to pin 1 + <emphasis>Protective Ground</emphasis> line, it is often + omitted. Some terminals work using only pins 2, 3, and + 7, while others require different configurations than + the examples shown below.</para> <table frame="none" pgwide="1"> <title>DB-25 to DB-25 Null-Modem Cable</title> @@ -261,8 +244,8 @@ </tgroup> </table> - <para>Here are two other schemes more common - nowadays.</para> + <para>The next two tables show two other common + schemes.</para> <table frame="none" pgwide="1"> <title>DB-9 to DB-9 Null-Modem Cable</title> @@ -451,10 +434,9 @@ 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 + <para>The above designs seem to be the most popular. In + another variation, SG connects to SG, TD connects to RD, + RTS and CTS connect to DCD, DTR connects to DSR, and vice-versa.</para> </sect4> @@ -464,11 +446,11 @@ <indexterm><primary>RS-232C cables</primary></indexterm> <para>A standard serial cable passes all of the RS-232C - signals straight through. That is, the <quote>Transmitted + signals straight through. 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 + This is the type of cable used to connect a modem to + the &os; system, and is also appropriate for some terminals.</para> </sect4> </sect3> @@ -477,61 +459,61 @@ <title>Ports</title> <para>Serial ports are the devices through which data is - transferred between the FreeBSD host computer and the + transferred between the &os; host computer and the terminal. This section describes the kinds of ports that - exist and how they are addressed in FreeBSD.</para> + exist and how they are addressed in &os;.</para> <sect4 id="term-portkinds"> <title>Kinds of Ports</title> - <para>Several kinds of serial ports exist. Before you - purchase or construct a cable, you need to make sure it - will fit the ports on your terminal and on the FreeBSD + <para>Several kinds of serial ports exist. Before + purchasing or constructing a cable, make sure it will + fit the ports on the terminal and on the &os; system.</para> - <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> + <para>Most terminals have DB-25 ports. Personal computers + may have DB-25 or DB-9 ports. A multiport serial card may + have RJ-12 or RJ-45 ports.</para> <para>See the documentation that accompanied the hardware - for specifications on the kind of port in use. A visual - inspection of the port often works too.</para> + for specifications on the kind of port or visually verify + the type of port.</para> </sect4> <sect4 id="term-portnames"> <title>Port Names</title> - <para>In FreeBSD, you access each serial port through an - entry in the <filename>/dev</filename> directory. There - are two different kinds of entries:</para> + <para>In &os;, each serial port is accessed through an + entry in <filename class="directory">/dev</filename>. + There are two different kinds of entries:</para> <itemizedlist> <listitem> <para>Call-in ports are named <filename>/dev/ttyu<replaceable>N</replaceable></filename> where <replaceable>N</replaceable> is the port number, - starting from zero. Generally, you use the call-in - port for terminals. Call-in ports require that the - serial line assert the data carrier detect (DCD) - signal to work correctly.</para> + starting from zero. Generally, the call-in port is + used for terminals. Call-in ports require that the + serial line assert the Data Carrier Detect + (<acronym>DCD</acronym>) signal to work + correctly.</para> </listitem> <listitem> <para>Call-out ports are named <filename>/dev/cuau<replaceable>N</replaceable></filename>. - You usually do not use the call-out port for - terminals, just for modems. You may use the call-out - port if the serial cable or the terminal does not - support the carrier detect signal.</para> + Call-out ports are usually not used for terminals, but + are used for modems. The call-out port can be used if + the serial cable or the terminal does not support the + carrier detect signal.</para> </listitem> </itemizedlist> - <para>If you have connected a terminal to the first serial - port(<devicename>COM1</devicename> in &ms-dos;), then you - will use <filename>/dev/ttyu0</filename> to refer to the + <para>If a terminal is connected to the first serial + port(<devicename>COM1</devicename>), use + <filename>/dev/ttyu0</filename> to refer to the terminal. If the terminal is on the second serial port - (also known as <devicename>COM2</devicename>), use + (<devicename>COM2</devicename>), use <filename>/dev/ttyu1</filename>, and so forth.</para> </sect4> @@ -541,72 +523,44 @@ <sect2> <title>Kernel Configuration</title> - <para>FreeBSD supports four serial ports by default. In the + <para>&os; supports four serial ports by default. In the &ms-dos; world, these are known as <devicename>COM1</devicename>, <devicename>COM2</devicename>, <devicename>COM3</devicename>, and - <devicename>COM4</devicename>. FreeBSD currently supports + <devicename>COM4</devicename>. &os; currently supports <quote>dumb</quote> multiport serial interface cards, such as - the BocaBoard 1008 and 2016, as well as more - intelligent multi-port cards such as those made by Digiboard - and Stallion Technologies. However, the default kernel only - looks for the standard COM ports.</para> - - <para>To see if your kernel recognizes any of your serial ports, - watch for messages while the kernel is booting, or use the - <command>/sbin/dmesg</command> command to replay the kernel's - boot messages. In particular, look for messages that start - with the characters <literal>uart</literal> if you use - &os; 8.0 or higher, or <literal>sio</literal> for - &os; 7.4 or older.</para> - - <tip><para>To view just the messages that have the word - <literal>uart</literal> or <literal>sio</literal> depending - on the installed version of &os;, use the commands:</para> - - <screen>&prompt.root; <userinput>/sbin/dmesg | grep 'uart'</userinput> -&prompt.root; <userinput>/sbin/dmesg | grep 'sio'</userinput></screen> - </tip> - - <para>For example, on a &os; 7.<replaceable>X</replaceable> - system with four serial ports, these are the serial-port - specific kernel boot messages:</para> - - <screen>sio0 at 0x3f8-0x3ff irq 4 on isa -sio0: type 16550A -sio1 at 0x2f8-0x2ff irq 3 on isa -sio1: type 16550A -sio2 at 0x3e8-0x3ef irq 5 on isa -sio2: type 16550A -sio3 at 0x2e8-0x2ef irq 9 on isa -sio3: type 16550A</screen> - - <para>If your kernel does not recognize all of your serial - ports, you will probably need to configure your kernel - in the <filename>/boot/device.hints</filename> file. You can - also comment-out or completely remove lines for devices you - do not have.</para> - - <para>Please refer to the &man.sio.4; manual page for - more information on serial ports and multiport boards - configuration. Be careful if you are using a configuration - file that was previously used for a different version of - FreeBSD because the device flags and the syntax have changed - between versions.</para> + the BocaBoard 1008 and 2016, as well as more intelligent + multi-port cards such as those made by Digiboard and Stallion + Technologies. However, the default kernel only looks for the + standard COM ports.</para> + + <para>To see if the kernel recognizes the serial ports, + watch for messages while the kernel is booting, or use + <command>/sbin/dmesg</command> to replay the kernel's + boot messages. Look for messages that start with the + characters <literal>uart</literal>:</para> + + <screen>&prompt.root; <userinput>/sbin/dmesg | grep 'uart'</userinput></screen> + + <para>If the kernel does not recognize all of the serial + ports, configure <filename>/boot/device.hints</filename>. + When editing this file, one can comment out or completely + remove lines for devices that do not exist on the + system.</para> <note> <para><literal>port IO_COM1</literal> is a substitution for <literal>port 0x3f8</literal>, <literal>IO_COM2</literal> is <literal>0x2f8</literal>, <literal>IO_COM3</literal> is <literal>0x3e8</literal>, and <literal>IO_COM4</literal> is - <literal>0x2e8</literal>, which are fairly common port - addresses for their respective serial ports; interrupts 4, - 3, 5, and 9 are fairly common interrupt request lines. Also - note that regular serial ports <emphasis>cannot</emphasis> - share interrupts on ISA-bus PCs (multiport boards have + <literal>0x2e8</literal>. These are fairly common port + addresses for their respective serial ports and interrupts + 4, 3, 5, and 9 are fairly common interrupt request lines. + Regular serial ports <emphasis>cannot</emphasis> share + interrupts on ISA-bus PCs. Multiport boards have on-board electronics that allow all the 16550A's on the - board to share one or two interrupt request lines).</para> + board to share one or two interrupt request lines.</para> </note> </sect2> @@ -615,13 +569,13 @@ sio3: type 16550A</screen> <title>Device Special Files</title> <para>Most devices in the kernel are accessed through - <quote>device special files</quote>, which are located in the - <filename>/dev</filename> directory. The + <quote>device special files</quote> which are located in + <filename class="directory">/dev</filename>. The <devicename>sio</devicename> devices are accessed through the <filename>/dev/ttyu<replaceable>N</replaceable></filename> (dial-in) and <filename>/dev/cuau<replaceable>N</replaceable></filename> - (call-out) devices. FreeBSD also provides initialization + (call-out) devices. &os; also provides initialization devices (<filename>/dev/ttyu<replaceable>N</replaceable>.init</filename> and @@ -635,9 +589,9 @@ sio3: type 16550A</screen> such as <literal>crtscts</literal> for modems which use <literal>RTS/CTS</literal> signaling for flow control. The locking devices are used to lock flags on ports to prevent - users or programs changing certain parameters; see the manual - pages &man.termios.4;, &man.sio.4;, and &man.stty.1; for - information on the terminal settings, locking and initializing + users or programs changing certain parameters. Refer to + &man.termios.4;, &man.sio.4;, and &man.stty.1; for + information on terminal settings, locking and initializing devices, and setting terminal options, respectively.</para> </sect2> @@ -651,20 +605,20 @@ sio3: type 16550A</screen> <para>The <devicename>ttyu<replaceable>N</replaceable></devicename> (or <devicename>cuau<replaceable>N</replaceable></devicename>) - device is the regular device you will want to open for your - applications. When a process opens the device, it will have a - default set of terminal I/O settings. You can see these - settings with the command</para> + is the regular device to open for applications. When a + process opens the device, it will have a default set of + terminal I/O settings. These settings can be viewed with the + command:</para> <screen>&prompt.root; <userinput>stty -a -f /dev/ttyu1</userinput></screen> - <para>When you change the settings to this device, the settings - are in effect until the device is closed. When it is - reopened, it goes back to the default set. To make changes to - the default set, you can open and adjust the settings of the + <para>When the settings are changed for a device, the settings + are in effect until the device is closed. When the device is + reopened, it goes back to the default set. To permanently + change the default set, open and adjust the settings of the <quote>initial state</quote> device. For example, to turn on <option>CLOCAL</option> mode, 8 bit communication, and - <option>XON/XOFF</option> flow control by default for + <option>XON/XOFF</option> flow control for <devicename>ttyu5</devicename>, type:</para> <screen>&prompt.root; <userinput>stty -f /dev/ttyu5.init clocal cs8 ixon ixoff</userinput></screen> @@ -674,8 +628,8 @@ sio3: type 16550A</screen> <secondary><filename>rc.serial</filename></secondary> </indexterm> - <para>System-wide initialization of the serial devices is - controlled in <filename>/etc/rc.d/serial</filename>. This + <para>System-wide initialization of serial devices is + controlled by <filename>/etc/rc.d/serial</filename>. This file affects the default settings of serial devices.</para> <para>To prevent certain settings from being changed by an @@ -689,9 +643,8 @@ sio3: type 16550A</screen> <devicename>ttyu5</devicename> and tries to change the speed of the port will be stuck with 57600 bps.</para> - <para>Naturally, you should make the initial state and lock - state devices writable only by the <username>root</username> - account.</para> + <para>The initial state and lock state devices should only be + writable by <username>root</username>.</para> </sect2> </sect1> @@ -708,120 +661,85 @@ sio3: type 16550A</screen> </sect1info> <title>Terminals</title> - <warning> - <para>As of &os; 8.0, device nodes for serial ports have been - renamed from - <filename>/dev/cuad<replaceable>N</replaceable></filename> to - <filename>/dev/cuau<replaceable>N</replaceable></filename> and - from - <filename>/dev/ttyd<replaceable>N</replaceable></filename> to - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> - <indexterm><primary>terminals</primary></indexterm> <para>Terminals provide a convenient and low-cost way to access - your FreeBSD system when you are not at the computer's console - or on a connected network. This section describes how to use - terminals with FreeBSD.</para> + a &os; system when not at the computer's console or on a + connected network. This section describes how to use terminals + with &os;.</para> <sect2 id="term-uses"> <title>Uses and Types of Terminals</title> <para>The original &unix; systems did not have consoles. - Instead, people logged in and ran programs through terminals - that were connected to the computer's serial ports. It is - quite similar to using a modem and terminal software to dial - into a remote system to do text-only work.</para> - - <para>Today's PCs have consoles capable of high quality - graphics, but the ability to establish a login session on a - serial port still exists in nearly every &unix; style - operating system today; FreeBSD is no exception. By using a - terminal attached to an unused serial port, you can log in and - run any text program that you would normally run on the - console or in an <command>xterm</command> window in the X - Window System.</para> - - <para>For the business user, you can attach many terminals to a - FreeBSD system and place them on your employees' desktops. - For a home user, a spare computer such as an older IBM PC or a - &macintosh; can be a terminal wired into a more powerful - computer running FreeBSD. You can turn what might otherwise be - a single-user computer into a powerful multiple user - system.</para> - - <para>For FreeBSD, there are three kinds of terminals:</para> - - <itemizedlist> - <listitem> - <para><link linkend="term-dumb">Dumb terminals</link></para> - </listitem> - - <listitem> - <para><link linkend="term-pcs">PCs acting as - terminals</link></para> - </listitem> - - <listitem> - <para><link linkend="term-x">X terminals</link></para> - </listitem> - </itemizedlist> - - <para>The remaining subsections describe each kind.</para> + Instead, users logged in and ran programs through terminals + that were connected to the computer's serial ports.</para> + + <para>The ability to establish a login session on a serial port + still exists in nearly every &unix;-like operating system + today, including &os;. By using a terminal attached to an + unused serial port, a user can log in and run any text program + that can normally be run on the console or in an + <command>xterm</command> window.</para> + + <para>Many terminals can be attached to a &os; system. An older + spare computer can be used as a terminal wired into a more + powerful computer running &os;. This can turn what might + otherwise be a single-user computer into a powerful multiple + user system.</para> + + <para>This section describes three kinds of terminals supported + by &os;: dumb terminals, computers acting as terminals, and X + terminals.</para> <sect3 id="term-dumb"> <title>Dumb Terminals</title> - <para>Dumb terminals are specialized pieces of hardware that - let you connect to computers over serial lines. They are - called <quote>dumb</quote> because they have only enough - computational power to display, send, and receive text. You - cannot run any programs on them. It is the computer to - which you connect them that has all the power to run text + <para>Dumb terminals are specialized hardware that connect to + computers over serial lines. They are called + <quote>dumb</quote> because they have only enough + computational power to display, send, and receive text. No + programs can be run on these devices. Dumb terminals + connect to a computer that has all the power to run text editors, compilers, email, games, and so forth.</para> <para>There are hundreds of kinds of dumb terminals made by - many manufacturers, including Digital Equipment - Corporation's VT-100 and Wyse's WY-75. Just about any kind - will work with FreeBSD. Some high-end terminals can even - display graphics, but only certain software packages can - take advantage of these advanced features.</para> + many manufacturers, and just about any kind will work with + &os;. Some high-end terminals can even display graphics, + but only certain software packages can take advantage of + these advanced features.</para> <para>Dumb terminals are popular in work environments where - workers do not need access to graphical applications such as - those provided by the X Window System.</para> + workers do not need access to graphical applications.</para> </sect3> <sect3 id="term-pcs"> - <title>PCs Acting as Terminals</title> + <title>Computers Acting as Terminals</title> <para>If a <link linkend="term-dumb">dumb terminal</link> has - just enough ability to display, send, and receive text, then - certainly any spare personal computer can be a dumb - terminal. All you need is the proper cable and some - <emphasis>terminal emulation</emphasis> software to run on - the computer.</para> - - <para>Such a configuration is popular in homes. For example, - if your spouse is busy working on your FreeBSD system's - console, you can do some text-only work at the same time - from a less powerful personal computer hooked up as a - terminal to the FreeBSD system.</para> + just enough ability to display, send, and receive text, + any spare computer can be a dumb terminal. All that is + needed is the proper cable and some <emphasis>terminal + emulation</emphasis> software to run on the + computer.</para> + + <para>This configuration can be useful. For example, if one + user is busy working at the &os; system's console, another + user can do some text-only work at the same time from a + less powerful personal computer hooked up as a terminal to + the &os; system.</para> <para>There are at least two utilities in the base-system of &os; that can be used to work through a serial connection: &man.cu.1; and &man.tip.1;.</para> <para>To connect from a client system that runs &os; to the - serial connection of another system, you can use:</para> + serial connection of another system, use:</para> <screen>&prompt.root; <userinput>cu -l <replaceable>serial-port-device</replaceable></userinput></screen> <para>Where <quote>serial-port-device</quote> is the name of a - special device file denoting a serial port of your system. + special device file denoting a serial port on the system. These device files are called <devicename>/dev/cuau<replaceable>N</replaceable></devicename>.</para> @@ -830,17 +748,13 @@ sio3: type 16550A</screen> <note> <para>Note that device numbers in &os; start from zero and - not one (like they do, for instance in &ms-dos;-derived - systems). This means that what &ms-dos;-based systems - call <devicename>COM1</devicename> is usually + not one. This means that <devicename>COM1</devicename> is <filename>/dev/cuau0</filename> in &os;.</para> </note> <note> - <para>Some people prefer to use other programs, available - through the Ports Collection. The Ports include quite a - few utilities which can work in ways similar to &man.cu.1; - and &man.tip.1;, i.e., <filename + <para>Some people prefer to use other programs available + through the Ports Collection, such as <filename role="package">comms/minicom</filename>.</para> </note> </sect3> @@ -854,48 +768,44 @@ sio3: type 16550A</screen> being relegated to text-only applications, they can display any X application.</para> - <para>We introduce X terminals just for the sake of - completeness. However, this chapter does - <emphasis>not</emphasis> cover setup, configuration, or use - of X terminals.</para> + <para>This chapter does <emphasis>not</emphasis> cover the + setup, configuration, or use of X terminals.</para> </sect3> </sect2> <sect2 id="term-config"> <title>Configuration</title> - <para>This section describes what you need to configure on your - FreeBSD system to enable a login session on a terminal. It - assumes you have already configured your kernel to support the - serial port to which the terminal is connected—and that - you have connected it.</para> - - <para>Recall from <xref linkend="boot"/> that the - <command>init</command> process is responsible for all process - control and initialization at system startup. One of the - tasks performed by <command>init</command> is to read the - <filename>/etc/ttys</filename> file and start a + <para>This section describes how to configure a &os; system to + enable a login session on a terminal. It assumes that the + kernel is configured to support the serial port to which the + terminal is connected and that the terminal is + connected.</para> + + <para>The <command>init</command> process is responsible for all + process control and initialization at system startup. One of + the tasks performed by <command>init</command> is to read + <filename>/etc/ttys</filename> and start a <command>getty</command> process on the available terminals. The <command>getty</command> process is responsible for reading a login name and starting the <command>login</command> program.</para> - <para>Thus, to configure terminals for your FreeBSD system the - following steps should be taken as - <username>root</username>:</para> + <para>To configure terminals for a &os; system, the following + steps should be taken as <username>root</username>:</para> <procedure> <step> <para>Add a line to <filename>/etc/ttys</filename> for the - entry in the <filename>/dev</filename> directory for the - serial port if it is not already there.</para> + entry in <filename class="directory">/dev</filename> for + the serial port if it is not already there.</para> </step> <step> <para>Specify that <command>/usr/libexec/getty</command> be run on the port, and specify the appropriate - <replaceable>getty</replaceable> type from the - <filename>/etc/gettytab</filename> file.</para> + <replaceable>getty</replaceable> type from + <filename>/etc/gettytab</filename>.</para> </step> <step> @@ -912,53 +822,53 @@ sio3: type 16550A</screen> </step> <step> - <para>Force <command>init</command> to reread the - <filename>/etc/ttys</filename> file.</para> + <para>Force <command>init</command> to reread + <filename>/etc/ttys</filename>.</para> </step> </procedure> - <para>As an optional step, you may wish to create a custom + <para>As an optional step, create a custom <replaceable>getty</replaceable> type for use in step 2 by - making an entry in <filename>/etc/gettytab</filename>. This - chapter does not explain how to do so; you are encouraged to - see the &man.gettytab.5; and the &man.getty.8; manual pages - for more information.</para> + making an entry in <filename>/etc/gettytab</filename>. For + more information, refer to &man.gettytab.5; and + &man.getty.8;.</para> <sect3 id="term-etcttys"> <title>Adding an Entry to <filename>/etc/ttys</filename></title> - <para>The <filename>/etc/ttys</filename> file lists all of the - ports on your FreeBSD system where you want to allow logins. - For example, the first virtual console - <devicename>ttyv0</devicename> has an entry in this file. - You can log in on the console using this entry. This - file also contains entries for the other virtual consoles, - serial ports, and pseudo-ttys. For a hardwired terminal, - just list the serial port's <filename>/dev</filename> entry - without the <filename>/dev</filename> part (for example, + <para><filename>/etc/ttys</filename> lists all of the ports + on the &os; system which allow logins. For example, the + first virtual console, + <devicename>ttyv0</devicename>, has an entry in this file, + allowing logins on the console. This file also contains + entries for the other virtual consoles, serial ports, and + pseudo-ttys. For a hardwired terminal, + list the serial port's <filename + class="directory">/dev</filename> entry without the + <literal>/dev</literal> part. For example, <filename>/dev/ttyv0</filename> would be listed as - <devicename>ttyv0</devicename>).</para> + <literal>ttyv0</literal>.</para> - <para>A default FreeBSD install includes an - <filename>/etc/ttys</filename> file with support for the + <para>A default &os; install includes an + <filename>/etc/ttys</filename> with support for the first four serial ports: <devicename>ttyu0</devicename> - through <devicename>ttyu3</devicename>. If you are - attaching a terminal to one of those ports, you do not need - to add another entry.</para> + through <devicename>ttyu3</devicename>. When + attaching a terminal to one of those ports, this file does + not need to be edited.</para> <example id="ex-etc-ttys"> <title>Adding Terminal Entries to <filename>/etc/ttys</filename></title> - <para>Suppose we would like to connect two terminals to the - system: a Wyse-50 and an old 286 IBM PC running + <para>This example configures two terminals: a Wyse-50 and + an old 286 IBM PC running <application>Procomm</application> terminal software - emulating a VT-100 terminal. We connect the Wyse to the - second serial port and the 286 to the sixth serial port (a - port on a multiport serial card). The corresponding - entries in the <filename>/etc/ttys</filename> file would - look like this:</para> + emulating a VT-100 terminal. The Wyse is connected to the + second serial port and the 286 to the sixth serial port on + a multiport serial card. The corresponding entries in + <filename>/etc/ttys</filename> would look like + this:</para> <programlisting>ttyu1<co id="co-ttys-line1col1"/> "/usr/libexec/getty std.38400"<co @@ -972,57 +882,56 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> <callout arearefs="co-ttys-line1col1"> <para>The first field normally specifies the name of the terminal special file as it is found in - <filename>/dev</filename>.</para> + <filename class="directory">/dev</filename>.</para> </callout> <callout arearefs="co-ttys-line1col2"> <para>The second field is the command to execute for this line, which is usually &man.getty.8;. <command>getty</command> initializes and opens the - line, sets the speed, prompts for a user name and then - executes the &man.login.1; program.</para> + line, sets the speed, prompts for a user name, and + then executes &man.login.1;.</para> <para>The <command>getty</command> program accepts one (optional) parameter on its command line, the <replaceable>getty</replaceable> type. A <replaceable>getty</replaceable> type configures - characteristics on the terminal line, like bps rate - and parity. The <command>getty</command> program - reads these characteristics from the file - <filename>/etc/gettytab</filename>.</para> - - <para>The file <filename>/etc/gettytab</filename> - contains lots of entries for terminal lines both old - and new. In almost all cases, the entries that start - with the text <literal>std</literal> will work for - hardwired terminals. These entries ignore parity. - There is a <literal>std</literal> entry for each bps - rate from 110 to 115200. Of course, you can add your - own entries to this file. The &man.gettytab.5; manual - page provides more information.</para> + characteristics on the terminal line, like + <acronym>bps</acronym> rate and parity. + <command>getty</command> reads these characteristics + from <filename>/etc/gettytab</filename>.</para> + + <para><filename>/etc/gettytab</filename> contains many + entries for terminal lines, both old and new. In + almost all cases, the entries that start with the + text <literal>std</literal> will work for hardwired + terminals as these entries ignore parity. There is + a <literal>std</literal> entry for each + <acronym>bps</acronym> rate from 110 to 115200. + &man.gettytab.5; provides more information.</para> <para>When setting the <replaceable>getty</replaceable> - type in the <filename>/etc/ttys</filename> file, make - sure that the communications settings on the terminal + type in <filename>/etc/ttys</filename>, make sure + that the communications settings on the terminal match.</para> - <para>For our example, the Wyse-50 uses no parity and + <para>For this example, the Wyse-50 uses no parity and connects at 38400 bps. The 286 PC uses no parity and connects at 19200 bps.</para> </callout> <callout arearefs="co-ttys-line1col3"> <para>The third field is the type of terminal usually - connected to that tty line. For dial-up ports, + connected to that terminal line. For dial-up ports, <literal>unknown</literal> or - <literal>dialup</literal> is typically used in this - field since users may dial up with practically any - type of terminal or software. For hardwired - terminals, the terminal type does not change, so you - can put a real terminal type from the &man.termcap.5; - database file in this field.</para> - - <para>For our example, the Wyse-50 uses the real + <literal>dialup</literal> is typically used since + users may dial up with practically any type of + terminal or software. Since the terminal type does + not change for hardwired terminals, a real terminal + type from &man.termcap.5; can be used in this + field.</para> + + <para>For this example, the Wyse-50 uses the real terminal type while the 286 PC running <application>Procomm</application> will be set to emulate at VT-100. </para> @@ -1030,30 +939,31 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> <callout arearefs="co-ttys-line1col4"> <para>The fourth field specifies if the port should be - enabled. Putting <literal>on</literal> here will have - the <command>init</command> process start the program - in the second field, <command>getty</command>. If you - put <literal>off</literal> in this field, there will - be no <command>getty</command>, and hence no logins on - the port.</para> + enabled. If set to <literal>on</literal>, the + <command>init</command> process will start the program + in the second field, <command>getty</command>. If + this field is set to <literal>off</literal>, there + will be no <command>getty</command>, and hence no + logins on the port.</para> </callout> <callout arearefs="co-ttys-line1col5"> <para>The final field is used to specify whether the - port is secure. Marking a port as secure means that - you trust it enough to allow the - <username>root</username> account (or any account with - a user ID of 0) to login from that port. Insecure - ports do not allow <username>root</username> logins. - On an insecure port, users must login from - unprivileged accounts and then use &man.su.1; or a - similar mechanism to gain superuser privileges.</para> - - <para>It is highly recommended that you use - <quote>insecure</quote> - even for terminals that are behind locked doors. It - is quite easy to login and use <command>su</command> - if you need superuser privileges.</para> + port is secure. Marking a port as + <literal>secure</literal> means that it is trusted + enough to allow <username>root</username>, or any + account with a <acronym>UID</acronym> of 0, to login + from that port. Insecure ports do not allow + <username>root</username> logins. On an insecure + port, users must login from unprivileged accounts and + then use &man.su.1; or a similar mechanism to gain + superuser privileges.</para> + + <para>It is highly recommended to use + <literal>insecure</literal>, even for terminals that + are behind locked doors. It is quite easy to login + and use <command>su</command> when superuser + privileges are needed.</para> </callout> </calloutlist> </example> @@ -1063,34 +973,34 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> <title>Force <command>init</command> to Reread <filename>/etc/ttys</filename></title> - <para>After making the necessary changes to the - <filename>/etc/ttys</filename> file you should send a SIGHUP + <para>After making any changes to + <filename>/etc/ttys</filename>, send a SIGHUP (hangup) signal to the <command>init</command> process to - force it to re-read its configuration file. For - example:</para> + force it to re-read its configuration file:</para> <screen>&prompt.root; <userinput>kill -HUP 1</userinput></screen> <note> <para><command>init</command> is always the first process - run on a system, therefore it will always have PID - 1.</para> + run on a system, therefore it will always have a process + ID of 1.</para> </note> <para>If everything is set up correctly, all cables are in place, and the terminals are powered up, then a <command>getty</command> process should be running on each - terminal and you should see login prompts on your terminals - at this point.</para> + terminal and login prompts should be available on each + terminal.</para> </sect3> </sect2> <sect2 id="term-debug"> - <title>Troubleshooting Your Connection</title> + <title>Troubleshooting the Connection</title> <para>Even with the most meticulous attention to detail, something could still go wrong while setting up a terminal. - Here is a list of symptoms and some suggested fixes.</para> + Here is a list of common symptoms and some suggested + fixes.</para> <sect3> <title>No Login Prompt Appears</title> @@ -1101,14 +1011,14 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> port.</para> <para>Make sure the cable is connected firmly to both the - terminal and the FreeBSD computer. Make sure it is the + terminal and the &os; computer. Make sure it is the right kind of cable.</para> - <para>Make sure the terminal and FreeBSD agree on the bps rate - and parity settings. If you have a video display terminal, - make sure the contrast and brightness controls are turned - up. If it is a printing terminal, make sure paper and ink - are in good supply.</para> + <para>Make sure the terminal and &os; agree on the + <acronym>bps</acronym> rate and parity settings. For a + video display terminal, make sure the contrast and + brightness controls are turned up. If it is a printing + terminal, make sure paper and ink are in good supply.</para> <para>Make sure that a <command>getty</command> process is running and serving the terminal. For example, to get a @@ -1117,46 +1027,44 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> <screen>&prompt.root; <userinput>ps -axww|grep getty</userinput></screen> - <para>You should see an entry for the terminal. For - example, the following display shows that a + <para>There should be an entry for the terminal. For example, + the following display shows that a <command>getty</command> is running on the second serial - port <devicename>ttyu1</devicename> and is using the + port, <devicename>ttyu1</devicename>, and is using the <literal>std.38400</literal> entry in <filename>/etc/gettytab</filename>:</para> <screen>22189 d1 Is+ 0:00.03 /usr/libexec/getty std.38400 ttyu1</screen> <para>If no <command>getty</command> process is running, make - sure you have enabled the port in - <filename>/etc/ttys</filename>. Also remember to run - <command>kill -HUP 1</command> after modifying the - <filename>ttys</filename> file.</para> + sure the port is enabled in + <filename>/etc/ttys</filename>. Remember to run + <command>kill -HUP 1</command> after modifying + <filename>/etc/ttys</filename>.</para> <para>If the <command>getty</command> process is running but the terminal still does not display a login prompt, - or if it displays a prompt but will not allow you to - type, your terminal or cable may not support hardware - handshaking. Try changing the entry in - <filename>/etc/ttys</filename> from - <literal>std.38400</literal> to - <literal>3wire.38400</literal> (remember to run + or if it displays a prompt but will not accept typed input, + the terminal or cable may not support hardware handshaking. + Try changing the entry in <filename>/etc/ttys</filename> + from <literal>std.38400</literal> to + <literal>3wire.38400</literal>, then run <command>kill -HUP 1</command> after modifying - <filename>/etc/ttys</filename>). The + <filename>/etc/ttys</filename>. The <literal>3wire</literal> entry is similar to <literal>std</literal>, but ignores hardware - handshaking. You may need to reduce the baud rate or - enable software flow control when using - <literal>3wire</literal> to prevent buffer - overflows.</para> + handshaking. The baud rate may need to be reduced or + software flow control enabled when using + <literal>3wire</literal> to prevent buffer overflows.</para> </sect3> <sect3> <title>If Garbage Appears Instead of a Login Prompt</title> - <para>Make sure the terminal and FreeBSD agree on the bps rate - and parity settings. Check the <command>getty</command> - processes to make sure the correct + <para>Make sure the terminal and &os; agree on the + <acronym>bps</acronym> rate and parity settings. Check the + <command>getty</command> processes to make sure the correct <replaceable>getty</replaceable> type is in use. If not, edit <filename>/etc/ttys</filename> and run <command>kill -HUP 1</command>.</para> @@ -1164,10 +1072,10 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> </sect3> <sect3> - <title>Characters Appear Doubled; the Password Appears When + <title>Characters Appear Doubled and the Password Appears When Typed</title> - <para>Switch the terminal (or the terminal emulation software) + <para>Switch the terminal, or the terminal emulation software, from <quote>half duplex</quote> or <quote>local echo</quote> to <quote>full duplex.</quote></para> @@ -1194,50 +1102,34 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> </sect1info> <title>Dial-in Service</title> - <warning> - <para>As of &os; 8.0, device nodes for serial ports have been - renamed from - <filename>/dev/cuad<replaceable>N</replaceable></filename> to - <filename>/dev/cuau<replaceable>N</replaceable></filename> and - from - <filename>/dev/ttyd<replaceable>N</replaceable></filename> to - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> - <indexterm><primary>dial-in service</primary></indexterm> - <para>Configuring your FreeBSD system for dial-in service is very - similar to connecting terminals except that you are dealing with - modems instead of terminals.</para> + <para>Configuring a &os; system for dial-in service is similar + to connecting terminals except that modems are used instead of + terminal devices.</para> <sect2> <title>External Versus Internal Modems</title> - <para>External modems seem to be more convenient for dial-up, - because external modems often can be semi-permanently - configured via parameters stored in non-volatile RAM and they - usually provide lighted indicators that display the state of - important RS-232 signals. Blinking lights impress visitors, - but lights are also very useful to see whether a modem is - operating properly.</para> + <para>External modems are more convenient for dial-up because + they often can be semi-permanently configured via parameters + stored in non-volatile RAM and they usually provide lighted + indicators that display the state of important RS-232 signals, + indicating whether the modem is operating properly.</para> <para>Internal modems usually lack non-volatile RAM, so their - configuration may be limited only to setting DIP switches. - If your internal modem has any signal indicator lights, it is - probably difficult to view the lights when the system's cover - is in place.</para> + configuration may be limited to setting DIP switches. If the + internal modem has any signal indicator lights, they are + difficult to view when the system's cover is in place.</para> <sect3> <title>Modems and Cables</title> <indexterm><primary>modem</primary></indexterm> - <para>If you are using an external modem, then you will of - course need the proper cable. A standard RS-232C serial - cable should suffice as long as all of the normal signals - are wired:</para> + <para>When using an external modem, a proper cable is needed. + A standard RS-232C serial cable should suffice as long as + all of the normal signals are wired:</para> <table frame="none" pgwide="1" id="serialcomms-signal-names"> <title>Signal Names</title> @@ -1295,39 +1187,38 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> </tgroup> </table> - <para>FreeBSD needs the <acronym>RTS</acronym> and + <para>&os; needs the <acronym>RTS</acronym> and <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 complete. Some cables are wired - without all of the needed signals, so if you have problems, - such as a login session not going away when the line hangs - up, you may have a problem with your cable.</para> + without all of the needed signals, so if a login session + does not go away when the line hangs up, there may be a + problem with the cable.</para> - <para>Like other &unix; like operating systems, FreeBSD uses + <para>Like other &unix;-like operating systems, &os; uses the hardware signals to find out when a call has been answered or a line has been hung up and to hangup and reset - the modem after a call. FreeBSD avoids sending commands to - the modem or watching for status reports from the modem. If - you are familiar with connecting modems to PC-based bulletin - board systems, this may seem awkward.</para> + the modem after a call. &os; avoids sending commands to + the modem or watching for status reports from the + modem.</para> </sect3> </sect2> <sect2> <title>Serial Interface Considerations</title> - <para>FreeBSD supports NS8250-, NS16450-, NS16550-, and + <para>&os; supports the NS8250-, NS16450-, NS16550-, and NS16550A-based EIA RS-232C (CCITT V.24) communications interfaces. The 8250 and 16450 devices have single-character buffers. The 16550 device provides a 16-character buffer, - which allows for better system performance. (Bugs in plain + which allows for better system performance. Bugs in plain 16550's prevent the use of the 16-character buffer, so use - 16550A's if possible). Because single-character-buffer + 16550A's if possible. Because single-character-buffer devices require more work by the operating system than the 16-character-buffer devices, 16550A-based serial interface - cards are much preferred. If the system has many active serial + cards are preferred. If the system has many active serial ports or will have a heavy load, 16550A-based cards are better for low-error-rate communications.</para> </sect2> @@ -1339,18 +1230,18 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> <para>As with terminals, <command>init</command> spawns a <command>getty</command> process for each configured serial port for dial-in connections. For example, if a modem is - attached to <filename>/dev/ttyu0</filename>, the command + attached to <filename>/dev/ttyu0</filename>, <command>ps ax</command> might show this:</para> <screen> 4850 ?? I 0:00.09 /usr/libexec/getty V19200 ttyu0</screen> <para>When a user dials the modem's line and the modems connect, - the <acronym>CD</acronym> (Carrier Detect) line is reported by - the modem. The kernel notices that carrier has been detected - and completes <command>getty</command>'s open of the port. - <command>getty</command> sends a <prompt>login:</prompt> - prompt at the specified initial line speed. - <command>getty</command> watches to see if legitimate + the Carrier Detect (<acronym>CD</acronym>) line is reported by + the modem. The kernel notices that the carrier has been + detected and instructs <command>getty</command> to open the + port. <command>getty</command> sends a + <prompt>login:</prompt> prompt at the specified initial line + speed. <command>getty</command> watches to see if legitimate characters are received, and, in a typical configuration, if it finds junk (probably due to the modem's connection speed being different than <command>getty</command>'s speed), @@ -1360,7 +1251,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> <indexterm> <primary><command>/usr/bin/login</command></primary> </indexterm> - <para>After the user enters his/her login name, + <para>After the user enters their login name, <command>getty</command> executes <filename>/usr/bin/login</filename>, which completes the login by asking for the user's password and then starting the user's @@ -1371,17 +1262,17 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> <sect2> <title>Configuration Files</title> - <para>There are three system configuration files in the - <filename>/etc</filename> directory that you will probably - need to edit to allow dial-up access to your FreeBSD system. - The first, <filename>/etc/gettytab</filename>, contains - configuration information for the - <filename>/usr/libexec/getty</filename> daemon. Second, - <filename>/etc/ttys</filename> holds information that tells - <filename>/sbin/init</filename> what <filename>tty</filename> - devices should have <command>getty</command> processes running - on them. Lastly, you can place port initialization commands - in the <filename>/etc/rc.d/serial</filename> script.</para> + <para>There are three system configuration files in + <filename class="directory">/etc</filename> that probably + need to be edited to allow dial-up access to the &os; system. + <filename>/etc/gettytab</filename> contains configuration + information for the <filename>/usr/libexec/getty</filename> + daemon. <filename>/etc/ttys</filename> holds information that + tells <command>init</command> which + <devicename>tty</devicename>s should have + <command>getty</command> processes running on them. Lastly, + port initialization commands can be placed in + <filename>/etc/rc.d/serial</filename>.</para> <para>There are two schools of thought regarding dial-up modems on &unix;. One group likes to configure their modems and @@ -1395,7 +1286,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> screen-painting methods to make their response better for slower connections.</para> - <para>The other school configures their modems' RS-232 interface + <para>The other group configures their modems' RS-232 interface to vary its speed based on the remote user's connection speed. For example, V.32bis (14.4 Kbps) connections to the modem might make the modem run its RS-232 interface at @@ -1406,17 +1297,15 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> gives a <prompt>login:</prompt> message at an initial speed and watches the characters that come back in response. If the user sees junk, it is assumed that they know they should press - the <keycap>Enter</keycap> key until they see a recognizable - prompt. If the data rates do not match, - <command>getty</command> sees anything the user types as - <quote>junk</quote>, tries going to the next speed and gives - the <prompt>login:</prompt> prompt again. This procedure can - continue ad nauseam, but normally only takes a keystroke - or two before the user sees a good prompt. Obviously, this - login sequence does not look as clean as the former - <quote>locked-speed</quote> method, but a user on a low-speed - connection should receive better interactive response from - full-screen programs.</para> + <keycap>Enter</keycap> until they see a recognizable prompt. + If the data rates do not match, <command>getty</command> sees + anything the user types as <quote>junk</quote>, tries going to + the next speed and gives the <prompt>login:</prompt> prompt + again. This procedure normally only takes a keystroke or two + before the user sees a good prompt. This login sequence does + not look as clean as the <quote>locked-speed</quote> method, + but a user on a low-speed connection should receive better + interactive response from full-screen programs.</para> <para>This section will try to give balanced configuration information, but is biased towards having the modem's data @@ -1430,28 +1319,27 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure</programlisting> </indexterm> <para><filename>/etc/gettytab</filename> is a &man.termcap.5;-style file of configuration information for - &man.getty.8;. Please see the &man.gettytab.5; manual page - for complete information on the format of the file and the - list of capabilities.</para> + &man.getty.8;. Refer to &man.gettytab.5; for complete + information on the format of the file and the list of + capabilities.</para> <sect4> <title>Locked-speed Config</title> - <para>If you are locking your modem's data communications - rate at a particular speed, you probably will not need to - make any changes to - <filename>/etc/gettytab</filename>.</para> + <para>When locking a modem's data communications rate at a + particular speed, no changes to + <filename>/etc/gettytab</filename> should be + needed.</para> </sect4> <sect4> <title>Matching-speed Config</title> - <para>You will need to set up an entry in + <para>Set up an entry in <filename>/etc/gettytab</filename> to give - <command>getty</command> information about the speeds you - wish to use for your modem. If you have a 2400 bps - modem, you can probably use the existing - <literal>D2400</literal> entry.</para> + <command>getty</command> information about the speeds to + use for the modem. For a 2400 bps modem, use the + existing <literal>D2400</literal> entry.</para> <programlisting># # Fast dialup terminals, 2400/1200/300 rotary (can start either way) @@ -1463,11 +1351,10 @@ D2400|d2400|Fast-Dial-2400:\ 5|D300|Fast-Dial-300:\ :nx=D2400:tc=300-baud:</programlisting> - <para>If you have a higher speed modem, you will probably - need to add an entry in - <filename>/etc/gettytab</filename>; here is an entry you - could use for a 14.4 Kbps modem with a top interface - speed of 19.2 Kbps:</para> + <para>For a higher speed modem, add an entry in + <filename>/etc/gettytab</filename>. This entry is for a + 14.4 Kbps modem with a top interface speed of + 19.2 Kbps:</para> <programlisting># # Additions for a V.32bis Modem @@ -1497,12 +1384,11 @@ uq|V19200|High Speed Modem at 19200,8-bit:\ entry to pick up the rest of the <quote>standard</quote> settings for a particular data rate.</para> - <para>If you have a 28.8 Kbps modem and/or you want to - take advantage of compression on a 14.4 Kbps modem, - you need to use a higher communications rate than - 19.2 Kbps. Here is an example of a - <filename>gettytab</filename> entry starting a - 57.6 Kbps:</para> + <para>For a 28.8 Kbps modem or to take advantage of + compression on a 14.4 Kbps modem, use a higher + communications rate than 19.2 Kbps. Here is an + example of a <filename>gettytab</filename> entry starting + a 57.6 Kbps:</para> <programlisting># # Additions for a V.32bis or V.34 Modem @@ -1519,8 +1405,8 @@ vp|VH9600|Very High Speed Modem at 9600,8-bit:\ vq|VH57600|Very High Speed Modem at 57600,8-bit:\ :nx=VH9600:tc=std.57600:</programlisting> - <para>If you have a slow CPU or a heavily loaded system and - do not have 16550A-based serial ports, you may receive + <para>For a slow CPU or a heavily loaded system without + 16550A-based serial ports, there may be <errorname>sio</errorname> <quote>silo</quote> errors at 57.6 Kbps.</para> </sect4> @@ -1533,59 +1419,54 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\ <primary><filename>/etc/ttys</filename></primary> </indexterm> - <para>Configuration of the <filename>/etc/ttys</filename> file - was covered in <xref linkend="ex-etc-ttys"/>. - Configuration for modems is similar but we must pass a - different argument to <command>getty</command> and specify a - different terminal type. The general format for both - locked-speed and matching-speed configurations is:</para> + <para>Configuration of <filename>/etc/ttys</filename> + is covered in <link linkend="ex-etc-ttys"></link>. + Configuration for modems is similar, but a different + argument is passed to <command>getty</command> and a + different terminal type is specified. The general format + for both locked-speed and matching-speed configurations + is:</para> <programlisting>ttyu0 "/usr/libexec/getty <replaceable>xxx</replaceable>" dialup on</programlisting> <para>The first item in the above line is the device special - file for this entry — <devicename>ttyu0</devicename> - means <filename>/dev/ttyu0</filename> is the file that this - <command>getty</command> will be watching. The second item, - <literal>"/usr/libexec/getty - <replaceable>xxx</replaceable>"</literal> - (<replaceable>xxx</replaceable> will be replaced by the - initial <filename>gettytab</filename> capability) is the - process <command>init</command> will run on the device. The - third item, <literal>dialup</literal>, is the default - terminal type. The fourth parameter, <literal>on</literal>, + file for this entry. <literal>ttyu0</literal> indicates + that <command>getty</command> is watching + <devicename>/dev/ttyu0</devicename>. The + <replaceable>xxx</replaceable> will replace the initial + <filename>gettytab</filename> capability and is the process + <command>init</command> will run on the device. The third + item, <literal>dialup</literal>, is the default terminal + type. The fourth parameter, <literal>on</literal>, indicates to <command>init</command> that the line is operational. There can be a fifth parameter, <literal>secure</literal>, but it should only be used for - terminals which are physically secure (such as the system - console).</para> + terminals which are physically secure, such as the system + console.</para> - <para>The default terminal type (<literal>dialup</literal> in - the example above) may depend on local preferences. + <para>The default terminal type, <literal>dialup</literal> in + this example, may depend on local preferences. <literal>dialup</literal> is the traditional default terminal type on dial-up lines so that users may customize their login scripts to notice when the terminal is <literal>dialup</literal> and automatically adjust their - terminal type. However, the author finds it easier at his - site to specify <literal>vt102</literal> as the default - terminal type, since the users just use VT102 emulation on + terminal type. Setting <literal>vt102</literal> as the + default terminal type allows users to use VT102 emulation on their remote systems.</para> - <para>After you have made changes to - <filename>/etc/ttys</filename>, you may send the + <para>After editing <filename>/etc/ttys</filename>, send the <command>init</command> process a <acronym>HUP</acronym> - signal to re-read the file. You can use the command + signal to re-read the file:</para> <screen>&prompt.root; <userinput>kill -HUP 1</userinput></screen> - to send the signal. If this is your first time setting up - the system, you may want to wait until your modem(s) are - properly configured and connected before signaling - <command>init</command>.</para> + <para>Wait until the modem is properly configured and + connected before signaling <command>init</command>.</para> <sect4> <title>Locked-speed Config</title> - <para>For a locked-speed configuration, your + <para>For a locked-speed configuration, the <filename>ttys</filename> entry needs to have a fixed-speed entry provided to <command>getty</command>. For a modem whose port speed is locked at 19.2 Kbps, @@ -1594,26 +1475,24 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\ <programlisting>ttyu0 "/usr/libexec/getty std.19200" dialup on</programlisting> - <para>If your modem is locked at a different data rate, + <para>If the modem is locked at a different data rate, substitute the appropriate value for <literal>std.<replaceable>speed</replaceable></literal> - instead of <literal>std.19200</literal>. Make sure that - you use a valid type listed in + instead of <literal>std.19200</literal>. Make sure to use + a valid type listed in <filename>/etc/gettytab</filename>.</para> </sect4> <sect4> <title>Matching-speed Config</title> - <para>In a matching-speed configuration, your + <para>In a matching-speed configuration, the <filename>ttys</filename> entry needs to reference the - appropriate beginning <quote>auto-baud</quote> (sic) entry - in <filename>/etc/gettytab</filename>. For example, if - you added the above suggested entry for a matching-speed - modem that starts at 19.2 Kbps (the - <filename>gettytab</filename> entry containing the - <literal>V19200</literal> starting point), your - <filename>ttys</filename> entry might look like + appropriate beginning <quote>auto-baud</quote> entry + in <filename>/etc/gettytab</filename>. For example, for + the above suggested entry for a matching-speed modem that + starts at 19.2 Kbps, the + <filename>/etc/ttys</filename> entry might look like this:</para> <programlisting>ttyu0 "/usr/libexec/getty V19200" dialup on</programlisting> @@ -1630,16 +1509,16 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\ <para>High-speed modems, like V.32, V.32bis, and V.34 modems, need to use hardware (<literal>RTS/CTS</literal>) flow - control. You can add <command>stty</command> commands to - <filename>/etc/rc.d/serial</filename> to set the hardware - flow control flag in the FreeBSD kernel for the modem + control. <command>stty</command> can be used to set the + hardware flow control flag in the &os; kernel for the modem ports.</para> - <para>For example to set the <literal>termios</literal> flag - <varname>crtscts</varname> on serial port #1's - (<devicename>COM2</devicename>) dial-in and dial-out + <para>For example, to set the <literal>termios</literal> flag + <varname>crtscts</varname> on + <devicename>COM2</devicename>'s dial-in and dial-out initialization devices, the following lines could be added to <filename>/etc/rc.d/serial</filename>:</para> + <programlisting># Serial port initial configuration stty -f /dev/ttyu1.init crtscts stty -f /dev/cuau1.init crtscts</programlisting> @@ -1650,67 +1529,65 @@ stty -f /dev/cuau1.init crtscts</programlisting> <sect2> <title>Modem Settings</title> - <para>If you have a modem whose parameters may be permanently - set in non-volatile RAM, you will need to use a terminal - program (such as <application>Telix</application> under - &ms-dos; or <command>tip</command> under FreeBSD) to set the - parameters. Connect to the modem using the same - communications speed as the initial speed - <command>getty</command> will use and configure the modem's - non-volatile RAM to match these requirements:</para> + <para>For a modem whose parameters may be permanently set in + non-volatile RAM, a terminal program such as + <command>tip</command> can be used to set the parameters. + Connect to the modem using the same communications speed as + the initial speed <command>getty</command> will use and + configure the modem's non-volatile RAM to match these + requirements:</para> <itemizedlist> <listitem> - <para><acronym>CD</acronym> asserted when connected</para> + <para><acronym>CD</acronym> asserted when connected.</para> </listitem> <listitem> - <para><acronym>DTR</acronym> asserted for operation; - dropping DTR hangs up line and resets modem</para> + <para><acronym>DTR</acronym> asserted for operation and + dropping DTR hangs up the line and resets the + modem.</para> </listitem> <listitem> <para><acronym>CTS</acronym> transmitted data flow - control</para> + control.</para> </listitem> <listitem> <para>Disable <acronym>XON/XOFF</acronym> flow - control</para> + control.</para> </listitem> <listitem> <para><acronym>RTS</acronym> received data flow - control</para> + control.</para> </listitem> <listitem> - <para>Quiet mode (no result codes)</para> + <para>Quiet mode (no result codes).</para> </listitem> <listitem> - <para>No command echo</para> + <para>No command echo.</para> </listitem> </itemizedlist> - <para>Please read the documentation for your modem to find out - what commands and/or DIP switch settings you need to give - it.</para> + <para>Read the documentation for the modem to find out + which commands and/or DIP switch settings are needed.</para> <para>For example, to set the above parameters on a &usrobotics; - &sportster; 14,400 external modem, one could give these - commands to the modem:</para> + &sportster; 14,400 external modem, give these commands to + the modem:</para> <programlisting>ATZ AT&C1&D2&H1&I0&R2&W</programlisting> - <para>You might also want to take this opportunity to adjust - other settings in the modem, such as whether it will use - V.42bis and/or MNP5 compression.</para> + <para>Other settings can be adjusted in the modem, such as + whether it will use V.42bis and/or MNP5 compression.</para> <para>The &usrobotics; &sportster; 14,400 external modem also - has some DIP switches that need to be set; for other modems, - perhaps you can use these settings as an example:</para> + has some DIP switches that need to be set. Other modems, + may need these settings:</para> <itemizedlist> <listitem> @@ -1753,19 +1630,19 @@ AT&C1&D2&H1&I0&R2&W</programlisting> <command>getty</command> mistakenly gives a <prompt>login:</prompt> prompt to a modem that is in command mode and the modem echoes the command or returns a result - code. This sequence can result in a extended, silly + code. This sequence can result in an extended, silly conversation between <command>getty</command> and the modem.</para> <sect3> <title>Locked-speed Config</title> - <para>For a locked-speed configuration, you will need to - configure the modem to maintain a constant modem-to-computer - data rate independent of the communications rate. On a - &usrobotics; &sportster; 14,400 external modem, these - commands will lock the modem-to-computer data rate at the - speed used to issue the commands:</para> + <para>For a locked-speed configuration, configure the modem to + maintain a constant modem-to-computer data rate independent + of the communications rate. On a &usrobotics; &sportster; + 14,400 external modem, these commands will lock the + modem-to-computer data rate at the speed used to issue the + commands:</para> <programlisting>ATZ AT&B1&W</programlisting> @@ -1774,12 +1651,12 @@ AT&B1&W</programlisting> <sect3> <title>Matching-speed Config</title> - <para>For a variable-speed configuration, you will need to - configure your modem to adjust its serial port data rate to - match the incoming call rate. On a &usrobotics; &sportster; - 14,400 external modem, these commands will lock the modem's - error-corrected data rate to the speed used to issue the - commands, but allow the serial port rate to vary for + <para>For a variable-speed configuration, configure the modem + to adjust its serial port data rate to match the incoming + call rate. On a &usrobotics; &sportster; 14,400 external + modem, these commands will lock the modem's error-corrected + data rate to the speed used to issue the commands, while + allowing the serial port rate to vary for non-error-corrected connections:</para> <programlisting>ATZ @@ -1792,73 +1669,70 @@ AT&B2&W</programlisting> <para>Most high-speed modems provide commands to view the modem's current operating parameters in a somewhat human-readable fashion. On the &usrobotics; &sportster; - 14,400 external modems, the command - <command>ATI5</command> displays the settings that are - stored in the non-volatile RAM. To see the true operating - parameters of the modem (as influenced by the modem's DIP - switch settings), use the commands <command>ATZ</command> + 14,400 external modem, <command>ATI5</command> displays the + settings that are stored in the non-volatile RAM. To see + the true operating parameters of the modem, as influenced by + the modem's DIP switch settings, use <command>ATZ</command> and then <command>ATI4</command>.</para> - <para>If you have a different brand of modem, check your - modem's manual to see how to double-check your modem's - configuration parameters.</para> + <para>For a different brand of modem, check the modem's manual + to see how to double-check the modem's configuration + parameters.</para> </sect3> </sect2> <sect2> <title>Troubleshooting</title> - <para>Here are a few steps you can follow to check out the - dial-up modem on your system.</para> + <para>Here are a few steps for troubleshooting a dial-up modem + on a &os; system.</para> <sect3> - <title>Checking Out the FreeBSD System</title> + <title>Checking Out the &os; System</title> - <para>Hook up your modem to your FreeBSD system, boot the - system, and, if your modem has status indication lights, + <para>Hook up the modem to the &os; system, boot the + system, and, if the modem has status indication lights, watch to see whether the modem's <acronym>DTR</acronym> indicator lights when the <prompt>login:</prompt> prompt - appears on the system's console — if it lights up, - that should mean that FreeBSD has started a + appears on the system's console. If it lights up, that + should mean that &os; has started a <command>getty</command> process on the appropriate communications port and is waiting for the modem to accept a call.</para> <para>If the <acronym>DTR</acronym> indicator does not light, - login to the FreeBSD system through the console and issue a - <command>ps ax</command> to see if FreeBSD is trying to run - a <command>getty</command> process on the correct port. You - should see lines like these among the processes - displayed:</para> + login to the &os; system through the console and type + <command>ps ax</command> to see if &os; is trying to run + a <command>getty</command> process on the correct + port:</para> <screen> 114 ?? I 0:00.10 /usr/libexec/getty V19200 ttyu0 115 ?? I 0:00.10 /usr/libexec/getty V19200 ttyu1</screen> - <para>If you see something different, like this:</para> + <para>If something like this is displayed instead:</para> <screen> 114 d0 I 0:00.10 /usr/libexec/getty V19200 ttyu0</screen> <para>and the modem has not accepted a call yet, this means that <command>getty</command> has completed its open on the communications port. This could indicate a problem with the - cabling or a mis-configured modem, because + cabling or a misconfigured modem, because <command>getty</command> should not be able to open the - communications port until <acronym>CD</acronym> (carrier - detect) has been asserted by the modem.</para> + communications port until carrier detect has been asserted + by the modem.</para> - <para>If you do not see any <command>getty</command> processes - waiting to open the desired + <para>If no <command>getty</command> processes are waiting to + open the desired <devicename>ttyu<replaceable>N</replaceable></devicename> - port, double-check your entries in + port, double-check the entries in <filename>/etc/ttys</filename> to see if there are any - mistakes there. Also, check the log file + mistakes. Also, check <filename>/var/log/messages</filename> to see if there are any log messages from <command>init</command> or - <command>getty</command> regarding any problems. If there - are any messages, triple-check the configuration files - <filename>/etc/ttys</filename> and + <command>getty</command>. If there are any messages, + triple-check <filename>/etc/ttys</filename> and <filename>/etc/gettytab</filename>, as well as the - appropriate device special files + appropriate device special files, <filename>/dev/ttyuN</filename>, for any mistakes, missing entries, or missing device special files.</para> </sect3> @@ -1866,53 +1740,49 @@ AT&B2&W</programlisting> <sect3> <title>Try Dialing In</title> - <para>Try dialing into the system; be sure to use 8 bits, no - parity, and 1 stop bit on the remote system. If you do not - get a prompt right away, or get garbage, try pressing - <keycap>Enter</keycap> about once per second. If you still - do not see a <prompt>login:</prompt> prompt after a while, - try sending a <command>BREAK</command>. If you are using a - high-speed modem to do the dialing, try dialing again after - locking the dialing modem's interface speed (via - <command>AT&B1</command> on a &usrobotics; &sportster; - modem, for example).</para> - - <para>If you still cannot get a <prompt>login:</prompt> + <para>Try dialing into the system. Be sure to use 8 bits, no + parity, and 1 stop bit on the remote system. If a prompt + does not appear right away, or the prompt shows garbage, try + pressing <keycap>Enter</keycap> about once per second. If + there is still no <prompt>login:</prompt> prompt after a + while, try sending a <command>BREAK</command>. When using a + high-speed modem, try dialing again after locking the + dialing modem's interface speed.</para> + + <para>If there is still no <prompt>login:</prompt> prompt, check <filename>/etc/gettytab</filename> again and - double-check that</para> + double-check that:</para> <itemizedlist> <listitem> - <para>The initial capability name specified in - <filename>/etc/ttys</filename> for the line matches a - name of a capability in - <filename>/etc/gettytab</filename></para> + <para>The initial capability name specified in the entry + in <filename>/etc/ttys</filename> matches the name of + a capability in + <filename>/etc/gettytab</filename>.</para> </listitem> <listitem> <para>Each <literal>nx=</literal> entry matches another - <filename>gettytab</filename> capability name</para> + <filename>gettytab</filename> capability name.</para> </listitem> <listitem> <para>Each <literal>tc=</literal> entry matches another - <filename>gettytab</filename> capability name</para> + <filename>gettytab</filename> capability name.</para> </listitem> </itemizedlist> - <para>If you dial but the modem on the FreeBSD system will not - answer, make sure that the modem is configured to answer the - phone when <acronym>DTR</acronym> is asserted. If the modem - seems to be configured correctly, verify that the + <para>If the modem on the &os; system will not answer, make + sure that the modem is configured to answer the phone when + <acronym>DTR</acronym> is asserted. If the modem seems to + be configured correctly, verify that the <acronym>DTR</acronym> line is asserted by checking the - modem's indicator lights (if it has any).</para> - - <para>If you have gone over everything several times and it - still does not work, take a break and come back to it later. - If it still does not work, perhaps you can send an - electronic mail message to the &a.questions; describing your - modem and your problem, and the good folks on the list will - try to help.</para> + modem's indicator lights.</para> + + <para>If it still does not work, take a break and come back to + it later. If it still does not work, try sending an + email message to the &a.questions; describing the modem + and the problem.</para> </sect3> </sect2> @@ -1921,115 +1791,98 @@ AT&B2&W</programlisting> <sect1 id="dialout"> <title>Dial-out Service</title> - <warning> - <para>As of &os; 8.0, device nodes for serial ports have been - renamed from - <filename>/dev/cuad<replaceable>N</replaceable></filename> to - <filename>/dev/cuau<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> - <indexterm><primary>dial-out service</primary></indexterm> - <para>The following are tips for getting your host to be able to - connect over the modem to another computer. This is appropriate - for establishing a terminal session with a remote host.</para> - - <para>This is useful to log onto a BBS.</para> + <para>The following are tips for getting the host to connect over + the modem to another computer. This is appropriate for + establishing a terminal session with a remote host.</para> - <para>This kind of connection can be extremely helpful to get a - file on the Internet if you have problems with PPP. If you need - to FTP something and PPP is broken, use the terminal session to - FTP it. Then use zmodem to transfer it to your machine.</para> + <para>This kind of connection can be helpful to get a file on the + Internet if there are problems using PPP. If PPP is not + working, use the terminal session to FTP the needed file. Then + use zmodem to transfer it to the machine.</para> <sect2 id="hayes-unsupported"> - <title>My Stock Hayes Modem Is Not Supported, What Can I - Do?</title> + <title>Using a Stock Hayes Modem</title> - <para>Actually, the manual page for <command>tip</command> is - out of date. There is a generic Hayes dialer already built - in. Just use <literal>at=hayes</literal> in your - <filename>/etc/remote</filename> file.</para> + <para>A generic Hayes dialer is built into + <command>tip</command>. Use <literal>at=hayes</literal> in + <filename>/etc/remote</filename>.</para> <para>The Hayes driver is not smart enough to recognize some of - the advanced features of newer modems—messages like + the advanced features of newer modems messages like <literal>BUSY</literal>, <literal>NO DIALTONE</literal>, or - <literal>CONNECT 115200</literal> will just confuse it. You - should turn those messages off when you use - <command>tip</command> (using - <command>ATX0&W</command>).</para> - - <para>Also, the dial timeout for <command>tip</command> is 60 - seconds. Your modem should use something less, or else tip - will think there is a communication problem. Try - <command>ATS7=45&W</command>.</para> + <literal>CONNECT 115200</literal>. Turn those messages off + when using <command>tip</command> with + <command>ATX0&W</command>.</para> + + <para>The dial timeout for <command>tip</command> is 60 + seconds. The modem should use something less, or else + <command>tip</command> will think there is a communication + problem. Try <command>ATS7=45&W</command>.</para> </sect2> <sect2 id="direct-at"> - <title>How Am I Expected to Enter These <literal>AT</literal> - Commands?</title> + <title>Using <literal>AT</literal> Commands</title> <indexterm> <primary><filename>/etc/remote</filename></primary> </indexterm> - <para>Make what is called a <quote>direct</quote> entry in your - <filename>/etc/remote</filename> file. For example, if your + <para>Create a <quote>direct</quote> entry in + <filename>/etc/remote</filename>. For example, if the modem is hooked up to the first serial port, - <filename>/dev/cuau0</filename>, then put in the following + <filename>/dev/cuau0</filename>, use the following line:</para> <programlisting>cuau0:dv=/dev/cuau0:br#19200:pa=none</programlisting> - <para>Use the highest bps rate your modem supports in the br - capability. Then, type <command>tip cuau0</command> and you - will be connected to your modem.</para> + <para>Use the highest <acronym>bps</acronym> rate the modem + supports in the <literal>br</literal> capability. Then, type + <command>tip cuau0</command> to connect to the modem.</para> - <para>Or use <command>cu</command> as <username>root</username> + <para>Or, use <command>cu</command> as <username>root</username> with the following command:</para> <screen>&prompt.root; <userinput>cu -l<replaceable>line</replaceable> -s<replaceable>speed</replaceable></userinput></screen> - <para><replaceable>line</replaceable> is the serial port - (e.g., <filename>/dev/cuau0</filename>) and - <replaceable>speed</replaceable> is the speed (e.g., - <literal>57600</literal>). When you are done entering the AT - commands type <command>~.</command> to exit.</para> + <para><replaceable>line</replaceable> is the serial port, such + as <filename>/dev/cuau0</filename>, and + <replaceable>speed</replaceable> is the speed, such as + <literal>57600</literal>. When finished entering the AT + commands, type <command>~.</command> to exit.</para> </sect2> <sect2 id="gt-failure"> - <title>The <literal>@</literal> Sign for the pn Capability Does - Not Work!</title> + <title>The <literal>@</literal> Sign Does Not Work</title> <para>The <literal>@</literal> sign in the phone number - capability tells tip to look in - <filename>/etc/phones</filename> for a phone number. But the + capability tells <command>tip</command> to look in + <filename>/etc/phones</filename> for a phone number. But, the <literal>@</literal> sign is also a special character in - capability files like <filename>/etc/remote</filename>. - Escape it with a backslash:</para> + capability files like <filename>/etc/remote</filename>, so it + needs to be escaped with a backslash:</para> <programlisting>pn=\@</programlisting> </sect2> <sect2 id="dial-command-line"> - <title>How Can I Dial a Phone Number on the Command - Line?</title> + <title>Dialing from the Command Line</title> - <para>Put what is called a <quote>generic</quote> entry in your - <filename>/etc/remote</filename> file. For example:</para> + <para>Put a <quote>generic</quote> entry in + <filename>/etc/remote</filename>. For example:</para> <programlisting>tip115200|Dial any phone number at 115200 bps:\ :dv=/dev/cuau0:br#115200:at=hayes:pa=none:du: tip57600|Dial any phone number at 57600 bps:\ :dv=/dev/cuau0:br#57600:at=hayes:pa=none:du:</programlisting> - <para>Then you can do things like:</para> + <para>This should now work:</para> <screen>&prompt.root; <userinput>tip -115200 5551234</userinput></screen> - <para>If you prefer <command>cu</command> over - <command>tip</command>, use a generic <literal>cu</literal> - entry:</para> + <para>Users who prefer <command>cu</command> over + <command>tip</command>, can use a generic + <literal>cu</literal> entry:</para> <programlisting>cu115200|Use cu to dial any number at 115200bps:\ :dv=/dev/cuau1:br#57600:at=hayes:pa=none:du:</programlisting> @@ -2040,26 +1893,31 @@ tip57600|Dial any phone number at 57600 bps:\ </sect2> <sect2 id="set-bps"> - <title>Do I Have to Type in the bps Rate Every Time I Do - That?</title> + <title>Setting the <acronym>bps</acronym> Rate</title> <para>Put in an entry for <literal>tip1200</literal> or - <literal>cu1200</literal>, but go ahead and use whatever bps - rate is appropriate with the br capability. + <literal>cu1200</literal>, but go ahead and use whatever + <acronym>bps</acronym> rate is appropriate with the + <literal>br</literal> capability. <command>tip</command> thinks a good default is 1200 bps which is why it looks for a <literal>tip1200</literal> entry. - You do not have to use 1200 bps, though.</para> + 1200 bps does not have to be used, though.</para> </sect2> <sect2 id="terminal-server"> - <title>I Access a Number of Hosts Through a Terminal + <title>Accessing a Number of Hosts Through a Terminal Server</title> - <para>Rather than waiting until you are connected and typing + <para>Rather than waiting until connected and typing <command>CONNECT <replaceable>host</replaceable></command> - each time, use tip's <literal>cm</literal> capability. For - example, these entries in - <filename>/etc/remote</filename>:</para> + each time, use <command>tip</command>'s <literal>cm</literal> + capability. For example, these entries in + <filename>/etc/remote</filename> will let you type + <command>tip pain</command> or + <command>tip muffin</command> to connect to the hosts + <hostid>pain</hostid> or <hostid>muffin</hostid>, and + <command>tip deep13</command> to connect to the terminal + server.</para> <programlisting>pain|pain.deep13.com|Forrester's machine:\ :cm=CONNECT pain\n:tc=deep13: @@ -2068,30 +1926,26 @@ muffin|muffin.deep13.com|Frank's machine:\ deep13:Gizmonics Institute terminal server:\ :dv=/dev/cuau2:br#38400:at=hayes:du:pa=none:pn=5551234:</programlisting> - <para>will let you type <command>tip pain</command> or - <command>tip muffin</command> to connect to the hosts - <hostid>pain</hostid> or <hostid>muffin</hostid>, and - <command>tip deep13</command> to get to the terminal - server.</para> </sect2> <sect2 id="tip-multiline"> - <title>Can Tip Try More Than One Line for Each Site?</title> + <title>Using More Than One Line with + <command>tip</command></title> <para>This is often a problem where a university has several modem lines and several thousand students trying to use them.</para> - <para>Make an entry for your university in - <filename>/etc/remote</filename> and use <literal>@</literal> - for the <literal>pn</literal> capability:</para> + <para>Make an entry in <filename>/etc/remote</filename> and use + <literal>@</literal> for the <literal>pn</literal> + capability:</para> <programlisting>big-university:\ :pn=\@:tc=dialout dialout:\ :dv=/dev/cuau3:br#9600:at=courier:du:pa=none:</programlisting> - <para>Then, list the phone numbers for the university in + <para>Then, list the phone numbers in <filename>/etc/phones</filename>:</para> <programlisting>big-university 5551111 @@ -2099,38 +1953,31 @@ big-university 5551112 big-university 5551113 big-university 5551114</programlisting> - <para><command>tip</command> will try each one in the listed - order, then give up. If you want to keep retrying, run - <command>tip</command> in a while loop.</para> + <para><command>tip</command> will try each number in the listed + order, then give up. To keep retrying, run + <command>tip</command> in a <literal>while</literal> + loop.</para> </sect2> <sect2 id="multi-controlp"> - <title>Why Do I Have to Hit - <keycombo action="simul"> - <keycap>Ctrl</keycap> - <keycap>P</keycap> - </keycombo> - Twice to Send - <keycombo action="simul"> + <title>Using the Force Character</title> + + <para><keycombo action="simul"> <keycap>Ctrl</keycap> <keycap>P</keycap> - </keycombo> - Once?</title> - - <para><keycombo - action="simul"><keycap>Ctrl</keycap><keycap>P</keycap></keycombo> - is the default <quote>force</quote> character, used to tell - <command>tip</command> that the next character is literal - data. You can set the force character to any other character - with the <command>~s</command> escape, which means <quote>set - a variable.</quote></para> + </keycombo> is the default <quote>force</quote> character, + used to tell <command>tip</command> that the next character is + literal data. The force character can be set to any other + character with the <command>~s</command> escape, which means + <quote>set a variable.</quote></para> <para>Type <command>~sforce=<replaceable>single-char</replaceable></command> followed by a newline. <replaceable>single-char</replaceable> - is any single character. If you leave out - <replaceable>single-char</replaceable>, then the force - character is the nul character, which you can get by typing + is any single character. If + <replaceable>single-char</replaceable> is left out, then the + force character is the null character, which is accessed by + typing <keycombo action="simul"> <keycap>Ctrl</keycap><keycap>2</keycap> </keycombo> @@ -2145,37 +1992,35 @@ big-university 5551114</programlisting> </keycombo>, which is only used on some terminal servers.</para> - <para>You can have the force character be whatever you want by - specifying the following in your - <filename>$HOME/.tiprc</filename> file:</para> + <para>To change the force character, specify the following in + <filename>~/.tiprc</filename>:</para> <programlisting>force=<replaceable>single-char</replaceable></programlisting> </sect2> <sect2 id="uppercase"> - <title>Suddenly Everything I Type Is in Upper Case??</title> + <title>Upper Case Characters</title> - <para>You must have pressed + <para>This happens when <keycombo action="simul"> <keycap>Ctrl</keycap> <keycap>A</keycap> - </keycombo>, <command>tip</command>'s - <quote>raise character,</quote> specially designed for people - with broken caps-lock keys. Use <command>~s</command> as - above and set the variable <literal>raisechar</literal> to - something reasonable. In fact, you can set it to the same as - the force character, if you never expect to use either of - these features.</para> - - <para>Here is a sample <filename>.tiprc</filename> file perfect - for <application>Emacs</application> users who need to type + </keycombo> is pressed, which is <command>tip</command>'s + <quote>raise character</quote>, specially designed for people + with broken caps-lock keys. Use <command>~s</command> to set + <literal>raisechar</literal> to something reasonable. It can + be set to be the same as the force character, if neither + feature is used.</para> + + <para>Here is a sample <filename>~/.tiprc</filename> for + <application>Emacs</application> users who need to type <keycombo action="simul"> <keycap>Ctrl</keycap> <keycap>2</keycap> </keycombo> and <keycombo action="simul"> <keycap>Ctrl</keycap> <keycap>A</keycap> - </keycombo> a lot:</para> + </keycombo>:</para> <programlisting>force=^^ raisechar=^^</programlisting> @@ -2188,12 +2033,11 @@ raisechar=^^</programlisting> </sect2> <sect2 id="tip-filetransfer"> - <title>How Can I Do File Transfers with - <command>tip</command>?</title> + <title>File Transfers with <command>tip</command></title> - <para>If you are talking to another &unix; system, you can send - and receive files with <command>~p</command> (put) and - <command>~t</command> (take). These commands run + <para>When talking to another &unix;-like operating system, + files can be sent and received using <command>~p</command> + (put) and <command>~t</command> (take). These commands run <command>cat</command> and <command>echo</command> on the remote system to accept and send files. The syntax is:</para> @@ -2209,12 +2053,12 @@ raisechar=^^</programlisting> <arg choice="opt">local-file</arg> </cmdsynopsis> - <para>There is no error checking, so you probably should use - another protocol, like zmodem.</para> + <para>There is no error checking, so another protocol, like + zmodem, should probably be used.</para> </sect2> <sect2 id="zmodem-tip"> - <title>How Can I Run <application>zmodem</application> with + <title>Using <application>zmodem</application> with <command>tip</command>?</title> <para>To receive files, start the sending program on the remote @@ -2247,46 +2091,35 @@ raisechar=^^</programlisting> </sect1info> <title>Setting Up the Serial Console</title> - <warning> - <para>As of &os; 8.0, device nodes for serial ports have been - renamed from - <filename>/dev/ttyd<replaceable>N</replaceable></filename> to - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X users will have to adapt the following - documentation according to these changes.</para> - </warning> - <indexterm><primary>serial console</primary></indexterm> <sect2 id="serialconsole-intro"> <title>Introduction</title> - <para>FreeBSD has the ability to boot on a system with only - a dumb terminal on a serial port as a console. Such a - configuration should be useful for two classes of people: - system administrators who wish to install FreeBSD on machines - that have no keyboard or monitor attached, and developers who - want to debug the kernel or device drivers.</para> + <para>&os; has the ability to boot a system with a dumb + terminal on a serial port as a console. This configuration is + useful for system administrators who wish to install &os; on + machines that have no keyboard or monitor attached, and + developers who want to debug the kernel or device + drivers.</para> - <para>As described in <xref linkend="boot"/>, FreeBSD employs a - three stage bootstrap. The first two stages are in the boot - block code which is stored at the beginning of the FreeBSD - slice on the boot disk. The boot block will then load and run - the boot loader (<filename>/boot/loader</filename>) as the - third stage code.</para> + <para>As described in <link linkend="boot"></link>, &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 + the boot loader as the third stage code.</para> - <para>In order to set up the serial console you must configure - the boot block code, the boot loader code and the - kernel.</para> + <para>In order to set up booting from a serial console, the + boot block code, the boot loader code, and the kernel need to + be configured.</para> </sect2> <sect2 id="serialconsole-howto-fast"> - <title>Serial Console Configuration, Terse Version</title> + <title>Quick Serial Console Configuration</title> - <para>This section assumes that you are using the default setup - and just want a fast overview of setting up the serial - console.</para> + <para>This section assumes the default setup and provides a fast + overview of setting up the serial console.</para> <procedure> @@ -2297,9 +2130,9 @@ raisechar=^^</programlisting> </step> <step> - <para>To see all boot messages on the serial console, issue - the following command while logged in as the - superuser:</para> + <para>To see all the boot messages on the serial console, + issue the following command as the superuser:</para> + <screen>&prompt.root; echo 'console="comconsole"' >> /boot/loader.conf</screen> </step> @@ -2307,7 +2140,7 @@ raisechar=^^</programlisting> <para>Edit <filename>/etc/ttys</filename> and change <literal>off</literal> to <literal>on</literal> and <literal>dialup</literal> to <literal>vt100</literal> for - the <devicename>ttyu0</devicename> entry. Otherwise a + the <devicename>ttyu0</devicename> entry. Otherwise, a password will not be required to connect via the serial console, resulting in a potential security hole.</para> </step> @@ -2319,50 +2152,47 @@ raisechar=^^</programlisting> </procedure> - <para>If a different configuration is required, a more in depth - configuration explanation exists in - <xref linkend="serialconsole-howto"/>.</para> + <para>If a different configuration is required, see the next + section for a more in-depth configuration explanation.</para> </sect2> <sect2 id="serialconsole-howto"> - <title>Serial Console Configuration</title> + <title>In-Depth Serial Console Configuration</title> <procedure> <step> <para>Prepare a serial cable.</para> <indexterm><primary>null-modem cable</primary></indexterm> - <para>You will need either a null-modem cable or a standard - serial cable and a null-modem adapter. See <xref - linkend="serial-cables-ports"/> for a discussion on - serial cables.</para> + + <para>Use either a null-modem cable or a standard serial + cable and a null-modem adapter. See <link + linkend="serial-cables-ports"></link> for a discussion + on serial cables.</para> </step> <step> - <para>Unplug your keyboard.</para> + <para>Unplug the keyboard.</para> - <para>Most PC systems probe for the keyboard during the - Power-On Self-Test (POST) and will generate an error if - the keyboard is not detected. Some machines complain - loudly about the lack of a keyboard and will not continue - to boot until it is plugged in.</para> + <para>Many PC systems probe for the keyboard during the + Power-On Self-Test (<acronym>POST</acronym>) and will + generate an error if the keyboard is not detected. Some + machines will refuse to boot until the keyboard is plugged + in.</para> - <para>If your computer complains about the error, but boots - anyway, then you do not have to do anything special. - (Some machines with Phoenix BIOS installed merely say - <errorname>Keyboard failed</errorname> and continue to - boot normally.)</para> + <para>If the computer complains about the error, but boots + anyway, no further configuration is needed.</para> - <para>If your computer refuses to boot without a keyboard - attached then you will have to configure the BIOS so that - it ignores this error (if it can). Consult your - motherboard's manual for details on how to do this.</para> + <para>If the computer refuses to boot without a keyboard + attached, the BIOS needs to be configured so that it + ignores this error (if it can). Consult the motherboard's + manual for details on how to do this.</para> <tip> - <para>Set the keyboard to <quote>Not installed</quote> in - the BIOS setup. You will still be able to use your - keyboard. All this does is tell the BIOS not to probe - for a keyboard at power-on. Your BIOS should not + <para>Try setting the keyboard to <quote>Not + installed</quote> in the BIOS. The keyboard can still + be used as this setting just tells the BIOS not to probe + for a keyboard at power-on. The BIOS should not complain if the keyboard is absent. You can leave the keyboard plugged in even with this flag set to <quote>Not installed</quote> and the keyboard will still @@ -2374,16 +2204,12 @@ raisechar=^^</programlisting> </tip> <note> - <para>If your system has a &ps2; mouse, chances are very - good that you may have to unplug your mouse as well as - your keyboard. This is because &ps2; mice share some - hardware with the keyboard and leaving the mouse plugged - in can fool the keyboard probe into thinking the - keyboard is still there. It is said that a Gateway 2000 - Pentium 90 MHz system with an AMI BIOS that behaves - this way. In general, this is not a problem since the - mouse is not much good without the keyboard - anyway.</para> + <para>If the system has a &ps2; mouse, chances are good + that both the mouse and keyboard need to be unplugged. + This is because &ps2; mice share some hardware with the + keyboard and leaving the mouse plugged in can fool the + keyboard probe into thinking the keyboard is still + there.</para> </note> </step> @@ -2392,30 +2218,23 @@ raisechar=^^</programlisting> <devicename>COM1</devicename> (<devicename>sio0</devicename>).</para> - <para>If you do not have a dumb terminal, you can use an old - PC/XT with a modem program, or the serial port on another - &unix; box. If you do not have a + <para>If a dumb terminal is not available, use an old + computer with a modem program, or the serial port on + another &unix; box. If there is no <devicename>COM1</devicename> (<devicename>sio0</devicename>), get one. At this time, there is no way to select a port other than <devicename>COM1</devicename> for the boot blocks without - recompiling the boot blocks. If you are already using - <devicename>COM1</devicename> for another device, you will - have to temporarily remove that device and install a new - boot block and kernel once you get FreeBSD up and running. - (It is assumed that <devicename>COM1</devicename> will - be available on a file/compute/terminal server anyway; if - you really need <devicename>COM1</devicename> for - something else (and you cannot switch that something else - to <devicename>COM2</devicename> - (<devicename>sio1</devicename>)), then you probably should - not even be bothering with all this in the first - place.)</para> + recompiling the boot blocks. If + <devicename>COM1</devicename> is being used by another + device, temporarily remove that device and install a new + boot block and kernel once &os; is up and running.</para> </step> <step> - <para>Make sure the configuration file of your kernel has - appropriate flags set for <devicename>COM1</devicename> + <para>Make sure the configuration file of the custom kernel + has appropriate flags set for + <devicename>COM1</devicename> (<devicename>sio0</devicename>).</para> <para>Relevant flags are:</para> @@ -2428,10 +2247,10 @@ raisechar=^^</programlisting> <para>Enables console support for this unit. The other console flags are ignored unless this is set. Currently, at most one unit can have console - support; the first one (in config file order) with + support. The first one, in config file order, with this flag set is preferred. This option alone will not make the serial port the console. Set the - following flag or use the <option>-h</option> option + following flag or use <option>-h</option> as described below, together with this flag.</para> </listitem> </varlistentry> @@ -2440,11 +2259,11 @@ raisechar=^^</programlisting> <term><literal>0x20</literal></term> <listitem> - <para>Forces this unit to be the console (unless there - is another higher priority console), regardless of - the <option>-h</option> option discussed below. - The flag <literal>0x20</literal> must be used - together with the <option>0x10</option> flag.</para> + <para>Forces this unit to be the console, unless there + is another higher priority console, regardless of + <option>-h</option> as discussed below. The flag + <literal>0x20</literal> must be used together with + the <option>0x10</option> flag.</para> </listitem> </varlistentry> @@ -2454,27 +2273,25 @@ raisechar=^^</programlisting> <listitem> <para>Reserves this unit (in conjunction with <literal>0x10</literal>) and makes the unit - unavailable for normal access. You should not set - this flag to the serial port unit which you want to - use as the serial console. The only use of this - flag is to designate the unit for kernel remote - debugging. See <ulink - url="&url.books.developers-handbook;/index.html">The + unavailable for normal access. This flag should + not be set to the serial port to use as the serial + console. The only use of this flag is to designate + the unit for kernel remote debugging. See <ulink + url="&url.books.developers-handbook;/index.html">The Developer's Handbook</ulink> for more information on remote debugging.</para> </listitem> </varlistentry> </variablelist> - <para>Example:</para> + <para>Here is an example setting:</para> <programlisting>device sio0 flags 0x10</programlisting> - <para>See the &man.sio.4; manual page for more - details.</para> + <para>Refer to &man.sio.4; for more details.</para> - <para>If the flags were not set, you need to run UserConfig - (on a different console) or recompile the kernel.</para> + <para>If the flags were not set, run UserConfig on a + different console or recompile the kernel.</para> </step> <step> @@ -2482,26 +2299,26 @@ raisechar=^^</programlisting> directory of the <literal>a</literal> partition on the boot drive.</para> - <para>This file will instruct the boot block code how you - would like to boot the system. In order to activate the - serial console, you need one or more of the following - options—if you want multiple options, include them - all on the same line:</para> + <para>This file instructs the boot block code how to boot + the system. In order to activate the serial console, + one or more of the following options are needed. When + using multiple options, include them all on the same + line:</para> <variablelist> <varlistentry> <term><option>-h</option></term> <listitem> - <para>Toggles internal and serial consoles. You can - use this to switch console devices. For instance, - if you boot from the internal (video) console, you - can use <option>-h</option> to direct the boot - loader and the kernel to use the serial port as its - console device. Alternatively, if you boot from the - serial port, you can use the <option>-h</option> to - tell the boot loader and the kernel to use the video - display as the console instead.</para> + <para>Toggles between the internal and serial + consoles. Use this to switch console devices. For + instance, to boot from the internal (video) console, + use <option>-h</option> to direct the boot loader + and the kernel to use the serial port as its console + device. Alternatively, to boot from the serial + port, use <option>-h</option> to tell the boot + loader and the kernel to use the video display as + the console instead.</para> </listitem> </varlistentry> @@ -2509,19 +2326,19 @@ raisechar=^^</programlisting> <term><option>-D</option></term> <listitem> - <para>Toggles single and dual console configurations. - In the single configuration the console will be - either the internal console (video display) or the - serial port, depending on the state of the - <option>-h</option> option above. In the dual - console configuration, both the video display and - the serial port will become the console at the same - time, regardless of the state of the - <option>-h</option> option. However, note that the - dual console configuration takes effect only during - the boot block is running. Once the boot loader - gets control, the console specified by the - <option>-h</option> option becomes the only + <para>Toggles between the single and dual console + configurations. In the single configuration, the + console will be either the internal console (video + display) or the serial port, depending on the state + of <option>-h</option>. In the dual console + configuration, both the video display and the + serial port will become the console at the same + time, regardless of the state of + <option>-h</option>. However, the dual console + configuration takes effect only while the boot + block is running. Once the boot loader gets + control, the console specified by + <option>-h</option> becomes the only console.</para> </listitem> </varlistentry> @@ -2537,56 +2354,53 @@ raisechar=^^</programlisting> <note> <para>Due to space constraints in the current - version of the boot blocks, the - <option>-P</option> option is capable of - detecting extended keyboards only. Keyboards with - less than 101 keys (and without F11 and F12 keys) - may not be detected. Keyboards on some laptop - computers may not be properly found because of - this limitation. If this is the case with your - system, you have to abandon using the - <option>-P</option> option. Unfortunately there - is no workaround for this problem.</para> + version of the boot blocks, + <option>-P</option> is capable of detecting + extended keyboards only. Keyboards with less + than 101 keys and without F11 and F12 keys may + not be detected. Keyboards on some laptops + may not be properly found because of this + limitation. If this is the case, do not use + <option>-P</option>. Unfortunately there is no + workaround for this problem.</para> </note> </listitem> </varlistentry> </variablelist> - <para>Use either the <option>-P</option> option to select - the console automatically, or the <option>-h</option> - option to activate the serial console.</para> - - <para>You may include other options described in - &man.boot.8; as well.</para> - - <para>The options, except for <option>-P</option>, will be - passed to the boot loader - (<filename>/boot/loader</filename>). The boot loader will - determine which of the internal video or the serial port - should become the console by examining the state of the - <option>-h</option> option alone. This means that if you - specify the <option>-D</option> option but not the - <option>-h</option> option in - <filename>/boot.config</filename>, you can use the - serial port as the console only during the boot block; - the boot loader will use the internal video display as the + <para>Use either <option>-P</option> to select the + console automatically, or <option>-h</option> to + activate the serial console.</para> + + <para>Other options are described in &man.boot.8;.</para> + + <para>The options, except for <option>-P</option>, are + passed to the boot loader. The boot loader will + determine whether the internal video or the serial port + should become the console by examining the state of + <option>-h</option>. This means that if + <option>-D</option> is specified but + <option>-h</option> is not specified in + <filename>/boot.config</filename>, the serial port can + be used as the console only during the boot block as the + boot loader will use the internal video display as the console.</para> </step> <step> <para>Boot the machine.</para> - <para>When you start your FreeBSD box, the boot blocks will - echo the contents of <filename>/boot.config</filename> to - the console. For example:</para> + <para>When &os; starts, the boot blocks echo the contents of + <filename>/boot.config</filename> to the console. For + example:</para> <screen>/boot.config: -P Keyboard: no</screen> - <para>The second line appears only if you put - <option>-P</option> in <filename>/boot.config</filename> - and indicates presence/absence of the keyboard. These - messages go to either serial or internal console, or both, + <para>The second line appears only if <option>-P</option> is + in <filename>/boot.config</filename> and indicates the + presence or absence of the keyboard. These messages go + to either the serial or internal console, or both, depending on the option in <filename>/boot.config</filename>.</para> @@ -2633,54 +2447,53 @@ Keyboard: no</screen> </tgroup> </informaltable> - <para>After the above messages, there will be a small pause - before the boot blocks continue loading the boot loader - and before any further messages printed to the console. - Under normal circumstances, you do not need to interrupt - the boot blocks, but you may want to do so in order to - make sure things are set up correctly.</para> + <para>After the message, there will be a small pause before + the boot blocks continue loading the boot loader and + before any further messages are printed to the console. + Under normal circumstances, there is no need to interrupt + the boot blocks, but one can do so in order to make sure + things are set up correctly.</para> - <para>Hit any key, other than <keycap>Enter</keycap>, at the - console to interrupt the boot process. The boot blocks - will then prompt you for further action. You should now - see something like:</para> + <para>Press any key, other than <keycap>Enter</keycap>, at + the console to interrupt the boot process. The boot + blocks will then prompt for further action:</para> <screen>>> FreeBSD/i386 BOOT Default: 0:ad(0,a)/boot/loader boot:</screen> - <para>Verify the above message appears on either the serial - or internal console or both, according to the options you - put in <filename>/boot.config</filename>. If the message - appears in the correct console, hit <keycap>Enter</keycap> - to continue the boot process.</para> - - <para>If you want the serial console but you do not see the - prompt on the serial terminal, something is wrong with - your settings. In the meantime, you enter - <option>-h</option> and hit <keycap>Enter</keycap> or - <keycap>Return</keycap> (if possible) to tell the boot - block (and then the boot loader and the kernel) to choose - the serial port for the console. Once the system is up, - go back and check what went wrong.</para> + <para>Verify that the above message appears on either the + serial or internal console, or both, according to the + options in <filename>/boot.config</filename>. If the + message appears in the correct console, press + <keycap>Enter</keycap> to continue the boot + process.</para> + + <para>If there is no prompt on the serial terminal, + something is wrong with the settings. Enter + <option>-h</option> then <keycap>Enter</keycap> or + <keycap>Return</keycap> to tell the boot block (and then + the boot loader and the kernel) to choose the serial port + for the console. Once the system is up, go back and check + what went wrong.</para> </step> </procedure> - <para>After the boot loader is loaded and you are in the third - stage of the boot process you can still switch between the - internal console and the serial console by setting appropriate - environment variables in the boot loader. See <xref - linkend="serialconsole-loader"/>.</para> + <para>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 <link linkend="serialconsole-loader"></link> for more + information.</para> </sect2> <sect2 id="serialconsole-summary"> <title>Summary</title> - <para>Here is the summary of various settings discussed in this - section and the console eventually selected.</para> + <para>Here is the summary of the various settings discussed in + this section:</para> <sect3> - <title>Case 1: You Set the Flags to 0x10 for + <title>Case 1: Set the Flags to 0x10 for <devicename>sio0</devicename></title> <programlisting>device sio0 flags 0x10</programlisting> @@ -2744,7 +2557,7 @@ boot:</screen> </sect3> <sect3> - <title>Case 2: You Set the Flags to 0x30 for + <title>Case 2: Set the Flags to 0x30 for <devicename>sio0</devicename></title> <programlisting>device sio0 flags 0x30</programlisting> @@ -2814,45 +2627,41 @@ boot:</screen> <sect3> <title>Setting a Faster Serial Port Speed</title> - <para>By default, the serial port settings are: 9600 baud, 8 - bits, no parity, and 1 stop bit. If you wish to change the - default console speed, you have the following - options:</para> + <para>By default, the serial port settings are 9600 baud, 8 + bits, no parity, and 1 stop bit. To change the default + console speed, the following options are available:</para> <itemizedlist> <listitem> - <para>Recompile the boot blocks - with <makevar>BOOT_COMCONSOLE_SPEED</makevar> set to the - new console speed. See <xref - linkend="serialconsole-com2"/> for detailed + <para>Recompile the boot blocks with + <makevar>BOOT_COMCONSOLE_SPEED</makevar> set to the + new console speed. See <link + linkend="serialconsole-com2"></link> for detailed instructions about building and installing new boot blocks.</para> <para>If the serial console is configured in some other way than by booting with <option>-h</option>, or if the serial console used by the kernel is different from the - one used by the boot blocks, then you must also add the - following option to the kernel configuration file and - compile a new kernel:</para> + one used by the boot blocks, add the following option + to a custom kernel configuration file and compile a + new kernel:</para> <programlisting>options CONSPEED=19200</programlisting> </listitem> <listitem> - <para>Use the <option>-S</option> boot option of the - kernel. The <option>-S</option> command line option can - be added to <filename>/boot.config</filename>. See the - &man.boot.8; manual page for a description of how to add - options to <filename>/boot.config</filename> and a list - of the supported options.</para> + <para>Add the <option>-S</option> boot option to + <filename>/boot.config</filename>. See &man.boot.8; for + a description of how to add options to + <filename>/boot.config</filename> and a list of the + supported options.</para> </listitem> <listitem> - <para>Enable the <varname>comconsole_speed</varname> - option in your <filename>/boot/loader.conf</filename> - file.</para> - - <para>This option depends on <varname>console</varname>, + <para>Enable <varname>comconsole_speed</varname> in + <filename>/boot/loader.conf</filename>. This option + depends on <varname>console</varname>, <varname>boot_serial</varname>, and <varname>boot_multicons</varname> being set in <filename>/boot/loader.conf</filename> too. An example @@ -2868,37 +2677,35 @@ console="comconsole,vidconsole"</programlisting> </sect3> <sect3 id="serialconsole-com2"> - <title>Using Serial Port Other Than + <title>Using a Serial Port Other Than <devicename>sio0</devicename> for the Console</title> <para>Using a port other than <devicename>sio0</devicename> as - the console requires some recompiling. If you want to use - another serial port for whatever reasons, recompile the boot - blocks, the boot loader and the kernel as follows.</para> + the console requires the boot blocks, the boot loader, and + the kernel to be recompiled as follows.</para> <procedure> <step> - <para>Get the kernel source. (See <xref - linkend="updating-upgrading"/>)</para> + <para>Get the kernel source as described in <link + linkend="updating-upgrading"></link>.</para> </step> <step> <para>Edit <filename>/etc/make.conf</filename> and set <literal>BOOT_COMCONSOLE_PORT</literal> to the address - of the port you want to use (0x3F8, 0x2F8, 0x3E8 or - 0x2E8). Only <devicename>sio0</devicename> through + of the port to use: 0x3F8, 0x2F8, 0x3E8 or 0x2E8. Only + <devicename>sio0</devicename> through <devicename>sio3</devicename> (<devicename>COM1</devicename> through - <devicename>COM4</devicename>) can be used; multiport + <devicename>COM4</devicename>) can be used as multiport serial cards will not work. No interrupt setting is needed.</para> </step> <step> <para>Create a custom kernel configuration file and add - appropriate flags for the serial port you want to use. - For example, if you want to make - <devicename>sio1</devicename> + appropriate flags for the serial port to use. For + example, to make <devicename>sio1</devicename> (<devicename>COM2</devicename>) the console:</para> <programlisting>device sio1 flags 0x10</programlisting> @@ -2935,11 +2742,11 @@ console="comconsole,vidconsole"</programlisting> <sect3 id="serialconsole-ddb"> <title>Entering the DDB Debugger from the Serial Line</title> - <para>If you wish to drop into the kernel debugger from the - serial console (useful for remote diagnostics, but also - dangerous if you generate a spurious BREAK on the serial - port!) then you should compile your kernel with the - following options:</para> + <para>To drop into the kernel debugger from the serial + console, compile a custom kernel with the following options. + Note that while this is useful for remote diagnostics, it is + also dangerous if a spurious BREAK is generated on the + serial port.</para> <programlisting>options BREAK_TO_DEBUGGER options DDB</programlisting> @@ -2948,14 +2755,14 @@ options DDB</programlisting> <sect3> <title>Getting a Login Prompt on the Serial Console</title> - <para>While this is not required, you may wish to get a - <emphasis>login</emphasis> prompt over the serial line, now - that you can see boot messages and can enter the kernel - debugging session through the serial console. Here is how - to do it.</para> + <para>While this is not required, it is possible to get a + <emphasis>login</emphasis> prompt over the serial line. + First, make sure that the boot messages are displayed and it + is possible to enter the kernel debugging session through + the serial console.</para> - <para>Open the file <filename>/etc/ttys</filename> with an - editor and locate the lines:</para> + <para>Open <filename>/etc/ttys</filename> with a text editor + and locate the lines:</para> <programlisting>ttyu0 "/usr/libexec/getty std.9600" unknown off secure ttyu1 "/usr/libexec/getty std.9600" unknown off secure @@ -2963,20 +2770,19 @@ ttyu2 "/usr/libexec/getty std.9600" unknown off secure ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting> <para><devicename>ttyu0</devicename> through - <devicename>ttyu3</devicename> corresponds to + <devicename>ttyu3</devicename> correspond to <devicename>COM1</devicename> through <devicename>COM4</devicename>. Change <literal>off</literal> to <literal>on</literal> for the - desired port. If you have changed the speed of the serial - port, you need to change <literal>std.9600</literal> to - match the current setting, e.g., - <literal>std.19200</literal>.</para> + desired port. If the speed of the serial port has been + changed, change <literal>std.9600</literal> to match the + new setting.</para> - <para>You may also want to change the terminal type from - <literal>unknown</literal> to the actual type of your serial + <para>The terminal type can also be changed from + <literal>unknown</literal> to the actual type of the serial terminal.</para> - <para>After editing the file, you must <command>kill -HUP + <para>After editing the file, type <command>kill -HUP 1</command> to make this change take effect.</para> </sect3> </sect2> @@ -2985,18 +2791,18 @@ ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting> <title>Changing Console from the Boot Loader</title> <para>Previous sections described how to set up the serial - console by tweaking the boot block. This section shows that - you can specify the console by entering some commands and + console by tweaking the boot block. This section shows how to + specify the console by entering some commands and environment variables in the boot loader. As the boot loader - is invoked at the third stage of the boot process, after the - boot block, the settings in the boot loader will override the - settings in the boot block.</para> + is invoked at the third stage of the boot process, the + settings in the boot loader will override the settings in the + boot block.</para> <sect3> <title>Setting Up the Serial Console</title> - <para>You can easily specify the boot loader and the kernel to - use the serial console by writing just one line in + <para>The boot loader and the kernel to use the serial console + can be specified by writing one line in <filename>/boot/loader.conf</filename>:</para> <programlisting>console="comconsole"</programlisting> @@ -3004,19 +2810,18 @@ ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting> <para>This will take effect regardless of the settings in the boot block discussed in the previous section.</para> - <para>You had better put the above line as the first line of + <para>This line should be the first line of <filename>/boot/loader.conf</filename> so as to see boot messages on the serial console as early as possible.</para> - <para>Likewise, you can specify the internal console - as:</para> + <para>Likewise, to specify the internal console:</para> <programlisting>console="vidconsole"</programlisting> - <para>If you do not set the boot loader environment variable - <envar>console</envar>, the boot loader, and subsequently - the kernel, will use whichever console indicated by the - <option>-h</option> option in the boot block.</para> + <para>If the boot loader environment variable + <envar>console</envar> is not set, the boot loader, and + subsequently the kernel, will use whichever console is + indicated by <option>-h</option> in the boot block.</para> <para>The console can be specified in <filename>/boot/loader.conf.local</filename> or in @@ -3026,10 +2831,10 @@ ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting> <note> <para>At the moment, the boot loader has no option - quivalent to the <option>-P</option> option in the boot - block, and there is no provision to automatically select - the internal console and the serial console based on the - presence of the keyboard.</para> + equivalent to <option>-P</option> in the boot block, and + there is no provision to automatically select the internal + console and the serial console based on the presence of + the keyboard.</para> </note> </sect3> @@ -3037,32 +2842,29 @@ ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting> <title>Using a Serial Port Other Than <devicename>sio0</devicename> for the Console</title> - <para>You need to recompile the boot loader to use a serial - port other than <devicename>sio0</devicename> for the serial - console. Follow the procedure described in <xref - linkend="serialconsole-com2"/>.</para> + <para>The boot loader needs to be compiled in order to use a + serial port other than <devicename>sio0</devicename> for the + serial console. Follow the procedure described in <link + linkend="serialconsole-com2"></link>.</para> </sect3> </sect2> <sect2 id="serialconsole-caveats"> <title>Caveats</title> - <para>The idea here is to allow people to set up dedicated - servers that require no graphics hardware or attached - keyboards. Unfortunately, while most systems will let you - boot without a keyboard, there are quite a few that will not - let you boot without a graphics adapter. Machines with AMI - BIOSes can be configured to boot with no graphics adapter + <para>While most systems will boot without a keyboard, quite a + few will not boot without a graphics adapter. Machines with + AMI BIOSes can be configured to boot with no graphics adapter installed by changing the <quote>graphics adapter</quote> setting in the CMOS configuration to <quote>Not installed.</quote></para> <para>However, many machines do not support this option and will - refuse to boot if you have no display hardware in the system. - With these machines, you will have to leave some kind of - graphics card plugged in, (even if it is just a junky mono - board) although you will not have to attach a monitor. You - might also try installing an AMI BIOS.</para> + refuse to boot if there is no display hardware in the system. + With these machines, leave some kind of graphics card plugged + in, even if it is just a junky mono board. A monitor does not + need to be attached. One might also try installing an AMI + BIOS.</para> </sect2> </sect1> </chapter> diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.xml b/en_US.ISO8859-1/books/handbook/users/chapter.xml index d63ff64e07..2a3cfbcfe4 100644 --- a/en_US.ISO8859-1/books/handbook/users/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/users/chapter.xml @@ -22,39 +22,32 @@ <sect1 id="users-synopsis"> <title>Synopsis</title> - <para>FreeBSD allows multiple users to use the computer at the - same time. Obviously, only one of those users can be sitting in - front of the screen and keyboard at any one time - <footnote><para>Well, unless you hook up multiple terminals, but - we will save that for <xref linkend="serialcomms"/>.</para> - </footnote>, but any number of users can log in through the - network to get their work done. To use the system every user - must have an account.</para> + <para>&os; allows multiple users to use the computer at the same + time. While only one user can sit in front of the screen and + use the keyboard at any one time, any number of users can log + in to the system through the network. To use the system, every + user must have a user account.</para> <para>After reading this chapter, you will know:</para> <itemizedlist> <listitem> <para>The differences between the various user accounts on a - FreeBSD system.</para> + &os; system.</para> </listitem> <listitem> - <para>How to add user accounts.</para> - </listitem> - - <listitem> - <para>How to remove user accounts.</para> + <para>How to add and remove user accounts.</para> </listitem> <listitem> <para>How to change account details, such as the user's full - name, or preferred shell.</para> + name or preferred shell.</para> </listitem> <listitem> - <para>How to set limits on a per-account basis, to control the - resources such as memory and CPU time that accounts and + <para>How to set limits on a per-account basis to control the + resources, such as memory and CPU time, that accounts and groups of accounts are allowed to access.</para> </listitem> @@ -68,8 +61,8 @@ <itemizedlist> <listitem> - <para>Understand the basics of &unix; and FreeBSD (<xref - linkend="basics"/>).</para> + <para>Understand the <link linkend="basics">basics of &unix; + and &os;</link>.</para> </listitem> </itemizedlist> </sect1> @@ -77,11 +70,11 @@ <sect1 id="users-introduction"> <title>Introduction</title> - <para>All access to the system is achieved via accounts, and all - processes are run by users, so user and account management are - of integral importance on FreeBSD systems.</para> + <para>Since all access to the &os; system is achieved via accounts + and all processes are run by users, user and account management + is important.</para> - <para>Every account on a FreeBSD system has certain information + <para>Every account on a &os; system has certain information associated with it to identify the account.</para> <variablelist> @@ -89,13 +82,13 @@ <term>User name</term> <listitem> - <para>The user name as it would be typed at the - <prompt>login:</prompt> prompt. User names must be unique - across the computer; you may not have two users with the - same user name. There are a number of rules for creating - valid user names, documented in &man.passwd.5;; you would - typically use user names that consist of eight or fewer - all lower case characters.</para> + <para>The user name is typed at the <prompt>login:</prompt> + prompt. User names must be unique on the system as no two + users can have the same user name. There are a number of + rules for creating valid user names, documented in + &man.passwd.5;. Typically user names consist of eight or + fewer all lower case characters in order to maintain + backwards compatibility with applications.</para> </listitem> </varlistentry> @@ -103,47 +96,48 @@ <term>Password</term> <listitem> - <para>Each account has a password associated with it. The - password may be blank, in which case no password will be - required to access the system. This is normally a very - bad idea; every account should have a password.</para> + <para>Each account has an associated password. While the + password can be blank, this is highly discouraged and + every account should have a password.</para> </listitem> </varlistentry> <varlistentry> - <term>User ID (UID)</term> + <term>User ID (<acronym>UID</acronym>)</term> <listitem> - <para>The UID is a number, traditionally from 0 to - 65535<footnote id="users-largeuidgid"> - <para>It is possible to use UID/GIDs as large as - 4294967295, but such IDs can cause serious problems - with software that makes assumptions about the values - of IDs.</para> + <para>The User ID (<acronym>UID</acronym>) is a number, + traditionally from 0 to 65535<footnote + id="users-largeuidgid"> + <para>It is possible to use + <acronym>UID</acronym>s/<acronym>GID</acronym>s as + large as 4294967295, but such IDs can cause serious + problems with software that makes assumptions about + the values of IDs.</para> </footnote>, used to uniquely identify the user to the - system. Internally, FreeBSD uses the UID to - identify users—any FreeBSD commands that allow - you to specify a user name will convert it to the UID - before working with it. This means that you can have - several accounts with different user names but the - same UID. As far as FreeBSD is concerned these - accounts are one user. It is unlikely you will ever - need to do this.</para> + system. Internally, &os; uses the + <acronym>UID</acronym> to identify users. Commands that + allow a user name to be specified will first convert it to + the <acronym>UID</acronym>. Though unlikely, it is + possible for several accounts with different user names to + share the same <acronym>UID</acronym>. As far as &os; is + concerned, these accounts are one user.</para> </listitem> </varlistentry> <varlistentry> - <term>Group ID (GID)</term> + <term>Group ID (<acronym>GID</acronym>)</term> <listitem> - <para>The GID is a number, traditionally from 0 to - 65535<footnoteref linkend="users-largeuidgid"/>, used to - uniquely identify the primary group that the user belongs - to. Groups are a mechanism for controlling access to - resources based on a user's GID rather than their UID. - This can significantly reduce the size of some - configuration files. A user may also be in more than one - group.</para> + <para>The Group ID (<acronym>GID</acronym>) is a number, + traditionally from 0 to 65535<footnoteref + linkend="users-largeuidgid"/>, used to uniquely identify + the primary group that the user belongs to. Groups are a + mechanism for controlling access to resources based on a + user's <acronym>GID</acronym> rather than their + <acronym>UID</acronym>. This can significantly reduce the + size of some configuration files. A user may also be a + member of more than one group.</para> </listitem> </varlistentry> @@ -161,9 +155,9 @@ <term>Password change time</term> <listitem> - <para>By default FreeBSD does not force users to change - their passwords periodically. You can enforce this on a - per-user basis, forcing some or all of your users to + <para>By default &os; does not force users to change their + passwords periodically. Password expiration can be + enforced on a per-user basis, forcing some or all users to change their passwords after a certain amount of time has elapsed.</para> </listitem> @@ -173,11 +167,10 @@ <term>Account expiry time</term> <listitem> - <para>By default FreeBSD does not expire accounts. If you - are creating accounts that you know have a limited - lifespan, for example, in a school where you have accounts - for the students, then you can specify when the account - expires. After the expiry time has elapsed the account + <para>By default &os; does not expire accounts. When + creating accounts that need a limited lifespan, such as + student accounts in a school, specify the account expiry + date. After the expiry time has elapsed, the account cannot be used to log in to the system, although the account's directories and files will remain.</para> </listitem> @@ -187,9 +180,9 @@ <term>User's full name</term> <listitem> - <para>The user name uniquely identifies the account to - FreeBSD, but does not necessarily reflect the user's real - name. This information can be associated with the + <para>The user name uniquely identifies the account to &os;, + but does not necessarily reflect the user's real name. + This information can be associated with the account.</para> </listitem> </varlistentry> @@ -199,15 +192,14 @@ <listitem> <para>The home directory is the full path to a directory on - the system in which the user will start when logging on to - the system. A common convention is to put all user home - directories under - <filename>/home/<replaceable>username</replaceable></filename> - or - <filename>/usr/home/<replaceable>username</replaceable></filename>. - The user would store their personal files in their home - directory, and any directories they may create in - there.</para> + the system. This is the user's starting directory when + the user logs in. A common convention is to put all user + home directories under <filename + class="directory">/home/<replaceable>username</replaceable></filename> + or <filename + class="directory">/usr/home/<replaceable>username</replaceable></filename>. + Each user stores their personal files and subdirectories + in their own home directory.</para> </listitem> </varlistentry> @@ -225,105 +217,105 @@ </variablelist> <para>There are three main types of accounts: the <link - linkend="users-superuser">Superuser</link>, <link - linkend="users-system">system users</link>, and <link - linkend="users-user">user accounts</link>. The Superuser + linkend="users-superuser">superuser</link>, <link + linkend="users-system">system accounts</link>, and <link + linkend="users-user">user accounts</link>. The superuser account, usually called <username>root</username>, is used to manage the system with no limitations on privileges. System - users run services. Finally, user accounts are used by real - people, who log on, read mail, and so forth.</para> - </sect1> + accounts are used to run services. User accounts are + assigned to real people and are used to log in and use the + system.</para> - <sect1 id="users-superuser"> - <title>The Superuser Account</title> + <sect2 id="users-superuser"> + <title>The Superuser Account</title> - <indexterm> - <primary>accounts</primary> - <secondary>superuser (root)</secondary> - </indexterm> - <para>The superuser account, usually called - <username>root</username>, comes preconfigured to facilitate - system administration, and should not be used for day-to-day - tasks like sending and receiving mail, general exploration of - the system, or programming.</para> - - <para>This is because the superuser, unlike normal user accounts, - can operate without limits, and misuse of the superuser account - may result in spectacular disasters. User accounts are unable - to destroy the system by mistake, so it is generally best to use - normal user accounts whenever possible, unless you especially - need the extra privilege.</para> - - <para>You should always double and triple-check commands you issue - as the superuser, since an extra space or missing character can - mean irreparable data loss.</para> - - <para>So, the first thing you should do after reading this - chapter is to create an unprivileged user account for yourself - for general usage if you have not already. This applies equally - whether you are running a multi-user or single-user machine. - Later in this chapter, we discuss how to create additional - accounts, and how to change between the normal user and - superuser.</para> - </sect1> + <indexterm> + <primary>accounts</primary> + <secondary>superuser (root)</secondary> + </indexterm> + <para>The superuser account, usually called + <username>root</username>, is used to perform system + administration tasks and should not be used for day-to-day + tasks like sending and receiving mail, general exploration of + the system, or programming.</para> + + <para>This is because the superuser, unlike normal user + accounts, can operate without limits, and misuse of the + superuser account may result in spectacular disasters. User + accounts are unable to destroy the system by mistake, so it is + generally best to use normal user accounts whenever possible, + unless extra privilege is required.</para> + + <para>Always double and triple-check any commands issued as the + superuser, since an extra space or missing character can mean + irreparable data loss.</para> + + <para>Always create a user account for the system administrator + and use this account to log in to the system for general + usage. This applies equally to multi-user or single-user + systems. Later sections will discuss how to create additional + accounts and how to change between the normal user and + superuser.</para> + </sect2> - <sect1 id="users-system"> - <title>System Accounts</title> + <sect2 id="users-system"> + <title>System Accounts</title> - <indexterm> - <primary>accounts</primary> - <secondary>system</secondary> - </indexterm> - <para>System users are those used to run services such as DNS, - mail, web servers, and so forth. The reason for this is - security; if all services ran as the superuser, they could - act without restriction.</para> + <indexterm> + <primary>accounts</primary> + <secondary>system</secondary> + </indexterm> + <para>System accounts are used to run services such as DNS, + mail, and web servers. The reason for this is security; if + all services ran as the superuser, they could act without + restriction.</para> - <indexterm> - <primary>accounts</primary> - <secondary><username>daemon</username></secondary> - </indexterm> - <indexterm> - <primary>accounts</primary> - <secondary><username>operator</username></secondary> - </indexterm> - <para>Examples of system users are <username>daemon</username>, - <username>operator</username>, <username>bind</username> (for - the Domain Name Service), <username>news</username>, and - <username>www</username>.</para> + <indexterm> + <primary>accounts</primary> + <secondary><username>daemon</username></secondary> + </indexterm> + <indexterm> + <primary>accounts</primary> + <secondary><username>operator</username></secondary> + </indexterm> + <para>Examples of system accounts are + <username>daemon</username>, <username>operator</username>, + <username>bind</username>, <username>news</username>, and + <username>www</username>.</para> - <indexterm> - <primary>accounts</primary> - <secondary><username>nobody</username></secondary> - </indexterm> - <para><username>nobody</username> is the generic unprivileged - system user. However, it is important to keep in mind that the - more services that use <username>nobody</username>, the more - files and processes that user will become associated with, and - hence the more privileged that user becomes.</para> - </sect1> + <indexterm> + <primary>accounts</primary> + <secondary><username>nobody</username></secondary> + </indexterm> + <para><username>nobody</username> is the generic unprivileged + system account. However, the more services that use + <username>nobody</username>, the more files and processes that + user will become associated with, and hence the more + privileged that user becomes.</para> + </sect2> - <sect1 id="users-user"> - <title>User Accounts</title> + <sect2 id="users-user"> + <title>User Accounts</title> - <indexterm> - <primary>accounts</primary> - <secondary>user</secondary> - </indexterm> - <para>User accounts are the primary means of access for real - people to the system, and these accounts insulate the user and - the environment, preventing the users from damaging the system - or other users, and allowing users to customize their - environment without affecting others.</para> - - <para>Every person accessing your system should have a unique user - account. This allows you to find out who is doing what, prevent - people from clobbering each others' settings or reading each - others' mail, and so forth.</para> - - <para>Each user can set up their own environment to accommodate - their use of the system, by using alternate shells, editors, key - bindings, and language.</para> + <indexterm> + <primary>accounts</primary> + <secondary>user</secondary> + </indexterm> + <para>User accounts are the primary means of access for real + people to the system. User accounts insulate the user and + the environment, preventing users from damaging the system + or other users, and allowing users to customize their + environment without affecting others.</para> + + <para>Every person accessing the system should have a unique + user account. This allows the administrator to find out who + is doing what, prevents users from clobbering each others' + settings or reading each others' mail, and so forth.</para> + + <para>Each user can set up their own environment to accommodate + their use of the system, by using alternate shells, editors, + key bindings, and language.</para> + </sect2> </sect1> <sect1 id="users-modifying"> @@ -334,10 +326,9 @@ <secondary>modifying</secondary> </indexterm> - <para>There are a variety of different commands available in the - &unix; environment to manipulate user accounts. The most common - commands are summarized below, followed by more detailed - examples of their usage.</para> + <para>&os; provides a variety of different commands to manage + user accounts. The most common commands are summarized below, + followed by more detailed examples of their usage.</para> <informaltable frame="none" pgwide="1"> <tgroup cols="2"> @@ -365,7 +356,7 @@ <row> <entry>&man.chpass.1;</entry> - <entry>A flexible tool to change user database + <entry>A flexible tool for changing user database information.</entry> </row> @@ -377,8 +368,8 @@ <row> <entry>&man.pw.8;</entry> - <entry>A powerful and flexible tool to modify all aspects - of user accounts.</entry> + <entry>A powerful and flexible tool for modifying all + aspects of user accounts.</entry> </row> </tbody> </tgroup> @@ -399,14 +390,14 @@ class="directory">/usr/share/skel</filename></primary> </indexterm> <indexterm><primary>skeleton directory</primary></indexterm> - <para>&man.adduser.8; is a simple program for - adding new users. It creates entries in the system - <filename>passwd</filename> and <filename>group</filename> - files. It will also create a home directory for the new user, - copy in the default configuration files - (<quote>dotfiles</quote>) from - <filename>/usr/share/skel</filename>, and can optionally mail - the new user a welcome message.</para> + <para>&man.adduser.8; is a simple program for adding new users + When a new user is added, this program automatically updates + <filename>/etc/passwd</filename> and + <filename>/etc/group</filename>. It also creates a home + directory for the new user, copies in the default + configuration files from <filename + class="directory">/usr/share/skel</filename>, and can + optionally mail the new user a welcome message.</para> <example> <title>Adding a User on &os;</title> @@ -444,9 +435,9 @@ Goodbye! </example> <note> - <para>The password you type in is not echoed, nor are - asterisks displayed. Make sure that you do not mistype the - password.</para> + <para>Since the password is not echoed when typed, be careful + to not mistype the password when creating the user + account.</para> </note> </sect2> @@ -459,14 +450,14 @@ Goodbye! <secondary>removing</secondary> </indexterm> - <para>You can use &man.rmuser.8; to completely remove a user - from the system. &man.rmuser.8; performs the following + <para>To completely remove a user from the system use + &man.rmuser.8;. This command performs the following steps:</para> <procedure> <step> - <para>Removes the user's &man.crontab.1; entry (if - any).</para> + <para>Removes the user's &man.crontab.1; entry if one + exists.</para> </step> <step> @@ -484,19 +475,20 @@ Goodbye! </step> <step> - <para>Removes the user's home directory (if it is owned by - the user).</para> + <para>Removes the user's home directory, if it is owned by + the user.</para> </step> <step> <para>Removes the incoming mail files belonging to the user - from <filename>/var/mail</filename>.</para> + from <filename + class="directory">/var/mail</filename>.</para> </step> <step> <para>Removes all files owned by the user from temporary - file storage areas such as - <filename>/tmp</filename>.</para> + file storage areas such as <filename + class="directory">/tmp</filename>.</para> </step> <step> @@ -505,7 +497,7 @@ Goodbye! <note> <para>If a group becomes empty and the group name is the - same as the username, the group is removed; this + same as the username, the group is removed. This complements the per-user unique groups created by &man.adduser.8;.</para> </note> @@ -513,11 +505,11 @@ Goodbye! </procedure> <para>&man.rmuser.8; cannot be used to remove superuser - accounts, since that is almost always an indication of massive + accounts since that is almost always an indication of massive destruction.</para> - <para>By default, an interactive mode is used, which attempts to - make sure you know what you are doing.</para> + <para>By default, an interactive mode is used, as shown + in the following example.</para> <example> <title><command>rmuser</command> Interactive Account @@ -542,24 +534,21 @@ Removing files belonging to jru from /var/tmp/vi.recover: done. <title><command>chpass</command></title> <indexterm><primary><command>chpass</command></primary></indexterm> - <para>&man.chpass.1; changes user database + <para>&man.chpass.1; can be used to change user database information such as passwords, shells, and personal information.</para> - <para>Only system administrators, as the superuser, may change - other users' information and passwords with - &man.chpass.1;.</para> + <para>Only the superuser can change other users' information and + passwords with &man.chpass.1;.</para> <para>When passed no options, aside from an optional username, - &man.chpass.1; displays an editor - containing user information. When the user exists from the - editor, the user database is updated with the new - information.</para> + &man.chpass.1; displays an editor containing user information. + When the user exists from the editor, the user database is + updated with the new information.</para> <note> - <para>You will be asked for your password - after exiting the editor if you are not the - superuser.</para> + <para>You will be asked for your password after exiting the + editor if you are not the superuser.</para> </note> <example> @@ -583,8 +572,8 @@ Home Phone: Other information:</screen> </example> - <para>The normal user can change only a small subset of this - information, and only for themselves.</para> + <para>A user can change only a small subset of this + information, and only for their own user account.</para> <example> <title>Interactive <command>chpass</command> by Normal @@ -600,15 +589,12 @@ Other information:</screen> </example> <note> - <para>&man.chfn.1; and &man.chsh.1; are - just links to &man.chpass.1;, as - are &man.ypchpass.1;, - &man.ypchfn.1;, and - &man.ypchsh.1;. NIS support is automatic, so - specifying the <literal>yp</literal> before the command is - not necessary. If this is confusing to you, do not worry, - NIS will be covered in <xref - linkend="network-servers"/>.</para> + <para>&man.chfn.1; and &man.chsh.1; are links to + &man.chpass.1;, as are &man.ypchpass.1;, &man.ypchfn.1;, and + &man.ypchsh.1;. <acronym>NIS</acronym> support is + automatic, so specifying the <literal>yp</literal> before + the command is not necessary. How to configure NIS is + covered in <link linkend="network-servers"></link>.</para> </note> </sect2> <sect2 id="users-passwd"> @@ -619,14 +605,15 @@ Other information:</screen> <primary>accounts</primary> <secondary>changing password</secondary> </indexterm> - <para>&man.passwd.1; is the usual way to - change your own password as a user, or another user's password - as the superuser.</para> + <para>&man.passwd.1; is the usual way to change your own + password as a user, or another user's password as the + superuser.</para> <note> - <para>To prevent accidental or unauthorized changes, the - original password must be entered before a new password can - be set.</para> + <para>To prevent accidental or unauthorized changes, the user + must enter their original password before a new password can + be set. This is not the case when the superuser changes a + user's password.</para> </note> <example> @@ -654,10 +641,8 @@ passwd: done</screen> </example> <note> - <para>As with &man.chpass.1;, - &man.yppasswd.1; is just a link to - &man.passwd.1;, so NIS works with either - command.</para> + <para>As with &man.chpass.1;, &man.yppasswd.1; is a link to + &man.passwd.1;, so NIS works with either command.</para> </note> </sect2> @@ -669,11 +654,11 @@ passwd: done</screen> <para>&man.pw.8; is a command line utility to create, remove, modify, and display users and groups. It functions as a front - end to the system user and group files. &man.pw.8; - has a very powerful set of command line options that make it - suitable for use in shell scripts, but new users may find it - more complicated than the other commands presented - here.</para> + end to the system user and group files. &man.pw.8; has a very + powerful set of command line options that make it suitable for + use in shell scripts, but new users may find it more + complicated than the other commands presented in this + section.</para> </sect2> @@ -687,12 +672,10 @@ passwd: done</screen> <primary>accounts</primary> <secondary>limiting</secondary> </indexterm> - <para>If you have users, the ability to limit their system use may - have come to mind. FreeBSD provides - several ways an administrator can limit the amount of system - resources an individual may use. These limits are - divided into two sections: disk quotas, and other resource - limits.</para> + <para>&os; provides several methods for an administrator to limit + the amount of system resources an individual may use. These + limits are discussed in two sections: disk quotas and other + resource limits.</para> <indexterm><primary>quotas</primary></indexterm> <indexterm> @@ -700,11 +683,10 @@ passwd: done</screen> <secondary>quotas</secondary> </indexterm> <indexterm><primary>disk quotas</primary></indexterm> - <para>Disk quotas limit disk usage to users, and - they - provide a way to quickly check that usage without - calculating it every time. Quotas are discussed in <xref - linkend="quotas"/>.</para> + <para>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 <link + linkend="quotas"></link>.</para> <para>The other resource limits include ways to limit the amount of CPU, memory, and other resources a user may consume. These @@ -714,47 +696,45 @@ passwd: done</screen> <primary><filename>/etc/login.conf</filename></primary> </indexterm> <para>Login classes are defined in - <filename>/etc/login.conf</filename>. The precise semantics are - beyond the scope of this section, but are described in detail in - the &man.login.conf.5; manual page. It is sufficient to say - that each user is assigned to a login class - (<literal>default</literal> by default), and that each login + <filename>/etc/login.conf</filename> and are described in detail + in &man.login.conf.5;. Each user account is assigned to a login + class, <literal>default</literal> by default, and each login class has a set of login capabilities associated with it. A login capability is a <literal><replaceable>name</replaceable>=<replaceable>value</replaceable></literal> pair, where <replaceable>name</replaceable> is a well-known identifier and <replaceable>value</replaceable> is an arbitrary - string processed accordingly depending on the name. Setting up - login classes and capabilities is rather straight-forward and is - also described in &man.login.conf.5;.</para> + string which is processed accordingly depending on the + <replaceable>name</replaceable>. Setting up login classes and + capabilities is rather straightforward and is also described in + &man.login.conf.5;.</para> <note> - <para>The system does not normally read the configuration in - <filename>/etc/login.conf</filename> directly, but reads the - database file <filename>/etc/login.conf.db</filename> which - provides faster lookups. To generate - <filename>/etc/login.conf.db</filename> from - <filename>/etc/login.conf</filename>, execute the following - command:</para> + <para>&os; does not normally read the configuration in + <filename>/etc/login.conf</filename> directly, but instead + reads the <filename>/etc/login.conf.db</filename> database + which provides faster lookups. Whenever + <filename>/etc/login.conf</filename> is edited, the + <filename>/etc/login.conf.db</filename> must be updated by + executing the following command:</para> <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen> </note> - <para>Resource limits are different from plain vanilla login - capabilities in two ways. First, for every limit, there is a - soft (current) and hard limit. A soft limit may be adjusted by - the user or application, but may be no higher than the hard - limit. The latter may be lowered by the user, but never raised. - Second, most resource limits apply per process to a specific - user, not the user as a whole. Note, however, that these + <para>Resource limits differ from the default login capabilities + in two ways. First, for every limit, there is a soft (current) + and hard limit. A soft limit may be adjusted by the user or + application, but may not be set higher than the hard limit. The + hard limit may be lowered by the user, but can only be raised + by the superuser. Second, most resource limits apply per + process to a specific user, not to the user as a whole. These differences are mandated by the specific handling of the limits, - not by the implementation of the login capability framework - (i.e., they are not <emphasis>really</emphasis> a special case - of login capabilities).</para> + not by the implementation of the login capability + framework.</para> - <para>And so, without further ado, below are the most commonly - used resource limits (the rest, along with all the other login - capabilities, may be found in &man.login.conf.5;).</para> + <para>Below are the most commonly used resource limits. The rest + of the limits, along with all the other login capabilities, can + be found in &man.login.conf.5;.</para> <variablelist> <varlistentry> @@ -766,14 +746,13 @@ passwd: done</screen> <secondary>coredumpsize</secondary> </indexterm> <para>The limit on the size of a core file generated by a - program is, for obvious reasons, subordinate to other - limits on disk usage (e.g., <literal>filesize</literal>, - or disk quotas). Nevertheless, it is often used as a - less-severe method of controlling disk space consumption: - since users do not generate core files themselves, and - often do not delete them, setting this may save them from - running out of disk space should a large program (e.g., - <application>emacs</application>) crash.</para> + program is subordinate to other limits on disk usage, such + as <literal>filesize</literal>, or disk quotas. + This limit is often used as a less-severe method of + controlling disk space consumption. Since users do not + generate core files themselves, and often do not delete + them, setting this may save them from running out of disk + space should a large program crash.</para> </listitem> </varlistentry> @@ -786,18 +765,14 @@ passwd: done</screen> <primary>limiting users</primary> <secondary>cputime</secondary> </indexterm> - <para>This is the maximum amount of CPU time a user's - process may consume. Offending processes will be killed - by the kernel.</para> + <para>The maximum amount of CPU time a user's process may + consume. Offending processes will be killed by the + kernel.</para> <note> <para>This is a limit on CPU <emphasis>time</emphasis> consumed, not percentage of the CPU as displayed in - some fields by &man.top.1; and &man.ps.1;. A limit on - the latter is, at the time of this writing, not - possible, and would be rather useless: a - compiler—probably a legitimate task—can - easily use almost 100% of a CPU for some time.</para> + some fields by &man.top.1; and &man.ps.1;.</para> </note> </listitem> </varlistentry> @@ -811,10 +786,10 @@ passwd: done</screen> <primary>limiting users</primary> <secondary>filesize</secondary> </indexterm> - <para>This is the maximum size of a file the user may - possess. Unlike <link linkend="quotas">disk - quotas</link>, this limit is enforced on individual - files, not the set of all files a user owns.</para> + <para>The maximum size of a file the user may own. Unlike + <link linkend="quotas">disk quotas</link>, this limit is + enforced on individual files, not the set of all files a + user owns.</para> </listitem> </varlistentry> @@ -827,17 +802,15 @@ passwd: done</screen> <primary>limiting users</primary> <secondary>maxproc</secondary> </indexterm> - <para>This is the maximum number of processes a user may be - running. This includes foreground and background - processes alike. For obvious reasons, this may not be - larger than the system limit specified by the - <varname>kern.maxproc</varname> &man.sysctl.8;. Also note - that setting this too small may hinder a user's - productivity: it is often useful to be logged in multiple - times or execute pipelines. Some tasks, such as - compiling a large program, also spawn multiple processes - (e.g., &man.make.1;, &man.cc.1;, and other intermediate - preprocessors).</para> + <para>The maximum number of processes a user can run. This + includes foreground and background processes. This limit + may not be larger than the system limit specified by the + <varname>kern.maxproc</varname> &man.sysctl.8;. Setting + this limit too small may hinder a user's productivity as + it is often useful to be logged in multiple times or to + execute pipelines. Some tasks, such as compiling a large + program, spawn multiple processes and other intermediate + preprocessors.</para> </listitem> </varlistentry> @@ -850,12 +823,11 @@ passwd: done</screen> <primary>limiting users</primary> <secondary>memorylocked</secondary> </indexterm> - <para>This is the maximum amount a memory a process may have - requested to be locked into main memory (e.g., see - &man.mlock.2;). Some system-critical programs, such as - &man.amd.8;, lock into main memory such that in the event - of being swapped out, they do not contribute to - a system's thrashing in time of trouble.</para> + <para>The maximum amount of memory a process may request + to be locked into main memory using &man.mlock.2;. Some + system-critical programs, such as &man.amd.8;, lock into + main memory so that if the system begins to swap, they do + not contribute to disk thrashing.</para> </listitem> </varlistentry> @@ -865,12 +837,11 @@ passwd: done</screen> <listitem> <indexterm><primary>memoryuse</primary></indexterm> <indexterm><primary>limiting users</primary> - <secondary>memoryuse</secondary> - </indexterm> - <para>This is the maximum amount of memory a process may - consume at any given time. It includes both core memory and - swap usage. This is not a catch-all limit for restricting - memory consumption, but it is a good start.</para> + <secondary>memoryuse</secondary></indexterm> + <para>The maximum amount of memory a process may consume at + any given time. It includes both core memory and swap + usage. This is not a catch-all limit for restricting + memory consumption, but is a good start.</para> </listitem> </varlistentry> @@ -882,10 +853,10 @@ passwd: done</screen> <indexterm><primary>limiting users</primary> <secondary>openfiles</secondary> </indexterm> - <para>This is the maximum amount of files a process may have - open. In FreeBSD, files are also used to represent - sockets and IPC channels; thus, be careful not to set this - too low. The system-wide limit for this is defined by the + <para>The maximum number of files a process may have open. + In &os;, files are used to represent sockets and IPC + channels, so be careful not to set this too low. The + system-wide limit for this is defined by the <varname>kern.maxfiles</varname> &man.sysctl.8;.</para> </listitem> </varlistentry> @@ -898,10 +869,8 @@ passwd: done</screen> <indexterm><primary>limiting users</primary> <secondary>sbsize</secondary> </indexterm> - <para>This is the limit on the amount of network memory, and - thus mbufs, a user may consume. This originated as a - response to an old DoS attack by creating a lot of - sockets, but can be generally used to limit network + <para>The limit on the amount of network memory, and + thus mbufs, a user may consume in order to limit network communications.</para> </listitem> </varlistentry> @@ -914,10 +883,10 @@ passwd: done</screen> <indexterm><primary>limiting users</primary> <secondary>stacksize</secondary> </indexterm> - <para>This is the maximum size a process' stack may grow to. - This alone is not sufficient to limit the amount of memory - a program may use; consequently, it should be used in - conjunction with other limits.</para> + <para>The maximum size of a process stack. This alone is + not sufficient to limit the amount of memory a program + may use so it should be used in conjunction with other + limits.</para> </listitem> </varlistentry> </variablelist> @@ -936,25 +905,26 @@ passwd: done</screen> <listitem> <para>Although the <filename>/etc/login.conf</filename> that comes with the system is a good source of reasonable values - for most limits, only you, the administrator, can know what - is appropriate for your system. Setting a limit too high - may open your system up to abuse, while setting it too low - may put a strain on productivity.</para> + for most limits, they may not be appropriate for every + system. Setting a limit too high may open the system up to + abuse, while setting it too low may put a strain on + productivity.</para> </listitem> <listitem> - <para>Users of the X Window System (X11) should probably be - granted more resources than other users. X11 by itself - takes a lot of resources, but it also encourages users to - run more programs simultaneously.</para> + <para>Users of <application>&xorg;</application> should + probably be granted more resources than other users. + <application>&xorg;</application> by itself takes a lot of + resources, but it also encourages users to run more programs + simultaneously.</para> </listitem> <listitem> - <para>Remember that many limits apply to individual processes, - not the user as a whole. For example, setting + <para>Many limits apply to individual processes, not the user + as a whole. For example, setting <varname>openfiles</varname> to 50 means that each process - the user runs may open up to 50 files. Thus, the gross - amount of files a user may open is the value of + the user runs may open up to 50 files. The total amount + of files a user may open is the value of <literal>openfiles</literal> multiplied by the value of <literal>maxproc</literal>. This also applies to memory consumption.</para> @@ -962,9 +932,8 @@ passwd: done</screen> </itemizedlist> <para>For further information on resource limits and login classes - and capabilities in general, please consult the relevant manual - pages: &man.cap.mkdb.1;, &man.getrlimit.2;, - &man.login.conf.5;.</para> + and capabilities in general, refer to &man.cap.mkdb.1;, + &man.getrlimit.2;, and &man.login.conf.5;.</para> </sect1> <sect1 id="users-groups"> @@ -978,29 +947,27 @@ passwd: done</screen> <primary>accounts</primary> <secondary>groups</secondary> </indexterm> - <para>A group is simply a list of users. Groups are identified by - their group name and GID (Group ID). In FreeBSD (and most other - &unix; like systems), the two factors the kernel uses to decide - whether a process is allowed to do something is its user ID and - list of groups it belongs to. Unlike a user ID, a process has a - list of groups associated with it. You may hear some things - refer to the <quote>group ID</quote> of a user or process; most - of the time, this just means the first group in the list.</para> - - <para>The group name to group ID map is in - <filename>/etc/group</filename>. This is a plain text file with - four colon-delimited fields. The first field is the group name, - the second is the encrypted password, the third the group ID, - and the fourth the comma-delimited list of members. It can - safely be edited by hand (assuming, of course, that you do not - make any syntax errors!). For a more complete description of - the syntax, see the &man.group.5; manual page.</para> - - <para>If you do not want to edit <filename>/etc/group</filename> - manually, you can use the &man.pw.8; command to add and edit - groups. For example, to add a group called - <groupname>teamtwo</groupname> and then confirm that it exists - you can use:</para> + <para>A group is a list of users. A group is identified by its + group name and <acronym>GID</acronym>. In &os;, the + kernel uses the <acronym>UID</acronym> of a process, and the + list of groups it belongs to, to determine what the process is + allowed to do. Most of the time, the <acronym>GID</acronym> of + a user or process usually means the first group in the + list.</para> + + <para>The group name to <acronym>GID</acronym> mapping is listed + in <filename>/etc/group</filename>. This is a plain text file + with four colon-delimited fields. The first field is the group + name, the second is the encrypted password, the third the + <acronym>GID</acronym>, and the fourth the comma-delimited list + of members. For a more complete description of the syntax, + refer to &man.group.5;.</para> + + <para>The superuser can modify <filename>/etc/group</filename> + using a text editor. Alternatively, &man.pw.8; can be used to + add and edit groups. For example, to add a group called + <groupname>teamtwo</groupname> and then confirm that it + exists:</para> <example> <title>Adding a Group Using &man.pw.8;</title> @@ -1010,15 +977,14 @@ passwd: done</screen> teamtwo:*:1100:</screen> </example> - <para>The number <literal>1100</literal> above is the group ID of - the group <groupname>teamtwo</groupname>. Right now, - <groupname>teamtwo</groupname> has no members, and is thus - rather useless. Let's change that by inviting - <username>jru</username> to the <groupname>teamtwo</groupname> - group.</para> + <para>In this example, <literal>1100</literal> is the + <acronym>GID</acronym> of <groupname>teamtwo</groupname>. Right + now, <groupname>teamtwo</groupname> has no members. This + command will add <username>jru</username> as a member of + <groupname>teamtwo</groupname>.</para> <example> - <title>Setting the List of Members of a Group Using + <title>Adding User Accounts to a New Group Using &man.pw.8;</title> <screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput> @@ -1026,17 +992,17 @@ teamtwo:*:1100:</screen> teamtwo:*:1100:jru</screen> </example> - <para>The argument to the <option>-M</option> option is a - comma-delimited list of users who are to be in the group. From - the preceding sections, we know that the password file also - contains a group for each user. The latter (the user) is - automatically added to the group list by the system; the user - will not show up as a member when using the - <option>groupshow</option> command to &man.pw.8;, but will show - up when the information is queried via &man.id.1; or similar - tool. In other words, &man.pw.8; only manipulates the - <filename>/etc/group</filename> file; it will never attempt to - read additionally data from + <para>The argument to <option>-M</option> is a comma-delimited + list of users to be added to a new (empty) group or to replace + the members of an existing group. To the user, this group + membership is different from (and in addition to) the user's + primary group listed in the password file. This means that + the user will not show up as a member when using + <option>groupshow</option> with &man.pw.8;, but will show up + when the information is queried via &man.id.1; or a similar + tool. When &man.pw.8; is used to add a user to a group, it only + manipulates <filename>/etc/group</filename> and does not attempt + to read additional data from <filename>/etc/passwd</filename>.</para> <example> @@ -1047,10 +1013,11 @@ teamtwo:*:1100:jru</screen> teamtwo:*:1100:jru,db</screen> </example> - <para>The argument to the <option>-m</option> option is a + <para>In this example, the argument to <option>-m</option> is a comma-delimited list of users who are to be added to the group. - Unlike the previous example, these users are added to the group - and do not replace the list of users in the group.</para> + Unlike the previous example, these users are appended to the + group list and do not replace the list of existing users in the + group.</para> <example> <title>Using &man.id.1; to Determine Group Membership</title> @@ -1059,13 +1026,12 @@ teamtwo:*:1100:jru,db</screen> uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen> </example> - <para>As you can see, <username>jru</username> is a member of the + <para>In this example, <username>jru</username> is a member of the groups <groupname>jru</groupname> and <groupname>teamtwo</groupname>.</para> - <para>For more information about &man.pw.8;, see its manual page, - and for more information on the format of - <filename>/etc/group</filename>, consult the &man.group.5; - manual page.</para> + <para>For more information about this command and the format of + <filename>/etc/group</filename>, refer to &man.pw.8; and + &man.group.5;.</para> </sect1> </chapter> diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml index ece904aa9e..0d6d3fa1cd 100644 --- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml @@ -21,80 +21,54 @@ </authorgroup> </chapterinfo> - <title>The Vinum Volume Manager</title> + <title>The <devicename>vinum</devicename> Volume Manager</title> <sect1 id="vinum-synopsis"> <title>Synopsis</title> - <para>No matter what disks you have, there are always potential - problems:</para> + <para>No matter the type of disks, there are always potential + problems. The disks can be too small, too slow, or too + unreliable to meet the system's requirements. While disks are + getting bigger, so are data storage requirements. Often a file + system is needed that is bigger than a disk's capacity. Various + solutions to these problems have been proposed and + implemented.</para> - <itemizedlist> - <listitem> - <para>They can be too small.</para> - </listitem> - - <listitem> - <para>They can be too slow.</para> - </listitem> - - <listitem> - <para>They can be too unreliable.</para> - </listitem> - </itemizedlist> - - <para>Various solutions to these problems have been proposed and - implemented. One way some users safeguard themselves against - such issues is through the use of multiple, and sometimes + <para>One method is through the use of multiple, and sometimes redundant, disks. In addition to supporting various cards and - controllers for hardware RAID systems, the base &os; system - includes the Vinum Volume Manager, a block device driver that - implements virtual disk drives. <emphasis>Vinum</emphasis> is a - so-called <emphasis>Volume Manager</emphasis>, a virtual disk - driver that addresses these three problems. Vinum provides more - flexibility, performance, and reliability than traditional disk - storage, and implements RAID-0, RAID-1, and RAID-5 models both - individually and in combination.</para> + controllers for hardware Redundant Array of Independent + Disks <acronym>RAID</acronym> systems, the base &os; system + includes the <devicename>vinum</devicename> volume manager, a + block device driver that implements virtual disk drives and + addresses these three problems. <devicename>vinum</devicename> + provides more flexibility, performance, and reliability than + traditional disk storage and implements + <acronym>RAID</acronym>-0, <acronym>RAID</acronym>-1, and + <acronym>RAID</acronym>-5 models, both individually and in + combination.</para> <para>This chapter provides an overview of potential problems with - traditional disk storage, and an introduction to the Vinum - Volume Manager.</para> + traditional disk storage, and an introduction to the + <devicename>vinum</devicename> volume manager.</para> <note> - <para>Starting with &os; 5, Vinum has been rewritten in - order to fit into the GEOM architecture (<xref - linkend="GEOM"/>), retaining the original ideas, - terminology, and on-disk metadata. This rewrite is called - <emphasis>gvinum</emphasis> (for <emphasis> GEOM - vinum</emphasis>). The following text usually refers to - <emphasis>Vinum</emphasis> as an abstract name, regardless of - the implementation variant. Any command invocations should - now be done using the <command>gvinum</command> command, and - the name of the kernel module has been changed from + <para>Starting with &os; 5, <devicename>vinum</devicename> + has been rewritten in order to fit into the <link + linkend="GEOM">GEOM architecture</link>, while retaining the + original ideas, terminology, and on-disk metadata. This + rewrite is called <emphasis>gvinum</emphasis> (for <emphasis> + GEOM vinum</emphasis>). While this chapter uses the term + <devicename>vinum</devicename>, any command invocations should + be performed with <command>gvinum</command>. The name of the + kernel module has changed from the original <filename>vinum.ko</filename> to <filename>geom_vinum.ko</filename>, and all device nodes reside under <filename class="directory">/dev/gvinum</filename> instead of <filename class="directory">/dev/vinum</filename>. As of - &os; 6, the old Vinum implementation is no longer - available in the code base.</para> + &os; 6, the original <devicename>vinum</devicename> + implementation is no longer available in the code base.</para> </note> - - </sect1> - - <sect1 id="vinum-intro"> - <title>Disks Are Too Small</title> - - <indexterm><primary>Vinum</primary></indexterm> - <indexterm><primary>RAID</primary> - <secondary>software</secondary></indexterm> - - <para>Disks are getting bigger, but so are data storage - requirements. Often you will find you want a file system that - is bigger than the disks you have available. Admittedly, this - problem is not as acute as it was ten years ago, but it still - exists. Some systems have solved this by creating an abstract - device which stores its data on a number of disks.</para> </sect1> <sect1 id="vinum-access-bottlenecks"> @@ -108,18 +82,18 @@ <para>Current disk drives can transfer data sequentially at up to 70 MB/s, but this value is of little importance in an - environment where many independent processes access a drive, + environment where many independent processes access a drive, and where they may achieve only a fraction of these values. In such - cases it is more interesting to view the problem from the - viewpoint of the disk subsystem: the important parameter is the - load that a transfer places on the subsystem, in other words the - time for which a transfer occupies the drives involved in the + cases, it is more interesting to view the problem from the + viewpoint of the disk subsystem. The important parameter is the + load that a transfer places on the subsystem, or the time for + which a transfer occupies the drives involved in the transfer.</para> <para>In any disk transfer, the drive must first position the heads, wait for the first sector to pass under the read head, and then perform the transfer. These actions can be considered - to be atomic: it does not make any sense to interrupt + to be atomic as it does not make any sense to interrupt them.</para> <para><anchor id="vinum-latency"/> Consider a typical transfer of @@ -134,14 +108,14 @@ size.</para> <para>The traditional and obvious solution to this bottleneck is - <quote>more spindles</quote>: rather than using one large disk, - it uses several smaller disks with the same aggregate storage + <quote>more spindles</quote>: rather than using one large disk, + use several smaller disks with the same aggregate storage space. Each disk is capable of positioning and transferring independently, so the effective throughput increases by a factor close to the number of disks used.</para> - <para>The exact throughput improvement is, of course, smaller than - the number of disks involved: although each drive is capable of + <para>The actual throughput improvement is smaller than the + number of disks involved. Although each drive is capable of transferring in parallel, there is no way to ensure that the requests are evenly distributed across the drives. Inevitably the load on one drive will be higher than on another.</para> @@ -168,8 +142,8 @@ 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. - <xref linkend="vinum-concat"/> illustrates the sequence in which - storage units are allocated in a concatenated + <link linkend="vinum-concat"></link> illustrates the sequence in + which storage units are allocated in a concatenated organization.</para> <para> @@ -187,7 +161,7 @@ <secondary>striping</secondary> </indexterm> <indexterm> - <primary>RAID</primary> + <primary><acronym>RAID</acronym></primary> </indexterm> <para>An alternative mapping is to divide the address space into @@ -196,20 +170,18 @@ stored on the first disk, the next 256 sectors on the next disk and so on. After filling the last disk, the process repeats until the disks are full. This mapping is called - <emphasis>striping</emphasis> or <acronym>RAID-0</acronym> - - <footnote> - <para><acronym>RAID</acronym> stands for <emphasis>Redundant - Array of Inexpensive Disks</emphasis> and offers various - forms of fault tolerance, though the latter term is somewhat - misleading: it provides no redundancy.</para> </footnote>. - - Striping requires 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. <xref linkend="vinum-striped"/> - illustrates the sequence in which storage units are allocated in - a striped organization.</para> + <emphasis>striping</emphasis> or + <acronym>RAID-0</acronym>.</para> + + <para><acronym>RAID</acronym> offers various forms of fault + tolerance, though <acronym>RAID-0</acronym> is somewhat + misleading as it provides no redundancy. Striping requires + 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. <link linkend="vinum-striped"></link> illustrates the + sequence in which storage units are allocated in a striped + organization.</para> <para> <figure id="vinum-striped"> @@ -222,56 +194,55 @@ <sect1 id="vinum-data-integrity"> <title>Data Integrity</title> - <para>The final problem with current disks is that they are - unreliable. Although disk drive reliability has increased - tremendously over the last few years, they are still the most - likely core component of a server to fail. When they do, the - results can be catastrophic: replacing a failed disk drive and - restoring data to it can take days.</para> + <para>The final problem with disks is that they are unreliable. + Although reliability has increased tremendously over the last + few years, disk drives are still the most likely core component + of a server to fail. When they do, the results can be + catastrophic and replacing a failed disk drive and restoring + data can result in server downtime.</para> <indexterm> <primary>disk mirroring</primary> </indexterm> - <indexterm><primary>Vinum</primary> + <indexterm><primary>vinum</primary> <secondary>mirroring</secondary> </indexterm> - <indexterm><primary>RAID-1</primary> + <indexterm><primary><acronym>RAID</acronym>-1</primary> </indexterm> - <para>The traditional way to approach this problem has been - <emphasis>mirroring</emphasis>, keeping two copies of the data - on different physical hardware. Since the advent of the - <acronym>RAID</acronym> levels, this technique has also been - called <acronym>RAID level 1</acronym> or - <acronym>RAID-1</acronym>. Any write to the volume writes to - both locations; a read can be satisfied from either, so if one - drive fails, the data is still available on the other + <para>One approach to this problem is + <emphasis>mirroring</emphasis>, or + <acronym>RAID-1</acronym>, which keeps two copies of the + data on different physical hardware. Any write to the volume + writes to both disks; a read can be satisfied from either, so if + one drive fails, the data is still available on the other drive.</para> <para>Mirroring has two problems:</para> <itemizedlist> <listitem> - <para>The price. It requires twice as much disk storage as - a non-redundant solution.</para> + <para>It requires twice as much disk storage as a + non-redundant solution.</para> </listitem> <listitem> - <para>The performance impact. Writes must be performed to - both drives, so they take up twice the bandwidth of a - non-mirrored volume. Reads do not suffer from a - performance penalty: it even looks as if they are + <para>Writes must be performed to both drives, so they take up + twice the bandwidth of a non-mirrored volume. Reads do not + suffer from a performance penalty and can even be faster.</para> </listitem> </itemizedlist> - <para><indexterm><primary>RAID-5</primary></indexterm>An - alternative solution is <emphasis>parity</emphasis>, implemented - in the <acronym>RAID</acronym> levels 2, 3, 4 and 5. Of these, - <acronym>RAID-5</acronym> is the most interesting. As - implemented in Vinum, it is a variant on a striped organization - which dedicates one block of each stripe to parity one of the - other blocks. As implemented by Vinum, a + <indexterm><primary><acronym>RAID</acronym>-5</primary></indexterm> + + <para>An alternative solution is <emphasis>parity</emphasis>, + implemented in <acronym>RAID</acronym> levels 2, 3, 4 and 5. + Of these, <acronym>RAID-5</acronym> is the most interesting. As + implemented in <devicename>vinum</devicename>, it is a variant + on a striped organization which dedicates one block of each + stripe to parity one of the other blocks. As implemented by + <devicename>vinum</devicename>, a <acronym>RAID-5</acronym> plex is similar to a striped plex, except that it implements <acronym>RAID-5</acronym> by including a parity block in each stripe. As required by @@ -281,7 +252,7 @@ <para> <figure id="vinum-raid5-org"> - <title>RAID-5 Organization</title> + <title><acronym>RAID</acronym>-5 Organization</title> <graphic fileref="vinum/vinum-raid5-org.pic"/> </figure></para> @@ -291,50 +262,52 @@ access is similar to that of striped organizations, but write access is significantly slower, approximately 25% of the read performance. If one drive fails, the array can continue to - operate in degraded mode: a read from one of the remaining + operate in degraded mode where a read from one of the remaining accessible drives continues normally, but a read from the failed drive is recalculated from the corresponding block from all the remaining drives.</para> </sect1> <sect1 id="vinum-objects"> - <title>Vinum Objects</title> + <title><devicename>vinum</devicename> Objects</title> - <para>In order to address these problems, Vinum implements a - four-level hierarchy of objects:</para> + <para>In order to address these problems, + <devicename>vinum</devicename> implements a four-level hierarchy + of objects:</para> <itemizedlist> <listitem> <para>The most visible object is the virtual disk, called a <emphasis>volume</emphasis>. Volumes have essentially the same properties as a &unix; disk drive, though there are - some minor differences. They have no size + some minor differences. For one, they have no size limitations.</para> </listitem> <listitem> <para>Volumes are composed of <emphasis>plexes</emphasis>, each of which represent the total address space of a - volume. This level in the hierarchy thus provides - redundancy. Think of plexes as individual disks in a - mirrored array, each containing the same data.</para> + volume. This level in the hierarchy provides redundancy. + Think of plexes as individual disks in a mirrored array, + each containing the same data.</para> </listitem> <listitem> - <para>Since Vinum exists within the &unix; disk storage - framework, it would be possible to use &unix; partitions - as the building block for multi-disk plexes, but in fact - this turns out to be too inflexible: &unix; disks can have - only a limited number of partitions. Instead, Vinum - subdivides a single &unix; partition (the - <emphasis>drive</emphasis>) into contiguous areas called - <emphasis>subdisks</emphasis>, which it uses as building - blocks for plexes.</para> + <para>Since <devicename>vinum</devicename> exists within the + &unix; disk storage framework, it would be possible to use + &unix; partitions as the building block for multi-disk + plexes. In fact, this turns out to be too inflexible as + &unix; disks can have only a limited number of partitions. + Instead, <devicename>vinum</devicename> subdivides a single + &unix; partition, the <emphasis>drive</emphasis>, into + contiguous areas called <emphasis>subdisks</emphasis>, which + are used as building blocks for plexes.</para> </listitem> <listitem> - <para>Subdisks reside on Vinum <emphasis>drives</emphasis>, - currently &unix; partitions. Vinum drives can contain any + <para>Subdisks reside on <devicename>vinum</devicename> + <emphasis>drives</emphasis>, currently &unix; partitions. + <devicename>vinum</devicename> drives can contain any number of subdisks. With the exception of a small area at the beginning of the drive, which is used for storing configuration and state information, the entire drive is @@ -343,24 +316,25 @@ </itemizedlist> <para>The following sections describe the way these objects - provide the functionality required of Vinum.</para> + provide the functionality required of + <devicename>vinum</devicename>.</para> <sect2> <title>Volume Size Considerations</title> <para>Plexes can include multiple subdisks spread over all - drives in the Vinum configuration. As a result, the size of - an individual drive does not limit the size of a plex, and - thus of a volume.</para> + drives in the <devicename>vinum</devicename> configuration. + As a result, the size of an individual drive does not limit + the size of a plex or a volume.</para> </sect2> <sect2> <title>Redundant Data Storage</title> - <para>Vinum implements mirroring by attaching multiple plexes to - a volume. Each plex is a representation of the data in a - volume. A volume may contain between one and eight - plexes.</para> + <para><devicename>vinum</devicename> implements mirroring by + attaching multiple plexes to a volume. Each plex is a + representation of the data in a volume. A volume may contain + between one and eight plexes.</para> <para>Although a plex represents the complete data of a volume, it is possible for parts of the representation to be @@ -372,66 +346,45 @@ </sect2> <sect2> - <title>Performance Issues</title> + <title>Which Plex Organization?</title> - <para>Vinum implements both concatenation and striping at the - plex level:</para> + <para><devicename>vinum</devicename> implements both + concatenation and striping at the plex level:</para> <itemizedlist> <listitem> <para>A <emphasis>concatenated plex</emphasis> uses the - address space of each subdisk in turn.</para> + address space of each subdisk in turn. Concatenated + plexes are the most flexible as they can contain any + number of subdisks, and the subdisks may be of different + length. The plex may be extended by adding additional + subdisks. They require less <acronym>CPU</acronym> + time than striped plexes, though the difference in + <acronym>CPU</acronym> overhead is not measurable. On + the other hand, they are most susceptible to hot spots, + where one disk is very active and others are idle.</para> </listitem> <listitem> <para>A <emphasis>striped plex</emphasis> stripes the data - across each subdisk. The subdisks must all have the same - size, and there must be at least two subdisks in order to - distinguish it from a concatenated plex.</para> + across each subdisk. The subdisks must all be the same + size and there must be at least two subdisks in order to + distinguish it from a concatenated plex. The greatest + advantage of striped plexes is that they reduce hot spots. + By choosing an optimum sized stripe, about 256 kB, + the load can be evened out on the component drives. + Extending a plex by adding new subdisks is so complicated + that <devicename>vinum</devicename> does not implement + it.</para> </listitem> </itemizedlist> - </sect2> - - <sect2> - <title>Which Plex Organization?</title> - <para>The version of Vinum supplied with &os; &rel.current; - implements two kinds of plex:</para> - - <itemizedlist> - <listitem> - <para>Concatenated plexes are the most flexible: they can - contain any number of subdisks, and the subdisks may be of - different length. The plex may be extended by adding - additional subdisks. They require less - <acronym>CPU</acronym> time than striped plexes, though - the difference in <acronym>CPU</acronym> overhead is not - measurable. On the other hand, they are most susceptible - to hot spots, where one disk is very active and others are - idle.</para> - </listitem> - - <listitem> - <para>The greatest advantage of striped - (<acronym>RAID-0</acronym>) plexes is that they reduce hot - spots: by choosing an optimum sized stripe (about - 256 kB), you can even out the load on the component - drives. The disadvantages of this approach are - (fractionally) more complex code and restrictions on - subdisks: they must be all the same size, and extending a - plex by adding new subdisks is so complicated that Vinum - currently does not implement it. Vinum imposes an - additional, trivial restriction: a striped plex must have - at least two subdisks, since otherwise it is - indistinguishable from a concatenated plex.</para> - </listitem> - </itemizedlist> - - <para><xref linkend="vinum-comparison"/> summarizes the + <para><link linkend="vinum-comparison"></link> summarizes the advantages and disadvantages of each plex organization.</para> <table id="vinum-comparison" frame="none"> - <title>Vinum Plex Organizations</title> + <title><devicename>vinum</devicename> Plex + Organizations</title> <tgroup cols="5"> <thead> @@ -471,28 +424,32 @@ <sect1 id="vinum-examples"> <title>Some Examples</title> - <para>Vinum maintains a <emphasis>configuration - database</emphasis> which describes the objects known to an - individual system. Initially, the user creates the - configuration database from one or more configuration files with - the aid of the &man.gvinum.8; utility program. Vinum stores a - copy of its configuration database on each disk slice (which - Vinum calls a <emphasis>device</emphasis>) under its control. - This database is updated on each state change, so that a restart - accurately restores the state of each Vinum object.</para> + <para><devicename>vinum</devicename> maintains a + <emphasis>configuration database</emphasis> which describes the + objects known to an individual system. Initially, the user + creates the configuration database from one or more + configuration files using &man.gvinum.8;. + <devicename>vinum</devicename> stores a copy of its + configuration database on each disk + <emphasis>device</emphasis> under its control. This database is + updated on each state change, so that a restart accurately + restores the state of each + <devicename>vinum</devicename> object.</para> <sect2> <title>The Configuration File</title> - <para>The configuration file describes individual Vinum objects. - The definition of a simple volume might be:</para> + <para>The configuration file describes individual + <devicename>vinum</devicename> objects. The definition of a + simple volume might be:</para> <programlisting> drive a device /dev/da3h volume myvol plex org concat sd length 512m drive a</programlisting> - <para>This file describes four Vinum objects:</para> + <para>This file describes four <devicename>vinum</devicename> + objects:</para> <itemizedlist> <listitem> @@ -500,9 +457,8 @@ partition (<emphasis>drive</emphasis>) and its location relative to the underlying hardware. It is given the symbolic name <emphasis>a</emphasis>. This separation of - the symbolic names from the device names allows disks to - be moved from one location to another without - confusion.</para> + symbolic names from device names allows disks to be moved + from one location to another without confusion.</para> </listitem> <listitem> @@ -514,7 +470,7 @@ <listitem> <para>The <emphasis>plex</emphasis> line defines a plex. The only required parameter is the organization, in this - case <emphasis>concat</emphasis>. No name is necessary: + case <emphasis>concat</emphasis>. No name is necessary as the system automatically generates a name from the volume name by adding the suffix <emphasis>.p</emphasis><emphasis>x</emphasis>, where @@ -526,13 +482,13 @@ <listitem> <para>The <emphasis>sd</emphasis> line describes a subdisk. The minimum specifications are the name of a drive on - which to store it, and the length of the subdisk. As with - plexes, no name is necessary: the system automatically - assigns names derived from the plex name by adding the - suffix <emphasis>.s</emphasis><emphasis>x</emphasis>, - where <emphasis>x</emphasis> is the number of the subdisk - in the plex. Thus Vinum gives this subdisk the name - <emphasis>myvol.p0.s0</emphasis>.</para> + which to store it, and the length of the subdisk. No name + is necessary as the system automatically assigns names + derived from the plex name by adding the suffix + <emphasis>.s</emphasis><emphasis>x</emphasis>, where + <emphasis>x</emphasis> is the number of the subdisk in + the plex. Thus <devicename>vinum</devicename> gives this + subdisk the name <emphasis>myvol.p0.s0</emphasis>.</para> </listitem> </itemizedlist> @@ -547,29 +503,30 @@ Plexes: 1 (8 configured) Subdisks: 1 (16 configured) - D a State: up Device /dev/da3h Avail: 2061/2573 MB (80%) + D a State: up Device /dev/da3h Avail: 2061/2573 MB (80%) - V myvol State: up Plexes: 1 Size: 512 MB + V myvol State: up Plexes: 1 Size: 512 MB - P myvol.p0 C State: up Subdisks: 1 Size: 512 MB + P myvol.p0 C State: up Subdisks: 1 Size: 512 MB - S myvol.p0.s0 State: up PO: 0 B Size: 512 MB</programlisting> + S myvol.p0.s0 State: up PO: 0 B Size: 512 MB</programlisting> <para>This output shows the brief listing format of - &man.gvinum.8;. It is represented graphically in <xref - linkend="vinum-simple-vol"/>.</para> + &man.gvinum.8;. It is represented graphically in <link + linkend="vinum-simple-vol"></link>.</para> <para> <figure id="vinum-simple-vol"> - <title>A Simple Vinum Volume</title> + <title>A Simple <devicename>vinum</devicename> + Volume</title> <graphic fileref="vinum/vinum-simple-vol.pic"/> </figure></para> <para>This figure, and the ones which follow, represent a - volume, which contains the plexes, which in turn contain the - subdisks. In this trivial example, the volume contains one - plex, and the plex contains one subdisk.</para> + volume, which contains the plexes, which in turn contains the + subdisks. In this example, the volume contains one plex, and + the plex contains one subdisk.</para> <para>This particular volume has no specific advantage over a conventional disk partition. It contains a single plex, so it @@ -597,11 +554,10 @@ sd length 512m drive b</programlisting> <para>In this example, it was not necessary to specify a - definition of drive <emphasis>a</emphasis> again, since Vinum - keeps track of all objects in its configuration database. - After processing this definition, the configuration looks - like:</para> - + definition of drive <emphasis>a</emphasis> again, since + <devicename>vinum</devicename> keeps track of all objects in + its configuration database. After processing this definition, + the configuration looks like:</para> <programlisting width="97"> Drives: 2 (4 configured) @@ -609,8 +565,8 @@ Plexes: 3 (8 configured) Subdisks: 3 (16 configured) - D a State: up Device /dev/da3h Avail: 1549/2573 MB (60%) - D b State: up Device /dev/da4h Avail: 2061/2573 MB (80%) + D a State: up Device /dev/da3h Avail: 1549/2573 MB (60%) + D b State: up Device /dev/da4h Avail: 2061/2573 MB (80%) V myvol State: up Plexes: 1 Size: 512 MB V mirror State: up Plexes: 2 Size: 512 MB @@ -623,12 +579,13 @@ S mirror.p0.s0 State: up PO: 0 B Size: 512 MB S mirror.p1.s0 State: empty PO: 0 B Size: 512 MB</programlisting> - <para><xref linkend="vinum-mirrored-vol"/> shows the structure - graphically.</para> + <para><link linkend="vinum-mirrored-vol"></link> shows the + structure graphically.</para> <para> <figure id="vinum-mirrored-vol"> - <title>A Mirrored Vinum Volume</title> + <title>A Mirrored <devicename>vinum</devicename> + Volume</title> <graphic fileref="vinum/vinum-mirrored-vol.pic"/> </figure></para> @@ -643,15 +600,15 @@ <para>The mirrored volume in the previous example is more resistant to failure than an unmirrored volume, but its - performance is less: each write to the volume requires a write - to both drives, using up a greater proportion of the total - disk bandwidth. Performance considerations demand a different - approach: instead of mirroring, the data is striped across as - many disk drives as possible. The following configuration - shows a volume with a plex striped across four disk - drives:</para> - - <programlisting> drive c device /dev/da5h + performance is less as each write to the volume requires a + write to both drives, using up a greater proportion of the + total disk bandwidth. Performance considerations demand a + different approach: instead of mirroring, the data is striped + across as many disk drives as possible. The following + configuration shows a volume with a plex striped across four + disk drives:</para> + + <programlisting> drive c device /dev/da5h drive d device /dev/da6h volume stripe plex org striped 512k @@ -661,8 +618,9 @@ sd length 128m drive d</programlisting> <para>As before, it is not necessary to define the drives which - are already known to Vinum. After processing this definition, - the configuration looks like:</para> + are already known to <devicename>vinum</devicename>. After + processing this definition, the configuration looks + like:</para> <programlisting width="92"> Drives: 4 (4 configured) @@ -694,15 +652,17 @@ <para> <figure id="vinum-striped-vol"> - <title>A Striped Vinum Volume</title> + <title>A Striped <devicename>vinum</devicename> + Volume</title> <graphic fileref="vinum/vinum-striped-vol.pic"/> </figure></para> - <para>This volume is represented in - <xref linkend="vinum-striped-vol"/>. The darkness of the - stripes indicates the position within the plex address space: - the lightest stripes come first, the darkest last.</para> + <para>This volume is represented in <link + linkend="vinum-striped-vol"></link>. The darkness of the + stripes indicates the position within the plex address space, + where the lightest stripes come first and the darkest + last.</para> </sect2> <sect2> @@ -729,16 +689,17 @@ sd length 102480k drive b</programlisting> <para>The subdisks of the second plex are offset by two drives - from those of the first plex: this helps ensure that writes do - not go to the same subdisks even if a transfer goes over two - drives.</para> + from those of the first plex. This helps to ensure that + writes do not go to the same subdisks even if a transfer goes + over two drives.</para> - <para><xref linkend="vinum-raid10-vol"/> represents the + <para><link linkend="vinum-raid10-vol"></link> represents the structure of this volume.</para> <para> <figure id="vinum-raid10-vol"> - <title>A Mirrored, Striped Vinum Volume</title> + <title>A Mirrored, Striped <devicename>vinum</devicename> + Volume</title> <graphic fileref="vinum/vinum-raid10-vol.pic"/> </figure></para> @@ -748,28 +709,28 @@ <sect1 id="vinum-object-naming"> <title>Object Naming</title> - <para>As described above, Vinum assigns default names to plexes - and subdisks, although they may be overridden. Overriding the - default names is not recommended: experience with the VERITAS - volume manager, which allows arbitrary naming of objects, has - shown that this flexibility does not bring a significant - advantage, and it can cause confusion.</para> + <para><devicename>vinum</devicename> assigns default names to + plexes and subdisks, although they may be overridden. + Overriding the default names is not recommended as it does not + bring a significant advantage and it can cause + confusion.</para> <para>Names may contain any non-blank character, but it is recommended to restrict them to letters, digits and the - underscore characters. The names of volumes, plexes and + underscore characters. The names of volumes, plexes, and subdisks may be up to 64 characters long, and the names of drives may be up to 32 characters long.</para> - <para>Vinum objects are assigned device nodes in the hierarchy - <filename class="directory">/dev/gvinum</filename>. The - configuration shown above would cause Vinum to create the - following device nodes:</para> + <para><devicename>vinum</devicename> objects are assigned device + nodes in the hierarchy <filename + class="directory">/dev/gvinum</filename>. The configuration + shown above would cause <devicename>vinum</devicename> to create + the following device nodes:</para> <itemizedlist> <listitem> - <para>Device entries for each volume. - These are the main devices used by Vinum. Thus the + <para>Device entries for each volume. These are the main + devices used by <devicename>vinum</devicename>. The configuration above would include the devices <filename class="devicefile">/dev/gvinum/myvol</filename>, <filename class="devicefile">/dev/gvinum/mirror</filename>, @@ -795,6 +756,7 @@ <para>For example, consider the following configuration file:</para> + <programlisting> drive drive1 device /dev/sd1h drive drive2 device /dev/sd2h drive drive3 device /dev/sd3h @@ -810,7 +772,8 @@ following structure in <filename class="directory">/dev/gvinum</filename>:</para> - <programlisting> drwxr-xr-x 2 root wheel 512 Apr 13 16:46 plex + <programlisting> drwxr-xr-x 2 root wheel 512 Apr 13 +16:46 plex crwxr-xr-- 1 root wheel 91, 2 Apr 13 16:46 s64 drwxr-xr-x 2 root wheel 512 Apr 13 16:46 sd @@ -826,58 +789,62 @@ crwxr-xr-- 1 root wheel 91, 0x20300002 Apr 13 16:46 s64.p0.s3</programlisting> <para>Although it is recommended that plexes and subdisks should - not be allocated specific names, Vinum drives must be named. - This makes it possible to move a drive to a different location - and still recognize it automatically. Drive names may be up to - 32 characters long.</para> + not be allocated specific names, + <devicename>vinum</devicename> drives must be named. This makes + it possible to move a drive to a different location and still + recognize it automatically. Drive names may be up to 32 + characters long.</para> <sect2> <title>Creating File Systems</title> - <para>Volumes appear to the system to be identical to disks, - with one exception. Unlike &unix; drives, Vinum does - not partition volumes, which thus do not contain a partition - table. This has required modification to some disk - utilities, notably &man.newfs.8;, which previously tried to - interpret the last letter of a Vinum volume name as a - partition identifier. For example, a disk drive may have a - name like <filename class="devicefile">/dev/ad0a</filename> - or <filename class="devicefile">/dev/da2h</filename>. These - names represent the first partition - (<devicename>a</devicename>) on the first (0) IDE disk - (<devicename>ad</devicename>) and the eighth partition - (<devicename>h</devicename>) on the third (2) SCSI disk - (<devicename>da</devicename>) respectively. By contrast, a - Vinum volume might be called <filename - class="devicefile">/dev/gvinum/concat</filename>, a name - which has no relationship with a partition name.</para> - - <para>In order to create a file system on this volume, use - &man.newfs.8;:</para> - - <screen>&prompt.root; <userinput>newfs /dev/gvinum/concat</userinput></screen> + <para>Volumes appear to the system to be identical to disks, + with one exception. Unlike &unix; drives, + <devicename>vinum</devicename> does not partition volumes, + which thus do not contain a partition table. This has + required modification to some disk utilities, notably + &man.newfs.8;, so that it does not try to interpret the last + letter of a <devicename>vinum</devicename> volume name as a + partition identifier. For example, a disk drive may have a + name like <filename class="devicefile">/dev/ad0a</filename> + or <filename class="devicefile">/dev/da2h</filename>. These + names represent the first partition + (<devicename>a</devicename>) on the first (0) IDE disk + (<devicename>ad</devicename>) and the eighth partition + (<devicename>h</devicename>) on the third (2) SCSI disk + (<devicename>da</devicename>) respectively. By contrast, a + <devicename>vinum</devicename> volume might be called + <filename class="devicefile">/dev/gvinum/concat</filename>, + which has no relationship with a partition name.</para> + + <para>In order to create a file system on this volume, use + &man.newfs.8;:</para> + + <screen>&prompt.root; <userinput>newfs /dev/gvinum/concat</userinput></screen> </sect2> </sect1> <sect1 id="vinum-config"> - <title>Configuring Vinum</title> + <title>Configuring <devicename>vinum</devicename></title> <para>The <filename>GENERIC</filename> kernel does not contain - Vinum. It is possible to build a special kernel which includes - Vinum, but this is not recommended. The standard way to start - Vinum is as a kernel module (<acronym>kld</acronym>). You do - not even need to use &man.kldload.8; for Vinum: when you start - &man.gvinum.8;, it checks whether the module has been loaded, - and if it is not, it loads it automatically.</para> + <devicename>vinum</devicename>. It is possible to build a + custom kernel which includes <devicename>vinum</devicename>, but + this is not recommended. The standard way to start + <devicename>vinum</devicename> is as a kernel module. + &man.kldload.8; is not needed because when &man.gvinum.8; + starts, it checks whether the module has been loaded, and if it + is not, it loads it automatically.</para> <sect2> <title>Startup</title> - <para>Vinum stores configuration information on the disk slices - in essentially the same form as in the configuration files. - When reading from the configuration database, Vinum recognizes - a number of keywords which are not allowed in the + <para><devicename>vinum</devicename> stores configuration + information on the disk slices in essentially the same form as + in the configuration files. When reading from the + configuration database, <devicename>vinum</devicename> + recognizes a number of keywords which are not allowed in the configuration files. For example, a disk configuration might contain the following text:</para> @@ -902,14 +869,14 @@ sd name bigraid.p0.s3 drive d plex bigraid.p0 state initializing len 4194304b dr sd name bigraid.p0.s4 drive e plex bigraid.p0 state initializing len 4194304b driveoff set 1573129b plexoffset 16777216b</programlisting> <para>The obvious differences here are the presence of - explicit location information and naming (both of which are - also allowed, but discouraged, for use by the user) and the - information on the states (which are not available to the - user). Vinum does not store information about drives in the - configuration information: it finds the drives by scanning - the configured disk drives for partitions with a Vinum - label. This enables Vinum to identify drives correctly even - if they have been assigned different &unix; drive + explicit location information and naming, both of which are + allowed but discouraged, and the information on the states. + <devicename>vinum</devicename> does not store information + about drives in the configuration information. It finds the + drives by scanning the configured disk drives for partitions + with a <devicename>vinum</devicename> label. This enables + <devicename>vinum</devicename> to identify drives correctly + even if they have been assigned different &unix; drive IDs.</para> <sect3 id="vinum-rc-startup"> @@ -922,110 +889,87 @@ sd name bigraid.p0.s4 drive e plex bigraid.p0 state initializing len 4194304b dr <literal>geom_vinum_load="YES"</literal> to <filename>/boot/loader.conf</filename>.</para> - <para>When you start Vinum with the <command>gvinum - start</command> command, Vinum reads the configuration - database from one of the Vinum drives. Under normal - circumstances, each drive contains an identical copy of - the configuration database, so it does not matter which - drive is read. After a crash, however, Vinum must - determine which drive was updated most recently and read - the configuration from this drive. It then updates the - configuration if necessary from progressively older + <para>When <devicename>vinum</devicename> is started with + <command>gvinum start</command>, + <devicename>vinum</devicename> reads the configuration + database from one of the <devicename>vinum</devicename> + drives. Under normal circumstances, each drive contains + an identical copy of the configuration database, so it + does not matter which drive is read. After a crash, + however, <devicename>vinum</devicename> must determine + which drive was updated most recently and read the + configuration from this drive. It then updates the + configuration, if necessary, from progressively older drives.</para> </sect3> </sect2> </sect1> <sect1 id="vinum-root"> - <title>Using Vinum for the Root Filesystem</title> + <title>Using <devicename>vinum</devicename> for the Root + File System</title> - <para>For a machine that has fully-mirrored filesystems using - Vinum, it is desirable to also mirror the root filesystem. - Setting up such a configuration is less trivial than mirroring - an arbitrary filesystem because:</para> + <para>For a machine that has fully-mirrored file systems using + <devicename>vinum</devicename>, it is desirable to also + mirror the root file system. Setting up such a configuration + is less trivial than mirroring an arbitrary file system + because:</para> <itemizedlist> <listitem> - <para>The root filesystem must be available very early - during the boot process, so the Vinum infrastructure must - alrqeady be available at this time.</para> + <para>The root file system must be available very early + during the boot process, so the + <devicename>vinum</devicename> infrastructure must + already be available at this time.</para> </listitem> <listitem> - <para>The volume containing the root filesystem also - contains the system bootstrap and the kernel, which must - be read using the host system's native utilities (e. g. - the BIOS on PC-class machines) which often cannot be - taught about the details of Vinum.</para> + <para>The volume containing the root file system also + contains the system bootstrap and the kernel. These must + be read using the host system's native utilities, such as + the BIOS, which often cannot be taught about the details + of <devicename>vinum</devicename>.</para> </listitem> </itemizedlist> <para>In the following sections, the term <quote>root - volume</quote> is generally used to describe the Vinum - volume that contains the root filesystem. It is probably a - good idea to use the name <literal>"root"</literal> for this - volume, but this is not technically required in any way. All - command examples in the following sections assume this name - though.</para> + volume</quote> is generally used to describe the + <devicename>vinum</devicename> volume that contains the root + file system.</para> <sect2> - <title>Starting up Vinum Early Enough for the Root - Filesystem</title> - - <para>There are several measures to take for this to - happen:</para> - - <itemizedlist> - <listitem> - <para>Vinum must be available in the kernel at boot-time. - Thus, the method to start Vinum automatically described - in <xref linkend="vinum-rc-startup"/> is not applicable - to accomplish this task, and the - <literal>start_vinum</literal> parameter must actually - <emphasis>not</emphasis> be set when the following setup - is being arranged. The first option would be to compile - Vinum statically into the kernel, so it is available all - the time, but this is usually not desirable. There is - another option as well, to have - <filename>/boot/loader</filename> (<xref - linkend="boot-loader"/>) load the vinum kernel module - early, before starting the kernel. This can be - accomplished by putting the line:</para> + <title>Starting up <devicename>vinum</devicename> Early + Enough for the Root File System</title> - <programlisting>geom_vinum_load="YES"</programlisting> + <para><devicename>vinum</devicename> must be available early + in the system boot as &man.loader.8; must be able to load + the vinum kernel module before starting the kernel. This + can be accomplished by putting this line in + <filename>/boot/loader.conf</filename>:</para> - <para>into the file - <filename>/boot/loader.conf</filename>.</para> - </listitem> + <programlisting>geom_vinum_load="YES"</programlisting> - <listitem> - <para>For <emphasis>Gvinum</emphasis>, all startup is done - automatically once the kernel module has been loaded, so - the procedure described above is all that is - needed.</para> - </listitem> - </itemizedlist> </sect2> <sect2> - <title>Making a Vinum-based Root Volume Accessible to the - Bootstrap</title> - - <para>Since the current &os; bootstrap is only 7.5 KB of - code, and already has the burden of reading files (like - <filename>/boot/loader</filename>) from the UFS filesystem, it - is sheer impossible to also teach it about internal Vinum - structures so it could parse the Vinum configuration data, and - figure out about the elements of a boot volume itself. Thus, - some tricks are necessary to provide the bootstrap code with - the illusion of a standard <literal>"a"</literal> partition - that contains the root filesystem.</para> - - <para>For this to be possible at all, the following requirements - must be met for the root volume:</para> + <title>Making a <devicename>vinum</devicename>-based Root + Volume Accessible to the Bootstrap</title> + + <para>The current &os; bootstrap is only 7.5 KB of code and + does not understand the internal + <devicename>vinum</devicename> structures. This means that it + cannot parse the <devicename>vinum</devicename> configuration + data or figure out the elements of a boot volume. Thus, some + workarounds are necessary to provide the bootstrap code with + the illusion of a standard <literal>a</literal> partition + that contains the root file system.</para> + + <para>For this to be possible, the following requirements must + be met for the root volume:</para> <itemizedlist> <listitem> - <para>The root volume must not be striped or RAID-5.</para> + <para>The root volume must not be a stripe or + <acronym>RAID</acronym>-5.</para> </listitem> <listitem> @@ -1034,118 +978,122 @@ sd name bigraid.p0.s4 drive e plex bigraid.p0 state initializing len 4194304b dr </listitem> </itemizedlist> - <para>Note that it is desirable and possible that there are - multiple plexes, each containing one replica of the root - filesystem. The bootstrap process will, however, only use one - of these replica for finding the bootstrap and all the files, - until the kernel will eventually mount the root filesystem - itself. Each single subdisk within these plexes will then - need its own <literal>"a"</literal> partition illusion, for - the respective device to become bootable. It is not strictly - needed that each of these faked <literal>"a"</literal> + <para>Note that it is desirable and possible to use multiple + plexes, each containing one replica of the root file system. + The bootstrap process will only use one replica for finding + the bootstrap and all boot files, until the kernel mounts the + root file system. Each single subdisk within these plexes + needs its own <literal>a</literal> partition illusion, for + the respective device to be bootable. It is not strictly + needed that each of these faked <literal>a</literal> partitions is located at the same offset within its device, compared with other devices containing plexes of the root volume. However, it is probably a good idea to create the - Vinum volumes that way so the resulting mirrored devices are - symmetric, to avoid confusion.</para> + <devicename>vinum</devicename> volumes that way so the + resulting mirrored devices are symmetric, to avoid + confusion.</para> - <para>In order to set up these <literal>"a"</literal> - partitions, for each device containing part of the root - volume, the following needs to be done:</para> + <para>In order to set up these <literal>a</literal> + partitions for each device containing part of the root + volume, the following is required:</para> <procedure> <step> - <para>The location (offset from the beginning of the device) + <para>The location, offset from the beginning of the device, and size of this device's subdisk that is part of the root - volume need to be examined, using the command:</para> + volume needs to be examined, using the command:</para> <screen>&prompt.root; <userinput>gvinum l -rv root</userinput></screen> - <para>Note that Vinum offsets and sizes are measured in - bytes. They must be divided by 512 in order to obtain the - block numbers that are to be used in the - <command>bsdlabel</command> command.</para> + <para><devicename>vinum</devicename> offsets and sizes are + measured in bytes. They must be divided by 512 in order + to obtain the block numbers that are to be used by + <command>bsdlabel</command>.</para> </step> <step> - <para>Run the command:</para> + <para>Run this command for each device that participates in + the root volume:</para> <screen>&prompt.root; <userinput>bsdlabel -e <replaceable>devname</replaceable></userinput></screen> - <para>for each device that participates in the root volume. - <replaceable>devname</replaceable> must be either the name - of the disk (like <devicename>da0</devicename>) for disks - without a slice (aka. fdisk) table, or the name of the - slice (like <devicename>ad0s1</devicename>).</para> - - <para>If there is already an <literal>"a"</literal> - partition on the device (presumably, containing a - pre-Vinum root filesystem), it should be renamed to - something else, so it remains accessible (just in case), - but will no longer be used by default to bootstrap the - system. Note that active partitions (like a root - filesystem currently mounted) cannot be renamed, so this - must be executed either when being booted from a - <quote>Fixit</quote> medium, or in a two-step process, - where (in a mirrored situation) the disk that has not been - currently booted is being manipulated first.</para> - - <para>Then, the offset of the Vinum partition on this - device (if any) must be added to the offset of the - respective root volume subdisk on this device. The - resulting value will become the - <literal>"offset"</literal> value for the new - <literal>"a"</literal> partition. The - <literal>"size"</literal> value for this partition can be + <para><replaceable>devname</replaceable> must be either the + name of the disk, like <devicename>da0</devicename> for + disks without a slice table, or the name of the + slice, like <devicename>ad0s1</devicename>.</para> + + <para>If there is already an <literal>a</literal> + partition on the device from a + pre-<devicename>vinum</devicename> root file system, it + should be renamed to something else so that it remains + accessible (just in case), but will no longer be used by + default to bootstrap the system. A currently mounted root + file system cannot be renamed, so this must be executed + either when being booted from a <quote>Fixit</quote> + media, or in a two-step process where, in a mirror, the + disk that is not been currently booted is manipulated + first.</para> + + <para>The offset of the <devicename>vinum</devicename> + partition on this device (if any) must be added to the + offset of the respective root volume subdisk on this + device. The resulting value will become the + <literal>offset</literal> value for the new + <literal>a</literal> partition. The + <literal>size</literal> value for this partition can be taken verbatim from the calculation above. The - <literal>"fstype"</literal> should be + <literal>fstype</literal> should be <literal>4.2BSD</literal>. The - <literal>"fsize"</literal>, <literal>"bsize"</literal>, - and <literal>"cpg"</literal> values should best be chosen - to match the actual filesystem, though they are fairly + <literal>fsize</literal>, <literal>bsize</literal>, + and <literal>cpg</literal> values should be chosen + to match the actual file system, though they are fairly unimportant within this context.</para> - <para>That way, a new <literal>"a"</literal> partition will - be established that overlaps the Vinum partition on this - device. Note that the <command>bsdlabel</command> will - only allow for this overlap if the Vinum partition has - properly been marked using the <literal>"vinum"</literal> - fstype.</para> + <para>That way, a new <literal>a</literal> partition will + be established that overlaps the + <devicename>vinum</devicename> partition on this device. + <command>bsdlabel</command> will only allow for this + overlap if the <devicename>vinum</devicename> partition + has properly been marked using the + <literal>vinum</literal> fstype.</para> </step> <step> - <para>That's all! A faked <literal>"a"</literal> partition - does exist now on each device that has one replica of the - root volume. It is highly recommendable to verify the - result again, using a command like:</para> + <para>A faked <literal>a</literal> partition now exists + on each device that has one replica of the root volume. + It is highly recommendable to verify the result using a + command like:</para> <screen>&prompt.root; <userinput>fsck -n /dev/<replaceable>devname</replaceable>a</userinput></screen> </step> </procedure> <para>It should be remembered that all files containing control - information must be relative to the root filesystem in the - Vinum volume which, when setting up a new Vinum root volume, - might not match the root filesystem that is currently active. - So in particular, the files <filename>/etc/fstab</filename> - and <filename>/boot/loader.conf</filename> need to be taken - care of.</para> + information must be relative to the root file system in the + <devicename>vinum</devicename> volume which, when setting up + a new <devicename>vinum</devicename> root volume, might not + match the root file system that is currently active. So in + particular, <filename>/etc/fstab</filename> and + <filename>/boot/loader.conf</filename> need to be taken care + of.</para> <para>At next reboot, the bootstrap should figure out the - appropriate control information from the new Vinum-based root - filesystem, and act accordingly. At the end of the kernel - initialization process, after all devices have been announced, - the prominent notice that shows the success of this setup is a - message like:</para> + appropriate control information from the new + <devicename>vinum</devicename>-based root file system, and act + accordingly. At the end of the kernel initialization process, + after all devices have been announced, the prominent notice + that shows the success of this setup is a message like:</para> <screen>Mounting root from ufs:/dev/gvinum/root</screen> </sect2> <sect2> - <title>Example of a Vinum-based Root Setup</title> + <title>Example of a <devicename>vinum</devicename>-based Root + Setup</title> - <para>After the Vinum root volume has been set up, the output of - <command>gvinum l -rv root</command> could look like:</para> + <para>After the <devicename>vinum</devicename> root volume has + been set up, the output of <command>gvinum l -rv + root</command> could look like:</para> <screen>... Subdisk root.p0.s0: @@ -1161,11 +1109,11 @@ Subdisk root.p1.s0: Drive disk1 (/dev/da1h) at offset 135680 (132 kB)</screen> <para>The values to note are <literal>135680</literal> for the - offset (relative to partition - <filename class="devicefile">/dev/da0h</filename>). This + offset, relative to partition + <filename class="devicefile">/dev/da0h</filename>. This translates to 265 512-byte disk blocks in <command>bsdlabel</command>'s terms. Likewise, the size of - this root volume is 245760 512-byte blocks. <filename + this root volume is 245760 512-byte blocks. <filename class="devicefile">/dev/da1h</filename>, containing the second replica of this root volume, has a symmetric setup.</para> @@ -1179,73 +1127,75 @@ Subdisk root.p1.s0: c: 71771688 0 unused 0 0 # (Cyl. 0 - 4467*) h: 71771672 16 vinum # (Cyl. 0*- 4467*)</screen> - <para>It can be observed that the <literal>"size"</literal> - parameter for the faked <literal>"a"</literal> partition + <para>It can be observed that the <literal>size</literal> + parameter for the faked <literal>a</literal> partition matches the value outlined above, while the - <literal>"offset"</literal> parameter is the sum of the offset - within the Vinum partition <literal>"h"</literal>, 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 <xref linkend="vinum-root-panic"/>. It can also - be seen that the entire <literal>"a"</literal> partition is - completely within the <literal>"h"</literal> partition - containing all the Vinum data for this device.</para> - - <para>Note that in the above example, the entire device is - dedicated to Vinum, and there is no leftover pre-Vinum root - partition, since this has been a newly set-up disk that was - only meant to be part of a Vinum configuration, ever.</para> + <literal>offset</literal> parameter is the sum of the offset + within the <devicename>vinum</devicename> partition + <literal>h</literal>, 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 <link + linkend="vinum-root-panic"></link>. The entire + <literal>a</literal> partition is completely within the + <literal>h</literal> partition containing all the + <devicename>vinum</devicename> data for this device.</para> + + <para>In the above example, the entire device is dedicated to + <devicename>vinum</devicename> and there is no leftover + pre-<devicename>vinum</devicename> root partition.</para> </sect2> <sect2> <title>Troubleshooting</title> - <para>If something goes wrong, a way is needed to recover from - the situation. The following list contains few known pitfalls - and solutions.</para> + <para>The following list contains a few known pitfalls and + solutions.</para> <sect3> <title>System Bootstrap Loads, but System Does Not Boot</title> <para>If for any reason the system does not continue to boot, - the bootstrap can be interrupted with by pressing the - <keycap>space</keycap> key at the 10-seconds warning. The - loader variables (like <literal>vinum.autostart</literal>) - can be examined using the <command>show</command>, and - manipulated using <command>set</command> or - <command>unset</command> commands.</para> - - <para>If the only problem was that the Vinum kernel module was - not yet in the list of modules to load automatically, a - simple <command>load geom_vinum</command> will help.</para> - - <para>When ready, the boot process can be continued with a - <command>boot -as</command>. The options - <option>-as</option> will request the kernel to ask for the - root filesystem to mount (<option>-a</option>), and make the + the bootstrap can be interrupted by pressing + <keycap>space</keycap> at the 10-seconds warning. The + loader variable <literal>vinum.autostart</literal> can be + examined by typing <command>show</command> and manipulated + using <command>set</command> or + <command>unset</command>.</para> + + <para>If the <devicename>vinum</devicename> kernel module was + not yet in the list of modules to load automatically, type + <command>load geom_vinum</command>.</para> + + <para>When ready, the boot process can be continued by typing + <command>boot -as</command> which + <option>-as</option> requests the kernel to ask for the + root file system to mount (<option>-a</option>) and make the boot process stop in single-user mode (<option>-s</option>), - where the root filesystem is mounted read-only. That way, + where the root file system is mounted read-only. That way, even if only one plex of a multi-plex volume has been mounted, no data inconsistency between plexes is being risked.</para> - <para>At the prompt asking for a root filesystem to mount, any - device that contains a valid root filesystem can be entered. - If <filename>/etc/fstab</filename> had been set up + <para>At the prompt asking for a root file system to mount, + any device that contains a valid root file system can be + entered. If <filename>/etc/fstab</filename> is set up correctly, the default should be something like <literal>ufs:/dev/gvinum/root</literal>. A typical alternate choice would be something like <literal>ufs:da0d</literal> which could be a - hypothetical partition that contains the pre-Vinum root - filesystem. Care should be taken if one of the alias - <literal>"a"</literal> partitions are entered here that are - actually reference to the subdisks of the Vinum root device, - because in a mirrored setup, this would only mount one piece - of a mirrored root device. If this filesystem is to be - mounted read-write later on, it is necessary to remove the - other plex(es) of the Vinum root volume since these plexes - would otherwise carry inconsistent data.</para> + hypothetical partition containing the + pre-<devicename>vinum</devicename> root file system. Care + should be taken if one of the alias + <literal>a</literal> partitions is entered here, that it + actually references the subdisks of the + <devicename>vinum</devicename> root device, because in a + mirrored setup, this would only mount one piece of a + mirrored root device. If this file system is to be mounted + read-write later on, it is necessary to remove the other + plex(es) of the <devicename>vinum</devicename> root volume + since these plexes would otherwise carry inconsistent + data.</para> </sect3> <sect3> @@ -1255,13 +1205,12 @@ Subdisk root.p1.s0: the primary bootstrap still loads (visible by a single dash in the left column of the screen right after the boot process starts), an attempt can be made to interrupt the - primary bootstrap at this point, using the - <keycap>space</keycap> key. This will make the bootstrap - stop in stage two, see <xref linkend="boot-boot1"/>. An - attempt can be made here to boot off an alternate partition, - like the partition containing the previous root filesystem - that has been moved away from <literal>"a"</literal> - above.</para> + primary bootstrap by pressing + <keycap>space</keycap>. This will make the bootstrap stop + in <link linkend="boot-boot1">stage two</link>. An attempt + can be made here to boot off an alternate partition, like + the partition containing the previous root file system that + has been moved away from <literal>a</literal>.</para> </sect3> <sect3 id="vinum-root-panic"> @@ -1269,28 +1218,33 @@ Subdisk root.p1.s0: Panics</title> <para>This situation will happen if the bootstrap had been - destroyed by the Vinum installation. Unfortunately, Vinum - accidentally currently leaves only 4 KB at the beginning of - its partition free before starting to write its Vinum header - information. However, the stage one and two bootstraps plus - the bsdlabel embedded between them currently require 8 KB. - So if a Vinum partition was started at offset 0 within a - slice or disk that was meant to be bootable, the Vinum setup - will trash the bootstrap.</para> + destroyed by the <devicename>vinum</devicename> + installation. Unfortunately, <devicename>vinum</devicename> + accidentally leaves only 4 KB at the beginning of its + partition free before starting to write its + <devicename>vinum</devicename> header information. However, + the stage one and two bootstraps plus the bsdlabel require 8 + KB. So if a <devicename>vinum</devicename> partition was + started at offset 0 within a slice or disk that was meant to + be bootable, the <devicename>vinum</devicename> setup will + trash the bootstrap.</para> <para>Similarly, if the above situation has been recovered, - for example by booting from a <quote>Fixit</quote> medium, - and the bootstrap has been re-installed using - <command>bsdlabel -B</command> as described in <xref - linkend="boot-boot1"/>, the bootstrap will trash the Vinum - header, and Vinum will no longer find its disk(s). Though - no actual Vinum configuration data or data in Vinum volumes - will be trashed by this, and it would be possible to recover - all the data by entering exact the same Vinum configuration - data again, the situation is hard to fix at all. It would - be necessary to move the entire Vinum partition by at least - 4 KB off, in order to have the Vinum header and the system - bootstrap no longer collide.</para> + by booting from a <quote>Fixit</quote> media, and the + bootstrap has been re-installed using + <command>bsdlabel -B</command> as described in <link + linkend="boot-boot1"></link>, the bootstrap will trash the + <devicename>vinum</devicename> header, and + <devicename>vinum</devicename> will no longer find its + disk(s). Though no actual <devicename>vinum</devicename> + configuration data or data in <devicename>vinum</devicename> + volumes will be trashed, and it would be possible to recover + all the data by entering exactly the same + <devicename>vinum</devicename> configuration data again, the + situation is hard to fix. It is necessary to move the + entire <devicename>vinum</devicename> partition by at least + 4 KB, in order to have the <devicename>vinum</devicename> + header and the system bootstrap no longer collide.</para> </sect3> </sect2> </sect1> diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml index aff54284e1..d990a1088d 100644 --- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml @@ -66,23 +66,23 @@ <itemizedlist> <listitem> - <para>Understand the basics of &unix; and &os; (<xref - linkend="basics"/>).</para> + <para>Understand the <link linkend="basics">basics of &unix; + and &os;</link>.</para> </listitem> <listitem> - <para>Know how to install &os; (<xref - linkend="install"/>).</para> + <para>Know how to <link linkend="install">install + &os;</link>.</para> </listitem> <listitem> - <para>Know how to set up your network connection (<xref - linkend="advanced-networking"/>).</para> + <para>Know how to <link linkend="advanced-networking">set up a + network connection</link>.</para> </listitem> <listitem> - <para>Know how to install additional third-party - software (<xref linkend="ports"/>).</para> + <para>Know how to <link linkend="ports">install additional + third-party software</link>.</para> </listitem> </itemizedlist> </sect1> @@ -91,7 +91,7 @@ <title>&os; as a Guest OS</title> <sect2 id="virtualization-guest-parallels"> - <title>Parallels on MacOS</title> + <title><application>Parallels</application> on &macos; X</title> <para><application>Parallels Desktop</application> for &mac; is a commercial software product available for &intel; based @@ -104,8 +104,8 @@ <sect3 id="virtualization-guest-parallels-install"> <title>Installing &os; on Parallels/&macos; X</title> - <para>The first step in installing &os; on &macos; - X/<application>Parallels</application> is to create a new + <para>The first step in installing &os; on + <application>Parallels</application> is to create a new virtual machine for installing &os;. Select <guimenuitem>&os;</guimenuitem> as the <guimenu>Guest OS Type</guimenu> when prompted:</para> @@ -116,8 +116,8 @@ </imageobject> </mediaobject> - <para>And choose a reasonable amount of disk and memory - depending on your plans for this virtual &os; instance. + <para>Choose a reasonable amount of disk and memory + depending on the plans for this virtual &os; instance. 4GB of disk space and 512MB of RAM work well for most uses of &os; under <application>Parallels</application>:</para> @@ -174,16 +174,16 @@ </imageobject> </mediaobject> - <para>After your &os; virtual machine has been created, you - will need to install &os; on it. This is best done with an - official &os; CDROM or with an ISO image downloaded from an - official FTP site. When you have the appropriate ISO image - on your local &mac; filesystem or a CDROM in your &mac;'s CD - drive, click on the disc icon in the bottom right corner of - your &os; <application>Parallels</application> window. This - will bring up a window that allows you to associate the - CDROM drive in your virtual machine with an ISO file on disk - or with your real CDROM drive.</para> + <para>After the &os; virtual machine has been created, &os; + can be installed on it. This is best done with an + official &os; CD/DVD or with an ISO image downloaded from an + official FTP site. Copy the appropriate ISO image to the + local &mac; filesystem or insert a CD/DVD in the &mac;'s CD + drive. Click on the disc icon in the bottom right corner of + the &os; <application>Parallels</application> window. This + will bring up a window that can be used to associate the + CDROM drive in the virtual machine with the ISO file on disk + or with the real CDROM drive.</para> <mediaobject> <imageobject> @@ -191,12 +191,10 @@ </imageobject> </mediaobject> - <para>Once you have made this association with your CDROM - source, reboot your &os; virtual machine as normal by - clicking the reboot icon. - <application>Parallels</application> will reboot with a - special BIOS that first checks if you have a CDROM just as a - normal BIOS would do.</para> + <para>Once this association with the CDROM source has been + made, reboot the &os; virtual machine by clicking the reboot + icon. <application>Parallels</application> will reboot with + a special BIOS that first checks if there is a CDROM.</para> <mediaobject> <imageobject> @@ -205,10 +203,9 @@ </mediaobject> <para>In this case it will find the &os; installation media - and begin a normal <application>sysinstall</application> - based installation as described in <xref - linkend="install"/>. You may install, but do not attempt - to configure X11 at this time.</para> + and begin a normal &os; installation. Perform the + installation, but do not attempt to configure + <application>&xorg;</application> at this time.</para> <mediaobject> <imageobject> @@ -216,8 +213,8 @@ </imageobject> </mediaobject> - <para>When you have finished the installation, reboot into - your newly installed &os; virtual machine.</para> + <para>When the installation is finished, reboot into the + newly installed &os; virtual machine.</para> <mediaobject> <imageobject> @@ -227,7 +224,8 @@ </sect3> <sect3 id="virtualization-guest-parallels-configure"> - <title>Configuring &os; on &macos; X/Parallels</title> + <title>Configuring &os; on + <application>Parallels</application> </title> <para>After &os; has been successfully installed on &macos; X with <application>Parallels</application>, there are a @@ -248,35 +246,32 @@ <programlisting>kern.hz=100</programlisting> <para>Without this setting, an idle &os; - <application>Parallels</application> guest - OS will use roughly 15% of the CPU of a single - processor &imac;. After this change the usage will be - closer to a mere 5%.</para> + <application>Parallels</application> guest will use + roughly 15% of the CPU of a single processor &imac;. + After this change the usage will be closer to 5%.</para> </step> <step> <title>Create a New Kernel Configuration File</title> - <para>You can remove all of the SCSI, FireWire, and USB - device drivers. <application>Parallels</application> - provides a virtual network - adapter used by the &man.ed.4; driver, so - all other network devices except for - &man.ed.4; and &man.miibus.4; can be - removed from the kernel.</para> + <para>All of the SCSI, FireWire, and USB device drivers + can be removed from a custom kernel configuration file. + <application>Parallels</application> provides a virtual + network adapter used by the &man.ed.4; driver, so all + network devices except for &man.ed.4; and &man.miibus.4; + can be removed from the kernel.</para> </step> <step> <title>Configure Networking</title> - <para>The most basic networking setup involves simply - using DHCP to connect your virtual machine to the same - local area network as your host &mac;. This can be - accomplished by adding + <para>The most basic networking setup uses DHCP to connect + the virtual machine to the same local area network as + the host &mac;. This can be accomplished by adding <literal>ifconfig_ed0="DHCP"</literal> to <filename>/etc/rc.conf</filename>. More advanced - networking setups are described in - <xref linkend="advanced-networking"/>.</para> + networking setups are described in <link + linkend="advanced-networking"></link>.</para> </step> </procedure> </sect3> @@ -592,26 +587,27 @@ xenbr1 8000.feffffffffff no vif0.1 </sect2> --> <sect2 id="virtualization-guest-virtualpc"> - <title>Virtual PC on &windows;</title> + <title><application>Virtual PC</application> on + &windows;</title> <para><application>Virtual PC</application> for &windows; is a µsoft; software product available for free download. - See <ulink + See this website for the <ulink url="http://www.microsoft.com/windows/downloads/virtualpc/sysreq.mspx"> system requirements</ulink>. Once <application> Virtual PC </application> has been installed on µsoft.windows;, - the user must configure a virtual machine and then install + the user can configure a virtual machine and then install the desired guest operating system.</para> <sect3 id="virtualization-guest-virtualpc-install"> - <title>Installing &os; on Virtual - PC/µsoft.windows;</title> + <title>Installing &os; on <application>Virtual + PC</application></title> <para>The first step in installing &os; on - µsoft.windows; /<application>Virtual PC - </application> is to create a new virtual machine for - installing &os;. Select <guimenuitem>Create a virtual - machine</guimenuitem> when prompted:</para> + <application>Virtual PC </application> is to create a new + virtual machine for installing &os;. Select + <guimenuitem>Create a virtual machine</guimenuitem> when + prompted:</para> <mediaobject> <imageobject> @@ -625,7 +621,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>And select <guimenuitem>Other</guimenuitem> as the + <para>Select <guimenuitem>Other</guimenuitem> as the <guimenuitem>Operating system</guimenuitem> when prompted:</para> @@ -636,10 +632,9 @@ xenbr1 8000.feffffffffff no vif0.1 </mediaobject> <para>Then, choose a reasonable amount of disk and memory - depending on your plans for this virtual &os; - instance. 4GB of disk space and 512MB of RAM work well - for most uses of &os; under - <application>Virtual PC</application>:</para> + depending on the plans for this virtual &os; instance. + 4GB of disk space and 512MB of RAM work well for most uses + of &os; under <application>Virtual PC</application>:</para> <mediaobject> <imageobject> @@ -661,7 +656,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Select your &os; virtual machine and click + <para>Select the &os; virtual machine and click <guimenu>Settings</guimenu>, then set the type of networking and a network interface:</para> @@ -677,18 +672,18 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>After your &os; virtual machine has been created, you - will need to install &os; on it. This is best done with an - official &os; CDROM or with an ISO image downloaded from an - official FTP site. When you have the appropriate ISO image - on your local &windows; filesystem or a CDROM in your CD - drive, double click on your &os; virtual machine to boot. - Then, click <guimenu>CD</guimenu> and choose - <guimenu>Capture ISO Image...</guimenu> on + <para>After the &os; virtual machine has been created, &os; + can be installed on it. This is best done with an + official &os; CD/DVD or with an ISO image downloaded from an + official FTP site. Copy the appropriate ISO image to the + local &windows; filesystem or insert a CD/DVD in the CD + drive, then double click on the &os; virtual machine to + boot. Then, click <guimenu>CD</guimenu> and choose + <guimenu>Capture ISO Image...</guimenu> on the <application>Virtual PC</application> window. This will - bring up a window that allows you to associate the CDROM - drive in your virtual machine with an ISO file on disk or - with your real CDROM drive.</para> + bring up a window where the CDROM drive in the virtual + machine can be associated with an ISO file on disk or + with the real CDROM drive.</para> <mediaobject> <imageobject> @@ -702,13 +697,11 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Once you have made this association with your CDROM - source, reboot your &os; virtual machine as normal by - clicking the <guimenu>Action</guimenu> and - <guimenu>Reset</guimenu>. + <para>Once this association with the CDROM source has been + made, reboot the &os; virtual machine by clicking + <guimenu>Action</guimenu> and <guimenu>Reset</guimenu>. <application>Virtual PC</application> will reboot with a - special BIOS that first checks if you have a CDROM just as a - normal BIOS would do.</para> + special BIOS that first checks for a CDROM.</para> <mediaobject> <imageobject> @@ -717,10 +710,9 @@ xenbr1 8000.feffffffffff no vif0.1 </mediaobject> <para>In this case it will find the &os; installation media - and begin a normal <application>sysinstall</application> - based installation as described in - <xref linkend="install"/>. You may install, but do not - attempt to configure X11 at this time.</para> + and begin a normal &os; installation. Continue with the + installation, but do not attempt to configure + <application>&xorg;</application> at this time.</para> <mediaobject> <imageobject> @@ -728,9 +720,9 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>When you have finished the installation, remember to - eject CDROM or release ISO image. Finally, reboot into your - newly installed &os; virtual machine.</para> + <para>When the installation is finished, remember to eject + the CD/DVD or release the ISO image. Finally, reboot into + the newly installed &os; virtual machine.</para> <mediaobject> <imageobject> @@ -740,8 +732,8 @@ xenbr1 8000.feffffffffff no vif0.1 </sect3> <sect3 id="virtualization-guest-virtualpc-configure"> - <title>Configuring &os; on µsoft.windows;/Virtual - PC</title> + <title>Configuring &os; on <application>Virtual + PC</application></title> <para>After &os; has been successfully installed on µsoft.windows; with <application>Virtual PC @@ -755,9 +747,9 @@ xenbr1 8000.feffffffffff no vif0.1 <para>The most important step is to reduce the <option>kern.hz</option> tunable to reduce the CPU - utilization of &os; under the - <application>Virtual PC</application> environment. - This is accomplished by adding the following line to + utilization of &os; under the <application>Virtual + PC</application> environment. This is accomplished + by adding the following line to <filename> /boot/loader.conf</filename>:</para> <programlisting>kern.hz=100</programlisting> @@ -765,55 +757,57 @@ xenbr1 8000.feffffffffff no vif0.1 <para>Without this setting, an idle &os; <application>Virtual PC</application> guest OS will use roughly 40% of the CPU of a single processor - computer. After this change the usage will be - closer to a mere 3%.</para> + computer. After this change, the usage will be + closer to 3%.</para> </step> <step> <title>Create a New Kernel Configuration File</title> - <para>You can remove all of the SCSI, FireWire, and USB - device drivers. <application>Virtual PC</application> - provides a virtual network adapter used by the - &man.de.4; driver, so all other network devices except - for &man.de.4; and &man.miibus.4; can be removed from - the kernel.</para> + <para>All of the SCSI, FireWire, and USB device drivers + can be removed from a custom kernel configuration file. + <application>Virtual PC</application> provides a virtual + network adapter used by the &man.de.4; driver, so all + network devices except for &man.de.4; and &man.miibus.4; + can be removed from the kernel.</para> </step> <step> <title>Configure Networking</title> - <para>The most basic networking setup involves simply - using DHCP to connect your virtual machine to the same - local area network as your host µsoft.windows;. - This can be accomplished by adding - <literal>ifconfig_de0="DHCP"</literal> to + <para>The most basic networking setup uses DHCP to connect + the virtual machine to the same local area network as + the µsoft.windows; host. This can be accomplished + by adding <literal>ifconfig_de0="DHCP"</literal> to <filename>/etc/rc.conf</filename>. More advanced - networking setups are described in - <xref linkend="advanced-networking"/>.</para> + networking setups are described in <link + linkend="advanced-networking"></link>.</para> </step> </procedure> </sect3> </sect2> <sect2 id="virtualization-guest-vmware"> - <title>VMware on MacOS</title> + <title><application>VMware Fusion</application> on + &macos;</title> <para><application>VMware Fusion</application> for &mac; is a commercial software product available for &intel; based &apple; &mac; computers running &macos; 10.4.9 or higher. &os; is a fully supported guest operating system. Once <application>VMware Fusion</application> has been - installed on &macos; X, the user must configure a virtual + installed on &macos; X, the user can configure a virtual machine and then install the desired guest operating system.</para> <sect3 id="virtualization-guest-vmware-install"> - <title>Installing &os; on VMware/&macos; X</title> + <title>Installing &os; on <application>VMware + Fusion</application></title> - <para>The first step is to start VMware Fusion, the Virtual - Machine Library will load. Click "New" to create the - VM:</para> + <para>The first step is to start <application>VMware + Fusion</application> which will load the Virtual + Machine Library. Click <guimenuitem>New</guimenuitem> to + create the virtual machine:</para> <mediaobject> <imageobject> @@ -821,8 +815,8 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>This will load the New Virtual Machine Assistant to help - you create the VM, click Continue to proceed:</para> + <para>This will load the New Virtual Machine Assistant. Click + <guimenuitem>Continue</guimenuitem> to proceed:</para> <mediaobject> <imageobject> @@ -831,11 +825,10 @@ xenbr1 8000.feffffffffff no vif0.1 </mediaobject> <para>Select <guimenuitem>Other</guimenuitem> as the - <guimenuitem>Operating System</guimenuitem> and + <guimenuitem>Operating System</guimenuitem> and either <guimenuitem>&os;</guimenuitem> or - <guimenuitem>&os; 64-bit</guimenuitem>, depending on if - you want 64-bit support, as the <guimenu>Version</guimenu> - when prompted:</para> + <guimenuitem>&os; 64-bit</guimenuitem>, as the + <guimenu>Version</guimenu> when prompted:</para> <mediaobject> <imageobject> @@ -843,8 +836,8 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Choose the Name of the VM Image and the Directory where - you would like it saved:</para> + <para>Choose the name of the virtual machine and the directory + where it should be saved:</para> <mediaobject> <imageobject> @@ -852,8 +845,8 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Choose the size of the Virtual Hard Disk for the - VM:</para> + <para>Choose the size of the Virtual Hard Disk for the virtual + machine:</para> <mediaobject> <imageobject> @@ -861,8 +854,8 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Choose the method you would like to install the VM, - either from an ISO image or from a CD:</para> + <para>Choose the method to install the virtual machine, + either from an ISO image or from a CD/DVD:</para> <mediaobject> <imageobject> @@ -870,7 +863,8 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Once you click Finish, the VM will boot:</para> + <para>Click <guimenuitem>Finish</guimenuitem> and the virtual + machine will boot:</para> <mediaobject> <imageobject> @@ -878,8 +872,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Install &os; like you normally would, or by following - the directions in <xref linkend="install"/>:</para> + <para>Install &os; as usual:</para> <mediaobject> <imageobject> @@ -887,12 +880,14 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Once the install is complete you can modify the settings - of the VM, such as Memory Usage:</para> + <para>Once the install is complete, the settings + of the virtual machine can be modified, such as memory + usage:</para> <note> - <para>The System Hardware settings of the VM cannot be - modified while the VM is running.</para> + <para>The System Hardware settings of the virtual machine + cannot be modified while the virtual machine is + running.</para> </note> <mediaobject> @@ -901,7 +896,8 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>The number of CPUs the VM will have access to:</para> + <para>The number of CPUs the virtual machine will have access + to:</para> <mediaobject> <imageobject> @@ -909,9 +905,9 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>The status of the CD-Rom Device. Normally you can - disconnect the CD-Rom/ISO from the VM if you will not be - needing it anymore.</para> + <para>The status of the CDROM device. Normally the + CD/DVD/ISO is disconnected from the virtual machine when it + is no longer needed.</para> <mediaobject> <imageobject> @@ -919,14 +915,15 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>The last thing to change is how the VM will connect to - the Network. If you want to allow connections to the VM - from other machines besides the Host, make sure you choose - the <guimenuitem>Connect directly to the physical network - (Bridged)</guimenuitem>. Otherwise <guimenuitem>Share the + <para>The last thing to change is how the virtual machine will + connect to the network. To allow connections to the virtual + machine from other machines besides the host, choose + <guimenuitem>Connect directly to the physical network + (Bridged)</guimenuitem>. Otherwise, <guimenuitem>Share the host's internet connection (NAT)</guimenuitem> is - preferred so that the VM can have access to the Internet, - but the network cannot access the VM.</para> + preferred so that the virtual machine can have access to the + Internet, but the network cannot access the virtual + machine.</para> <mediaobject> <imageobject> @@ -934,17 +931,18 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>After you have finished modifying the settings, boot the - newly installed &os; virtual machine.</para> + <para>After modifying the settings, boot the newly installed + &os; virtual machine.</para> </sect3> <sect3 id="virtualization-guest-vmware-configure"> - <title>Configuring &os; on &macos; X/VMware</title> + <title>Configuring &os; on <application>VMware + Fusion</application></title> <para>After &os; has been successfully installed on &macos; X - with <application>VMware</application>, there are a number - of configuration steps that can be taken to optimize the - system for virtualized operation.</para> + with <application>VMware Fusion</application>, there are a + number of configuration steps that can be taken to optimize + the system for virtualized operation.</para> <procedure> <step> @@ -953,40 +951,40 @@ xenbr1 8000.feffffffffff no vif0.1 <para>The most important step is to reduce the <option>kern.hz</option> tunable to reduce the CPU utilization of &os; under the - <application>VMware</application> environment. This is - accomplished by adding the following line to + <application>VMware Fusion</application> environment. + This is accomplished by adding the following line to <filename>/boot/loader.conf</filename>:</para> <programlisting>kern.hz=100</programlisting> <para>Without this setting, an idle &os; - <application>VMware</application> guest - OS will use roughly 15% of the CPU of a single - processor &imac;. After this change the usage will be - closer to a mere 5%.</para> + <application>VMware Fusion</application> guest will use + roughly 15% of the CPU of a single processor &imac;. + After this change, the usage will be closer to + 5%.</para> </step> <step> <title>Create a New Kernel Configuration File</title> - <para>You can remove all of the FireWire, and USB device - drivers. <application>VMware</application> provides a + <para>All of the FireWire, and USB device drivers can be + removed from a custom kernel configuration file. + <application>VMware Fusion</application> provides a virtual network adapter used by the &man.em.4; driver, - so all other network devices except for &man.em.4; can - be removed from the kernel.</para> + so all network devices except for &man.em.4; can be + removed from the kernel.</para> </step> <step> <title>Configure Networking</title> - <para>The most basic networking setup involves simply - using DHCP to connect your virtual machine to the - same local area network as your host &mac;. This - can be accomplished by adding + <para>The most basic networking setup uses DHCP to connect + the virtual machine to the same local area network as + the host &mac;. This can be accomplished by adding <literal>ifconfig_em0="DHCP"</literal> to <filename>/etc/rc.conf</filename>. More advanced - networking setups are described in - <xref linkend="advanced-networking"/>.</para> + networking setups are described in <link + linkend="advanced-networking"></link>.</para> </step> </procedure> </sect3> @@ -1000,23 +998,23 @@ xenbr1 8000.feffffffffff no vif0.1 <itemizedlist> <listitem> - <para>Clipboard sharing</para> + <para>Clipboard sharing.</para> </listitem> <listitem> - <para>Mouse pointer integration</para> + <para>Mouse pointer integration.</para> </listitem> <listitem> - <para>Host time synchronization</para> + <para>Host time synchronization.</para> </listitem> <listitem> - <para>Window scaling</para> + <para>Window scaling.</para> </listitem> <listitem> - <para>Seamless mode</para> + <para>Seamless mode.</para> </listitem> </itemizedlist> @@ -1026,7 +1024,8 @@ xenbr1 8000.feffffffffff no vif0.1 <para>First, install the <filename role="package">emulators/virtualbox-ose-additions</filename> - package in the &os; guest.</para> + package or port in the &os; guest. This will install + the port:</para> <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen> @@ -1036,14 +1035,15 @@ xenbr1 8000.feffffffffff no vif0.1 <programlisting>vboxguest_enable="YES" vboxservice_enable="YES"</programlisting> - <para>If &man.ntpd.8; or &man.ntpdate.8; will be used, host time + <para>If &man.ntpd.8; or &man.ntpdate.8; is used, host time synchronization should be disabled:</para> <programlisting>vboxservice_flags="--disable-timesync"</programlisting> - <para>The <literal>vboxvideo_drv</literal> should be recognized - by <command>Xorg -configure</command>. If not, modify - <filename>xorg.conf</filename> for the + <para>The <literal>vboxvideo</literal> driver should be + automatically recognized by <command>Xorg + -configure</command>. If not, modify + <filename>/etc/X11/xorg.conf</filename> for the <application>&virtualbox;</application> video card:</para> <programlisting>Section "Device" @@ -1058,15 +1058,16 @@ vboxservice_enable="YES"</programlisting> BusID "PCI:0:2:0" EndSection</programlisting> - <para>To use <literal>vboxmouse_drv</literal>, adjust the mouse - section in your <filename>xorg.conf</filename>:</para> + <para>To use the <literal>vboxmouse</literal> driver, adjust the + mouse section in + <filename>/etc/X11/xorg.conf</filename>:</para> <programlisting>Section "InputDevice" Identifier "Mouse0" Driver "vboxmouse" EndSection</programlisting> - <para><acronym>HAL</acronym> users should create this file at + <para><acronym>HAL</acronym> users should create the following <filename>/usr/local/etc/hal/fdi/policy/90-vboxguest.fdi</filename> or copy it from <filename>/usr/local/share/hal/fdi/policy/10osvendor/90-vboxguest.fdi</filename>:</para> @@ -1107,45 +1108,33 @@ EndSection</programlisting> </sect1> <sect1 id="virtualization-host"> - <title>&os; as a Host OS</title> - - <para>For a number of years, &os; was not officially supported as - a host OS by any of the available virtualization solutions. - Some people were using older and mostly obsolete versions of - <application>VMware</application> (like - <filename role="package">emulators/vmware3</filename>), which - utilized the &linux; binary compatibility layer. Shortly after - the release of &os; 7.2, Sun's - <application>&virtualbox;</application> appeared in the - Ports Collection as a native &os; program.</para> + <title>&os; as a Host</title> <para><application>&virtualbox;</application> is an actively developed, complete virtualization package, that is available for most operating systems including &windows;, &macos;, &linux; - and &os;. It is equally capable at running &windows; or &unix; - like guests. It is released as open source software, but with - closed-source components available in a separate extension pack. - These components include support for USB 2.0 devices, among - others. More information may be found on the - <quote>Downloads</quote> page of the - <application>&virtualbox;</application> wiki, at <ulink - url="http://www.virtualbox.org/wiki/Downloads"></ulink>. + and &os;. It is equally capable of running &windows; or + &unix;-like guests. It is released as open source software, but + with closed-source components available in a separate extension + pack. These components include support for USB 2.0 devices. + More information may be found on the <ulink + url="http://www.virtualbox.org/wiki/Downloads"> + <quote>Downloads</quote> page of the + <application>&virtualbox;</application> wiki</ulink>. Currently, these extensions are not available for &os;.</para> <sect2 id="virtualization-virtualbox-install"> <title>Installing &virtualbox;</title> <para><application>&virtualbox;</application> is available as a - &os; port in - <filename role="package">emulators/virtualbox-ose</filename>. - As &virtualbox; is very actively developed, make sure your - ports tree is up to date before installing. Install using - these commands:</para> + &os; package or port in <filename + role="package">emulators/virtualbox-ose</filename>. The + port can be installed using these commands:</para> <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>One useful option in the configuration dialog is the + <para>One useful option in the port's configuration menu is the <literal>GuestAdditions</literal> suite of programs. These provide a number of useful features in guest operating systems, like mouse pointer integration (allowing the mouse to @@ -1153,8 +1142,7 @@ EndSection</programlisting> special keyboard shortcut to switch) and faster video rendering, especially in &windows; guests. The guest additions are available in the <guimenu>Devices</guimenu> - menu, after the installation of the guest OS is - finished.</para> + menu, after the installation of the guest is finished.</para> <para>A few configuration changes are needed before <application>&virtualbox;</application> is started for the @@ -1181,59 +1169,51 @@ EndSection</programlisting> during installation of <application>&virtualbox;</application>. All users that need access to <application>&virtualbox;</application> will have to - be added as members of this group. The <command>pw</command> - command may be used to add new members:</para> + be added as members of this group. <command>pw</command> + can be used to add new members:</para> <screen>&prompt.root; <userinput>pw groupmod vboxusers -m <replaceable>yourusername</replaceable></userinput></screen> - <para>The default permissions for - <filename class="devicefile">/dev/vboxnetctl</filename> are + <para>The default permissions for <filename + class="devicefile">/dev/vboxnetctl</filename> are restrictive and need to be changed for bridged - networking.</para> - - <para>To test it temporarily:</para> + networking:</para> <screen>&prompt.root; <userinput>chown root:vboxusers /dev/vboxnetctl</userinput> &prompt.root; <userinput>chmod 0660 /dev/vboxnetctl</userinput></screen> - <para>To make the permissions change permanent, add these + <para>To make this permissions change permanent, add these lines to <filename>/etc/devfs.conf</filename>:</para> <programlisting>own vboxnetctl root:vboxusers perm vboxnetctl 0660</programlisting> - <para>To launch <application>&virtualbox;</application>, either - select the <guimenuitem>Sun VirtualBox</guimenuitem> item from - the graphic environment's menu, or type the following in a - terminal:</para> + <para>To launch <application>&virtualbox;</application>, + type from a <application>&xorg;</application> session:</para> <screen>&prompt.user; <userinput>VirtualBox</userinput></screen> <para>For more information on configuring and using - <application>&virtualbox;</application>, please visit the - official website at - <ulink url="http://www.virtualbox.org"></ulink>. As the &os; - port is very recent, it is under heavy development. For the - latest information and troubleshooting instructions, please - visit the relevant page in the &os; wiki, at <ulink - url="http://wiki.FreeBSD.org/VirtualBox"></ulink>.</para> + <application>&virtualbox;</application>, refer to the + <ulink url="http://www.virtualbox.org">official + website</ulink>. For &os;-specific information and + troubleshooting instructions, refer to the <ulink + url="http://wiki.FreeBSD.org/VirtualBox">relevant page in + the &os; wiki</ulink>.</para> </sect2> <sect2 id="virtualization-virtualbox-usb-support"> <title>&virtualbox; USB Support</title> - <note> - <para>These steps require VirtualBox 4.0.0 or later.</para> - </note> - <para>In order to be able to read and write to USB devices, - users need to be members of the operator group:</para> + users need to be members of + <groupname>operator</groupname>:</para> <screen>&prompt.root; <userinput>pw groupmod operator -m <replaceable>jerry</replaceable></userinput></screen> <para>Then, add the following to - <filename>/etc/devfs.rules</filename> (create it if it does - not exist yet):</para> + <filename>/etc/devfs.rules</filename>, or create this file if + it does not exist yet:</para> <programlisting>[system=10] add path 'usb/*' mode 0660 group operator</programlisting> @@ -1256,20 +1236,20 @@ add path 'usb/*' mode 0660 group operator</programlisting> <title>&virtualbox; Host DVD/CD Access</title> <para>Access to the host DVD/CD drives from guests is achieved - through the sharing of the physical drives. In GUI this is - set up from the Storage window in the Settings of the virtual - machine. Create an empty IDE CD/DVD device first. - Then choose the Host Drive from the popup menu for the virtual - CD/DVD drive selection. A checkbox labeled - <literal>Passthrough</literal> check box will appear. - This allows the virtual machine to use the hardware directly. - For example, audio CDs or the burner only function if - this option is selected.</para> + through the sharing of the physical drives. Within + &virtualbox;, this is set up from the Storage window in the + Settings of the virtual machine. If needed, create an empty + IDE CD/DVD device first. Then choose the Host Drive from the + popup menu for the virtual CD/DVD drive selection. A checkbox + labeled <literal>Passthrough</literal> will appear. This + allows the virtual machine to use the hardware directly. For + example, audio CDs or the burner will only function if this + option is selected.</para> <para><acronym>HAL</acronym> needs to run for <application>&virtualbox;</application> DVD/CD functions to work, so enable it in <filename>/etc/rc.conf</filename> and - start it (if it is not already running):</para> + start it if it is not already running:</para> <programlisting>hald_enable="YES"</programlisting> @@ -1277,16 +1257,14 @@ add path 'usb/*' mode 0660 group operator</programlisting> <para>In order for users to be able to use <application>&virtualbox;</application> DVD/CD functions, they - need access to - <filename class="devicefile">/dev/xpt0</filename>, <filename + need access to <filename + class="devicefile">/dev/xpt0</filename>, <filename class="devicefile">/dev/cd<replaceable>N</replaceable></filename>, and <filename class="devicefile">/dev/pass<replaceable>N</replaceable></filename>. - This is usually achieved by making the user of - <application>&virtualbox;</application> - a member of the operator group, which is also the default - group of the above mentioned devices. Permissions of these - devices have to be corrected by adding the following lines to + This is usually achieved by making the user a member of + <groupname>operator</groupname>. Permissions to these devices + have to be corrected by adding the following lines to <filename>/etc/devfs.conf</filename>:</para> <programlisting>perm cd* 0600 diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml index 5e09d09fec..c6a5d19166 100644 --- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml @@ -33,8 +33,7 @@ default and official flavor of X11 in &os; is <application>&xorg;</application>, the X11 server developed by the X.Org Foundation under a license very similar to the one - used by &os;. Commercial X servers for &os; are also - available.</para> + used by &os;.</para> <para>For more information on the video hardware that X11 supports, check the <ulink @@ -119,8 +118,8 @@ other input or output devices (i.e., a <quote>tablet</quote> can be used as an input device, and a video projector may be an alternative output device). Each X application - (such as <application>XTerm</application>, or - <application>&netscape;</application>) is a + (such as <application>XTerm</application> or + <application>Firefox</application>) is a <quote>client</quote>. A client sends messages to the server such as <quote>Please draw a window at these coordinates</quote>, and the server sends back messages such @@ -176,22 +175,16 @@ <para>Instead, X delegates this responsibility to an application called a <quote>Window Manager</quote>. There - are dozens of window managers available for X: - <application>AfterStep</application>, - <application>Blackbox</application>, - <application>ctwm</application>, - <application>Enlightenment</application>, - <application>fvwm</application>, - <application>Sawfish</application>, - <application>twm</application>, - <application>Window Maker</application>, and more. Each of + are <ulink + url="http://xwinman.org/">dozens of window managers</ulink> + available for X. Each of these window managers provides a different look and feel; some of them support <quote>virtual desktops</quote>; some of them allow customized keystrokes to manage the desktop; some have a <quote>Start</quote> button or similar device; some are <quote>themeable</quote>, allowing a complete change - of look-and-feel by applying a new theme. These window - managers, and many more, are available in the + of look-and-feel by applying a new theme. Window managers + are available in the <filename>x11-wm</filename> category of the Ports Collection.</para> @@ -300,15 +293,8 @@ <para>As a result, do not expect X applications to have a common look and feel. There are several popular widget sets - and variations, including the original Athena widget set from - MIT, <application>&motif;</application> (on which the widget - set in µsoft.windows; was modeled, all bevelled edges and - three shades of grey), <application>OpenLook</application>, - and others.</para> - - <para>Most newer X applications today will use a - modern-looking widget set, either Qt, used by - <application>KDE</application>, or GTK+, used by the + and variations, including Qt, used by + <application>KDE</application>, and GTK+, used by the <application>GNOME</application> project. In this respect, there is some convergence in look-and-feel of the &unix; desktop, which certainly makes things easier for the novice @@ -319,7 +305,7 @@ <sect1 id="x-install"> <title>Installing X11</title> - <para><application>&xorg;</application> is the default X11 + <para><application>&xorg;</application> is the X11 implementation for &os;. <application>&xorg;</application> is the X server of the open source X Window System implementation released by the X.Org Foundation. diff --git a/en_US.ISO8859-1/books/porters-handbook/Makefile b/en_US.ISO8859-1/books/porters-handbook/Makefile index 95a62ca124..7e813c64ac 100644 --- a/en_US.ISO8859-1/books/porters-handbook/Makefile +++ b/en_US.ISO8859-1/books/porters-handbook/Makefile @@ -20,6 +20,7 @@ INSTALL_ONLY_COMPRESSED?= # XML content SRCS= book.xml +SRCS+= uses.xml # Images from the cross-document image library IMAGES_LIB+= callouts/1.png diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml index 290e2c863a..c6d652470f 100644 --- a/en_US.ISO8859-1/books/porters-handbook/book.xml +++ b/en_US.ISO8859-1/books/porters-handbook/book.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" - "../../../share/xml/freebsd45.dtd"> + "../../../share/xml/freebsd45.dtd" [ +<!ENTITY values.uses SYSTEM "uses.xml"> +]> <!-- The FreeBSD Documentation Project @@ -32,6 +34,7 @@ <year>2010</year> <year>2011</year> <year>2012</year> + <year>2013</year> <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> </copyright> @@ -1022,6 +1025,27 @@ DOS2UNIX_REGEX= .*\.(c|cpp|h)</programlisting> incorrectly treated as a newer version since 20000801 is a numerically greater value than 1).</para> + <tip> + <para>The results of version number comparisons are not + always obvious. &man.pkg.version.1; can be used to test + the comparison of two version number strings. The + <application>pkgng</application> equivalent is + <command>pkg version -t</command>. For example:</para> + + <screen>&prompt.user; <userinput>pkg_version -t 0.031 0.29</userinput> +></screen> + + <para>Or, for <application>pkgng</application> + users:</para> + + <screen>&prompt.user; <userinput>pkg version -t 0.031 0.29</userinput> +></screen> + + <para>The <literal>></literal> output indicates that + version 0.031 is considered greater than version 0.29, + which may not have been obvious to the porter.</para> + </tip> + <para>In situations such as this, the <makevar>PORTEPOCH</makevar> version should be increased. If <makevar>PORTEPOCH</makevar> is nonzero it is appended @@ -3769,6 +3793,25 @@ ALWAYS_KEEP_DISTFILES= yes is the same as <makevar>DEPENDS_TARGET</makevar>.</para> </sect2> + <sect2 id="uses"> + <title><makevar>USES</makevar></title> + + <para>There several parameters exist for defining different kind + of features and dependencies that the port in question uses. + They can be specified by adding the following line to the + <filename>Makefile</filename> of the port:</para> + + <programlisting>USES= feature[:arguments]</programlisting> + + <para>For the complete list of such values, please see <xref + linkend="uses-values"/>.</para> + + <warning> + <para><makevar>USES</makevar> cannot be assigned after inclusion of + <filename>bsd.port.pre.mk</filename>.</para> + </warning> + </sect2> + <sect2 id="use-vars"> <title><makevar>USE_<replaceable>*</replaceable></makevar></title> @@ -3823,12 +3866,6 @@ ALWAYS_KEEP_DISTFILES= yes </row> <row> - <entry><makevar>USE_BISON</makevar></entry> - <entry>The port uses <command>bison</command> for - building.</entry> - </row> - - <row> <entry><makevar>USE_CDRTOOLS</makevar></entry> <entry>The port requires <application>cdrecord</application> either from @@ -4539,27 +4576,6 @@ CONFIGURE_ARGS+= --without-examples .include <bsd.port.mk></programlisting> </example> - <example id="ports-options-old-style-use"> - <title>Old-Style Use of <makevar>OPTIONS</makevar></title> - - <programlisting>OPTIONS= FOO "Enable option foo" On - -.include <bsd.port.pre.mk> - -.if defined(WITHOUT_FOO) -CONFIGURE_ARGS+= --without-foo -.else -CONFIGURE_ARGS+= --with-foo -.endif - -.include <bsd.port.post.mk></programlisting> - </example> - - <important> - <para>This method of using <makevar>OPTIONS</makevar> - is deprecated, and will be removed at some point. - Do not use this method for new ports.</para> - </important> </sect3> <sect3> @@ -5723,17 +5739,13 @@ IGNORE= may not be redistributed because of licensing reasons. Please visit <rep CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}"</programlisting> +GNU_CONFIGURE= yes</programlisting> <para>Of course, the code can be more compact if there are no more flags to pass to <command>configure</command>:</para> <programlisting>USE_GETTEXT= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib"</programlisting> +GNU_CONFIGURE= yes</programlisting> </sect2> <sect2> @@ -5750,13 +5762,17 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ <programlisting>GNU_CONFIGURE= yes -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -.endif</programlisting> +.endif + +.include <bsd.port.mk></programlisting> <para>The next item on your to-do list is to arrange so that the message catalog files are included in the packing list @@ -10267,7 +10283,8 @@ etc/orbit.conf.sample <makevar>SUB_FILES</makevar>. Several common pairs are automatically defined: <makevar>PREFIX</makevar>, <makevar>LOCALBASE</makevar>, <makevar>DATADIR</makevar>, - <makevar>DOCSDIR</makevar>, <makevar>EXAMPLESDIR</makevar>. + <makevar>DOCSDIR</makevar>, <makevar>EXAMPLESDIR</makevar>, + <makevar>WWWDIR</makevar>, and <makevar>ETCDIR</makevar>. Any line beginning with <literal>@comment</literal> will be deleted from resulting files after a variable substitution.</para> @@ -10478,7 +10495,7 @@ as .putsy.conf and edit it.</programlisting> <application>Subversion</application> or &man.portsnap.8; to keep your whole ports collection up-to-date, as described in the <ulink - url="&url.books.handbook;/synching.html#CVSUP-CONFIG">Handbook</ulink>. + url="&url.books.handbook;/ports-using.html">Handbook</ulink>. This will have the added benefit of tracking all the ports' dependencies.</para> @@ -10497,8 +10514,7 @@ as .putsy.conf and edit it.</programlisting> <literal>portsmon</literal>). This system attempts to classify port PRs by portname. To search for PRs about a particular port, use the <ulink - url="http://portsmon.FreeBSD.org/portoverview.py"> - Overview of One Port</ulink>.</para> + url="http://portsmon.FreeBSD.org/portoverview.py">Overview of One Port</ulink>.</para> <para>If there is no pending PR, the next step is to send an email to the port's maintainer, as shown by <command>make @@ -10598,7 +10614,7 @@ as .putsy.conf and edit it.</programlisting> <sect1 id="svn-diff"> <title>Using <literal>SVN</literal> to Make Patches</title> - <para>If you can, please submit a &man.svn.1; diff; they are + <para>If you can, please submit a &man.svn.1; diff — they are easier to handle than diffs between <quote>new and old</quote> directories. Plus it is easier for you to see what you have changed and to update your diff if something is modified in @@ -10607,7 +10623,7 @@ as .putsy.conf and edit it.</programlisting> something.</para> <screen>&prompt.user; <userinput>cd ~/my_wrkdir</userinput> <co id="my-wrkdir"/> -&prompt.user; <userinput>svn co svn://svn.FreeBSD.org/ports/head/dns/pdnsd</userinput> <co id="svn-FreeBSD-org"/> +&prompt.user; <userinput>svn co <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/ports/head/dns/pdnsd</userinput> <co id="svn-FreeBSD-org"/> &prompt.user; <userinput>cd ~/my_wrkdir/pdnsd</userinput></screen> <calloutlist> @@ -10620,8 +10636,12 @@ as .putsy.conf and edit it.</programlisting> <callout arearefs="svn-FreeBSD-org"> <para><ulink - url="http://svn.FreeBSD.org/">svn.FreeBSD.org</ulink> - is a public <literal>SVN</literal> server.</para> + url="https://svn0.us-west.FreeBSD.org/">svn0.us-west.FreeBSD.org</ulink> + is a public <literal>SVN</literal> server. + Select the closest mirror and verify the mirror server + certificate from the list of <ulink + url="&url.books.handbook;/svn-mirrors.html">Subversion + mirror sites</ulink>.</para> </callout> </calloutlist> @@ -15670,6 +15690,41 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 </row> <row> + <entry>901500</entry> + <entry>August 6, 2012</entry> + <entry>9.1-STABLE after branching releng/9.1 + (RELENG_9_1).</entry> + </row> + + <row> + <entry>901501</entry> + <entry>November 11, 2012</entry> + <entry>9.1-STABLE after LIST_PREV() added to queue.h.</entry> + </row> + + <row> + <entry>901502</entry> + <entry>November 28, 2012</entry> + <entry>9.1-STABLE after USB serial jitter buffer requires + rebuild of USB serial device modules.</entry> + </row> + + <row> + <entry>901503</entry> + <entry>February 21, 2013</entry> + <entry>9.1-STABLE after USB moved to the driver structure + requiring a rebuild of all USB modules. Also indicates + the presence of nmtree.</entry> + </row> + + <row> + <entry>901504</entry> + <entry>March 15, 2013</entry> + <entry>9.1-STABLE after install gained -l, -M, -N and related + flags and cat gained the -l option.</entry> + </row> + + <row> <entry>1000000</entry> <entry>September 26, 2011</entry> <entry>10.0-CURRENT.</entry> @@ -15900,6 +15955,14 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 <entry>10-CURRENT after cat gained the -l flag (rev <svnref>246083</svnref>).</entry> </row> + + <row> + <entry>1000030</entry> + <entry>March 12, 2013</entry> + <entry>10-CURRENT after KPI breakage introduced in the + VM subsystem to support read/write locking (rev + <svnref>248084</svnref>).</entry> + </row> </tbody> </tgroup> </table> @@ -16012,23 +16075,10 @@ Reference: <http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00 .if ${OSVERSION} > 300003 BROKEN= perl is in system .endif - -# only one shlib version number for ELF -.if ${PORTOBJFORMAT} == "elf" -TCL_LIB_FILE= ${TCL_LIB}.${SHLIB_MAJOR} -.else -TCL_LIB_FILE= ${TCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR} -.endif - -# software already makes link for ELF, but not for a.out -post-install: -.if ${PORTOBJFORMAT} == "aout" - ${LN} -sf liblinpack.so.1.0 ${PREFIX}/lib/liblinpack.so -.endif</programlisting> + </programlisting> <para>You did remember to use tab instead of spaces after <literal>BROKEN=</literal> and - <literal>TCL_LIB_FILE=</literal>, did you not? <!-- smiley -->:-).</para> </sect1> @@ -16836,4 +16886,29 @@ pre-install: about creating has already been submitted.</para> </sect1> </chapter> + + <chapter id="appendices"> + <title>Appendices</title> + + <sect1 id="uses-values"> + <title>Values of <makevar>USES</makevar></title> + + <table frame="none"> + <title>Values of <makevar>USES</makevar></title> + + <tgroup cols="2"> + <thead> + <row> + <entry>Feature</entry> + <entry>Arguments</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + &values.uses; + </tbody> + </tgroup> + </table> + </sect1> + </chapter> </book> diff --git a/en_US.ISO8859-1/books/porters-handbook/uses.xml b/en_US.ISO8859-1/books/porters-handbook/uses.xml new file mode 100644 index 0000000000..905e5b2963 --- /dev/null +++ b/en_US.ISO8859-1/books/porters-handbook/uses.xml @@ -0,0 +1,61 @@ +<!-- + + The FreeBSD Documentation Project + + $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 this scheme + below as a skeleton): + +<row> + <entry><literal>FEATURE</literal></entry> + <entry>ARGUMENTS</entry> + <entry>DESCRIPTION</entry> +</row> + +--> + +<row> + <entry><literal>bison</literal></entry> + <entry>none, <literal>build</literal>, <literal>run</literal>, + <literal>both</literal></entry> + <entry>Implies that the port uses <filename + role="package">devel/bison</filename> in one way or another. By + default, with no arguments or with the <literal>build</literal> + argument, it implies <command>bison</command> as a build-time + dependency, <literal>run</literal> implies a run-time dependency, and + <literal>both</literal> implies both run-time and build-time + dependencies.</entry> +</row> + +<row> + <entry><literal>fuse</literal></entry> + <entry>none</entry> + <entry>Implies the port will depend on the FUSE library and handle the + the dependency on the kernel module depending on the version of + &os;. + </entry> +</row> + +<row> + <entry><literal>pathfix</literal></entry> + <entry>none</entry> + <entry>Look for the <filename>Makefile.in</filename> and + <filename>configure</filename> files in the port's associated + sources and fix common paths to make sure they respect the &os; + hierarchy.</entry> +</row> + +<row> + <entry><literal>qmail</literal></entry> + <entry>none, <literal>build</literal>, <literal>run</literal>, + <literal>both</literal>, <literal>vars</literal></entry> + <entry>Implies that the port uses <filename + role="package">mail/qmail</filename> in one way or another. With + the <literal>build</literal> argument, it implies <command>qmail</command> + as a build-time dependency. <literal>run</literal> implies a run-time + dependency. Using no argument or the <literal>both</literal> argument + implies both run-time and build-time dependencies. <literal>vars</literal> + will only set QMAIL variables for the port to use.</entry> +</row> diff --git a/en_US.ISO8859-1/htdocs/Makefile b/en_US.ISO8859-1/htdocs/Makefile index 0e2e854bf9..1bd755fb79 100644 --- a/en_US.ISO8859-1/htdocs/Makefile +++ b/en_US.ISO8859-1/htdocs/Makefile @@ -13,7 +13,6 @@ DOCS= about.xml DOCS+= administration.xml DOCS+= applications.xml DOCS+= art.xml -DOCS+= availability.xml DOCS+= docs.xml DOCS+= features.xml DOCS+= internet.xml @@ -45,7 +44,6 @@ DATA+= freebsd.css DATA+= google6bb24ed0b804d5e9.html DATA+= index.css DATA+= robots.txt -DATA+= vendors.html # Subdirectories # XML @@ -76,7 +74,6 @@ SUBDIR+= search SUBDIR+= security SUBDIR+= snapshots SUBDIR+= support -SUBDIR+= tutorials .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= doc SUBDIR+= ports diff --git a/en_US.ISO8859-1/htdocs/about.xml b/en_US.ISO8859-1/htdocs/about.xml index 72321f6302..8b6d49b99c 100644 --- a/en_US.ISO8859-1/htdocs/about.xml +++ b/en_US.ISO8859-1/htdocs/about.xml @@ -16,7 +16,8 @@ <h2>What is FreeBSD?</h2> <p>FreeBSD is an advanced operating system for x86 - compatible (including Pentium® and Athlon™), amd64 + compatible (including Pentium® and Athlon™), + amd64, x86-64 and x64 compatible (including Opteron™, Athlon™64, and EM64T), ARM, IA-64, PowerPC, PC-98 and UltraSPARC® architectures. It is derived from BSD, the version of diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml index 18f1d951e7..05ad8c7121 100644 --- a/en_US.ISO8859-1/htdocs/administration.xml +++ b/en_US.ISO8859-1/htdocs/administration.xml @@ -4,6 +4,10 @@ <!ENTITY title "FreeBSD Project Administration and Management"> ]> +<!-- NOTE: If any alias listed on this page is modified in the + /etc/aliases on the FreeBSD project's mail server, + then this page must be updated. --> + <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>&title;</title> @@ -57,8 +61,6 @@ <li><a href="#t-bugmeister">Bugmeisters & GNATS Administrators</a></li> <li><a href="#t-clusteradm">Cluster Administrators</a></li> - <li><a href="#t-pcvs">CVS ports Repository Managers</a></li> - <li><a href="#t-ncvs">CVS src Repository Managers</a></li> <li><a href="#t-cvsup-master">CVSup Mirror Site Coordinators</a></li> <li><a href="#t-dnsadm">DNS Administrators</a></li> @@ -67,6 +69,7 @@ <li><a href="#t-perforce-admin">Perforce Repository Administrators</a></li> <li><a href="#t-postmaster">Postmaster Team</a></li> + <li><a href="#t-subversion">Subversion Administrators</a></li> <li><a href="#t-webmaster">Webmaster Team</a></li> </ul> </li> @@ -126,10 +129,9 @@ <li>&a.tabthorpe; <<a href="mailto:tabthorpe@FreeBSD.org">tabthorpe@FreeBSD.org</a>></li> <li>&a.marcus; <<a href="mailto:marcus@FreeBSD.org">marcus@FreeBSD.org</a>></li> <li>&a.bapt; <<a href="mailto:bapt@FreeBSD.org">bapt@FreeBSD.org</a>></li> + <li>&a.bdrewery; <<a href="mailto:bdrewery@FreeBSD.org">bdrewery@FreeBSD.org</a>></li> <li>&a.decke; <<a href="mailto:decke@FreeBSD.org">decke@FreeBSD.org</a>></li> - <li>&a.beat; <<a href="mailto:beat@FreeBSD.org">beat@FreeBSD.org</a>></li> <li>&a.erwin; <<a href="mailto:erwin@FreeBSD.org">erwin@FreeBSD.org</a>></li> - <li>&a.linimon; <<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>></li> <li>&a.itetcu; <<a href="mailto:itetcu@FreeBSD.org">itetcu@FreeBSD.org</a>></li> <li>&a.miwi; <<a href="mailto:miwi@FreeBSD.org">miwi@FreeBSD.org</a>></li> </ul> @@ -157,7 +159,7 @@ </ul> <h3><a name="t-re-builder">Builders Release Engineering Team</a> - <<a href="mailto:re-builder@FreeBSD.org">re-builder@FreeBSD.org</a>></h3> + <<a href="mailto:re-builders@FreeBSD.org">re-builders@FreeBSD.org</a>></h3> <p>The builders release engineering team is responsible for building and packaging FreeBSD releases on the various supported @@ -233,10 +235,9 @@ <ul> <li>&a.benl; <<a href="mailto:benl@FreeBSD.org">benl@FreeBSD.org</a>></li> - <li>&a.bz; <<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>></li> - <li>&a.cperciva; <<a href="mailto:cperciva@FreeBSD.org">cperciva@FreeBSD.org</a>></li> + <li>&a.cperciva; <<a href="mailto:cperciva@FreeBSD.org">cperciva@FreeBSD.org</a>> (Officer Emeritus)</li> <li>&a.csjp; <<a href="mailto:csjp@FreeBSD.org">csjp@FreeBSD.org</a>></li> - <li>&a.delphij; <<a href="mailto:delphij@FreeBSD.org">delphij@FreeBSD.org</a>></li> + <li>&a.delphij; <<a href="mailto:delphij@FreeBSD.org">delphij@FreeBSD.org</a>> (Officer Deputy)</li> <li>&a.des; <<a href="mailto:des@FreeBSD.org">des@FreeBSD.org</a>></li> <li>&a.gavin; <<a href="mailto:gavin@FreeBSD.org">gavin@FreeBSD.org</a>></li> <li>&a.jonathan; <<a href="mailto:jonathan@FreeBSD.org">jonathan@FreeBSD.org</a>></li> @@ -246,6 +247,7 @@ <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>> (Officer)</li> <li>&a.stas; <<a href="mailto:stas@FreeBSD.org">stas@FreeBSD.org</a>></li> + <li>&a.trasz; <<a href="mailto:trasz@FreeBSD.org">trasz@FreeBSD.org</a>></li> </ul> <h3><a name="t-vendor">Vendor Relations</a> @@ -314,9 +316,7 @@ acted upon without the proper approval from the appropriate entity.</p> <ul> - <li>&a.markm; <<a href="mailto:markm@FreeBSD.org">markm@FreeBSD.org</a>></li> <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> - <li>&a.kensmith; <<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>></li> <li>&a.dhw; <<a href="mailto:dhw@FreeBSD.org">dhw@FreeBSD.org</a>></li> </ul> @@ -328,7 +328,6 @@ <ul> <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> - <li>&a.kensmith; <<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>></li> <li>&a.dhw; <<a href="mailto:dhw@FreeBSD.org">dhw@FreeBSD.org</a>></li> </ul> @@ -344,7 +343,6 @@ <li>&a.eadler; < <a href="mailto:eadler@FreeBSD.org">eadler@FreeBSD.org</a>></li> <li>&a.gavin; <<a href="mailto:gavin@FreeBSD.org">gavin@FreeBSD.org</a>></li> <li>&a.gonzo; <<a href="mailto:gonzo@FreeBSD.org">gonzo@FreeBSD.org</a>></li> - <li>&a.linimon; <<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>></li> </ul> <h3><a name="t-clusteradm">Cluster Administrators</a> @@ -368,44 +366,6 @@ <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> </ul> - <h3><a name="t-pcvs">CVS ports Repository Managers</a> - <<a href="mailto:pcvs@FreeBSD.org">pcvs@FreeBSD.org</a>></h3> - - <p>The CVS ports Repository Managers are allowed to directly modify the - repository without using the CVS tool. It is their responsibility to - ensure that technical problems that arise in the repository are - resolved quickly. The CVS ports repository managers have the - authority to back out commits if this is necessary to resolve a CVS - technical problem. Repo-copy requests should be directed to the - repository managers.</p> - - <ul> - <li>&a.marcus; <<a href="mailto:marcus@FreeBSD.org">marcus@FreeBSD.org</a>></li> - <li>&a.joe; <<a href="mailto:joe@FreeBSD.org">joe@FreeBSD.org</a>></li> - <li>&a.kuriyama; <<a href="mailto:kuriyama@FreeBSD.org">kuriyama@FreeBSD.org</a>></li> - <li>&a.markm; <<a href="mailto:markm@FreeBSD.org">markm@FreeBSD.org</a>></li> - <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> - </ul> - - <h3><a name="t-ncvs">CVS src Repository Managers</a> - <<a href="mailto:ncvs@FreeBSD.org">ncvs@FreeBSD.org</a>></h3> - - <p>The CVS src Repository Managers are allowed to directly modify the - repository without using the CVS tool. It is their responsibility to - ensure that technical problems that arise in the repository are - resolved quickly. The CVS source repository managers have the - authority to back out commits if this is necessary to resolve a CVS - technical problem. Repo-copy requests should be directed to the - repository managers.</p> - - <ul> - <li>&a.joe; <<a href="mailto:joe@FreeBSD.org">joe@FreeBSD.org</a>></li> - <li>&a.kuriyama; <<a href="mailto:kuriyama@FreeBSD.org">kuriyama@FreeBSD.org</a>></li> - <li>&a.markm; <<a href="mailto:markm@FreeBSD.org">markm@FreeBSD.org</a>></li> - <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> - <li>&a.peter; <<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>></li> - </ul> - <h3><a name="t-cvsup-master">CVSup Mirror Site Coordinators</a> <<a href="mailto:cvsup-master@FreeBSD.org">cvsup-master@FreeBSD.org</a>></h3> @@ -417,7 +377,6 @@ <ul> <li>&a.kuriyama; <<a href="mailto:kuriyama@FreeBSD.org">kuriyama@FreeBSD.org</a>></li> - <li>&a.jdp; <<a href="mailto:jdp@FreeBSD.org">jdp@FreeBSD.org</a>></li> <li>&a.kensmith; <<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>></li> </ul> @@ -429,10 +388,10 @@ services.</p> <ul> - <li>&a.dg; <<a href="mailto:dg@FreeBSD.org">dg@FreeBSD.org</a>></li> - <li>&a.ps; <<a href="mailto:ps@FreeBSD.org">ps@FreeBSD.org</a>></li> - <li>&a.kensmith; <<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>></li> + <li>&a.brd; <<a href="mailto:brd@FreeBSD.org">brd@FreeBSD.org</a>></li> + <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> <li>&a.peter; <<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>></li> + <li>&a.bz; <<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>></li> </ul> <h3><a name="t-mirror-admin">FTP/WWW Mirror Site Coordinators</a> @@ -445,8 +404,11 @@ the general public to find their closest FTP/WWW mirror.</p> <ul> + <li>&a.brd; <<a href="mailto:brd@FreeBSD.org">brd@FreeBSD.org</a>></li> <li>&a.kuriyama; <<a href="mailto:kuriyama@FreeBSD.org">kuriyama@FreeBSD.org</a>></li> + <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> <li>&a.kensmith; <<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>></li> + <li>&a.bz; <<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>></li> </ul> <h3><a name="t-perforce-admin">Perforce Repository Administrators</a> @@ -459,12 +421,11 @@ administrators.</p> <ul> - <li>&a.scottl; <<a href="mailto:scottl@FreeBSD.org">scottl@FreeBSD.org</a>></li> + <li>&a.gibbs; <<a href="mailto:gibbs@FreeBSD.org">gibbs@FreeBSD.org</a>></li> <li>&a.kensmith; <<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>></li> <li>&a.gordon; <<a href="mailto:gordon@FreeBSD.org">gordon@FreeBSD.org</a>></li> <li>&a.rwatson; <<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>></li> <li>&a.peter; <<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>></li> - <li>&a.dhw; <<a href="mailto:dhw@FreeBSD.org">dhw@FreeBSD.org</a>></li> </ul> <h3><a name="t-postmaster">Postmaster Team</a> @@ -483,6 +444,17 @@ <li>&a.dhw; <<a href="mailto:dhw@FreeBSD.org">dhw@FreeBSD.org</a>></li> </ul> + <h3><a name="t-subversion">Subversion Administrators</a> <svnadm@></h3> + + <p>The FreeBSD Subversion team is responsible for maintaining the health of + the Subversion Repositories.</p> + + <ul> + <li>&a.bz; <<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>></li> + <li>&a.peter; <<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>></li> + <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> + </ul> + <h3><a name="t-webmaster">Webmaster Team</a> <<a href="mailto:webmaster@FreeBSD.org">webmaster@FreeBSD.org</a>></h3> @@ -498,6 +470,7 @@ <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> <li>&a.jesusr; <<a href="mailto:jesusr@FreeBSD.org">jesusr@FreeBSD.org</a>></li> <li>&a.wosch; <<a href="mailto:wosch@FreeBSD.org">wosch@FreeBSD.org</a>></li> + <li>&a.don; <<a href="mailto:don@FreeBSD.org">don@FreeBSD.org</a>></li> </ul> </body> diff --git a/en_US.ISO8859-1/htdocs/advocacy/index.xml b/en_US.ISO8859-1/htdocs/advocacy/index.xml index 1681dad7cb..c0f6ca9098 100644 --- a/en_US.ISO8859-1/htdocs/advocacy/index.xml +++ b/en_US.ISO8859-1/htdocs/advocacy/index.xml @@ -29,6 +29,11 @@ <h2>Web resources</h2> <ul> + <li><p><a href="&base;/news/status/status.html">FreeBSD quarterly status reports</a></p> + + <p>Quarterly status reports detailing activity within and surrounding FreeBSD.</p></li> + </ul> + <ul> <li><p><a href="whyusefreebsd.html">Why Use FreeBSD?</a></p> <p>Explanations given by existing users as to why FreeBSD should diff --git a/en_US.ISO8859-1/htdocs/availability.xml b/en_US.ISO8859-1/htdocs/availability.xml deleted file mode 100644 index e9415932e7..0000000000 --- a/en_US.ISO8859-1/htdocs/availability.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN" -"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [ -<!ENTITY title "About FreeBSD's availability"> -]> - -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="refresh" content="5;url=&base;/index.html"/> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> - - <title>&title;</title> - - <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword> - - </head> - - <body class="navinclude.about"> - - <p>The content of this page has been integrated into the <a - href="&base;/index.html">main FreeBSD webpage</a>. You should - be automatically redirected there in a few seconds. If not, - please follow the link and update your bookmarks.</p> - - <p>We apologize for the inconvenience.</p> - </body> -</html> diff --git a/en_US.ISO8859-1/htdocs/cgi/query-pr.cgi b/en_US.ISO8859-1/htdocs/cgi/query-pr.cgi index 613677a88d..39bdb26053 100755 --- a/en_US.ISO8859-1/htdocs/cgi/query-pr.cgi +++ b/en_US.ISO8859-1/htdocs/cgi/query-pr.cgi @@ -198,6 +198,7 @@ sub main $patch->filename; print $patch->data; + print "\n"; Exit(); } diff --git a/en_US.ISO8859-1/htdocs/developers/cvs.xml b/en_US.ISO8859-1/htdocs/developers/cvs.xml index d4886c9b96..51dff9bc83 100644 --- a/en_US.ISO8859-1/htdocs/developers/cvs.xml +++ b/en_US.ISO8859-1/htdocs/developers/cvs.xml @@ -24,8 +24,11 @@ <p>In June 2008, development of the base system moved to a different version control system, <a href="http://subversion.tigris.org/">Subversion</a> (SVN for short). The <a href="http://svnweb.FreeBSD.org/base/">web - interface</a> is available for browsing the repository. All changes are - also exported back to the CVS repository.</p> + interface</a> is available for browsing the repository. All changes + to the existing live branches (stable/9 and stable/8) are + also exported back to the legacy CVS repository, however the + CVS repositories are deprecated, and so existing users of them + should move away from doing so.</p> <p>In May 2012, the FreeBSD Documentation Project moved from CVS to Subversion. Unlike the base system, the documentation SVN @@ -35,11 +38,11 @@ Project SVN repository.</p> <p>In July 2012, the FreeBSD Ports tree moved from CVS to - Subversion. There is a <a - href="http://svnweb.FreeBSD.org/ports/">web interface</a> for - browsing the repository. The Ports tree is also exported back - to the CVS repository. - It will cease to be exported early 2013.</p> + Subversion. There is a <a + href="http://svnweb.FreeBSD.org/ports/">web interface</a> for + browsing the repository. The Ports tree is also exported back + to the legacy CVS repository. + It will cease to be exported early 2013.</p> <h2>Legacy - CVS</h2> @@ -50,14 +53,14 @@ the sources under control.</p> <p>The old web interface can be accessed at <a - href="http://www.freebsd.org/cgi/cvsweb.cgi/">the cvsweb instance - </a>.</p> + href="http://www.freebsd.org/cgi/cvsweb.cgi/">the cvsweb instance + </a>.</p> <h2>Other options</h2> <p><a href="&base;/doc/en_US.ISO8859-1/books/handbook/ctm.html"> - CTM</a> if you are looking for - very low overhead, batch-mode access (basically, patches through - email).</p> + CTM</a> if you are looking for + very low overhead, batch-mode access (basically, patches through + email).</p> </body> </html> diff --git a/en_US.ISO8859-1/htdocs/docs/books.xml b/en_US.ISO8859-1/htdocs/docs/books.xml index 125ed3c513..104536298f 100644 --- a/en_US.ISO8859-1/htdocs/docs/books.xml +++ b/en_US.ISO8859-1/htdocs/docs/books.xml @@ -147,11 +147,6 @@ An article with some tips about the subtleties of CVSup.</p> - <p><a href="&url.articles;/euro/index.html">The Euro symbol - on FreeBSD</a> (euro)<br/> - How to configure FreeBSD and related applications to display the - Euro symbol.</p> - <p><a href="&url.articles;/explaining-bsd/index.html">Explaining BSD</a> (explaining-bsd)<br/> An answer to the question ``What is BSD?''</p> @@ -410,12 +405,12 @@ </li> <li> - <p><a href="http://software.intel.com/sites/oss/pdfs/profiling_debugging_freebsd_kernel_321772.pdf">Profiling + <p><a href="http://software.intel.com/sites/default/files/profiling_debugging_freebsd_kernel_321772.pdf">Profiling and Debugging the FreeBSD Kernel</a></p> </li> <li> - <p><a href="http://software.intel.com/sites/oss/pdfs/debugging_buffer_overruns_322486.pdf">Debugging + <p><a href="http://software.intel.com/sites/default/files/debugging_buffer_overruns_322486.pdf">Debugging Buffer Overruns in the FreeBSD Kernel</a></p> </li> diff --git a/en_US.ISO8859-1/htdocs/features.xml b/en_US.ISO8859-1/htdocs/features.xml index 6ff63d636f..fe79b9a7eb 100644 --- a/en_US.ISO8859-1/htdocs/features.xml +++ b/en_US.ISO8859-1/htdocs/features.xml @@ -58,6 +58,7 @@ functions with hook points of interest within the kernel. These allow a structured way to dynamically extend the kernel at runtime in an ABI preserving manner.</li> + <li><b>Accounting API:</b> has been implemented. It can keep per-process, per-jail, and per-login class resource accounting information. Note that this is neither built nor @@ -96,15 +97,15 @@ net.inet.tcp.cc.algorithm.</li> <li><b>SU+J:</b> &os;'s Fast File System now supports soft - updates with journaling. It introduces an intent log into a - softupdates-enabled file system which eliminates the need for - background fsck(8) even on unclean shutdowns.</li> + updates with journaling. It introduces an intent log into + a softupdates-enabled file system which eliminates the need + for background fsck(8) even on unclean shutdowns.</li> </ul> - <p><b>&os; 8.x</b> brings many new + <p><b>&os; 8.x</b> brought many new features and performance enhancements. With special focus on - a new USB stack, &os;-8.x shipped with experimental support - for NFSv4. As well as a new TTY layer. Which improves + a new USB stack, &os;-8.x also shipped with experimental support + for NFSv4. A new TTY layer was introduced, which improves scalability and resources handling in SMP enabled systems.</p> <ul> @@ -117,6 +118,12 @@ benchmarks on SMP machines show substantial performance improvement over the previous version.</li> + <li><b>Jail improvements:</b> Jails now support multiple IPv4 + and IPv6 addresses per jail, and also support SCTP. + Hierarchies of jails (jails-within-jails) are now supported, + and jails can now be restricted to subsets of available + CPUs.</li> + <li><b>Linux emulation:</b> layer has been updated to version 2.6.16 and the default Linux infrastructure port is now emulators/linux_base-f10 (Fedora 10)</li> diff --git a/en_US.ISO8859-1/htdocs/gnome/index.xsl b/en_US.ISO8859-1/htdocs/gnome/index.xsl index 4204f5fe0c..69d7bdc287 100644 --- a/en_US.ISO8859-1/htdocs/gnome/index.xsl +++ b/en_US.ISO8859-1/htdocs/gnome/index.xsl @@ -130,8 +130,8 @@ <h2>State of the port</h2> <p>GNOME for FreeBSD is currently fully supported on - 8.1, 8.2, 8-STABLE, 9.0, and 9-STABLE, while 7.3, 7.4, 7-STABLE, - and 10.0-CURRENT are provided on a best effort basis. + 8.3, 8-STABLE, 9.0, 9.1, and 9-STABLE, while + 10.0-CURRENT is provided on a best effort basis. Most of GNOME has been ported to FreeBSD, but there is still <a href="docs/volunteer.html">plenty left to be done</a>!</p> diff --git a/en_US.ISO8859-1/htdocs/index.xsl b/en_US.ISO8859-1/htdocs/index.xsl index 6f98cc20a0..e4f7f6154d 100644 --- a/en_US.ISO8859-1/htdocs/index.xsl +++ b/en_US.ISO8859-1/htdocs/index.xsl @@ -82,9 +82,9 @@ <h2><a href="&base;/releases/">LATEST RELEASES</a></h2> <ul id="frontreleaseslist"> <li>Production: <a - href="&u.rel.announce;">&rel.current;</a>, <a href="&u.rel2.announce;">&rel2.current;</a></li> + href="&u.rel.announce;">&rel.current;</a></li> <li>Legacy: <a - href="&u.rel3.announce;">&rel3.current;</a></li> + href="&u.rel2.announce;">&rel2.current;</a></li> <xsl:if test="'&beta.testing;' != 'IGNORE'"> <li>Upcoming: <a href="&base;/where.html#helptest">&betarel.current;-&betarel.vers;</a></li> diff --git a/en_US.ISO8859-1/htdocs/internal/Makefile b/en_US.ISO8859-1/htdocs/internal/Makefile index e619c1a05d..1debfc3387 100644 --- a/en_US.ISO8859-1/htdocs/internal/Makefile +++ b/en_US.ISO8859-1/htdocs/internal/Makefile @@ -22,6 +22,7 @@ DOCS+= machines.xml DOCS+= mirror.xml DOCS+= new-account.xml DOCS+= policies.xml +DOCS+= proposing-committers.xml DOCS+= releng.xml DOCS+= resources.xml DOCS+= statistic.xml diff --git a/en_US.ISO8859-1/htdocs/internal/README.mirror b/en_US.ISO8859-1/htdocs/internal/README.mirror index 300529ad97..11ac2a5b87 100644 --- a/en_US.ISO8859-1/htdocs/internal/README.mirror +++ b/en_US.ISO8859-1/htdocs/internal/README.mirror @@ -1,17 +1,17 @@ -You can (and are encouraged to) mirror the pages with CVSup. +You can mirror the web pages with csup. If you are running apache as installed from the ports collection the following should make a copy of www.freebsd.org available from http://wwwN.XX.freebsd.org/. Of course, there are possible variations on the method... -1) The CVSup file to get the WWW pages +1) The csup file to get the WWW pages (/usr/local/www/data/freebsd.cvsup in the next step): -www release=current host=cvsup.freebsd.org hostbase=/home base=/usr prefix=/usr/local/www/data/www.freebsd.org delete old use-rel-suffix +www release=current host=cvsup.freebsd.org base=/usr prefix=/usr/local/www/data/www.freebsd.org delete use-rel-suffix 2) Add to /etc/crontab -1 5 * * * root /usr/local/bin/cvsup -z -g /usr/local/www/data/freebsd.cvsup +1 5 * * * root /usr/bin/csup -z -g /usr/local/www/data/freebsd.cvsup 2) Add to /usr/local/etc/apache/access.conf: diff --git a/en_US.ISO8859-1/htdocs/internal/about.xml b/en_US.ISO8859-1/htdocs/internal/about.xml index 4fea2bbef2..a8eb36f41b 100644 --- a/en_US.ISO8859-1/htdocs/internal/about.xml +++ b/en_US.ISO8859-1/htdocs/internal/about.xml @@ -117,7 +117,7 @@ Building and updating the FreeBSD Web Pages</a></h2> href="http://www.freebsd.org/build/index.cgi">here</a>.</p> <h2>Mirroring the FreeBSD Web Pages</h2> - <p>You can (and are encouraged to) <a href="mirror.html">mirror</a> + <p>It is possible to <a href="mirror.html">mirror</a> the FreeBSD web pages on www.FreeBSD.org.</p> <p></p><a href="internal.html">FreeBSD Internal Home</a> diff --git a/en_US.ISO8859-1/htdocs/internal/fortunes.xml b/en_US.ISO8859-1/htdocs/internal/fortunes.xml index 5ba6369ef8..6b39d7a356 100644 --- a/en_US.ISO8859-1/htdocs/internal/fortunes.xml +++ b/en_US.ISO8859-1/htdocs/internal/fortunes.xml @@ -23,7 +23,7 @@ <p>If an entry offends more than a couple of FreeBSD committers and does not contain any reasonable historical reference, the entry should - be in the offensive file. The speaker of the quote is not to be the + not be added. The speaker of the quote is not to be the basis for categorizing the quote as offensive.</p> <p>Examples of offensive entries:</p> diff --git a/en_US.ISO8859-1/htdocs/internal/mirror.xml b/en_US.ISO8859-1/htdocs/internal/mirror.xml index c602b217b4..c94e45d18f 100644 --- a/en_US.ISO8859-1/htdocs/internal/mirror.xml +++ b/en_US.ISO8859-1/htdocs/internal/mirror.xml @@ -13,42 +13,27 @@ <body class="navinclude.docs"> -<p>You can (and are encouraged to) mirror the FreeBSD web pages +<p>It is possible to mirror the FreeBSD web pages <tt>www.FreeBSD.org</tt>. -To do this, you need to obtain and install -a program called <em>cvsup</em> on your web server. +This can be done using a program called <em>csup</em>. -<a href="&url.doc.base;/books/handbook/cvsup.html#CVSUP-INSTALL">CVSup</a> is a software package for +csup is a software package in the base system for distributing and updating collections of files across a network.</p> -<h2>Installing CVSup</h2> - -<p>You can build and install it from source by the following commands:</p> - -<pre> - # cd /usr/ports/net/cvsup-without-gui - # make all install clean -</pre> - -<p>However, installing precompiled package from the FreeBSD -<a href="&url.doc.base;/books/handbook/packages-using.html">packages -collection</a> may be much easier. -Refer to the chapter mentioned for the details.</p> - -<h2>Running CVSup</h2> +<h2>Running csup</h2> <p>If you keep your mirrored FreeBSD web pages in the directory <tt>/usr/FreeBSD-mirror</tt> and are owned by the user `fred', then run the following command as user `fred':</p> <pre> - $ cvsup supfile-www + $ csup supfile-www </pre> The file <tt>supfile-www</tt> contain: <pre> - *default host="cvsup".FreeBSD.org + *default host=cvsup.FreeBSD.org *default prefix=/usr/FreeBSD-mirror *default base=/usr/local/etc/cvsup www release="current" delete use-rel-suffix compress @@ -56,13 +41,7 @@ The file <tt>supfile-www</tt> contain: <p>This will mirror the FreeBSD web pages into <tt>/usr/FreeBSD-mirror</tt>. You can install this into fred's -crontab, so that it runs once a day. The pages on www.FreeBSD.org are -updated daily at about 4:30am California time.</p> - -<h2>More Information on CVSup</h2> - -See the <a href="&url.doc.base;/books/handbook/synching.html#CVSUP">CVSup introduction</a> in the -handbook. +crontab, so that it runs once a day.</p> <p><a href="internal.html">FreeBSD Internal Home</a></p> diff --git a/en_US.ISO8859-1/htdocs/internal/new-account.xml b/en_US.ISO8859-1/htdocs/internal/new-account.xml index a6e03b72ef..fb135da03e 100644 --- a/en_US.ISO8859-1/htdocs/internal/new-account.xml +++ b/en_US.ISO8859-1/htdocs/internal/new-account.xml @@ -29,7 +29,9 @@ <p>Any commit bit requests that do not follow the guidelines outlined above will be delayed (at best) or earn you negative vibrations from the - respective team / team secretary. + respective team / team secretary. For some guidelines on how the + proposal itself should be written, please see <a + href="proposing-committers.html">a brief summary</a>. </p> <p>Responsible party for this procedure is:</p> @@ -73,11 +75,18 @@ and send the following information to accounts@:</p> <ul> - <li><p><tt>master.passwd</tt> line containing preferred username, - shell, and GECOS info (no password is needed)</p></li> + <li><p>username (lowercase a-z and 0-9)</p></li> + <li><p>Full Name (as would go in a GECOS field)</p></li> + <li><p>optional additional GECOS information (phone, location etc)</p></li> + <li><p>shell (sh, csh/tcsh, bash, zsh are available)</p></li> <li><p>ssh V2 public key (<strong>version 2 ONLY</strong>)</p></li> </ul> + <p>Any non-ASCII characters for the <em>Full Name</em> field should be encoded + in UTF-8. Be aware that we have very limited support for this and caution + that they are likely to be frequently corrupted. The number of characters + should kept to a minimum.</p> + <p>The mentor is responsible for obtaining this information from the new committer in a secure fashion, and providing it to accounts@ in a secure fashion. PGP-signed email, with the mentor's public key @@ -102,9 +111,9 @@ <p>After the new committer confirms that the account works, the mentor adds the new committer to the correct <tt>access</tt> file, using an appropriate commit message. The commit message should at least - contain the committer's full name, the mentor's name and what area - the new committer will start to work in. For src and doc commit - bits, an entry should also be added to the <tt>mentors</tt> file in + contain the committer's full name and username, the mentor's + name and what area the new committer will start to work in. + An entry should also be added to the <tt>mentors</tt> file in the respective Subversion repository to indicate the mentor relationship. Having done all that, the new committer and mentor jointly go through the first commit @@ -121,19 +130,15 @@ <p>There is no pre-set duration for a mentorship. Once the mentor feels the mentee is ready to 'fly solo' the mentor notifies the developer - community by removing the entry from the <tt>mentors</tt> file in SVN, - or via a forced commit to <tt>access</tt> in CVS with an appropriate - commit message.</p> + community by removing the entry from the <tt>mentors</tt> file in + SVN.</p> <h2>Transfer Of Mentorship</h2> <p>Should a need arise to transfer mentorship for a committer please email the responsible party, as described for a new account proposal. Typically this request is rubberstamped as-is. - In Subversion, the <tt>mentors</tt> file should be updated. - In CVS, a forced commit to <tt>access</tt> with an appropriate commit - message is to be used to inform the world of the transfer.</p> - + In Subversion, the <tt>mentors</tt> file should be updated.</p> </body> </html> diff --git a/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml b/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml new file mode 100644 index 0000000000..2662ac80f0 --- /dev/null +++ b/en_US.ISO8859-1/htdocs/internal/proposing-committers.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN" +"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [ +<!ENTITY title "Proposing Committers"> +]> + +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title>&title;</title> + + <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword> + </head> + + <body class="navinclude.docs"> + +<p>The following paragraphs contain an advice from &a.kib;, member of + the Core Team, who summarizes what constitutes a good proposal, how + you as potential mentor, could increase your chances to have your + mentee granted a commit bit.</p> + +<p>When proposing somebody, you should just forget for a moment that you + know the candidate personally. After that, look unprejudiced on the + person's activity on the mailing lists, and evaluate the patches + submitted.</p> + +<p>Now, you can ask yourself, is it enough confidence in both technical + abilities and the social behavior of the candidate, from what you see + only on the media? If you do, then write down the reasons why are + you sure, using the said list of the contributions as the evidence, + and do include the reasoning in the commit bit application.</p> + +<p>Due to several failures of the premature granting of commit bits, the + Core Team became quite sensitive to these criteria. Most of the + members only see the activity of applicants on the lists, and not + seeing much there causes the cautious choice.</p> + +<p>The Core Team wants to see a good list of the work already done for + &os; (e.g., the long list of the commits, submitted by the applicant, + the list of PRs opened etc.), which can make us confident that the + person has an established interest in the project, backed by the + technical ability and work done.</p> + +<p>Also, the history of the good engagement with the community on the + public media, such as mailing list, is a deciding factor too. The + Core Team wants to filter out the controversial personalities, since + it is almost impossible and highly undesirable to revoke the commit + bit, once granted.</p> + +<p>Vendor-proposed maintainers for the hardware drivers usually approved + without applying the listed criteria. Still, the Core Team requires + an experienced mentor for a vendor committer to avoid unwanted tension + and to make sure that vendor commits follow the Project procedures and + community expectations.</p> + + </body> +</html> diff --git a/en_US.ISO8859-1/htdocs/layout/css/layout.css b/en_US.ISO8859-1/htdocs/layout/css/layout.css index 379812a48e..dbb8b11ead 100644 --- a/en_US.ISO8859-1/htdocs/layout/css/layout.css +++ b/en_US.ISO8859-1/htdocs/layout/css/layout.css @@ -401,9 +401,6 @@ padding: 0; width: 130px; background-color: #D8D8D8; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - -khtml-border-radius: 10px; border-radius: 10px; } @@ -436,9 +433,6 @@ padding: 0; width: 180px; background-color: white; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - -khtml-border-radius: 10px; border-radius: 10px; } @@ -472,9 +466,6 @@ padding: 0; width: 190px; background-color: #FACC2E; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - -khtml-border-radius: 10px; border-radius: 15px; } diff --git a/en_US.ISO8859-1/htdocs/news/2012-compromise.xml b/en_US.ISO8859-1/htdocs/news/2012-compromise.xml index c0f82599d8..0802682ebe 100644 --- a/en_US.ISO8859-1/htdocs/news/2012-compromise.xml +++ b/en_US.ISO8859-1/htdocs/news/2012-compromise.xml @@ -62,6 +62,7 @@ <ul> <li><a href="#announce">Announcement</a></li> + <li><a href="#update20130303">Update: 3rd March 2013</a></li> <li><a href="#update20121229">Update: 29th December 2012</a></li> <li><a href="#update20121127">Update: 27th November 2012</a></li> <li><a href="#update20121122">Update: 22nd November 2012</a></li> @@ -72,6 +73,27 @@ <li><a href="#recommend">Recommendations</a></li> </ul> + <h1><a name="update20130302">Update: March 3rd, 2013</a></h1> + + <p>Redports underwent a full security audit, and as a result could + be brought back on line. This took place on the 5th February, and + since then more backend hardware has been added to bring it back + up to full strength. On 11th February, sanity checks for ports + have been turned back on, reenabling generation and update of the + INDEX files used. The portsnap(8) service has been switched from + CVS to SVN on 25th February. The binary package building + infrastructure has undergone a major security review, and as a + result many changes have been made to the code. The review + completed on the 16th February and we are now in the process of + bringing it up on new hardware. At this point, we expect new + binary packages to be available in 2-4 weeks.</p> + + <p>Unless there are any other major changes, this is planned to be + the last status update to this page. An email will be sent to + the <a href="http://lists.freebsd.org/mailman/listinfo/freebsd-announce"> + FreeBSD announcements mailing list</a> when the package build + infrastructure is online and packages are once again available.</p> + <h1><a name="update20121229">Update: December 29th, 2012</a></h1> <p>With the exception of systems relating to the building and testing @@ -94,12 +116,6 @@ <a href="/doc/handbook/ports-using.html"> FreeBSD Handbook</a>.</p> - <p>Unless there are any other major changes, this is planned to be - the last status update to this page. An email will be sent to - the <a href="http://lists.freebsd.org/mailman/listinfo/freebsd-announce"> - FreeBSD announcements mailing list</a> when the package build - infrastructure is online and packages are once again available.</p> - <h1><a name="update20121127">Update: November 27th, 2012</a></h1> <p>Due to the legacy third-party package build controller head diff --git a/en_US.ISO8859-1/htdocs/news/status/Makefile b/en_US.ISO8859-1/htdocs/news/status/Makefile index f127e87653..197874b7f2 100644 --- a/en_US.ISO8859-1/htdocs/news/status/Makefile +++ b/en_US.ISO8859-1/htdocs/news/status/Makefile @@ -56,6 +56,8 @@ XMLDOCS+= report-2011-07-2011-09 XMLDOCS+= report-2011-10-2011-12 XMLDOCS+= report-2012-01-2012-03 XMLDOCS+= report-2012-04-2012-06 +XMLDOCS+= report-2012-07-2012-09 +XMLDOCS+= report-2012-10-2012-12 XSLT.DEFAULT= report.xsl diff --git a/en_US.ISO8859-1/htdocs/news/status/README b/en_US.ISO8859-1/htdocs/news/status/README index 612a26d0e0..936a6bc8f0 100644 --- a/en_US.ISO8859-1/htdocs/news/status/README +++ b/en_US.ISO8859-1/htdocs/news/status/README @@ -25,7 +25,7 @@ Compiling status reports - best practices 4) Putting it all together: - Copy and paste all reports in a single .xml file and use tidy(1) to get - it well formatted. Usually <url>'s without a description are missing + it well formatted. Usually <url>s without a description are missing the closing "/>" which is the cause for most of the errors you will encounter. Sometimes other closing tags are missing. - Invoking tidy with the following options seems to cause the fewest @@ -44,7 +44,7 @@ Compiling status reports - best practices </ul> <p>Some more blabla ... -5) After the a couple iterations of the above, wrap the whole thing in a +5) After a couple of iterations of the above, wrap the whole thing in a report template: <?xml version="1.0" encoding="iso-8859-1" ?> @@ -136,14 +136,11 @@ Report//EN" the html helps. Make sure you have an up-to-date doc tree. 6) Sending it out: - - Just prior to committing, build the html locally. - - Extract a text version: lynx -dump -nolist report.html > report.txt - - Prettify. - - Send out To: hackers, CC: current, stable. New email to: announce@ this - one needs to be approved. Find somebody who can do that before you - start. - - Commit. Also update the next due date in status.sgml and link to the - new report. + - Commit, hooking the report XML to the build but not linking to it + from anywhere. This gives time for other committers to review and + suggest minor changes. + - After a few days, collate and commit the changes. Also update the + next due date in status.xml and link to the new report. - Add a news entry to head/share/xml/news.xml. Template: <event> <title>June-October, 2006 Status Report</title> @@ -152,5 +149,10 @@ Report//EN" href="&enbase;/news/status/report-2006-06-2006-10.html">now available</a> with 49 entries.</p> </event> + - Extract a text version with the command + lynx -dump -nolist report.html > report.txt and prettify it. + - Send out To: hackers, CC: current, stable. New email to: announce@. + This needs to be approved, so find someone who can do that before you + start. 7) Repeat. diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml b/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml index 3f9ff9acab..2aa8355586 100644 --- a/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml +++ b/en_US.ISO8859-1/htdocs/news/status/report-2012-04-2012-06.xml @@ -16,7 +16,7 @@ Report//EN" "http://www.FreeBSD.org/XML/www/share/xml/statusreport.dtd"> 2012. This quarter was highlighted by having a new Core Team elected, which took office on July 11th to start its work with a relatively high number of new members. Note that this is the - second of the three reports planned for 2012.</p> + second of the four reports planned for 2012.</p> <p>Thanks to all the reporters for the excellent work! This report contains 17 entries and we hope you enjoy reading it.</p> @@ -524,7 +524,7 @@ Report//EN" "http://www.FreeBSD.org/XML/www/share/xml/statusreport.dtd"> <task>Test KDE SC 4.8.95.</task> <task>Test KDE PIM 4.8.95.</task> <task>Update out-of-date ports, see <a - href="http://portscout.org/kde@freebsd.org.html">PortScout</a> for a + href="http://portscout.FreeBSD.org/kde@freebsd.org.html">PortScout</a> for a list.</task> </help> </project> diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml b/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml new file mode 100644 index 0000000000..9556c1f6ea --- /dev/null +++ b/en_US.ISO8859-1/htdocs/news/status/report-2012-07-2012-09.xml @@ -0,0 +1,713 @@ +<?xml version="1.0" encoding="iso-8859-1" ?> +<!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status Report//EN" "http://www.FreeBSD.org/XML/www/share/xml/statusreport.dtd" > +<!-- $FreeBSD$ --> +<report> + <date> + <month>July-September</month> + + <year>2012</year> + </date> + + <section> + <title>Introduction</title> + + <p>This report covers &os;-related projects between July and + September 2012. This is the third of the four reports planned for + 2012.</p> + + <p>Highlights from this quarter include successful participation in + Google Summer of Code, major work in areas of the source and + ports trees, and a Developer Summit attended by over 30 + developers.</p> + + <p>Thanks to all the reporters for the excellent work! This report + contains 12 entries and we hope you enjoy reading it.</p> + </section> + + <category> + <name>proj</name> + + <description>Projects</description> + </category> + + <category> + <name>team</name> + + <description>&os; Team Reports</description> + </category> + + <category> + <name>kern</name> + + <description>Kernel</description> + </category> + + <category> + <name>docs</name> + + <description>Documentation</description> + </category> + + <category> + <name>ports</name> + + <description>Ports</description> + </category> + + <category> + <name>misc</name> + + <description>Miscellaneous</description> + </category> + + <category> + <name>soc</name> + + <description>&os; in Google Summer of Code</description> + </category> + + <project cat='proj'> + <title>&os; on Altera FPGAs</title> + + <contact> + <person> + <name> + <given>Brooks</given> + <common>Davis</common> + </name> + <email>brooks@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Robert</given> + <common>Watson</common> + </name> + <email>rwatson@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Bjoern</given> + <common>Zeeb</common> + </name> + <email>bz@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.cl.cam.ac.uk/research/security/ctsrd/"> + CTSRD Project</url> + + <url + href="http://www.cl.cam.ac.uk/research/security/ctsrd/cheri.html"> + CHERI</url> + </links> + + <body> + <p>In the course of developing the <a + href="http://www.cl.cam.ac.uk/research/security/ctsrd/cheri.html"> + CHERI processor</a> as part of the <a + href="http://www.cl.cam.ac.uk/research/security/ctsrd/">CTSRD + project</a> SRI International's Computer Science Laboratory and + the University of Cambridge Computer Laboratory have developed + support for a number of general purpose IP cores for Altera FPGAs + including the Altera Triple Speed Ethernet (ATSE) MAC core, the + Altera University Program SD Card core, and the Altera JTAG UART. + We have also added support for general access to memory mapped + devices on the Avalon bus via the avgen bus. We have implemented + both nexus and flattened device tree (FDT) attachments for these + devices.</p> + + <p>In addition to these softcore we have developed support for + the Terasic multi-touch LCD and are working to provide support + for the Terasic HDMI Transmitter Daughter Card. Both of these + work with common development and/or reference boards for Altera + FPGAs. They do require additional IP cores which we plan to + release to the open source community in the near future.</p> + + <p>With exception of the ATSE and HDMI drivers we have merged all + of these changes to &os;-CURRENT. We anticipate that these + drivers will be useful for users who with to run &os; on either + hard or soft core CPUs on Altera FPGAs.</p> + + <p>This work has been sponsored by DARPA, AFRL, and Google.</p> + </body> + </project> + + <project cat='proj'> + <title>Native iSCSI Target</title> + + <contact> + <person> + <name> + <given>Edward Tomasz</given> + <common>Napierała</common> + </name> + <email>trasz@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>During the July-September time period, the Native iSCSI Target + project was officially started under sponsorship from the &os; + Foundation. Before the end of September I've written ctld(8), the + userspace part of the target, responsible for handling + configuration, accepting incoming connections, performing + authentication and iSCSI parameter negotiation, and handing off + connections to the kernel. For the time being, I've reused some + parts of protocol-handling code from the istgt project; since + ctld(8) only handles the Login phase, the code can be rewritten + in a much simpler and shorter way in the future.</p> + </body> + </project> + + <project cat='proj'> + <title>Parallel rc.d execution</title> + + <contact> + <person> + <name> + <given>Kuan-Chung</given> + <common>Chiu</common> + </name> + <email>buganini@gmail.com</email> + </person> + + <person> + <name> + <given>Kilian</given> + </name> + <email>kklimek@uos.de</email> + </person> + </contact> + + <links> + <url href="https://github.com/buganini/rcexecr" /> + <url href="https://github.com/kil/rcorder" /> + </links> + + <body> + <p>There are two implementations to make rc.d execution parallel. + Compared to Kil's rcorder, rcexecr brings more concurrence and + provides more flexibility than older "early_late_divider" + mechanism but require more invasive /etc patch. Both + implementations have switch to toggle parallel execution. Further + modification/integration needs more discussion.</p> + </body> + + <help> + <task>Refine /etc/rc.d/* to eliminate unnecessary waiting.</task> + </help> + </project> + + <project cat='team'> + <title>&os; Bugbusting Team</title> + + <contact> + <person> + <name> + <given>Eitan</given> + <common>Adler</common> + </name> + <email>eadler@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Gavin</given> + <common>Atkinson</common> + </name> + <email>gavin@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Oleksandr</given> + <common>Tymoshenko</common> + </name> + <email>gonzo@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.FreeBSD.org/support.html#gnats" /> + <url href="https://wiki.freebsd.org/BugBusting" /> + </links> + + <body> + <p>In August, Eitan Adler (eadler@) and Oleksandr Tymoshenko + (gonzo@) joined the Bugmeister team. At the same time, Remko + Lodder and Volker Werth stepped down. We extend our thanks to + Volker and Remko for their work in the past, and welcome + Oleksandr and Eitan. Eitan and Oleksandr have been working hard + on migrating from GNATS, and have made significant progress on + evaluating new software, and creating scripts to export data + from GNATS.</p> + + <p>The bugbusting team continue work on trying to make the + contents of the GNATS PR database cleaner, more accessible and + easier for committers to find and resolve PRs, by tagging PRs + to indicate the areas involved, and by ensuring that there is + sufficient info within each PR to resolve each issue.</p> + + <p>As always, anybody interested in helping out with the PR + queue is welcome to join us in #freebsd-bugbusters on EFnet. We + are always looking for additional help, whether your interests + lie in triaging incoming PRs, generating patches to resolve + existing problems, or simply helping with the database + housekeeping (identifying duplicate PRs, ones that have already + been resolved, etc). This is a great way of getting more + involved with &os;!</p> + </body> + + <help> + <task>Further research into tools suitable to replace + GNATS.</task> + + <task>Get more users involved with triaging PRs as they come + in.</task> + + <task>Assist committers with closing PRs.</task> + </help> + </project> + + <project cat='team'> + <title>The &os; Core Team</title> + + <contact> + <person> + <name> + <given>Core Team</given> + </name> + <email>core@FreeBSD.org</email> + </person> + </contact> + + <body> + <p>Along with the change in the Core Team membership, several + related roles changed hands. Gabor Pali assumed the role of core + secretary from Gavin Atkinson, and David Chisnall replaced Robert + Watson as liaison to the &os; Foundation. The Core Team felt + there was no longer a need for a formal security team liaison, so + that role was retired.</p> + + <p>In the third quarter, the Core Team granted access for 2 new + committers and took 2 commit bits into safekeeping.</p> + + <p>The Core Team worked with the Port Management Team and Cluster + Administrators to set a date to stop providing CVS exports for + the ports repository, which is February 28, 2013. In the + meantime, the CVS export for 9.1-RELEASE was restored.</p> + </body> + </project> + + <project cat='team'> + <title>&os; Foundation</title> + + <contact> + <person> + <name> + <given>Deb</given> + <common>Goodkin</common> + </name> + <email>deb@FreeBSDFoundation.org</email> + </person> + </contact> + + <links> + <url + href="http://www.freebsdfoundation.org/press/2012Jul-newsletter.shtml"> + Semi-annual newsletter</url> + </links> + + <body> + <p>The Foundation hosted and sponsored the Cambridge &os; + developer summit in August 2012.</p> + + <p>We were represented at the following conferences: OSCON July + 2012, Texas LinuxFest, and Ohio LinuxFest.</p> + + <p>We negotiated/supervised Foundation funded projects: + Distributed Security Audit Logging, Capsicum Component + Framework, Native iSCSI Target Scoping, and Growing UFS + Filesystems Online.</p> + + <p>We negotiated, supervised, and funded hardware needs for + &os; co-location centers.</p> + + <p>We welcomed Kirk McKusick to our board of directors. He took + over the responsibility of managing our investments.</p> + + <p>We visited companies to discuss their &os; use and to help + facilitate collaboration with the Project.</p> + + <p>We managed &os; vendor community mailing list and + meetings.</p> + + <p>We created a high quality &os; 9 brochure to help promote + &os;.</p> + + <p>Published our <a + href="http://www.freebsdfoundation.org/press/2012Jul-newsletter.shtml"> + semi-annual newsletter</a> that highlighted Foundation + funded projects, travel grants for + developers, conferences sponsored and other ways the Foundation + supported the &os; Project.</p> + + <p>We hired a technical writer to help with &os; + marketing/promotional material.</p> + + <p>We began work on redesigning our website.</p> + </body> + </project> + + <project cat='kern'> + <title>&os; on ARMv6/ARMv7</title> + + <contact> + <person> + <name> + <given>freebsd-arm mailing list</given> + </name> + <email>freebsd-arm@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>Support for ARMv6 and ARMv7 architecture has been merged from + project branch to HEAD. This code covers the following parts: + <ul> + <li>General ARMv6/ARMv7 kernel bits (pmap, cache, assembler + routines, etc...)</li> + <li>ARM Generic Interrupt Controller driver</li> + <li>Improved thread-local storage for cpus >=ARMv6</li> + <li>Driver for SMSC LAN95XX and LAN8710A ethernet controllers</li> + <li>Marvell MV78x60 support (multiuser, ARMADA XP kernel config)</li> + <li>TI OMAP4 and AM335x support (multiuser, no GPU or graphics + support, kernel configs for Pandaboard and Beaglebone)</li> + <li>LPC32x0 support (multiuser, frame buffer works with SSD1289 + LCD controller. Embedded Artists EA3250 kernel config)</li> + </ul> + </p> + + <p>This work was a result of a joint effort by many people, + including but not limited to: Grzegorz Bernacki (gber@), + Aleksander Dutkowski, Ben R. Gray (bgray@), Olivier Houchard + (cognet@), Rafal Jaworowski (raj@) and Semihalf team, Tim + Kientzle (kientzle@), Jakub Wojciech Klama (jceel@), Ian Lepore + (ian@), Warner Losh (imp@), Damjan Marion (dmarion@), Lukasz + Plachno, Stanislav Sedov (stas@), Mark Tinguely and Andrew + Turner (andrew@). Thanks to all, who contributed by + submitting code, testing and giving valuable advice.</p> + </body> + + <help> + <task>More hardware bring-ups and more drivers</task> + + <task>Finish SMP support</task> + + <task>VFP/NEON support</task> + </help> + </project> + + <project cat='docs'> + <title>The &os; Japanese Documentation Project</title> + + <contact> + <person> + <name> + <given>Hiroki</given> + <common>Sato</common> + </name> + <email>hrs@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Ryusuke</given> + <common>Suzuki</common> + </name> + <email>ryusuke@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.FreeBSD.org/ja/">Japanese &os; Web + Page</url> + + <url href="http://www.jp.FreeBSD.org/doc-jp/">The &os; Japanese + Documentation Project Web Page</url> + </links> + + <body> + <p>Web page (htdocs): Newsflash and some other updates in the + English version were translated to keep them up-to-date. + Especially "security incident on &os; infrastructure" was + translated and published in a timely manner.</p> + + <p>&os; Handbook: Big update in the "advanced-networking". With + this update, merging translation results from the handbook in the + local repository of Japanese documentation project into the main + repository was completed. This chapter is still outdated and + needs more work. The other sections have also constantly been + updated. Especially, new subsection "Using pkgng for Binary + Package Management" was added to "ports" section and "Using + subversion" subsection was added to "mirrors" section.</p> + + <p>Article: Some progress was made in "Writing &os; Problem + Reports" and "Writing &os; Problem Reports" articles.</p> + </body> + + <help> + <task>Further translation work of outdated documents in the + <tt>ja_JP.eucJP</tt> subtree.</task> + </help> + </project> + + <project cat='ports'> + <title>KDE/&os;</title> + + <contact> + <person> + <name> + <given>KDE</given> + <common>FreeBSD</common> + </name> + <email>kde@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://FreeBSD.kde.org">KDE/&os; home page</url> + <url href="http://FreeBSD.kde.org/area51.php">area51</url> + </links> + + <body> + <p>The KDE/&os; team have continued to improve the experience of + KDE software and Qt under &os;. The latest round of improvements + include: + <ul> + <li>Fixes for building Qt with libc++ and C++11</li> + + <li>Fixes for Solid-related crashes</li> + + <li>Fix battery detection in battery monitor plasmoid</li> + </ul> + </p> + + <p>The team has also made many releases and upstreamed many fixes + and patches. The latest round of releases include: + <ul> + <li>KDE SC: 4.9.1 (area51) and 4.8.4 (ports)</li> + + <li>Qt: 4.8.3 (area51)</li> + + <li>PyQt: 4.9.4 (area51); QScintilla 2.6.2 (area51); SIP: + 4.13.3 (area51)</li> + + <li>Calligra: 2.4.3, 2.5-RC2, 2.5.0. 2.5.1, 2.5.2 (area51) and + 2.4.3, 2.5.0, 2.5.1 (ports)</li> + + <li>Amarok: 2.6.0 (area51)</li> + + <li>CMake: 2.8.9 (ports)</li> + + <li>Digikam (and KIPI-plugins): 2.7.0, 2.8.0, 2.9.0 (area51) + and 2.7.0, 2.9.0 (ports)</li> + + <li>QtCreator: 2.6.0-beta (area51)</li> + + <li>many smaller ports</li> + </ul> + </p> + + <p>The team is always looking for more testers and porters so + please contact us at kde@FreeBSD.org and visit our home page at + <a href="http://FreeBSD.kde.org">http://FreeBSD.kde.org</a>.</p> + </body> + + <help> + <task>Please see 2012 Q4 Status Report</task> + + <task>Updating out-of-date ports, see + <a href="http://portscout.FreeBSD.org/kde@freebsd.org.html">PortScout</a> + for a list</task> + </help> + </project> + + <project cat='ports'> + <title>Ports Collection</title> + + <contact> + <person> + <name> + <given>Thomas</given> + <common>Abthorpe</common> + </name> + <email>portmgr-secretary@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Port</given> + <common>Management Team</common> + </name> + <email>portmgr@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.FreeBSD.org/ports/" /> + + <url href="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributing-ports/" /> + + <url href="http://portsmon.freebsd.org/index.html" /> + + <url href="http://www.freebsd.org/portmgr/index.html" /> + + <url href="http://blogs.freebsdish.org/portmgr/" /> + + <url href="http://www.twitter.com/freebsd_portmgr/" /> + + <url href="http://www.facebook.com/portmgr" /> + </links> + + <body> + <p>The ports tree approaches 24,000 ports, while the PR count + still is above 1000.</p> + + <p>In Q3 we added 2 new committers and took in two commits bit + for safe keeping.</p> + + <p>The Ports Management team had performed multiple -exp runs, + verifying how base system updates may affect the ports tree, + as well as providing QA runs for major ports updates.</p> + + <p>Beat Gaetzi took over the role of sending out fail mails, a + role that Pav Lucistnik had previously held. Beat also undertook + the task of converting the Ports tree from CVS to Subversion.</p> + + <p>Florent Thoumie stepped down from his role on portmgr, he was + instrumental in maintaining the legacy pkg_* code.</p> + </body> + + <help> + <task>Most ports PRs are assigned, we now need to focus on + testing, committing and closing.</task> + </help> + </project> + + <project cat='misc'> + <title>&os; Developer Summit, Cambridge, UK</title> + + <contact> + <person> + <name> + <given>Robert</given> + <common>Watson</common> + </name> + <email>rwatson@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="https://wiki.freebsd.org/201208DevSummit">Developer + Summit Home Page</url> + </links> + + <body> + <p>In the end of August, there was an "off-season" Developer + Summit held in Cambridge, UK at the University of Cambridge + Computer Laboratory. This was a three-day event, with a + documentation summit scheduled for the day before. The three + days of the main event were split into three sessions, with two + tracks in each. Some of them even involved ARM developers from + the neighborhoods which proven to be productive, and led to + further engagement between the &os; community and ARM.</p> + + <p>The schedule was finalized on the first day, spawning a + plethora of topics to discuss, followed by splitting into groups. + A short summary from each of the groups was presented in the + final session and then published at the event's home page on the + &os; wiki. This summit contributed greatly to arriving to a + tentative plan for throwing the switch to make clang the default + compiler on HEAD. This was further discussed on the mailing list, + and has now happened, bringing us one big step closer to a + GPL-free &os; 10. As part of the program, an afternoon of short + talks from researchers in the Cambridge Computer Laboratory + involved either operating systems work in general or &os; in + particular. Robert Watson showed off a tablet running &os; on a + MIPS-compatible soft-core processor running on an Altera + FPGA.</p> + + <p>In association with the event, a dinner was hosted by St. John's + college and co-sponsored by Google and the &os; Foundation. The + day after the conference, a trip was organized to Bletchley Park, + which was celebrating Turing's centenary in 2012.</p> + </body> + </project> + + <project cat='soc'> + <title>Google Summer of Code 2012</title> + + <contact> + <person> + <name> + <given> + </given> + <common>&os; Summer of Code Administrators</common> + </name> + <email>soc-admins@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.freebsd.org/projects/summerofcode.html"> + FreeBSD Summer of Code page</url> + + <url href="https://wiki.freebsd.org/SummerOfCode2012">Summer of + Code 2012 projects</url> + </links> + + <body> + <p>Over the Summer of 2012, &os; were once again granted a + place to participate in the Google Summer of Code program. We + received a total of 32 project proposals, and were ultimately + given 15 slots for university students to work on open source + projects mentored by existing &os; developers.</p> + + <p>We were able to accept a wide spread of proposals, covering + both the base system and the ports infrastructure. We had + students working on file systems, file integrity checking, and + parallelization in the ports collection. Students worked on + kernel infrastructure, including one project to support CPU + resource limits on users, processes and jails, and one student + improving the BSD callout(9) and timer facilities. Two students + worked on the ARM platform, widely used in embedded systems and + smart phones; one student worked on a significant cleanup and + improvements to the Flattened Device Tree implementation code, + while the other ported &os; to the OMAP3-based BeagleBoard-xM + device. One student worked on improving IPv6 support in + userland tools, whilst another worked on BIOS emulation for the + BHyVE BSD-licensed hypervisor, new in &os; 10. Other students + worked on EFI boot support, userland lock profiling and an + automated kernel crash reporting system.</p> + + <p>Overall, a significant proportion of the code produced has + or will be integrated into &os; in one form or another. All of + the work is available in our Summer Of Code Subversion + repository, and some of the work has already been merged back + into the main repositories.</p> + + <p>&os; is once again grateful to Google for being selected to + participate in Summer of Code 2012.</p> + </body> + </project> +</report> diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml b/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml new file mode 100644 index 0000000000..314d6cc8fe --- /dev/null +++ b/en_US.ISO8859-1/htdocs/news/status/report-2012-10-2012-12.xml @@ -0,0 +1,1456 @@ +<?xml version="1.0" encoding="iso-8859-1" ?> +<!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status Report//EN" "http://www.FreeBSD.org/XML/www/share/xml/statusreport.dtd" > +<!-- $FreeBSD$ --> +<report> + <date> + <month>October-December</month> + + <year>2012</year> + </date> + + <section> + <title>Introduction</title> + + <p>This report covers &os;-related projects between October and + December 2012. This is the last of four reports planned for 2012.</p> + + <p>Highlights from this status report include a very successful + EuroBSDCon 2012 conference and associated FreeBSD Developer Summit, + both held in Warsaw, Poland. Other highlights are several projects + related to the FreeBSD port to the ARM architecture, extending + support for platforms, boards and CPUs, improvements to the + performance of the pf(4) firewall, and a new native iSCSI target.</p> + + <p>Thanks to all the reporters for the excellent work! This report + contains 27 entries and we hope you enjoy reading it.</p> + + <p>The deadline for submissions covering the period between January + and March 2013 is April 21st, 2013.</p> + </section> + + <category> + <name>proj</name> + + <description>Projects</description> + </category> + + <category> + <name>bin</name> + + <description>Userland Programs</description> + </category> + + <category> + <name>team</name> + + <description>&os; Team Reports</description> + </category> + + <category> + <name>kern</name> + + <description>Kernel</description> + </category> + + <category> + <name>docs</name> + + <description>Documentation</description> + </category> + + <category> + <name>arch</name> + + <description>Architectures</description> + </category> + + <category> + <name>ports</name> + + <description>Ports</description> + </category> + + <category> + <name>misc</name> + + <description>Miscellaneous</description> + </category> + + <project cat='arch'> + <title>&os; on BeagleBone</title> + + <contact> + <person> + <name> + <given>Tim</given> + <common>Kientzle</common> + </name> + <email>kientzle@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Oleksandr</given> + <common>Tymoshenko</common> + </name> + <email>gonzo@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Damjan</given> + <common>Marion</common> + </name> + <email>dmarion@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Brett</given> + <common>Wynkoop</common> + </name> + <email>wynkoop@wynn.com</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>&os; on BeagleBone is benefiting from the general work on ARM + stability being done by many people, and is proving to be a nice + testbed for our ARMv7 support. All ongoing work is happening now + directly in -CURRENT and we expect it to be in pretty good shape + by the time 10.0 ships.</p> + + <p>The network driver is now pretty stable; the system should be + useful as a small network device.</p> + + <p>Occasional system snapshots are being built and advertised for + people to test. Ask on freebsd-arm@ if you'd like to try the + newest one.</p> + </body> + + <help> + <task>We need someone to finish the USB driver. Ask if you'd like + to take this over.</task> + + <task>MMCSD performance is still rather poor.</task> + + <task>There's been discussion of how to improve the GPIO + configuration and pinmux handling to simplify hardware + experimentation. If we had more people to help build drivers, we + could start supporting some of the BeagleBone capes.</task> + + <task>Mostly we just need people to use it and report any issues + they encounter.</task> + </help> + </project> + + <project cat='proj'> + <title>BHyVe</title> + + <contact> + <person> + <name> + <given>Neel</given> + <common>Natu</common> + </name> + <email>neel@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Peter</given> + <common>Grehan</common> + </name> + <email>grehan@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="https://wiki.FreeBSD.org/BHyVe" /> + <url href="http://www.bhyve.org/" /> + </links> + + <body> + <p>BHyVe is a type-2 hypervisor for &os;/amd64 hosts with Intel + VT-x and EPT CPU support. The bhyve project branch was merged + into CURRENT on Jan 18. Work is progressing on performance, ease + of use, AMD SVM support, and being able to run non-&os; operating + systems.</p> + </body> + + <help> + <task>1. Booting Linux/*BSD/Windows</task> + + <task>2. Moving the codebase to a more modular design consisting + of a small base and loadable modules</task> + + <task>3. Various hypervisor features such as suspend/resume/live + migration/sparse disk support</task> + </help> + </project> + + <project cat='bin'> + <title>BSD-licenced patch(1)</title> + + <contact> + <person> + <name> + <given>Pedro</given> + <common>Giffuni</common> + </name> + <email>pfg@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Gabor</given> + <common>Kovesdan</common> + </name> + <email>gabor@FreeBSD.org</email> + </person> + <person> + <name> + <given>Xin</given> + <common>Li</common> + </name> + <email>delphij@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://code.google.com/p/bsd-patch/">Home for BSD + patch (deprecated)</url> + </links> + + <body> + <p>&os; has been using for a while a very old version of GNU + patch that is partially under the GPLv2. The original GNU patch + utility is based on an initial implementation by Larry Wall that + was not actually copyleft. OpenBSD did many enhancements to an + older non-copyleft version of patch, this version was later + adopted and further refined by DragonFlyBSD and NetBSD but there + was no centralized development of the tool and &os; kept working + independently. In less than a week we took the version in + DragonFlyBSD and adapted the &os; enhancements to make it behave + nearer to the version used natively in &os;. Most of the work was + done by Pedro Giffuni, adapting patches from sepotvin@ and ed@, + and additional contributions were done by Christoph Mallon, Gabor + Kovesdan and Xin Li. As a result of this we now have a new + version of patch committed in head/usr.bin/patch that you can try + by using WITH_BSD_PATCH in your builds. The new patch(1) doesn't + support the &os;-specific -I and -S options which don't seem + necessary. In GNU patch -I actually means 'ignore whitespaces' + and we now support it too.</p> + </body> + + <help> + <task>Testing. A lot more testing.</task> + </help> + </project> + + <project cat='kern'> + <title>Common Flash Interface (CFI) driver improvements</title> + + <contact> + <person> + <name> + <given>Brooks</given> + <common>Davis</common> + </name> + <email>brooks@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>The Common Flash Interface provides a common programming + interface for a wide range of NOR flash devices commonly found in + embedded systems. I have developed a number of improvements to + the cfi(4) device when used on Intel StrataFlash parts. + Unnecessary erase cycles are now avoided, devices that require + single word writes only write changed words, and multi-word + writes are supported for Intel and Sharp devices. Additionally + the timeout code has been reworked and no longer imposes unneeded + latency on operations taking less than 100us. With all of these + changes streaming write speed has improved by more than an order + of magnitude. Once these changes are reviewed they will be + committed to HEAD.</p> + + <p>This work was sponsored by DARPA and AFRL.</p> + </body> + </project> + + <project cat='proj'> + <title>Native iSCSI Target</title> + + <contact> + <person> + <name> + <given>Edward Tomasz</given> + <common>Napierała</common> + </name> + <email>trasz@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>During the October-December time period, the Native iSCSI + Target project progressed to the working prototype stage. Most of + this time was spent writing kernel-based part, an iSCSI frontend + to the CAM Target Layer. The frontend handles iSCSI Full Feature + phase after ctld(8) hands off the connection. The istgt-derived + code in ctld(8) was rewritten from scratch; now it's much shorter + and more readable. The ctladm(8) utility gained iSCSI-specific + subcommands to handle tasks such as listing iSCSI sessions or + forcing disconnection. The target works correctly with the &os; + initiator.</p> + </body> + </project> + + <project cat="proj"> + <title>NFS Version 4</title> + + <contact> + <person> + <name> + <given>Rick</given> + <common>Macklem</common> + </name> + <email>rmacklem@FreeBSD.org</email> + </person> + </contact> + + <body> + <p>The NFSv4.1 client, including support for pNFS for the Files + Layout only, has now been committed to head/current. Work on + NFSv4.1 server support has just been started and will hopefully + be ready for head/current this summer. The client side disk + caching of delegated files is progressing and the code is under + projects/nfsv4-packrats in the subversion repository. Someone is + working on server side referrals and, as such, I hope this might + make it into 10.0 as well.</p> + </body> + </project> + + <project cat='proj'> + <title>Unprivileged install and image creation</title> + + <contact> + <person> + <name> + <given>Brooks</given> + <common>Davis</common> + </name> + <email>brooks@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>In order to make it easier to build releases and embedded + system disk images I have been adding infrastructure to allow + the install and packaging stages to the &os; build progress to + run without root privilege. To this end I have added two + options to the toplevel build system: The + <tt>-DDB_FROM_SRC</tt> option allows the install to proceed + when the required set of passwd and group entires does not + match the host system. The <tt>-DNO_ROOT</tt> option causes + files to be installed as the running user and for metadata such + as owner, group, suid bits, and file flags to be logged in a + <tt>${DESTDIR}/METALOG</tt> file.</p> + + <p>This work required the import of NetBSD's <tt>mtree</tt> and + the addition of a number of features from NetBSD to + <tt>install</tt>. I have added all &os; features to NetBSD's + <tt>mtree</tt> and imported it as <tt>nmtree</tt>. Before &os; + 10.0 is released I will replace our version. I have also added + all required features to <tt>install</tt>. Changes to + <tt>makefs</tt> were required to parse the contents of the + <tt>METALOG</tt> file.</p> + + <p>These new features required importing new versions of the + pwcache(3) and vis(3) APIs from NetBSD so those portions of + libc.</p> + + <p>In addition to modifying build infrastructure to use the new + features of <tt>mtree</tt> and <tt>install</tt>. I corrected a + number of cases of files being installed by programs other than + <tt>install</tt> or being installed more than once. A few known + instances of duplicate directories in the output exist, but the + results are usable in some contexts.</p> + + <p>I plan to MFC these changes as far back as the stable/8 + branch to make it possible to build all supported releases + without root privilege.</p> + + <p>This work was sponsored by DARPA and AFRL.</p> + </body> + + <help> + <task>Add support for <tt>-DNO_ROOT</tt> to + <tt>src/release/Makefile</tt> so that releases can be built + without root privilege.</task> + + <task>Create a tool to install partition tables and file system + images in disk image files without the use of <tt>mdctl</tt>, + <tt>gpart</tt>, and <tt>dd</tt>.</task> + </help> + </project> + + <project cat='kern'> + <title>SMP-Friendly pf(4)</title> + + <contact> + <person> + <name> + <given>Gleb</given> + <common>Smirnoff</common> + </name> + <email>glebius@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>The project is aimed at moving the pf(4) packet filter out of + a single mutex, as well as in general improving of the &os; port. + The project has reached its main goal. The pf(4) is no longer + covered by single mutex and contention on network stack on pf(4) + is now very low. The code is production ready. The projects/pf + branch had been merged to the head branch and will be available + in 10.0-RELEASE.</p> + </body> + </project> + + <project cat='arch'> + <title>&os; on Raspberry Pi</title> + + <contact> + <person> + <name> + <given>Oleksandr</given> + <common>Tymoshenko</common> + </name> + <email>gonzo@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>&os; is running on Raspberry Pi and supports the following + peripherals:</p> + <ul> + <li>USB controller</li> + <li>SDHC controller</li> + <li>Network</li> + <li>Framebuffer (HDMI and composite)</li> + <li>GPIO</li> + <li>VCHI interface</li> + </ul> + <p>Videocore tests (OpenGL, video decoding, audio, display access) + work with current VCHI driver implementation.</p> + </body> + + <help> + <task>Add DMA mode support to USB driver. Some proof-of-concept + code is done but more work required to finish it.</task> + + <task>Re-implement VCHI driver with more &os;-friendly + locking.</task> + + <task>Implement more drivers: SPI, PWM, audio.</task> + </help> + </project> + + <project cat='proj'> + <title>pxe_http -- booting &os; from apache</title> + + <contact> + <person> + <name> + <given>Sean</given> + <common>Bruno</common> + </name> + <email>sbruno@FreeBSD.org</email> + </person> + </contact> + + <links> + <url + href="http://svnweb.FreeBSD.org/base/user/sbruno/pxe_http_head/"> + svn repo of project</url> + </links> + + <body> + <p>Currently works with VirtualBox VMs and Apache 2.2 port.</p> + </body> + + <help> + <task>Lots and lots of compile warnings exist with clang and gcc. + This really needs to be investigated.</task> + + <task>Better support for other webservers. Currently needs Apache + to work.</task> + + <task>Needs another pass at basic documentation. Current + documentation is actually quite good from the original</task> + + <task>Network stack needs audit. I'm not sure if the + HTTP/TCP/UDP/IP code is original or based on something + else.</task> + </help> + </project> + + <project cat='proj'> + <title>UEFI</title> + + <contact> + <person> + <name> + <given>Benno</given> + <common>Rice</common> + </name> + <email>benno@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="https://wiki.FreeBSD.org/UEFI" /> + + <url href="http://svnweb.FreeBSD.org/base/projects/uefi/" /> + </links> + + <body> + <p>There is code in the projects/uefi branch that can build a + working 64-bit loader for UEFI. This loader can load a kernel and + boot to a mountroot prompt on a serial console on a system with + ≤ 1GB of RAM. Full multiuser has not yet been tested. Work is + progressing towards having a working syscons. The issue + preventing boot on systems with > 1GB of RAM has not yet been + found. UEFI-compatible boot media can be generated using in-tree + tools, however there are issues with detecting the CD filesystem + and using it as the load default. The 64-bit UEFI loader can load + a 32-bit kernel but currently cannot hand over to it due to a + lack of code to switch to 32-bit mode. Further research is + required into Secure Boot.</p> + </body> + </project> + + <project cat='bin'> + <title>bsdconfig(8)</title> + + <contact> + <person> + <name> + <given>Devin</given> + <common>Teske</common> + </name> + <email>dteske@FreeBSD.org</email> + </person> + </contact> + + <links> + <url + href="http://svnweb.FreeBSD.org/base/head/usr.sbin/bsdconfig/"> + Dev Tree</url> + + <url href="http://freshports.org/sysutils/bsdconfig/">Ports + Tree</url> + + <url href="http://druidbsd.sf.net/download/bsdconfig/">Dev + Depot</url> + </links> + + <body> + <p>bsdconfig(8) is actively being developed in HEAD under the + WITH_BSDCONFIG build-requirement. Snapshots are occasionally + taken and made available through the ports system to make testing + on 9.0-RELEASE or higher easier on the testers. Currently HEAD is + far beyond the version 0.7.3 sitting in ports. Upcoming changes + will push this to version 0.8 bringing in the necessary + frameworks required for in-depth package management and + distribution maintenance (read: one step closer to full 1.0 + release).</p> + </body> + </project> + + <project cat='team'> + <title>&os; Core Team</title> + + <contact> + <person> + <name> + <given>Core Team</given> + </name> + <email>core@FreeBSD.org</email> + </person> + </contact> + + <body> + <p>In the fourth quarter, the Core Team granted access for 7 new + committers, and took 1 commit bit in for safekeeping.</p> + + <p>The Core Team oversaw the response to the security incident in + November in cooperation with the security team, port managers, + and cluster administrators. For more information on the fallouts + and response see the + <a href="http://www.FreeBSD.org/news/2012-compromise.html"> + official announcement</a>. As a result, 9.1-RELEASE was delayed + until late December and was released with a limited set of binary + packages. The Core Team continues to work with developers to + rebuild, review, and restore the package building infrastructure + along with redports/QAT.</p> + </body> + </project> + + <project cat='team'> + <title>&os; Documentation Engineering</title> + + <contact> + <person> + <name> + <given>Glen</given> + <common>Barber</common> + </name> + <email>gjb@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Marc</given> + <common>Fonvieille</common> + </name> + <email>blackend@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Gábor</given> + <common>Kövesdán</common> + </name> + <email>gabor@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Hiroki</given> + <common>Sato</common> + </name> + <email>hrs@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.FreeBSD.org/internal/doceng.html"> + Documentation Engineering Team Charter</url> + </links> + + <body> + <p>The translations/, projects/ and user/ directories of the doc + repository have been opened with the announced policies in + effect. These branches are now actively used for translations + work, editing the upcoming printed version of the Handbook, + and some doc infrastructure improvements.</p> + + <p>The next phase of the infrastructure improvements is in + progress. It will migrate to real XML tools (with the exception + of Jade) for validation and rendering. At the same time, the + DocBook schema will be updated to 4.5.</p> + + <p>After long discussions, Google Analytics has been enabled on + &os;.org webpages but access to statistical data has to be + solicited from the Documentation Engineering Team on an + individual and one time basis.</p> + + <p>Since July, we have added two doc committers and one + translator.</p> + </body> + + <help> + <task>Help the ongoing work on printed edition of the + Handbook.</task> + + <task>Finish the migration to XML tools.</task> + </help> + </project> + + <project cat='team'> + <title>&os; Foundation</title> + + <contact> + <person> + <name> + <given>Deb</given> + <common>Goodkin</common> + </name> + <email>deb@FreeBSDFoundation.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>A strong year-end <a + href="http://www.FreeBSDFoundation.org/announcements.shtml#fundraising"> + fundraising campaign</a> led to the raising $770,000 in 2012. + Thank you to everyone who made a donation to support &os;!</p> + + <p>We published our <a + href="http://www.FreeBSDFoundation.org/press/2012Dec-newsletter.shtml"> + year-end newsletter</a> that highlighted everything we did to + support the &os; Project and community during the second half of + the year.</p> + + <p>We were a Gold Sponsor for EuroBSDCon. We also attended the + conference and developer summit. Erwin Lansing organized and + chaired the Ports and Package Summit and Vendor Summit at + EuroBSDCon 2012. We attended MeetBSD developer summit + November 2012.</p> + + <p>George Neville-Neil organized and the Foundation sponsored the + Bay Area Vendor Summit November 2012. We were represented at + LISA.</p> + + <p>Kirk McKusick taught a tutorial and gave a keynote at EuroBSDCon + 2012, and Justin Gibbs gave a talk at ZFS Day, October 2012.</p> + + <p>We talked to DNS server software vendors and participated in + discussions on our DNS implementation, specifically with regard + to DNSSEC validation, at CENTR Tech September 2012 (Amsterdam, + the Netherlands) and EuroBSDCon.</p> + + <p>We visited companies to discuss their &os; use and to help + facilitate collaboration with the Project.</p> + + <p>Robert Watson published <a href="http://queue.acm.org/detail.cfm?id=2430732"> + ACM Queue and Communications of the ACM: A decade of OS + access-control extensibility</a> and Kirk McKusick + published <a href="http://queue.acm.org/detail.cfm?id=2367378"> + ACM Queue and Communications of the ACM: Disks from the + Perspective of a File System</a>.</p> + + <p>We negotiated/supervised Foundation funded projects: porting + &os; to the Efika ARM platform, Capsicum Component Framework, + Native iSCSI Target implementation, and EUFI.</p> + + <p>We negotiated/supervised/funded hardware needs in &os; + co-location centers.</p> + + <p>Many board members provided support for recovery efforts + following the security compromise of &os;.org systems in late + 2012.</p> + + <p>We completed negotiation and provided legal counsel for the + new website privacy policy for the &os; Project.</p> + + <p>We are now an industrial partner in the + Cambridge/Imperial/Edinburgh EPSRC REMS project on the Rigorous + Engineering of Mainstream Systems.</p> + + <p>We coordinated the Foundation's discussion of Jira/Java; + conclusion, will continue to be supportive of OpenJDK and not + restart proprietary JDK support.</p> + + <p>We implemented a donor management database to help with our + fundraising efforts. We also began working on automating the + donation process.</p> + + <p>We started the Faces of &os; Series where we share the story of + a Foundation grant recipient periodically. This allows us to + spotlight people who received Foundation funding to work on + development projects, run conferences, travel to conferences, + and advocate for &os;.</p> + + <p>We hired two technical staff members.</p> + </body> + </project> + + <project cat='team'> + <title>Postmaster</title> + + <contact> + <person> + <name> + <given>David</given> + <common>Wolfskill</common> + </name> + <email>postmaster@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>The postmaster team has expanded, with the addition of + Florian Smeets (flo@FreeBSD.org).</p> + + <p>We have implemented a Mailman "handler" to drop duplicate + messages when both copies are sent to the same list (under + both the "long" (e.g., "freebsd-current") and "short" + (e.g., "current") names).</p> + + <p>We have created several new mailing lists:</p> + <ul> + <li>freebsd-course: educational course on &os;</li> + <li>freebsd-numerics: Discussions of high quality + implementation of libm functions.</li> + <li>freebsd-snapshots: &os; Development Snapshot + Announcements</li> + <li>freebsd-tcltk: &os;-specific Tcl/Tk discussions</li> + </ul> + + <p>We have also removed old mailing lists:</p> + <ul> + <li>freebsd-binup</li> + <li>freebsd-www (merged into freebsd-doc)</li> + </ul> + </body> + </project> + + <project cat='kern'> + <title>AMD GPUs kernel-modesetting support</title> + + <contact> + <person> + <name> + <given>Alexander</given> + <common>Kabaev</common> + </name> + <email>kan@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Jean-Sébastien</given> + <common>Pédron</common> + </name> + <email>dumbbell@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Konstantin</given> + <common>Belousov</common> + </name> + <email>kib@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="https://wiki.FreeBSD.org/AMD_GPU">Project status on + the wiki</url> + + <url href="http://people.FreeBSD.org/~kib/misc/ttm.1.patch"> + Initial TTM port</url> + </links> + + <body> + <p>Jean-Sébastien Pédron started to port the AMD GPUs driver + from Linux to &os; 10-CURRENT in January 2013. This work is based + on a previous effort by Alexander Kabaev. Konstantin Belousov + provided the initial port of the TTM memory manager.</p> + + <p>As of this writing, the driver is building but the tested + device fails to attach.</p> + + <p>Status updates will be posted to the &os; wiki.</p> + </body> + </project> + + <project cat='kern'> + <title>Unmapped I/O</title> + + <contact> + <person> + <name> + <given>Jeff</given> + <common>Roberson</common> + </name> + <email>jeff@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Konstantin</given> + <common>Belousov</common> + </name> + <email>kib@FreeBSD.org</email> + </person> + </contact> + + <links> + <url + href="http://people.FreeBSD.org/~kib/misc/unmapped.13.patch">The + patch.</url> + </links> + + <body> + <p>A well-known performance problem of &os; on large SMP + hardware is the need to invalidate TLB for all CPUs when + instantiating and destroying the VMIO buffers. Invalidation is + performed by sending inter-processor interrupt broadcast, which + disrupts the execution path of each CPU, and induces latency + on the request itself. Since most I/O requests processing require + creation of the buffers to hold the data in the kernel, TLB + invalidation becomes an obstacle for I/O scalability on + many-CPU machines.</p> + + <p>The work done for flushing the TLBs is especially meaningless + since most mappings created are not used for anything but copying + the data from the usermode to the kernel page cache forth and + back. Most architectures have already established facilities to + perform such copies using much faster techniques, for instance, + the direct map on amd64, or specially reserved per-CPU page + frames or TLB entries on other architectures.</p> + + <p>Jeff Roberson unified the machine-specific parts of the + busdma(9), making a common set of low-level functions available + on each architecture. This was committed as r246713. The end + result is that the new types of the load functions can be added + in the single, machine-independent place. In particular, it is + easy to modify the drivers to accept the 'unmapped' bio requests, + which lists the vm pages for the device dma engine, instead of + the virtual address of the kernel buffer.</p> + + <p>Konstantin Belousov developed the changes for buffer cache + which allow the VMIO buffers to not map the referenced pages, and + used the feature for UFS. Per-architecture pmap_copy_pages(9) + methods were added to facilitate fast copying between user I/O + buffers and pages of unmapped buffers. The unmapped buffers + create the unmapped bio requests for the drivers, support for + which was made possible by Jeff's patch.</p> + + <p>Tests show that even on a small 4-core machine, the system + time for reading files on UFS is reduced by 30%.</p> + </body> + + <help> + <task>Test the patch, in particular, on non-x86 + architectures.</task> + </help> + </project> + + <project cat='docs'> + <title>The &os; Japanese Documentation Project</title> + + <contact> + <person> + <name> + <given>Hiroki</given> + <common>Sato</common> + </name> + <email>hrs@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Ryusuke</given> + <common>Suzuki</common> + </name> + <email>ryusuke@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.FreeBSD.org/ja/">Japanese &os; Web + Page</url> + + <url href="http://www.jp.FreeBSD.org/doc-jp/">The &os; Japanese + Documentation Project Web Page</url> + </links> + + <body> + <p>The ja_JP.eucJP subtree has constantly been updated since the + last status report.</p> + + <p>In &os; Handbook, translation work of the "users" section has + been completed. "linuxemu" and "serialcomms" were updated and + subsection "Subversion mirror site" was newly added to "mirrors" + section.</p> + </body> + + <help> + <task>Further translation work of outdated documents in the + <tt>ja_JP.eucJP</tt> subtree.</task> + </help> + </project> + + <project cat='arch'> + <title>&os; on AARCH64</title> + + <contact> + <person> + <name> + <given>Andrew</given> + <common>Turner</common> + </name> + <email>andrew@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="https://github.com/zxombie/aarch64-freebsd-sandbox" /> + + <url + href="http://www.arm.com/products/tools/models/fast-models/foundation-model.php" /> + </links> + + <body> + <p>Work has started on porting &os; to AARCH64, ARM's new 64-bit + architecture, using the ARMv8 Foundation Model software. GCC and + binutils have been ported to &os; and work started on kernel + initialization, including MMU setup.</p> + </body> + + <help> + <task>Get the MMU working</task> + + <task>Get system register documentation from ARM</task> + + <task>Port clang AArch64 to &os;</task> + + <task>Bring the code into a &os; project branch</task> + </help> + </project> + + <project cat='arch'> + <title>Compiler improvements for &os;/ARMv6</title> + + <contact> + <person> + <name> + <given>Andrew</given> + <common>Turner</common> + </name> + <email>andrew@FreeBSD.org</email> + </person> + </contact> + + <links> + </links> + + <body> + <p>&os;/ARM architecture is now supported by the in-tree clang + compiler. ARM EABI support is now available for both clang and + gcc along with the older and less documented OABI. There are + several outstanding issues, once they are fixed EABI will be + made default.</p> + </body> + + <help> + <task>Test EABI builds</task> + + <task>Fix exception handling for EABI</task> + + <task>Test clang builds</task> + + <task>Get clang to work natively on EABI-based ARM system. + Currently it works only as cross-compiler for ARM EABI.</task> + </help> + </project> + + <project cat='ports'> + <title>&os; Haskell Ports</title> + + <contact> + <person> + <name> + <given>Gábor</given> + <common>PÁLI</common> + </name> + <email>pgj@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Ashish</given> + <common>SHUKLA</common> + </name> + <email>ashish@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://wiki.FreeBSD.org/Haskell">&os; Haskell wiki + page</url> + + <url href="https://github.com/FreeBSD-haskell/FreeBSD-haskell/"> + &os; Haskell ports repository</url> + </links> + + <body> + <p>We are proud to announce that the &os; Haskell Team has + updated the Haskell Platform to 2012.4.0.0, GHC to 7.4.2 as well + as updated existing ports to their latest stable versions. All + Haskell ports are also updated to use new OPTIONS framework, and + now, building with dynamic libraries (DYNAMIC) is on by default. + GHC also uses GCC 4.6 and binutils 2.22 from ports. We also added + a number of new Haskell ports, and their count in &os; Ports tree + is now 368.</p> + </body> + + <help> + <task>Test GHC to work with clang/LLVM.</task> + + <task>Commit pending Haskell ports to the &os; Ports tree.</task> + + <task>Add more ports to the Ports Collection.</task> + </help> + </project> + + <project cat='ports'> + <title>KDE/&os;</title> + + <contact> + <person> + <name> + <given>KDE</given> + <common>FreeBSD</common> + </name> + <email>kde@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://FreeBSD.kde.org">KDE/FreeBSD home page</url> + + <url href="http://FreeBSD.kde.org/area51.php">area51</url> + </links> + + <body> + <p>The KDE/&os; team have continued to improve the experience of + KDE software and Qt under &os;. The latest round of improvements + include:</p> + <ul> + <li>Fix handling of Removable property in solid engine</li> + + <li>Fix management of backlight with UPower (requires + acpi_video(4))</li> + + <li>Installing spell-checking dictionaries with a dependency of + KDE-locale ports</li> + </ul> + + <p>The team has also made many releases and upstreamed many fixes + and patches. The latest round of releases include:</p> + <ul> + <li>KDE SC: 4.9.2 (area51)</li> + + <li>PyQt: 4.9.5 (area51); SIP: 4.14 (area51)</li> + + <li>KDevelop: 4.4.0, 4.4.1 (area51); KDevPlatform: 1.4.0, 1.4.1 + (area51)</li> + + <li>Calligra: 2.5.3, 2.5.4 (area51)</li> + + <li>CMake: 2.8.10.1</li> + + <li>Many smaller ports</li> + </ul> + + <p>The team is always looking for more testers and porters so + please contact us at kde@FreeBSD.org and visit our home page at + <a href="http://FreeBSD.kde.org">http://FreeBSD.kde.org</a>.</p> + </body> + + <help> + <task>Updating out-of-date ports, see + <a href="http://portscout.FreeBSD.org/kde@freebsd.org.html">PortScout</a> + for a list</task> + </help> + </project> + + <project cat='ports'> + <title>Ports Collection</title> + + <contact> + <person> + <name> + <given>Thomas</given> + <common>Abthorpe</common> + </name> + <email>portmgr-secretary@FreeBSD.org</email> + </person> + + <person> + <name> + <given>Port</given> + <common>Management Team</common> + </name> + <email>portmgr@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.FreeBSD.org/ports/" /> + + <url + href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributing-ports/" /> + + <url href="http://portsmon.FreeBSD.org/index.html" /> + + <url href="http://www.FreeBSD.org/portmgr/index.html" /> + + <url href="http://blogs.FreeBSDish.org/portmgr/" /> + + <url href="http://www.twitter.com/freebsd_portmgr/" /> + + <url href="http://www.facebook.com/portmgr" /> + </links> + + <body> + <p>The ports tree crossed the threshold of 24,000 ports, while the + PR count still is close to 1600.</p> + + <p>In Q4 we added five new committers and took in two commit bits + for safe keeping.</p> + + <p>In the tradition of recruiting new portmgr@ at conferences, we + added Bernhard Froehlich to our ranks. He is the one responsible + for redports.org</p> + + <p>Pav Lucistnik stepped down from his role on portmgr, he was + one of our principles doing -exp runs and well known for sending + failmails.</p> + + <p>In the well publicised compromise, the pointyhat machines were + broken into and subsequently taken down, isolated and sanitised. + As a pre-emptive move redports/QAT were also taken down. Work is + under way to restore the services.</p> + + <p>Mark Linimon began a from-scratch test install on one of his + own spare machines with the purpose of documenting all the + missing steps from the portbuild article. While doing so, he + further overhauled the codebase to both make it easier to + install, and to further refactor it in light of a security review + (still ongoing at time of this writing). Once this is complete, + the next task will be to reinstall all existing machines from + scratch.</p> + </body> + + <help> + <task>Most ports PRs are assigned, we now need to focus on + testing, committing and closing.</task> + </help> + </project> + + <project cat='ports'> + <title>Xfce</title> + + <contact> + <person> + <email>xfce@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="https://wiki.FreeBSD.org/Xfce" /> + </links> + + <body> + <p>A major update has been made to + <strong>Thunar</strong> (file manager for the Xfce Desktop + Environment).</p> + + <p><em>1.6.x</em> series introduce lots of improvements, most + noticeably is <strong>tabs support</strong>, and the performance + has been improved.</p> + </body> + + <help> + <task>Try to fix HSTS (HTTP Strict Transport Security) feature in + Midori with Vala 0.12.1 (works fine with Vala ≥ 0.14.x)</task> + + <task>Replace libxfce4gui (deprecated and not maintained by + upstream) by libxfce4ui in order to enhance support for Xfce ≥ + 4.10.</task> + + <task>Test core and plugins (panel, Thunar) with GLib ≥ 4.32 + (to replace deprecated and removed functions introduced since + GLib 2.30).</task> + + <task>Fix gtk-xfce-engine with Gtk+ ≥ 3.6.</task> + </help> + </project> + + <project cat='soc'> + <title>Google Summer of Code 2013</title> + + <contact> + <person> + <name> + <given> + </given> + <common>FreeBSD Summer of Code Administrators</common> + </name> + <email>soc-admins@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://www.FreeBSD.org/projects/summerofcode.html"> + FreeBSD Summer of Code page</url> + + <url + href="http://google-opensource.blogspot.co.uk/2013/02/flip-bits-not-burgers-google-summer-of.html"> + Google announcement of Summer of Code 2013</url> + + <url + href="http://www.google-melange.com/gsoc/homepage/google/gsoc2013"> + Google's GSoC 2013 page (including timeline)</url> + + <url href="http://en.wikipedia.org/wiki/Google_Summer_of_Code"> + GSoC Wikipedia page</url> + </links> + + <body> + <p>Since 2005 Google has run its yearly Summer of Code program, + in which Google awards stipends to students who successfully + complete projects with participating Open Source organisations. + &os; has participated in GSoC every year since its inception, + and with the announcement that Google will once again run the + program in 2013 hopes to participate once more.</p> + + <p>Google have not yet opened the application period for + mentoring organisations, but once it does &os; plans to apply. + Assuming that we are successful in our application to + participate, we will publish a large list of ideas for possible + projects shortly after. Students may then apply to do one of + those projects, or suggest their own idea for a project. After + the application period, &os; will discover how many student + slots we have been allocated, at which point successful + students will take some time to plan their project, gather + required information and discuss their plans with their + mentors, before having around 12 weeks to develop their + code.</p> + + <p>In the eight years of &os;'s participation in Google Summer + of Code, approximately 150 students have successfully complete + projects with us, covering a wide spread of areas of both the + source and ports trees. Of these, 22 students continued + participating with &os; and subsequently became full &os; + committers, many later going on to mentor Summer of Code + students themselves.</p> + + <p>Whether &os; has been successful in being selected to be a + participating organisation in Google Summer of Code 2013 should + be announced in early April.</p> + </body> + </project> + + <project cat='misc'> + <title>EuroBSDcon 2012</title> + + <contact> + <person> + <name> + <given>EuroBSDcon</given> + <common>Organizers</common> + </name> + <email>oc-2012@eurobsdcon.org</email> + </person> + + <person> + <name> + <given>Gabor</given> + <common>Pali</common> + </name> + <email>pgj@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://2012.eurobsdcon.org/">EuroBSDcon 2012 web + site</url> + + <url href="http://www.youtube.com/user/eurobsdcon">EuroBSDcon + YouTube channel</url> + </links> + + <body> + <p>The 11th European BSD Conference took place in Warsaw, Poland + at the Warsaw University of Technology with a large number of + visitors. It started up with two tracks of tutorials, featuring + FreeNAS, pfSense, DTrace, PF, development of NetBSD drivers, and + an overall introduction to the &os; operating system given by + Kirk McKusick. There we also had opening and closing keynotes, + supplemented with 22 talks on different topics related to &os;, + OpenBSD, NetBSD, FreeNAS and PC-BSD: BHyVe, configuration + management with puppet, improvements in the OpenBSD cryptographic + framework, tuning ZFS, server load balancing in DNS, running &os; + on embedded systems, e.g MIPS and ARM, and challenges in identity + management and authentication.</p> + + <p>The conference also had a dedicated track presented by the + attendees of the &os; developer summit and open to all, where one + could learn more about what is happening currently in the + Project: results of Google Summer of Code 2012, architectural + changes in the &os; documentation tree, ILNP, advancements in + package building and development of pkg(8), and a status report + on the USB stack.</p> + </body> + </project> + + <project cat='misc'> + <title>&os; Developer Summit, Warsaw</title> + + <contact> + <person> + <name> + <given>Gabor</given> + <common>Pali</common> + </name> + <email>pgj@FreeBSD.org</email> + </person> + </contact> + + <links> + <url href="http://wiki.FreeBSD.org/201210DevSummit">Home page of + the summit</url> + </links> + + <body> + <p>We had 53 &os; developers and invited guests attending the + &os; Developer Summit organized as part of EuroBSDcon 2012 in + Warsaw, Poland at the Warsaw University of Technology. This year + EuroBSDcon organizers again offered us their generous support in + helping with keeping the event running smooth, helping with + registrations, renting the venue, and providing food for keeping + attendees satisfied and happy.</p> + + <p>The Warsaw developer summit spanned over 3 days and had 9 + working groups on various topics. We improved last year's layout + inherited from the Canadian summits because it has worked well + earlier but could use some further refinements. On both the first + and second days, we ran the working groups, ranging from the + standard matters, discussing issues with the USB stack, the + compiler toolchain, the Ports Collection, or the documentation to + some experimental ones, e.g. arranging an operating systems + course focusing on &os;. In addition to this, similarly to last + year, one of the working groups was about gathering vendors to + present their ideas and engage in discussion with the developers + on their needs from the Project. Finally, on the third day, there + were a number of exciting work-in-progress reports given in a + dedicated Developer Summit track at the main conference.</p> + + <p>Photos and slides for the most of the talks are available on + the home page of the summit.</p> + </body> + </project> +</report> diff --git a/en_US.ISO8859-1/htdocs/news/status/status.xml b/en_US.ISO8859-1/htdocs/news/status/status.xml index 9bd5d27f33..ba8e2f386b 100644 --- a/en_US.ISO8859-1/htdocs/news/status/status.xml +++ b/en_US.ISO8859-1/htdocs/news/status/status.xml @@ -13,7 +13,7 @@ <body class="navinclude.about"> - <h2>Next submissions due: February 17th, 2013</h2> + <h2>Next submissions due: April 21st, 2013</h2> <p>Use the <a href="http://www.FreeBSD.org/cgi/monthly.cgi">xml generator</a> or download and edit the <a href="report-sample.xml"> @@ -47,6 +47,10 @@ <h2>2012</h2> <ul> + <li><a href="report-2012-10-2012-12.html">October, 2012 - + December, 2012</a></li> + <li><a href="report-2012-07-2012-09.html">July, 2012 - + September, 2012</a></li> <li><a href="report-2012-04-2012-06.html">April, 2012 - June, 2012</a></li> <li><a href="report-2012-01-2012-03.html">January, 2012 - diff --git a/en_US.ISO8859-1/htdocs/platforms/amd64.xml b/en_US.ISO8859-1/htdocs/platforms/amd64.xml index 258691d5b7..bf92cf457b 100644 --- a/en_US.ISO8859-1/htdocs/platforms/amd64.xml +++ b/en_US.ISO8859-1/htdocs/platforms/amd64.xml @@ -18,18 +18,19 @@ <p>This page contains information of the FreeBSD port to <a href="http://www.amd.com/">AMD's</a> AMD64 and <a - href="http://developer.intel.com/technology/intel64/index.htm">Intel® + href="http://www.intel.com/info/em64t">Intel® 64</a> architecture. The - AMD64 architecture was previously known as x86-64 or ``Hammer.'' + AMD64 architecture was previously known as <q>Hammer</q>. The Intel 64 architecture was previously known as Yamhill, Clackamas Technology (CT), IA-32e, and EM64T (Extended Memory 64-bit - Technology).</p> + Technology). Generically, the platform is often known as + <q>x86-64</q> or <q>x64</q>.</p> <p>The AMD Opteron™, AMD Athlon™ 64, AMD Turion™ 64 and newer AMD Sempron™ processors use the AMD64 architecture.</p> - <p>The Intel vPro™, Intel Celeron D (some models since ``Prescott''), + <p>The Intel vPro™, Intel Celeron D (some models since <q>Prescott</q>), Intel Centrino® Duo, Intel Centrino® Pro, Intel Viiv™, Intel Core™2 Extreme, Intel Core™2 Quad, Intel Core™2 Duo, Intel Xeon (3000-sequence, 5000-sequence, and diff --git a/en_US.ISO8859-1/htdocs/projects/newbies.xml b/en_US.ISO8859-1/htdocs/projects/newbies.xml index 23972a6579..3d3136db16 100644 --- a/en_US.ISO8859-1/htdocs/projects/newbies.xml +++ b/en_US.ISO8859-1/htdocs/projects/newbies.xml @@ -95,6 +95,15 @@ answers via the <a href="&base;/search/search.html#mailinglists">search</a> page.</p></li> + <li><p>The main newsgroup for &os; is <a + href="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</a>. + General UNIX questions are dealt with in the newsgroup <a + href="news:comp.unix.questions">comp.unix.questions</a> and the + associated <a + href="ftp://rtfm.mit.edu/pub/usenet/news.answers/unix-faq/faq/">FAQ</a> + from the RMIT FTP site. Newbies are likely to be most + interested in sections 1 and 2 initially.</p></li> + <li><p><a href="&cgibase;/man.cgi">Manual pages</a> are good for reference but not always the best introduction for a novice. The more you work with man pages diff --git a/en_US.ISO8859-1/htdocs/projects/projects.xml b/en_US.ISO8859-1/htdocs/projects/projects.xml index 5ae2e6d0f7..9b0308aa6c 100644 --- a/en_US.ISO8859-1/htdocs/projects/projects.xml +++ b/en_US.ISO8859-1/htdocs/projects/projects.xml @@ -58,12 +58,6 @@ mailing list and participate.</li> A list of resources to help those new to FreeBSD and &unix; in general.</li> -<li><a name="BSDsites" href="http://mirrorlist.FreeBSD.org/"> -RELEASE/SNAP finder for FreeBSD FTP servers</a>: -A resource that would allow anyone to find a FTP server that contains -particular releases and SNAP of FreeBSD. The database is updated daily -at 3am Melbourne time (10 hours ahead of UTC).</li> - <li><a name="diary" href="http://www.freebsddiary.org/">The FreeBSD Diary</a>: A collection of how-to entries aimed at UNIX novices. The aim is to provide a set of step-by-step guides to diff --git a/en_US.ISO8859-1/htdocs/tutorials/Makefile b/en_US.ISO8859-1/htdocs/releases/8.4R/Makefile index e529271127..3d59b5b009 100644 --- a/en_US.ISO8859-1/htdocs/tutorials/Makefile +++ b/en_US.ISO8859-1/htdocs/releases/8.4R/Makefile @@ -1,8 +1,4 @@ -# # $FreeBSD$ -# -# Build the FreeBSD tutorials/articles outside of the www tree, and then -# install them in to the right place. .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -11,6 +7,8 @@ .include "../Makefile.inc" .endif -DOCS = index.xml +DOCS+= schedule.xml + +DATA= docbook.css .include "${DOC_PREFIX}/share/mk/web.site.mk" diff --git a/en_US.ISO8859-1/htdocs/releases/8.4R/docbook.css b/en_US.ISO8859-1/htdocs/releases/8.4R/docbook.css new file mode 100644 index 0000000000..499e19f271 --- /dev/null +++ b/en_US.ISO8859-1/htdocs/releases/8.4R/docbook.css @@ -0,0 +1,242 @@ +/* + * Copyright (c) 2001, 2003, 2010 The FreeBSD Documentation Project + * 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. + * + * $FreeBSD$ + */ + +BODY ADDRESS { + line-height: 1.3; + margin: .6em 0; +} + +BODY BLOCKQUOTE { + margin-top: .75em; + line-height: 1.3; + margin-bottom: .75em; +} + +HTML BODY { + margin: 1em 8% 1em 10%; + line-height: 1.2; +} + +.LEGALNOTICE { + font-size: small; + font-variant: small-caps; +} + +BODY DIV { + margin: 0; +} + +DL { + margin: .8em 0; + line-height: 1.2; +} + +DIV.CALLOUTLIST DT { + float: left; + width: 1em; +} + +DIV.CALLOUTLIST DD { + clear: right; + margin-bottom: 1ex; +} + +BODY FORM { + margin: .6em 0; +} + +H1, H2, H3, H4, H5, H6, +DIV.EXAMPLE P B, +.QUESTION, +DIV.TABLE P B, +DIV.PROCEDURE P B { + color: #990000; +} + +BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 { + line-height: 1.3; + margin-left: 0; +} + +BODY H1, BODY H2 { + margin: .8em 0 0 -4%; +} + +BODY H3, BODY H4 { + margin: .8em 0 0 -3%; +} + +BODY H5 { + margin: .8em 0 0 -2%; +} + +BODY H6 { + margin: .8em 0 0 -1%; +} + +BODY HR { + margin: .6em; + border-width: 0 0 1px 0; + border-style: solid; + border-color: #cecece; +} + +BODY IMG.NAVHEADER { + margin: 0 0 0 -4%; +} + +OL { + margin: 0 0 0 5%; + line-height: 1.2; +} + +BODY PRE { + margin: .75em 0; + line-height: 1.0; + font-family: monospace; +} + +BODY TD, BODY TH { + line-height: 1.2; +} + +UL, BODY DIR, BODY MENU { + margin: 0 0 0 5%; + line-height: 1.2; +} + +HTML { + margin: 0; + padding: 0; +} + +BODY P B.APPLICATION { + color: #000000; +} + +.FILENAME { + color: #007a00; +} + +SVNREF { + color: #007a00; +} + +.GUIMENU, .GUIMENUITEM, .GUISUBMENU, +.GUILABEL, .INTERFACE, +.SHORTCUT, .SHORTCUT .KEYCAP { + font-weight: bold; +} + +.GUIBUTTON { + background-color: #CFCFCF; + padding: 2px; +} + +.ACCEL { + background-color: #F0F0F0; + text-decoration: underline; +} + +.SCREEN { + padding: 1ex; +} + +.PROGRAMLISTING { + padding: 1ex; + background-color: #eee; + border: 1px solid #ccc; + line-height: 1.1; +} + +@media screen { /* hide from IE3 */ + a[href]:hover { background: #ffa } +} + +.INFORMALTABLE, .TABLE TH { + padding-left: 02.em; + text-align: left; +} + +BLOCKQUOTE, .EXAMPLE, .PROGRAMLISTING { + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + -khtml-border-radius: 6px; + border-radius: 6px; +} + +BLOCKQUOTE { + padding: 0 2ex; +} + +BLOCKQUOTE.NOTE { + color: #222; + background: #eee; + border: 1px solid #ccc; + width: 85%; +} + +BLOCKQUOTE.TIP { + color: #004F00; + background: #d8ecd6; + border: 1px solid green; + width: 85%; +} + +BLOCKQUOTE.IMPORTANT { + font-style:italic; + border: 1px solid #a00; + border-left: 12px solid #c00; +} + +BLOCKQUOTE.WARNING { + color: #9F1313; + background: #f8e8e8; + border: 1px solid #e59595; + width: 85%; +} + +BLOCKQUOTE.CAUTION { + color: #3E3535; + background: #FFC; + border: 1px solid #e59595; + width: 85%; +} + +.EXAMPLE { + background: #fefde6; + border: 1px solid #f1bb16; + margin: 1em 0; + padding: 0.2em 2em; + width: 90%; +} + +.INFORMALTABLE TABLE.CALSTABLE TR TD { + padding-left: 1em; + padding-right: 1em; +} diff --git a/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml b/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml new file mode 100644 index 0000000000..95e972c8ba --- /dev/null +++ b/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN" +"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [ +<!ENTITY email 'freebsd-qa'> +<!ENTITY local.rel "8.4"> +<!ENTITY title "FreeBSD &local.rel; Release Process"> +]> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <title>&title;</title> + + <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword> + </head> + + <body class="navinclude.download"> + + <h1>Introduction</h1> + + <p>This is the release schedule for FreeBSD &local.rel;. For more + information about the release engineering process, please see the <a + href="&base;/releng/index.html">Release Engineering</a> section of the + web site.</p> + + <p>General discussions about the pending release and known issues should be + sent to the public + <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list. + </p> + + <h1>Schedule</h1> + + <table class="tblbasic"> + <tr class="heading"> + <td>Action</td> + <td>Expected</td> + <td>Actual</td> + <td>Description</td> + </tr> + + <tr> + <td>Initial release schedule announcement</td> + <td>-</td> + <td>08 February 2013</td> + <td>Release Engineers send announcement email to developers with a + rough schedule.</td> + </tr> + + <tr> + <td>Announce <tt>doc/</tt> tree slush</td> + <td>-</td> + <td>28 February 2013</td> + <td>Notification of the impending <tt>doc/</tt> tree slush + should be sent to <tt>doc@</tt>.</td> + </tr> + + <tr> + <td>Code freeze begins</td> + <td>08 March 2013</td> + <td>-</td> + <td>Release Engineers announce that all further commits to the + stable/8 branch will require explicit approval. + Certain blanket approvals will be granted for narrow areas of + development, documentation improvements, etc.</td> + </tr> + + <tr> + <td>BETA1</td> + <td>20 March 2013</td> + <td>-</td> + <td>First beta test snapshot.</td> + </tr> + + <tr> + <td><tt>doc/</tt> tree slush</td> + <td>17 March 2013</td> + <td>17 March 2013</td> + <td>Non-essential commits to the <tt>en_US.ISO8859-1/</tt> + subtree should be delayed from this point until after the + <tt>doc/</tt> tree tagging, to give translation teams time to + synchronize their work.</td> + </tr> + + <tr> + <td>releng/&local.rel; branch</td> + <td>18 March 2013</td> + <td>-</td> + <td>Subversion branch created, propagated to CVS; future + release engineering proceeds on this branch.</td> + </tr> + + <tr> + <td>RC1</td> + <td>30 March 2013</td> + <td>-</td> + <td>First release candidate.</td> + </tr> + + <tr> + <td>RC2</td> + <td>05 April 2013</td> + <td>-</td> + <td>Second release candidate.</td> + </tr> + + <tr> + <td>RELEASE build</td> + <td>12 April 2013</td> + <td>-</td> + <td>&local.rel;-RELEASE build.</td> + </tr> + + <tr> + <td>RELEASE announcement</td> + <td>19 April 2013</td> + <td>-</td> + <td>&local.rel;-RELEASE press release.</td> + </tr> + + <tr> + <td>Turn over to the secteam</td> + <td>-</td> + <td>-</td> + <td>releng/&local.rel; branch is handed over to + the FreeBSD Security Officer Team in one or two weeks after the + announcement.</td> + </tr> + </table> +<!-- + <h1>Internal Status / TODO</h1> + <a href="http://wiki.freebsd.org/Releng/8.4TODO">http://wiki.freebsd.org/Releng/8.4TODO</a> +--> + + </body> +</html> diff --git a/en_US.ISO8859-1/htdocs/releases/Makefile b/en_US.ISO8859-1/htdocs/releases/Makefile index 34c0cdae84..aa1bf597d7 100644 --- a/en_US.ISO8859-1/htdocs/releases/Makefile +++ b/en_US.ISO8859-1/htdocs/releases/Makefile @@ -16,7 +16,7 @@ SUBDIR+= 4.6.2R 4.7R 4.8R 4.9R 4.10R 4.11R SUBDIR+= 5.0R 5.1R 5.2R 5.2.1R 5.3R 5.4R 5.5R SUBDIR+= 6.0R 6.1R 6.2R 6.3R 6.4R SUBDIR+= 7.0R 7.1R 7.2R 7.3R 7.4R -SUBDIR+= 8.0R 8.1R 8.2R 8.3R +SUBDIR+= 8.0R 8.1R 8.2R 8.3R 8.4R SUBDIR+= 9.0R 9.1R .if defined $(NEW_BUILD) diff --git a/en_US.ISO8859-1/htdocs/releases/index.xml b/en_US.ISO8859-1/htdocs/releases/index.xml index 546f4fc0e0..279e63126a 100644 --- a/en_US.ISO8859-1/htdocs/releases/index.xml +++ b/en_US.ISO8859-1/htdocs/releases/index.xml @@ -52,6 +52,17 @@ <a href="&u.rel.errata;">Errata</a> </em></p> + <p><b>Release 9.0</b> (January 2012) + <em> + <a href="9.0R/announce.html">Announcement</a>: + <a href="9.0R/relnotes.html">Release Notes</a>: + <a href="9.0R/installation.html">Installation Instructions</a>: + <a href="9.0R/hardware.html">Hardware Notes</a>: + <a href="9.0R/readme.html">Readme</a>: + <a href="9.0R/errata.html">Errata</a> + </em></p> + + <h3>Legacy Releases</h3> <p><b>Release &rel2.current;</b> (&rel2.current.date;) <em> <a href="&u.rel2.announce;">Announcement</a> : @@ -62,16 +73,6 @@ <a href="&u.rel2.errata;">Errata</a> </em></p> - <h3>Legacy Releases</h3> - <p><b>Release &rel3.current;</b> (&rel3.current.date;) - <em> - <a href="&u.rel3.announce;">Announcement</a> : - <a href="&u.rel3.notes;">Release Notes</a> : - <a href="&u.rel3.hardware;">Hardware Notes</a> : - <a href="&u.rel3.readme;">Readme</a> : - <a href="&u.rel3.errata;">Errata</a> - </em></p> - <a name="future"></a> <h2>Future Releases</h2> @@ -102,16 +103,6 @@ Information</a> page.</p> <ul> - <li><b>9.0</b> (January 2012) - <em> - <a href="9.0R/announce.html">Announcement</a>: - <a href="9.0R/relnotes.html">Release Notes</a>: - <a href="9.0R/installation.html">Installation Instructions</a>: - <a href="9.0R/hardware.html">Hardware Notes</a>: - <a href="9.0R/readme.html">Readme</a>: - <a href="9.0R/errata.html">Errata</a> - </em></li> - <li><b>8.2</b> (February 2011) <em> <a href="8.2R/announce.html">Announcement</a>: @@ -142,6 +133,16 @@ </em> </li> + <li><b>7.4</b> (February 2011) + <em> + <a href="7.4R/announce.html">Announcement</a>: + <a href="7.4R/relnotes.html">Release Notes</a>: + <a href="7.4R/hardware.html">Hardware Notes</a>: + <a href="7.4R/readme.html">Readme</a>: + <a href="7.4R/errata.html">Errata</a> + </em> + </li> + <li><b>7.3</b> (March 2010) <em> <a href="7.3R/announce.html">Announcement</a>: diff --git a/en_US.ISO8859-1/htdocs/releng/index.xml b/en_US.ISO8859-1/htdocs/releng/index.xml index 549578c89c..9ac1db927d 100644 --- a/en_US.ISO8859-1/htdocs/releng/index.xml +++ b/en_US.ISO8859-1/htdocs/releng/index.xml @@ -52,7 +52,7 @@ <tr> <td>TBD</td> <td>&os; 8.4</td> - <td><!-- <a href="&base;/releases/8.4R/schedule.html">Target Schedule</a> --></td> + <td><a href="&base;/releases/8.4R/schedule.html">Target Schedule</a></td> </tr> <tr> @@ -146,14 +146,14 @@ <td><tt>RELENG_7</tt></td> <td>Open</td> <td>committers</td> - <td>Development branch for 7-STABLE.</td> + <td>Maintenance branch for 7-STABLE (not officially supported).</td> </tr> <tr> <td><tt>RELENG_7_4</tt></td> <td>Frozen</td> <td>&contact.so;</td> - <td>FreeBSD 7.4 supported errata fix branch.</td> + <td>FreeBSD 7.4 errata fix branch (not officially supported).</td> </tr> <tr> @@ -444,12 +444,10 @@ <p>The FreeBSD Project does not maintain a centralized historical archive of old release ISO images, but there are still many - options. First, a large collection of the old releases (many + options. A large collection of the old releases (many complete with the package sets) is at <a href="ftp://ftp-archive.FreeBSD.org/pub/FreeBSD-Archive/old-releases/"> ftp://ftp-archive.FreeBSD.org/pub/FreeBSD-Archive/old-releases/</a>. - Second, try looking on <a - href="http://mirrorlist.FreeBSD.org">http://mirrorlist.FreeBSD.org</a>. If you are unable to find an FTP mirror that still contains the release you are looking for, then you can email CD-ROM vendors to see if they have any old releases available. In September 2003, diff --git a/en_US.ISO8859-1/htdocs/search/sitemap.xml b/en_US.ISO8859-1/htdocs/search/sitemap.xml index ad6fd34457..cc1bdde25a 100644 --- a/en_US.ISO8859-1/htdocs/search/sitemap.xml +++ b/en_US.ISO8859-1/htdocs/search/sitemap.xml @@ -1061,7 +1061,7 @@ <term> <text>Project ideas</text> - <destination>&base;/projects/ideas/index.html</destination> + <destination>https://wiki.freebsd.org/IdeasPage</destination> </term> <term> @@ -1270,8 +1270,8 @@ </term> <term> - <text>Logo design competition</text> - <destination>http://logo-contest.FreeBSD.org/</destination> + <text>Logo</text> + <destination>&base;/logo.html</destination> </term> <term> @@ -1520,7 +1520,7 @@ <item> <text>Project Ideas</text> - <destination>&base;/projects/ideas/index.html</destination> + <destination>https://wiki.freebsd.org/IdeasPage</destination> </item> <item> @@ -1665,7 +1665,7 @@ <item> <text>FreeBSD Project Ideas</text> - <destination>&base;/projects/ideas/index.html</destination> + <destination>https://wiki.freebsd.org/IdeasPage</destination> </item> <item> diff --git a/en_US.ISO8859-1/htdocs/security/security.xml b/en_US.ISO8859-1/htdocs/security/security.xml index 30d36b48d8..0afd7d6254 100644 --- a/en_US.ISO8859-1/htdocs/security/security.xml +++ b/en_US.ISO8859-1/htdocs/security/security.xml @@ -101,6 +101,11 @@ <td>Release Engineering liaison,<br/> TrustedBSD Project liaison, system security architecture expert</td> </tr> + <tr valign="top"> + <td>&a.delphij; <a + href="mailto:delphij@FreeBSD.org"><delphij@FreeBSD.org></a></td> + <td>Deputy Security Officer</td> + </tr> </table> <p>The Security Officer is supported by the <a @@ -250,20 +255,6 @@ <th>Estimated EoL</th> </tr> <tr> - <td>RELENG_7</td> - <td>n/a</td> - <td>n/a</td> - <td>n/a</td> - <td>February 28, 2013</td> - </tr> - <tr> - <td>RELENG_7_4</td> - <td>7.4-RELEASE</td> - <td>Extended</td> - <td>February 24, 2011</td> - <td>February 28, 2013</td> - </tr> - <tr> <td>RELENG_8</td> <td>n/a</td> <td>n/a</td> @@ -421,6 +412,13 @@ <td>November 30, 2010</td> </tr> <tr> + <td>RELENG_7</td> + <td>n/a</td> + <td>n/a</td> + <td>n/a</td> + <td>February 28, 2013</td> + </tr> + <tr> <td>RELENG_7_0</td> <td>7.0-RELEASE</td> <td>Normal</td> @@ -449,6 +447,13 @@ <td>March 31, 2012</td> </tr> <tr> + <td>RELENG_7_4</td> + <td>7.4-RELEASE</td> + <td>Extended</td> + <td>February 24, 2011</td> + <td>February 28, 2013</td> + </tr> + <tr> <td>RELENG_8_0</td> <td>8.0-RELEASE</td> <td>Normal</td> diff --git a/en_US.ISO8859-1/htdocs/tutorials/index.xml b/en_US.ISO8859-1/htdocs/tutorials/index.xml deleted file mode 100644 index ed70f0ff24..0000000000 --- a/en_US.ISO8859-1/htdocs/tutorials/index.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN" -"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [ -<!ENTITY title "FreeBSD Tutorials"> -]> - -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>&title;</title> - - <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword> - </head> - - <body class="navinclude.about"> - - <p>A complete list of documentation pertaining to FreeBSD is now - available at <a href="../docs.html">../docs.html</a>. Please see - that list for further information.</p> - -</body> -</html> - diff --git a/en_US.ISO8859-1/htdocs/vendors.html b/en_US.ISO8859-1/htdocs/vendors.html deleted file mode 100644 index 3bf0a65ee1..0000000000 --- a/en_US.ISO8859-1/htdocs/vendors.html +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- $FreeBSD$ --> -<html> - <head> - <meta http-equiv="refresh" content="5;url=doc/en_US.ISO8859-1/books/handbook/mirrors.html" /> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>Vendors who provide FreeBSD</title> - </head> - - <body bgcolor="#ffffff"> - <p>The list of vendors who carry FreeBSD is available <a - href="doc/en_US.ISO8859-1/books/handbook/mirrors.html">as part of - the FreeBSD Handbook</a>. You should be automatically redirected - there in a few seconds. If not, please follow the link and update - your bookmarks. We apologize for the inconvenience.</p> - </body> -</html> diff --git a/en_US.ISO8859-1/htdocs/where.xml b/en_US.ISO8859-1/htdocs/where.xml index eaf6e9c29e..05fea09307 100644 --- a/en_US.ISO8859-1/htdocs/where.xml +++ b/en_US.ISO8859-1/htdocs/where.xml @@ -77,7 +77,7 @@ </tr> <tr> <td></td> - <td>amd64</td> + <td>amd64<br/>(x86-64, x64)</td> <td><a href="&url.rel;/amd64/amd64/&rel.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">[ISO]</a></td> </tr> @@ -123,7 +123,7 @@ </tr> <tr> <td></td> - <td>amd64</td> + <td>amd64<br/>(x86-64, x64)</td> <td><a href="&url.rel;/amd64/&rel2.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> @@ -145,6 +145,7 @@ <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> + <!-- <tr> <td colspan="2">FreeBSD &rel3.current;-RELEASE</td> <td colspan="2"></td> @@ -155,28 +156,29 @@ </tr> <tr> <td></td> - <td>amd64</td> - <!--<td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td>amd64<br/>(x86-64, x64)</td> + <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distribution]</a></td> <td colspan="2" align="right"><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>i386</td> - <!--<td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td> <td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>pc98</td> - <!--<td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td> <td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>sparc64</td> - <!--<td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td> <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> + --> </tbody> </table> diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml index 6c5a970307..3d92a21015 100644 --- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml +++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r40472 + Original revision: r41113 $FreeBSD$ --> @@ -23,77 +23,181 @@ <sect1 id="desktop-synopsis"> <title>¤³¤Î¾Ï¤Ç¤Ï</title> - <para>FreeBSD ¤Ç¤Ï¡¢Web ¥Ö¥é¥¦¥¶¤ä¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤È¤¤¤Ã¤¿ - ¤¿¤¯¤µ¤ó¤Î¼ïÎà¤Î¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ¤Þ¤¹¡£ - ¤½¤Î¿¤¯¤Ï packages ¤ä Ports Collection ¤òÍѤ¤¤ÆƳÆþ¤Ç¤¤Þ¤¹¡£ - ¿·¤·¤¤¥æ¡¼¥¶¤Î¿¤¯¤Ï¡¢ - ¥Ç¥¹¥¯¥È¥Ã¥×¤Ë¤³¤Î¼ï¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¤¢¤ë¤³¤È¤ò´üÂÔ¤·¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£ - ¤³¤Î¾Ï¤Ç¤Ï¡¢¿Íµ¤¤Î¹â¤¤¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò packages - ¤ä Ports Collection ¤«¤é´Êñ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para> - - <para>ports ¤«¤é¥×¥í¥°¥é¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¡¢ - ¤½¤Î¥×¥í¥°¥é¥à¤Ï¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÂоݤä¥Þ¥·¥ó¤ÎÀǽ¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢ - ¤³¤Îºî¶È¤Ë¤Ï¤È¤Æ¤â»þ´Ö¤¬¤«¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£ - ¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ë»þ´Ö¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ - Ports Collection ¤Ë¼ýÏ¿¤µ¤ì¤Æ¤¤¤ë¤Û¤È¤ó¤É¤Î¥×¥í¥°¥é¥à¤ò¡¢ - ¤¢¤é¤«¤¸¤á¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿ packages ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> - - <para>FreeBSD ¤Ë¤ª¤±¤ë Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤Ë¤è¤Ã¤Æ¡¢Linux - ÍѤ˳«È¯¤µ¤ì¤¿Â¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò - ¤¢¤Ê¤¿¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ç¤âÍøÍѤǤ¤Þ¤¹¡£ - ¤É¤ó¤Ê Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ç¤â¡¢ - »öÁ°¤Ë <xref linkend="linuxemu"/> ¤òÆɤó¤Ç¤ª¤¯¤³¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£ - Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍѤ¤¤¿ port - ¤Î¿¤¯¤Ï <quote>linux-</quote> ¤«¤é¤Ï¤¸¤Þ¤ë̾Á°¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ - &man.whereis.1; - ¤Ê¤É¤ò»È¤Ã¤ÆÆÃÄê¤Î port ¤òõ¤¹¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¤³¤È¤ò»×¤¤½Ð¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¤³¤Î¾Ï¤Ç¤Ï¡¢Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë - Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤ò͸ú¤Ë¤·¤Æ¤¢¤ë¤³¤È¤òÁ°Äó¤È¤·¤Þ¤¹¡£</para> - - <para>¤³¤Î¾Ï¤Ç¤Ï¡¢°Ê²¼¤ÎʬÌî¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para> + <para>&os; ¤ÏÀǽ¤ä°ÂÄêÀ¤Ë¤è¤ê¥µ¡¼¥Ð¤È¤·¤Æ¿Íµ¤¤¬¤¢¤ë°ìÊý¤Ç¡¢ + Æü¡¹¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤È¤·¤Æ¤ÎÍøÍѤˤâŬ¤·¤Æ¤¤¤Þ¤¹¡£<link + linkend="packages-using">packages</link> ¤ä <link + linkend="ports-using">ports</link> ¤«¤é + &os.numports; ¤òĶ¤¨¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ¤ë¤Î¤Ç¡¢ + ¤µ¤Þ¤¶¤Þ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÆ°¤«¤»¤ë¤è¤¦¤Ë¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ç¥¹¥¯¥È¥Ã¥×¤òºî¤ê¾å¤²¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ + ¤³¤Î¾Ï¤Ç¤Ï¡¢packages ¤ä Ports Collection + ¤òÍѤ¤¤Æ¡¢¿Íµ¤¤Î¹â¤¤¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò³Ú¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</para> + + <para>&os; ¤Ï¡¢<link linkend="linuxemu">&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹</link> + µ¡Ç½¤ò»ý¤Ä¤Î¤Ç¡¢&linux; ÍѤ˳«È¯¤µ¤ì¤¿Â¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò + &os; ¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ç¤âÍøÍѤǤ¤Þ¤¹¡£ + &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤òÍѤ¤¤¿ port + ¤Î¿¤¯¤Ï <quote>linux-</quote> ¤«¤é¤Ï¤¸¤Þ¤ë̾Á°¤ò»ý¤Á¤Þ¤¹¡£ + ¤³¤Î¾Ï¤Ç¤Ï¡¢&linux; ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë + &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤¬Í¸ú¤Ç¤¢¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para> + + <para>¤³¤Î¾Ï¤Ç¤Ï¡¢ + °Ê²¼¤Î¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para> - <itemizedlist> - <listitem> - <para>Web ¥Ö¥é¥¦¥¶ (<application>Firefox</application>, - <application>Opera</application>, - <application>Konqueror</application>, - <application>Chromium</application> ¤Ê¤É)</para> - </listitem> + <informaltable frame="none" pgwide="1"> + <tgroup cols="3"> + <thead> + <row> + <entry>ʬÌî</entry> + <entry>¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾</entry> + <entry>Package ̾</entry> + <entry>Ports ̾</entry> + </row> + </thead> - <listitem> - <para>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó (<application>KOffice</application>, - <application>AbiWord</application>, - <application>GIMP</application>, - <application>Apache OpenOffice</application>, - <application>LibreOffice</application> ¤Ê¤É)</para> - </listitem> + <tbody> + <row> + <entry>¥Ö¥é¥¦¥¶</entry> + <entry><application>Firefox</application></entry> + <entry><literal>firefox</literal></entry> + <entry><filename + role="package">www/firefox</filename></entry> + </row> - <listitem> - <para>¥É¥¥å¥á¥ó¥È¥Ó¥å¡¼¥¢ (<application>&acrobat.reader;</application>, - <application>gv</application>, - <application>Xpdf</application>, - <application>GQview</application> ¤Ê¤É)</para> - </listitem> + <row> + <entry>¥Ö¥é¥¦¥¶</entry> + <entry><application>Opera</application></entry> + <entry><literal>opera</literal></entry> + <entry><filename + role="package">www/opera</filename></entry> + </row> - <listitem> - <para>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢ (<application>GnuCash</application>, - <application>Gnumeric</application>, - <application>Abacus</application> ¤Ê¤É)</para> - </listitem> - </itemizedlist> + <row> + <entry>¥Ö¥é¥¦¥¶</entry> + <entry><application>Konqueror</application></entry> + <entry><literal>kde4-baseapps</literal></entry> + <entry><filename + role="package">x11/kde4-baseapps</filename></entry> + </row> + + <row> + <entry>¥Ö¥é¥¦¥¶</entry> + <entry><application>Chromium</application></entry> + <entry><literal>chromium</literal></entry> + <entry><filename + role="package">www/chromium</filename></entry> + </row> + + <row> + <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry> + <entry><application>Calligra</application></entry> + <entry><literal>calligra</literal></entry> + <entry><filename + role="package">editors/calligra</filename></entry> + </row> + + <row> + <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry> + <entry><application>AbiWord</application></entry> + <entry><literal>abiword</literal></entry> + <entry><filename + role="package">editors/abiword</filename></entry> + </row> + + <row> + <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry> + <entry><application>The GIMP</application></entry> + <entry><literal>gimp</literal></entry> + <entry><filename + role="package">graphics/gimp</filename></entry> + </row> + + <row> + <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry> + <entry><application>Apache + OpenOffice</application></entry> + <entry><literal>openoffice</literal></entry> + <entry><filename + role="package">editors/openoffice-3</filename></entry> + </row> + + <row> + <entry>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry> + <entry><application>LibreOffice</application></entry> + <entry><literal>libreoffice</literal></entry> + <entry><filename + role="package">editors/libreoffice</filename></entry> + </row> + + <row> + <entry>¥É¥¥å¥á¥ó¥È¥Ó¥å¡¼¥¢</entry> + <entry><application>&acrobat.reader;</application></entry> + <entry><literal>¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤ê package + ¤ÏÍøÍѤǤ¤Þ¤»¤ó¡£</literal></entry> + <entry><filename + role="package">print/acroread9</filename></entry> + </row> + + <row> + <entry>¥É¥¥å¥á¥ó¥È¥Ó¥å¡¼¥¢</entry> + <entry><application>gv</application></entry> + <entry><literal>gv</literal></entry> + <entry><filename + role="package">print/gv</filename></entry> + </row> + + <row> + <entry>¥É¥¥å¥á¥ó¥È¥Ó¥å¡¼¥¢</entry> + <entry><application>Xpdf</application></entry> + <entry><literal>xpdf</literal></entry> + <entry><filename + role="package">graphics/xpdf</filename></entry> + </row> + + <row> + <entry>¥É¥¥å¥á¥ó¥È¥Ó¥å¡¼¥¢</entry> + <entry><application>GQview</application></entry> + <entry><literal>gqview</literal></entry> + <entry><filename + role="package">graphics/gqview</filename></entry> + </row> + + <row> + <entry>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</entry> + <entry><application>GnuCash</application></entry> + <entry><literal>gnucash</literal></entry> + <entry><filename + role="package">finance/gnucash</filename></entry> + </row> + + <row> + <entry>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</entry> + <entry><application>Gnumeric</application></entry> + <entry><literal>gnumeric</literal></entry> + <entry><filename + role="package">math/gnumeric</filename></entry> + </row> + + <row> + <entry>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</entry> + <entry><application>KMyMoney</application></entry> + <entry><literal>kmymoney-kde4</literal></entry> + <entry><filename + role="package">finance/kmymoney-kde4</filename></entry> + </row> + </tbody> + </tgroup> + </informaltable> <para>¤³¤Î¾Ï¤òÆɤàÁ°¤Ë¡¢°Ê²¼¤Î¤³¤È¤òÍý²ò¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para> <itemizedlist> <listitem> - <para>¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡ - (<xref linkend="ports"/>)</para> + <para>package ¤Þ¤¿¤Ï ports + ¤òÍѤ¤¤¿¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¡£</para> </listitem> <listitem> - <para>Linux ¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡ - (<xref linkend="linuxemu"/>)</para> + <para>&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤ò͸ú¤Ë¤¹¤ëÊýË¡¡£</para> </listitem> </itemizedlist> @@ -119,26 +223,29 @@ <secondary>web</secondary> </indexterm> - <para>FreeBSD ¤Ç¤Ï Web ¥Ö¥é¥¦¥¶¤Ï»öÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ + <para>&os; ¤Ç¤Ï Web ¥Ö¥é¥¦¥¶¤Ï»öÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ ¤½¤Î¤«¤ï¤ê¡¢Ports Collection ¤Î <ulink url="http://www.FreeBSD.org/ja/ports/www.html">www</ulink> - ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¿ô¿¤¯¤Î Web ¥Ö¥é¥¦¥¶ ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢ - ¤¹¤°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ë»þ´Ö¤¬¤Ê¤¤¾ì¹ç - (¥½¡¼¥¹¤«¤é¤Î¥³¥ó¥Ñ¥¤¥ë¤ÏÂçÊѤʻþ´Ö¤¬¤«¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹)¡¢ - ¿¤¯¤Î¥×¥í¥°¥é¥à¤ò packages ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> - - <para><application>KDE</application> ¤È - <application>GNOME</application> ¤Ç¤Ï¡¢¤Ï¤¸¤á¤«¤é HTML - ¥Ö¥é¥¦¥¶¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ + ¥«¥Æ¥´¥ê¤Ë¤Ï¿ô¿¤¯¤Î Web ¥Ö¥é¥¦¥¶ ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢ + ¿¤¯¤Î¥×¥í¥°¥é¥à¤ò packages ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤ê¡¢ + Ports Collection ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤Ç¤¤Þ¤¹¡£</para> + + <para><application>KDE</application> ¤ä + <application>GNOME</application> ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤Ë¤Ï¡¢ + ¤½¤ì¤¾¤ì HTML ¥Ö¥é¥¦¥¶¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¤³¤ì¤é¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤òÀßÄꤹ¤ë¤¿¤á¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï - <xref linkend="x11-wm"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + <link linkend="x11-wm"></link> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - <para>·Ú²÷¤Ê Web ¥Ö¥é¥¦¥¶¤òõ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢Ports Collection ¤«¤é + <para>·ÚÎ̤ʥ֥饦¥¶¤È¤·¤Æ¤Ï¡¢ <filename role="package">www/dillo2</filename>, <filename role="package">www/links</filename>, - <filename role="package">www/w3m</filename> ¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</para> + <filename role="package">www/w3m</filename> + ¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para> - <para>¤³¤ÎÀá¤Ç¤Ï¼¡¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para> + <para>¤³¤ÎÀá¤Ç¤Ï°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ë web ¥Ö¥é¥¦¥¶¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£ + ¤â¤·¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥ê¥½¡¼¥¹¤òÂçÎ̤˾ÃÈñ¤·¤¿¤ê¡¢ + ports ¤«¤é¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë»þ´Ö¤¬¤«¤«¤Ã¤¿¤ê¡¢ + ¤â¤·¤¯¤ÏÂ礤ʰ͸¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¤³¤È¤Ë¤Ä¤¤¤Æ¤â¿¨¤ì¤Þ¤¹¡£</para> <informaltable frame="none" pgwide="1"> <tgroup cols="4"> @@ -147,7 +254,7 @@ <entry>¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾</entry> <entry>ɬÍפʥ꥽¡¼¥¹</entry> <entry>port ¤«¤é¤Î¥¤¥ó¥¹¥È¡¼¥ë</entry> - <entry>¼Â¹Ô¤ËɬÍפȤʤë¼ç¤Ê´Ä¶</entry> + <entry>È÷¹Í</entry> </row> </thead> @@ -156,32 +263,28 @@ <entry><application>Firefox</application></entry> <entry>Ãæ</entry> <entry>½Å</entry> - <entry><application>Gtk+</application></entry> + <entry>&os; ¤ª¤è¤Ó &linux; ÈǤò¤¬ÍøÍѤǤ¤Þ¤¹¡£</entry> </row> <row> <entry><application>Opera</application></entry> <entry>¾¯</entry> <entry>·Ú</entry> - <entry>FreeBSD ÈÇ¤È Linux ÈǤòÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - Linux ÈǤΥХ¤¥Ê¥ê¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢ - Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤ò͸ú¤Ë¤·¡¢ - <application>linux-openmotif</application> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</entry> + <entry>&os; ¤È &linux; ÈǤòÍøÍѤǤ¤Þ¤¹¡£</entry> </row> <row> <entry><application>Konqueror</application></entry> <entry>Ãæ</entry> <entry>½Å</entry> - <entry><application>KDE</application> ¥é¥¤¥Ö¥é¥ê</entry> + <entry><application>KDE</application> ¥é¥¤¥Ö¥é¥ê¤òɬÍפȤ·¤Þ¤¹¡£</entry> </row> <row> <entry><application>Chromium</application></entry> <entry>Ãæ</entry> - <entry>Ãæ</entry> - <entry><application>Gtk+</application></entry> + <entry>½Å</entry> + <entry><application>Gtk+</application> ¤òɬÍפȤ·¤Þ¤¹¡£</entry> </row> </tbody> </tgroup> @@ -195,60 +298,57 @@ </indexterm> <para><application>Firefox</application> ¤Ï¡¢ - Àè¿ÊŪ¤Ç̵ÎÁ¤«¤Ä¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î°ÂÄꤷ¤¿¥Ö¥é¥¦¥¶¤Ç¤¹¡£ + Àè¿ÊŪ¤Ç̵ÎÁ¤«¤Ä¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î¥Ö¥é¥¦¥¶¤Ç¤¹¡£ &os; ¤Ë´°Á´¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£ - ɸ½à¤Ë¤è¤¯½àµò¤·¤¿ HTML ɽ¼¨¥¨¥ó¥¸¥ó¡¢¥¿¥Ö¥Ö¥é¥¦¥¸¥ó¥°¡¢¥Ý¥Ã¥×¥¢¥Ã¥×¥Ö¥í¥Ã¥¯¡¢ + ɸ½à¤Ë½àµò¤·¤¿ HTML ɽ¼¨¥¨¥ó¥¸¥ó¡¢¥¿¥Ö¥Ö¥é¥¦¥¸¥ó¥°¡¢¥Ý¥Ã¥×¥¢¥Ã¥×¥Ö¥í¥Ã¥¯¡¢ ³ÈÄ¥À¡¢¹â¤¤°ÂÁ´À¤Ê¤É¤¬ÆÃħ¤Ç¤¹¡£ <application>Firefox</application> ¤Ï <application>Mozilla</application> ¤Î¥³¡¼¥É¥Ù¡¼¥¹¤«¤éÇÉÀ¸¤·¤¿¥Ö¥é¥¦¥¶¤Ç¤¹¡£</para> - <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para> + <para>ºÇ¿·¤Î <application>Firefox</application> ¤Î package + ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen> - <para>¾å¤ÎÎã¤Ç¤Ï¡¢<application>Firefox</application> - ¤ÎºÇ¿·ÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£ - <application>Firefox</application> ±äĹ¥µ¥Ý¡¼¥ÈÈÇ + <para><application>Firefox</application> ±äĹ¥µ¥Ý¡¼¥ÈÈÇ (ESR: Extended Support Release) ¤òÍøÍѤ·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢ ¤«¤ï¤ê¤Ë°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r firefox-esr</userinput></screen> - <para>¥½¡¼¥¹¥³¡¼¥É¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÊý¤¬¹¥¤¤Ê¤é¡¢Ports Collection - ¤ò»È¤Ã¤Æ°Ê²¼¤Î¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£</para> + <para>¥í¡¼¥«¥é¥¤¥ºÈǤϡ¢<filename + role="package">www/firefox-i18n</filename> ¤ª¤è¤Ó <filename + role="package">www/firefox-esr-i18n</filename> + ¤«¤éÍøÍѤǤ¤Þ¤¹¡£</para> + + <para>¤«¤ï¤ê¤Ë¥½¡¼¥¹¥³¡¼¥É¤«¤é´õ˾¤Î <application>firefox</application> + ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï <filename + role="package">www/firefox</filename> ¤ò¥Ó¥ë¥É¤·¤Þ¤¹¤¬¡¢ + <literal>firefox</literal> ¤ÎÉôʬ¤Ï¡¢ + ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë ESR ¤ä¥í¡¼¥«¥é¥¤¥º¤ËÃÖ¤´¹¤¨¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para><application>Firefox</application> ESR ¤òÍøÍѤ¹¤ë¾ì¹ç¤Ï¡¢ - ¾å¤Î¥³¥Þ¥ó¥É¤Î <literal>firefox</literal> ¤ò - <literal>firefox-esr</literal> ¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para> - </sect2> - - <sect2 id="moz-java-plugin"> + <sect3 id="moz-java-plugin"> <title>Firefox ¤È &java; ¥×¥é¥°¥¤¥ó</title> <note> - <para>¤³¤ÎÀá¤È¼¡¤Î 2 ¤Ä¤ÎÀá¤Ç¤Ï¡¢<application>Firefox</application> + <para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>Firefox</application> ¤¬¤¢¤é¤«¤¸¤á¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para> </note> - <para>°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¡¢Ports Collection ¤«¤é - <application>OpenJDK 6</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - - <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6</userinput> -&prompt.root; <userinput>make install clean</userinput></screen> - - <para>¤½¤Î¸å¡¢ - <filename role="package">java/icedtea-web</filename> - port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + <para><filename role="package">java/icedtea-web</filename> ¤Ï¡¢ + Java ¥¢¥×¥ì¥Ã¥È¤ËÂФ·¡¢¥Õ¥ê¡¼¥½¥Õ¥È¤Î web ¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤òÄ󶡤·¤Þ¤¹¡£ + package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£port ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤Ë¤Ï¡¢ + °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web</userinput> &prompt.root; <userinput>make install clean</userinput></screen> <para>¤É¤Á¤é¤Î ports ¤â¡¢¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¤Þ¤Þ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - <para>¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë + <para>¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥×¥é¥°¥¤¥ó°ìÍ÷¤Î¥Ú¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£ @@ -260,9 +360,9 @@ <screen>&prompt.user; <userinput>ln -s /usr/local/lib/IcedTeaPlugin.so \ $HOME/.mozilla/plugins/</userinput></screen> - </sect2> + </sect3> - <sect2 id="moz-flash-plugin"> + <sect3 id="moz-flash-plugin"> <title>Firefox ¤È &adobe; &flash; ¥×¥é¥°¥¤¥ó</title> @@ -271,70 +371,62 @@ </indexterm> <para>&os; ÍѤΠ&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ÏÄ󶡤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ - ¤·¤«¤·¤Ê¤¬¤é¡¢Linux ¥Ð¡¼¥¸¥ç¥ó¤Î¥×¥é¥°¥¤¥ó¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥½¥Õ¥È¥¦¥§¥¢¥ì¥¤¥ä (wrapper) ¤¬Â¸ºß¤·¤Þ¤¹¡£ - ¤³¤Î wrapper ¤Ï¡¢&adobe; &acrobat; ¥×¥é¥°¥¤¥ó¤ä - &realplayer; ¥×¥é¥°¥¤¥ó¤Ê¤É¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para> + ¤·¤«¤·¤Ê¤¬¤é¡¢&linux; + ¥Ð¡¼¥¸¥ç¥ó¤Î¥×¥é¥°¥¤¥ó¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥½¥Õ¥È¥¦¥§¥¢¥ì¥¤¥ä (wrapper) ¤¬Â¸ºß¤·¤Þ¤¹¡£ + ¤³¤Î wrapper ¤Ï¡¢ + &realplayer; ¥×¥é¥°¥¤¥ó¤È¤¤¤Ã¤¿Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para> - <para>»ÈÍѤ·¤Æ¤¤¤ë &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆɬÍפʺî¶È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£</para> + <para>¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ͸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢ + °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <procedure> <step> - <title>&os; 7.X</title> - - <para> - <filename role="package">www/nspluginwrapper</filename> - port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ - ¤³¤Î port ¤Ï¡¢<filename role="package">emulators/linux_base-fc4</filename> - ¤È¤¤¤¦Âç¤¤Ê port ¤òɬÍפȤ·¤Þ¤¹¡£</para> - - <para>¼¡¤Ë¡¢ - <filename role="package">www/linux-flashplugin9</filename> - port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ - ¤³¤Î port ¤Ï¡¢&os; 7.X ¤Ë¤ª¤¤¤ÆÀµ¾ï¤ËÆ°ºî¤¹¤ë - &flash; 9.X ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para> - </step> - - <step> - <title>&os; 8.X °Ê¹ß</title> - <para> <filename role="package">www/nspluginwrapper</filename> - port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ + port ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ + ¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Î¤¿¤á package ¤ÏÍøÍѤǤ¤Þ¤»¤ó¡£ ¤³¤Î port ¤Ï¡¢<filename role="package">emulators/linux_base-f10</filename> ¤È¤¤¤¦Âç¤¤Ê port ¤òɬÍפȤ·¤Þ¤¹¡£</para> + </step> - <para>¼¡¤Ë¡¢<filename + <step> + <para><filename role="package">www/linux-f10-flashplugin11</filename> - port ¤«¤é &flash; 11.X ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para> - - <para>¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢ - °Ê²¼¤Î¤è¤¦¤Ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> + port ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ + ¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤ê¡¢package ¤ÏÍøÍѤǤ¤Þ¤»¤ó¡£</para> + </step> + <step> <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \ /usr/local/lib/browser_plugins/</userinput></screen> <para><filename class="directory">/usr/local/lib/browser_plugins</filename> - ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ - ¼êÆ°¤ÇºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> + ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para> </step> - </procedure> - <para>»ÈÍѤ·¤Æ¤¤¤ë &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤ËÂФ·¤ÆŬÀÚ¤Ê - &flash; port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¸å¤Ï¡¢ - ³Æ¥æ¡¼¥¶¤´¤È¤Ë <command>nspluginwrapper</command> - ¤ò»È¤Ã¤Æ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + <step> + <para>flash ¤òºÇ½é¤Ë»È¤¦Á°¤Ë¡¢ + ¥æ¡¼¥¶¤´¤È¤Ë°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para> - <screen>&prompt.user; <userinput>nspluginwrapper -v -a -i</userinput></screen> + <screen>&prompt.user; <userinput>nspluginwrapper -v -a -i</userinput></screen> - <para>¤½¤Î¸å¡¢¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢ - ¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ - <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¸½ºßÍøÍѲÄǽ¤Ê¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para> - </sect2> + <para>flash ¤¬¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¤é¡¢ + ³Æ¥æ¡¼¥¶¤Ï°Ê²¼¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> - <sect2 id="moz-swfdec-flash-plugin"> + <screen>&prompt.user; <userinput>nspluginwrapper -v -a -u</userinput></screen> + + <para>¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë + <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ + <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ + ¸½ºßÍøÍѲÄǽ¤Ê¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para> + </step> + + </procedure> + </sect3> + + <sect3 id="moz-swfdec-flash-plugin"> <title>Firefox ¤È Swfdec &flash; ¥×¥é¥°¥¤¥ó</title> @@ -344,18 +436,18 @@ SWF ¥Õ¥¡¥¤¥ë¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥×¥é¥°¥¤¥ó¤Ç¡¢Swfdec ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£ ¤³¤Î¥é¥¤¥Ö¥é¥ê¤Ï¡¢¸½ºß¤Ç¤âÀ¹¤ó¤Ë³«È¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para> - <para>¤â¤·¡¢¥³¥ó¥Ñ¥¤¥ë¤Ç¤¤Ê¤«¤Ã¤¿¤ê¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤¿¤¯¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ - ¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é package ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r swfdec-plugin</userinput></screen> - <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection + <para>package ¤òÍøÍѤǤ¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/www/swfdec-plugin</userinput> &prompt.root; <userinput>make install clean</userinput></screen> <para>¤½¤Î¸å¡¢¥Ö¥é¥¦¥¶¤òºÆµ¯Æ°¤·¤Æ¥×¥é¥°¥¤¥ó¤ò͸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + </sect3> </sect2> <sect2> @@ -366,53 +458,54 @@ </indexterm> <para><application>Opera</application> ¤Ï¡¢ - µ¡Ç½ËþºÜ¤Ç¡¢É¸½àµ¬³Ê¤Ë½àµò¤·¤¿ Web ¥Ö¥é¥¦¥¶¤Ç¤¹¡£ - ¤Þ¤¿¡¢¥á¡¼¥ë¤ª¤è¤Ó¥Ë¥å¡¼¥¹¥ê¡¼¥À¤ä¡¢IRC ¥¯¥é¥¤¥¢¥ó¥È¡¢ + µ¡Ç½ËþºÜ¤Ç¡¢É¸½àµ¬³Ê¤Ë½àµò¤·¤¿ Web ¥Ö¥é¥¦¥¶¤Ç¤¹¤¬¡¢ + ·ÚÎ̤ǹ⮤Ǥ¹¡£ + ¥á¡¼¥ë¤ª¤è¤Ó¥Ë¥å¡¼¥¹¥ê¡¼¥À¤ä¡¢IRC ¥¯¥é¥¤¥¢¥ó¥È¡¢ RSS/Atom ¥Õ¥£¡¼¥É¥ê¡¼¥À¡¢¤½¤Î¾¤¤¤í¤¤¤í¤Ê¤â¤Î¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ - ¤½¤ì¤Ë¤â¤«¤«¤ï¤é¤º¡¢<application>Opera</application> - ¤ÏÈæ³ÓŪ·Ú¤¯¡¢Èó¾ï¤Ë®¤¯Æ°ºî¤·¤Þ¤¹¡£ - FreeBSD <quote>¥Í¥¤¥Æ¥£¥Ö</quote>¥Ð¡¼¥¸¥ç¥ó¤È¡¢ - Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤Ë¤è¤Ã¤ÆÆ°ºî¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¤Î + &os; <quote>¥Í¥¤¥Æ¥£¥Ö</quote> ¥Ð¡¼¥¸¥ç¥ó¤È¡¢ + &linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤Ë¤è¤Ã¤ÆÆ°ºî¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¤Î 2 ¤Ä¤¬¤¢¤ê¤Þ¤¹¡£</para> - <para>FreeBSD ÈǤΠ<application>Opera</application> ¤Ç Web - ¤ò¸«¤ë¤Ë¤Ï¡¢¼¡¤Î package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para> + <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢&os; ÈǤΠ<application>Opera</application> + package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ + &linux; ÈǤò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢ + <literal>opera</literal> ¤ò <literal>linux-opera</literal> + ¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r opera</userinput></screen> - <para>°ìÉô¤Î FTP ¥µ¥¤¥È¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î packages ¤ÏÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ - °Ê²¼¤Î¤è¤¦¤ËÆþÎϤ¹¤ë¤³¤È¤Ç¡¢<application>Opera</application> - ¤ò Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> + <para>¤¢¤ë¤¤¤Ï Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ + °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢¥Í¥¤¥Æ¥£¥ÖÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/www/opera</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>Linux ÈǤΠ<application>Opera</application> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¾å¤ÎÎã¤Ç <literal>opera</literal> ¤ò + <para>&linux; ÈǤΠ<application>Opera</application> + ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢<literal>opera</literal> ¤ò <literal>linux-opera</literal> ¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para> - <para>&os; ÍѤΠ&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ÏÄ󶡤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤¬¡¢ - Linux ÈǤΥץ饰¥¤¥ó¤¬Â¸ºß¤·¤Þ¤¹¡£ - ¤³¤Î¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º <filename + <para>&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º <filename role="package">www/linux-f10-flashplugin11</filename> port - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ + ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£package ¤Ï¡¢¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤êÍøÍѤǤ¤Þ¤»¤ó¡£ ¤½¤Î¸å¡¢<filename role="package">www/opera-linuxplugins</filename> port - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + ¤â¤·¤¯¤Ï package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ + °Ê²¼¤ÎÎã¤Ç¤Ï¡¢Î¾Êý¤ò ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput> &prompt.root; <userinput>make install clean</userinput> &prompt.root; <userinput>cd /usr/ports/www/opera-linuxplugins</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>¥×¥é¥°¥¤¥ó¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò¼¡¤Î¤è¤¦¤Ë¤·¤Æ³Îǧ¤Ç¤¤Þ¤¹¡£ - ¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¡¢¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ + <para>¥¤¥ó¥¹¥È¡¼¥ë¤¬½ªÎ»¤·¤¿¤é¡¢ + ¥×¥é¥°¥¤¥ó¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¤«¤É¤¦¤«¤ò¥Ö¥é¥¦¥¶¤òµ¯Æ°¤·¤Æ³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ + ¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤Ë <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ ¸½ºßÍøÍѲÄǽ¤Ê¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para> <para><application>&java;</application> ¥×¥é¥°¥¤¥ó¤òÄɲ乤ë¤Ë¤Ï¡¢ - <link linkend="moz-java-plugin"> - Firefox ¤Ç¤Î¼ê½ç</link> ¤Ë¤·¤¿¤¬¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> + <link linkend="moz-java-plugin">Firefox ¤Ç¤Î¼ê½ç</link> + ¤Ë¤·¤¿¤¬¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> </sect2> <sect2> @@ -422,30 +515,31 @@ <primary><application>Konqueror</application></primary> </indexterm> - <para><application>Konqueror</application> ¤Ï - <application>KDE</application> ¤ò¹½À®¤¹¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ - ¤¿¤À¤·¡¢<application>KDE</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¯¤Æ¤â¡¢ - <filename role="package">x11/kdebase3</filename> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢Ã±ÂΤÇÆ°ºî¤µ¤»¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ + <para><application>Konqueror</application> ¤Ï <filename + role="package">x11/kde4-baseapps</filename> + ¤ò¹½À®¤¹¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ <application>Konqueror</application> ¤Ï¥Ö¥é¥¦¥¶¤Ç¤¢¤ë¤ÈƱ»þ¤Ë¡¢ ¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ª¤è¤Ó¥Þ¥ë¥Á¥á¥Ç¥£¥¢¥Ó¥å¡¼¥¢¤ÎÌò³ä¤â²Ì¤¿¤·¤Þ¤¹¡£</para> - <para><application>Konqueror</application> - ¤Ë¤Ï¥×¥é¥°¥¤¥ó°ì¼°¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢ - <filename role="package">misc/konq-plugins</filename> - ¤òÍøÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> - - <para><application>Konqueror</application> KHTML ¤È¤È¤â¤Ë¡¢WebKit - ¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£WebKit ¤Ï Chromium ¤Ê¤ÉºÇ¶á¤Î¥Ö¥é¥¦¥¶¤Î¿¤¯¤ÇºÎÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£ + <para><application>Konqueror</application> ¤Ï¡¢KHTML ¤È¤È¤â¤Ë¡¢WebKit + ¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£WebKit ¤Ï Chromium + ¤Ê¤ÉºÇ¶á¤Î¥Ö¥é¥¦¥¶¤Î¿¤¯¤ÇºÎÍѤµ¤ì¤Æ¤¤¤ë¥ì¥ó¥À¥ê¥ó¥°¥¨¥ó¥¸¥ó¤Ç¤¹¡£ &os; ¤Î <application>Konqueror</application> ¤Ç WebKit - ¤ò»È¤¦¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + ¤ò»È¤¦¤Ë¤Ï <filename + role="package">www/kwebkitpart</filename> package ¤Þ¤¿¤Ï¡¢ + port ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ + °Ê²¼¤ÎÎã¤Ç¤Ï¡¢port ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/www/kwebkitpart</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>¤½¤Î¸å¡¢<application>Konqueror</application> ¤Ë¤ª¤¤¤Æ¡¢ + <para><application>Konqueror</application> ¤Ç¡¢WebKit ¤ò͸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢ <quote>Settings</quote>, <quote>Configure Konqueror</quote> - ¤òÁªÂò¤·¡¢<quote>Change KHTML to WebKit</quote> ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£ + <quote>General</quote> ¤ÎÀßÄê¥Ú¡¼¥¸¤Ë¤ª¤¤¤Æ¡¢ + ¥É¥í¥Ã¥×¥À¥¦¥ó¥á¥Ë¥å¡¼¤«¤é + <quote>Default web browser engine</quote> ¤ò¥¯¥ê¥Ã¥¯¤·¡¢ + <quote>WebKit</quote> ¤ò<quote>KHTML</quote> ¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <para><application>Konqueror</application> ¤Ï <application>&flash;</application> ¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£ @@ -483,35 +577,25 @@ &prompt.root; <userinput>make install clean</userinput></screen> <note> - <para><application>Chromium</application> ¤Ï¡¢ - <filename>/usr/local/bin/chrome</filename> ¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£ + <para><application>Chromium</application> ¤Î¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¤Ï¡¢ + <filename>/usr/local/bin/chrome</filename> ¤Ç¤¹¡£ <filename>/usr/local/bin/chromium</filename> ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para> </note> - </sect2> - <sect2 id="chromium-java-plugin"> + <sect3 id="chromium-java-plugin"> <title>Chromium ¤È &java; ¥×¥é¥°¥¤¥ó</title> <note> - <para>¤³¤ÎÀá¤Ç¤Ï¡¢<application>Chromium</application> + <para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>Chromium</application> ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para> </note> - <para>°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¡¢Ports Collection ¤«¤é - <application>OpenJDK 6</application> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - - <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6 -&prompt.root; make install clean</userinput></screen> - - <para>¤½¤Î¸å¡¢Ports Collection ¤«¤é <filename - role="package">java/icedtea-web</filename> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + <para>&java; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢ + <link linkend="moz-java-plugin"></link> + ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> - <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web -&prompt.root; make install clean</userinput></screen> - - <para><application>Chromium</application> ¤òµ¯Æ°¤·¡¢ - ¥¢¥É¥ì¥¹¥Ð¡¼¤Ë¡¢ + <para>&java; ¤Î¥µ¥Ý¡¼¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢ + <application>Chromium</application> ¤òµ¯Æ°¤·¡¢¥¢¥É¥ì¥¹¥Ð¡¼¤Ë¡¢ <literal>about:plugins</literal> ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥×¥é¥°¥¤¥ó¤Î°ìÍ÷¤Ë IcedTea-Web ¤¬Äɲ䵤ì¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¡£</para> @@ -523,24 +607,18 @@ <screen>&prompt.root; <userinput>mkdir -p /usr/local/share/chromium/plugins &prompt.root; ln -s /usr/local/lib/IcedTeaPlugin.so \ /usr/local/share/chromium/plugins/</userinput></screen> - </sect2> - - <sect2 id="chromium-flash-plugin"> - <title>Chromium ¤È &adobe; &flash; ¥×¥é¥°¥¤¥ó</title> - - <note> - <para>¤³¤ÎÀá¤Ç¤Ï¡¢<application>Chromium</application> - ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£</para> - </note> - - <para><application>Chromium</application> ¤È &adobe; &flash; - ¤ÎÀßÄê¤Ï¡¢<link - linkend="moz-flash-plugin">Firefox ¤Î¼ê½ç</link> ¤ÈƱ¤¸¤Ç¤¹¡£ - &os; ¤Ë &adobe; &flash; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢ - ¾åµ¤Î¾Ï¤ò»²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ - <application>Chromium</application> - ¤Ï¡¢Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤¤ë¤Î¤Ç¡¢ - ÄɲäÎÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para> + </sect3> + + <sect3 id="chromium-flash-plugin"> + <title>Chromium ¤È &adobe; &flash; ¥×¥é¥°¥¤¥ó</title> + + <para><application>Chromium</application> ¤È &adobe; &flash; + ¤ÎÀßÄê¤Ï¡¢<link + linkend="moz-flash-plugin">Firefox ¤Î¼ê½ç</link> ¤ÈƱ¤¸¤Ç¤¹¡£ + <application>Chromium</application> + ¤Ï¡¢Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤¤ë¤Î¤Ç¡¢ + ÄɲäÎÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para> + </sect3> </sect2> </sect1> @@ -554,10 +632,13 @@ <application>KDE</application> ¤Î¤è¤¦¤Ê <link linkend="x11-wm">¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶</link> ¤Ï¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£ - FreeBSD ¤Ï¡¢¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤Ë¤«¤«¤ï¤é¤º - ɬÍפʤâ¤Î¤Ï¤¹¤Ù¤ÆÄ󶡤·¤Æ¤¤¤Þ¤¹¡£</para> + ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤Ë¤«¤«¤ï¤é¤º¡¢&os; ¤Ç¤Ï¡¢ + ¤¤¤¯¤Ä¤â¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¡¢Ê¸½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¤òÍøÍѤǤ¤Þ¤¹¡£</para> - <para>¤³¤ÎÀá¤Ç¤Ï¼¡¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para> + <para>¤³¤ÎÀá¤Ç¤Ï¡¢°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ëÀ¸»ºÅª¤Ê¥½¥Õ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£ + ¤â¤·¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥ê¥½¡¼¥¹¤òÂçÎ̤˾ÃÈñ¤·¤¿¤ê¡¢ + ports ¤«¤é¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë»þ´Ö¤¬¤«¤«¤Ã¤¿¤ê¡¢ + ¤â¤·¤¯¤ÏÂ礤ʰ͸¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¤³¤È¤Ë¤Ä¤¤¤Æ¤â¿¨¤ì¤Þ¤¹¡£</para> <informaltable frame="none" pgwide="1"> <tgroup cols="4"> @@ -572,7 +653,7 @@ <tbody> <row> - <entry><application>KOffice</application></entry> + <entry><application>Calligra</application></entry> <entry>¾¯</entry> <entry>½Å</entry> <entry><application>KDE</application></entry> @@ -598,7 +679,7 @@ OpenOffice</application></entry> <entry>¿</entry> <entry>ÇüÂç</entry> - <entry><application>&jdk;</application>, + <entry><application>&jdk;</application> ¤ª¤è¤Ó <application>Mozilla</application></entry> </row> @@ -616,43 +697,42 @@ </informaltable> <sect2> - <title>KOffice</title> + <title>Calligra</title> <indexterm> - <primary><application>KOffice</application></primary> + <primary><application>Calligra</application></primary> </indexterm> <indexterm> <primary>¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È</primary> - <secondary><application>KOffice</application></secondary> + <secondary><application>Calligra</application></secondary> </indexterm> <para>KDE ¥³¥ß¥å¥Ë¥Æ¥£¤Ï¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤È¤È¤â¤Ë¡¢ <application>KDE</application> ´Ä¶°Ê³°¤Ç¤âÍøÍѲÄǽ¤Ê ¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£ - ¤³¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤Ë¤Ï¡¢Â¾¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤ÈƱÍͤˡ¢ - 4 ¤Ä¤Îɸ½àŪ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ - <application>KWord</application> ¤Ï¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¡¢ - <application>KSpread</application> ¤Ïɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢ - <application>KPresenter</application> + <application>Calligra</application> ¤Ë¤Ï¡¢Â¾¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤ÈƱÍͤˡ¢ + ɸ½àŪ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ + <application>Words</application> ¤Ïʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¡¢ + <application>Sheets</application> ¤Ïɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢ + <application>Stage</application> ¤Ï¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢¤½¤·¤Æ - <application>Kontour</application> ¤Ï¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£</para> + <application>Karbon</application> ¤Ï¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£</para> <para>ºÇ¿·¤Î <application>KOffice</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢»öÁ°¤Ë <application>KDE</application> ¤òºÇ¿·¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para> - <para><application>KDE4</application> ¤Î - <application>KOffice</application> ¤ò package - ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> + <para><filename + role="package">editors/calligra</filename> ¤Ï¡¢package ¤Þ¤¿¤Ï port + ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë½ÐÍè¤Þ¤¹¡£ + package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> - <screen>&prompt.root; <userinput>pkg_add -r koffice-kde4</userinput></screen> + <screen>&prompt.root; <userinput>pkg_add -r calligra</userinput></screen> - <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤Ç¤â Ports Collection ¤òÍøÍѤǤ¤Þ¤¹¡£ - ¤¿¤È¤¨¤Ð¡¢<application>KDE4</application> ¤Î - <application>KOffice</application> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> + <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤Ï¡¢¤«¤ï¤ê¤Ë Ports Collection + ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para> - <screen>&prompt.root; <userinput>cd /usr/ports/editors/koffice-kde4</userinput> + <screen>&prompt.root; <userinput>cd /usr/ports/editors/calligra</userinput> &prompt.root; <userinput>make install clean</userinput></screen> </sect2> @@ -667,20 +747,18 @@ ¤Ï¡¢<application>µsoft; Word</application> ¤Î¤è¤¦¤Ê¸«¤¿ÌܤäÁàºî´¶¤ò»ý¤Ä¥Õ¥ê¡¼¤Î¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¤Ç¤¹¡£ ½ñÎà¤ä¼ê»æ¡¢Êó¹ð½ñ¡¢¥á¥â¤Ê¤É¤ò½ñ¤¯¤Î¤ËŬ¤·¤Æ¤¤¤Þ¤¹¡£ - Èó¾ï¤Ë®¤¯¡¢Â¿¤¯¤ÎÆÃħ¤¬¤¢¤ê¡¢Èó¾ï¤Ë¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ç¤¹¡£</para> + ®¤¯¡¢Â¿¤¯¤ÎÆÃħ¤¬¤¢¤ê¡¢¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ç¤¹¡£</para> <para><application>AbiWord</application> ¤Ï¡¢ µsoft; <filename>.doc</filename> ¤Î¤è¤¦¤ÊÆȼ«»ÅÍͤò´Þ¤à¿¤¯¤Î·Á¼°¤Î¥Õ¥¡¥¤¥ë¤òÆɤ߽ñ¤¤Ç¤¤Þ¤¹¡£</para> - <para>¼¡¤Î¤è¤¦¤Ë¤·¤Æ <application>AbiWord</application> ¤ò package - ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> + <para><application>AbiWord</application> ¤ò package + ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r abiword</userinput></screen> - <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤Ç¤â Ports Collection ¤òÍøÍѤǤ¤Þ¤¹¡£ - ¤ª¤½¤é¤¯ Ports Collection ¤ÎÊý¤¬¿·¤·¤¤¤Ç¤·¤ç¤¦¡£ - ¼¡¤Î¤è¤¦¤Ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para> + <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/editors/abiword</userinput> &prompt.root; <userinput>make install clean</userinput></screen> @@ -695,7 +773,7 @@ <para>²èÁü¤òÉÁ²è¤·¤¿¤ê¼Ì¿¿¤ò½¤Àµ¤¹¤ë¤³¤È¤Ë´Ø¤·¤Æ¡¢ <application>GIMP</application> - ¤Ï¤È¤Æ¤âÀöÎý¤µ¤ì¤¿ÊÔ½¸¥×¥í¥°¥é¥à¤Ç¤¹¡£ + ¤ÏÀöÎý¤µ¤ì¤¿ÊÔ½¸¥×¥í¥°¥é¥à¤Ç¤¹¡£ ñ½ã¤Ë¤ª³¨¤«¤¥½¥Õ¥È¥¦¥§¥¢¤È¤·¤Æ»È¤¦¤³¤È¤â¤Ç¤¤Þ¤¹¤·¡¢ ¹âÉʼÁ¤Ê¼Ì¿¿¤Î²Ã¹©¥Ä¡¼¥ë¤È¤·¤Æ¤â»È¤¨¤Þ¤¹¡£ ¿¤¯¤Î¥×¥é¥°¥¤¥ó¤ËÂбþ¤·¤Æ¤ª¤ê¡¢ @@ -704,33 +782,20 @@ ¤Ï¤µ¤Þ¤¶¤Þ¤Ê·Á¼°¤Î¥Õ¥¡¥¤¥ë¤òÆɤ߽ñ¤¤Ç¤¡¢ ¥¹¥¥ã¥Ê¤ä¥¿¥Ö¥ì¥Ã¥È¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para> - <para>¼¡¤Î¥³¥Þ¥ó¥É¤Ë¤è¤ê package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> + <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r gimp</userinput></screen> - <para>ÍøÍѤ·¤Æ¤¤¤ë FTP ¥µ¥¤¥È¤Ë¤³¤Î package ¤¬¤Ê¤¤¾ì¹ç¤Ç¤â¡¢ - Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£ - Ports Collection ¤Î <ulink - url="http://www.FreeBSD.org/ja/ports/graphics.html">graphics</ulink> - ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï <application>Gimp ¥Þ¥Ë¥å¥¢¥ë</application>¤â¤¢¤ê¤Þ¤¹¡£ - ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£</para> + <para>¤â¤·¤¯¤Ï¡¢Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput> -&prompt.root; <userinput>make install clean</userinput> -&prompt.root; <userinput>cd /usr/ports/graphics/gimp-manual-pdf</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <note> - <para>Ports Collection ¤Î <ulink - url="http://www.FreeBSD.org/ja/ports/graphics.html">graphics</ulink> - ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï <application>GIMP</application> - ¤Î³«È¯ÈǤǤ¢¤ë - <filename role="package">graphics/gimp-devel</filename> - ¤¬¤¢¤ê¤Þ¤¹¡£ - <application>Gimp ¥Þ¥Ë¥å¥¢¥ë</application> ¤Î HTML ¥Ð¡¼¥¸¥ç¥ó¤Ï - <filename role="package">graphics/gimp-manual-html</filename> - ¤Ë¤¢¤ê¤Þ¤¹¡£</para> - </note> + <para>Ports Collection ¤Î <ulink + url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink> + ¥«¥Æ¥´¥ê¤Ë¤Ï¡¢<application>GIMP</application> ¤Ë´ØÏ¢¤·¤¿¥×¥é¥°¥¤¥ó¡¢ + ¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥æ¡¼¥¶¥Þ¥Ë¥å¥¢¥ë¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</para> + </sect2> <sect2> @@ -748,7 +813,7 @@ </secondary> </indexterm> - <para>2011 ǯ 7 ·î 1 Æü¡¢Oracle Corporation ¤Ï + <para>2011 ǯ 7 ·î 1 Æü¡¢&oracle; ¤Ï <application>OpenOffice.org</application> ¤Î¥³¡¼¥É¥Ù¡¼¥¹¤ò Apache Software Foundation ¤Ø´ó£¤·¤Þ¤·¤¿¡£ ¸½ºß <application>OpenOffice.org</application> ¤Ï¡¢ @@ -771,74 +836,65 @@ ¥Ý¡¼¥¿¥Ó¥ê¥Æ¥£¤ä½ÀÆðÀ¤ò¹â¤á¤Æ¤¤¤Þ¤¹¡£ ɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ï¥Þ¥¯¥íµ¡Ç½¤¬¤¢¤ê¡¢ ³°Éô¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÈÀܳ¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£ - <application>Apache OpenOffice</application> ¤Ï¡¢¤¹¤Ç¤Ë - &windows;, &solaris;, Linux, FreeBSD, &macos; X + <application>Apache OpenOffice</application> ¤Ï¡¢ + &windows;, &linux;, &os; ¤ª¤è¤Ó &macos; X ¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤Þ¤¹¡£ <application>Apache OpenOffice</application> - ¤Ë¤Ä¤¤¤Æ¤Î¾Ü¤·¤¤¾ðÊó¤Ï¡¢<ulink + ¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢<ulink url="http://incubator.apache.org/openofficeorg/">Apache OpenOffice web ¥µ¥¤¥È</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢<ulink - url="http://porting.openoffice.org/freebsd/">FreeBSD Apache - OpenOffice ¥×¥í¥¸¥§¥¯¥È¥Á¡¼¥à</ulink> - ¤Î Web ¥µ¥¤¥È¤«¤é¡¢FreeBSD ÆÃͤξðÊó¤ä + url="http://porting.openoffice.org/freebsd/">&os; Apache + OpenOffice °Ü¿¢¥Á¡¼¥à</ulink> + ¤Î web ¥µ¥¤¥È¤«¤é¡¢&os; ÆÃͤξðÊó¤ä packages ¤òľÀܼèÆÀ¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£</para> - <para><application>Apache OpenOffice</application> + <para><application>Apache OpenOffice</application> package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen> <note> <para>&os; ¤Î¥ê¥ê¡¼¥¹ÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤ÎÁàºî¤Ï¤¦¤Þ¤¯¤¤¤¯¤Ç¤·¤ç¤¦¡£ - ¤½¤ì°Ê³°¤ÎÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢&os; <application>Apache OpenOffice</application> - °Ü¿¢¥Á¡¼¥à¤Î web ¥µ¥¤¥È¤«¤éŬÀڤʥѥ屡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢ + ¤½¤ì°Ê³°¤ÎÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢ + &os; <application>Apache OpenOffice</application> + °Ü¿¢¥Á¡¼¥à¤Î web ¥µ¥¤¥È¤«¤éŬÀÚ¤Ê package ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢ &man.pkg.add.1; ¤ò»ÈÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¤³¤³¤«¤é¤Ï¥ê¥ê¡¼¥¹ÈǤȳ«È¯ÈǤÎξÊý¤¬¥À¥¦¥ó¥í¡¼¥É¤Ç¤¤Þ¤¹¡£</para> + ¤³¤Î¥¦¥§¥Ö¥µ¥¤¥È¤«¤é¡¢¥ê¥ê¡¼¥¹ÈǤȳ«È¯ÈǤÎξÊý¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤¤Þ¤¹¡£</para> </note> - <para>package - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ¹¤ë¤È¡¢ - <application>Apache OpenOffice</application> ¤¬µ¯Æ°¤·¤Þ¤¹¡£</para> + <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ + <application>Apache OpenOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.user; <userinput>openoffice-<replaceable>X.Y.Z</replaceable></userinput></screen> <para>¤³¤³¤Ç <replaceable>X.Y.Z</replaceable> ¤Ï¡¢ - <replaceable>3.4.0</replaceable> ¤Î¤è¤¦¤Ê¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë + ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë <application>Apache OpenOffice</application> ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£</para> <note> - <para>½é²óµ¯Æ°»þ¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬ɽ¼¨¤µ¤ì¡¢ - ¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë <filename>.openoffice.org</filename> + <para>½é²óµ¯Æ°»þ¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬¹Ô¤ï¤ì¡¢ + ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë <filename>.openoffice.org</filename> ¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para> </note> - <para><application>Apache OpenOffice</application> ¤Î packages - ¤òÍøÍѤǤ¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢port ¤òÍøÍѤ¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¤¬¡¢ - ¥³¥ó¥Ñ¥¤¥ë¤Ë¤ÏÂ礤ʥǥ£¥¹¥¯¥¹¥Ú¡¼¥¹¤È¡¢ - ËÜÅö¤Ë¤«¤Ê¤êŤ¤»þ´Ö¤òɬÍפȤ¹¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para> + <para>´õ˾¤Î <application>Apache OpenOffice</application> ¤Î packages + ¤òÍøÍѤǤ¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢port ¤òÍøÍѤ¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£ + ¤·¤«¤·¤Ê¤¬¤é¡¢¥³¥ó¥Ñ¥¤¥ë¤Ë¤ÏÂ礤ʥǥ£¥¹¥¯¥¹¥Ú¡¼¥¹¤È¡¢ + ËÜÅö¤Ë¤«¤Ê¤êŤ¤»þ´Ö¤òɬÍפȤ·¤Þ¤¹¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-3</userinput> &prompt.root; <userinput>make install clean</userinput></screen> <note> - <para>ÃÏ°è²½¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤ò¥Ó¥ë¥É¤·¤¿¤¤¤Î¤Ê¤é¡¢ + <para>ÃÏ°è²½¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤ò¥Ó¥ë¥É¤¹¤ë¤Ë¤Ï¡¢ ¾åµ¥³¥Þ¥ó¥É¤ÎÂå¤ï¤ê¤Ë°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ²¼¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>make LOCALIZED_LANG=<replaceable>your_language</replaceable> install clean</userinput></screen> <para><replaceable>your_language</replaceable> ¤òÀµ¤·¤¤¸À¸ì ISO ¥³¡¼¥É¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£ ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¸À¸ì¥³¡¼¥É¤Ï¡¢Æ±¤¸ port ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë - <filename>files/Makefile.localized</filename> ¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para> + <filename>files/Makefile.localized</filename> ¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para> </note> - - <para>¥¤¥ó¥¹¥È¡¼¥ë¤¬½ª¤ï¤Ã¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç - <application>Apache OpenOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - - <screen>&prompt.user; <userinput>openoffice-<replaceable>X.Y.Z</replaceable></userinput></screen> - - <para>¤³¤³¤Ç <replaceable>X.Y.Z</replaceable> ¤Ï¡¢ - <replaceable>3.4.0</replaceable> ¤Î¤è¤¦¤Ê¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë - <application>Apache OpenOffice</application> ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£</para> </sect2> <sect2> @@ -859,7 +915,7 @@ ¾¤Î¥á¥¸¥ã¡¼¤Ê¥ª¥Õ¥£¥¹¥¹¥£¡¼¥È¤È¸ß´¹À¤¬¤¢¤ê¡¢ ¤µ¤Þ¤¶¤Þ¤Ê¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ÇÍøÍѤǤ¤Þ¤¹¡£ ´°Á´¤Ê¥ª¥Õ¥£¥¹À¸»ºÀ¥¹¥£¡¼¥È¤Ëɬ¿Ü¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó - (¥ï¡¼¥É¥×¥í¥»¥Ã¥µ¡¢É½·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢ + (ʸ½ñºîÀ®¥½¥Õ¥È¥¦¥§¥¢¡¢É½·×»»¥½¥Õ¥È¥¦¥§¥¢¡¢¥×¥ì¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Õ¥È¥¦¥§¥¢¡¢ ¿Þ·ÁÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¡¢¿ô¼°¥¨¥Ç¥£¥¿) ¤ò¤¹¤Ù¤Æ·¤¨¤Æ¤¤¤ë <application>OpenOffice.org</application> ¤«¤é¤Î¿·¤·¤¤¥Õ¥©¡¼¥¯¤Ç¤¹¡£ @@ -872,23 +928,26 @@ ¥Ý¡¼¥¿¥Ó¥ê¥Æ¥£¤ä½ÀÆðÀ¤ò¹â¤á¤Æ¤¤¤Þ¤¹¡£ ɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ï¥Þ¥¯¥íµ¡Ç½¤¬¤¢¤ê¡¢ ³°Éô¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÈÀܳ¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£ - <application>LibreOffice</application> ¤Ï¡¢¤¹¤Ç¤Ë - &windows;, &solaris;, Linux, FreeBSD, &macos; X + <application>LibreOffice</application> ¤Ï¡¢ + &windows;, &solaris;, &linux;, &os;, &macos; X ¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤Þ¤¹¡£ <application>LibreOffice</application> ¤Ë¤Ä¤¤¤Æ¤Î¾Ü¤·¤¤¾ðÊó¤Ï¡¢ <ulink url="http://www.libreoffice.org/">LibreOffice ¥¦¥§¥Ö¥µ¥¤¥È</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para> - <para>package ¤«¤é <application>LibreOffice</application> + <para>±Ñ¸ìÈǤΠ<application>LibreOffice</application> package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen> - <note> - <para>&os; ¤Î¥ê¥ê¡¼¥¹ÈǤò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢ - ¤³¤ÎÁàºî¤Ï¤¦¤Þ¤¯¤¤¤¯¤Ç¤·¤ç¤¦¡£</para> - </note> + <para>Ports Collection ¤Î <ulink + url="http://www.FreeBSD.org/ports/editors.html">editors</ulink> + ¥«¥Æ¥´¥ê¤Ë¤Ï¡¢ÃÏ°è²½¤µ¤ì¤¿ <application>LibreOffice</application> + ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ + ÃÏ°è²½¤µ¤ì¤¿ package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢ + <literal>libreoffice</literal> ¤òÃÏ°è²½¤µ¤ì¤¿ + package ̾¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para> <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç <application>LibreOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -896,35 +955,29 @@ <screen>&prompt.user; <userinput>libreoffice</userinput></screen> <note> - <para>½é²óµ¯Æ°»þ¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬ɽ¼¨¤µ¤ì¡¢ - ¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë <filename class="directory">.libreoffice</filename> + <para>½é²óµ¯Æ°»þ¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¼ÁÌ䤬¹Ô¤ï¤ì¡¢ + ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë + <filename class="directory">.libreoffice</filename> ¥Õ¥©¥ë¥À¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para> </note> - <para><application>LibreOffice.org</application> ¤Î packages - ¤òÍøÍѤǤ¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢port ¤òÍøÍѤ¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¤¬¡¢ - ¥³¥ó¥Ñ¥¤¥ë¤Ë¤ÏÂ礤ʥǥ£¥¹¥¯¥¹¥Ú¡¼¥¹¤È¡¢ - ËÜÅö¤Ë¤«¤Ê¤êŤ¤»þ´Ö¤òɬÍפȤ¹¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para> + <para>´õ˾¤Î <application>LibreOffice</application> ¤Î packages + ¤òÍøÍѤǤ¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢port ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£ + ¤·¤«¤·¤Ê¤¬¤é¡¢¥³¥ó¥Ñ¥¤¥ë¤Ë¤ÏÂ礤ʥǥ£¥¹¥¯¥¹¥Ú¡¼¥¹¤È¡¢ + ËÜÅö¤Ë¤«¤Ê¤êŤ¤»þ´Ö¤òɬÍפȤ·¤Þ¤¹¡£ + °Ê²¼¤ÎÎã¤Ç¤Ï¡¢±Ñ¸ìÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/editors/libreoffice</userinput> &prompt.root; <userinput>make install clean</userinput></screen> <note> <para>ÃÏ°è²½¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤ò¥Ó¥ë¥É¤·¤¿¤¤¤Î¤Ê¤é¡¢ - ¾åµ¥³¥Þ¥ó¥É¤ÎÂå¤ï¤ê¤Ë°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ²¼¤µ¤¤¡£</para> - - <screen>&prompt.root; <userinput>make LOCALIZED_LANG=<replaceable>your_language</replaceable> install clean</userinput></screen> - - <para><replaceable>your_language</replaceable> ¤òÀµ¤·¤¤¸À¸ì ISO ¥³¡¼¥É¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£ - ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¸À¸ì¥³¡¼¥É¤Î°ìÍ÷¤Ï¡¢port - ¤Î <filename>Makefile</filename> ¤Î - <maketarget>pre-fetch</maketarget> ¥¿¡¼¥²¥Ã¥È¤Ë¤¢¤ê¤Þ¤¹¡£</para> + ´õ˾¤Î¸À¸ì¤Î port ¥Ç¥£¥ì¥¯¥È¥ê¤Ë <application>cd</application> + ¥³¥Þ¥ó¥É¤Ç°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£ + Âбþ¤·¤Æ¤¤¤ë¸À¸ì¤Ï¡¢Ports Collection ¤Î <ulink + url="http://www.FreeBSD.org/ports/editors.html">editors</ulink> + ¥«¥Æ¥´¥ê¤Ë¤¢¤ê¤Þ¤¹¡£</para> </note> - - <para>¥¤¥ó¥¹¥È¡¼¥ë¤¬½ª¤ï¤Ã¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç - <application>LibreOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - - <screen>&prompt.user; <userinput>libreoffice</userinput></screen> </sect2> </sect1> @@ -935,8 +988,6 @@ ´ðËÜ¥·¥¹¥Æ¥à¤Ë¤Ï¡¢¤½¤ì¤é¤Îʸ½ñ¤¬Í׵᤹¤ë¥Ó¥å¡¼¥¢¤¬¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£ ¤³¤ÎÀá¤Ç¤Ï¤½¤ì¤é¤Î¥É¥¥å¥á¥ó¥È¥Ó¥å¡¼¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para> - <para>¤³¤ÎÀá¤Ç¤Ï¼¡¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para> - <informaltable frame="none" pgwide="1"> <tgroup cols="4"> <thead> @@ -953,7 +1004,7 @@ <entry><application>&acrobat.reader;</application></entry> <entry>¾¯</entry> <entry>·Ú</entry> - <entry>Linux ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½</entry> + <entry>&linux; ¥Ð¥¤¥Ê¥ê¸ß´¹µ¡Ç½</entry> </row> <row> @@ -992,25 +1043,32 @@ <secondary>¥Ó¥å¡¼¥¢</secondary> </indexterm> - <para>º£¤ä¿¤¯¤Îʸ½ñ¤¬ <quote>Portable Document Format</quote> - ¤ò°ÕÌ£¤¹¤ë PDF ¥Õ¥¡¥¤¥ë·Á¼°¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - PDF ¥Õ¥¡¥¤¥ë¤òÆɤà¤Î¤Ë¿ä¾©¤µ¤ì¤ë¥Ó¥å¡¼¥¢¤Î°ì¤Ä¤¬ - <application>&acrobat.reader;</application> ¤Ç¡¢ - Adobe ¤«¤é Linux ¸þ¤±¤Ë¥ê¥ê¡¼¥¹¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - FreeBSD ¤Ï Linux ¥Ð¥¤¥Ê¥ê¤ò¼Â¹Ô¤Ç¤¤ë¤Î¤Ç¡¢ - FreeBSD ¤Ç¤â¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ¤Þ¤¹¡£</para> - - <para>Ports Collection ¤«¤é <application>&acrobat.reader; 8</application> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> - - <screen>&prompt.root; <userinput>cd /usr/ports/print/acroread8</userinput> + <para>º£¤ä¿¤¯¤Îʸ½ñ¤¬ Portable Document Format (PDF) + ¥Õ¥¡¥¤¥ë·Á¼°¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ + PDF ¥Õ¥¡¥¤¥ë¤òÆɤà¤Î¤Ë¤è¤¯ÍѤ¤¤é¤ì¤ë¥Ó¥å¡¼¥¢¤¬ + &adobe; ¤¬ &linux; ÍѤ˥ê¥ê¡¼¥¹¤·¤Æ¤¤¤ë + <application>&acrobat.reader;</application> ¤Ç¤¹¡£ + &os; ¤Ï &linux; ¥Ð¥¤¥Ê¥ê¤ò¼Â¹Ô¤Ç¤¤ë¤Î¤Ç¡¢ + &os; ¤Ç¤â¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ¤Þ¤¹¡£ + ¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤«¤é package ¤ÏÍøÍѤǤ¤Ê¤¤¤¿¤á¡¢ + ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + ÃÏ°è²½¤µ¤ì¤¿¤â¤Î¤¬ Ports Collection ¤Î <ulink + url="http://www.FreeBSD.org/ports/print.html">print</ulink> + ¥«¥Æ¥´¥ê¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para> + + <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ports Collection ¤«¤é¡¢ + <application>&acrobat.reader; 9</application> + ¤Î±Ñ¸ìÈǤò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ÃÏ°è²½¤µ¤ì¤¿ÈǤò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢ + ¤«¤ï¤ê¤Ë´õ˾¤Î ports ¥Ç¥£¥ì¥¯¥È¥ê¤Ë <application>cd</application> + ¥³¥Þ¥ó¥É¤Ç°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + + <screen>&prompt.root; <userinput>cd /usr/ports/print/acroread9</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Î¤¿¤á¡¢¥Ñ¥Ã¥±¡¼¥¸¤òÍøÍѤ¹¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£</para> </sect2> <sect2> - <title>gv</title> + <title><application>gv</application></title> <indexterm> <primary><application>gv</application></primary> @@ -1024,7 +1082,9 @@ <secondary>¥Ó¥å¡¼¥¢</secondary> </indexterm> - <para><application>gv</application> ¤Ï &postscript; ¤È PDF + <para><ulink + url="http://www.gnu.org/software/gv/">gv</ulink> + ¤Ï &postscript; ¤È PDF ¤Î¥Ó¥å¡¼¥¢¤Ç¤¹¡£¤³¤ì¤Ï¤â¤È¤â¤È <application>ghostview</application> ¤ò¥Ù¡¼¥¹¤È¤·¤Æ¤¤¤Þ¤¹¤¬¡¢ <application>Xaw3d</application> @@ -1039,7 +1099,8 @@ <screen>&prompt.root; <userinput>pkg_add -r gv</userinput></screen> - <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤¤¾ì¹ç¤Ë¤Ï Ports Collection ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> + <para>package ¤òÍøÍѤǤ¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢Ports Collection + ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/print/gv</userinput> &prompt.root; <userinput>make install clean</userinput></screen> @@ -1055,27 +1116,27 @@ <secondary>¥Ó¥å¡¼¥¢</secondary> </indexterm> - <para>FreeBSD ¸þ¤±¤Î·Ú¤¤ PDF ¥Ó¥å¡¼¥¢¤ò»È¤¤¤¿¤¤¤Î¤Ê¤é¡¢ - <application>Xpdf</application> ¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£ - <application>Xpdf</application> ¤Ï·Ú¤¯¤Æ¸úΨŪ¤Ê¥Ó¥å¡¼¥¢¤Ç¤¹¡£ - ¤È¤Æ¤â¾¯¤Ê¤¤¥ê¥½¡¼¥¹¤Ç¤âÆ°ºî¤·¡¢¤È¤Æ¤â°ÂÄꤷ¤Æ¤¤¤Þ¤¹¡£ + <para>&os; ¸þ¤±¤Î·Ú¤¤ PDF ¥Ó¥å¡¼¥¢¤ò»È¤¤¤¿¤¤¤Î¤Ê¤é¡¢<ulink + url="http://www.foolabs.com/xpdf/">xpdf</ulink> + ¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£ + ¤³¤ì¤Ï¾¯¤Ê¤¤¥ê¥½¡¼¥¹¤ÇÆ°ºî¤¹¤ë¥Ó¥å¡¼¥¢¤Ç¡¢·Ú¤¯¤Æ¸úΨŪ¤Ç¤¹¡£ ɸ½à¤Î X ¥Õ¥©¥ó¥È¤òÍøÍѤ·¡¢ <application>&motif;</application>, ¤½¤Î¾¤Î X ¥Ä¡¼¥ë¥¥Ã¥È¤òɬÍפȤ·¤Þ¤»¤ó¡£</para> <para><application>Xpdf</application> ¤Î - package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£</para> + package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r xpdf</userinput></screen> - <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤ä¡¢ - Ports Collection ¤òÍøÍѤ·¤¿¤¤¾ì¹ç¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤Ï¡¢ + Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/graphics/xpdf</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>¥¤¥ó¥¹¥È¡¼¥ë¤¬´°Î»¤·¤¿¤é <application>Xpdf</application> - ¤òµ¯Æ°¤Ç¤¤Þ¤¹¡£ + <para>¥¤¥ó¥¹¥È¡¼¥ë¤¬´°Î»¤·¤¿¤é <application>xpdf</application> + ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£ ¥á¥Ë¥å¡¼¤òɽ¼¨¤¹¤ë¤Ë¤Ï¥Þ¥¦¥¹¤Î±¦¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para> </sect2> @@ -1086,21 +1147,23 @@ <primary><application>GQview</application></primary> </indexterm> - <para><application>GQview</application> ¤Ï²èÁü´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ + <para><ulink + url="http://gqview.sourceforge.net/">GQview</ulink> + ¤Ï²èÁü´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ ¥¯¥ê¥Ã¥¯¤Ò¤È¤Ä¤Ç²èÁü¥Õ¥¡¥¤¥ë¤ò³«¤¤¤¿¤ê¡¢³°Éô¥¨¥Ç¥£¥¿¤òµ¯Æ°¤·¤¿¤ê¡¢ - ¥µ¥à¥Í¥¤¥ë²èÁü¤òºîÀ®¤·¤¿¤ê¡¢¤½¤Î¤Û¤«¤Ë¤â¤¤¤í¤¤¤í¤Ç¤¤Þ¤¹¡£ + ¥µ¥à¥Í¥¤¥ë²èÁü¤òºîÀ®¤Ç¤¤Þ¤¹¡£ ¤Þ¤¿¡¢¥¹¥é¥¤¥É¥·¥ç¡¼¤ä´ðËÜŪ¤Ê¥Õ¥¡¥¤¥ëÁàºîµ¡Ç½¤âÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£ - ²èÁü¤Î¥³¥ì¥¯¥·¥ç¥ó¤ò´ÉÍý¤Ç¤¡¢½ÅÊ£¤·¤¿¥Õ¥¡¥¤¥ë¤â´Êñ¤Ë¸«¤Ä¤±¤é¤ì¤Þ¤¹¡£ - <application>GQview</application> ¤ÏÁ´²èÌÌɽ¼¨¤â¤Ç¤¡¢ - ¹ñºÝ²½¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para> + ²èÁü¤Î¥³¥ì¥¯¥·¥ç¥ó¤Î´ÉÍý¤ä¡¢½ÅÊ£¤·¤¿¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤³¤È¤¬´Êñ¤Ë¤Ç¤¤Þ¤¹¡£ + <application>GQview</application> ¤ÏÁ´²èÌÌɽ¼¨¡¢ + ¤ª¤è¤Ó¹ñºÝ²½¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para> - <para><application>GQview</application> ¤Î - package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£</para> + <para><application>GQview</application> + package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r gqview</userinput></screen> - <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤ä¡¢ - Ports Collection ¤òÍøÍѤ·¤¿¤¤¾ì¹ç¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + <para>package ¤òÆþ¼ê¤Ç¤¤Ê¤¤¾ì¹ç¤Ï¡¢ + Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gqview</userinput> &prompt.root; <userinput>make install clean</userinput></screen> @@ -1110,7 +1173,7 @@ <sect1 id="desktop-finance"> <title>ºâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</title> - <para>FreeBSD ¥Ç¥¹¥¯¥È¥Ã¥×¤Ç¸Ä¿ÍŪ¤Êºâ̳´ÉÍý¤¬¤Ç¤¤ë¤è¤¦¤Ë¡¢ + <para>&os; ¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ç¸Ä¿ÍŪ¤Êºâ̳´ÉÍý¤¬¤Ç¤¤ë¤è¤¦¤Ë¡¢ ¶¯ÎϤǴÊñ¤Ë»È¤¨¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¤½¤ì¤é¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÃæ¤Ë¤Ï <application><trademark class="registered">Quicken</trademark></application> @@ -1146,13 +1209,6 @@ </row> <row> - <entry><application>Abacus</application></entry> - <entry>¾¯</entry> - <entry>·Ú</entry> - <entry><application>Tcl/Tk</application></entry> - </row> - - <row> <entry><application>KMyMoney</application></entry> <entry>¾¯</entry> <entry>½Å</entry> @@ -1169,13 +1225,14 @@ <primary><application>GnuCash</application></primary> </indexterm> - <para><application>GnuCash</application> ¤Ï¡¢ + <para><ulink + url="http://www.gnucash.org/">GnuCash</ulink> ¤Ï¡¢ <application>GNOME</application> ¤Î°ìÉô¤Ç¡¢ »È¤¤¤ä¤¹¤¯¤«¤Ä¶¯ÎϤʥ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤·¤Æ¥¨¥ó¥É¥æ¡¼¥¶¤ËÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£ <application>GnuCash</application> ¤ò»È¤¨¤Ð¡¢ ¼ýÆþ¤ä»Ù½Ð¡¢¶ä¹Ô¸ýºÂ¡¢¤¢¤ë¤¤¤Ï³ô¤ò´ÉÍý¤Ç¤¤Þ¤¹¡£ ľ´ÑŪ¤Ê¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÆÃħ¤È¤·¤Æ¤¤¤Þ¤¹¤¬¡¢ - Èó¾ï¤Ë¹âÅ٤ʵ¡Ç½¤âÄ󶡤·¤Æ¤¤¤Þ¤¹¡£</para> + ¹âÅ٤ʵ¡Ç½¤âÄ󶡤·¤Æ¤¤¤Þ¤¹¡£</para> <para><application>GnuCash</application> ¤ÏÀöÎý¤µ¤ì¤¿ÅÐÏ¿µ¡Ç½¡¢ ³¬Áع½Â¤¤Î´ªÄꥷ¥¹¥Æ¥à¡¢Â¿¤¯¤Î¥¡¼¥Ü¡¼¥É¥·¥ç¡¼¥È¥«¥Ã¥È¡¢ @@ -1186,12 +1243,12 @@ ¤Î QIF ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤ä¥Þ¡¼¥¸¤¬¤Ç¤¤Þ¤¹¡£ ¤Þ¤¿¡¢¹ñºÝŪ¤ÊÆüÉÕ¤ª¤è¤ÓÄ̲߷Á¼°¤â°·¤¨¤Þ¤¹¡£</para> - <para><application>GnuCash</application> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> + <para><application>GnuCash</application> package + ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r gnucash</userinput></screen> - <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤¤¤Ê¤é¤Ð¡¢Ports Collection ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> + <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤±¤ì¤Ð¡¢Ports Collection ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/finance/gnucash</userinput> &prompt.root; <userinput>make install clean</userinput></screen> @@ -1208,9 +1265,10 @@ <secondary><application>Gnumeric</application></secondary> </indexterm> - <para><application>Gnumeric</application> ¤Ï¡¢ + <para><ulink + url="http://projects.gnome.org/gnumeric/index.shtml">Gnumeric</ulink> ¤Ï¡¢ <application>GNOME</application> - ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ëɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ + ¥³¥ß¥å¥Ë¥Æ¥£¤Ë¤è¤Ã¤Æ³«È¯¤µ¤ì¤Æ¤¤¤ëɽ·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ ¥»¥ë¤Î½ñ¼°¤Ë½¾¤Ã¤Æ¥æ¡¼¥¶¤ÎÆþÎϤò¼«Æ°Åª¤Ë <quote>¿ä¬</quote>¤¹¤ëÊØÍø¤Êµ¡Ç½¤ä¡¢ ¿¤¯¤Î¥·¡¼¥±¥ó¥¹¤ËÂФ¹¤ë¼«Æ°Êä´°µ¡Ç½¤¬¤¢¤ê¤Þ¤¹¡£ @@ -1218,18 +1276,15 @@ <application>Lotus 1-2-3</application>, <application>Quattro Pro</application> ¤È¤¤¤Ã¤¿¹¤¯¹Ô¤ÅϤäƤ¤¤ë¿¤¯¤Î·Á¼°¤Î¥Õ¥¡¥¤¥ë¤òÆɤߤ³¤á¤Þ¤¹¡£ - <application>Gnumeric</application> ¤Ï¡¢¥°¥é¥ÕÉÁ²è¥½¥Õ¥È¥¦¥§¥¢¤Î - <filename role="package">math/guppi</filename> - ¤ò²ð¤·¤Æ¥°¥é¥Õµ¡Ç½¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£ ¿¤¯¤Î´Ø¿ô¤òÆ⢤·¤Æ¤ª¤ê¡¢ ¿ôÃÍ¡¢Ä̲ߡ¢ÆüÉÕ¡¢»þ´Ö¤Ê¤É¤Î¤è¤¯»È¤¦¥»¥ë¤Î½ñ¼°¤¬ÍøÍѤǤ¤Þ¤¹¡£</para> - <para>package ¤«¤é <application>Gnumeric</application> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Þ¤¹¡£</para> + <para><application>Gnumeric</application> package + ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>pkg_add -r gnumeric</userinput></screen> - <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤¤¤Ê¤é¤Ð¡¢Ports Collection + <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤±¤ì¤Ð¡¢Ports Collection ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>cd /usr/ports/math/gnumeric</userinput> @@ -1237,36 +1292,6 @@ </sect2> <sect2> - <title>Abacus</title> - - <indexterm> - <primary><application>Abacus</application></primary> - </indexterm> - <indexterm> - <primary>ɽ·×»»¥½¥Õ¥È¥¦¥§¥¢</primary> - <secondary><application>Abacus</application></secondary> - </indexterm> - - <para><application>Abacus</application> - ¤Ï¡¢·Ú¤¯¤Æ»È¤¤¤ä¤¹¤¤É½·×»»¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ - Åý·×¡¢ºâ̳¡¢¿ô³Ø¤Ê¤É¤ÎʬÌî¤Ç - Ìò¤Ë¤¿¤Ä¿¤¯¤Î´Ø¿ô¤òÆ⢤·¤Æ¤¤¤Þ¤¹¡£ - <application>Abacus</application> ¤Ï - <application>Excel</application> ·Á¼°¤Î¥Õ¥¡¥¤¥ë¤òÆɤ߽ñ¤¤Ç¤¡¢ - &postscript; ·Á¼°¤Î¥Õ¥¡¥¤¥ë¤âºîÀ®¤Ç¤¤Þ¤¹¡£</para> - - <para>package ¤«¤é <application>Abacus</application> - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> - - <screen>&prompt.root; <userinput>pkg_add -r abacus</userinput></screen> - - <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤¤¤Ê¤é¤Ð¡¢Ports Collection ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> - - <screen>&prompt.root; <userinput>cd /usr/ports/deskutils/abacus</userinput> -&prompt.root; <userinput>make install clean</userinput></screen> - </sect2> - - <sect2> <title>KMyMoney</title> <indexterm><primary><application>KMyMoney</application></primary></indexterm> @@ -1276,168 +1301,26 @@ <secondary><application>KMyMoney</application></secondary> </indexterm> - <para><application>KMyMoney</application> ¤Ï¡¢ - KDE ¤Î¸Ä¿ÍÍѺâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ + <para><ulink + url="http://kmymoney2.sourceforge.net">KMyMoney</ulink> + ¤Ï¡¢KDE ¥³¥ß¥å¥Ë¥Æ¥£¤¬ºîÀ®¤·¤Æ¤¤¤ë¸Ä¿ÍÍѺâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£ ¾¦ÍѤθĿÍÍѺâ̳´ÉÍý¥½¥Õ¥È¥¦¥§¥¢¤Ë¸«¤é¤ì¤ëµ¡Ç½¤ò¼è¤êÆþ¤ì¡¢ Ä󶡤¹¤ë¤³¤È¤òÌܻؤ·¤Æ¤¤¤Þ¤¹¡£ ¤Þ¤¿¡¢»È¤¤¤ä¤¹¤¤Ê£¼°Êíµµ¡Ç½¤âÆÃħ¤Ç¤¹¡£ KMyMoney ¤Ïɸ½à¤Î Quicken Interchange Format (QIF) ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥Ý¡¼¥È²Äǽ¤Ç¡¢ - Åê»ñÍúÎò¤äÊ£¿ôÄ̲ߤμ谷¤¤¡¢ºâÀ¯¾õ¶·¤Î¥ì¥Ý¡¼¥È¤òÄ󶡤·¤Þ¤¹¡£ - ¤Þ¤¿¡¢¥×¥é¥°¥¤¥ó¤òÍѤ¤¤ë¤³¤È¤Ë¤è¤ê OFX ¤Î¥¤¥ó¥Ý¡¼¥È¤â¤Ç¤¤Þ¤¹¡£</para> + Åê»ñÍúÎò¤äÊ£¿ôÄ̲ߤμ谷¤¤¡¢ºâÀ¯¾õ¶·¤Î¥ì¥Ý¡¼¥È¤òÄ󶡤·¤Þ¤¹¡£</para> <para>package ¤«¤é <application>KMyMoney</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> - <screen>&prompt.root; <userinput>pkg_add -r kmymoney2</userinput></screen> + <screen>&prompt.root; <userinput>pkg_add -r kmymoney-kde4</userinput></screen> <para>package ¤¬¼ê¤ËÆþ¤é¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> - <screen>&prompt.root; <userinput>cd /usr/ports/finance/kmymoney2</userinput> + <screen>&prompt.root; <userinput>cd /usr/ports/finance/kmymoney-kde4</userinput> &prompt.root; <userinput>make install clean</userinput></screen> </sect2> </sect1> - <sect1 id="desktop-summary"> - <title>¤Þ¤È¤á</title> - - <para>FreeBSD ¤Ï¤½¤ÎÀǽ¤ä°ÂÄêÀ¤Ë¤è¤Ã¤Æ - ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤Ë¿Íµ¤¤¬¤¢¤ë°ìÊý¤Ç¡¢ - Æü¾ï¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ç¤ÎÍÑÅӤˤⴰÁ´¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£ - ¿ôÀé¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ - <ulink url="http://www.FreeBSD.org/ja/applications.html">packages</ulink> ¤ä - <ulink url="http://www.FreeBSD.org/ja/ports/index.html">ports</ulink> - ¤«¤éÍøÍѤǤ¤Þ¤¹¡£ - ¤³¤ì¤é¤Ë¤è¤ê¤¢¤Ê¤¿¤Î¥Ë¡¼¥º¤ò´°Á´¤ËËþ¤¿¤¹¥Ç¥¹¥¯¥È¥Ã¥×¤ò¹½ÃۤǤ¤Þ¤¹¡£ - </para> - - <para>°Ê²¼¤Ï¡¢¤³¤Î¾Ï¤ÇÀâÌÀ¤·¤¿ - ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°ìÍ÷¤Ç¤¹¡£</para> - - <informaltable frame="none" pgwide="1"> - <tgroup cols="3"> - <thead> - <row> - <entry>¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾</entry> - <entry>package ̾</entry> - <entry>port ̾</entry> - </row> - </thead> - - <tbody> - <row> - <entry><application>Opera</application></entry> - <entry><literal>opera</literal></entry> - <entry><filename - role="package">www/opera</filename></entry> - </row> - - <row> - <entry><application>Firefox</application></entry> - <entry><literal>firefox</literal></entry> - <entry><filename - role="package">www/firefox</filename></entry> - </row> - - <row> - <entry><application>Chromium</application></entry> - <entry><literal>chromium</literal></entry> - <entry><filename - role="package">www/chromium</filename></entry> - </row> - - <row> - <entry><application>KOffice</application></entry> - <entry><literal>koffice-kde4</literal></entry> - <entry><filename - role="package">editors/koffice-kde4</filename></entry> - </row> - - <row> - <entry><application>AbiWord</application></entry> - <entry><literal>abiword</literal></entry> - <entry><filename - role="package">editors/abiword</filename></entry> - </row> - - <row> - <entry><application>GIMP</application></entry> - <entry><literal>gimp</literal></entry> - <entry><filename - role="package">graphics/gimp</filename></entry> - </row> - - <row> - <entry><application>Apache OpenOffice</application></entry> - <entry><literal>openoffice</literal></entry> - <entry><filename - role="package">editors/openoffice-3</filename></entry> - </row> - - <row> - <entry><application>LibreOffice</application></entry> - <entry><literal>libreoffice</literal></entry> - <entry><filename - role="package">editors/libreoffice</filename></entry> - </row> - - <row> - <entry><application>&acrobat.reader;</application></entry> - <entry><literal>acroread</literal></entry> - <entry><filename - role="package">print/acroread8</filename></entry> - </row> - - <row> - <entry><application>gv</application></entry> - <entry><literal>gv</literal></entry> - <entry><filename - role="package">print/gv</filename></entry> - </row> - - <row> - <entry><application>Xpdf</application></entry> - <entry><literal>xpdf</literal></entry> - <entry><filename - role="package">graphics/xpdf</filename></entry> - </row> - - <row> - <entry><application>GQview</application></entry> - <entry><literal>gqview</literal></entry> - <entry><filename - role="package">graphics/gqview</filename></entry> - </row> - - <row> - <entry><application>GnuCash</application></entry> - <entry><literal>gnucash</literal></entry> - <entry><filename - role="package">finance/gnucash</filename></entry> - </row> - - <row> - <entry><application>Gnumeric</application></entry> - <entry><literal>gnumeric</literal></entry> - <entry><filename - role="package">math/gnumeric</filename></entry> - </row> - - <row> - <entry><application>Abacus</application></entry> - <entry><literal>abacus</literal></entry> - <entry><filename - role="package">deskutils/abacus</filename></entry> - </row> - - <row> - <entry><application>KMyMoney</application></entry> - <entry><literal>kmymoney2</literal></entry> - <entry><filename - role="package">finance/kmymoney2</filename></entry> - </row> - </tbody> - </tgroup> - </informaltable> - </sect1> </chapter> diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.xml b/ja_JP.eucJP/books/handbook/eresources/chapter.xml index 64cc3d2da3..387b561afb 100644 --- a/ja_JP.eucJP/books/handbook/eresources/chapter.xml +++ b/ja_JP.eucJP/books/handbook/eresources/chapter.xml @@ -85,7 +85,7 @@ <row> <entry>&a.announce.name;</entry> - <entry>½ÅÍפʥ¤¥Ù¥ó¥È¤ä¥×¥í¥¸¥§¥¯¥È¤Î¥Þ¥¤¥ë¥¹¥È¥ó</entry> + <entry>½ÅÍפʥ¤¥Ù¥ó¥È¤ä¥×¥í¥¸¥§¥¯¥È¤Î¥Þ¥¤¥ë¥¹¥È¥ó (¥â¥Ç¥ì¡¼¥¿À©)</entry> </row> <row> @@ -138,7 +138,7 @@ <row> <entry>&a.security-notifications.name;</entry> - <entry>¥»¥¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÄÌÃÎ</entry> + <entry>¥»¥¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÄÌÃÎ (¥â¥Ç¥ì¡¼¥¿À©)</entry> </row> <row> @@ -189,7 +189,7 @@ <row> <entry>&a.amd64.name;</entry> - <entry>FreeBSD ¤Î AMD64 ¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry> + <entry>FreeBSD ¤Î AMD64 ¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢ (¥â¥Ç¥ì¡¼¥¿À©)</entry> </row> <row> @@ -369,7 +369,8 @@ <row> <entry>&a.ports-announce.name;</entry> - <entry>Ports Collection ¤Ë´Ø¤¹¤ë½ÅÍפʥ˥塼¥¹¤È°ÆÆâ</entry> + <entry>Ports Collection ¤Ë´Ø¤¹¤ë½ÅÍפʥ˥塼¥¹¤È°ÆÆâ + (¥â¥Ç¥ì¡¼¥¿À©)</entry> </row> <row> @@ -490,17 +491,6 @@ <entry>&a.usergroups.name;</entry> <entry>¥æ¡¼¥¶¥°¥ë¡¼¥×¤ÎÄ´À°</entry> </row> - - <row> - <entry>&a.vendors.name;</entry> - <entry>¥×¥ì¥ê¥ê¡¼¥¹¤Ë´Ø¤¹¤ë¥Ù¥ó¥À¤È¤ÎÄ´À°</entry> - </row> - - <row> - <entry>&a.www.name;</entry> - <entry><ulink url="../../../../ja/index.html">www.FreeBSD.org - </ulink> ¤Î´ÉÍý¼Ô</entry> - </row> </tbody> </tgroup> </informaltable> @@ -1177,7 +1167,7 @@ <para>FreeBSD.org ¥×¥í¥¸¥§¥¯¥È¤Î¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤ÎÊѹ¹¤ä´ØÏ¢¤·¤¿ÌäÂê¤Ë¤Ä¤¤¤Æ¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ë¸þ¤±¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para> - <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¥¢¥Ê¥¦¥ó¥¹¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹ + <para>¤³¤Î¥â¥Ç¥ì¡¼¥È¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¥¢¥Ê¥¦¥ó¥¹¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹ (ÊÖÅú¤äÍ׵ᡢµÄÏÀ¡¢°Õ¸«¤ò½Ò¤Ù¤ë¾ì¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)¡£</para> </listitem> </varlistentry> @@ -1440,17 +1430,6 @@ µ»½ÑŪ¤ÊµÄÏÀ¤Ë¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ëÊý¤Î»²²Ã¤â´¿·Þ¤·¤Þ¤¹¡£</para> </listitem> </varlistentry> - - <varlistentry> - <term>&a.vendors.name;</term> - - <listitem> - <para><emphasis>vendors</emphasis></para> - - <para>FreeBSD ¥×¥í¥¸¥§¥¯¥È¤È FreeBSD - ¤Î¥½¥Õ¥È¥¦¥§¥¢¤ª¤è¤Ó¥Ï¡¼¥É¥¦¥§¥¢¥Ù¥ó¥À¤È¤ÎÄ´À°¤ÎµÄÏÀ¡£</para> - </listitem> - </varlistentry> </variablelist> </sect2> diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml index 9f492af624..76612008c2 100644 --- a/ja_JP.eucJP/books/handbook/install/chapter.xml +++ b/ja_JP.eucJP/books/handbook/install/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: rr40601 + Original revision: r41166 $FreeBSD$ --> @@ -159,19 +159,19 @@ </sect2> <sect2 id="install-hardware-supported"> - <title>¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢</title> - - <para>¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥ê¥¹¥È¤Ï &os; ¤Î¥ê¥ê¡¼¥¹¤È°ì½ï¤Ë - &os; ¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È¤È¤·¤ÆÄ󶡤µ¤ì¤Þ¤¹¡£ - ¤³¤Î¥É¥¥å¥á¥ó¥È¤ÏÄ̾ï CDROM ¤ä FTP ÇÛÉۤΰìÈÖ¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ä - <application>sysinstall</application> ¤Î¥É¥¥å¥á¥ó¥È¥á¥Ë¥å¡¼¤Ë¤¢¤ë - <filename>HARDWARE.TXT</filename> ¤È¤¤¤¦Ì¾¤Î¥Õ¥¡¥¤¥ë¤Ç¸«¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤´¤È¤ËÍÑ°Õ¤µ¤ì¤ë¤½¤Î¥ê¥¹¥È¤ò¸«¤ë¤³¤È¤Ç¡¢&os; - ¤Î³Æ¥ê¥ê¡¼¥¹¤Ç¤É¤Î¤è¤¦¤Ê¥Ï¡¼¥É¥¦¥§¥¢ÁõÃÖ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤ë¤«¤¬¤ï¤«¤ê¤Þ¤¹¡£ - ¥ê¥ê¡¼¥¹¤´¤È¡¢¤ª¤è¤Ó¥¢¡¼¥¥Æ¥¯¥Á¥ã¤´¤È¤Î¥Ï¡¼¥É¥¦¥§¥¢¥ê¥¹¥È¤Ï¡¢ - &os; ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Î <ulink - url="http://www.FreeBSD.org/ja/releases/index.html">¥ê¥ê¡¼¥¹¾ðÊó</ulink> - ¤Î¥Ú¡¼¥¸¤Ë¤¢¤ê¤Þ¤¹¡£</para> + <title>¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢</title> + + <para>¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥ê¥¹¥È¤Ï &os; ¤Î¥ê¥ê¡¼¥¹¤È°ì½ï¤Ë + &os; ¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È¤È¤·¤ÆÄ󶡤µ¤ì¤Þ¤¹¡£ + ¤³¤Î¥É¥¥å¥á¥ó¥È¤ÏÄ̾ï CDROM ¤ä FTP ÇÛÉۤΰìÈÖ¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ä + <application>sysinstall</application> ¤Î¥É¥¥å¥á¥ó¥È¥á¥Ë¥å¡¼¤Ë¤¢¤ë + <filename>HARDWARE.TXT</filename> ¤È¤¤¤¦Ì¾¤Î¥Õ¥¡¥¤¥ë¤Ç¸«¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ + ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤´¤È¤ËÍÑ°Õ¤µ¤ì¤ë¤½¤Î¥ê¥¹¥È¤ò¸«¤ë¤³¤È¤Ç¡¢&os; + ¤Î³Æ¥ê¥ê¡¼¥¹¤Ç¤É¤Î¤è¤¦¤Ê¥Ï¡¼¥É¥¦¥§¥¢ÁõÃÖ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤ë¤«¤¬¤ï¤«¤ê¤Þ¤¹¡£ + ¥ê¥ê¡¼¥¹¤´¤È¡¢¤ª¤è¤Ó¥¢¡¼¥¥Æ¥¯¥Á¥ã¤´¤È¤Î¥Ï¡¼¥É¥¦¥§¥¢¥ê¥¹¥È¤Ï¡¢ + &os; ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Î <ulink + url="http://www.FreeBSD.org/ja/releases/index.html">¥ê¥ê¡¼¥¹¾ðÊó</ulink> + ¤Î¥Ú¡¼¥¸¤Ë¤¢¤ê¤Þ¤¹¡£</para> </sect2> </sect1> @@ -181,14 +181,14 @@ <sect2 id="install-inventory"> <title>¤¢¤Ê¤¿¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ÎÉôÉÊ°ìÍ÷¤òºî¤ë (Inventory)</title> - <para>FreeBSD¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë¡¢ + <para>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë¡¢ ¤¢¤Ê¤¿¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ç»ÈÍѤ·¤Æ¤¤¤ëÉôÉʤΰìÍ÷¤òºî¤Ã¤Æ¤ª¤¤¤¿¤Û¤¦¤¬¤¤¤¤¤Ç¤·¤ç¤¦¡£ - FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥ë¡¼¥Á¥ó¤Ï¡¢ÉôÉÊ (¥Ï¡¼¥É¥Ç¥£¥¹¥¯¡¢ + &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥ë¡¼¥Á¥ó¤Ï¡¢ÉôÉÊ (¥Ï¡¼¥É¥Ç¥£¥¹¥¯¡¢ ¥Í¥Ã¥È¥ï¡¼¥¯¥«¡¼¥É¡¢CDROM ¥É¥é¥¤¥Ö¤Ê¤É) ¤Î¥â¥Ç¥ëÈÖ¹æ¤È¥á¡¼¥«¡¼¤òɽ¼¨¤·¡¢ ¤µ¤é¤Ë¤³¤ì¤é¤Î¥Ç¥Ð¥¤¥¹¤Ë¤Ä¤¤¤Æ¡¢»ÈÍѤ¹¤ë IRQ, IO ¥Ý¡¼¥È¤Þ¤Ç´Þ¤á¤ÆÀµ¤·¤¤ÀßÄê¤òǧ¼±¤·¤è¤¦¤È»î¤ß¤Þ¤¹¡£¤·¤«¤·¡¢PC - ¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤è¤Ã¤Æ¤Ï¡¢¤³¤Î²áÄø¤Ï´°Á´¤Ë¤ÏÀ®¸ù¤»¤º¡¢FreeBSD + ¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤è¤Ã¤Æ¤Ï¡¢¤³¤Î²áÄø¤Ï´°Á´¤Ë¤ÏÀ®¸ù¤»¤º¡¢&os; ¤¬Ç§¼±¤·¤¿ÀßÄê¤ò½¤Àµ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤â¤¢¤ê¤Þ¤¹¡£</para> <para>&windows; ¤ä Linux ¤Ê¤É¤Î¡¢ @@ -199,7 +199,7 @@ ¤è¤¯»È¤ï¤ì¤ë IRQ ¤Ï 3, 5, 7 ¤Ç¡¢IO ¥Ý¡¼¥È¥¢¥É¥ì¥¹¤ÏÄ̾ï 0x330 ¤Î¤è¤¦¤Ê 16 ¿Ê¿ô¤Ç½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para> - <para>FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë¡¢ + <para>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë¡¢ ¤³¤Î¾ðÊó¤ò°õºþ¤¹¤ë¤«½ñ¤Î±¤á¤Æ¤ª¤¯¤«¤¹¤ë¤³¤È¤ò´«¤á¤Þ¤¹¡£ Î㤨¤Ð¼¡¤Î¤è¤¦¤Êɽ¤Ç¤¹:</para> @@ -299,23 +299,23 @@ <sect2> <title>¥Ç¡¼¥¿¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×</title> - <para>FreeBSD + <para>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥³¥ó¥Ô¥å¡¼¥¿¤Ë²ÁÃͤΤ¢¤ë¥Ç¡¼¥¿¤¬Æþ¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢ ³Î¼Â¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¤È¤ê¡¢ - ¤µ¤é¤ËÀµ¤·¤¯¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬¤È¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£FreeBSD + ¤µ¤é¤ËÀµ¤·¤¯¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬¤È¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥ë¡¼¥Á¥ó¤Ï¡¢¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë¼ÂºÝ¤Ë½ñ¤¹þ¤àÁ°¤Ë³Îǧ¤òµá¤á¤Þ¤¹¤¬¡¢ °ìÅټºݤ˽ñ¤¹þ¤àºî¶È¤¬»Ï¤Þ¤Ã¤Æ¤·¤Þ¤¦¤È¡¢ ¤â¤¦¸µ¤ËÌ᤹¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£</para> </sect2> <sect2 id="install-where"> - <title>FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì½ê¤Î·èÄê</title> + <title>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì½ê¤Î·èÄê</title> - <para>FreeBSD ¤ò¡¢¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤¹¤Ù¤Æ¤ò»È¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ï¡¢ + <para>&os; ¤ò¡¢¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤¹¤Ù¤Æ¤ò»È¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ï¡¢ ¤³¤Î»þÅÀ¤Ç³Îǧ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤Ï²¿¤â¤¢¤ê¤Þ¤»¤ó — ¤³¤ÎÀá¤òÈô¤Ð¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> - <para>¤·¤«¤· FreeBSD + <para>¤·¤«¤· &os; ¤ò¾¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤È¶¦Â¸¤µ¤»¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢ ¥Ç¡¼¥¿¤¬¥Ç¥£¥¹¥¯¤Ë¤É¤Î¤è¤¦¤ËÇÛÃÖ¤µ¤ì¤Æ¤ª¤ê¡¢ ¤½¤ì¤¬¤É¤Î¤è¤¦¤Ë±Æ¶Á¤¹¤ë¤«¤òÂç¤Þ¤«¤ËÍý²ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> @@ -327,7 +327,7 @@ ¤³¤ì¤é¤Î²ô¤Ï <firstterm>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó</firstterm> ¤È¸Æ¤Ð¤ì¤Þ¤¹¡£ &os; ¤ÏÆâÉô¤Ë¤â¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò»ý¤Ä¤Î¤Ç¡¢¤³¤Î̾¾Î¤Ïº®Íð¤ò¤ª¤³¤·¤Þ¤¹¡£ ¤½¤Î¤¿¤á¡¢&os; ¤Ç¤Ï¤³¤Î²ô¤ò¥Ç¥£¥¹¥¯¥¹¥é¥¤¥¹¤Þ¤¿¤Ïñ¤Ë¥¹¥é¥¤¥¹¤È¸Æ¤Ó¤Þ¤¹¡£ - ¤¿¤È¤¨¤Ð¡¢PC ¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òÁàºî¤¹¤ë FreeBSD ¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Î + ¤¿¤È¤¨¤Ð¡¢PC ¥Ç¥£¥¹¥¯¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òÁàºî¤¹¤ë &os; ¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Î <command>fdisk</command> ¤Ï¡¢¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ç¤Ï¤Ê¤¯¥¹¥é¥¤¥¹¤È¸Æ¤Ó¤Þ¤¹¡£ PC ¤Ç¤Ï¡¢¥Ç¥£¥¹¥¯ 1 Â椢¤¿¤ê 4 ¤Ä¤Þ¤Ç¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤Ç¤¤Þ¤¹¡£ ¤³¤ì¤é¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï<firstterm>¥×¥é¥¤¥Þ¥ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó</firstterm>¤È¸Æ¤Ð¤ì¤Þ¤¹¡£ @@ -339,7 +339,7 @@ <para>¤½¤ì¤¾¤ì¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¡¢ ¤½¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë´Þ¤Þ¤ì¤ë¥Ç¡¼¥¿¤Î·Á¼°¤ò¼¨¤¹¿ô»ú¤Ç¤¢¤ë¡¢ - <firstterm>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó ID</firstterm> ¤ò»ý¤Á¤Þ¤¹¡£FreeBSD + <firstterm>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó ID</firstterm> ¤ò»ý¤Á¤Þ¤¹¡£&os; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó ID ¤Ï <literal>165</literal>¤Ç¤¹¡£</para> <para>Ä̾³Æ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ï¡¢ @@ -349,13 +349,13 @@ <devicename>C:</devicename> ¤«¤é»Ï¤Þ¤ë <firstterm>¥É¥é¥¤¥Ö¥ì¥¿¡¼</firstterm>¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£</para> - <para>FreeBSD + <para>&os; ¤Ï¥×¥é¥¤¥Þ¥ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ - FreeBSD ¤Ï¤¢¤Ê¤¿¤¬ºîÀ®¤·¤¿¥Õ¥¡¥¤¥ë¤ò´Þ¤à¤¹¤Ù¤Æ¤Î¥Ç¡¼¥¿¤ò¡¢ + &os; ¤Ï¤¢¤Ê¤¿¤¬ºîÀ®¤·¤¿¥Õ¥¡¥¤¥ë¤ò´Þ¤à¤¹¤Ù¤Æ¤Î¥Ç¡¼¥¿¤ò¡¢ ¤³¤Î°ì¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ËÊÝ»ý¤Ç¤¤Þ¤¹¡£ ¤·¤«¤·Ê£¿ô¤Î¥Ç¥£¥¹¥¯¤¬¤¢¤ë¾ì¹ç¤Ï¤½¤Î¤¦¤Á¤Î¤¤¤¯¤Ä¤«¡¢¤â¤·¤¯¤Ï¤¹¤Ù¤Æ¤Ë¡¢ - FreeBSD ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£ - FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë»þ¤Ï + &os; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£ + &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë»þ¤Ï 1 ¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò»ÈÍѲÄǽ¤Ë¤·¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ ¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¡¢¿·¤¿¤ËÍÑ°Õ¤·¤¿¶õÇò¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ç¤â¤¤¤¤¤Ç¤¹¤·¡¢ ¤Þ¤¿¤Ï̵¤¯¤Ê¤Ã¤Æ¤â¹½¤ï¤Ê¤¤¥Ç¡¼¥¿¤·¤«Æþ¤Ã¤Æ¤¤¤Ê¤¤¡¢ @@ -364,13 +364,13 @@ <para>¤¹¤Ù¤Æ¤Î¥Ç¥£¥¹¥¯¤Ç¡¢´û¤Ë¤¹¤Ù¤Æ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢ ¾¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¥Ä¡¼¥ë (Î㤨¤Ð &ms-dos; ¤Þ¤¿¤Ï &windows; ¤Î <command>fdisk</command>) ¤ò»ÈÍѤ·¤Æ¡¢ - ¤½¤Î¤¦¤Á¤Î 1 ¤Ä¤ò FreeBSD ¤Î¤¿¤á¤Ë²òÊü¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para> + ¤½¤Î¤¦¤Á¤Î 1 ¤Ä¤ò &os; ¤Î¤¿¤á¤Ë²òÊü¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para> <para>ͽÈ÷¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¤½¤ì¤ò»È¤¦¤³¤È¤â¤Ç¤¤Þ¤¹¡£ ¤·¤«¤·¡¢¤Þ¤º»Ï¤á¤Ï 1 ¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î´û¸¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò½Ì¾®¤¹¤ë¤³¤È¤ò¹Í¤¨¤Æ¤âÎɤ¤¤Ç¤·¤ç¤¦¡£</para> - <para>FreeBSD ¤ÎºÇ¾®¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï¡¢100 MB + <para>&os; ¤ÎºÇ¾®¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï¡¢100 MB ÄøÅ٤Υǥ£¥¹¥¯ÍÆÎ̤¬É¬ÍפǤ¹¡£ ¤·¤«¤·¤³¤ì¤Ï<emphasis>Èó¾ï¤Ë</emphasis>¾®¤µ¤Ê¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¢¤ê¡¢ ¼«Ê¬¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¥¹¥Ú¡¼¥¹¤Ï¤Û¤È¤ó¤É»Ä¤é¤Ê¤¤¤Ç¤·¤ç¤¦¡£ @@ -421,7 +421,7 @@ 2 ¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬¤¢¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£ ¤³¤Î¾ì¹ç¡¢<devicename>D:</devicename> ¤Ë¤¢¤ë¥Ç¡¼¥¿¤ò¤¹¤Ù¤Æ <devicename>C:</devicename> ¤Ë¥³¥Ô¡¼¤¹¤ì¤Ð¡¢ - 2 ¤ÄÌܤΥѡ¼¥Æ¥£¥·¥ç¥ó¤ò²òÊü¤·¡¢FreeBSD + 2 ¤ÄÌܤΥѡ¼¥Æ¥£¥·¥ç¥ó¤ò²òÊü¤·¡¢&os; ¤Î¤¿¤á¤Ë»È¤¦¤³¤È¤¬¤Ç¤¤ë¤Ç¤·¤ç¤¦¡£</para> </example> @@ -432,9 +432,9 @@ 1 ÂæÀܳ¤µ¤ì¤¿ PC ¤ò»ÈÍѤ·¤Æ¤¤¤ë¤È²¾Äꤷ¤Þ¤¹¡£¤µ¤é¤Ë &windows; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¡¢1 ¤Ä¤ÎÂ礤ʥѡ¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤· <devicename>C:</devicename> ¥É¥é¥¤¥Ö¤È¤·¤Æ 4 GB ¤ò³ä¤êÅö¤Æ¤¿¤È¤·¤Þ¤¹¡£ - ¤½¤·¤Æ¸½ºß 1.5 GB »ÈÍѤ·¤Æ¤ª¤ê¡¢FreeBSD ¤Ç 2 GB »È¤¤¤¿¤¤¤È¤·¤Þ¤¹¡£</para> + ¤½¤·¤Æ¸½ºß 1.5 GB »ÈÍѤ·¤Æ¤ª¤ê¡¢&os; ¤Ç 2 GB »È¤¤¤¿¤¤¤È¤·¤Þ¤¹¡£</para> - <para>FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ + <para>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ °Ê²¼¤Î¤É¤Á¤é¤«¤ò¹Ô¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para> <orderedlist> @@ -456,10 +456,10 @@ <sect2> <title>¥Í¥Ã¥È¥ï¡¼¥¯ÀßÄê¤Î¾ÜºÙ¤ò¤Þ¤È¤á¤ë</title> - <para>FreeBSD ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¤òÍøÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ï + <para>&os; ¤ò¥Í¥Ã¥È¥ï¡¼¥¯¤òÍøÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ï (Î㤨¤Ð FTP ¥µ¥¤¥È¡¢¤Þ¤¿¤Ï NFS ¥µ¡¼¥Ð¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç), ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê¤òÃΤëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ - FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò´°Î»¤¹¤ë¤¿¤á¤Ë¥Í¥Ã¥È¥ï¡¼¥¯¤ËÀܳ¤Ç¤¤ë¤è¤¦¡¢ + &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò´°Î»¤¹¤ë¤¿¤á¤Ë¥Í¥Ã¥È¥ï¡¼¥¯¤ËÀܳ¤Ç¤¤ë¤è¤¦¡¢ ¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë¤³¤ì¤é¤Î¾ðÊó¤òÆþÎϤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> <sect3> @@ -503,7 +503,7 @@ <para>Èó¾ï¤ËŤ¤»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¤¬¡¢ Ä̾ï¤Î¥â¥Ç¥à¤ò»ÈÍѤ·¤¿¥À¥¤¥¢¥ë¥¢¥Ã¥×¤Ç ISP ¤ËÀܳ¤·¤Æ¤¤¤ë¾ì¹ç¤Ç¤â¡¢ - ¥¤¥ó¥¿¡¼¥Í¥Ã¥È·Ðͳ¤Ç FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> + ¥¤¥ó¥¿¡¼¥Í¥Ã¥È·Ðͳ¤Ç &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> <para>¤³¤Î¾ì¹ç¡¢°Ê²¼¤ÎÆâÍƤò¤¢¤é¤«¤¸¤á³Îǧ¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹:</para> @@ -523,31 +523,31 @@ </sect3> </sect2> <sect2> - <title>FreeBSD Errata ¤Î³Îǧ</title> + <title>&os; Errata ¤Î³Îǧ</title> - <para>FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Ç¤Ï FreeBSD + <para>&os; ¥×¥í¥¸¥§¥¯¥È¤Ç¤Ï &os; ¤Î³Æ¥ê¥ê¡¼¥¹¤¬¤Ç¤¤ë¸Â¤ê°ÂÄꤹ¤ë¤è¤¦ÅØÎϤ·¤Æ¤¤¤Þ¤¹¤¬¡¢ »þ¡¹¥Ð¥°¤¬È¯À¸¤·¤Æ¤·¤Þ¤¦¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¶Ë¤Þ¤ì¤Ë¡¢ ȯÀ¸¤·¤¿¥Ð¥°¤Ë¤è¤ê¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£ ¤³¤ì¤é¤ÎÌäÂê¤Ïȯ¸«¤µ¤ì²ò·è¤µ¤ì¤ë¤È¤È¤â¤Ë¡¢ - FreeBSD ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Î - <ulink url="http://www.FreeBSD.org/releases/&rel.current;R/errata.html">FreeBSD Errata</ulink> ¤Ë·Ç¼¨¤µ¤ì¤Þ¤¹¡£ + &os; ¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Î + <ulink url="http://www.FreeBSD.org/releases/&rel.current;R/errata.html">&os; Errata</ulink> ¤Ë·Ç¼¨¤µ¤ì¤Þ¤¹¡£ Ãí°Õ¤¹¤Ù¤´ûÃΤÎÌäÂ̵꤬¤¤¤³¤È¤ò³Î¤«¤á¤ë¤¿¤á¤Ë¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë Errata ¤ò³Îǧ¤¹¤ë¤Ù¤¤Ç¤¹¡£</para> <para>Errata ¤ò´Þ¤à¡¢¤¹¤Ù¤Æ¤Î¥ê¥ê¡¼¥¹¤Ë´Ø¤¹¤ë¾ðÊó¤Ï¡¢ <ulink - url="&url.base;/ja/index.html">FreeBSD ¤Î¥¦¥§¥Ö¥µ¥¤¥È</ulink> ¤Î + url="&url.base;/ja/index.html">&os; ¤Î¥¦¥§¥Ö¥µ¥¤¥È</ulink> ¤Î <ulink url="&url.base;/ja/releases/index.html">¥ê¥ê¡¼¥¹¾ðÊó</ulink> ¤Î¹à¤Ç³Îǧ¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> </sect2> <sect2> - <title>FreeBSD ¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥¡¥¤¥ë¤ÎÆþ¼ê</title> + <title>&os; ¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥¡¥¤¥ë¤ÎÆþ¼ê</title> - <para>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤Ç¤Ï¡¢ - °Ê²¼¤Î¤¤¤º¤ì¤«¤Î¾ì½ê¤ËÃÖ¤¤¤Æ¤¢¤ë¥Õ¥¡¥¤¥ë¤«¤é FreeBSD + <para>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤Ç¤Ï¡¢ + °Ê²¼¤Î¤¤¤º¤ì¤«¤Î¾ì½ê¤ËÃÖ¤¤¤Æ¤¢¤ë¥Õ¥¡¥¤¥ë¤«¤é &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para> <itemizedlist> @@ -591,13 +591,13 @@ </listitem> </itemizedlist> - <para>FreeBSD ¤ò CD ¤Þ¤¿¤Ï DVD ¤Ç¹ØÆþ¤·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ + <para>&os; ¤ò CD ¤Þ¤¿¤Ï DVD ¤Ç¹ØÆþ¤·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ ɬÍפʤâ¤Î¤Ï¤¹¤Ù¤Æ¤½¤í¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¢¼¡¤ÎÀá (<xref linkend="install-boot-media"/>) ¤òÆɤßÈô¤Ð¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - <para>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥¡¥¤¥ë¤ò¤Þ¤À»ý¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢ + <para>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥¡¥¤¥ë¤ò¤Þ¤À»ý¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢ <xref linkend="install-diff-media"/> ¤Þ¤ÇÆɤßÈô¤Ð¤·¤Æ¤¯¤À¤µ¤¤¡£ - FreeBSD + &os; ¤ò¾å¤Ç¼¨¤·¤¿¾ì½ê¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Î½àÈ÷¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ ¤³¤Î¥»¥¯¥·¥ç¥ó¤òÆɤ߽ª¤ï¤Ã¤¿¸å¡¢¤³¤³¤ËÌá¤Ã¤Æ¤¤Æ¡¢ <xref linkend="install-boot-media"/> ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</para> @@ -606,23 +606,20 @@ <sect2 id="install-boot-media"> <title>¥Ö¡¼¥È¥á¥Ç¥£¥¢¤Î½àÈ÷</title> - <para>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤Ï¡¢FreeBSD + <para>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤Ï¡¢&os; ¥¤¥ó¥¹¥È¡¼¥é¤Ç¥³¥ó¥Ô¥å¡¼¥¿¤òµ¯Æ°¤¹¤ë¤³¤È¤«¤é»Ï¤Þ¤ê¤Þ¤¹—¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢ Ê̤Υª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¼Â¹Ô¤¹¤ë¥×¥í¥°¥é¥à¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ Ä̾¥³¥ó¥Ô¥å¡¼¥¿¤Ï¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤«¤éµ¯Æ°¤·¤Þ¤¹¤¬¡¢ - <quote>µ¯Æ°²Äǽ¤Ê</quote> - ¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤«¤éµ¯Æ°¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£ - ºÇ¶á¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Î¿¤¯¤Ï¡¢CDROM ¥É¥é¥¤¥Ö¤Î CDROM ¤ä - USB ¥Ç¥£¥¹¥¯¤«¤é¤âµ¯Æ°¤Ç¤¤Þ¤¹¡£</para> + CDROM ¤ä USB ¥Ç¥£¥¹¥¯¤«¤éµ¯Æ°¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£</para> <tip> - <para>FreeBSD ¤Î CDROM ¤Þ¤¿¤Ï DVD ¤ò (¹ØÆþ¤·¤¿¤ê¡¢¼«Ê¬¼«¿È¤Ç½àÈ÷¤ò¤·¤Æ) + <para>&os; ¤Î CDROM ¤Þ¤¿¤Ï DVD ¤ò (¹ØÆþ¤·¤¿¤ê¡¢¼«Ê¬¼«¿È¤Ç½àÈ÷¤ò¤·¤Æ) »ý¤Ã¤Æ¤ª¤ê¡¢ ¤¢¤Ê¤¿¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ç CDROM µÚ¤Ó DVD ¤«¤é¤Îµ¯Æ°¤¬²Äǽ¤Ç¤¢¤ë¾ì¹ç (Ä̾ï <quote>Boot Order</quote> ¤Þ¤¿¤ÏÎà»÷¤Î BIOS ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹)¡¢¤³¤ÎÀá¤òÈô¤Ð¤·¤Æ¤¯¤À¤µ¤¤¡£ - FreeBSD ¤Î CDROM ¤È DVD ¥¤¥á¡¼¥¸¤Ïµ¯Æ°²Äǽ¤Ç¤¢¤ê¡¢ - ¾¤ÎÆÃÊ̤ʽàÈ÷¤ò¤¹¤ë¤³¤È¤Ê¤¯ FreeBSD + &os; ¤Î CDROM ¤È DVD ¥¤¥á¡¼¥¸¤Ïµ¯Æ°²Äǽ¤Ç¤¢¤ê¡¢ + ¾¤ÎÆÃÊ̤ʽàÈ÷¤ò¤¹¤ë¤³¤È¤Ê¤¯ &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÇÍøÍѤǤ¤Þ¤¹¡£</para> </tip> @@ -671,7 +668,7 @@ <title>¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤ò¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤Ë½ñ¤¹þ¤à</title> <procedure> - <title>FreeBSD ¤ò»È¤Ã¤Æ¥¤¥á¡¼¥¸¤ò½ñ¤¹þ¤à</title> + <title>&os; ¤ò»È¤Ã¤Æ¥¤¥á¡¼¥¸¤ò½ñ¤¹þ¤à</title> <warning> <para>°Ê²¼¤ÎÎã¤Ç¤Ï¡¢µ¯Æ°¤¹¤ë¥Ç¥Ð¥¤¥¹¤ò @@ -683,17 +680,18 @@ <step> <title>¥¤¥á¡¼¥¸¤ò &man.dd.1; ¤ò»È¤Ã¤Æ½ñ¤¹þ¤à</title> - <para><filename>.img</filename> ¥Õ¥¡¥¤¥ë¤Ï¡¢ - ¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤Ë¥³¥Ô¡¼¤µ¤ì¤ë¤è¤¦¤Ê¡¢ - Ä̾ï¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï<emphasis>¤¢¤ê¤Þ¤»¤ó</emphasis>¡£ - ¥Ç¥£¥¹¥¯¤Î´°Á´¤ÊÆâÍƤΥ¤¥á¡¼¥¸¤Ç¤¹¡£ - ¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥£¥¹¥¯¤«¤é¾¤Î¥Ç¥£¥¹¥¯¤Ø¤Î¥³¥Ô¡¼¤Ï´Êñ¤Ë¤Ï<emphasis>¤Ç¤¤Þ¤»¤ó</emphasis>¡£ - ¤½¤Î¤«¤ï¤ê¤Ë¡¢ - ¥¤¥á¡¼¥¸¤òľÀܥǥ£¥¹¥¯¤Ë½ñ¤¹þ¤à &man.dd.1; ¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> + <para><filename>.img</filename> ¥Õ¥¡¥¤¥ë¤Ï¡¢ + ¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤Ë¥³¥Ô¡¼¤µ¤ì¤ë¤è¤¦¤Ê¡¢ + Ä̾ï¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï<emphasis>¤¢¤ê¤Þ¤»¤ó</emphasis>¡£ + ¥Ç¥£¥¹¥¯¤Î´°Á´¤ÊÆâÍƤΥ¤¥á¡¼¥¸¤Ç¤¹¡£ + ¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥£¥¹¥¯¤«¤é¾¤Î¥Ç¥£¥¹¥¯¤Ø¤Î¥³¥Ô¡¼¤Ï´Êñ¤Ë¤Ï<emphasis>¤Ç¤¤Þ¤»¤ó</emphasis>¡£ + ¤½¤Î¤«¤ï¤ê¤Ë¡¢ + ¥¤¥á¡¼¥¸¤òľÀܥǥ£¥¹¥¯¤Ë½ñ¤¹þ¤à &man.dd.1; ¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> <screen>&prompt.root; <userinput>dd if=&os;-&rel2.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen> - <para><computeroutput>Operation not permitted</computeroutput> + <para> + <computeroutput>Operation not permitted</computeroutput> ¥¨¥é¡¼¤¬É½¼¨¤µ¤ì¤¿¤é¡¢¥¿¡¼¥²¥Ã¥È¥Ç¥Ð¥¤¥¹¤¬Â¾¤ÇÍøÍѤµ¤ì¤Æ¤¤¤Ê¤¤¤«¤É¤¦¤«¡¢ ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤É¤¦¤«¡¢ ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¥×¥í¥°¥é¥à¤¬µ¤¤òÍø¤«¤»¤Æ¼«Æ°Åª¤Ë¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Ê¤¤¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ @@ -741,47 +739,29 @@ </step> </procedure> - <para>µ¯Æ°¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ + <para>&os;/&arch.pc98; + ¤Î¥¤¥ó¥¹¥È¡¼¥ëÍѤ˵¯Æ°¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ ¼¡¤Î¥¹¥Æ¥Ã¥×¤Ë½¾¤Ã¤Æ²¼¤µ¤¤:</para> <procedure> <step> <title>µ¯Æ°¥Õ¥í¥Ã¥Ô¡¼¥¤¥á¡¼¥¸¤Î¼èÆÀ</title> - <important> - <para>&os; 8.<replaceable>X</replaceable> ¤Ç¤Ï¡¢ - ¥Õ¥í¥Ã¥Ô¡¼¥¤¥á¡¼¥¸¤ÏÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ - ¾åµ¤Î USB ¥á¥â¥ê¤ä¡¢CDROM ¤ä DVD ¤òÍѤ¤¤¿ &os; - ¤Î¥¤¥ó¥¹¥È¡¼¥ëË¡¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> - </important> - - <para>µ¯Æ°¥Ç¥£¥¹¥¯¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤Î <filename>floppies</filename> - ¥Ç¥£¥ì¥¯¥È¥ê¤ä¡¢ - <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable>arch</replaceable>/<replaceable>version</replaceable>-RELEASE/floppies/</literal> + <para>&os;/&arch.pc98; ¤Î¥Ö¡¼¥È¥Ç¥£¥¹¥¯¤Ï¡¢ + floppies ¥Ç¥£¥ì¥¯¥È¥ê¡¢ + <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/<replaceable>version</replaceable>-RELEASE/floppies/</literal> ¤«¤éÆþ¼ê¤Ç¤¤Þ¤¹¡£ - ¤³¤³¤Ç¡¢<replaceable>arch</replaceable> ¤È - <replaceable>version</replaceable> ¤ÎÉôʬ¤ò¡¢ - ¤½¤ì¤¾¤ì¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥¢¡¼¥¥Æ¥¯¥Á¥ã¤È¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£ - ¤¿¤È¤¨¤Ð¡¢&os;/&arch.i386; &rel2.current;-RELEASE - ¤Îµ¯Æ°¥Õ¥í¥Ã¥Ô¡¼¥¤¥á¡¼¥¸¤Ï¡¢ - <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/floppies/"></ulink> - ¤«¤é¥À¥¦¥ó¥í¡¼¥É¤Ç¤¤Þ¤¹¡£</para> + ¤³¤³¤Ç <replaceable>version</replaceable> ¤ÎÉôʬ¤ò¡¢ + ¤½¤ì¤¾¤ì¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para> <para>¥Õ¥í¥Ã¥Ô¡¼¥¤¥á¡¼¥¸¤Ï <filename>.flp</filename> - ¤È¤¤¤¦³ÈÄ¥»Ò¤¬¤Ä¤¤¤Æ¤¤¤Þ¤¹¡£<filename>floppies/</filename> - ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤ÏÊ£¿ô¤Î°Û¤Ê¤ë¥¤¥á¡¼¥¸¤¬¤¢¤ê¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë - FreeBSD ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢ - ¤Þ¤¿¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤è¤Ã¤Æ¡¢ - »È¤¤Ê¬¤±¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ - ¿¤¯¤Î¾ì¹ç¤Ï¡¢ - <filename>boot.flp</filename>, - <filename>kern1.flp</filename>, - <filename>kern2.flp</filename> ¤ª¤è¤Ó - <filename>kern3.flp</filename> - ¤Î 4 ¤Ä¤Î¥Õ¥í¥Ã¥Ô¡¼¤òɬÍפȤ·¤Þ¤¹¡£ - ¤³¤ì¤é¤Î¥Õ¥í¥Ã¥Ô¡¼¥¤¥á¡¼¥¸¤Ë´Ø¤¹¤ëºÇ¿·¤Î¾ðÊó¤Ï¡¢ - Ʊ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë <filename>README.TXT</filename> - ¤Ç³Îǧ¤·¤Æ²¼¤µ¤¤¡£</para> + ¤È¤¤¤¦³ÈÄ¥»Ò¤¬¤Ä¤¤¤Æ¤¤¤Þ¤¹¡£<filename + class="directory">floppies/</filename> + ¤Ë¤ÏÊ£¿ô¤Î°Û¤Ê¤ë¥¤¥á¡¼¥¸¤¬¤¢¤ê¤Þ¤¹¡£ + <filename>boot.flp</filename> ¤È¤È¤â¤Ë¡¢ + <filename>kern.small*</filename> ¤Þ¤¿¤Ï + <filename>kern*</filename> + ¤È¤¤¤Ã¤¿¥¤¥ó¥¹¥È¡¼¥ë¤Î¼ïÎà¤Ë´ØÏ¢¤Å¤¤¤¿Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <important> <para>FTP ¥×¥í¥°¥é¥à¤ò»ÈÍѤ·¤Æ¤³¤ì¤é¤Î¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë»þ¤Ï¡¢ @@ -797,7 +777,7 @@ <title>¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤ÎÍÑ°Õ</title> <para>¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë 1 ¤Ä¤Ë¤Ä¤ - 1 Ëç¤Î¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òÍÑ°Õ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + 1 Ëç¤Î¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òÍÑ°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤ì¤é¤Î¥Ç¥£¥¹¥¯¤Ë·ç´Ù¤¬¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£ ¤³¤ì¤ò³Îǧ¤¹¤ëºÇ¤â´Êñ¤ÊÊýË¡¤Ï¡¢ ¼«Ê¬¼«¿È¤Ç¥Õ¥©¡¼¥Þ¥Ã¥È¤·¤Æ¤ß¤ë¤³¤È¤Ç¤¹¡£ @@ -809,7 +789,7 @@ ¿·ÉʤΥեí¥Ã¥Ô¡¼¤ò»È¤¦¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£</para> <important> - <para>FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤·¤¿»þ¤Ë¡¢ + <para>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤·¤¿»þ¤Ë¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥°¥é¥à¤¬¥¯¥é¥Ã¥·¥å¤·¤¿¤ê¥Õ¥ê¡¼¥º¤·¤¿¤ê¡¢ ¤ª¤«¤·¤ÊÆ°ºî¤ò¤·¤¿»þ¡¢ ¤Þ¤º¤Ï¤¸¤á¤Ëµ¿¤¦¤Ù¤¤â¤Î¤Î¤¦¤Á¤Î 1 ¤Ä¤Ï¥Õ¥í¥Ã¥Ô¡¼¤Ç¤¹¡£ @@ -848,20 +828,20 @@ ¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤³¤Î¥³¥Þ¥ó¥É¤ò·«¤êÊÖ¤·¤Þ¤¹¡£ <filename>.flp</filename> ¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤¿¾ì½ê¤Ë±þ¤¸¤Æ¡¢ ¥³¥Þ¥ó¥É¥é¥¤¥ó¤òÊѹ¹¤·¤Æ²¼¤µ¤¤¡£ - CDROM ¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢<command>fdimage</command> ¤Ï FreeBSD ¤Î + CDROM ¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢<command>fdimage</command> ¤Ï &os; ¤Î FTP ¥µ¥¤¥È¤Î <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/"><filename class="directory">tools</filename> ¥Ç¥£¥ì¥¯¥È¥ê</ulink>¤«¤é¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> - <para>(Ê̤ΠFreeBSD ¥·¥¹¥Æ¥à¤Î¤è¤¦¤Ê) &unix; + <para>(Ê̤Π&os; ¥·¥¹¥Æ¥à¤Î¤è¤¦¤Ê) &unix; ¥·¥¹¥Æ¥à¾å¤Ç¥Õ¥í¥Ã¥Ô¡¼¤Ø¤Î½ñ¤¹þ¤ß¤ò¹Ô¤¦¾ì¹ç¤Ï¡¢ ¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤òľÀܥǥ£¥¹¥¯¤Ë½ñ¤¹þ¤à¤¿¤á¤Ë &man.dd.1; - ¥³¥Þ¥ó¥É¤ò»È¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£FreeBSD ¾å¤Ç¤Ï¡¢ + ¥³¥Þ¥ó¥É¤ò»È¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£&os; ¾å¤Ç¤Ï¡¢ ¼¡¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Þ¤¹:</para> <screen>&prompt.root; <userinput>dd if=boot.flp of=/dev/fd0</userinput></screen> - <para>FreeBSD ¤Ë¤ª¤¤¤Æ¤Ï¡¢<filename>/dev/fd0</filename> ¤¬ + <para>&os; ¤Ë¤ª¤¤¤Æ¤Ï¡¢<filename>/dev/fd0</filename> ¤¬ 1 ÂæÌܤΥեí¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö (<devicename>A:</devicename> ¥É¥é¥¤¥Ö) ¤òɽ¤·¤Þ¤¹¡£Æ±ÍÍ¤Ë <filename>/dev/fd1</filename> ¤Ï <devicename>B:</devicename> ¥É¥é¥¤¥Ö¤òɽ¤·¤Þ¤¹¡£ @@ -871,7 +851,7 @@ </step> </procedure> - <para>¤³¤ì¤Ç FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÍÑ°Õ¤¬¤Ç¤¤Þ¤·¤¿¡£</para> + <para>¤³¤ì¤Ç &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÍÑ°Õ¤¬¤Ç¤¤Þ¤·¤¿¡£</para> </sect2> </sect1> @@ -925,8 +905,8 @@ We can take no responsibility for lost disk contents!</literallayout> <step> <para>¤É¤ÎÁõÃÖ¤«¤é¥·¥¹¥Æ¥à¤¬µ¯Æ°¤¹¤ë¤«¤òÀ©¸æ¤¹¤ëÀßÄê¤òõ¤·¤Æ¤¯¤À¤µ¤¤¡£ - Ä̾ï¤Ï <quote>Boot Order</quote> ¤È¸Æ¤Ð¤ì¡¢ - °ìÈÌŪ¤Ë¤Ï¡¢<literal>Floppy</literal>, <literal>CDROM</literal>, + Ä̾ï¤Ï <quote>Boot Order</quote> ¤È¸Æ¤Ð¤ì¡¢°ìÈÌŪ¤Ë¤Ï¡¢ + <literal>Floppy</literal>, <literal>CDROM</literal>, <literal>First Hard Disk</literal> ¤Ê¤É¤ÎÁõÃ֤ΰìÍ÷¤È¤·¤Æɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para> @@ -949,12 +929,14 @@ We can take no responsibility for lost disk contents!</literallayout> ¤¹¤°¤Ë CDROM ¤òÁÞÆþ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> <note> - <para>&os; 7.<replaceable>X</replaceable> ¤Ç¤Ï¡¢ + <para>&os;/&arch.pc98; ¤Ç¤Ï¡¢ + ¥¤¥ó¥¹¥È¡¼¥ëÍѤε¯Æ°¥Õ¥í¥Ã¥Ô¡¼¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢ <xref linkend="install-boot-media"/> - ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ëÊýË¡¤ÇºîÀ®¤·¤¿µ¯Æ°¥Õ¥í¥Ã¥Ô¡¼¤òÍѤ¤¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£ - <filename>boot.flp</filename> ¤¬ºÇ½é¤ËÁÞÆþ¤¹¤ë disc ¤Ç¤¹¡£ - ¤³¤Î¥Ç¥£¥¹¥¯¤ò¥Õ¥í¥Ã¥Ô¡¼¥É¥é¥¤¥Ö¤ËÁÞÆþ¤·¤Æ¡¢ - ¥³¥ó¥Ô¥å¡¼¥¿¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ëÊýË¡¤ÇºîÀ®¤Ç¤¤Þ¤¹¡£ + <filename>boot.flp</filename> + ¤¬ºÇ½é¤ËÁÞÆþ¤¹¤ë¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤Ç¤¹¡£ + ¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤Ç¤¤ë¤è¤¦¤Ë¡¢ + ¤³¤Î¥Õ¥í¥Ã¥Ô¡¼¤ò¥Õ¥í¥Ã¥Ô¡¼¥É¥é¥¤¥Ö¤ËÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤¡£</para> </note> <para>¤â¤·¡¢¥³¥ó¥Ô¥å¡¼¥¿¤¬¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤ë OS ¤òÆɤ߹þ¤ß¡¢ @@ -980,7 +962,7 @@ We can take no responsibility for lost disk contents!</literallayout> </step> <step> - <para>FreeBSD ¤Ïµ¯Æ°¤ò³«»Ï¤·¤Þ¤¹¡£CDROM ¤«¤éµ¯Æ°¤·¤Æ¤¤¤ë¾ì¹ç¡¢ + <para>&os; ¤Ïµ¯Æ°¤ò³«»Ï¤·¤Þ¤¹¡£CDROM ¤«¤éµ¯Æ°¤·¤Æ¤¤¤ë¾ì¹ç¡¢ ¼¡¤Î¤è¤¦¤Ê²èÌ̤¬É½¼¨¤µ¤ì¤ë¤Ç¤·¤ç¤¦ (¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Ï¾Êά¤·¤Æ¤¤¤Þ¤¹)¡£</para> <screen>Booting from CD-Rom... @@ -1182,7 +1164,7 @@ Mounting root from ufs:/dev/md0c </figure> <para>ðǰ¤Ë¸¡½Ð·ë²Ì¤ò¥Á¥§¥Ã¥¯¤·¤Æ¡¢¤¢¤Ê¤¿¤¬Í½´ü¤·¤¿¤¹¤Ù¤Æ¤Î¥Ç¥Ð¥¤¥¹¤ò - FreeBSD ¤¬¸¡½Ð¤Ç¤¤¿»ö¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¥Ð¥¤¥¹¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ + &os; ¤¬¸¡½Ð¤Ç¤¤¿»ö¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¥Ð¥¤¥¹¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ ¸¡½Ð·ë²Ì¤Øɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£ <link linkend="kernelconfig">¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</link> ¤ò¹½ÃÛ¤¹¤ë¤³¤È¤Ç¡¢ ¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¤è¤¦¤Ë <filename>GENERIC</filename> @@ -1228,7 +1210,7 @@ Mounting root from ufs:/dev/md0c <sect1 id="using-sysinstall"> <title>Sysinstall ¤Î¾Ò²ð</title> - <para><application>sysinstall</application> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï FreeBSD + <para><application>sysinstall</application> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï &os; ¥×¥í¥¸¥§¥¯¥È¤¬Ä󶡤¹¤ë¥¤¥ó¥¹¥È¡¼¥ëÍÑ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤¹¡£ ¤³¤ì¤Ï¡¢¥³¥ó¥½¡¼¥ë¾å¤ÇÆ°ºî¤·¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤ÎÀßÄê¤äÀ©¸æ¤Ë»È¤¨¤ë¤¤¤¯¤Ä¤â¤Î¥á¥Ë¥å¡¼¤ä²èÌ̤Ëʬ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para> @@ -1382,7 +1364,7 @@ Mounting root from ufs:/dev/md0c <sect2 id="start-install"> <title>ɸ½à¥¤¥ó¥¹¥È¡¼¥ë¤Î³«»Ï</title> - <para>&unix; ¤ä FreeBSD ¤¬½é¤á¤Æ¤Î¿Í¤Ë¤Ï + <para>&unix; ¤ä &os; ¤¬½é¤á¤Æ¤Î¿Í¤Ë¤Ï <guimenuitem>Standard</guimenuitem> ¥¤¥ó¥¹¥È¡¼¥ë¤¬¤ª¾©¤á¤Ç¤¹¡£ ¥«¡¼¥½¥ë¥¡¼¤Ç <guimenuitem>Standard</guimenuitem> ¤òÁªÂò¤·¤Æ¡¢ <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤ò»Ï¤á¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -1398,19 +1380,20 @@ Mounting root from ufs:/dev/md0c </figure> </sect2> </sect1> + <sect1 id="install-steps"> <title>¥Ç¥£¥¹¥¯Îΰè¤Î³ä¤êÅö¤Æ</title> - <para>ºÇ½é¤Î²ÝÂê¤Ï¡¢FreeBSD ÍѤ˥ǥ£¥¹¥¯Îΰè¤ò³ä¤êÅö¤Æ¡¢ + <para>ºÇ½é¤Î²ÝÂê¤Ï¡¢&os; ÍѤ˥ǥ£¥¹¥¯Îΰè¤ò³ä¤êÅö¤Æ¡¢ <application>sysinstall</application> ¤¬»È¤¨¤ë¤è¤¦¤Ë¥é¥Ù¥ë¤òºîÀ®¤¹¤ë¤³¤È¤Ç¤¹¡£ - ¤½¤¦¤¹¤ë¤¿¤á¤Ë¤Ï¡¢FreeBSD + ¤½¤¦¤¹¤ë¤¿¤á¤Ë¤Ï¡¢&os; ¤¬¥Ç¥£¥¹¥¯¾å¤Ë¤É¤Î¤è¤¦¤Ê¾ðÊ󤬤¢¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤ë¤«¤òÃΤé¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para> <sect2 id="install-drive-bios-numbering"> <title>BIOS ¥É¥é¥¤¥Ö¤ÎÈÖ¹æÉÕ¤±</title> - <para>FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤ÆÀßÄꤹ¤ëÁ°¤Ë¡¢ + <para>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤ÆÀßÄꤹ¤ëÁ°¤Ë¡¢ ÆäËÊ£¿ô¤Î¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤ò»ý¤Ã¤Æ¤¤¤ë¤Ê¤é¤Ðµ¤¤ò¤Ä¤±¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤½ÅÍפʤ³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para> <indexterm><primary>MS-DOS</primary></indexterm> @@ -1439,14 +1422,14 @@ Mounting root from ufs:/dev/md0c Âæ¤Þ¤Ç¤Î¥É¥é¥¤¥Ö¤Î½çÈÖ¤òÁȤߴ¹¤¨¤ë¤³¤È¤¬¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</para> <para>°Ê¾å¤Î¤è¤¦¤Êµ¡Ç½¤òÊØÍø¤Ë»È¤Ã¤Æ¤¤¤ë¥æ¡¼¥¶¤Ï¡¢ - FreeBSD ¤Ç¤ÏƱ¤¸¤è¤¦¤Ê·ë²Ì¤Ë¤Ê¤é¤Ê¤¤¤³¤È¤Ë¶Ã¤¯¤«¤â¤·¤ì¤Þ¤»¤ó¡£FreeBSD ¤Ï + &os; ¤Ç¤ÏƱ¤¸¤è¤¦¤Ê·ë²Ì¤Ë¤Ê¤é¤Ê¤¤¤³¤È¤Ë¶Ã¤¯¤«¤â¤·¤ì¤Þ¤»¤ó¡£&os; ¤Ï BIOS ¤òÍøÍѤ·¤Ê¤¤¤¿¤á¡¢<quote>ÏÀÍý BIOS ¥É¥é¥¤¥Ö¥Þ¥Ã¥Ô¥ó¥°</quote> ¤Ë¤Ä¤¤¤Æ¤ÏÃΤé¤Ê¤¤¤Î¤Ç¤¹¡£ ¤³¤Î¤¿¤á¡¢Æäˤ¤¤¯¤Ä¤«¤Î¥É¥é¥¤¥Ö¤¬Æ±¤¸¥¸¥ª¥á¥È¥ê¤ò»ý¤Ã¤Æ¤¤¤ë»þ¤Ë¡¢ ¤½¤·¤Æ¤Þ¤¿¤¢¤ë¤â¤Î¤ò¤â¤¦°ì¤Ä¤Î¥¯¥í¡¼¥ó¤È¤·¤Æ»È¤Ã¤Æ¤¤¤ë»þ¤Ë¡¢ Èó¾ï¤Ë¤ä¤ä¤³¤·¤¤¾õ¶·¤Ë¤Ê¤êÆÀ¤Þ¤¹¡£</para> - <para>FreeBSD ¤ò»È¤¦»þ¤Ï¡¢ + <para>&os; ¤ò»È¤¦»þ¤Ï¡¢ ¥¤¥ó¥¹¥È¡¼¥ëÁ°¤Ë¥É¥é¥¤¥Ö¤ÎÈÖ¹æÉÕ¤±¤¬¼«Á³¤Ê¤â¤Î¤Ë¤Ê¤ë¤è¤¦¤Ë¡¢ ɬ¤º BIOS ¤ÎÀßÄê¤ò˺¤ì¤º¤ËÌᤷ¤Æ¤ª¤¤Þ¤·¤ç¤¦¡£ ¤â¤·¥É¥é¥¤¥Ö¤ÎÈÖ¹æÉÕ¤±¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢ @@ -1455,9 +1438,9 @@ Mounting root from ufs:/dev/md0c <sidebar> <title>Bill ¤È Fred ¤Î¥¤¥±¥¤¥±ËÁ¸±µ¤è¤ê</title> - <para>Bill ¤Ï Fred ¤Î¤¿¤á¤Ë¤â¤¦°ì¤Ä FreeBSD È¢¤òºî¤í¤¦¤È¸Å¤¤ + <para>Bill ¤Ï Fred ¤Î¤¿¤á¤Ë¤â¤¦°ì¤Ä &os; È¢¤òºî¤í¤¦¤È¸Å¤¤ Wintel È¢¤òÄÙ¤·¤Þ¤·¤¿¡£Bill ¤Ï ¥æ¥Ë¥Ã¥ÈÈÖ¹æ 0 ¤Î SCSI ¥É¥é¥¤ - ¥Ö¤ò°ì¤ÄÄɲä·¡¢¤½¤³¤Ë FreeBSD ¤òÆþ¤ì¤Þ¤·¤¿¡£</para> + ¥Ö¤ò°ì¤ÄÄɲä·¡¢¤½¤³¤Ë &os; ¤òÆþ¤ì¤Þ¤·¤¿¡£</para> <para>Fred ¤Ï¤³¤Î¥·¥¹¥Æ¥à¤ò»È¤¤»Ï¤á¤Þ¤·¤¿¤¬¡¢¿ôÆü¸å¤½¤Î¸Å¤¤ SCSI ¥É¥é¥¤¥Ö¤¬¤¿¤¯¤µ¤ó¤Î¥½¥Õ¥È¥¨¥é¡¼¤òÅǤ¤¤Æ¤¤¤ë¤Î¤Ëµ¤ÉÕ¤¡¢ @@ -1472,21 +1455,21 @@ Mounting root from ufs:/dev/md0c ¤¯Æ°¤¤¤Æ¤¤¤ë¤¿¤á¡¢Bill ¤Ï¤½¤ì¤ò»È¤¤»Ï¤á¤Æ¤â¤¤¤¤¤À¤í¤¦¤È»×¤¤¤Þ¤·¤¿¡£ ¤½¤³¤ÇÈà¤Ï SCSI BIOS ¤Îµ¡Ç½¤ò»È¤Ã¤Æ¥·¥¹¥Æ¥à¤¬¥æ¥Ë¥Ã¥È 4 ¤«¤éµ¯Æ°¤¹¤ë¤è¤¦¤Ë¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤Î½ç½ø¤òÆþ¤ì´¹¤¨¤Þ¤·¤¿¡£ - FreeBSD ¤¬µ¯Æ°¤·¡¢Ä´»ÒÎɤ¯Æ°¤»Ï¤á¤Þ¤·¤¿¡£</para> + &os; ¤¬µ¯Æ°¤·¡¢Ä´»ÒÎɤ¯Æ°¤»Ï¤á¤Þ¤·¤¿¡£</para> <para>Fred ¤Ï¿ôÆüºî¶È¤ò³¤±¤Þ¤·¤¿¤¬¡¢¤¹¤°¤Ë Bill ¤È Fred - ¤Ï¿·¤·¤¤ËÁ¸±¤ËÄ©À魯¤ë¤³¤È¤Ë¤·¤Þ¤·¤¿¡£¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î FreeBSD + ¤Ï¿·¤·¤¤ËÁ¸±¤ËÄ©À魯¤ë¤³¤È¤Ë¤·¤Þ¤·¤¿¡£¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤Î¤Ç¤¹¡£Bill ¤Ï SCSI ¥æ¥Ë¥Ã¥È 0 ¤Î¥Ç¥£¥¹¥¯¤ÏÅö¤Æ¤Ë¤Ê¤é¤Ê¤¤¤Î¤Ç¼è¤ê¤Ï¤º¤·¡¢<quote>¥¢¡¼¥«¥¤¥Ö</quote> ¤«¤é»ý¤Ã¤Æ¤¤¿Ê̤ο·¤·¤¤¥É¥é¥¤¥Ö¤È¸ò´¹¤·¤Þ¤·¤¿¡£¤½¤·¤Æ¡¢¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î - FreeBSD ¤ò¡¢Fred ¤Î»ý¤Ã¤Æ¤¤¤¿ËâË¡¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È FTP + &os; ¤ò¡¢Fred ¤Î»ý¤Ã¤Æ¤¤¤¿ËâË¡¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È FTP ¥Õ¥í¥Ã¥Ô¡¼¤òÍѤ¤¤Æ¿·¤·¤¤ SCSI ¥æ¥Ë¥Ã¥È 0 ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤Î¤Ç¤¹¡£ ¥¤¥ó¥¹¥È¡¼¥ë¤Ï¤¦¤Þ¤¯¤¤¤¤Þ¤·¤¿¡£</para> - <para>Fred ¤Ï¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î FreeBSD ¤ò¿ôÆü»È¤Ã¤Æ¤ß¤Æ¡¢ + <para>Fred ¤Ï¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤ò¿ôÆü»È¤Ã¤Æ¤ß¤Æ¡¢ µ»½ÑÉôÌç¤Ç¤â»È¤¨¤ë¤¯¤é¤¤½½Ê¬¤ËÎɤ¤¤â¤Î¤À¤È³Îǧ¤·¤Þ¤·¤¿¡£ ¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤«¤é¤¹¤Ù¤Æ¤Îºî¶È¤ò¥³¥Ô¡¼¤¹¤ë»þ¤¬Í褿¤Î¤Ç¤¹¡£ - ¤½¤³¤Ç Fred ¤Ï SCSI ¥æ¥Ë¥Ã¥È 4 (¸Å¤¤ FreeBSD + ¤½¤³¤Ç Fred ¤Ï SCSI ¥æ¥Ë¥Ã¥È 4 (¸Å¤¤ &os; ¤Ç¹Ô¤Ê¤Ã¤Æ¤¤¤¿ºî¶È¤ÎºÇ¿·¤Î¤â¤Î¤òÃÖ¤¤¤Æ¤¢¤ë¥É¥é¥¤¥Ö¤Ç¤¹) ¤ò¥Þ¥¦¥ó¥È¤·¤Þ¤·¤¿¡£¤È¤³¤í¤¬¡¢Fred ¤Ï SCSI ¥æ¥Ë¥Ã¥È 4 ¤Ë¤Ï¼«Ê¬¤Îµ®½Å¤Êºî¶È¤¬¤Ê¤Ë¤â»Ä¤Ã¤Æ¤¤¤Ê¤¤¤³¤È¤òȯ¸«¤·¤Æ¹²¤Æ¤Õ¤¿¤á¤¤Þ¤·¤¿¡£</para> @@ -1497,12 +1480,12 @@ Mounting root from ufs:/dev/md0c 4 ¤Ë¥³¥Ô¡¼¤·¤¿»þ¡¢¥æ¥Ë¥Ã¥È 4 ¤Ï <quote>¿·¥¯¥í¡¼¥ó</quote> ¤Ë¤Ê¤ê¤Þ¤·¤¿¡£ Bill ¤¬¥æ¥Ë¥Ã¥È 4 ¤«¤éµ¯Æ°¤¹¤ë¤è¤¦¤Ë SCSI BIOS ¤Ç½ç½ø¤ÎÆþ¤ì´¹¤¨¤ò¹Ô¤Ê¤Ã¤¿»þ¡¢ ¼Â¤Ï¤ª¥Ð¥«¤Ê¤³¤È¤Ë¤½¤¦Êѹ¹¤·¤¿¤È»×¤¤¹þ¤ó¤Ç¤¤¤¿¤À¤±¤Ê¤Î¤Ç¤¹¡£ - FreeBSD ¤Ï°ÍÁ³¤È¤·¤Æ SCSI ¥æ¥Ë¥Ã¥È 0 ¾å¤ÇÆ°¤¤¤Æ¤¤¤¿¤Î¤Ç¤¹¡£ + &os; ¤Ï°ÍÁ³¤È¤·¤Æ SCSI ¥æ¥Ë¥Ã¥È 0 ¾å¤ÇÆ°¤¤¤Æ¤¤¤¿¤Î¤Ç¤¹¡£ BIOS ¤Ë¤³¤Î¤è¤¦¤ÊÊѹ¹¤ò¹Ô¤Ê¤Ã¤Æ¤â Boot ¤È Loader ¤Î¥³¡¼¥É¤Î°ìÉô¤â¤·¤¯¤ÏÁ´Éô¤ÏÁªÂò¤µ¤ì¤¿ BIOS - ¥É¥é¥¤¥Ö¤«¤é¼èÆÀ¤µ¤ì¤ë¤â¤Î¤Î¡¢½èÍý¤¬ FreeBSD + ¥É¥é¥¤¥Ö¤«¤é¼èÆÀ¤µ¤ì¤ë¤â¤Î¤Î¡¢½èÍý¤¬ &os; ¤Î¥«¡¼¥Í¥ë¥É¥é¥¤¥Ð¡¼¤Ë°ú¤ÅϤµ¤ì¤¿»þ¤«¤é BIOS ¥É¥é¥¤¥Ö¤Î½ç½ø¤Ï̵»ë¤µ¤ì¡¢ - FreeBSD ¤Ï¡¢Ä̾ï¤Î¥É¥é¥¤¥ÖÈÖ¹æ½ç¤Ë°Ü¹Ô¤¹¤ë¤Î¤Ç¤¹¡£ + &os; ¤Ï¡¢Ä̾ï¤Î¥É¥é¥¤¥ÖÈÖ¹æ½ç¤Ë°Ü¹Ô¤¹¤ë¤Î¤Ç¤¹¡£ ¤µ¤¤Û¤É¤ÎÎã¤Ç¤Ï¡¢¥·¥¹¥Æ¥à¤Ï¥ª¥ê¥¸¥Ê¥ë¤Î SCSI ¥æ¥Ë¥Ã¥È 0 ¤ÇÆ°¤Â³¤±¤Æ¤ª¤ê¡¢ Fred ¤Î¥Ç¡¼¥¿¤Ï¤¹¤Ù¤Æ SCSI ¥æ¥Ë¥Ã¥È 4 ¤Ç¤Ï¤Ê¤¯¤½¤Î¥Ç¥£¥¹¥¯¤Ë»Ä¤Ã¤Æ¤¤¤¿¤Î¤Ç¤¹¡£ ¥·¥¹¥Æ¥à¤¬ SCSI ¥æ¥Ë¥Ã¥È 4 @@ -1545,9 +1528,9 @@ Mounting root from ufs:/dev/md0c partitioning scheme followed by a (Q)uit. If you wish to allocate only free space to FreeBSD, move to a partition marked "unused" and use the (C)reate command. - [ OK ] + [ OK ] - [ Press enter or space ]</screen> + [ Press enter or space ]</screen> <para>»Ø¼¨¤µ¤ì¤¿¤È¤ª¤ê <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ ¼¡¤Ë¡¢¥Ç¥Ð¥¤¥¹¤ÎÁöºº¤ò¼Â¹Ô¤·¤¿¤È¤¤Ë¥«¡¼¥Í¥ë¤¬¸«ÉÕ¤±¤¿¡¢ @@ -1576,7 +1559,7 @@ Mounting root from ufs:/dev/md0c IDE ¥³¥ó¥È¥í¡¼¥é¤Î¥Þ¥¹¥¿¤È¤·¤Æ¡¢ Æó¤ÄÌܤϥ»¥«¥ó¥À¥ê IDE ¥³¥ó¥È¥í¡¼¥é¤Î¥Þ¥¹¥¿¤È¤·¤ÆÆó¤ÄÀܳ¤·¤Æ¤¤¤ë¾ì¹ç¡¢ ¤Ê¤Ë¤¬µ¯¤³¤ë¤«¹Í¤¨¤Æ¤¯¤À¤µ¤¤¡£ - ¤â¤· FreeBSD ¤¬¤³¤ì¤é¤ò <devicename>ad0</devicename> ¤È + ¤â¤· &os; ¤¬¤³¤ì¤é¤ò <devicename>ad0</devicename> ¤È <devicename>ad1</devicename> ¤Î¤è¤¦¤Ë¡¢ ¸«ÉÕ¤±¤¿½çÈÖ¤ÇÈÖ¹æ¤ò¤Ä¤±¤¿¤È¤·¤Æ¤â¤¹¤Ù¤Æ¤ÏÆ°ºî¤¹¤ë¤Ç¤·¤ç¤¦¡£</para> @@ -1588,7 +1571,7 @@ Mounting root from ufs:/dev/md0c ¥Ç¥Ð¥¤¥¹Ì¾ (<devicename>ad1s1a</devicename> ¤Î¤è¤¦¤Ê) ¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¸«¤Ä¤±¤ë¤Î¤Ë»È¤ï¤ì¤ë¤Î¤Ç¡¢ ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¤¤¤¯¤Ä¤«¤ÏÆÍÁ³Àµ¤·¤¯¸½¤ì¤Ê¤¯¤Ê¤ë¤«¤â¤·¤ì¤º¡¢ - FreeBSD ¤ÎÀßÄê¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£</para> + &os; ¤ÎÀßÄê¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£</para> <para>¤³¤ì¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¡¢¥Ç¥£¥¹¥¯¤¬¸«¤Ä¤«¤Ã¤¿½çÈ֤ǤϤʤ¯¡¢ ¤É¤³¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¤«¤È¤¤¤¦¤³¤È¤Ë´ð¤Å¤¤¤Æ @@ -1598,14 +1581,14 @@ Mounting root from ufs:/dev/md0c ¥Ç¥Ð¥¤¥¹¤¬¤Ê¤¤¤È¤·¤Æ¤â<emphasis>¤¤¤Ä¤Ç¤â</emphasis> <devicename>ad2</devicename> ¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</para> - <para>¤³¤ÎÀßÄê¤Ï FreeBSD ¥«¡¼¥Í¥ë¤Îɸ½àÀßÄê¤Ç¤¹¡£ + <para>¤³¤ÎÀßÄê¤Ï &os; ¥«¡¼¥Í¥ë¤Îɸ½àÀßÄê¤Ç¤¹¡£ ¤³¤ì¤¬¤³¤Î²èÌÌ¤Ç <devicename>ad0</devicename> ¤ª¤è¤Ó <devicename>ad2</devicename> ¤òɽ¼¨¤¹¤ëÍýͳ¤Ç¤¹¡£ ¤³¤Î¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È¤¬ÆÀ¤é¤ì¤¿¥Þ¥·¥ó¤Ë¤Ï¡¢ IDE ¥³¥ó¥È¥í¡¼¥é¤ÎξÊý¤Î¥Þ¥¹¥¿¥Á¥ã¥Í¥ë¤Ë¥Ç¥£¥¹¥¯¤¬¤¢¤ê¡¢ ¥¹¥ì¡¼¥Ö¥Á¥ã¥Í¥ë¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para> - <para>FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¥Ç¥£¥¹¥¯¤òÁªÂò¤·¤Æ¡¢ + <para>&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¥Ç¥£¥¹¥¯¤òÁªÂò¤·¤Æ¡¢ &gui.ok; ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ <xref linkend="sysinstall-fdisk1"/> ¤Î¤è¤¦¤Êɽ¼¨¤È¤È¤â¤Ë <application>fdisk</application> ¤¬µ¯Æ°¤¹¤ë¤Ç¤·¤ç¤¦¡£</para> @@ -1615,11 +1598,11 @@ Mounting root from ufs:/dev/md0c <para>°ì¤ÄÌܤΥ»¥¯¥·¥ç¥ó¤Ï¡¢¤³¤ì¤Ïɽ¼¨¤ÎÀèƬÆó¹Ô¤Ë¤ï¤¿¤Ã¤Æ¤¤¤ë¤Î¤Ç¤¹¤¬¡¢ ¸½ºßÁªÂò¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥¹¥¯¤Î¾ÜºÙ¤òɽ¼¨¤·¤Þ¤¹¡£ - ¥Ç¥£¥¹¥¯¤Î¾ÜºÙ¤Ë¤Ï FreeBSD ¤Ç¤Î¥Ç¥Ð¥¤¥¹Ì¾¡¢¥Ç¥£¥¹¥¯¤Î¥¸¥ª¥á¥È¥ê¡¢ + ¥Ç¥£¥¹¥¯¤Î¾ÜºÙ¤Ë¤Ï &os; ¤Ç¤Î¥Ç¥Ð¥¤¥¹Ì¾¡¢¥Ç¥£¥¹¥¯¤Î¥¸¥ª¥á¥È¥ê¡¢ ¤½¤·¤Æ¥Ç¥£¥¹¥¯¤ÎÁ´ÍÆÎ̤¬´Þ¤Þ¤ì¤Þ¤¹¡£</para> <para>Æó¤ÄÌܤΥ»¥¯¥·¥ç¥ó¤Ï¸½ºß¥Ç¥£¥¹¥¯¾å¤Ë¤¢¤ë¥¹¥é¥¤¥¹¤òɽ¼¨¤·¤Þ¤¹¡£ - ¥¹¥é¥¤¥¹¤Î³«»Ï¥»¥¯¥¿¤È½ªÎ»¥»¥¯¥¿¡¢Â礤µ¡¢FreeBSD ¾å¤Ç¤Î̾Á°¡¢ + ¥¹¥é¥¤¥¹¤Î³«»Ï¥»¥¯¥¿¤È½ªÎ»¥»¥¯¥¿¡¢Â礤µ¡¢&os; ¾å¤Ç¤Î̾Á°¡¢ ¼ïÎà¤È¥µ¥Ö¥¿¥¤¥×¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£ ¤³¤ÎÎã¤Ç¤Ï¡¢PC ¾å¤Î¥Ç¥£¥¹¥¯¥ì¥¤¥¢¥¦¥Èµ¡Ç½¤¬À¸¤ß½Ð¤·¤¿¡¢ ̤»ÈÍѤµ¤Ê¥¹¥é¥¤¥¹¤òÆó¤Äɽ¼¨¤·¤Æ¤¤¤Þ¤¹¡£ @@ -1643,7 +1626,7 @@ Mounting root from ufs:/dev/md0c <para>º£¤«¤é¹Ô¤¦¤³¤È¤Ï¡¢ ¤¢¤Ê¤¿¤¬¤É¤Î¤è¤¦¤Ë¥Ç¥£¥¹¥¯¤òʬ³ä¤·¤¿¤¤¤«¤Ë¤è¤ê¤Þ¤¹¡£</para> - <para>FreeBSD ¤ò¥Ç¥£¥¹¥¯Á´ÂΤǻȤ¤¤¿¤¤¤Ê¤é¡¢ + <para>&os; ¤ò¥Ç¥£¥¹¥¯Á´ÂΤǻȤ¤¤¿¤¤¤Ê¤é¡¢ <guimenuitem>Use Entire Disk</guimenuitem> ¥ª¥×¥·¥ç¥ó¤òɽ¤¹ <keycap>A</keycap> ¥¡¼¤ò²¡¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ ¤³¤Î¤³¤È¤Ï <application>sysinstall</application> @@ -1652,9 +1635,9 @@ Mounting root from ufs:/dev/md0c ¸ºß¤·¤Æ¤¤¤ë¥¹¥é¥¤¥¹¤Ï¼è¤ê½ü¤«¤ì¡¢ <literal>unused</literal> ¤Î¾®¤µ¤ÊÎΰè (PC¥Ç¥£¥¹¥¯¥ì¥¤¥¢¥¦¥Èµ¡Ç½¤ÎÉû»ºÊª) ¤È¡¢ - FreeBSD ¤Î¤¿¤á¤ÎÂ礤ʥ¹¥é¥¤¥¹¤ØÃÖ¤¤«¤ï¤ë¤Ç¤·¤ç¤¦¡£ + &os; ¤Î¤¿¤á¤ÎÂ礤ʥ¹¥é¥¤¥¹¤ØÃÖ¤¤«¤ï¤ë¤Ç¤·¤ç¤¦¡£ ¤³¤ì¤ò¹Ô¤Ã¤¿¤é¡¢¼¡¤ËÊý¸þ¥¡¼¤ò»È¤Ã¤Æ¿·¤·¤¯ºîÀ®¤µ¤ì¤¿ - FreeBSD ¥¹¥é¥¤¥¹¤òÁªÂò¤·¡¢¥¹¥é¥¤¥¹¤Ëµ¯Æ°²Äǽ¤Î°õ¤ò¤Ä¤±¤ë¤¿¤á¤Ë + &os; ¥¹¥é¥¤¥¹¤òÁªÂò¤·¡¢¥¹¥é¥¤¥¹¤Ëµ¯Æ°²Äǽ¤Î°õ¤ò¤Ä¤±¤ë¤¿¤á¤Ë <keycap>S</keycap> ¥¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤Î¤È¤¡¢²èÌ̤諤¿ÌÜ¤Ï <xref linkend="sysinstall-fdisk2"/> ¤È¤è¤¯»÷¤¿¤â¤Î¤È¤Ê¤ë¤Ç¤·¤ç¤¦¡£ @@ -1662,7 +1645,7 @@ Mounting root from ufs:/dev/md0c ¤³¤ì¤Ï¤³¤Î¥¹¥é¥¤¥¹¤¬ <emphasis>¥¢¥¯¥Æ¥£¥Ö</emphasis> ¤Ç¡¢ ¤³¤³¤«¤éµ¯Æ°¤¹¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£</para> - <para>FreeBSD ¤Î¤¿¤á¤Î¶õ¤Îΰè¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¡¢ + <para>&os; ¤Î¤¿¤á¤Î¶õ¤Îΰè¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¡¢ ¸ºß¤·¤Æ¤¤¤ë¥¹¥é¥¤¥¹¤òºï½ü¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Î¤Ê¤é¡¢ Êý¸þ¥¡¼¤ò¤Ä¤«¤Ã¤Æ¥¹¥é¥¤¥¹¤òÁªÂò¤·¤Æ <keycap>D</keycap> ¥¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ @@ -1672,7 +1655,7 @@ Mounting root from ufs:/dev/md0c ¤³¤ÎÍó¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤ë¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢¥¹¥é¥¤¥¹¤ËÂФ·¤Æ³ä¤êÅö¤Æ¤ë¤³¤È¤Î¤Ç¤¤ëºÇÂç¤ÎÃͤǤ¹¡£ ¤³¤ÎÃͤϡ¢³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Ê¤¤Îΰè¤ÎϢ³¤·¤¿¥Ö¥í¥Ã¥¯¡¢¤Þ¤¿¤Ï¡¢¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤ÎÁ´¥µ¥¤¥º¤Ç¤¹¡£</para> - <para>FreeBSD ¤Î¤¿¤á¤Î¶õ¤Îΰè¤ò´û¤ËºîÀ®¤·¤Æ¤¤¤ë¤Ê¤é + <para>&os; ¤Î¤¿¤á¤Î¶õ¤Îΰè¤ò´û¤ËºîÀ®¤·¤Æ¤¤¤ë¤Ê¤é (¤ª¤½¤é¤¯ <application>&partitionmagic;</application> ¤Ê¤É¤Î¥Ä¡¼¥ë¤òÍøÍѤ·¤¿¤Î¤Ç¤·¤ç¤¦) ¡¢ ¤½¤Î¤È¤¤Ï <keycap>C</keycap> @@ -1698,24 +1681,24 @@ Mounting root from ufs:/dev/md0c <title>¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤Î¥¤¥ó¥¹¥È¡¼¥ë</title> <para>¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¤É¤¦¤«¹Í¤¨¤Þ¤·¤ç¤¦¡£°ìÈÌŪ¤Ë¡¢¼¡¤Î¾ì¹ç¤Ï - FreeBSD ¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ù¤¤Ç¤¹¡£</para> + &os; ¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ù¤¤Ç¤¹¡£</para> <itemizedlist> <listitem> <para>Æó¤Ä°Ê¾å¤Î¥É¥é¥¤¥Ö¤¬¤¢¤ê¡¢ - °ìÈÖÌܤΥɥ饤¥Ö°Ê³°¤Ë FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¾ì¹ç</para> + °ìÈÖÌܤΥɥ饤¥Ö°Ê³°¤Ë &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¾ì¹ç</para> </listitem> <listitem> - <para>FreeBSD ¤òƱ¤¸¥Ç¥£¥¹¥¯Æâ¤Ë¾¤Î OS ¤È¶¦Â¸¤µ¤»¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤ê¡¢ - ¥³¥ó¥Ô¥å¡¼¥¿¤òµ¯Æ°¤¹¤ëºÝ¤Ë FreeBSD ¤«Â¾¤Î OS ¤«¤òÁªÂò¤·¤¿¤¤¾ì¹ç</para> + <para>&os; ¤òƱ¤¸¥Ç¥£¥¹¥¯Æâ¤Ë¾¤Î OS ¤È¶¦Â¸¤µ¤»¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤ê¡¢ + ¥³¥ó¥Ô¥å¡¼¥¿¤òµ¯Æ°¤¹¤ëºÝ¤Ë &os; ¤«Â¾¤Î OS ¤«¤òÁªÂò¤·¤¿¤¤¾ì¹ç</para> </listitem> </itemizedlist> - <para>¤â¤·¡¢¥³¥ó¥Ô¥å¡¼¥¿¤Ë FreeBSD ¤Î¤ß¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ + <para>¤â¤·¡¢¥³¥ó¥Ô¥å¡¼¥¿¤Ë &os; ¤Î¤ß¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ ºÇ½é¤Î¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢ <guimenuitem>Standard</guimenuitem> ¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¤â¤·¡¢FreeBSD ¤ò¥Ö¡¼¥È²Äǽ¤Ê¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò»È¤¦¤Î¤Ç¤¢¤ì¤Ð¡¢ + ¤â¤·¡¢&os; ¤ò¥Ö¡¼¥È²Äǽ¤Ê¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò»È¤¦¤Î¤Ç¤¢¤ì¤Ð¡¢ <guimenuitem>None</guimenuitem> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <para>ÁªÂò¤ò¤·¤Æ <keycap>Enter</keycap> ¥¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -1740,14 +1723,14 @@ Mounting root from ufs:/dev/md0c <para>Æó¤Ä°Ê¾å¥É¥é¥¤¥Ö¤¬¤¢¤ë¾ì¹ç¡¢ ¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤òÁªÂò¤·¤¿¸å¡¢¥É¥é¥¤¥ÖÁªÂò²èÌ̤ËÌá¤ê¤Þ¤¹¡£ - FreeBSD ¤òÆó¤Ä°Ê¾å¤Î¥Ç¥£¥¹¥¯¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¤Î¤Ê¤é¡¢ + &os; ¤òÆó¤Ä°Ê¾å¤Î¥Ç¥£¥¹¥¯¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¤Î¤Ê¤é¡¢ ¤½¤Î¤È¤¤Ï¤³¤³¤Ç¾¤Î¥Ç¥£¥¹¥¯¤òÁªÂò¤·¡¢ <application>fdisk</application> ¤òÍѤ¤¤Æ¥¹¥é¥¤¥¹ºîÀ®¤Îºî¶È¤ò·«¤ê¤«¤¨¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> <important> - <para>°ìÈÖÌܰʳ°¤Î¥É¥é¥¤¥Ö¤Ë FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ - ξÊý¤Î¥É¥é¥¤¥Ö¤Ë FreeBSD + <para>°ìÈÖÌܰʳ°¤Î¥É¥é¥¤¥Ö¤Ë &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ + ξÊý¤Î¥É¥é¥¤¥Ö¤Ë &os; ¤Î¥Ö¡¼¥È¥Þ¥Í¡¼¥¸¥ã¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> </important> @@ -1783,12 +1766,12 @@ Mounting root from ufs:/dev/md0c <para>ÆÃÄê¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢ÆÃÊ̤Υѡ¼¥Æ¥£¥·¥ç¥ó¹½À® (ÆäËÆó¤Ä°Ê¾å¤Î¥Ç¥£¥¹¥¯¤Ë¤ï¤¿¤Ã¤Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¹½À®¤·¤Æ¤¤¤ë¾ì¹ç) ¤«¤éÍø±×¤òÆÀ¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - ¤·¤«¤·¤³¤Î¤³¤È¤Ë¤Ä¤¤¤Æ¤Ï¡¢¤Ï¤¸¤á¤Æ FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¡¢ + ¤·¤«¤·¤³¤Î¤³¤È¤Ë¤Ä¤¤¤Æ¤Ï¡¢¤Ï¤¸¤á¤Æ &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¡¢ ¥Ç¥£¥¹¥¯¤ò¤É¤Î¤è¤¦¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë¶èÀڤ뤫¡¢ ¤È¤¤¤¦¤³¤È¤ò¤¢¤Þ¤êÂ礲¤µ¤Ë¹Í¤¨¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£ - FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ»È¤¤Êý¤ò³Ø¤Ó¤Ï¤¸¤á¤ë¤³¤È¤ÎÊý¤¬¤è¤ê½ÅÍפǤ¹¡£ + &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ»È¤¤Êý¤ò³Ø¤Ó¤Ï¤¸¤á¤ë¤³¤È¤ÎÊý¤¬¤è¤ê½ÅÍפǤ¹¡£ OS ¤Ë¤è¤ê¾Ü¤·¤¯¤Ê¤Ã¤¿¤È¤¤Ë¡¢¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¹½À®¤òÊѹ¹¤¹¤ë¤¿¤á¤Ë - FreeBSD ¤ò¤¤¤Ä¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> + &os; ¤ò¤¤¤Ä¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> <para>°Ê²¼¤Ï»Í¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó — °ì¤Ä¤Ï¥¹¥ï¥Ã¥×Îΰ衢 »°¤Ä¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡¢¤Î¹½À®¤Ç¤¹¡£</para> @@ -1825,11 +1808,11 @@ Mounting root from ufs:/dev/md0c <entry>¤³¤ì¤Ï¥ë¡¼¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤¹¡£ ¾¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ï¤¹¤Ù¤Æ¤³¤Î²¼¤Î¤É¤³¤«¤Ë¥Þ¥¦¥ó¥È¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£ 1 GB ¤Ï¤³¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¼ê¤´¤í¤Ê¥µ¥¤¥º¤Ç¤¹¡£ - Ä̾ï¤Î FreeBSD ¥¤¥ó¥¹¥È¡¼¥ë¤¬¤³¤³¤ËÌó 128 MB + Ä̾ï¤Î &os; ¥¤¥ó¥¹¥È¡¼¥ë¤¬¤³¤³¤ËÌó 128 MB ¤Î¥Ç¡¼¥¿¤òÇÛÃÖ¤¹¤ë¤è¤¦¤Ë¡¢ ¤³¤³¤Ë¤Ï¤¢¤Þ¤ê¿¤¯¤Î¥Ç¡¼¥¿¤ò³ÊǼ¤·¤Ê¤¤¤Ç¤·¤ç¤¦¡£ »Ä¤ê¤ÎÎΰè¤Ï°ì»þŪ¤Ê¥Ç¡¼¥¿¤Î¤¿¤á¤Ë¤¢¤ê¡¢¤½¤·¤Æ - FreeBSD ¤Î¾Íè¤Î¥Ð¡¼¥¸¥ç¥ó¤¬ <filename>/</filename> + &os; ¤Î¾Íè¤Î¥Ð¡¼¥¸¥ç¥ó¤¬ <filename>/</filename> ¤Ë¤è¤ê¿¤¯¤ÎÎΰè¤òɬÍפȤ·¤¿¾ì¹ç¤Î³ÈÄ¥Îΰè¤È¤·¤Æ»Ä¤·¤Þ¤¹¡£ </entry> </row> @@ -1852,7 +1835,7 @@ Mounting root from ufs:/dev/md0c 32 MB ̤Ëþ¤Î¥á¥â¥ê¤òÅëºÜ¤·¤Æ¤¤¤ë»þ¤Ï¡¢ ¥¹¥ï¥Ã¥×Îΰè¤ò 64 MB ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para><para>Æó¤Ä°Ê¾å¤Î¥Ç¥£¥¹¥¯¤¬¤¢¤ë¤È¤¤Ë¤Ï¡¢ ¤½¤ì¤¾¤ì¤Î¥Ç¥£¥¹¥¯¤Ë¥¹¥ï¥Ã¥×¤òÃÖ¤¯¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - FreeBSD ¤Ï¤½¤ì¤¾¤ì¤Î¥Ç¥£¥¹¥¯¤ò¥¹¥ï¥Ã¥×¤ËÍѤ¤¡¢ + &os; ¤Ï¤½¤ì¤¾¤ì¤Î¥Ç¥£¥¹¥¯¤ò¥¹¥ï¥Ã¥×¤ËÍѤ¤¡¢ ¥¹¥ï¥Ã¥×Æ°ºî¤ò¸ú²ÌŪ¤Ë¹â®²½¤µ¤»¤ë¤Ç¤·¤ç¤¦¡£ ¤³¤Î¾ì¹ç¡¢É¬ÍפȤ¹¤ë¥¹¥ï¥Ã¥×¥µ¥¤¥º¤Î¹ç·×¤ò·×»»¤· (¤¿¤È¤¨¤Ð 128 MB)¡¢ @@ -1873,11 +1856,11 @@ Mounting root from ufs:/dev/md0c ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¡¢¥í¥°¥Õ¥¡¥¤¥ë¤ä¤½¤Î¾¤Î´ÉÍý¥Õ¥¡¥¤¥ë¤È¤¤¤Ã¤¿¡¢ À䤨¤ºÊѲ½¤¹¤ë¥Õ¥¡¥¤¥ë¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Î¿¤¯¤Ï - FreeBSD ¤ÎËèÆü¤ÎÆ°ºî¤Î´Ö¤Ë¹ÈϰϤˤ錄¤Ã¤ÆÆɤߤ³¤Þ¤ì¡¢ + &os; ¤ÎËèÆü¤ÎÆ°ºî¤Î´Ö¤Ë¹ÈϰϤˤ錄¤Ã¤ÆÆɤߤ³¤Þ¤ì¡¢ ½ñ¤¤³¤Þ¤ì¤Þ¤¹¡£ (ÌõÃí: <filename>/</filename>¤È¤Ï) Ê̤Υե¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¤³¤È¤Ï¡¢ °Û¤Ê¤Ã¤¿¥¢¥¯¥»¥¹ÉÑÅ٤Υǥ£¥ì¥¯¥È¥êÆâ¤Ë¤¢¤ë¾¤Î¥Õ¥¡¥¤¥ë¤Ë±Æ¶Á¤òÍ¿¤¨¤º¤Ë¡¢ - FreeBSD ¤¬¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹¤òºÇŬ²½¤¹¤ë¤³¤È¤ò²Äǽ¤È¤·¤Þ¤¹¡£</entry> + &os; ¤¬¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹¤òºÇŬ²½¤¹¤ë¤³¤È¤ò²Äǽ¤È¤·¤Þ¤¹¡£</entry> </row> <row> @@ -1902,7 +1885,7 @@ Mounting root from ufs:/dev/md0c ¤ÇÁªÂò¤Ç¤¤ë¼«Æ°¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥ì¥¤¥¢¥¦¥È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para> </warning> - <para>Æó¤Ä°Ê¾å¤Î¥Ç¥£¥¹¥¯¤Ë FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Î¤Ê¤é¡¢ + <para>Æó¤Ä°Ê¾å¤Î¥Ç¥£¥¹¥¯¤Ë &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Î¤Ê¤é¡¢ ÀßÄꤷ¤¿Â¾¤Î¥¹¥é¥¤¥¹¤Ë¤â¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó¡£ ºÇ¤â´Êñ¤ÊÊýË¡¤Ï¡¢ ¤½¤ì¤¾¤ì¤Î¥Ç¥£¥¹¥¯¤ËÆó¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤¹¤ë¤³¤È¤Ç¤¹¡£ @@ -1988,11 +1971,11 @@ Mounting root from ufs:/dev/md0c more specific needs or just don't care for the layout chosen by (A)uto, press F1 for more information on manual layout. - [ OK ] - [ Press enter or space ]</screen> + [ OK ] + [ Press enter or space ]</screen> <para><application>disklabel</application> ¤È¸Æ¤Ð¤ì¤ë - FreeBSD ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¨¥Ç¥£¥¿¤ò¤Ï¤¸¤á¤ë¤¿¤á¤Ë + &os; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¨¥Ç¥£¥¿¤ò¤Ï¤¸¤á¤ë¤¿¤á¤Ë <keycap>Enter</keycap> ¥¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <para><xref linkend="sysinstall-label"/> ¤Ï @@ -2040,14 +2023,14 @@ Mounting root from ufs:/dev/md0c ¥Ç¥Õ¥©¥ë¥È¤ò¤½¤Î¤Þ¤Þ¼õ¤±Æþ¤ì¤ëɬÍפϤʤ¤¤Î¤Ç¡¢ ¤³¤Î¤³¤È¤ÏÌäÂê¤Ë¤Ê¤ê¤Þ¤»¤ó¡£</para> - <note> - <para>¥Ç¥Õ¥©¥ë¥È¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¹½À®¤Ï - <filename>/tmp</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë - <filename>/</filename> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î°ìÉô¤Ç¤Ï¤Ê¤¯¡¢ - ¤½¤ì¼«¿È¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ - ¤³¤Î¤³¤È¤Ï¡¢°ì»þ¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ <filename>/</filename> - ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬¤¢¤Õ¤ì¤Æ¤·¤Þ¤¦¤³¤È¤òËɤ°¤Î¤ËÌòΩ¤Á¤Þ¤¹¡£</para> - </note> + <note> + <para>¥Ç¥Õ¥©¥ë¥È¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¹½À®¤Ï + <filename>/tmp</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë + <filename>/</filename> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î°ìÉô¤Ç¤Ï¤Ê¤¯¡¢ + ¤½¤ì¼«¿È¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ + ¤³¤Î¤³¤È¤Ï¡¢°ì»þ¥Õ¥¡¥¤¥ë¤Ë¤è¤Ã¤Æ <filename>/</filename> + ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬¤¢¤Õ¤ì¤Æ¤·¤Þ¤¦¤³¤È¤òËɤ°¤Î¤ËÌòΩ¤Á¤Þ¤¹¡£</para> + </note> <figure id="sysinstall-label2"> <title>¥Ç¥Õ¥©¥ë¥È¤Î¼«Æ°³ä¤êÅö¤Æ¤Ë¤è¤ë sysinstall ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¥¨¥Ç¥£¥¿</title> @@ -2154,7 +2137,7 @@ Mounting root from ufs:/dev/md0c ¥¹¥é¥¤¥¹¤Ë»Ä¤Ã¤Æ¤¤¤ë¥µ¥¤¥º¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¡¢ ɽ¼¨¤µ¤ì¤¿¥µ¥¤¥º¤ò¤½¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¯¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> - <para>ºÇ½ªÅª¤Ê FreeBSD ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¥¨¥Ç¥£¥¿ ¤Î²èÌ̤ϡ¢ + <para>ºÇ½ªÅª¤Ê &os; ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¥¨¥Ç¥£¥¿ ¤Î²èÌ̤ϡ¢ ÁªÂò¤µ¤ì¤¿¿ôÃͤϰۤʤäƤ¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢ <xref linkend="sysinstall-label4"/> ¤Î¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£ <keycap>Q</keycap> ¥¡¼¤ò²¡¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£</para> @@ -2180,7 +2163,7 @@ Mounting root from ufs:/dev/md0c <para>¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¥»¥Ã¥È¤òÁªÂò¤·¤Þ¤¹¡£ ¤³¤ì¤Ï»È¤ª¤¦¤È¤¹¤ë¥·¥¹¥Æ¥à¤äÍøÍѲÄǽ¤Ê¥Ç¥£¥¹¥¯¤ÎÍÆÎ̤˰͸¤·¤Þ¤¹¡£ ºÇ¾®¹½À®¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤éÁ´¤Æ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Þ¤Ç¤Î¥ª¥×¥·¥ç¥ó¤¬¤¢¤é¤«¤¸¤áÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - &unix; ¤ä FreeBSD ¤Ë´·¤ì¤Æ¤Ê¤¤¿Í¤Ï¤Û¤Ü´Ö°ã¤¤¤Ê¤¯¤³¤ì¤é¤ÎÍÑ°Õ¤µ¤ì¤¿¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á¤Î 1 ¤Ä¤òÁª¤Ö¤Ù¤¤Ç¤¹¡£ + &unix; ¤ä &os; ¤Ë´·¤ì¤Æ¤Ê¤¤¿Í¤Ï¤Û¤Ü´Ö°ã¤¤¤Ê¤¯¤³¤ì¤é¤ÎÍÑ°Õ¤µ¤ì¤¿¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á¤Î 1 ¤Ä¤òÁª¤Ö¤Ù¤¤Ç¤¹¡£ ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¥»¥Ã¥È¤Î¥«¥¹¥¿¥Þ¥¤¥º¤Ï¡¢¼ç¤È¤·¤Æ¤è¤ê·Ð¸³¤òÀѤó¤À¥æ¡¼¥¶¡¼¤Î¤¿¤á¤Ë¤¢¤ê¤Þ¤¹¡£</para> <para><keycap>F1</keycap> ¥¡¼¤ò²¡¤¹¤È¤½¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¥»¥Ã¥È¤Î¥ª¥×¥·¥ç¥ó¤ä¤½¤ì¤é¤¬²¿¤ò´Þ¤ó¤Ç¤¤¤ë¤«¤È¤¤¤¦¤è¤ê¾Ü¤·¤¤¾ðÊó¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£ @@ -2194,16 +2177,16 @@ Mounting root from ufs:/dev/md0c <xref linkend="x11"/> ¤Ë¤¢¤ê¤Þ¤¹¡£</para> <para>¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ëͽÄê¤Ê¤é¤Ð¥½¡¼¥¹¥³¡¼¥É¤ò´Þ¤à¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£ - ¤Ê¤¼¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¤Î¤«¡¢¤Þ¤¿¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¹½ÃÛÊýË¡¤Ë´Ø¤·¤Æ¤Ï - <xref linkend="kernelconfig"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + ¤Ê¤¼¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¤Î¤«¡¢¤Þ¤¿¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¹½ÃÛÊýË¡¤Ë´Ø¤·¤Æ¤Ï + <xref linkend="kernelconfig"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <para>ÅöÁ³¤Ê¤¬¤é¡¢Á´¤Æ¤ò´Þ¤à¥·¥¹¥Æ¥à¤¬ºÇ¤â¿¤¯¤Î¤³¤È¤ò¹Ô¤¨¤Þ¤¹¡£ - ½½Ê¬¤Ê¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤¬¤¢¤ë¤Ê¤é¤Ð¡¢<xref linkend="distribution-set1"/> - ¤Ç¼¨¤µ¤ì¤ë¤è¤¦¤Ë <guimenuitem>All</guimenuitem> ¤òÌð°õ¥¡¼¤ÇÁªÂò¤·¡¢ - <keycap>Enter</keycap> ¤ò²¡¤·¤Þ¤¹¡£ - ¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤Ë·üÇ°¤¬¤¢¤ë¤Ê¤é¤Ð¡¢¾õ¶·¤Ë¹ç¤Ã¤¿¤è¤ê¤Õ¤µ¤ï¤·¤¤¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£ - ¥¤¥ó¥¹¥È¡¼¥ë¸å¤Ë¤½¤Î¤Û¤«¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò²Ã¤¨¤ë¤³¤È¤¬¤Ç¤¤ë¤Î¤Ç¡¢ - ´°àú¤ÊÁªÂò¤ò¤·¤è¤¦¤È¤·¤ÆǺ¤Þ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para> + ½½Ê¬¤Ê¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤¬¤¢¤ë¤Ê¤é¤Ð¡¢<xref linkend="distribution-set1"/> + ¤Ç¼¨¤µ¤ì¤ë¤è¤¦¤Ë <guimenuitem>All</guimenuitem> ¤òÌð°õ¥¡¼¤ÇÁªÂò¤·¡¢ + <keycap>Enter</keycap> ¤ò²¡¤·¤Þ¤¹¡£ + ¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤Ë·üÇ°¤¬¤¢¤ë¤Ê¤é¤Ð¡¢¾õ¶·¤Ë¹ç¤Ã¤¿¤è¤ê¤Õ¤µ¤ï¤·¤¤¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£ + ¥¤¥ó¥¹¥È¡¼¥ë¸å¤Ë¤½¤Î¤Û¤«¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò²Ã¤¨¤ë¤³¤È¤¬¤Ç¤¤ë¤Î¤Ç¡¢ + ´°àú¤ÊÁªÂò¤ò¤·¤è¤¦¤È¤·¤ÆǺ¤Þ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para> <figure id="distribution-set1"> <title>¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎÁªÂò</title> @@ -2220,17 +2203,17 @@ Mounting root from ufs:/dev/md0c <title>Ports Collection ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title> <para>¤ªË¾¤ß¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤òÁª¤Ö¤È¡¢ - FreeBSD Ports Collection ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤Æ¤¤Þ¤¹¡£ - Ports Collection ¤È¤Ï¡¢´Êñ¤Ë¥½¥Õ¥È¥¦¥§¥¢¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ç¤¹¡£ - ¤³¤ì¤Ï¥½¥Õ¥È¥¦¥§¥¢¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤Î¤ËɬÍפʥ½¡¼¥¹¥³¡¼¥É¤ò´Þ¤ß¤Þ¤»¤ó¡£ - ¤½¤ÎÂå¤ï¤ê¡¢¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥½¥Õ¥È¥¦¥§¥¢¥Ñ¥Ã¥±¡¼¥¸¤ò¼«Æ°Åª¤Ë¥À¥¦¥ó¥í¡¼¥É¡¢¥³¥ó¥Ñ¥¤¥ë¡¢¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤Î½¸¤Þ¤ê¤Ç¤¹¡£ - <xref linkend="ports"/> ¤Ç Ports Collection ¤Î»ÈÍÑÊýË¡¤¬²òÀ⤵¤ì¤Æ¤¤¤Þ¤¹¡£</para> + &os; Ports Collection ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤Æ¤¤Þ¤¹¡£ + Ports Collection ¤È¤Ï¡¢´Êñ¤Ë¥½¥Õ¥È¥¦¥§¥¢¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ç¤¹¡£ + ¤³¤ì¤Ï¥½¥Õ¥È¥¦¥§¥¢¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤Î¤ËɬÍפʥ½¡¼¥¹¥³¡¼¥É¤ò´Þ¤ß¤Þ¤»¤ó¡£ + ¤½¤ÎÂå¤ï¤ê¡¢¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥½¥Õ¥È¥¦¥§¥¢¥Ñ¥Ã¥±¡¼¥¸¤ò¼«Æ°Åª¤Ë¥À¥¦¥ó¥í¡¼¥É¡¢¥³¥ó¥Ñ¥¤¥ë¡¢¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤Î½¸¤Þ¤ê¤Ç¤¹¡£ + <xref linkend="ports"/> ¤Ç Ports Collection ¤Î»ÈÍÑÊýË¡¤¬²òÀ⤵¤ì¤Æ¤¤¤Þ¤¹¡£</para> <para>¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥°¥é¥à¤Ï¥Ç¥£¥¹¥¯¤Ë½½Ê¬¤Ê¶õ¤ÍÆÎ̤¬¤¢¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤»¤ó¤Î¤Ç¡¢ ½½Ê¬¤Ê¶õ¤ÍÆÎ̤¬¤¢¤ë¾ì¹ç¤Î¤ß¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ - FreeBSD &rel.current; ¤Ç¤Ï¡¢FreeBSD Ports Collection ¤Ï¡¢Ìó &ports.size; + &os; &rel.current; ¤Ç¤Ï¡¢&os; Ports Collection ¤Ï¡¢Ìó &ports.size; ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤òɬÍפȤ·¤Þ¤¹¡£ - ¤è¤êºÇ¿·¤Î FreeBSD ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢°ÂÁ´¤Î¤¿¤á¤â¤¦¾¯¤·Â礤ʥµ¥¤¥º¤òÁÛÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para> + ¤è¤êºÇ¿·¤Î &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢°ÂÁ´¤Î¤¿¤á¤â¤¦¾¯¤·Â礤ʥµ¥¤¥º¤òÁÛÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para> <screen> User Confirmation Requested FreeBSD Ports Collection ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤«? @@ -2250,13 +2233,13 @@ Mounting root from ufs:/dev/md0c °Ê²¼¤Î¾ì½ê¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ http://www.FreeBSD.org/ports - [ Yes ] No</screen> + [ Yes ] No</screen> <para>Ports Collection ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ê¤é &gui.yes; ¤ò¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð &gui.no; - ¤òÌð°õ¥¡¼¤ÇÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£ - <keycap>Enter</keycap> ¥¡¼¤ò²¡¤·¤ÆÀè¤Ë¿Ê¤ß¤Þ¤¹¡£ - ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎÁªÂò¥á¥Ë¥å¡¼¤¬ºÆÅÙɽ¼¨¤µ¤ì¤Þ¤¹¡£</para> + ¤òÌð°õ¥¡¼¤ÇÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£ + <keycap>Enter</keycap> ¥¡¼¤ò²¡¤·¤ÆÀè¤Ë¿Ê¤ß¤Þ¤¹¡£ + ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎÁªÂò¥á¥Ë¥å¡¼¤¬ºÆÅÙɽ¼¨¤µ¤ì¤Þ¤¹¡£</para> <figure id="distribution-set2"> <title>¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î³Îǧ</title> @@ -2269,8 +2252,8 @@ Mounting root from ufs:/dev/md0c </figure> <para>¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤¿¤éÌð°õ¥¡¼¤Ç <guimenuitem>Exit</guimenuitem> - ¤òÁª¤Ó¡¢&gui.ok; ¤¬¥Ï¥¤¥é¥¤¥È¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¡¢ - <keycap>Enter</keycap> ¤ò²¡¤·¤ÆÀè¤Ë¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para> + ¤òÁª¤Ó¡¢&gui.ok; ¤¬¥Ï¥¤¥é¥¤¥È¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¡¢ + <keycap>Enter</keycap> ¤ò²¡¤·¤ÆÀè¤Ë¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para> </sect2> </sect1> @@ -2314,8 +2297,8 @@ Mounting root from ufs:/dev/md0c <variablelist> <varlistentry> - <term>FTP Active: - <guimenuitem>Install from an FTP server</guimenuitem></term> + <term>FTP Active: <guimenuitem>Install from an FTP + server</guimenuitem></term> <listitem> <para>¤¹¤Ù¤Æ¤Î FTP žÁ÷¤ÎºÝ¤Ë <quote>Active</quote> @@ -2329,8 +2312,7 @@ Mounting root from ufs:/dev/md0c </varlistentry> <varlistentry> - <term>FTP Passive: - <guimenuitem>Install from an FTP server through a + <term>FTP Passive: <guimenuitem>Install from an FTP server through a firewall</guimenuitem></term> <listitem> @@ -2350,7 +2332,7 @@ Mounting root from ufs:/dev/md0c <varlistentry> <term>HTTP proxy ·Ðͳ¤Î FTP: <guimenuitem>Install from an FTP server - through a http proxy</guimenuitem></term> + through a http proxy</guimenuitem></term> <listitem> <indexterm> @@ -2399,7 +2381,9 @@ Mounting root from ufs:/dev/md0c <hostid role="fqdn">ftp.FreeBSD.org</hostid> ¤«¤é¥Õ¥¡¥¤¥ë¤ò¼è¤ê´ó¤»¤Þ¤¹)¡£</para> </note> - </sect1> <sect1 id="install-final-warning"> + </sect1> + + <sect1 id="install-final-warning"> <title>¥¤¥ó¥¹¥È¡¼¥ëÁàºî¤Î³ÎÄê</title> <para>¤³¤ì¤ÇÎɤ¤¤È»×¤Ã¤¿¤é¡¢¤³¤³¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤ò¿Ê¤á¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ @@ -2414,7 +2398,7 @@ Mounting root from ufs:/dev/md0c We can take no responsibility for lost disk contents! - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁªÂò¤·¤Æ <keycap>Enter</keycap> ¥¡¼¤ò²¡¤¹¤³¤È¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤Ï¿Ê¤ß¤Þ¤¹¡£</para> @@ -2436,9 +2420,9 @@ For any option you do not wish to configure, simply select No. If you wish to re-enter this utility after the system is up, you may do so by typing: /usr/sbin/sysinstall. - [ OK ] + [ OK ] - [ Press enter or space ]</screen> + [ Press enter or space ]</screen> <para><keycap>Enter</keycap> ¥¡¼¤ò²¡¤»¤Ð¥¤¥ó¥¹¥È¡¼¥ë¸å¤ÎÀßÄê²èÌÌ¤Ë °Ü¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> @@ -2454,7 +2438,7 @@ through the debugging messages on VTY1 with the scroll-lock feature. You can also choose "No" at the next prompt and go back into the installation menus to retry whichever operations have failed. - [ OK ]</screen> + [ OK ]</screen> <para>²¿¤â¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Ê¤«¤Ã¤¿¤¿¤á¡¢¤³¤Î¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ <keycap>Enter</keycap> ¥¡¼¤ò²¡¤·¤Þ¤¹¤È¡¢ @@ -2465,9 +2449,11 @@ installation menus to retry whichever operations have failed. <title>¥¤¥ó¥¹¥È¡¼¥ë¸å¤Îºî¶È</title> <para>¥¤¥ó¥¹¥È¡¼¥ë´°Î»¸å¤Ë¿ô¡¹¤Î¥ª¥×¥·¥ç¥óÀßÄê¤ò¹Ô¤¤¤Þ¤¹¡£ - ¥ª¥×¥·¥ç¥ó¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ FreeBSD ¤òµ¯Æ°¤¹¤ëÁ°¤Ë configuration - ¤Î¹àÌܤËÆþ¤ê¤Ê¤ª¤¹¤«¡¢ºÆµ¯Æ°¸å¤Ë <command>sysinstall</command> ¤ÎÃæ¤Ë¤¢¤ë - <guimenuitem>Configure</guimenuitem> ¤Î¹àÌܤÇÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> + ¥ª¥×¥·¥ç¥ó¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ &os; ¤òµ¯Æ°¤¹¤ëÁ°¤Ë configuration + ¤Î¹àÌܤËÆþ¤ê¤Ê¤ª¤¹¤«¡¢ºÆµ¯Æ°¸å¤Ë + <command>sysinstall</command> + ¤ÎÃæ¤Ë¤¢¤ë <guimenuitem>Configure</guimenuitem> + ¤Î¹àÌܤÇÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> <sect2 id="inst-network-dev"> <title>¥Í¥Ã¥È¥ï¡¼¥¯¥Ç¥Ð¥¤¥¹¤ÎÀßÄê</title> @@ -2475,7 +2461,7 @@ installation menus to retry whichever operations have failed. <para>¤â¤·¡¢FTP ¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Ë PPP ¤òÀßÄꤷ¤¿¤Î¤Ê¤é¤Ð¡¢ ¤³¤Î²èÌ̤Ïɽ¼¨¤µ¤ì¤º¡¢Á°¹à¤Ç½Ò¤Ù¤¿¤è¤¦¤Ë¸å¤«¤éÀßÄê¤Ç¤¤Þ¤¹¡£</para> - <para>LAN ¤Î¾ÜºÙ¾ðÊó¤È¡¢FreeBSD ¤Î¥²¡¼¥È¥¦¥§¥¤¡¦¥ë¡¼¥¿¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï + <para>LAN ¤Î¾ÜºÙ¾ðÊó¤È¡¢&os; ¤Î¥²¡¼¥È¥¦¥§¥¤¡¦¥ë¡¼¥¿¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï <link linkend="advanced-networking">¹âÅ٤ʥͥåȥ¥¯</link> ¤Î¾Ï¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -2484,7 +2470,7 @@ installation menus to retry whichever operations have failed. (Ìõ¡§¥¤¡¼¥µ¥Í¥Ã¥È¤ä SLIP/PPP ¥Í¥Ã¥È¥ï¡¼¥¯¥Ç¥Ð¥¤¥¹¤òÀßÄꤷ¤¿¤¤¤Ç¤¹¤«¡©) - [ Yes ] No</screen> + [ Yes ] No</screen> <para>¥Í¥Ã¥È¥ï¡¼¥¯¥Ç¥Ð¥¤¥¹¤òÀßÄꤹ¤ë¤Ë¤Ï &gui.yes; ¤òÁª¤Ó¡¢<keycap>Enter</keycap> ¥¡¼¤ò²¡¤·¤Þ¤¹¡£ @@ -2509,7 +2495,7 @@ installation menus to retry whichever operations have failed. (Ìõ¡§¤³¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¾å¤Ç IPv6 ¤ÎÀßÄê¤ò¹Ô¤Ê¤¤¤¿¤¤¤Ç¤¹¤«¡©) - Yes [ No ]</screen> + Yes [ No ]</screen> <para>¥×¥é¥¤¥Ù¡¼¥È¤Ê LAN ¤Ë¤ª¤¤¤Æ¡¢¸½¹Ô¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥×¥í¥È¥³¥ë (<acronym>IPv4</acronym>) @@ -2521,11 +2507,11 @@ installation menus to retry whichever operations have failed. ¤¹¤ë¤È¡¢¿ôÉÃ´Ö RA ¥µ¡¼¥Ð¤ò¸¡º÷¤·¤Þ¤¹¡£</para> <screen> User Confirmation Requested - Do you want to try DHCP configuration of the interface? + Do you want to try DHCP configuration of the interface? (Ìõ¡§¤³¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¾å¤Ç DHCP ÀßÄê¤ò¹Ô¤Ê¤¤¤¿¤¤¤Ç¤¹¤«¡©) - Yes [ No ]</screen> + Yes [ No ]</screen> <para>¤â¤·¡¢DHCP (Dynamic Host Configuration Protocol) ¤¬É¬Íפʤ±¤ì¤Ð¡¢Ìð°õ¤Ç &gui.no; ¤òÁª¤Ó <keycap>Enter</keycap> @@ -2630,11 +2616,11 @@ installation menus to retry whichever operations have failed. <screen> User Confirmation Requested - Would you like to bring the ed0 interface up right now? + Would you like to bring the ed0 interface up right now? (Ìõ¡§¤³¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ø¤ÎÀßÄê¤òº£¤¹¤°Í¸ú¤Ë¤·¤Þ¤¹¤«¡©) - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁª¤ó¤Ç <keycap>Enter</keycap> ¤ò²¡¤¹¤È¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤Ø¤ÎÀßÄê¤ò¹Ô¤¤¡¢ÍøÍѲÄǽ¤Ê¾õÂ֤ˤ·¤Þ¤¹¡£ @@ -2650,7 +2636,7 @@ installation menus to retry whichever operations have failed. (Ìõ¡§¤³¤Î¥Þ¥·¥ó¤Ë¥Í¥Ã¥È¥ï¡¼¥¯¥²¡¼¥È¥¦¥§¥¤µ¡Ç½¤òÅëºÜ¤·¤Þ¤¹¤«¡©) - [ Yes ] No</screen> + [ Yes ] No</screen> <para>¤â¤·¡¢¥Þ¥·¥ó¤¬ LAN ¤Î¥²¡¼¥È¥¦¥¨¥¤¤Ç¤¢¤ê¡¢Â¾¥Þ¥·¥ó´Ö¤Î ¥Ñ¥±¥Ã¥È¤òžÁ÷¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢&gui.yes; ¤òÁª¤ó¤Ç @@ -2667,7 +2653,7 @@ Do you want to configure inetd and the network services that it provides? (Ìõ¡§inetd µÚ¤ÓÄ󶡤¹¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ó¥¹¤ÎÀßÄê¤ò¹Ô¤¤¤Þ¤¹¤«¡©) - Yes [ No ]</screen> + Yes [ No ]</screen> <para>¤â¤· &gui.no; ¤òÁª¤ó¤À¾ì¹ç¤Ë¤Ï¡¢¤µ¤Þ¤¶¤Þ¤Ê¥µ¡¼¥Ó¥¹¡¢ ¤¿¤È¤¨¤Ð <application>telnetd</application> ¤Ê¤É¤Ï͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ @@ -2696,7 +2682,7 @@ the exposure of your system. With this in mind, do you wish to enable inetd? - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁª¤ó¤Ç³¤±¤Þ¤¹¡£</para> @@ -2706,7 +2692,7 @@ which of its Internet services will be available. The default FreeBSD inetd.conf(5) leaves all services disabled by default, so they must be specifically enabled in the configuration file before they will function, even once inetd(8) is enabled. Note that services for -IPv6 must be seperately enabled from IPv4 services. +IPv6 must be separately enabled from IPv4 services. Select [Yes] now to invoke an editor on /etc/inetd.conf, or [No] to use the current settings. @@ -2721,7 +2707,7 @@ use the current settings. [Yes] ¤òÁª¤Ö¤È /etc/inetd.conf ¤ò¥¨¥Ç¥£¥¿¤ÇÊÔ½¸¤Ç¤¤Þ¤¹¡£ [No] ¤òÁª¤Ö¤È¡¢¸½ºß¤ÎÀßÄê¤ò¤Ä¤«¤¤¤Þ¤¹¡£) - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁª¤Ö¤È¡¢ ÀèƬ¹Ô¤«¤éÀßÄ꤬¤Ï¤¸¤Þ¤ê¤Þ¤¹¡£ @@ -2752,8 +2738,8 @@ use the current settings. </indexterm> <screen> User Confirmation Requested - Would you like to enable SSH login? - Yes [ No ]</screen> + Would you like to enable SSH login? + Yes [ No ]</screen> <para>&gui.yes; ¤òÁªÂò¤¹¤ë¤È¡¢<application>OpenSSH</application> ¤Î¥Ç¡¼¥â¥ó¤Ç¤¢¤ë &man.sshd.8; ¤¬Í¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£ @@ -2773,7 +2759,7 @@ use the current settings. <screen> User Confirmation Requested Do you want to have anonymous FTP access to this machine? - Yes [ No ]</screen> + Yes [ No ]</screen> <sect3 id="deny-anon"> <title>Anonymous FTP ¤òµö²Ä¤·¤Ê¤¤</title> @@ -2814,7 +2800,7 @@ use the current settings. Do you wish to continue configuring anonymous FTP? - [ Yes ] No</screen> + [ Yes ] No</screen> <para>¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï¡¢<filename>/etc/inetd.conf</filename> ¤Ë¤ª¤¤¤Æ¤â FTP ¥µ¡¼¥Ó¥¹¤ò͸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£ @@ -2891,9 +2877,9 @@ use the current settings. <keycap>Enter</keycap> ¤ò²¡¤·¤ÆÀè¤Ë¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£</para> <screen> User Confirmation Requested - Create a welcome message file for anonymous FTP users? + Create a welcome message file for anonymous FTP users? - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁªÂò¤· <keycap>Enter</keycap> ¤ò²¡¤¹¤È¡¢ @@ -2937,7 +2923,7 @@ use the current settings. <screen> User Confirmation Requested Do you want to configure this machine as an NFS server? - Yes [ No ]</screen> + Yes [ No ]</screen> <para>¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥µ¡¼¥Ð¤Îµ¡Ç½¤òɬÍפȤ·¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢ &gui.no; ¤òÁªÂò¤· @@ -2952,7 +2938,7 @@ Operating as an NFS server means that you must first configure an /etc/exports file to indicate which hosts are allowed certain kinds of access to your local filesystems. Press [Enter] now to invoke an editor on /etc/exports - [ OK ]</screen> + [ OK ]</screen> <para><keycap>Enter</keycap> ¤ò²¡¤·¤ÆÀè¤Ë¿Ê¤ó¤Ç¤¯¤À¤µ¤¤¡£ <filename>exports</filename> ¥Õ¥¡¥¤¥ë¤ÎºîÀ®¡¢ @@ -2987,7 +2973,7 @@ Press [Enter] now to invoke an editor on /etc/exports <screen> User Confirmation Requested Do you want to configure this machine as an NFS client? - Yes [ No ]</screen> + Yes [ No ]</screen> <para>Ìð°õ¥¡¼¤ò»È¤Ã¤Æ¡¢Å¬ÀÚ¤Ë &gui.yes; ¤Þ¤¿¤Ï &gui.no; ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -3002,7 +2988,7 @@ Press [Enter] now to invoke an editor on /etc/exports <screen> User Confirmation Requested Would you like to customize your system console settings? - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁªÂò¤·¡¢<keycap>Enter</keycap> ¤ò²¡¤·¤Æ¥ª¥×¥·¥ç¥ó¤Î³Îǧ¤ª¤è¤ÓÀßÄê¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -3083,9 +3069,9 @@ Press [Enter] now to invoke an editor on /etc/exports ¼ÂºÝ¤ÎÃÏÍýŪ°ÌÃÖ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen> User Confirmation Requested - Would you like to set this machine's time zone now? + Would you like to set this machine's time zone now? - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁªÂò¤· <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¡¢¥¿¥¤¥à¥¾¡¼¥ó¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -3094,7 +3080,7 @@ Press [Enter] now to invoke an editor on /etc/exports Is this machine's CMOS clock set to UTC? If it is set to local time or you don't know, please choose NO here! - Yes [ No ]</screen> + Yes [ No ]</screen> <para>¥³¥ó¥Ô¥å¡¼¥¿¤Î¥¯¥í¥Ã¥¯¤¬¤É¤Î¤è¤¦¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤«¤Ë½¾¤Ã¤Æ¡¢ &gui.yes; ¤Þ¤¿¤Ï &gui.no; @@ -3140,41 +3126,14 @@ Press [Enter] now to invoke an editor on /etc/exports <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen> Confirmation - Does the abbreviation 'EDT' look reasonable? + Does the abbreviation 'EDT' look reasonable? - [ Yes ] No</screen> + [ Yes ] No</screen> <para>¥¿¥¤¥à¥¾¡¼¥ó¤Îû½Ì·Á¤¬Å¬ÀÚ¤«¤É¤¦¤«¤ò³Îǧ¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£ ÌäÂê¤Ê¤±¤ì¤Ð <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¡¢¥¤¥ó¥¹¥È¡¼¥ë¸å¤ÎÀßÄê¤ò³¤±¤Æ¤¯¤À¤µ¤¤¡£</para> </sect2> - <sect2 id="linuxcomp"> - <title>Linux ¸ß´¹µ¡Ç½</title> - - <note> - <para>°Ê²¼¤Ï &os; 7.<replaceable>X</replaceable> - ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ËÅö¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£ - &os; 8.<replaceable>X</replaceable> - ¤ò¥¤¥ó¥¹¥È¡¼¥ëºÝ¤Ë¤Ï¡¢°Ê²¼¤Î²èÌ̤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£</para> - </note> - - <screen> User Confirmation Requested - Would you like to enable Linux binary compatibility? - - [ Yes ] No</screen> - - <para>&gui.yes; ¤òÁªÂò¤·¤Æ - <keycap>Enter</keycap> ¤ò²¡¤¹¤È¡¢ - FreeBSD ¾å¤Ç Linux ¤Î¥½¥Õ¥È¥¦¥¨¥¢¤ò¼Â¹Ô¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ - Linux ¸ß´¹¤Î¤¿¤á¤ËɬÍ×¤Ê package ¤¬Äɲ䵤ì¤Þ¤¹¡£</para> - - <para>FTP ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢ - ¥³¥ó¥Ô¥å¡¼¥¿¤¬¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤Ç¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ - Linux ¥Ð¥¤¥Ê¥ê¸ß´¹¤Ê¤É¡¢¤¹¤Ù¤Æ¤Î package ¤òÇÛÉÛ¤·¤Æ¤¤¤Ê¤¤¥ê¥â¡¼¥È - ftp ¥µ¥¤¥È¤¬¤¢¤ê¤Þ¤¹¡£ - ɬÍפǤ¢¤ì¤Ð¡¢¸å¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> - </sect2> - <sect2 id="mouse"> <title>¥Þ¥¦¥¹¤ÎÀßÄê</title> @@ -3188,9 +3147,9 @@ Press [Enter] now to invoke an editor on /etc/exports ¤ÎÀßÄê¤òÎã¤ËÀâÌÀ¤·¤Þ¤¹¡£</para> <screen> User Confirmation Requested - Does this system have a PS/2, serial, or bus mouse? + Does this system have a PS/2, serial, or bus mouse? - [ Yes ] No </screen> + [ Yes ] No </screen> <para>PS/2¡¢¥·¥ê¥¢¥ë¤Þ¤¿¤Ï¥Ð¥¹¥Þ¥¦¥¹¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï &gui.yes; ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ @@ -3306,7 +3265,7 @@ Press [Enter] now to invoke an editor on /etc/exports ready-to-run applications, from text editors to games to WEB servers and more. Would you like to browse the collection now? - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁªÂò¤·¤Æ¡¢ <keycap>Enter</keycap> ¤ò²¡¤¹¤È¡¢ @@ -3411,7 +3370,7 @@ Press [Enter] now to invoke an editor on /etc/exports working as the "root" user is dangerous (it is easy to do things which adversely affect the entire system). - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁªÂò¤·¡¢ <keycap>Enter</keycap> ¤ò²¡¤·¤Æ¡¢¥æ¡¼¥¶¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para> @@ -3457,7 +3416,7 @@ Press [Enter] now to invoke an editor on /etc/exports <listitem> <para>¿·¤·¤¤¥æ¡¼¥¶¤Î ID ÈÖ¹æ - (¶õÍó¤Î¤Þ¤Þ¤Ë¤¹¤ë¤È¡¢¼«Æ°Åª¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹)</para> + (¶õÍó¤Î¤Þ¤Þ¤Ë¤¹¤ë¤È¡¢¼«Æ°Åª¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹)</para> </listitem> </varlistentry> @@ -3466,7 +3425,7 @@ Press [Enter] now to invoke an editor on /etc/exports <listitem> <para>¿·¤·¤¤¥æ¡¼¥¶¤Î¥í¥°¥¤¥ó¥°¥ë¡¼¥× - (¶õÍó¤Î¤Þ¤Þ¤Ë¤¹¤ë¤È¡¢¼«Æ°Åª¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹)</para> + (¶õÍó¤Î¤Þ¤Þ¤Ë¤¹¤ë¤È¡¢¼«Æ°Åª¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹)</para> </listitem> </varlistentry> @@ -3559,9 +3518,9 @@ Press [Enter] now to invoke an editor on /etc/exports Now you must set the system manager's password. This is the password you'll use to log in as "root". - [ OK ] + [ OK ] - [ Press enter or space ]</screen> + [ Press enter or space ]</screen> <para><keycap>Enter</keycap> ¤ò²¡¤·¤Æ¡¢ <username>root</username> ¥Ñ¥¹¥ï¡¼¥É¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -3592,7 +3551,7 @@ Retype new password :</screen> Visit the general configuration menu for a chance to set any last options? - Yes [ No ]</screen> + Yes [ No ]</screen> <para>&gui.no; ¤òÁªÂò¤·¡¢ <keycap>Enter</keycap> @@ -3615,7 +3574,7 @@ Retype new password :</screen> <screen> User Confirmation Requested Are you sure you wish to exit? The system will reboot. - [ Yes ] No</screen> + [ Yes ] No</screen> <para>&gui.yes; ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ CDROM ¥É¥é¥¤¥Ö¤«¤éµ¯Æ°¤·¤Æ¤¤¤ë¤Î¤Ê¤é¡¢ @@ -3624,8 +3583,8 @@ Retype new password :</screen> <screen> Message Be sure to remove the media from the drive. - [ OK ] - [ Press enter or space ]</screen> + [ OK ] + [ Press enter or space ]</screen> <para>¥Þ¥·¥ó¤¬ºÆµ¯Æ°¤·»Ï¤á¤ë¤È CDROM ¥É¥é¥¤¥Ö¤Ï¥í¥Ã¥¯¤µ¤ì¤ë¤Î¤Ç¡¢ ¥É¥é¥¤¥Ö¤«¤é (ÁÇÁ᤯) ¥Ç¥£¥¹¥¯¤ò¼è¤ê½Ð¤·¤Æ¤¯¤À¤µ¤¤¡£ @@ -3941,9 +3900,9 @@ Retype new password :</screen> <para>ŵ·¿Åª¤Ê¥Ö¡¼¥È¥á¥Ã¥»¡¼¥¸ (¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Ï¾Êά¤·¤Æ¤¤¤Þ¤¹)</para> - <screen>Copyright (c) 1992-2002 The FreeBSD Project. +<screen>Copyright (c) 1992-2002 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 - The Regents of the University of California. All rights reserved. + The Regents of the University of California. All rights reserved. Timecounter "i8254" frequency 1193182 Hz CPU: AMD-K6(tm) 3D processor (300.68-MHz 586-class CPU) @@ -4030,13 +3989,13 @@ Automatic boot in progress... /dev/ad0s1e: clean, 128193 free (17 frags, 16022 blocks, 0.0% fragmentation) Doing initial network setup: hostname. ed0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 - inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255 - inet6 fe80::5054::5ff::fede:731b%ed0 prefixlen 64 tentative scopeid 0x1 - ether 52:54:05:de:73:1b + inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255 + inet6 fe80::5054::5ff::fede:731b%ed0 prefixlen 64 tentative scopeid 0x1 + ether 52:54:05:de:73:1b lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384 - inet6 fe80::1%lo0 prefixlen 64 scopeid 0x8 - inet6 ::1 prefixlen 128 - inet 127.0.0.1 netmask 0xff000000 + inet6 fe80::1%lo0 prefixlen 64 scopeid 0x8 + inet6 ::1 prefixlen 128 + inet 127.0.0.1 netmask 0xff000000 Additional routing options: IP gateway=YES TCP keepalive=YES routing daemons:. additional daemons: syslogd. @@ -4081,7 +4040,7 @@ Password:</screen> </sect2> <sect2 id="shutdown"> - <title>FreeBSD ¤Î¥·¥ã¥Ã¥È¥À¥¦¥ó</title> + <title>&os; ¤Î¥·¥ã¥Ã¥È¥À¥¦¥ó</title> <para>¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤òŬÀڤ˥·¥ã¥Ã¥È¥À¥¦¥ó¤¹¤ë¤³¤È¤Ï½ÅÍפǤ¹¡£ ¤¿¤ÀÅŸ»¤òÍ¤È¤¤¤¦¤³¤È¤Ï¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£ @@ -4102,7 +4061,12 @@ Please press any key to reboot.</screen> ÅŸ»¤òÍÂå¤ï¤ê¤Ë²¿¤é¤«¤Î¥¡¼¤¬²¡¤µ¤ì¤¿¾ì¹ç¡¢ ¥·¥¹¥Æ¥à¤Ï¥ê¥Ö¡¼¥È¤¹¤ë¤Ç¤·¤ç¤¦¡£</para> - <para><keycombo action="simul"><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo> + <para> + <keycombo action="simul"> + <keycap>Ctrl</keycap> + <keycap>Alt</keycap> + <keycap>Del</keycap> + </keycombo> ¤È¤¤¤¦¥¡¼¤ÎÁȹ礻¤ò»È¤Ã¤Æ¥·¥¹¥Æ¥à¤ò¥ê¥Ö¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¤¬¡¢ Ä̾ï¤Î±¿ÍѤˤª¤¤¤Æ¤³¤ì¤Ï¿ä¾©¤µ¤ì¤Þ¤»¤ó¡£</para> @@ -4117,7 +4081,7 @@ Please press any key to reboot.</screen> <secondary>¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°</secondary> </indexterm> <para>¤³¤ÎÀá¤Ç¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤ÎºÝ¤Î¡¢¤³¤ì¤Þ¤ÇÊó¹ð¤µ¤ì¤¿¶¦Ä̤ÎÌäÂê¤ËÂФ¹¤ë²ò·è¤Î¤¿¤á¤Î¾ðÊ󤬽ñ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£ - ¤Þ¤¿¡¢FreeBSD ¤È &ms-dos; ¤Þ¤¿¤Ï¡¢&windows; + ¤Þ¤¿¡¢&os; ¤È &ms-dos; ¤Þ¤¿¤Ï¡¢&windows; ¤Î¥Ç¥å¥¢¥ë¥Ö¡¼¥È¤ò¹Ô¤¦ºÝ¤Î¤¤¤¯¤Ä¤«¤Î¼ÁÌä¤È²óÅú¤â½ñ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£</para> <sect2> @@ -4428,10 +4392,10 @@ Please press any key to reboot.</screen> <title>¹âÅ٤ʥ¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</title> - <para>¤³¤ÎÀá¤Ç¤ÏÆüì¤Ê¾õ¶·¤Ç¤Î FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤¬µ½Ò¤·¤Æ¤¢¤ê¤Þ¤¹¡£</para> + <para>¤³¤ÎÀá¤Ç¤ÏÆüì¤Ê¾õ¶·¤Ç¤Î &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤¬µ½Ò¤·¤Æ¤¢¤ê¤Þ¤¹¡£</para> <sect2 id="headless-install"> - <title>FreeBSD ¤ò¥â¥Ë¥¿¤ä¥¡¼¥Ü¡¼¥É¤Î¤Ê¤¤¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë</title> + <title>&os; ¤ò¥â¥Ë¥¿¤ä¥¡¼¥Ü¡¼¥É¤Î¤Ê¤¤¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë</title> <indexterm> <primary>installation</primary> @@ -4439,7 +4403,7 @@ Please press any key to reboot.</screen> </indexterm> <indexterm><primary>serial console</primary></indexterm> <para>¤³¤Î·Á¼°¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï <quote>ɽ¼¨¤Î¤Ê¤¤¥¤¥ó¥¹¥È¡¼¥ë</quote> ¤È¸Æ¤Ð¤ì¤Þ¤¹¡£ - ¤Ê¤¼¤Ê¤é¡¢FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤¹¤ë¥Þ¥·¥ó¤Ë¥â¥Ë¥¿¤¬Àܳ¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢ + ¤Ê¤¼¤Ê¤é¡¢&os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤¹¤ë¥Þ¥·¥ó¤Ë¥â¥Ë¥¿¤¬Àܳ¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢ VGA ½ÐÎϤµ¤¨¤â¤Ã¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£ ¤É¤Î¤è¤¦¤Ë¤¹¤ì¤Ð¤è¤¤¤Ç¤·¤ç¤¦¤«? ¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£ @@ -4457,12 +4421,12 @@ Please press any key to reboot.</screen> <step> <title>¥¤¥ó¥¹¥È¡¼¥ëÍÑ USB ¥¹¥Æ¥£¥Ã¥¯¤Î¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ø¤Îµ¯Æ°¤ò͸ú¤Ë¤¹¤ë</title> - <indexterm> + <indexterm> <primary><command>mount</command></primary> </indexterm> <para>ºîÀ®¤·¤¿ USB ¥¹¥Æ¥£¥Ã¥¯¤Çµ¯Æ°¤¹¤ë¤È¡¢ - FreeBSD ¤ÏÄ̾ï¤Î¥¤¥ó¥¹¥È¡¼¥ë¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£ - ¥¤¥ó¥¹¥È¡¼¥ë¤Ë¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤ò»È¤Ã¤Æ FreeBSD ¤òµ¯Æ°¤·¤¿¤¤¤Î¤Ç¡¢ + &os; ¤ÏÄ̾ï¤Î¥¤¥ó¥¹¥È¡¼¥ë¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£ + ¥¤¥ó¥¹¥È¡¼¥ë¤Ë¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤ò»È¤Ã¤Æ &os; ¤òµ¯Æ°¤·¤¿¤¤¤Î¤Ç¡¢ ¤½¤Î¤¿¤á¤Ë¤Ï¡¢¤Þ¤º &os; ¤Î¥·¥¹¥Æ¥à¤Ë &man.mount.8; ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ USB ¥Ç¥£¥¹¥¯¤ò¥Þ¥¦¥ó¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> @@ -4492,7 +4456,7 @@ Please press any key to reboot.</screen> <step> <title>¥¤¥ó¥¹¥È¡¼¥ëÍÑ CD ¤Î¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ø¤Îµ¯Æ°¤ò͸ú¤Ë¤¹¤ë</title> - <indexterm> + <indexterm> <primary><command>mount</command></primary> </indexterm> <para>¥¤¥ó¥¹¥È¡¼¥ëÍѤΠISO ¥¤¥á¡¼¥¸ (<xref @@ -4530,7 +4494,7 @@ Please press any key to reboot.</screen> <para>ŬÀÚ¤Ê ISO ¥¤¥á¡¼¥¸¤òºîÀ®¤Ç¤¤¿¤Î¤Ç¡¢ ¤ªµ¤¤ËÆþ¤ê¤Î CD ¥é¥¤¥¿ÍѤΥ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò»È¤Ã¤Æ CD-R ¤Ë¾Æ¤¤¤Æ¤¯¤À¤µ¤¤¡£</para> - </step> + </step> <step> <title>¥Ì¥ë¥â¥Ç¥à¥±¡¼¥Ö¥ë¤ÎÀܳ</title> @@ -4541,8 +4505,8 @@ Please press any key to reboot.</screen> ¥Ì¥ë¥â¥Ç¥à¥±¡¼¥Ö¥ë ¤ÇÀܳ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ¥±¡¼¥Ö¥ë¤Ç 2 ¤Ä¤Î¥Þ¥·¥ó¤Î¥·¥ê¥¢¥ë¥Ý¡¼¥ÈƱ»Î¤ò¤Ä¤Ê¤²¤Æ¤¯¤À¤µ¤¤¡£ - <emphasis>ÉáÄ̤Υ·¥ê¥¢¥ë¥±¡¼¥Ö¥ë¤Ï¤³¤³¤Ç¤Ï»È¤¨¤Þ¤»¤ó¡£</emphasis> - ÆâÉôÇÛÀþ¤Î¤¤¤¯¤Ä¤«¤¬¥¯¥í¥¹¤µ¤ì¤¿¥Ì¥ë¥â¥Ç¥à¥±¡¼¥Ö¥ë¤¬É¬ÍפǤ¹¡£</para> + <emphasis>ÉáÄ̤Υ·¥ê¥¢¥ë¥±¡¼¥Ö¥ë¤Ï¤³¤³¤Ç¤Ï»È¤¨¤Þ¤»¤ó¡£</emphasis> + ÆâÉôÇÛÀþ¤Î¤¤¤¯¤Ä¤«¤¬¥¯¥í¥¹¤µ¤ì¤¿¥Ì¥ë¥â¥Ç¥à¥±¡¼¥Ö¥ë¤¬É¬ÍפǤ¹¡£</para> </step> <step> @@ -4552,7 +4516,7 @@ Please press any key to reboot.</screen> USB ¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤ò¡¢²èÌ̤Τʤ¤¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤ª¤¦¤È¤·¤Æ¤¤¤ë¥Þ¥·¥ó¤ËÁÞÆþ¤·¡¢ ÅŸ»¤òÅêÆþ¤·¤Æ¤¯¤À¤µ¤¤¡£ºîÀ®¤·¤¿ CDROM ¤ò»È¤¦¾ì¹ç¤Ë¤Ï¡¢ - ¥Þ¥·¥ó¤ÎÅŸ»¤òÅêÆþ¤·¡¢¥Ç¥£¥¹¥¯¤òÁÞÆþ¤·¤Æµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + ¥Þ¥·¥ó¤ÎÅŸ»¤òÅêÆþ¤·¡¢¥Ç¥£¥¹¥¯¤òÁÞÆþ¤·¤Æµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para> </step> <step> @@ -4566,11 +4530,6 @@ Please press any key to reboot.</screen> <screen>&prompt.root; <userinput>cu -l /dev/cuau0</userinput></screen> - <para>&os; 7.<replaceable>X</replaceable> ¤Ç¤Ï¡¢ - ¤«¤ï¤ê¤Ë°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> - - <screen>&prompt.root; <userinput>cu -l /dev/cuad0</userinput></screen> - </step> </procedure> @@ -4579,7 +4538,7 @@ Please press any key to reboot.</screen> ¥¤¥ó¥¹¥È¡¼¥é¤¬ <filename>kern1.flp</filename> ¤òÁÞÆþ¤¹¤ë¤è¤¦¤ËÍ׵ᤷ¡¢ ¤½¤Î¸å¤É¤Î¼ïÎà¤ÎüËö¤ò»È¤¦¤«Áª¤Ö¤è¤¦Ìä¤ï¤ì¤Þ¤¹¡£ - FreeBSD ¥«¥é¡¼¥³¥ó¥½¡¼¥ë¤òÁª¤ó¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤ò³¹Ô¤·¤Æ¤¯¤À¤µ¤¤!</para> + &os; ¥«¥é¡¼¥³¥ó¥½¡¼¥ë¤òÁª¤ó¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤ò³¹Ô¤·¤Æ¤¯¤À¤µ¤¤!</para> </sect2> </sect1> @@ -4588,12 +4547,12 @@ Please press any key to reboot.</screen> <title>¼«Ê¬¤Î¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤Î½àÈ÷</title> <note> - <para>¾Êά¤Î¤¿¤á¡¢°Ê²¼¤Ë¤ª¤¤¤Æ <quote>FreeBSD ¥Ç¥£¥¹¥¯</quote>¤È¤¤¤¦¤Î¤Ï¡¢ - ¤¢¤Ê¤¿¤¬¹ØÆþ¡¢¤â¤·¤¯¤Ï¼«Ê¬¤ÇºîÀ®¤·¤¿ - FreeBSD ¤Î CDROM ¤Þ¤¿¤Ï DVD ¤Î¤³¤È¤ò°ÕÌ£¤¹¤ë¤³¤È¤Ë¤·¤Þ¤¹¡£</para> + <para>¾Êά¤Î¤¿¤á¡¢°Ê²¼¤Ë¤ª¤¤¤Æ <quote>&os; ¥Ç¥£¥¹¥¯</quote>¤È¤¤¤¦¤Î¤Ï¡¢ + ¤¢¤Ê¤¿¤¬¹ØÆþ¡¢¤â¤·¤¯¤Ï¼«Ê¬¤ÇºîÀ®¤·¤¿ + &os; ¤Î CDROM ¤Þ¤¿¤Ï DVD ¤Î¤³¤È¤ò°ÕÌ£¤¹¤ë¤³¤È¤Ë¤·¤Þ¤¹¡£</para> </note> - <para>¼«Ê¬ÍѤΠFreeBSD ¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤ä¥½¡¼¥¹¤òÍÑ°Õ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ + <para>¼«Ê¬ÍѤΠ&os; ¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤ä¥½¡¼¥¹¤òÍÑ°Õ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ ¤³¤ì¤Ï¼§µ¤¥Æ¡¼¥×¤Î¤è¤¦¤ÊʪÍýŪ¤Ê¥á¥Ç¥£¥¢¤Ç¤¢¤Ã¤¿¤ê¡¢ ¥í¡¼¥«¥ë FTP ¥µ¥¤¥È¤Þ¤¿¤Ï &ms-dos; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤È¤¤¤Ã¤¿ <application>sysinstall</application> @@ -4604,44 +4563,44 @@ Please press any key to reboot.</screen> <itemizedlist> <listitem> <para>¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¤Ë·Ò¤¬¤Ã¤¿¤¿¤¯¤µ¤ó¤Î¥Þ¥·¥ó¤È¡¢ - 1 ¤Ä¤Î FreeBSD ¥Ç¥£¥¹¥¯¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£ - FreeBSD ¥Ç¥£¥¹¥¯¤ÎÆâÍƤò»È¤Ã¤Æ¥í¡¼¥«¥ë FTP ¥µ¥¤¥È¤òºîÀ®¤·¡¢ - ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤¹¤ëɬÍפÎÂå¤ï¤ê¤Ë¤³¤Î¥í¡¼¥«¥ë FTP - ¥µ¥¤¥È¤ò»È¤¦¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> + 1 ¤Ä¤Î &os; ¥Ç¥£¥¹¥¯¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£ + &os; ¥Ç¥£¥¹¥¯¤ÎÆâÍƤò»È¤Ã¤Æ¥í¡¼¥«¥ë FTP ¥µ¥¤¥È¤òºîÀ®¤·¡¢ + ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤¹¤ëɬÍפÎÂå¤ï¤ê¤Ë¤³¤Î¥í¡¼¥«¥ë FTP + ¥µ¥¤¥È¤ò»È¤¦¤è¤¦¤Ë¤·¤Þ¤¹¡£</para> </listitem> <listitem> - <para>FreeBSD ¥Ç¥£¥¹¥¯¤ò»ý¤Ã¤Æ¤¤¤Æ¡¢FreeBSD ¤Ï¤¢¤Ê¤¿¤Î - CD/DVD ¥É¥é¥¤¥Ö¤òǧ¼±¤Ç¤¤Ê¤¤¤¬¡¢ - &ms-dos; / &windows; ¤Ï¤½¤ì¤¬¤Ç¤¤ë¤È¤·¤Þ¤¹¡£ - ¥³¥ó¥Ô¥å¡¼¥¿¾å¤Î &ms-dos; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë FreeBSD - ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤·¤Æ¡¢FreeBSD - ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò»È¤¤¤Þ¤¹¡£</para> + <para>&os; ¥Ç¥£¥¹¥¯¤ò»ý¤Ã¤Æ¤¤¤Æ¡¢&os; ¤Ï¤¢¤Ê¤¿¤Î + CD/DVD ¥É¥é¥¤¥Ö¤òǧ¼±¤Ç¤¤Ê¤¤¤¬¡¢ + &ms-dos; / &windows; ¤Ï¤½¤ì¤¬¤Ç¤¤ë¤È¤·¤Þ¤¹¡£ + ¥³¥ó¥Ô¥å¡¼¥¿¾å¤Î &ms-dos; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë &os; + ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤·¤Æ¡¢&os; + ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò»È¤¤¤Þ¤¹¡£</para> </listitem> <listitem> <para>¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤¿¤¤¥³¥ó¥Ô¥å¡¼¥¿¤¬ CD/DVD - ¥É¥é¥¤¥Ö¤ä¥Í¥Ã¥È¥ï¡¼¥¯¥«¡¼¥É¤òÅëºÜ¤·¤Æ¤Ê¤¯¤Æ¤â¡¢ - <quote>Laplink ¥¹¥¿¥¤¥ë¤Î</quote>¥·¥ê¥¢¥ë¤Þ¤¿¤Ï¥Ñ¥é¥ì¥ë¥±¡¼¥Ö¥ë¤Ç¡¢ - ¤½¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ËÀܳ¤Ç¤¤Þ¤¹¡£</para> + ¥É¥é¥¤¥Ö¤ä¥Í¥Ã¥È¥ï¡¼¥¯¥«¡¼¥É¤òÅëºÜ¤·¤Æ¤Ê¤¯¤Æ¤â¡¢ + <quote>Laplink ¥¹¥¿¥¤¥ë¤Î</quote>¥·¥ê¥¢¥ë¤Þ¤¿¤Ï¥Ñ¥é¥ì¥ë¥±¡¼¥Ö¥ë¤Ç¡¢ + ¤½¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ËÀܳ¤Ç¤¤Þ¤¹¡£</para> </listitem> <listitem> - <para>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë»È¤¨¤ë¼§µ¤¥Æ¡¼¥×¤òºîÀ®¤·¤Þ¤¹¡£</para> + <para>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë»È¤¨¤ë¼§µ¤¥Æ¡¼¥×¤òºîÀ®¤·¤Þ¤¹¡£</para> </listitem> </itemizedlist> <sect2 id="install-cdrom"> <title>¥¤¥ó¥¹¥È¡¼¥ë CDROM ¤ÎºîÀ®</title> - <para>FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥ê¥ê¡¼¥¹¤ËÂФ·¤Æ + <para>&os; ¥×¥í¥¸¥§¥¯¥È¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥ê¥ê¡¼¥¹¤ËÂФ·¤Æ ¾¯¤Ê¤¯¤È¤â 2 ¤Ä¤Î CDROM ¥¤¥á¡¼¥¸ (<quote>ISO ¥¤¥á¡¼¥¸</quote>) ¤ò¤½¤ì¤¾¤ì¤Î¥¢¡¼¥¥Æ¥¯¥Á¥ã¤´¤È¤ËÍÑ°Õ¤·¤Æ¤¤¤Þ¤¹¡£ CD ¥é¥¤¥¿¤ò»ý¤Ã¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢¥¤¥á¡¼¥¸¤ò CD ¤Ë½ñ¤¹þ¤à (<quote>¾Æ¤¯</quote>) ¤³¤È¤¬¤Ç¤¡¢ - ¤½¤ì¤ò»È¤Ã¤Æ FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£ + ¤½¤ì¤ò»È¤Ã¤Æ &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£ CD ¥é¥¤¥¿¤ò»ý¤Ã¤Æ¤¤¤Æ¡¢¥Ð¥ó¥ÉÉý¤ò°Â¤¯ÍøÍѤǤ¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ - ¤³¤ì¤¬ FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÇ¤â´Êñ¤ÊÊýË¡¤Ç¤¹¡£</para> + ¤³¤ì¤¬ &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÇ¤â´Êñ¤ÊÊýË¡¤Ç¤¹¡£</para> <procedure> <step> @@ -4656,8 +4615,8 @@ Please press any key to reboot.</screen> <para>Ä̾¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï°Ê²¼¤Î¥¤¥á¡¼¥¸¤¬ÃÖ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£</para> <table frame="none"> - <title>FreeBSD 7.<replaceable>X</replaceable> ¤ª¤è¤Ó - 8.<replaceable>X</replaceable> ISO ¥¤¥á¡¼¥¸¤Î̾Á°¤ÈÆâÍÆ</title> + <title>&os; 8.<replaceable>X</replaceable> + ISO ¥¤¥á¡¼¥¸¤Î̾Á°¤ÈÆâÍÆ</title> <tgroup cols="2"> <thead> @@ -4682,7 +4641,7 @@ Please press any key to reboot.</screen> <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-dvd1.iso.gz</filename></entry> <entry>¤³¤Î DVD ¥¤¥á¡¼¥¸¤Ë¤Ï¡¢ - FreeBSD ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¡¢ + &os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¡¢ ¥³¥ó¥Ñ¥¤¥ëºÑ¤ß¤Î package °ì¼°¡¢ ¥É¥¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤ËɬÍפʤâ¤Î¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£ <quote>livefs</quote> ¥Ù¡¼¥¹¤Î¥ì¥¹¥¥å¡¼¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£</entry> @@ -4695,18 +4654,16 @@ Please press any key to reboot.</screen> USB ¥É¥é¥¤¥Ö¤«¤é¤Îµ¯Æ°²Äǽ¤Ê¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤Ï¡¢ ¤³¤ì¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ë»È¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ <quote>livefs</quote> ¥Ù¡¼¥¹¤Î¥ì¥¹¥¥å¡¼¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£ - package ¤Ï¡¢¥É¥¥å¥á¥ó¥È¤Ë´ØÏ¢¤¹¤ë¤â¤Î¤Î¤ß¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£ - &os; 7.<replaceable>X</replaceable> - °ÊÁ°¤Ç¤Ï¤³¤Î¥¤¥á¡¼¥¸¤òÍøÍѤǤ¤Þ¤»¤ó¡£</entry> + package ¤Ï¡¢¥É¥¥å¥á¥ó¥È¤Ë´ØÏ¢¤¹¤ë¤â¤Î¤Î¤ß¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£</entry> </row> <row> <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc1.iso</filename></entry> <entry>¤³¤Î CD ¥¤¥á¡¼¥¸¤Ë¤Ï¡¢ - FreeBSD ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤È¥É¥¥å¥á¥ó¥È¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤ËɬÍפʤâ¤Î¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£ + &os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤È¥É¥¥å¥á¥ó¥È¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤ËɬÍפʤâ¤Î¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£ ¤½¤Î¾¤Î package ¤Ï´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</entry> - </row> + </row> <row> <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc2.iso</filename></entry> @@ -4745,13 +4702,6 @@ Please press any key to reboot.</screen> </tgroup> </table> - <note> - <para>&os; 7.3 ¤è¤êÁ°¤Î &os; 7.<replaceable>X</replaceable> ¤ª¤è¤Ó - &os; 8.0 ¤Ç¤Ï¡¢ - ¾åµ¤È¤Ï°Û¤Ê¤ë̾Á°ÉÕ¤±¤¬¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£ - ISO ¥¤¥á¡¼¥¸¤Ë¤Ï¡¢<literal>&os;-</literal> ¤ÎÀÜƬ¼¤¬¤¢¤ê¤Þ¤»¤ó¡£</para> - </note> - <para><literal>bootonly</literal> ISO ¥¤¥á¡¼¥¸¤Þ¤¿¤Ï <literal>disc1</literal> ¥¤¥á¡¼¥¸¤Î¤É¤Á¤é¤«¤ò¥À¥¦¥ó¥í¡¼¥É <emphasis>¤·¤Ê¤±¤ì¤Ð</emphasis> ¤Ê¤ê¤Þ¤»¤ó¡£ @@ -4779,7 +4729,7 @@ Please press any key to reboot.</screen> <title>¥¤¥á¡¼¥¸¤ò CD ¤Ø½ñ¤¹þ¤à</title> <para>¼¡¤Ë¡¢CD ¥¤¥á¡¼¥¸¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤¹þ¤ó¤Ç¤¯¤À¤µ¤¤¡£ - ¾¤Î FreeBSD ¥·¥¹¥Æ¥à¾å¤Ç½ñ¤¹þ¤ß¤ò¹Ô¤¦¾ì¹ç¤Ë¤Ï¡¢ + ¾¤Î &os; ¥·¥¹¥Æ¥à¾å¤Ç½ñ¤¹þ¤ß¤ò¹Ô¤¦¾ì¹ç¤Ë¤Ï¡¢ <xref linkend="creating-cds"/> (Æäˡ¢<xref linkend="burncd"/> ¤ª¤è¤Ó <xref linkend="cdrecord"/>) ¤òÆɤó¤Ç¡¢ @@ -4793,14 +4743,14 @@ Please press any key to reboot.</screen> </step> </procedure> - <note><para>¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿ FreeBSD - ¤Î¥ê¥ê¡¼¥¹¤Î¹½Ãۤ˶½Ì£¤¬¤¢¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ - <ulink url="&url.articles.releng.en;">Release Engineering - Article</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para></note> + <note><para>¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿ &os; + ¤Î¥ê¥ê¡¼¥¹¤Î¹½Ãۤ˶½Ì£¤¬¤¢¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢<ulink + url="&url.articles.releng;">Release Engineering + Article</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para></note> </sect2> <sect2 id="install-ftp"> - <title>FreeBSD ¥Ç¥£¥¹¥¯¤ò»È¤Ã¤¿¥í¡¼¥«¥ë FTP ¥µ¥¤¥È¤ÎºîÀ®</title> + <title>&os; ¥Ç¥£¥¹¥¯¤ò»È¤Ã¤¿¥í¡¼¥«¥ë FTP ¥µ¥¤¥È¤ÎºîÀ®</title> <indexterm> <primary>installation</primary> @@ -4808,25 +4758,25 @@ Please press any key to reboot.</screen> <tertiary>FTP</tertiary> </indexterm> - <para>FreeBSD ¤Î¥Ç¥£¥¹¥¯¤Ï FTP ¥µ¥¤¥È¤ÈƱ¤¸ÇÛÃÖ¤¬¤Ê¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - ¤³¤ì¤Ï FreeBSD ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë»þ¤Ë¤ª¤¤¤Æ¡¢ - ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¾¤Î¥Þ¥·¥ó¤¬»È¤¦¤³¤È¤Î¤Ç¤¤ë¥í¡¼¥«¥ë¤Ê FTP - ¥µ¥¤¥È¤ò´Êñ¤Ë¹½ÃۤǤ¤ë¤³¤È¤ò¤¢¤é¤ï¤·¤Æ¤¤¤Þ¤¹¡£</para> + <para>&os; ¤Î¥Ç¥£¥¹¥¯¤Ï FTP ¥µ¥¤¥È¤ÈƱ¤¸ÇÛÃÖ¤¬¤Ê¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ + ¤³¤ì¤Ï &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë»þ¤Ë¤ª¤¤¤Æ¡¢ + ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¾¤Î¥Þ¥·¥ó¤¬»È¤¦¤³¤È¤Î¤Ç¤¤ë¥í¡¼¥«¥ë¤Ê FTP + ¥µ¥¤¥È¤ò´Êñ¤Ë¹½ÃۤǤ¤ë¤³¤È¤ò¤¢¤é¤ï¤·¤Æ¤¤¤Þ¤¹¡£</para> <procedure> <step> - <para>FTP ¥µ¥¤¥È¤Î¥Û¥¹¥È¤È¤Ê¤ë FreeBD ¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ë¤Ï¡¢ - CDROM ¤ò¥É¥é¥¤¥Ö¤ËÆþ¤ì <filename>/cdrom</filename> - ¤Ë¥Þ¥¦¥ó¥È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> + <para>FTP ¥µ¥¤¥È¤Î¥Û¥¹¥È¤È¤Ê¤ë &os; ¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ë¤Ï¡¢ + CDROM ¤ò¥É¥é¥¤¥Ö¤ËÆþ¤ì <filename>/cdrom</filename> + ¤Ë¥Þ¥¦¥ó¥È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>mount /cdrom</userinput></screen> </step> <step> <para>anonymous FTP ¤Î¥¢¥«¥¦¥ó¥È¤ò <filename>/etc/passwd</filename> - ¤ËºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£ - <filename>/etc/passwd</filename> ¤ÎÊÔ½¸¤Ë¤Ï &man.vipw.8; - ¤ò»ÈÍѤ·¤Æ¼¡¤Î¹Ô¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£</para> + ¤ËºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£ + <filename>/etc/passwd</filename> ¤ÎÊÔ½¸¤Ë¤Ï &man.vipw.8; + ¤ò»ÈÍѤ·¤Æ¼¡¤Î¹Ô¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£</para> <programlisting>ftp:*:99:99::0:0:FTP:/cdrom:/nonexistent</programlisting> </step> @@ -4838,10 +4788,10 @@ Please press any key to reboot.</screen> </procedure> <para>¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤Ë¥Í¥Ã¥È¥ï¡¼¥¯¤Ç·Ò¤¬¤Ã¤Æ¤¤¤ë¤É¤Î¥Þ¥·¥ó¤â¡¢ - ¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¥á¥Ç¥£¥¢¥¿¥¤¥×¤Ç FTP ¤òÁªÂò¤·¡¢ + ¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¥á¥Ç¥£¥¢¥¿¥¤¥×¤Ç FTP ¤òÁªÂò¤·¡¢ FTP ¥µ¥¤¥È¥á¥Ë¥å¡¼¤Ç <quote>Other</quote> ¤òÁª¤ó¤À¸å - <userinput>ftp://<replaceable>your machine</replaceable></userinput> - ¤ÈÂǤÁ¹þ¤à¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> + <userinput>ftp://<replaceable>your machine</replaceable></userinput> + ¤ÈÂǤÁ¹þ¤à¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> <note> <para>¤â¤· FTP ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°¥á¥Ç¥£¥¢ (Ä̾ï¤Ï¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯) @@ -4855,11 +4805,11 @@ Please press any key to reboot.</screen> <warning> <para>¤³¤ÎÊýË¡¤Ï¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¡¢ ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ÇÊݸ¤ì¤¿¥Þ¥·¥ó¤ËÍÍѤǤ¹¡£ - ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ò²ð¤·¤¿ (¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¤Ç¤Ï¤Ê¤¤) - ¾¤Î¥Þ¥·¥ó¤Ë FTP ¥µ¡¼¥Ó¥¹¤òÄ󶡤¹¤ë¤³¤È¤Ï¡¢ - ¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤ò¥¯¥é¥Ã¥«¡¼¤ä¤½¤Î¾¹¥¤Þ¤·¤¯¤Ê¤¤¾õ¶·¤Ë¤µ¤é¤·¤Þ¤¹¡£ - ¤³¤ÎÊýË¡¤òÍѤ¤¤ë¤È¤¤Ë¤Ï¥»¥¥å¥ê¥Æ¥£¤Î¾õÂÖ¤ËÃí°Õ¤¹¤ë¤³¤È¤ò - ¶¯¤¯Äó¸À¤·¤Þ¤¹¡£</para> + ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ò²ð¤·¤¿ (¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¤Ç¤Ï¤Ê¤¤) + ¾¤Î¥Þ¥·¥ó¤Ë FTP ¥µ¡¼¥Ó¥¹¤òÄ󶡤¹¤ë¤³¤È¤Ï¡¢ + ¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤ò¥¯¥é¥Ã¥«¡¼¤ä¤½¤Î¾¹¥¤Þ¤·¤¯¤Ê¤¤¾õ¶·¤Ë¤µ¤é¤·¤Þ¤¹¡£ + ¤³¤ÎÊýË¡¤òÍѤ¤¤ë¤È¤¤Ë¤Ï¥»¥¥å¥ê¥Æ¥£¤Î¾õÂÖ¤ËÃí°Õ¤¹¤ë¤³¤È¤ò + ¶¯¤¯Äó¸À¤·¤Þ¤¹¡£</para> </warning> </sect2> @@ -4872,10 +4822,10 @@ Please press any key to reboot.</screen> </indexterm> <para>¤¢¤Ê¤¿¤¬¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤«¤é¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç - (»ä¤¿¤Á¤Ï¤³¤ÎÊýË¡¤ò<emphasis>¤È¤é¤Ê¤¤</emphasis>¤³¤È¤òÄó°Æ¤·¤Þ¤¹)¡¢ - ¤½¤ÎÍýͳ¤Ï¥Ï¡¼¥É¥¦¥§¥¢¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤Ê¤«¤Ã¤¿¤¿¤á¤«¡¢ - ñ¤Ë¤¤¤Ð¤é¤ÎÆ»¤òÄ̤뤳¤È¤ò³Ú¤·¤ó¤Ç¤¤¤ë¤«¤é¤Ç¤·¤ç¤¦¤¬¡¢ - ¥¤¥ó¥¹¥È¡¼¥ëÍѤΥեí¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òÍÑ°Õ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> + (»ä¤¿¤Á¤Ï¤³¤ÎÊýË¡¤ò<emphasis>¤È¤é¤Ê¤¤</emphasis>¤³¤È¤òÄó°Æ¤·¤Þ¤¹)¡¢ + ¤½¤ÎÍýͳ¤Ï¥Ï¡¼¥É¥¦¥§¥¢¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤Ê¤«¤Ã¤¿¤¿¤á¤«¡¢ + ñ¤Ë¤¤¤Ð¤é¤ÎÆ»¤òÄ̤뤳¤È¤ò³Ú¤·¤ó¤Ç¤¤¤ë¤«¤é¤Ç¤·¤ç¤¦¤¬¡¢ + ¥¤¥ó¥¹¥È¡¼¥ëÍѤΥեí¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òÍÑ°Õ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para> <para>ºÇÄã¤Ç¤â <filename>base</filename> ¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¤¤¤ì¤é¤ì¤ë¤À¤±¤Î @@ -4885,36 +4835,36 @@ Please press any key to reboot.</screen> ¥³¥Þ¥ó¥É¤Ç½é´ü²½<emphasis>¤µ¤ì¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó</emphasis>¡£ &windows; ¤ò¤ª»È¤¤¤Î¾ì¹ç¤Ë¤Ï¡¢ ¥¨¥¯¥¹¥×¥í¡¼¥é¡¼¤ò»ÈÍѤ·¤Æ¥Ç¥£¥¹¥¯¤ò½é´ü²½¤·¤Æ¤¯¤À¤µ¤¤ - (<devicename>A:</devicename> ¥É¥é¥¤¥Ö¤ò±¦¥¯¥ê¥Ã¥¯¤·¤Æ¡¢ - <quote>¥Õ¥©¡¼¥Þ¥Ã¥È</quote>¤òÁªÂò¤·¤Þ¤¹)¡£</para> + (<devicename>A:</devicename> ¥É¥é¥¤¥Ö¤ò±¦¥¯¥ê¥Ã¥¯¤·¤Æ¡¢ + <quote>¥Õ¥©¡¼¥Þ¥Ã¥È</quote>¤òÁªÂò¤·¤Þ¤¹)¡£</para> <para>¹©¾ì¤Ç¤Î½é´ü²½ºÑ¤ß¥Ç¥£¥¹¥¯¤ò¿®ÍÑ<emphasis>¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤</emphasis>¡£ - Ç°¤Î¤¿¤á¼«Ê¬¤Ç¥Õ¥©¡¼¥Þ¥Ã¥È¤·Ä¾¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¥æ¡¼¥¶¤«¤é¤Î¥È¥é¥Ö¥ëÊó¹ð¤Î¿¤¯¤Ï¤¤Á¤ó¤È¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ç¥£¥¹¥¯¤ò»ÈÍѤ·¤¿¤³¤È¤¬¸¶°ø¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ - ¥Õ¥©¡¼¥Þ¥Ã¥È¤·Ä¾¤·¤Æ¤¯¤À¤µ¤¤¤È½Ò¤Ù¤Æ¤¤¤ë¤Î¤Ï¡¢ - ¤³¤¦¤¤¤Ã¤¿Íýͳ¤«¤é¤Ç¤¹¡£</para> - - <para>¾¤Î FreeBSD ¥Þ¥·¥ó¤Ç¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òºîÀ®¤·¤Æ¤¤¤ë¾ì¹ç¡¢ - ¥Õ¥©¡¼¥Þ¥Ã¥È¤¹¤ë¤³¤È¤Ï°¤¤¤³¤È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ - ¤¤¤Á¤¤¤Á &ms-dos; ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òºîÀ®¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢ - <command>bsdlabel</command> ¥³¥Þ¥ó¥É¤È <command>newfs</command> ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¡¢ - ¼¡¤Î¤è¤¦¤Ê¼ê½ç¤Ç (3.5 ¥¤¥ó¥Á 1.44 MB ¥Ç¥£¥¹¥¯ÍѤÎ) - UFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºîÀ®¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹:</para> + Ç°¤Î¤¿¤á¼«Ê¬¤Ç¥Õ¥©¡¼¥Þ¥Ã¥È¤·Ä¾¤·¤Æ¤¯¤À¤µ¤¤¡£ + ¥æ¡¼¥¶¤«¤é¤Î¥È¥é¥Ö¥ëÊó¹ð¤Î¿¤¯¤Ï¤¤Á¤ó¤È¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ç¥£¥¹¥¯¤ò»ÈÍѤ·¤¿¤³¤È¤¬¸¶°ø¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ + ¥Õ¥©¡¼¥Þ¥Ã¥È¤·Ä¾¤·¤Æ¤¯¤À¤µ¤¤¤È½Ò¤Ù¤Æ¤¤¤ë¤Î¤Ï¡¢ + ¤³¤¦¤¤¤Ã¤¿Íýͳ¤«¤é¤Ç¤¹¡£</para> + + <para>¾¤Î &os; ¥Þ¥·¥ó¤Ç¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òºîÀ®¤·¤Æ¤¤¤ë¾ì¹ç¡¢ + ¥Õ¥©¡¼¥Þ¥Ã¥È¤¹¤ë¤³¤È¤Ï°¤¤¤³¤È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ + ¤¤¤Á¤¤¤Á &ms-dos; ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òºîÀ®¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢ + <command>bsdlabel</command> ¥³¥Þ¥ó¥É¤È <command>newfs</command> ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¡¢ + ¼¡¤Î¤è¤¦¤Ê¼ê½ç¤Ç (3.5 ¥¤¥ó¥Á 1.44 MB ¥Ç¥£¥¹¥¯ÍѤÎ) + UFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºîÀ®¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹:</para> <screen>&prompt.root; <userinput>fdformat -f 1440 fd0.1440</userinput> &prompt.root; <userinput>bsdlabel -w fd0.1440 floppy3</userinput> &prompt.root; <userinput>newfs -t 2 -u 18 -l 1 -i 65536 /dev/fd0</userinput></screen> <para>¤³¤ì¤Ç¾¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÈƱÍÍ¤Ë - mount ¤·¤Æ½ñ¤¹þ¤à¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> + mount ¤·¤Æ½ñ¤¹þ¤à¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> <para>¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤¿¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤òÍÑ°Õ¤·¤¿¤é¡¢ - ¤½¤ì¤é¤Ë¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ - ÇÛÉÛ¥Õ¥¡¥¤¥ë¤Ï¤¤¤¯¤Ä¤«¤Î¤«¤¿¤Þ¤ê¤Ë¤ï¤«¤ì¤Æ¤¤¤Æ¡¢ - ¤³¤ì¤é¤«¤¿¤Þ¤ê 5 ¤Ä¤Ç°ìÈÌŪ¤Ê 1.44 MB ¤Î¥Õ¥í¥Ã¥Ô¡¼¤Ë¼ý¤Þ¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ - ¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤ËÆþ¤ë¤À¤±¥Õ¥¡¥¤¥ë¤òÆþ¤ì¤Æ¤¤¤Ã¤Æ¡¢ - ÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤Æ¥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¤½¤ì¤¾¤ì¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤Ï¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + ¤½¤ì¤é¤Ë¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ + ÇÛÉÛ¥Õ¥¡¥¤¥ë¤Ï¤¤¤¯¤Ä¤«¤Î¤«¤¿¤Þ¤ê¤Ë¤ï¤«¤ì¤Æ¤¤¤Æ¡¢ + ¤³¤ì¤é¤«¤¿¤Þ¤ê 5 ¤Ä¤Ç°ìÈÌŪ¤Ê 1.44 MB ¤Î¥Õ¥í¥Ã¥Ô¡¼¤Ë¼ý¤Þ¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ + ¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤ËÆþ¤ë¤À¤±¥Õ¥¡¥¤¥ë¤òÆþ¤ì¤Æ¤¤¤Ã¤Æ¡¢ + ÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤Æ¥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£ + ¤½¤ì¤¾¤ì¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤Ï¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ¤¿¤È¤¨¤Ð¡¢ <filename>a:\base\base.aa</filename>, <filename>a:\base\base.ab</filename> ¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para> @@ -4935,72 +4885,73 @@ Please press any key to reboot.</screen> <title>&ms-dos; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤«¤é¤Î¥¤¥ó¥¹¥È¡¼¥ë</title> <indexterm> - <primary>installation</primary> - <secondary>from MS-DOS</secondary> - </indexterm> + <primary>installation</primary> + <secondary>from MS-DOS</secondary> + </indexterm> + <para>¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Î &ms-dos; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤¤Ë¤Ï¡¢ - ÇÛÉÛ¥Õ¥¡¥¤¥ë¤òÎ㤨¤Ð <filename>c:\freebsd</filename> - ¤Ê¤É¤È¤·¤Æ¤½¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤Î - <filename>freebsd</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¡£ - CDROM ¤ä FTP ¥µ¥¤¥È¤Ë¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤òÈ¿±Ç¤·¤Æ¥³¥Ô¡¼¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ - ¤½¤³¤Ç CD ¤«¤é¥³¥Ô¡¼¤¹¤ë¾ì¹ç¤Ë¤Ï &ms-dos; ¤Î <command>xcopy</command> - ¥³¥Þ¥ó¥É¤Î»ÈÍѤò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£ - Î㤨¤Ð¡¢ºÇÄã¸Â¤Î FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤Ë¤Ï¡¢ - ¼¡¤Î¤è¤¦¤Ë½àÈ÷¤·¤Þ¤¹:</para> + ÇÛÉÛ¥Õ¥¡¥¤¥ë¤òÎ㤨¤Ð <filename>c:\freebsd</filename> + ¤Ê¤É¤È¤·¤Æ¤½¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤Î + <filename>freebsd</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¡£ + CDROM ¤ä FTP ¥µ¥¤¥È¤Ë¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤òÈ¿±Ç¤·¤Æ¥³¥Ô¡¼¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ + ¤½¤³¤Ç CD ¤«¤é¥³¥Ô¡¼¤¹¤ë¾ì¹ç¤Ë¤Ï &ms-dos; ¤Î <command>xcopy</command> + ¥³¥Þ¥ó¥É¤Î»ÈÍѤò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£ + Î㤨¤Ð¡¢ºÇÄã¸Â¤Î &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤Ë¤Ï¡¢ + ¼¡¤Î¤è¤¦¤Ë½àÈ÷¤·¤Þ¤¹:</para> <screen><prompt>C:\></prompt> <userinput>md c:\freebsd</userinput> <prompt>C:\></prompt> <userinput>xcopy e:\bin c:\freebsd\bin\ /s</userinput> <prompt>C:\></prompt> <userinput>xcopy e:\manpages c:\freebsd\manpages\ /s</userinput></screen> <para>¤³¤³¤Ç <devicename>C:</devicename> ¥É¥é¥¤¥Ö¤Ë¤Ï½½Ê¬¤Ê¶õ¤ÍÆÎ̤¬¤¢¤ê¡¢ - CDROM ¤Ï <devicename>E:</devicename> ¥É¥é¥¤¥Ö¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤È¤·¤Þ¤¹¡£</para> + CDROM ¤Ï <devicename>E:</devicename> ¥É¥é¥¤¥Ö¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤È¤·¤Þ¤¹¡£</para> <para>CDROM ¥É¥é¥¤¥Ö¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/"> - ftp.FreeBSD.org</ulink> - ¤«¤éÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - ¤½¤ì¤¾¤ì¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤ÏÆȼ«¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÆþ¤Ã¤Æ¤¤¤Þ¤¹¡£ + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">ftp.FreeBSD.org</ulink> + ¤«¤éÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ + ¤½¤ì¤¾¤ì¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤ÏÆȼ«¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÆþ¤Ã¤Æ¤¤¤Þ¤¹¡£ Î㤨¤Ð¡¢<emphasis>base</emphasis> ÇÛÉÛ¥Õ¥¡¥¤¥ë¤Ï <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/base/">&rel.current;/base/</ulink> - ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£</para> + ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£</para> <para>&ms-dos; ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤«¤é¤¿¤¯¤µ¤ó¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤ - (¤½¤·¤Æ¥Ç¥£¥¹¥¯¤ÎÍÆÎ̤¬¤¢¤ë) ¾ì¹ç¡¢ - ¤½¤ì¤¾¤ì <filename>c:\freebsd</filename> - ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ - — <literal>BIN</literal> - ÇÛÉÛ¥Õ¥¡¥¤¥ë¤Ï¡¢ºÇÄã¸ÂɬÍפʤâ¤Î¤Ç¤¹¡£</para> + (¤½¤·¤Æ¥Ç¥£¥¹¥¯¤ÎÍÆÎ̤¬¤¢¤ë) ¾ì¹ç¡¢ + ¤½¤ì¤¾¤ì <filename>c:\freebsd</filename> + ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ + — <literal>BIN</literal> + ÇÛÉÛ¥Õ¥¡¥¤¥ë¤Ï¡¢ºÇÄã¸ÂɬÍפʤâ¤Î¤Ç¤¹¡£</para> </sect2> <sect2> <title>¥¤¥ó¥¹¥È¡¼¥ë¥Æ¡¼¥×¤ÎºîÀ®</title> <indexterm> - <primary>installation</primary> - <secondary>from QIC/SCSI Tape</secondary> - </indexterm> + <primary>installation</primary> + <secondary>from QIC/SCSI Tape</secondary> + </indexterm> + <para>¥Æ¡¼¥×¤«¤é¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¤ª¤½¤é¤¯ FTP - ¤òÍøÍѤ·¤¿¥ª¥ó¥é¥¤¥ó¥¤¥ó¥¹¥È¡¼¥ë¤« - CDROM ¥¤¥ó¥¹¥È¡¼¥ë¤ò½ü¤±¤Ð¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤Ç¤·¤ç¤¦¡£ - ¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥°¥é¥à¤Ï¥Õ¥¡¥¤¥ë¤¬Ã±½ã¤Ë tar - ¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò´üÂÔ¤·¤Þ¤¹¡£ - ɬÍפÊÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤ÆÍÑ°Õ¤·¤¿¤é¡¢ - ¤½¤ì¤é¤ò¥Æ¡¼¥×¾å¤Ëñ½ã¤Ë tar ¤·¤Þ¤¹¡£</para> + ¤òÍøÍѤ·¤¿¥ª¥ó¥é¥¤¥ó¥¤¥ó¥¹¥È¡¼¥ë¤« + CDROM ¥¤¥ó¥¹¥È¡¼¥ë¤ò½ü¤±¤Ð¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤Ç¤·¤ç¤¦¡£ + ¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥°¥é¥à¤Ï¥Õ¥¡¥¤¥ë¤¬Ã±½ã¤Ë tar + ¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò´üÂÔ¤·¤Þ¤¹¡£ + ɬÍפÊÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤ÆÍÑ°Õ¤·¤¿¤é¡¢ + ¤½¤ì¤é¤ò¥Æ¡¼¥×¾å¤Ëñ½ã¤Ë tar ¤·¤Þ¤¹¡£</para> <screen>&prompt.root; <userinput>cd /freebsd/distdir</userinput> &prompt.root; <userinput>tar cvf /dev/rwt0 dist1 ... dist2</userinput></screen> <para>¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦ºÝ¡¢ - °ì»þ»ÈÍѥǥ£¥ì¥¯¥È¥ê¤Ë½½Ê¬¤Ê¶õ¤¥¹¥Ú¡¼¥¹¤ò³ÎÊݤ·¤Æ¡¢ - ºîÀ®¤·¤¿¥Æ¡¼¥×¤Î<emphasis>¤¹¤Ù¤Æ¤Î</emphasis>¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤Ç¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤ - (°ì»þ»ÈÍѥǥ£¥ì¥¯¥È¥ê¤Ï¼«Ê¬¤ÇÁª¤Ö¤³¤È¤¬¤Ç¤¤Þ¤¹)¡£ - ¥Æ¡¼¥×¤ÎÆÃÀ¾å¡¢¥é¥ó¥À¥à¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Î¤Ç¡¢ - °ì»þŪ¤Ë¤¤ï¤á¤ÆÂçÎ̤ÎÍÆÎ̤òɬÍפȤ·¤Þ¤¹¡£</para> + °ì»þ»ÈÍѥǥ£¥ì¥¯¥È¥ê¤Ë½½Ê¬¤Ê¶õ¤¥¹¥Ú¡¼¥¹¤ò³ÎÊݤ·¤Æ¡¢ + ºîÀ®¤·¤¿¥Æ¡¼¥×¤Î<emphasis>¤¹¤Ù¤Æ¤Î</emphasis>¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤Ç¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤ + (°ì»þ»ÈÍѥǥ£¥ì¥¯¥È¥ê¤Ï¼«Ê¬¤ÇÁª¤Ö¤³¤È¤¬¤Ç¤¤Þ¤¹)¡£ + ¥Æ¡¼¥×¤ÎÆÃÀ¾å¡¢¥é¥ó¥À¥à¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Î¤Ç¡¢ + °ì»þŪ¤Ë¤¤ï¤á¤ÆÂçÎ̤ÎÍÆÎ̤òɬÍפȤ·¤Þ¤¹¡£</para> <note> <para>¥¤¥ó¥¹¥È¡¼¥ë¤ò»Ï¤á¤ë»þ¤Ë¤Ï¡¢ - µ¯Æ°¥Õ¥í¥Ã¥Ô¡¼¤«¤éΩ¤Á¾å¤²¤ë<emphasis>Á°¤Ë</emphasis>¥Æ¡¼¥×¤ò¥É¥é¥¤¥Ö¤Ë¤¤¤ì¤Æ¤ª¤«¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ - ¤µ¤â¤Ê¤¤¤È¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¥Ç¥Ð¥¤¥¹¸¡½Ð»þ¤Ë¥É¥é¥¤¥Ö¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó¡£</para> + µ¯Æ°¥Õ¥í¥Ã¥Ô¡¼¤«¤éΩ¤Á¾å¤²¤ë<emphasis>Á°¤Ë</emphasis>¥Æ¡¼¥×¤ò¥É¥é¥¤¥Ö¤Ë¤¤¤ì¤Æ¤ª¤«¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ + ¤µ¤â¤Ê¤¤¤È¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¥Ç¥Ð¥¤¥¹¸¡½Ð»þ¤Ë¥É¥é¥¤¥Ö¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó¡£</para> </note> </sect2> @@ -5008,20 +4959,21 @@ Please press any key to reboot.</screen> <title>¥Í¥Ã¥È¥ï¡¼¥¯·Ðͳ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÎÁ°¤Ë</title> <indexterm> - <primary>installation</primary> - <secondary>network</secondary> - <tertiary>serial (PPP)</tertiary> - </indexterm> + <primary>installation</primary> + <secondary>network</secondary> + <tertiary>serial (PPP)</tertiary> + </indexterm> <indexterm> - <primary>installation</primary> - <secondary>network</secondary> - <tertiary>parallel (PLIP)</tertiary> - </indexterm> + <primary>installation</primary> + <secondary>network</secondary> + <tertiary>parallel (PLIP)</tertiary> + </indexterm> <indexterm> - <primary>installation</primary> - <secondary>network</secondary> - <tertiary>Ethernet</tertiary> - </indexterm> + <primary>installation</primary> + <secondary>network</secondary> + <tertiary>Ethernet</tertiary> + </indexterm> + <para>3 ¼ïÎà¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ ¥¤¡¼¥µ¥Í¥Ã¥È (ɸ½àŪ¤Ê¥¤¡¼¥µ¥Í¥Ã¥È¥³¥ó¥È¥í¡¼¥é)¡¢ ¥·¥ê¥¢¥ë¥Ý¡¼¥È (PPP)¡¢¤Þ¤¿¤Ï¡¢ @@ -5029,71 +4981,72 @@ Please press any key to reboot.</screen> ¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> <para>¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¦¤Á¤â¤Ã¤È¤â¹â®¤Ê¤â¤Î¤È¤·¤Æ¡¢ - ¥¤¡¼¥µ¥Í¥Ã¥È¥¢¥À¥×¥¿¤¬¤¤¤Ä¤â¤è¤¤ÁªÂò¤È¤Ê¤ê¤Þ¤¹¡£ - FreeBSD ¤Ï¤¤ï¤á¤Æ¿¤¯¤Î PC ¥¤¡¼¥µ¥Í¥Ã¥È¥«¡¼¥É¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ - ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥«¡¼¥É¤Î°ìÍ÷ (¤È¡¢É¬ÍפÊÀßÄê) ¤Ï - FreeBSD ¤½¤ì¤¾¤ì¤Î¥ê¥ê¡¼¥¹¤Î¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È¤ÇÄ󶡤µ¤ì¤Þ¤¹¡£ - ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë PCMCIA ¥¤¡¼¥µ¥Í¥Ã¥È¥«¡¼¥É¤ò»È¤¦¾ì¹ç¡¢ - ¥é¥Ã¥×¥È¥Ã¥×¤ÎÅŸ»¤òÆþ¤ì¤ë<emphasis>Á°¤Ë</emphasis>º¹¤·¹þ¤ó¤Ç¤ª¤¯¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ - »ÄÇ°¤Ê¤¬¤é¡¢º£¤Î FreeBSD ¤Ï¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î PCMCIA - ¥«¡¼¥É¤Î³èÀþÁÞÈ´¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£</para> + ¥¤¡¼¥µ¥Í¥Ã¥È¥¢¥À¥×¥¿¤¬¤¤¤Ä¤â¤è¤¤ÁªÂò¤È¤Ê¤ê¤Þ¤¹¡£ + &os; ¤Ï¤¤ï¤á¤Æ¿¤¯¤Î PC ¥¤¡¼¥µ¥Í¥Ã¥È¥«¡¼¥É¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ + ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥«¡¼¥É¤Î°ìÍ÷ (¤È¡¢É¬ÍפÊÀßÄê) ¤Ï + &os; ¤½¤ì¤¾¤ì¤Î¥ê¥ê¡¼¥¹¤Î¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È¤ÇÄ󶡤µ¤ì¤Þ¤¹¡£ + ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë PCMCIA ¥¤¡¼¥µ¥Í¥Ã¥È¥«¡¼¥É¤ò»È¤¦¾ì¹ç¡¢ + ¥é¥Ã¥×¥È¥Ã¥×¤ÎÅŸ»¤òÆþ¤ì¤ë<emphasis>Á°¤Ë</emphasis>º¹¤·¹þ¤ó¤Ç¤ª¤¯¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ + »ÄÇ°¤Ê¤¬¤é¡¢º£¤Î &os; ¤Ï¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î PCMCIA + ¥«¡¼¥É¤Î³èÀþÁÞÈ´¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£</para> <para>¥Í¥Ã¥È¥ï¡¼¥¯¤Ç¤Î IP ¥¢¥É¥ì¥¹¡¢ - ¥¢¥É¥ì¥¹¥¯¥é¥¹¤ËÂбþ¤·¤¿¥Í¥Ã¥È¥Þ¥¹¥¯¡¢ - ¥Þ¥·¥ó̾¤òÃΤäƤª¤¯¤³¤È¤âɬÍפǤ¹¡£ - PPP Àܳ¤òÍøÍѤ·¤¿¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤¿¤¤¤¬¡¢ - ¸ÇÄê IP ¥¢¥É¥ì¥¹¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¤È¤¤¤¦¾ì¹ç¤Ï¡¢ - ISP ¤¬¼«Æ°Åª¤Ë IP ¥¢¥É¥ì¥¹¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ - ¥Í¥Ã¥È¥ï¡¼¥¯´ÉÍý¼Ô¤Ë¿Ò¤Í¤ì¤Ð¤É¤ó¤ÊÃͤò»È¤Ã¤¿¤é¤è¤¤¤«¶µ¤¨¤Æ¤¯¤ì¤ë¤Ç¤·¤ç¤¦¡£ - ¤â¤·Â¾¤Î¥Û¥¹¥È¤ò IP ¥¢¥É¥ì¥¹¤Ç¤Ï¤Ê¤¯Ì¾Á°¤Ç°ú¤¤¿¤¤¾ì¹ç¡¢ - ¥Í¡¼¥à¥µ¡¼¥Ð¤È¡¢¤½¤ì¤ò»È¤¦¤¿¤á¤Î¥²¡¼¥È¥¦¥§¥¤¤Î¥¢¥É¥ì¥¹ - (PPP ¤ò¤´»ÈÍѤξì¹ç¤Ï¡¢¥×¥í¥Ð¥¤¥À¤Î IP ¥¢¥É¥ì¥¹¤Ë¤Ê¤ê¤Þ¤¹) - ¤âÃΤé¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ - HTTP ¥×¥í¥¥··Ðͳ¤Ç FTP ¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢ - ¥×¥í¥¥·¥µ¡¼¥Ð¤Î¥¢¥É¥ì¥¹¤âɬÍפȤʤê¤Þ¤¹¡£ - ¤³¤ì¤é¤Î¤¦¤Á¤¹¤Ù¤Æ¡¢¤Þ¤¿¤Ï¤¤¤¯¤Ä¤«¤òÃΤé¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ - ¥¤¡¼¥µ¥Í¥Ã¥È·Ðͳ¤Ç¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò»Ï¤á¤ë<emphasis>Á°¤Ë</emphasis>¡¢ - ¥Í¥Ã¥È¥ï¡¼¥¯´ÉÍý¼Ô¤« ISP ¤ËÁêÃ̤¹¤ë¤Ù¤¤Ç¤·¤ç¤¦¡£</para> + ¥¢¥É¥ì¥¹¥¯¥é¥¹¤ËÂбþ¤·¤¿¥Í¥Ã¥È¥Þ¥¹¥¯¡¢ + ¥Þ¥·¥ó̾¤òÃΤäƤª¤¯¤³¤È¤âɬÍפǤ¹¡£ + PPP Àܳ¤òÍøÍѤ·¤¿¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤¿¤¤¤¬¡¢ + ¸ÇÄê IP ¥¢¥É¥ì¥¹¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¤È¤¤¤¦¾ì¹ç¤Ï¡¢ + ISP ¤¬¼«Æ°Åª¤Ë IP ¥¢¥É¥ì¥¹¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ + ¥Í¥Ã¥È¥ï¡¼¥¯´ÉÍý¼Ô¤Ë¿Ò¤Í¤ì¤Ð¤É¤ó¤ÊÃͤò»È¤Ã¤¿¤é¤è¤¤¤«¶µ¤¨¤Æ¤¯¤ì¤ë¤Ç¤·¤ç¤¦¡£ + ¤â¤·Â¾¤Î¥Û¥¹¥È¤ò IP ¥¢¥É¥ì¥¹¤Ç¤Ï¤Ê¤¯Ì¾Á°¤Ç°ú¤¤¿¤¤¾ì¹ç¡¢ + ¥Í¡¼¥à¥µ¡¼¥Ð¤È¡¢¤½¤ì¤ò»È¤¦¤¿¤á¤Î¥²¡¼¥È¥¦¥§¥¤¤Î¥¢¥É¥ì¥¹ + (PPP ¤ò¤´»ÈÍѤξì¹ç¤Ï¡¢¥×¥í¥Ð¥¤¥À¤Î IP ¥¢¥É¥ì¥¹¤Ë¤Ê¤ê¤Þ¤¹) + ¤âÃΤé¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ + HTTP ¥×¥í¥¥··Ðͳ¤Ç FTP ¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢ + ¥×¥í¥¥·¥µ¡¼¥Ð¤Î¥¢¥É¥ì¥¹¤âɬÍפȤʤê¤Þ¤¹¡£ + ¤³¤ì¤é¤Î¤¦¤Á¤¹¤Ù¤Æ¡¢¤Þ¤¿¤Ï¤¤¤¯¤Ä¤«¤òÃΤé¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ + ¥¤¡¼¥µ¥Í¥Ã¥È·Ðͳ¤Ç¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò»Ï¤á¤ë<emphasis>Á°¤Ë</emphasis>¡¢ + ¥Í¥Ã¥È¥ï¡¼¥¯´ÉÍý¼Ô¤« ISP ¤ËÁêÃ̤¹¤ë¤Ù¤¤Ç¤·¤ç¤¦¡£</para> <para>¤â¤·¥â¥Ç¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¤Ê¤é¡¢ - »Ä¤µ¤ì¤¿ÁªÂò»è¤Ï¤Û¤Ü´Ö°ã¤¤¤Ê¤¯ PPP ¤Ç¤·¤ç¤¦¡£ - Á᤯Àµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤ËɬÍפȤʤê¤Þ¤¹¤Î¤Ç¡¢ - ¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤Ë´Ø¤¹¤ë¾ðÊó¤òÍÑ°Õ¤·¤Æ¤ª¤¤Þ¤·¤ç¤¦¡£</para> - - <para>¤â¤· ISP ¤ËÀܳ¤¹¤ë¤Î¤Ë PAP ¤ä CHAP - ¤òÍѤ¤¤ë¤Ê¤é (¸À¤¤´¹¤¨¤ë¤È¡¢¤â¤· &windows; ¤Ç ISP - ¤ËÀܳ¤¹¤ë»þ¤Ë¥¹¥¯¥ê¥×¥È¤ò»ÈÍѤ·¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð)¡¢ - <command>dial</command> ¤È <application>ppp</application> - ¤Î¥×¥í¥ó¥×¥È¤ËÂФ·¤ÆÆþÎϤ¹¤ë¤À¤±¤Ç¤¤¤¤¤Ç¤¹¡£ - ¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥â¥Ç¥à¸ÇͤΠ<quote>AT ¥³¥Þ¥ó¥É</quote>¤ò»È¤Ã¤Æ - ISP ¤Ë¥À¥¤¥ä¥ë¤¹¤ëÊýË¡¤òÃΤäƤª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£ - ¤³¤ì¤Ç PPP ¥À¥¤¥ä¥é¤Ï¤È¤Æ¤â¥·¥ó¥×¥ë¤ÊüËö¥¨¥ß¥å¥ì¡¼¥¿¤Î¤ß¤òÄ󶡤·¤Þ¤¹¡£ - ¤³¤ì°Ê¾å¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï <link linkend="userppp">¥Ï¥ó¥É¥Ö¥Ã¥¯</link> - ¤ä <ulink url="&url.books.faq;/ppp.html">FAQ</ulink> ¤Î¥æ¡¼¥¶¡¼ - PPP ¥¨¥ó¥È¥ê¡¼¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ - ÌäÂ꤬µ¯¤¤¿¾ì¹ç¤Ë¤Ï <command>set log local ...</command> - ¥³¥Þ¥ó¥É¤òÍѤ¤¤Æ¥í¥°¤ò²èÌ̤ËÅǤ¯¤³¤È¤â¤Ç¤¤Þ¤¹¡£</para> - - <para>FreeBSD ¤ÎÆ°¤¤¤Æ¤¤¤ëÊ̤Υޥ·¥ó¤ÈľÀÜÀܳ¤¬²Äǽ¤Ç¤·¤¿¤é¡¢ - <quote>laplink</quote> ¥Ñ¥é¥ì¥ë¥Ý¡¼¥È¥±¡¼¥Ö¥ë¤ò²ð¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Þ¤¿¹Í¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£ - ¥Ñ¥é¥ì¥ë¥Ý¡¼¥È·Ðͳ¤Î¥Ç¡¼¥¿Å¾Á÷¥¹¥Ô¡¼¥É¤Ï¡¢ - ¥·¥ê¥¢¥ë¥é¥¤¥ó¤Ç¤Î°ìÈÌŪ¤Ê¥¹¥Ô¡¼¥É (ºÇ¹â 50 kbytes/sec) - ¤è¤ê¤â¤º¤Ã¤È¹â®¤Ê¤Î¤Ç¡¢¤è¤êÁ᤯¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> + »Ä¤µ¤ì¤¿ÁªÂò»è¤Ï¤Û¤Ü´Ö°ã¤¤¤Ê¤¯ PPP ¤Ç¤·¤ç¤¦¡£ + Á᤯Àµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤ËɬÍפȤʤê¤Þ¤¹¤Î¤Ç¡¢ + ¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤Ë´Ø¤¹¤ë¾ðÊó¤òÍÑ°Õ¤·¤Æ¤ª¤¤Þ¤·¤ç¤¦¡£</para> + + <para>¤â¤· ISP ¤ËÀܳ¤¹¤ë¤Î¤Ë PAP ¤ä CHAP + ¤òÍѤ¤¤ë¤Ê¤é (¸À¤¤´¹¤¨¤ë¤È¡¢¤â¤· &windows; ¤Ç ISP + ¤ËÀܳ¤¹¤ë»þ¤Ë¥¹¥¯¥ê¥×¥È¤ò»ÈÍѤ·¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð)¡¢ + <command>dial</command> ¤È <application>ppp</application> + ¤Î¥×¥í¥ó¥×¥È¤ËÂФ·¤ÆÆþÎϤ¹¤ë¤À¤±¤Ç¤¤¤¤¤Ç¤¹¡£ + ¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥â¥Ç¥à¸ÇͤΠ<quote>AT ¥³¥Þ¥ó¥É</quote>¤ò»È¤Ã¤Æ + ISP ¤Ë¥À¥¤¥ä¥ë¤¹¤ëÊýË¡¤òÃΤäƤª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£ + ¤³¤ì¤Ç PPP ¥À¥¤¥ä¥é¤Ï¤È¤Æ¤â¥·¥ó¥×¥ë¤ÊüËö¥¨¥ß¥å¥ì¡¼¥¿¤Î¤ß¤òÄ󶡤·¤Þ¤¹¡£ + ¤³¤ì°Ê¾å¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï <link linkend="userppp">¥Ï¥ó¥É¥Ö¥Ã¥¯</link> + ¤ä <ulink url="&url.books.faq;/ppp.html">FAQ</ulink> ¤Î¥æ¡¼¥¶¡¼ + PPP ¥¨¥ó¥È¥ê¡¼¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ + ÌäÂ꤬µ¯¤¤¿¾ì¹ç¤Ë¤Ï <command>set log local ...</command> + ¥³¥Þ¥ó¥É¤òÍѤ¤¤Æ¥í¥°¤ò²èÌ̤ËÅǤ¯¤³¤È¤â¤Ç¤¤Þ¤¹¡£</para> + + <para>&os; ¤ÎÆ°¤¤¤Æ¤¤¤ëÊ̤Υޥ·¥ó¤ÈľÀÜÀܳ¤¬²Äǽ¤Ç¤·¤¿¤é¡¢ + <quote>laplink</quote> ¥Ñ¥é¥ì¥ë¥Ý¡¼¥È¥±¡¼¥Ö¥ë¤ò²ð¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Þ¤¿¹Í¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£ + ¥Ñ¥é¥ì¥ë¥Ý¡¼¥È·Ðͳ¤Î¥Ç¡¼¥¿Å¾Á÷¥¹¥Ô¡¼¥É¤Ï¡¢ + ¥·¥ê¥¢¥ë¥é¥¤¥ó¤Ç¤Î°ìÈÌŪ¤Ê¥¹¥Ô¡¼¥É (ºÇ¹â 50 kbytes/sec) + ¤è¤ê¤â¤º¤Ã¤È¹â®¤Ê¤Î¤Ç¡¢¤è¤êÁ᤯¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</para> <sect3> <title>NFS ·Ðͳ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÎÁ°¤Ë</title> - <indexterm> - <primary>installation</primary> - <secondary>network</secondary> - <tertiary>NFS</tertiary> - </indexterm> + <indexterm> + <primary>installation</primary> + <secondary>network</secondary> + <tertiary>NFS</tertiary> + </indexterm> + <para>NFS ¥¤¥ó¥¹¥È¡¼¥ë¤Ï¤Þ¤Ã¤¿¤¯Ã±½ãÌÀ²÷¤Ç¤¹¡£ - FreeBSD ¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò NFS ¥µ¡¼¥Ð¤Î¹¥¤¤Ê¾ì½ê¤Ë¥³¥Ô¡¼¤·¤Æ¤ª¤¤¤Æ¡¢ - ¥á¥Ç¥£¥¢ÁªÂò¤Ç NFS ¤òÁªÂò¤·¤Þ¤¹¡£</para> + &os; ¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤ò NFS ¥µ¡¼¥Ð¤Î¹¥¤¤Ê¾ì½ê¤Ë¥³¥Ô¡¼¤·¤Æ¤ª¤¤¤Æ¡¢ + ¥á¥Ç¥£¥¢ÁªÂò¤Ç NFS ¤òÁªÂò¤·¤Þ¤¹¡£</para> <para>¤â¤·¥µ¡¼¥Ð¤¬<quote>Æø¢¥Ý¡¼¥È</quote>¤Ø¤Î¥¢¥¯¥»¥¹¤Î¤ß¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¡¢ - (Sun ¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤Îɸ½à¤Ï¤³¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹) + (Sun ¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤Îɸ½à¤Ï¤³¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹) ¥¤¥ó¥¹¥È¡¼¥ë¤ò¿Ê¤á¤ëÁ°¤Ë <guimenu>Options</guimenu> ¥á¥Ë¥å¡¼¤Ç <literal>NFS Secure</literal> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -5102,21 +5055,21 @@ Please press any key to reboot.</screen> <literal>NFS Slow</literal> ¥Õ¥é¥°¤òÁªÂò¤¹¤ë¤È¤¤¤¤¤Ç¤·¤ç¤¦¡£</para> <para>NFS ·Ðͳ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ - ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤â´Þ¤ó¤À¥Þ¥¦¥ó¥È¤Ë¥µ¡¼¥Ð¤¬Âбþ¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ - Î㤨¤Ð FreeBSD &rel.current; ¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤¬ - <filename>ziggy:/usr/archive/stuff/FreeBSD</filename> - ¤Ë¤¢¤ë¤È¤¹¤ë¤È¡¢¥Þ¥·¥ó <hostid>ziggy</hostid> ¤Ç¤Ï - <filename>/usr</filename> ¤ä <filename>/usr/archive/stuff</filename> - ¤À¤±¤Ç¤Ê¤¯ <filename>/usr/archive/stuff/FreeBSD</filename> - ¤ÎľÀÜ¥Þ¥¦¥ó¥È¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para> - - <para>FreeBSD ¤Î <filename>/etc/exports</filename> - ¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢¤³¤Î¤³¤È¤Ï <option>-alldirs</option> - ¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - ¾¤Î NFS ¥µ¡¼¥Ð¤Î¾ì¹ç¤À¤È¤Þ¤¿Ï䬰ã¤Ã¤Æ¤¯¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ - ¤â¤·¥µ¡¼¥Ð¤«¤é <errorname>permission denied</errorname> - ¤¬Ê֤äƤ¯¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢ - ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¥Þ¥¦¥ó¥È¤ò¤Á¤ã¤ó¤È͸ú¤Ë¤Ç¤¤Æ¤¤¤Ê¤¤¤³¤È¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£</para> + ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤â´Þ¤ó¤À¥Þ¥¦¥ó¥È¤Ë¥µ¡¼¥Ð¤¬Âбþ¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + Î㤨¤Ð &os; &rel.current; ¤ÎÇÛÉÛ¥Õ¥¡¥¤¥ë¤¬ + <filename>ziggy:/usr/archive/stuff/FreeBSD</filename> + ¤Ë¤¢¤ë¤È¤¹¤ë¤È¡¢¥Þ¥·¥ó <hostid>ziggy</hostid> ¤Ç¤Ï + <filename>/usr</filename> ¤ä <filename>/usr/archive/stuff</filename> + ¤À¤±¤Ç¤Ê¤¯ <filename>/usr/archive/stuff/FreeBSD</filename> + ¤ÎľÀÜ¥Þ¥¦¥ó¥È¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para> + + <para>&os; ¤Î <filename>/etc/exports</filename> + ¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢¤³¤Î¤³¤È¤Ï <option>-alldirs</option> + ¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ + ¾¤Î NFS ¥µ¡¼¥Ð¤Î¾ì¹ç¤À¤È¤Þ¤¿Ï䬰ã¤Ã¤Æ¤¯¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ + ¤â¤·¥µ¡¼¥Ð¤«¤é <errorname>permission denied</errorname> + ¤¬Ê֤äƤ¯¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢ + ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¥Þ¥¦¥ó¥È¤ò¤Á¤ã¤ó¤È͸ú¤Ë¤Ç¤¤Æ¤¤¤Ê¤¤¤³¤È¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£</para> </sect3> </sect2> diff --git a/ja_JP.eucJP/books/handbook/introduction/chapter.xml b/ja_JP.eucJP/books/handbook/introduction/chapter.xml index 3eb38ae54d..bc862c709f 100644 --- a/ja_JP.eucJP/books/handbook/introduction/chapter.xml +++ b/ja_JP.eucJP/books/handbook/introduction/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r40795 + Original revision: r41107 $FreeBSD$ --> @@ -853,8 +853,8 @@ <variablelist> <varlistentry> - <term>SVN ¤È CVS ¥ê¥Ý¥¸¥È¥ê - <anchor id="development-cvs-repository"/></term> + <term>SVN ¥ê¥Ý¥¸¥È¥ê<anchor + id="development-cvs-repository"/></term> <listitem> <indexterm> @@ -897,31 +897,14 @@ Ports Collection ¥ê¥Ý¥¸¥È¥ê¤â¡¢¤½¤ì¤¾¤ì 2012 ǯ 5 ·î¤È 7 ·î¤Ë <application>CVS</application> ¤«¤é - <application>SVN</application> ¤Ø¤È°Ü¹Ô¤·¤Þ¤·¤¿¡£</para> - - <para>¸½ºß <literal>src/</literal> ¤ª¤è¤Ó - <literal>ports/</literal> ¥ê¥Ý¥¸¥È¥ê¤Ï - <application>SVN</application> ¤Ë¤è¤Ã¤Æ´ÉÍý¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢ - <application>SVN</application> ¥ê¥Ý¥¸¥È¥ê¤Ë¤ª¤±¤ëÊѹ¹ÅÀ¤Ï - <application>CVS</application> ¤ËÈ¿±Ç¤µ¤ì¤ë¤Î¤Ç¡¢ - <application>csup</application> - ¤È¤¤¤Ã¤¿ <application>CVS</application> - ¤Î¥¯¥é¥¤¥¢¥ó¥È¥Ä¡¼¥ë¤Ï¤³¤ì¤Þ¤ÇÄ̤êÀµ¾ï¤ËÆ°¤¤Þ¤¹¡£ - <literal>src/</literal> ¤ª¤è¤Ó <literal>ports/</literal> - ¤È¤Ï°Û¤Ê¤ê¡¢¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î - <application>SVN</application> ¥ê¥Ý¥¸¥È¥ê¤Ï¡¢ - <application>CVS</application> ¤Ø¤ÈÈ¿±Ç¤µ¤ì¤Þ¤»¤ó¡£</para> - - <para>&os; ¤Î <application>CVS</application> - <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">¥á¥¤¥ó¥ê¥Ý¥¸¥È¥ê</ulink> - ¤ÏÊƹñ¥«¥ê¥Õ¥©¥ë¥Ë¥¢½£¤Î¥µ¥ó¥¿¥¯¥é¥é»Ô¤Ë¸ºß¤·¡¢ - ¤½¤³¤«¤éÀ¤³¦Ãæ¤Î¤¿¤¯¤µ¤ó¤Î¥ß¥é¡¼¥µ¥¤¥È¤Ë¥³¥Ô¡¼¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - <link linkend="current">-CURRENT</link> ¤È - <link linkend="stable">-STABLE</link> - ¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë <application>SVN</application> ¥Ä¥ê¡¼¤½¤Î¤â¤Î¤Ï¡¢ - ¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤Ë¤â´Êñ¤Ë¼è¤Ã¤Æ¤¯¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - ¤³¤ì¤Ë¤Ä¤¤¤Æ¤Ï <link linkend="synching"> - ¥½¡¼¥¹¥Ä¥ê¡¼¤ÎƱ´ü</link>¤Î¾Ï¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para> + <application>SVN</application> ¤Ø¤È°Ü¹Ô¤·¤Þ¤·¤¿¡£ + &os; <literal>src/</literal> ¥ê¥Ý¥¸¥È¥ê¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Î¾ðÊó¤Ï + <link linkend="synching"> + ¥½¡¼¥¹¥Ä¥ê¡¼¤ÎƱ´ü</link> ¤Î¾Ï¤ò¡¢&os; + Ports Collection ¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï + <link linkend="ports-using">Ports Collection ¤ÎÍøÍÑ</link> + ¤Î¾Ï¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para> + </listitem> </varlistentry> diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml index d97a607977..ec69e39ef2 100644 --- a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml +++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r40982 + Original revision: r41189 $FreeBSD$ --> @@ -146,8 +146,8 @@ <warning> <para>CVS ¤Ï¡¢¥×¥í¥¸¥§¥¯¥È¤Ë¤ª¤¤¤Æ»ÈÍѤµ¤ì¤Ê¤¯¤Ê¤Ã¤¿¤¿¤á¡¢ - Èó¿ä¾©¤Ë¤Ê¤ê¤Þ¤·¤¿¡£ - ¤«¤ï¤ê¤Ë <application>Subversion</application> + Èó¿ä¾©¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¤«¤ï¤ê¤Ë + <ulink url="&url.books.handbook;/svn.html">Subversion</ulink> ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> </warning> </sect2> @@ -236,8 +236,8 @@ ÇÛÉۥ᡼¥ê¥ó¥°¥ê¥¹¥È¤Î¤¤¤º¤ì¤«¤Ë»²²Ã¤·¤Æ¤¯¤À¤µ¤¤¡£ &a.ctm-cvs-cur.name; ¤Ï´°Á´¤Ê CVS ¥Ä¥ê¡¼¡¢ &a.ctm-src-cur.name; - ¤Ï³«È¯Àèü¥Ö¥é¥ó¥Á¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£&a.ctm-src-7.name; - ¤Ï 7.X ¥ê¥ê¡¼¥¹¤Î¥Ö¥é¥ó¥Á¤ËÂбþ¤·¤¿¤â¤Î¤Ç¤¹ + ¤Ï³«È¯Àèü¥Ö¥é¥ó¥Á¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£&a.ctm-src-9.name; + ¤Ï 9.X ¥ê¥ê¡¼¥¹¤Î¥Ö¥é¥ó¥Á¤ËÂбþ¤·¤¿¤â¤Î¤Ç¤¹ (¤â¤·»²²ÃÊýË¡¤¬Ê¬¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È̾¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤«¡¢ &a.mailman.lists.link; ¤Ë¹Ô¤Ã¤Æ»²²Ã¤·¤¿¤¤¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤Î¥Ú¡¼¥¸¤Ë¤Ï¡¢»²²Ã¼ê½ç¤¬¾Ü¤·¤¯½ñ¤«¤ì¤Æ¤¤¤Þ¤¹)¡£</para> @@ -869,19 +869,6 @@ Certificate information: ¤Î³Æ¥ß¥é¡¼¥µ¥¤¥È¤Ç¼Â¹Ô¤¹¤ë¥µ¡¼¥Ð <command>cvsupd</command> ¤Ç¤¹¡£</para> - <para>&os; ¤Îʸ½ñ¤ä¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤òÆɤó¤ÀºÝ¤Ë¡¢ - <application>sup</application> ¤Ë¤Ä¤¤¤Æ¤Î¸ÀµÚ¤ò - ¸«¤«¤±¤¿¤«¤â¤·¤ì¤Þ¤»¤ó¡£<application>sup</application> ¤Ï - <application>CVSup</application> ¤ÎÁ°¤Ë¸ºß¤·¤Æ¤¤¤¿¤â¤Î¤Ç¡¢ - ƱÍͤÎÌÜŪ¤Ç»È¤ï¤ì¤Æ¤¤¤Þ¤·¤¿¡£ - <application>CVSup</application> ¤Ï sup - ¤ÈƱ¤¸¤è¤¦¤Ë»ÈÍѤµ¤ì¤Æ¤ª¤ê¡¢¼ÂºÝ¡¢<command>sup</command> - ¤È¸ß´¹À¤Î¤¢¤ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Þ¤¹¡£ - <application>CVSup</application> - ¤ÎÊý¤¬¤è¤ê¹â®¤Ç½ÀÆðÀ¤â¤¢¤ë¤Î¤Ç¡¢¤â¤Ï¤ä - <application>sup</application> ¤Ï &os; - ¥×¥í¥¸¥§¥¯¥È¤Ç¤Ï»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para> - <note> <para><application>csup</application> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï <application>CVSup</application> @@ -1257,23 +1244,9 @@ src-all</programlisting> <quote>¤ï¤«¤ê¤Þ¤·¤¿¡£ ¤Ç¤Ï¡¢¤³¤ì¤È¤³¤ì¤È¤³¤ì¤ò¤â¤é¤¤¤Þ¤¹</quote> ¤ÈÅú¤¨¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Î <application>CVSup</application> ¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢ - ÀßÄê¥Õ¥¡¥¤¥ë¤ÇÁª¤ó¤À¥³¥ì¥¯¥·¥ç¥ó¤È¥¿¥°¤ËŬ¹ç¤¹¤ë - ¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ - ¤·¤«¤·¡¢¤³¤ì¤Ï¾ï¤Ë¤¢¤Ê¤¿¤Î˾¤àÆ°ºî¤È°ìÃפ¹¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£ - ÆÃ¤Ë <filename>doc</filename> ¤ä <filename>ports</filename> ¤ä - <filename>www</filename> ¤Î¥Ä¥ê¡¼¤òƱ´ü¤µ¤»¤ë¾ì¹ç¤Ê¤É¤Ï¤½¤¦¤Ç¤·¤ç¤¦¡£ - ¤Û¤È¤ó¤É¤Î¿Í¤Ï»Í¤«¹ñ¸ì¤â¸Þ¤«¹ñ¸ì¤âÁà¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤«¤é¡¢ - ÆÃÄê¤Î¸À¸ì¤Î¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤ÏɬÍפʤ¤¤Ç¤·¤ç¤¦¡£ - Ports Collection ¤ò <application>CVSup</application> - ¤Ç¼èÆÀ¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢³Æ¥³¥ì¥¯¥·¥ç¥ó¤ò¸ÄÊ̤˻ØÄꤹ¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹ - (¤¿¤È¤¨¤Ð¡¢Ã±¤Ë <emphasis>ports-all</emphasis> ¤È¤¹¤ë¤«¤ï¤ê¤Ë - <emphasis>ports-astrology</emphasis>¡¢ - <emphasis>ports-biology</emphasis> ¤Ê¤É¤È½ñ¤¤Þ¤¹)¡£ - °ìÊý¡¢<filename>doc</filename> ¤È <filename>www</filename> - ¤Î¥Ä¥ê¡¼¤Ï¸À¸ìÊ̤Υ³¥ì¥¯¥·¥ç¥ó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ - ¤½¤³¤Ç¤¢¤Ê¤¿¤Ï <application>CVSup</application> - ¤Î¤¿¤¯¤µ¤ó¤¢¤ëÀöÎý¤µ¤ì¤¿µ¡Ç½¤Î°ì¤Ä¡¢ - <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para> + ÀßÄê¥Õ¥¡¥¤¥ë¤ÇÁª¤ó¤À¥³¥ì¥¯¥·¥ç¥ó¤È¥¿¥°¤ËŬ¹ç¤¹¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ + ¥Ä¥ê¡¼¤Î°ìÉô¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¡¢ + <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> <para><filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤Ï <application>CVSup</application> ¤ËÂФ·¡¢ @@ -1292,37 +1265,13 @@ src-all</programlisting> <para><filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤Î½ñ¼°¤Ï¡¢Ã±¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤¯¤Ê¤¤¥Õ¥¡¥¤¥ë¤ä ¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤¬½ñ¤¤¤Æ¤¢¤ë¤À¤±¤ÎÈó¾ï¤Ë¥·¥ó¥×¥ë¤Ê¤â¤Î¤Ç¤¹¡£ - ¤¿¤È¤¨¤Ð¡¢±Ñ¸ì°Ê³°¤Ë¤Ï¥É¥¤¥Ä¸ì¤ò¾¯¤·Ï令ë¤À¤±¤Î¿Í¤Ç¡¢ - ʸ½ñ¤Î¥É¥¤¥Ä¸ìÌõ¤òÆɤàɬÍפò´¶¤¸¤Ê¤±¤ì¤Ð - °Ê²¼¤Î¤è¤¦¤Ê <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£</para> - - <programlisting>doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_*</programlisting> - - <para>¾¤Î¸À¸ì¤Ë¤Ä¤¤¤Æ¤âƱÍͤǤ¹ (Á´¥ê¥¹¥È¤Ï <ulink - url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">&os; - CVS ¥ê¥Ý¥¸¥È¥ê</ulink> ¤ò¤´Í÷¤Ë¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤)¡£</para> - - <para>¤³¤Î¼Â¤ËÊØÍø¤Êµ¡Ç½¤ò»È¤¦¤È - ¤Þ¤Ã¤¿¤¯É¬ÍפȤ·¤Ê¤¤¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëɬÍפ¬¤Ê¤¯¤Ê¤ê¡¢ - ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î²óÀþ¤¬ÃÙ¤«¤Ã¤¿¤ê½¾ÎÌÀ©¤Ç²Ý¶â¤µ¤ì¤Æ¤¤¤ë¿Í¤Ï - µ®½Å¤Ê»þ´Ö¤òÀáÌó¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ + ¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¤è¤¦¤Ê <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£</para> + + <programlisting>bin/ +usr.bin/</programlisting> + + <para>¤Þ¤Ã¤¿¤¯É¬ÍפȤ·¤Ê¤¤¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëɬÍפ¬¤Ê¤¯¤Ê¤ê¡¢ + ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Î²óÀþ¤¬ÃÙ¤«¤Ã¤¿¤ê½¾ÎÌÀ©¤Ç²Ý¶â¤µ¤ì¤Æ¤¤¤ë¿Í¤Ï»þ´Ö¤òÀáÌó¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ <filename>refuse</filename> ¥Õ¥¡¥¤¥ë¤Î¾ÜºÙ¤ä <application>CVSup</application> ¤¬»ý¤Ä¤½¤Î¾¤ÎÊØÍø¤Êµ¡Ç½¤Ë´Ø¤·¤Æ¤Ï ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> @@ -1418,11 +1367,7 @@ doc/zh_*</programlisting> »ú²¼¤²¤·¤Æɽ¸½¤·¤Þ¤¹¡£</para> <para>ºÇ¤â°ìÈÌŪ¤Ë»ÈÍѤ¹¤ë¥³¥ì¥¯¥·¥ç¥ó¤Ï - <literal>src-all</literal>¡¢ - <literal>ports-all</literal> ¤Ç¤¹¡£ - ¾¤Î¥³¥ì¥¯¥·¥ç¥ó¤ÏÆÃÊ̤ÊÌÜŪ¤ò»ý¤Ä¿Íã¤À¤±¤¬»ÈÍѤ·¤Æ¤ª¤ê¡¢ - ¥ß¥é¡¼¥µ¥¤¥È¤Ï¤½¤ì¤é¤Î¤¹¤Ù¤Æ¤ò - »ý¤Ã¤Æ¤¤¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para> + <literal>src-all</literal> ¤Ç¤¹¡£</para> <variablelist> <varlistentry> @@ -1443,560 +1388,6 @@ doc/zh_*</programlisting> </varlistentry> <varlistentry> - <term><literal>ports-all release=cvs</literal></term> - - <listitem> - <para>&os; Ports Collection ¤Ç¤¹¡£</para> - - <important id="cvsup-collec-pbase-warn"> - <para><literal>ports-all</literal> (ports ¥Ä¥ê¡¼Á´ÂÎ) ¤ò¹¹¿·¤»¤º¤Ë¡¢ - °Ê²¼¤Î¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤Î°ì¤Ä¤ò»È¤¦¾ì¹ç¤Ï¡¢<emphasis>¾ï¤Ë</emphasis> - <literal>ports-base</literal> ¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤ò¹¹¿·¤¹¤ë¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤! - ports ¤Î¹½ÃÛ¥·¥¹¥Æ¥à¤ËÊѹ¹¤¬¤¢¤ë¤È¡¢ - <literal>ports-base</literal> ¤ËÈ¿±Ç¤µ¤ì¤Þ¤¹¡£ - ¤½¤·¤Æ¤Û¤È¤ó¤É¤Î¾ì¹ç¡¢¤½¤ÎÊѹ¹¤Ï¿·¤·¤¤ ports - ¤Ç<quote>¼ÂºÝ¤Ë</quote>»È¤ï¤ì¤ë¤«¤é¤Ç¤¹¡£ - ¤Ä¤Þ¤ê¡¢<quote>¸Ä¡¹¤Î ports</quote> ¤À¤±¤ò¹¹¿·¤·¤Æ¤¤¤ë¤È¡¢ - ´ñ̯¤Ê¥¨¥é¡¼¤Ç¹½Ãۤ˼ºÇÔ¤¹¤ë²ÄǽÀ¤¬Èó¾ï¤Ë¹â¤¯¤Ê¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£ - <literal>ports-base</literal> ¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤¬ - ºÇ¿·¾õÂ֤Ǥ¢¤ë¤«¤É¤¦¤«¤Î³Îǧ¤Ï¡¢ - <emphasis>²¿¤è¤ê¤âºÇ½é¤Ë¤ä¤é¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤</emphasis> - ¤³¤È¤Ê¤Î¤Ç¤¹¡£</para> - </important> - - <important id="cvsup-collec-index-warn"> - <para>¥í¡¼¥«¥ë¤Ç <filename>ports/INDEX</filename> - ¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢ - <literal>ports-all</literal> (ports ¥Ä¥ê¡¼Á´ÂÎ) - ¤¬<emphasis>ɬÍ×</emphasis>¤Ç¤¹¡£ - ¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤Î¤ß¤Ç <filename>ports/INDEX</filename> - ¤òºîÀ®¤¹¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£ - <ulink url="&url.books.faq;/applications.html#MAKE-INDEX"> - FAQ</ulink> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - </important> - - <variablelist> - <varlistentry> - <term><literal>ports-accessibility - release=cvs</literal></term> - - <listitem> - <para>¾ã³²¤ò»ý¤Ã¤¿¥æ¡¼¥¶¤ÎÌò¤ËΩ¤Ä¥½¥Õ¥È¥¦¥§¥¢</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-arabic - release=cvs</literal></term> - - <listitem> - <para>¥¢¥é¥Ó¥¢¸ì¥µ¥Ý¡¼¥È</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-archivers release=cvs</literal></term> - - <listitem> - <para>¥¢¡¼¥«¥¤¥Ó¥ó¥°¤Î¥Ä¡¼¥ë¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-astro release=cvs</literal></term> - - <listitem> - <para>ŷʸ³Ø´ØÏ¢¤Î ports¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-audio release=cvs</literal></term> - - <listitem> - <para>¥µ¥¦¥ó¥É¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-base release=cvs</literal></term> - - <listitem> - <para>Ports Collection ¤Î¹½ÃÛ¥·¥¹¥Æ¥àÉôʬ¡£ - <filename>/usr/ports</filename> ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê - <filename>Mk/</filename>¡¢<filename>Tools/</filename> - ¤Ë¤¢¤ë¡¢¤µ¤Þ¤¶¤Þ¤Ê¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£</para> - - <note> - <para><link linkend="cvsup-collec-pbase-warn">¾å¤ÎÃí°Õʸ</link>¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ - &os; Ports Collection ¤Î°ìÉôʬ¤ò¹¹¿·¤¹¤ë»þ¤Ë¤Ï¡¢ - ¤³¤Î¥µ¥Ö¥³¥ì¥¯¥·¥ç¥ó¤â<emphasis>¾ï¤Ë</emphasis>¹¹¿·¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para> - </note> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-benchmarks release=cvs</literal></term> - - <listitem> - <para>¥Ù¥ó¥Á¥Þ¡¼¥¯¥×¥í¥°¥é¥à¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-biology release=cvs</literal></term> - - <listitem> - <para>¿¢Êª³Ø´ØÏ¢¤Î¥×¥í¥°¥é¥à¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-cad release=cvs</literal></term> - - <listitem> - <para>CAD ¥Ä¡¼¥ë¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-chinese release=cvs</literal></term> - - <listitem> - <para>Ãæ¹ñ¸ì¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-comms release=cvs</literal></term> - - <listitem> - <para>ÄÌ¿®¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-converters release=cvs</literal></term> - - <listitem> - <para>ʸ»ú¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-databases release=cvs</literal></term> - - <listitem> - <para>¥Ç¡¼¥¿¥Ù¡¼¥¹¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-deskutils release=cvs</literal></term> - - <listitem> - <para>¥³¥ó¥Ô¥å¡¼¥¿¤¬È¯ÌÀ¤µ¤ì¤ëÁ°¤Ë - Âî¾å¤Ç»È¤ï¤ì¤Æ¤¤¤¿¤â¤Î¤¿¤Á¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-devel release=cvs</literal></term> - - <listitem> - <para>³«È¯¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-dns release=cvs</literal></term> - - <listitem> - <para>DNS ´ØÏ¢¤Î¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-editors release=cvs</literal></term> - - <listitem> - <para>¥¨¥Ç¥£¥¿¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-emulators release=cvs</literal></term> - - <listitem> - <para>¾¤Î OS ¤Î¥¨¥ß¥å¥ì¡¼¥¿¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-finance - release=cvs</literal></term> - - <listitem> - <para>¶âÍ»¡¢ºâ̳´ØÏ¢¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ftp release=cvs</literal></term> - - <listitem> - <para>FTP ¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-games release=cvs</literal></term> - - <listitem> - <para>¥²¡¼¥à¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-german release=cvs</literal></term> - - <listitem> - <para>¥É¥¤¥Ä¸ì¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-graphics release=cvs</literal></term> - - <listitem> - <para>¥°¥é¥Õ¥£¥Ã¥¯¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-hebrew - release=cvs</literal></term> - - <listitem> - <para>¥Ø¥Ö¥é¥¤¸ì¥µ¥Ý¡¼¥È</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-hungarian - release=cvs</literal></term> - - <listitem> - <para>¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-irc release=cvs</literal></term> - - <listitem> - <para>¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥ê¥ì¡¼¥Á¥ã¥Ã¥È (IRC) ÍѤΥ桼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-japanese release=cvs</literal></term> - - <listitem> - <para>ÆüËܸ쥵¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-java release=cvs</literal></term> - - <listitem> - <para>&java; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-korean release=cvs</literal></term> - - <listitem> - <para>´Ú¹ñ¸ì¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-lang release=cvs</literal></term> - - <listitem> - <para>¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-mail release=cvs</literal></term> - - <listitem> - <para>¥á¡¼¥ë¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-math release=cvs</literal></term> - - <listitem> - <para>¿ôÃÍ·×»»¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-misc release=cvs</literal></term> - - <listitem> - <para>¿§¡¹¤Ê¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-multimedia - release=cvs</literal></term> - - <listitem> - <para>¥Þ¥ë¥Á¥á¥Ç¥£¥¢¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net release=cvs</literal></term> - - <listitem> - <para>¥Í¥Ã¥È¥ï¡¼¥¥ó¥°¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-im - release=cvs</literal></term> - - <listitem> - <para>¥¤¥ó¥¹¥¿¥ó¥È¥á¥Ã¥»¡¼¥¸¥ó¥°¥½¥Õ¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-mgmt - release=cvs</literal></term> - - <listitem> - <para>¥Í¥Ã¥È¥ï¡¼¥¯´ÉÍý¥½¥Õ¥È¥¦¥§¥¢</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-p2p - release=cvs</literal></term> - - <listitem> - <para>¥Ô¥¢¥Ä¡¼¥Ô¥¢¥Í¥Ã¥È¥ï¡¼¥¯¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-news release=cvs</literal></term> - - <listitem> - <para>USENET ¥Ë¥å¡¼¥¹¤Î¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-palm release=cvs</literal></term> - - <listitem> - <para><trademark class="trade">Palm</trademark> ¥·¥ê¡¼¥ºÍÑ¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-polish - release=cvs</literal></term> - - <listitem> - <para>¥Ý¡¼¥é¥ó¥É¸ì¤Î¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ports-mgmt - release=cvs</literal></term> - - <listitem> - <para>ports ¤ª¤è¤Ó packages ´ÉÍýÍѤΥ桼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-portuguese - release=cvs</literal></term> - - <listitem> - <para>¥Ý¥ë¥È¥¬¥ë¸ì¤Î¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-print release=cvs</literal></term> - - <listitem> - <para>°õºþ¥½¥Õ¥È¥¦¥§¥¢¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-russian release=cvs</literal></term> - - <listitem> - <para>¥í¥·¥¢¸ì¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-science - release=cvs</literal></term> - - <listitem> - <para>²Ê³Ø</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-security release=cvs</literal></term> - - <listitem> - <para>¥»¥¥å¥ê¥Æ¥£¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-shells release=cvs</literal></term> - - <listitem> - <para>¥³¥Þ¥ó¥É¥é¥¤¥ó¥·¥§¥ë¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-sysutils release=cvs</literal></term> - - <listitem> - <para>¥·¥¹¥Æ¥à¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-textproc release=cvs</literal></term> - - <listitem> - <para>ʸ½ñ½èÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ - (¥Ç¥¹¥¯¥È¥Ã¥×¥Ñ¥Ö¥ê¥Ã¥·¥ó¥°¤Ï´Þ¤Þ¤Ê¤¤)¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ukrainian - release=cvs</literal></term> - - <listitem> - <para>¥¦¥¯¥é¥¤¥Ê¸ì¥µ¥Ý¡¼¥È</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-vietnamese release=cvs</literal></term> - - <listitem> - <para>¥Ù¥È¥Ê¥à¸ì¥µ¥Ý¡¼¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11 release=cvs</literal></term> - - <listitem> - <para>X window ¥·¥¹¥Æ¥à¤ò¥µ¥Ý¡¼¥È¤¹¤ë ports¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-clocks release=cvs</literal></term> - - <listitem> - <para>X11 ¾å¤ÇÆ°ºî¤¹¤ë»þ·×¤Î¿ô¡¹¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-drivers - release=cvs</literal></term> - - <listitem> - <para>X11 ¤Î¥É¥é¥¤¥Ð¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-fm release=cvs</literal></term> - - <listitem> - <para>X11 ¾å¤ÇÆ°ºî¤¹¤ë¥Õ¥¡¥¤¥é¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-fonts release=cvs</literal></term> - - <listitem> - <para>X11 ¤Î¥Õ¥©¥ó¥È¤È¥Õ¥©¥ó¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-toolkits release=cvs</literal></term> - - <listitem> - <para>X11 ¤Î¥Ä¡¼¥ë¥¥Ã¥È¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-servers - release=cvs</literal></term> - - <listitem> - <para>³Æ¼ï X11 ¥µ¡¼¥Ð¡£</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-themes - release=cvs</literal></term> - - <listitem> - <para>X11 ¤Î¥Æ¡¼¥Þ</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-wm - release=cvs</literal></term> - - <listitem> - <para>X11 ¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡£</para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - </varlistentry> - - <varlistentry> <term><literal>projects-all release=cvs</literal></term> <listitem> <para>&os; ¥×¥í¥¸¥§¥¯¥È¤Î¥ê¥Ý¥¸¥È¥ê¤Î¥½¡¼¥¹¡£</para> @@ -2279,14 +1670,6 @@ doc/zh_*</programlisting> <para>&os; ´ØÏ¢¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥¢¡¼¥«¥¤¥Ö¡£</para> </listitem> </varlistentry> - - <varlistentry><term><literal>www release=current</literal></term> - <listitem> - <para>Á°½èÍý¤µ¤ì¤¿ &os; WWW ¥µ¥¤¥È¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹ - (¥½¡¼¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)¡£ - WWW ¥ß¥é¡¼¥µ¥¤¥È¤¬»ÈÍѤ·¤Þ¤¹¡£</para> - </listitem> - </varlistentry> </variablelist> </sect2> diff --git a/ja_JP.eucJP/books/handbook/multimedia/chapter.xml b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml index 4ca1575e82..8d30bc6f68 100644 --- a/ja_JP.eucJP/books/handbook/multimedia/chapter.xml +++ b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: 1.144 + Original revision: r41064 $FreeBSD$ --> @@ -1706,9 +1706,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting> <application>SANE</application> ¤Ë¤Ï ¥¹¥¥ã¥Ê¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤È¤½¤Î¾õ¶·¤¬¤Þ¤È¤á¤é¤ì¤Æ¤¤¤ë <ulink url="http://www.sane-project.org/sane-supported-devices.html">Âбþ¥Ç¥Ð¥¤¥¹¤Î°ìÍ÷</ulink> - ¤¬¤¢¤ê¤Þ¤¹¡£&os; 8.X ¤è¤êÁ°¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ - &os; ¤Î &man.uscanner.4; - ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤âÂбþ USB ¥¹¥¥ã¥Ê¤Î°ìÍ÷¤¬µºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para> + ¤¬¤¢¤ê¤Þ¤¹¡£</para> </sect2> <sect2> @@ -1732,16 +1730,6 @@ device uhci device ohci device ehci</programlisting> - <para>&os; 8.X - ¤è¤êÁ°¤Î¥·¥¹¥Æ¥à¤Ç¤Ï°Ê²¼¤Î¹Ô¤âɬÍפȤʤê¤Þ¤¹¡£</para> - - <programlisting>device uscanner</programlisting> - - <para>¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ç¤Ï¡¢&man.uscanner.4; - ¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤¬ USB ¥¹¥¥ã¥Ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£ - &os; 8.0 °Ê¹ß¤Ç¤Ï¡¢&man.libusb.3; - ¥é¥¤¥Ö¥é¥ê¤¬Ä¾ÀÜÄ󶡤·¤Þ¤¹¡£</para> - <para>ŬÀڤʥɥ饤¥Ð¤òÁȤ߹þ¤ó¤À¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¸å¡¢ USB ¥¹¥¥ã¥Ê¤ò¥·¥¹¥Æ¥à¤ËÀܳ¤·¤Þ¤¹¡£ ¤¹¤ë¤È¡¢¥á¥Ã¥»¡¼¥¸¥Ð¥Ã¥Õ¥¡ (&man.dmesg.8;) @@ -1749,14 +1737,7 @@ device ehci</programlisting> <screen>ugen0.2: <EPSON> at usbus0</screen> - <para>&os; 7.X ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ - °Ê²¼¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£</para> - - <screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen> - - <para>¤³¤ì¤é¤ÎÎã¤Ç¤Ï¡¢»ÈÍѤ·¤Æ¤¤¤ë &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë±þ¤¸¤Æ¡¢ - ¥¹¥¥ã¥Ê¤¬ <filename>/dev/ugen0.2</filename> - ¤Þ¤¿¤Ï¡¢<filename>/dev/uscanner0</filename> + <para>¤³¤ì¤é¤ÎÎã¤Ç¤Ï¡¢¥¹¥¥ã¥Ê¤¬ <filename>/dev/ugen0.2</filename> ¥Ç¥Ð¥¤¥¹¥Î¡¼¥É¤ò»ÈÍѤ·¤Æ¤¤¤ë¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£ ¤³¤ÎÎã¤Ç¤Ï¡¢&epson.perfection; 1650 USB ¥¹¥¥ã¥Ê¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</para> </sect3> @@ -2010,22 +1991,6 @@ device `epson:/dev/uscanner0' is a Epson GT-8200 flatbed scanner</screen> add path ugen0.2 mode 0660 group usb add path usb/0.2.0 mode 0666 group usb</programlisting> - <para>&os; 7.X ¤Î¥æ¡¼¥¶¤Ï¡¢¥Ç¥Ð¥¤¥¹¥Î¡¼¥É - <filename>/dev/uscanner0</filename> ¤ËÂФ·¡¢ - °Ê²¼¤Î¤è¤¦¤Ê¹Ô¤ÎÄɲä¬É¬ÍפȤʤë¤Ç¤·¤ç¤¦¡£</para> - - <programlisting>[system=5] -add path uscanner0 mode 660 group usb</programlisting> - - <para>¼¡¤Ë¡¢<filename>/etc/rc.conf</filename> ¤Ë°Ê²¼¤Î¹Ô¤òÄɲä·¤Æ - ¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Þ¤¹¡£</para> - - <programlisting>devfs_system_ruleset="system"</programlisting> - - <para><filename>/etc/devfs.rules</filename> - ¤ÇÀßÄꤷ¤¿ÆâÍƤˤĤ¤¤Æ¤Î¾ÜºÙ¤Ï¡¢&man.devfs.8; - ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para> - <para>ºÇ¸å¤Ë¡¢¥¹¥¥ã¥Ê¤òÍøÍѤ¹¤ë¥æ¡¼¥¶¤ò <groupname><replaceable>usb</replaceable></groupname> ¥°¥ë¡¼¥×¤ËÄɲä·¤Þ¤¹¡£</para> diff --git a/ja_JP.eucJP/books/handbook/ports/chapter.xml b/ja_JP.eucJP/books/handbook/ports/chapter.xml index c7ee8e551c..57b707da6d 100644 --- a/ja_JP.eucJP/books/handbook/ports/chapter.xml +++ b/ja_JP.eucJP/books/handbook/ports/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r40855 + Original revision: r41119 $FreeBSD$ --> @@ -613,12 +613,6 @@ docbook = <screen>&prompt.root; <userinput>pkg_add -r pkg</userinput></screen> - <note> - <para><application>pkgng</application> package ´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢ - &os; 7.<replaceable>X</replaceable> ¤ª¤è¤Ó - &os; 8.0 ¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£</para> - </note> - <para>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤¬¤¹¤Ç¤Ë¹Ô¤ï¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ <application>pkg_install</application> package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Õ¥©¡¼¥Þ¥Ã¥È¤ØÊÑ´¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ @@ -1027,14 +1021,17 @@ Deinstalling ca_root_nss-3.13.5... done</screen> class="directory">/usr/ports</filename> ¤ËŸ³«¤·¤Æ¤¯¤À¤µ¤¤¡£</para> <screen>&prompt.root; <userinput>portsnap extract</userinput></screen> + </step> + <step> <para>¾å¤Ç¼¨¤·¤¿ <application>Portsnap</application> ¤ò½é¤á¤ÆÍøÍѤ¹¤ëºÝ¤Ë¹Ô¤¦¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¸å¤Ï¡¢ °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç <filename class="directory">/usr/ports</filename> ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤¤Þ¤¹¡£</para> - <screen>&prompt.root; <userinput>portsnap update</userinput></screen> + <screen>&prompt.root; <userinput>portsnap fetch</userinput> +&prompt.root; <userinput>portsnap update</userinput></screen> </step> </procedure> @@ -1077,15 +1074,15 @@ Deinstalling ca_root_nss-3.13.5... done</screen> <step> <para>ports ¥Ä¥ê¡¼¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£ ¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤òÎɤ¯¤¹¤ë¤¿¤á¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ë¤ª¤¤¤Æ¡¢ - <replaceable>svn.FreeBSD.org</replaceable> ¤ò <ulink - url="&url.books.handbook;/mirrors-svn.html">Subversion + <replaceable>svn0.us-east.FreeBSD.org</replaceable> ¤ò <ulink + url="&url.books.handbook;/svn-mirrors.html">Subversion ¥ß¥é¡¼</ulink> ¤ÎÃ椫¤éÃÏÍýŪ¤Ë¶á¤¤¾ì½ê¤Ë¤¢¤ë¥ß¥é¡¼¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£ ¥³¥ß¥Ã¥¿¤ÎÊý¡¹¤Ï¡¢ºÇ½é¤Ë <ulink url="&url.articles.committers-guide.en;/subversion-primer.html">Subversion Primer</ulink> ¤òÆɤó¤Ç¡¢Å¬Àڤʥץí¥È¥³¥ë¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para> - <screen>&prompt.root; <userinput>svn checkout svn://<replaceable>svn.FreeBSD.org</replaceable>/ports/head /usr/ports</userinput></screen> + <screen>&prompt.root; <userinput>svn checkout https://<replaceable>svn0.us-east.FreeBSD.org</replaceable>/ports/head /usr/ports</userinput></screen> </step> <step> diff --git a/ja_JP.eucJP/books/handbook/printing/chapter.xml b/ja_JP.eucJP/books/handbook/printing/chapter.xml index 39554c77fb..8dba6b9c84 100644 --- a/ja_JP.eucJP/books/handbook/printing/chapter.xml +++ b/ja_JP.eucJP/books/handbook/printing/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r38826 + Original revision: r41064 $FreeBSD$ --> @@ -169,11 +169,8 @@ <sect2 id="printing-intro-why"> <title>¤É¤¦¤·¤Æ¥¹¥×¡¼¥é¤ò»È¤¦¤Ù¤¤Ê¤Î¤«</title> - <para>¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ë¤Î¤¬¤¢¤Ê¤¿°ì¿Í¤À¤±¤À¤È¤·¤¿¤é¡¢ - ¥¢¥¯¥»¥¹À©¸æ¤â¥Ø¥Ã¥À¥Ú¡¼¥¸¤â¥×¥ê¥ó¥¿ÍøÍѤËÂФ¹¤ë²Ý¶â¤âɬÍפʤ¤¤Î¤Ë¡¢ - ¤Ê¤¼¤ï¤¶¤ï¤¶¥¹¥×¡¼¥é¤ËÈѤ蘆¤ì¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤Î¤«µ¿Ìä¤Ë»×¤¦¤«¤âÃΤì¤Þ¤»¤ó¡£ - ¥×¥ê¥ó¥¿¤ËÂФ¹¤ëľÀÜ¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë¤³¤È¤â¤Ç¤¤ë¤Î¤Ç¤¹¤¬¡¢ - ¤È¤Ë¤«¤¯¥¹¥×¡¼¥é¤ò»ÈÍѤ¹¤ë¤Ù¤¤Ç¤¹¡£¤½¤ÎÍýͳ¤Ï¡¢</para> + <para>¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ë¤Î¤¬¤¢¤Ê¤¿°ì¿Í¤À¤±¤À¤È¤·¤Æ¤â¡¢ + ¥¹¥×¡¼¥é¤ÏÍÍѤǤ¹¤·¡¢»ÈÍѤ¹¤Ù¤¤Ç¤¹¡£¤½¤ÎÍýͳ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para> <itemizedlist> <listitem> @@ -208,15 +205,6 @@ <sect1 id="printing-intro-setup"> <title>´ðËÜŪ¤ÊÀßÄê</title> - <warning> - <para>&os; 8.0 ¤«¤é¡¢¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Î¥Ç¥Ð¥¤¥¹¥Î¡¼¥É̾¤¬¡¢ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> ¤«¤é - <filename>/dev/ttyd<replaceable>N</replaceable></filename> - ¤Ø¤ÈÊѹ¹¤Ë¤Ê¤ê¤Þ¤·¤¿¡£ - &os; 7.X ¥æ¡¼¥¶¤Ï¡¢ - ¤³¤ÎÊѹ¹¤òÍý²ò¤·¤¿¾å¤Ç°Ê²¼¤Îʸ½ñ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</para> - </warning> - <para><application>LPD</application> ¥¹¥×¡¼¥ê¥ó¥°¥·¥¹¥Æ¥à¤òÍѤ¤¤Æ¥×¥ê¥ó¥¿¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢ ¥×¥ê¥ó¥¿µ¡´ï¤È <application>LPD</application> @@ -1519,15 +1507,6 @@ $%&'()*+,-./01234567 <sect1 id="printing-advanced"> <title>¥×¥ê¥ó¥¿ÀßÄê¾åµéÊÔ</title> - <warning> - <para>&os; 8.0 ¤«¤é¡¢¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Î¥Ç¥Ð¥¤¥¹¥Î¡¼¥É̾¤¬¡¢ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> ¤«¤é - <filename>/dev/ttyd<replaceable>N</replaceable></filename> - ¤Ø¤ÈÊѹ¹¤Ë¤Ê¤ê¤Þ¤·¤¿¡£ - &os; 7.X ¥æ¡¼¥¶¤Ï¡¢ - ¤³¤ÎÊѹ¹¤òÍý²ò¤·¤¿¾å¤Ç°Ê²¼¤Îʸ½ñ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</para> - </warning> - <para>¤³¤ÎÀá¤Ç¤Ï¡¢Æüì¤Ê·Á¼°¤Î¥Õ¥¡¥¤¥ë¤ò°õ»ú¤¹¤ë¤¿¤á¤Î¥Õ¥£¥ë¥¿¡¢ ¥Ø¥Ã¥À¥Ú¡¼¥¸¡¢¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Î¥×¥ê¥ó¥¿¤Ø¤Î°õ»ú¡¢¤½¤·¤Æ¡¢ ¥×¥ê¥ó¥¿»ÈÍѤÎÀ©¸Â¤ä²Ý¶â¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para> diff --git a/ja_JP.eucJP/books/handbook/x11/chapter.xml b/ja_JP.eucJP/books/handbook/x11/chapter.xml index 16a25ba7af..9f77c4009b 100644 --- a/ja_JP.eucJP/books/handbook/x11/chapter.xml +++ b/ja_JP.eucJP/books/handbook/x11/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r39176 + Original revision: r41025 $FreeBSD$ --> @@ -37,8 +37,7 @@ &os; ¤Ë¤ª¤±¤ë¥Ç¥Õ¥©¥ë¥È¤«¤Ä¸ø¼°¤Î X11 ¥µ¡¼¥Ð¤Ï X.Org Foundation ¤¬³«È¯¤·¤Æ¤¤¤ë <application>&xorg;</application> ¤Ç¤¹¡£ - &os; ¤Ë»÷¤¿¥é¥¤¥»¥ó¥¹¤Ë½¾¤Ã¤ÆÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - &os; ÍѤξ¦ÍÑ X ¥µ¡¼¥Ð¤âÆþ¼ê¤Ç¤¤Þ¤¹¡£</para> + &os; ¤Ë»÷¤¿¥é¥¤¥»¥ó¥¹¤Ë½¾¤Ã¤ÆÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para> <para>X11 ¤¬¥µ¥Ý¡¼¥È¤¹¤ë¥Ó¥Ç¥ª¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤Ï¡¢ <ulink url="http://www.x.org/">&xorg;</ulink> @@ -124,7 +123,7 @@ ½ÐÎÏÁõÃ֤Ȥ·¤Æ¥Ó¥Ç¥ª¥×¥í¥¸¥§¥¯¥¿¤òÍøÍѤ¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹) ¤ò¼è¤ê°·¤¤¤Þ¤¹¡£ ³Æ X ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó (<application>XTerm</application> ¤ä - <application>&netscape;</application> ¤Ê¤É) ¤Ï + <application>Firefox</application> ¤Ê¤É) ¤Ï <quote>¥¯¥é¥¤¥¢¥ó¥È</quote> ¤Ë¤Ê¤ê¤Þ¤¹¡£ ¥¯¥é¥¤¥¢¥ó¥È¤Ï <quote>¤³¤ÎºÂɸ¤Ë¥¦¥£¥ó¥É¥¦¤òÉÁ¤¤¤Æ¤¯¤À¤µ¤¤</quote> ¤È¤¤¤Ã¤¿¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ð¤ØÁ÷¤ê¡¢¥µ¡¼¥Ð¤Ï @@ -180,16 +179,8 @@ <para>¤½¤ÎÂå¤ï¤ê¤Ë¡¢X ¤Ç¤Ï¤½¤¦¤¤¤Ã¤¿¤³¤È¤ò <quote>¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã</quote> ¤È¸Æ¤Ð¤ì¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËǤ¤»¤ë¤Î¤Ç¤¹¡£ - X ÍѤΥ¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤¿¤¯¤µ¤ó¤¢¤ê¤Þ¤¹¡£ - <application>AfterStep</application>, - <application>Blackbox</application>, - <application>ctwm</application>, - <application>Enlightenment</application>, - <application>fvwm</application>, - <application>Sawfish</application>, - <application>twm</application>, - <application>Window Maker</application> - ¤Ê¤É¤Ê¤É¡£ + X ÍѤΠ<ulink + url="http://xwinman.org/">¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï¤¿¤¯¤µ¤ó</ulink> ¤¢¤ê¤Þ¤¹¡£ ¤³¤ì¤é¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Î¸«¤¿Ìܤä»È¤¤¾¡¼ê¤Ï¤½¤ì¤¾¤ì°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ <quote>¥Ð¡¼¥Á¥ã¥ë¥Ç¥¹¥¯¥È¥Ã¥×</quote> ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¤·¡¢ @@ -198,8 +189,7 @@ ¥Ü¥¿¥ó¤ä¤½¤ì¤ËÎह¤ë¤â¤Î¤ò»ý¤Ã¤Æ¤¤¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£ <quote>¥Æ¡¼¥Þ</quote> ¤ËÂбþ¤·¤Æ¤ª¤ê¡¢ ¿·¤·¤¤¥Æ¡¼¥Þ¤òŬÍѤ·¤Æ¸«¤¿Ìܤä»È¤¤¾¡¼ê¤ò´°Á´¤ËÊѤ¨¤é¤ì¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£ - ¤³¤ì¤é¤Î¡¢¤ª¤è¤Ó¤½¤Î¾¿¤¯¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï - Ports Collection ¤Î <filename>x11-wm</filename> + ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï Ports Collection ¤Î <filename>x11-wm</filename> ¤È¤¤¤¦¥«¥Æ¥´¥ê¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</para> <para>¤µ¤é¤Ë¡¢<application>KDE</application> ¤ä @@ -302,17 +292,9 @@ <para>¤·¤¿¤¬¤Ã¤Æ¡¢X ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¶¦Ä̤諤¿Ìܤä»È¤¤¾¡¼ê¤ò´üÂÔ¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£ - MIT ¤Î¥ª¥ê¥¸¥Ê¥ë¤Î Athena ¥¦¥£¥¸¥§¥Ã¥È¤ä - <application>&motif;</application> (µsoft.windows; - ¤Î¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤Ï¤³¤ì¤ò´ð¤Ë¤·¤Æ¤ª¤ê¡¢ - ¼ÐÅ٤ΤĤ¤¤¿±ï¤È»°Êý¤Ë³¥¿§¤Î±¢±Æ¤¬¤Ä¤¤¤Æ¤¤¤Þ¤¹)¡¢ - <application>OpenLook</application> ¤ò¤Ï¤¸¤á¤È¤·¤Æ - Í̾¤Ê¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤ä¤½¤Î°¡¼ï¤¬²¿¼ïÎà¤â¤¢¤ê¤Þ¤¹¡£</para> - - <para>Èæ³ÓŪ¿·¤·¤¤ X ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¤Û¤È¤ó¤É¤¬¡¢ <application>KDE</application> ¤Ç»È¤ï¤ì¤Æ¤¤¤ë Qt ¤ä <application>GNOME</application> ¥×¥í¥¸¥§¥¯¥È¤Ç»È¤ï¤ì¤Æ¤¤¤ë GTK+ - ¤Î¤É¤Á¤é¤«¤Î¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ + ¤È¤¤¤Ã¤¿Í̾¤Ê¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤ä¤½¤Î°¡¼ï¤¬²¿¼ïÎà¤â¤¢¤ê¤Þ¤¹¡£ ¤³¤ì¤é¤Î¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤Ï¥â¥À¥ó¤Ê¸«¤¿Ìܤò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£ ¤³¤ÎÅÀ¤Ç¸À¤¨¤Ð¡¢&unix; ¤Î¥ë¥Ã¥¯¥¢¥ó¥É¥Õ¥£¡¼¥ë¤Ï¼ýṲ́µ¤ì¤Æ¤¤Æ¤ª¤ê¡¢ ½é¿´¼Ô¤¬¤è¤ê´Êñ¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤Æ¤¤¤Þ¤¹¡£</para> @@ -322,9 +304,8 @@ <sect1 id="x-install"> <title>X11 ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title> - <para>&os; ¤Î¥Ç¥Õ¥©¥ë¥È¤Î X11 ¤Ï¡¢<application>&xorg;</application> - ¤Ç¤¹¡£ - <application>&xorg;</application> ¤Ï X.Org Foundation + <para>&os; ¤Ë¤ª¤±¤ë X11 ¤Î¼ÂÁõ¤Ï¡¢<application>&xorg;</application> ¤Ç¤¹¡£ + <application>&xorg;</application> ¤Ï X.Org Foundation ¤¬¥ê¥ê¡¼¥¹¤·¤Æ¤¤¤ë X Window System ¤Î¥ª¡¼¥×¥ó¥½¡¼¥¹¤Ê¼ÂÁõ¤Ç¤¹¡£ <application>&xorg;</application> ¤Ï <application>&xfree86; 4.4RC2</application> diff --git a/ja_JP.eucJP/htdocs/about.xml b/ja_JP.eucJP/htdocs/about.xml index 65f8d6a2f4..6a91caf72c 100644 --- a/ja_JP.eucJP/htdocs/about.xml +++ b/ja_JP.eucJP/htdocs/about.xml @@ -4,7 +4,7 @@ <!ENTITY title "FreeBSD ¤Ë¤Ä¤¤¤Æ"> ]> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r40760 --> +<!-- Original revision: r41251 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -17,7 +17,8 @@ <h2>FreeBSD ¤È¤Ï?</h2> <p>FreeBSD ¤Ï x86 ¸ß´¹µ¡ (Pentium® ¤ä Athlon™ ¤Ê¤É), - amd64 ¸ß´¹µ¡ (Opteron™, Athlon™64, EM64T ¤Ê¤É), + amd64, x86-64 ¤ª¤è¤Ó x64 ¸ß´¹µ¡ + (Opteron™, Athlon™64, EM64T ¤Ê¤É), ARM, IA-64, PowerPC, PC-98 ¤ª¤è¤Ó UltraSPARC® ¤Î³Æ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤ËÂбþ¤·¤¿¹âÀǽ¤Ê¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¤¹¡£ FreeBSD ¤Ï BSD ¤È¸Æ¤Ð¤ì¤ë¡¢¥«¥ê¥Õ¥©¥ë¥Ë¥¢Âç³Ø¥Ð¡¼¥¯¥ì¡¼¹»¤Ç³«È¯¤µ¤ì¤¿ diff --git a/ja_JP.eucJP/htdocs/developers/cvs.xml b/ja_JP.eucJP/htdocs/developers/cvs.xml index da4244772c..94bb4883b7 100644 --- a/ja_JP.eucJP/htdocs/developers/cvs.xml +++ b/ja_JP.eucJP/htdocs/developers/cvs.xml @@ -5,7 +5,7 @@ ]> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r39747 --> +<!-- Original revision: r41253 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -24,12 +24,15 @@ ¥ê¥Ý¥¸¥È¥ê¤ËµÏ¿¤µ¤ì¡¢ °Ê²¼¤Ç½Ò¤Ù¤ë¥¦¥§¥Ö¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç´Êñ¤Ë¸«¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</p> - <p>2008 ǯ 6 ·î¤è¤ê¡¢¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î³«È¯¤Ï¡¢Ê̤ΥС¼¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à¤«¤é + <p>2008 ǯ 6 ·î¤è¤ê¡¢¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î³«È¯¤Ï¡¢Ê̤ΥС¼¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à <a href="http://subversion.tigris.org/">Subversion</a> (ά¤·¤Æ SVN) ¤Ë°Ü¹Ô¤·¤Þ¤·¤¿¡£ <a href="http://svnweb.FreeBSD.org/base/">¥¦¥§¥Ö¥¤¥ó¥¿¥Õ¥§¡¼¥¹</a> ¤òÍøÍѤ·¤Æ¥ê¥Ý¥¸¥È¥ê¤ò¸«¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - ¤¹¤Ù¤Æ¤ÎÊѹ¹ÅÀ¤Ï¡¢CVS ¥ê¥Ý¥¸¥È¥ê¤Ë¤âÈ¿±Ç¤µ¤ì¤Þ¤¹¡£</p> + ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥Ö¥é¥ó¥Á (stable/9 ¤ª¤è¤Ó stable/8) + ¤Ø¤Î¤¹¤Ù¤Æ¤ÎÊѹ¹ÅÀ¤Ï¡¢CVS ¥ê¥Ý¥¸¥È¥ê¤Ë¤âÈ¿±Ç¤µ¤ì¤Þ¤¹¡£ + ¤¿¤À¤·¡¢CVS ¥ê¥Ý¥¸¥È¥ê¤Ï¿ä¾©¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢ + CVS ¤òÍøÍѤ·¤Æ¤¤¤ë¥æ¡¼¥¶¤Ï SVN ¤Ë°Ü¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</p> <p>2012 ǯ 5 ·î¤è¤ê¡¢FreeBSD ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤Ï¡¢CVS ¤«¤é Subversion ¤Ø¤È°Ü¹Ô¤·¤Þ¤·¤¿¡£¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤È¤Ï°Û¤Ê¤ê¡¢ @@ -42,15 +45,14 @@ Subversion ¤Ø¤È°Ü¹Ô¤·¤Þ¤·¤¿¡£<a href="http://svnweb.FreeBSD.org/ports/">¥¦¥§¥Ö¥¤¥ó¥¿¥Õ¥§¡¼¥¹</a> ¤òÍøÍѤ·¤Æ¥ê¥Ý¥¸¥È¥ê¤ÎÆâÍƤò¸«¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - Ports ¥Ä¥ê¡¼¤ÎÊѹ¹ÅÀ¤Ï¡¢CVS ¥ê¥Ý¥¸¥È¥ê¤Ë¤âÈ¿±Ç¤µ¤ì¤Þ¤¹¤¬¡¢ + Ports ¥Ä¥ê¡¼¤ÎÊѹ¹ÅÀ¤Ï¡¢¸µ¤Î CVS ¥ê¥Ý¥¸¥È¥ê¤Ë¤âÈ¿±Ç¤µ¤ì¤Þ¤¹¤¬¡¢ 2013 ǯ¤ÎÁ°È¾¤Ë¤Ï¹Ô¤ï¤ì¤Ê¤¯¤Ê¤ëͽÄê¤Ç¤¹¡£</p> <h2>¥ì¥¬¥·¡¼ : CVS</h2> - <p>&os; ¥×¥í¥¸¥§¥¯¥È¤Ï¡¢¥½¡¼¥¹¤ò´ÉÍý¤¹¤ë¥Ä¡¼¥ë¤È¤·¤Æ - <a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a> - (Concurrent Version System) ¤ò»È¤Ã¤Æ¤¤¤Þ¤·¤¿¡£</p> - + <p><a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a> (the + Concurrent Version System) ¤Ï¡¢&os; ¥×¥í¥¸¥§¥¯¥È¤¬¡¢ + ¥½¡¼¥¹¤ò´ÉÍý¤¹¤ë¤¿¤á¤Ë»È¤Ã¤Æ¤¤¤¿¥Ä¡¼¥ë¤Ç¤¹¡£</p> <p>¸Å¤¤¥¦¥§¥Ö¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢<a href="http://www.freebsd.org/cgi/cvsweb.cgi/">cvsweb ¥¤¥ó¥¹¥¿¥ó¥¹</a> diff --git a/ja_JP.eucJP/htdocs/docs/books.xml b/ja_JP.eucJP/htdocs/docs/books.xml index 01bd1fef5e..7287aa4bcb 100644 --- a/ja_JP.eucJP/htdocs/docs/books.xml +++ b/ja_JP.eucJP/htdocs/docs/books.xml @@ -9,7 +9,7 @@ <!ENTITY url.ja.books "&enbase;/doc/ja_JP.eucJP/books"> ]> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r40285 --> +<!-- Original revision: r41129 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -406,12 +406,12 @@ </li> <li> - <p><a href="http://software.intel.com/sites/oss/pdfs/profiling_debugging_freebsd_kernel_321772.pdf">Profiling + <p><a href="http://software.intel.com/sites/default/files/profiling_debugging_freebsd_kernel_321772.pdf">Profiling and Debugging the FreeBSD Kernel</a></p> </li> <li> - <p><a href="http://software.intel.com/sites/oss/pdfs/debugging_buffer_overruns_322486.pdf">Debugging + <p><a href="http://software.intel.com/sites/default/files/debugging_buffer_overruns_322486.pdf">Debugging Buffer Overruns in the FreeBSD Kernel</a></p> </li> diff --git a/ja_JP.eucJP/htdocs/index.xsl b/ja_JP.eucJP/htdocs/index.xsl index 1a79fa7946..17ee37237b 100644 --- a/ja_JP.eucJP/htdocs/index.xsl +++ b/ja_JP.eucJP/htdocs/index.xsl @@ -5,7 +5,7 @@ ]> <!-- $FreeBSD$ --> -<!-- Original revision: r40504 --> +<!-- Original revision: r41116 --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -80,9 +80,9 @@ <h2><a href="&base;/releases/">ºÇ¿·¥ê¥ê¡¼¥¹</a></h2> <ul id="frontreleaseslist"> <li>¥×¥í¥À¥¯¥·¥ç¥ó: <a - href="&u.rel.announce;">&rel.current;</a>, <a href="&u.rel2.announce;">&rel2.current;</a></li> + href="&u.rel.announce;">&rel.current;</a></li> <li>¥ì¥¬¥·¡¼: <a - href="&u.rel3.announce;">&rel3.current;</a></li> + href="&u.rel2.announce;">&rel2.current;</a></li> <xsl:if test="'&beta.testing;' != 'IGNORE'"> <li>¼¡²óͽÄê: <a href="&base;/where.html#helptest">&betarel.current;-&betarel.vers;</a></li> diff --git a/ja_JP.eucJP/htdocs/internal/about.xml b/ja_JP.eucJP/htdocs/internal/about.xml index 9dec1a7541..dd9ea28f7b 100644 --- a/ja_JP.eucJP/htdocs/internal/about.xml +++ b/ja_JP.eucJP/htdocs/internal/about.xml @@ -5,7 +5,7 @@ ]> <!-- $FreeBSD$ --> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: 1.63 --> +<!-- Original revision: r41110 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -120,8 +120,8 @@ FreeBSD Web ¥Ú¡¼¥¸¤Î¹½Ãۤȹ¹¿·</a></h2> ¤Ç³Îǧ¤Ç¤¤Þ¤¹¡£</p> <h2>FreeBSD Web ¥Ú¡¼¥¸¤Î¥ß¥é¡¼</h2> - <p>www.FreeBSD.org ¤Î FreeBSD Web ¥Ú¡¼¥¸¤ò <a href="mirror.html"> - ¥ß¥é¡¼</a>¤Ç¤¤Þ¤¹ (¾©Î夵¤ì¤Æ¤¤¤Þ¤¹)¡£</p> + <p>www.FreeBSD.org ¤Î FreeBSD Web ¥Ú¡¼¥¸¤ò + <a href="mirror.html">¥ß¥é¡¼</a>¤Ç¤¤Þ¤¹¡£</p> <p></p><a href="internal.html">FreeBSD Internal ¥Û¡¼¥à</a> diff --git a/ja_JP.eucJP/htdocs/internal/mirror.xml b/ja_JP.eucJP/htdocs/internal/mirror.xml index 082cf41652..4da23de243 100644 --- a/ja_JP.eucJP/htdocs/internal/mirror.xml +++ b/ja_JP.eucJP/htdocs/internal/mirror.xml @@ -4,7 +4,7 @@ <!ENTITY title "FreeBSD ¤Î Web ¥Ú¡¼¥¸¤ò¥ß¥é¡¼¤¹¤ë"> ]> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: 1.24 --> +<!-- Original revision: r41110 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -16,36 +16,21 @@ <body class="navinclude.docs"> <p><tt>www.FreeBSD.org</tt> ¤Ë¤¢¤ë FreeBSD ¤Î Web -¥Ú¡¼¥¸¤ò¥ß¥é¡¼¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹ (¤Þ¤¿¡¢¾©Î夵¤ì¤Æ¤â¤¤¤Þ¤¹)¡£ +¥Ú¡¼¥¸¤ò¥ß¥é¡¼¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ -¥ß¥é¡¼¤ò¹Ô¤¦¤Ë¤Ï¡¢<em>cvsup</em> ¤È¤¤¤¦¥×¥í¥°¥é¥à¤òÆþ¼ê¤·¤Æ Web -¥µ¡¼¥Ð¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ +¥ß¥é¡¼¤Ï¡¢<em>csup</em> ¤È¤¤¤¦¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¹Ô¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ -<a href="&url.doc.base;/books/handbook/cvsup.html#CVSUP-INSTALL">CVSup</a> ¤Ï¡¢ -¥Í¥Ã¥È¥ï¡¼¥¯¤òÄ̤¸¤Æ¥Õ¥¡¥¤¥ë·²¤òÇÛÉÛ¡¦¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤¿¤á¤Î¥½¥Õ¥È¥¦¥§¥¢¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£</p> +csup ¤Ï¡¢ +¥Í¥Ã¥È¥ï¡¼¥¯¤òÄ̤¸¤Æ¥Õ¥¡¥¤¥ë·²¤òÇÛÉÛ¡¦¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤¿¤á¤Î¥½¥Õ¥È¥¦¥§¥¢¥Ñ¥Ã¥±¡¼¥¸¤Ç¡¢¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p> -<h2>CVSup ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë</h2> - -<p>°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¥½¡¼¥¹¤«¤é¥Ó¥ë¥É¤·¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¤Þ¤¹¡£</p> - -<pre> - # cd /usr/ports/net/cvsup-without-gui - # make all install clean -</pre> - -<p>¤·¤«¤·¤Ê¤¬¤é¡¢FreeBSD -<a href="&url.doc.base;/books/handbook/packages-using.html">packages -collection</a> ¤«¤é¥³¥ó¥Ñ¥¤¥ëºÑ¤ß¤Î package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊý¤¬³Ú¤Ç¤·¤ç¤¦¡£ -¾ÜºÙ¤òµ½Ò¤·¤Æ¤¤¤ë¾Ï¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p> - -<h2>CVSup ¤òÁö¤é¤»¤ë</h2> +<h2>csup ¤òÁö¤é¤»¤ë</h2> <p>¥ß¥é¡¼¤¹¤ë FreeBSD ¤Î web ¥Ú¡¼¥¸¤ò <tt>/usr/FreeBSD-mirror</tt> ¤ËÃÖ¤¡¢¥æ¡¼¥¶ `fred' ¤Ë½êͤµ¤»¤¿¤¤¾ì¹ç¡¢¥æ¡¼¥¶ `fred' ¤Ë¤Ê¤Ã¤Æ°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</p> <pre> - $ cvsup supfile-www + $ csup supfile-www </pre> <tt>supfile-www</tt> ¥Õ¥¡¥¤¥ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Êµ½Ò¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ @@ -58,13 +43,7 @@ collection</a> ¤«¤é¥³¥ó¥Ñ¥¤¥ëºÑ¤ß¤Î package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊý¤¬³Ú¤Ç¤·¤ç¤¦¡£ <p>¤³¤¦¤¹¤ì¤Ð FreeBSD ¤Î web ¥Ú¡¼¥¸¤ò <tt>/usr/FreeBSD-mirror</tt> ¤Ë¥ß¥é¡¼¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£fred ¤Î crontab ¤Ë¤³¤Î¥³¥Þ¥ó¥É¤ò½ñ¤¹þ¤á¤Ð¡¢ -°ìÆü°ì²ó¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤â¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ -www.FreeBSD.org ¤Ï¡¢ËèÆü¥«¥ê¥Õ¥©¥ë¥Ë¥¢»þ´Ö¤Î 4:30am ¤Ë¥Ú¡¼¥¸¤ò¹¹¿·¤·¤Æ¤¤¤Þ¤¹¡£</p> - -<h2>CVSup ¤Ë´Ø¤¹¤ë¹¹¤Ê¤ë¾ðÊó</h2> - -¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ë¤¢¤ë¡¢<a href="&url.doc.base;/books/handbook/synching.html#CVSUP">CVSup¤Î¾Ò²ð</a> -¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£ +°ìÆü°ì²ó¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤â¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p> <p><a href="internal.html">FreeBSD Internal ¥Û¡¼¥à</a></p> diff --git a/ja_JP.eucJP/htdocs/platforms/amd64.xml b/ja_JP.eucJP/htdocs/platforms/amd64.xml index b8b3ebe5ef..0a08aa6eac 100644 --- a/ja_JP.eucJP/htdocs/platforms/amd64.xml +++ b/ja_JP.eucJP/htdocs/platforms/amd64.xml @@ -5,7 +5,7 @@ <!ENTITY email 'freebsd-amd64'> ]> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r38956 --> +<!-- Original revision: r41246 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -19,20 +19,22 @@ <a href="&enbase;/gifs/daemon_hammer.jpg"><img src="&enbase;/gifs/daemon_hammer-tn15.jpg" align="right" border="0" alt="ÂçÄȤò¿¶¤ë BSD ¥Ç¡¼¥â¥ó"/></a> <p>¤³¤Î¥Ú¡¼¥¸¤Ï <a href="http://www.amd.com/">AMD ¼Ò</a> ¤Î - AMD64 ¥¢¡¼¥¥Æ¥¯¥Á¥ã¡¢¤ª¤è¤Ó - <a href="http://developer.intel.com/technology/intel64/index.htm">Intel® 64</a> ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Ø¤Î + AMD64 ¥¢¡¼¥¥Æ¥¯¥Á¥ã¡¢¤ª¤è¤Ó <a + href="http://www.intel.com/info/em64t">Intel® + 64</a> ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Ø¤Î FreeBSD ¤Î°Ü¿¢¤Ë´Ø¤¹¤ë¾ðÊó¤ò¤Þ¤È¤á¤¿¤â¤Î¤Ç¤¹¡£ - AMD64 ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Ï¡¢°ÊÁ°¤Ï x86-64 ¤Þ¤¿¤Ï - ``Hammer'' ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤·¤¿¡£ + AMD64 ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Ï¡¢°ÊÁ°¤Ï <q>Hammer</q> ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤·¤¿¡£ Intell 64 ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Ï¡¢°ÊÁ°¤Ï Yamhill, Clackamas Techchnology (CT), IA-32e¡¢¤ª¤è¤Ó - EM64T (Extended Memory 64-bit Technology) ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤·¤¿¡£</p> + EM64T (Extended Memory 64-bit Technology) ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤·¤¿¡£ + °ìÈÌŪ¤Ë¡¢¤³¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ï + <q>x86-64</q> ¤â¤·¤¯¤Ï <q>x64</q> ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£</p> <p>AMD Opteron™, AMD Athlon™ 64, AMD Turion™ 64 ¤ª¤è¤Ó¡¢¿·¤·¤¤ AMD Sempron™ ¥×¥í¥»¥Ã¥µ¤Ï AMD64 ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£</p> - <p>Intel vPro™, Intel Celeron D (°ìÉô¤Î¥â¥Ç¥ë¤Ï ``Prescott'' ¤òºÎÍÑ), + <p>Intel vPro™, Intel Celeron D (°ìÉô¤Î¥â¥Ç¥ë¤Ï <q>Prescott</q> ¤òºÎÍÑ), Intel Centrino® Duo, Intel Centrino® Pro, Intel Viiv™, Intel Core™2 Extreme, Intel Core™2 Quad, Intel Core™2 Duo, Intel Xeon (3000 ·Ï¡¢5000 ·Ï¡¢¤ª¤è¤Ó 7000 ·Ï) diff --git a/ja_JP.eucJP/htdocs/projects/projects.xml b/ja_JP.eucJP/htdocs/projects/projects.xml index 2a0e8cc8e7..e64e36cbec 100644 --- a/ja_JP.eucJP/htdocs/projects/projects.xml +++ b/ja_JP.eucJP/htdocs/projects/projects.xml @@ -8,7 +8,7 @@ ]> <!-- $FreeBSD$ --> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r40761 --> +<!-- Original revision: r41155 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -63,12 +63,6 @@ FreeBSD ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÈϰϤò¿·¤·¤¤Êý¸þ¤Ç³ÈÂ礹¤ë¤¿¤á¤Ëºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£ ½é¿´¼Ô¤Î¤¿¤á¤Î FreeBSD ¤Ë´Ø¤¹¤ë¾ðÊó</a>: FreeBSD ¤È &unix; ¤ò»È¤¤»Ï¤á¤¿¿Í¤ËÌòΩ¤Ä°ìÈÌŪ¤Ê¾ðÊó¤Î¥ê¥¹¥È¤Ç¤¹¡£</li> - <li><a name="BSDsites" href="http://mirrorlist.FreeBSD.org/"> - RELEASE/SNAP ¤ò FreeBSD ¤Î FTP ¥µ¡¼¥Ð¤«¤éÁܤ¹</a>: - ÆÃÄê¤Î release ¤ä snap ¤ò»ý¤Ã¤Æ¤¤¤ë FTP ¥µ¡¼¥Ð¤òÁܤ¹¼ê½õ¤±¤ò¤·¤Þ¤¹¡£ - ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÏËèÆü¥á¥ë¥Ü¥ë¥ó»þ´Ö¤Ç¸áÁ° 3 »þ - (UTC ¤Î 10 »þ´ÖÀè) ¤Ë¹¹¿·¤µ¤ì¤Þ¤¹¡£</li> - <li><a name="diary" href="http://www.freebsddiary.org/"> FreeBSD Diary</a>: UNIX ½é¿´¼Ô¸þ¤±¤Î¥Ï¥¦¥Ä¡¼¤Î¥³¥ì¥¯¥·¥ç¥ó¤Ç¤¹¡£ ÌÜŪ¤Ï¤µ¤Þ¤¶¤Þ¤Ê ports ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤äÀßÄê¤Î step-by-step diff --git a/ja_JP.eucJP/htdocs/releases/index.xml b/ja_JP.eucJP/htdocs/releases/index.xml index 976bc6a187..98c6fc3fc5 100644 --- a/ja_JP.eucJP/htdocs/releases/index.xml +++ b/ja_JP.eucJP/htdocs/releases/index.xml @@ -5,7 +5,7 @@ ]> <!-- $FreeBSD$ --> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r40515 --> +<!-- Original revision: r41117 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -52,6 +52,17 @@ <a href="&u.rel.errata;">Errata (Àµ¸íɽ)</a> </em></p> + <p><b>¥ê¥ê¡¼¥¹ 9.0</b> (2012 ǯ 1 ·î) + <em> + <a href="9.0R/announce.html">¥¢¥Ê¥¦¥ó¥¹</a>: + <a href="&enbase;/releases/9.0R/relnotes.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a>: + <a href="&enbase;/releases/9.0R/readme.html">¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</a>: + <a href="&enbase;/releases/9.0R/hardware.html">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</a>: + <a href="&enbase;/releases/9.0R/readme.html">README</a>: + <a href="&enbase;/releases/9.0R/errata.html">Errata (Àµ¸íɽ)</a> + </em></p> + + <h3>¥ì¥¬¥·¡¼¥ê¥ê¡¼¥¹</h3> <p><b>¥ê¥ê¡¼¥¹ &rel2.current;</b> (&rel2.current.date;) <em> <a href="&u.rel2.announce;">¥¢¥Ê¥¦¥ó¥¹</a> : @@ -62,16 +73,6 @@ <a href="&u.rel2.errata;">Errata (Àµ¸íɽ)</a> </em></p> - <h3>¥ì¥¬¥·¡¼¥ê¥ê¡¼¥¹</h3> - <p><b>¥ê¥ê¡¼¥¹ &rel3.current;</b> (&rel3.current.date;) - <em> - <a href="&u.rel3.announce;">¥¢¥Ê¥¦¥ó¥¹</a> : - <a href="&u.rel3.notes;">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a> : - <a href="&u.rel3.hardware;">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</a> : - <a href="&u.rel3.readme;">README</a> : - <a href="&u.rel3.errata;">Errata (Àµ¸íɽ)</a> - </em></p> - <a name="future"></a> <h2>¾Íè¤Î¥ê¥ê¡¼¥¹</h2> @@ -100,15 +101,6 @@ ¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</p> <ul> - <li><b>9.0</b> (2012 ǯ 1 ·î) - <em> - <a href="9.0R/announce.html">¥¢¥Ê¥¦¥ó¥¹</a>: - <a href="&enbase;/releases/9.0R/relnotes.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a>: - <a href="&enbase;/releases/9.0R/hardware.html">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</a>: - <a href="&enbase;/releases/9.0R/readme.html">README</a> - <a href="&enbase;/releases/9.0R/errata.html">Errata (Àµ¸íɽ)</a> - </em> - </li> <li><b>8.2</b> (2011 ǯ 2 ·î) <em> @@ -142,6 +134,16 @@ </em> </li> + <li><b>7.4</b> (2011 ǯ 2 ·î) + <em> + <a href="&enbase;/releases/7.4R/announce.html">¥¢¥Ê¥¦¥ó¥¹</a>: + <a href="&enbase;/releases/7.4R/relnotes.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a>: + <a href="&enbase;/releases/7.4R/hardware.html">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</a>: + <a href="&enbase;/releases/7.4R/readme.html">README</a> + <a href="&enbase;/releases/7.4R/errata.html">Errata (Àµ¸íɽ)</a> + </em> + </li> + <li><b>7.3</b> (2010 ǯ 3 ·î) <em> <a href="&enbase;/releases/7.3R/announce.html">¥¢¥Ê¥¦¥ó¥¹</a>: diff --git a/ja_JP.eucJP/htdocs/search/sitemap.xml b/ja_JP.eucJP/htdocs/search/sitemap.xml index 334e79fed4..de291eb0c3 100644 --- a/ja_JP.eucJP/htdocs/search/sitemap.xml +++ b/ja_JP.eucJP/htdocs/search/sitemap.xml @@ -3,7 +3,7 @@ "http://www.FreeBSD.org/XML/www/share/xml/sitemap.dtd"> <!-- $FreeBSD$ --> -<!-- Original revision: r39951 --> +<!-- Original revision: r41184 --> <sitemap> <term> @@ -1063,7 +1063,7 @@ <term> <text>Project ideas</text> - <destination>&enbase;/projects/ideas/index.html</destination> + <destination>https://wiki.freebsd.org/IdeasPage</destination> </term> <term> @@ -1272,8 +1272,8 @@ </term> <term> - <text>Logo design competition</text> - <destination>http://logo-contest.FreeBSD.org/</destination> + <text>Logo</text> + <destination>&enbase;/logo.html</destination> </term> <term> @@ -1522,7 +1522,7 @@ <item> <text>¥×¥í¥¸¥§¥¯¥È¥¢¥¤¥Ç¥£¥¢</text> - <destination>&enbase;/projects/ideas/index.html</destination> + <destination>https://wiki.freebsd.org/IdeasPage</destination> </item> <item> @@ -1667,7 +1667,7 @@ <item> <text>FreeBSD ¥×¥í¥¸¥§¥¯¥È¥¢¥¤¥Ç¥£¥¢</text> - <destination>&enbase;/projects/ideas/index.html</destination> + <destination>https://wiki.freebsd.org/IdeasPage</destination> </item> <item> diff --git a/ja_JP.eucJP/htdocs/security/security.xml b/ja_JP.eucJP/htdocs/security/security.xml index 5ec924263d..86099685cc 100644 --- a/ja_JP.eucJP/htdocs/security/security.xml +++ b/ja_JP.eucJP/htdocs/security/security.xml @@ -6,7 +6,7 @@ ]> <!-- $FreeBSD$ --> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r40715 --> +<!-- Original revision: r41257 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -106,6 +106,11 @@ <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¾Ä³°¡¢<br/> TrustedBSD ¥×¥í¥¸¥§¥¯¥È¾Ä³°¡¢¥·¥¹¥Æ¥à¥»¥¥å¥ê¥Æ¥£¥¢¡¼¥¥Æ¥¯¥Á¥ã¤ÎÀìÌç²È</td> </tr> + <tr valign="top"> + <td>&a.delphij; <a + href="mailto:delphij@FreeBSD.org"><delphij@FreeBSD.org></a></td> + <td>¥»¥¥å¥ê¥Æ¥£¥ª¥Õ¥£¥µÊ亴</td> + </tr> </table> <p>¤Þ¤¿¡¢¥»¥¥å¥ê¥Æ¥£¥ª¥Õ¥£¥µ¤¬Áª½Ð¤·¤¿¥³¥ß¥Ã¥¿¡¼¥°¥ë¡¼¥×¤Ç¤¢¤ë @@ -247,20 +252,6 @@ <th>Êݼ齪λͽÄêÆü</th> </tr> <tr> - <td>RELENG_7</td> - <td>¤Ê¤·</td> - <td>¤Ê¤·</td> - <td>¤Ê¤·</td> - <td>2013 ǯ 2 ·î 28 Æü</td> - </tr> - <tr> - <td>RELENG_7_4</td> - <td>7.4-RELEASE</td> - <td>Extended</td> - <td>2011 ǯ 2 ·î 24 Æü</td> - <td>2013 ǯ 2 ·î 28 Æü</td> - </tr> - <tr> <td>RELENG_8</td> <td>¤Ê¤·</td> <td>¤Ê¤·</td> @@ -421,6 +412,13 @@ <td>2010 ǯ 11 ·î 30 Æü</td> </tr> <tr> + <td>RELENG_7</td> + <td>¤Ê¤·</td> + <td>¤Ê¤·</td> + <td>¤Ê¤·</td> + <td>2013 ǯ 2 ·î 28 Æü</td> + </tr> + <tr> <td>RELENG_7_0</td> <td>7.0-RELEASE</td> <td>Normal</td> @@ -449,6 +447,13 @@ <td>2012 ǯ 3 ·î 31 Æü</td> </tr> <tr> + <td>RELENG_7_4</td> + <td>7.4-RELEASE</td> + <td>Extended</td> + <td>2011 ǯ 2 ·î 24 Æü</td> + <td>2013 ǯ 2 ·î 28 Æü</td> + </tr> + <tr> <td>RELENG_8_0</td> <td>8.0-RELEASE</td> <td>Normal</td> diff --git a/ja_JP.eucJP/htdocs/where.xml b/ja_JP.eucJP/htdocs/where.xml index 85f32db7d9..7ddd956743 100644 --- a/ja_JP.eucJP/htdocs/where.xml +++ b/ja_JP.eucJP/htdocs/where.xml @@ -5,7 +5,7 @@ <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases"> ]> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r40536 --> +<!-- Original revision: r41269 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -76,7 +76,7 @@ </tr> <tr> <td></td> - <td>amd64</td> + <td>amd64<br/>(x86-64, x64)</td> <td><a href="&url.rel;/amd64/amd64/&rel.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">[ISO]</a></td> </tr> @@ -122,7 +122,7 @@ </tr> <tr> <td></td> - <td>amd64</td> + <td>amd64<br/>(x86-64, x64)</td> <td><a href="&url.rel;/amd64/&rel2.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> @@ -144,6 +144,7 @@ <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> + <!-- <tr> <td colspan="2">FreeBSD &rel3.current;-RELEASE</td> <td colspan="2"></td> @@ -154,28 +155,29 @@ </tr> <tr> <td></td> - <td>amd64</td> - <!-- <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> --> + <td>amd64<br/>(x86-64, x64)</td> + <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> <td colspan="2" align="right"><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>i386</td> - <!-- <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> --> + <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> <td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>pc98</td> - <!-- <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> --> + <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> <td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>sparc64</td> - <!-- <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> --> + <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td> <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> + --> </tbody> </table> diff --git a/ja_JP.eucJP/share/xml/navibar.l10n.ent b/ja_JP.eucJP/share/xml/navibar.l10n.ent index b7c68e8a2f..84090a8cbe 100644 --- a/ja_JP.eucJP/share/xml/navibar.l10n.ent +++ b/ja_JP.eucJP/share/xml/navibar.l10n.ent @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='euc-jp'?> <!-- $FreeBSD$ --> <!-- The FreeBSD Japanese Documentation Project --> -<!-- Original revision: r39773 --> +<!-- Original revision: r41115 --> <!ENTITY nav.about ' <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav"> @@ -99,9 +99,9 @@ <li><a href="&base;/releases/">¥ê¥ê¡¼¥¹¾ðÊó</a> <ul> <li>¥×¥í¥À¥¯¥·¥ç¥ó¥ê¥ê¡¼¥¹: <br /> - <a href="&u.rel.announce;">&rel.current;</a> <a href="&u.rel2.announce;">&rel2.current;</a></li> + <a href="&u.rel.announce;">&rel.current;</a></li> <li>¥×¥í¥À¥¯¥·¥ç¥ó (µìÈÇ) ¥ê¥ê¡¼¥¹:<br /> - <a href="&u.rel3.announce;">&rel3.current;</a></li> + <a href="&u.rel2.announce;">&rel2.current;</a></li> <!-- <li><a href="&base;/snapshots/">¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥ê¥ê¡¼¥¹</a></li> --> &beta.listitem; &beta2.listitem; diff --git a/ja_JP.eucJP/share/xml/news.xml b/ja_JP.eucJP/share/xml/news.xml index 9637edad35..720a402ca1 100644 --- a/ja_JP.eucJP/share/xml/news.xml +++ b/ja_JP.eucJP/share/xml/news.xml @@ -20,7 +20,7 @@ the contents of <title> will be preferred over <p>. $FreeBSD$ - Original revision: r40933 + Original revision: r41225 --> <news> <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> @@ -31,6 +31,55 @@ <name>2013</name> <month> + <name>3</name> + + <day> + <name>14</name> + + <event> + <title>The &os; Foundation ¤Ë¿·¤·¤¯¥Æ¥¯¥Ë¥«¥ë¥¹¥¿¥Ã¥Õ¤¬²Ã¤ï¤ê¤Þ¤·¤¿ + (Konstantin Belousov)</title> + + <p>The &os; Foundation ¤Ï¡¢ + Konstantin Belousov ¤ò½é¤á¤Æ¤Î¥Õ¥ë¥¿¥¤¥à¤Î¥Æ¥¯¥Ë¥«¥ë¥¹¥¿¥Ã¥Õ¤È¤·¤Æ¸ÛÍѤ·¤¿¤³¤È¤ò¤ªÃΤ餻¤·¤Þ¤¹¡£ + ¤³¤ì¤Ï¡¢2013 ǯ¤Î¥¹¥¿¥Ã¥Õ¤ËÂФ¹¤ë Foundation + ¤ÎÅê»ñ¤ÎÃæ¤Ç½ÅÂç¤Ê½ÐÍè»ö¤Ç¤¹¡£</p> + + <p><a + href="http://freebsdfoundation.blogspot.com/2013/03/foundation-announces-new-technical.html">³¤¤òÆɤà</a></p> + </event> + </day> + + <day> + <name>12</name> + + <event> + <p><a href="mailto:bdrewery@FreeBSD.org">Bryan Drewery</a> + ¤¬¡¢¿·¤·¤¯ Ports Management ¥Á¡¼¥à¤Î¥á¥ó¥Ð¡¼¤Ë²Ã¤ï¤ê¤Þ¤·¤¿¡£</p> + </event> + </day> + + <day> + <name>3</name> + + <event> + <title>³«È¯¿ÊĽ¥ì¥Ý¡¼¥È (2012 ǯ 10 ·î - 12 ·î) ¸ø³«</title> + + <p>2012 ǯ 10 ·î ¤«¤é 12 ·î¤Î³«È¯¿ÊĽ¥ì¥Ý¡¼¥È (27 ¥¨¥ó¥È¥ê) ¤¬ <a + href="&enbase;/news/status/report-2012-10-2012-12.html">¸ø³«</a> + ¤µ¤ì¤Þ¤·¤¿¡£</p> + </event> + <event> + <title>³«È¯¿ÊĽ¥ì¥Ý¡¼¥È (2012 ǯ 7 ·î - 9 ·î) ¸ø³«</title> + + <p>2012 ǯ 7 ·î ¤«¤é 9 ·î¤Î³«È¯¿ÊĽ¥ì¥Ý¡¼¥È (12 ¥¨¥ó¥È¥ê) ¤¬ <a + href="&enbase;/news/status/report-2012-07-2012-09.html">¸ø³«</a> + ¤µ¤ì¤Þ¤·¤¿¡£</p> + </event> + </day> + </month> + + <month> <name>2</name> <day> @@ -41,6 +90,16 @@ <a href="mailto:pclin@FreeBSD.org">Po-Chien Lin</a> (ports)</p> </event> </day> + + <day> + <name>1</name> + + <event> + <p>¿·¥³¥ß¥Ã¥¿½¢Ç¤: + <a href="mailto:tmseck@FreeBSD.org">Thomas-Martin Seck</a> (ports)</p> + </event> + </day> + </month> <month> @@ -212,6 +271,11 @@ <p>PC-BSD ¥Á¡¼¥à¤«¤é PC-BSD 9.1 ¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤Þ¤·¤¿ (<a href="http://blog.pcbsd.org/2012/12/pc-bsd-9-1-now-available/">¥¢¥Ê¥¦¥ó¥¹</a>)¡£</p> </event> + + <event> + <p>¿·¥³¥ß¥Ã¥¿½¢Ç¤: + <a href="mailto:smh@FreeBSD.org">Steven Hartland</a> (src)</p> + </event> </day> <day> diff --git a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml index d001f63c9d..a0188faa3b 100644 --- a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40601 + Original revision 41064 $FreeBSD$ --> @@ -56,10 +56,6 @@ </listitem> <listitem> - <para>PLIP-ÑÑÑ€ хоёр компьютерийг Ñ…ÑрхÑн холбох талаар.</para> - </listitem> - - <listitem> <para>FreeBSD машин дÑÑÑ€ IPv6-г Ñ…ÑрхÑн тохируулах талаар.</para> </listitem> @@ -807,23 +803,6 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting> болох юм.</para> </note> - <para>&os; 7.X дÑÑÑ€ төхөөрөмжийн драйверийн хувьд түүний шаарддаг - 802.11 ÑүлжÑÑний дÑмжлÑгийг Ð±Ð°Ñ Ð¾Ñ€ÑƒÑƒÐ»Ð°Ñ… Ñ…ÑÑ€ÑгтÑй болно. &man.ath.4; - драйверийн хувьд ÑÐ½Ñ Ð½ÑŒ Ñдахдаа &man.wlan.4;, - <literal>wlan_scan_ap</literal> болон <literal>wlan_scan_sta</literal> - модулиуд байх бөгөөд &man.wlan.4; модуль нь утаÑгүй төхөөрөмжийн драйвертай - цуг автоматаар дуудагддаг ба үлдÑÑн модулиуд нь <filename>/boot/loader.conf</filename> - файлын туÑламжтайгаар ачаалах үед дуудагдах Ñ‘Ñтой:</para> - - <programlisting>wlan_scan_ap_load="YES" -wlan_scan_sta_load="YES"</programlisting> - - <note> - <para>&os; 8.0-Ñ ÑхлÑн ÑдгÑÑÑ€ модулиуд нь - үндÑÑн &man.wlan.4; драйверын Ñ…ÑÑÑг болÑон бөгөөд адаптерийн драйвертай - цуг динамикаар ачаалагддаг.</para> - </note> - <para>ҮүнтÑй цуг таны ашиглах аюулгүй байдлын протоколуудад зориулагдÑан криптографын дÑмжлÑгийг хийдÑг модулиуд Ñ…ÑÑ€ÑгтÑй болно. ÐдгÑÑÑ€ нь &man.wlan.4; модулиар автоматаар шаардлагын дагуу дуудагддаг байхаар зориулагдÑан боловч одоохондоо ÑдгÑÑрийг гараар @@ -859,14 +838,6 @@ device ath_hal # pci/cardbus chip support options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath</programlisting> - - <para>Дараах хоёр мөрийг - &os; 7.X шаарддаг бөгөөд, &os;-ийн буÑад хувилбарууд - Ñ‚ÑдгÑÑрийг шаарддаггүй:</para> - - <programlisting>device wlan_scan_ap # 802.11 AP mode scanning -device wlan_scan_sta # 802.11 STA mode scanning</programlisting> - <para>Цөмийн тохиргооны файлдаа ийм мÑдÑÑлÑлтÑйгÑÑÑ€ цөмөө дахин ÑмхÑтгÑÑд өөрийн &os; машиныг дахин ачаалах Ñ…ÑÑ€ÑгтÑй.</para> </note> @@ -912,20 +883,6 @@ freebsdap 00:11:95:c3:0d:ac 1 54M -83:96 100 EPS WPA</screen> up болгож Ñ‚ÑмдÑглÑхийг шаарддаггүй.</para> </note> - <note> - <para>&os; 7.X дÑÑÑ€ адаптер төхөөрөмж, жишÑÑ Ð½ÑŒ - <devicename><replaceable>ath0</replaceable></devicename> - нь <devicename>wlan<replaceable>0</replaceable></devicename> төхөөрөмжийн оронд - шууд ашиглагддаг. Өмнөх хоёр мөрийг дараах байдлаар - өөрчлөхийг шаарддаг:</para> - - <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput></screen> - - <para>ÐÐ½Ñ Ð±Ð°Ñ€Ð¸Ð¼Ñ‚Ñ‹Ð½ үлдÑÑн Ñ…ÑÑÑгт &os; 7.X-ийн Ñ…ÑÑ€ÑглÑгчид - ÑÐ½Ñ Ñхемийн дагуу тушаал болон тохиргооны мөрүүдийг Ñольж - ашиглах Ñ‘Ñтой.</para> - </note> - <para>Хайлтын Ñ…Ò¯ÑÑлтийн гаралт олÑон BSS/IBSS ÑүлжÑÑ Ð±Ò¯Ñ€Ð¸Ð¹Ð³ харуулдаг. СүлжÑÑний нÑÑ€ <literal>SSID</literal>-Ñ Ð³Ð°Ð´Ð½Ð° хандалтын цÑгийн MAC хаÑг болох <literal>BSSID</literal>-г @@ -1021,13 +978,6 @@ freebsdap 00:11:95:c3:0d:ac 1 54M -83:96 100 EPS WPA</screen> <programlisting>ifconfig_ath0="wlan0" ifconfig_wlan0="DHCP"</programlisting> - <note> - <para>Өмнө дурдÑаны адил &os; 7.X нь - адаптер төхөөрөмжтÑй холбоотой мөрийг шаарддаг:</para> - - <programlisting>ifconfig_ath0="DHCP"</programlisting> - </note> - <para>Ð¥ÑÑ€Ñв олон хандалтын цÑгүүд байгаа бөгөөд та тухайн нÑгийг Ñонгохыг Ñ…Ò¯ÑвÑл түүнийг SSID-аар нь Ñонгож болно:</para> @@ -1120,7 +1070,7 @@ ifconfig_wlan0="DHCP"</programlisting> <para>ÐÐ½Ñ Ñ…Ò¯Ñ€ÑÑ…Ñд та утаÑгүй интерфÑйÑÑÑ Ð°Ð¶Ð¸Ð»Ð»ÑƒÑƒÐ»Ð°Ñ…Ð°Ð´ бÑлÑн байх болно:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput></screen> + <screen>&prompt.root; <userinput>service netif start</userinput></screen> <para>ИнтерфÑÐ¹Ñ Ð°Ð¶Ð¸Ð»Ð»Ð°Ð¶ ÑÑ…ÑлÑний дараа <devicename>ath0</devicename> интерфÑйÑийн төлөвийг үзÑхийн тулд <command>ifconfig</command> @@ -1231,7 +1181,7 @@ ifconfig_wlan0="WPA DHCP"</programlisting> <para>Дараа нь бид интерфÑйÑийг боÑгож ажиллуулна:</para> - <screen>&prompt.root; <userinput><filename>/etc/rc.d/netif</filename> start</userinput> + <screen>&prompt.root; <userinput><filename>service netif</filename> start</userinput> Starting wpa_supplicant. DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5 DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6 @@ -1295,131 +1245,7 @@ wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 Ñтанцыг таниулж нÑвтрүүлÑний дараа та Ñтатик IP хаÑг тохируулж болно:</para> - <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.100</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput> -&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput> -wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 - ether 00:11:95:d5:43:62 - inet 192.168.0.100 netmask 0xffffff00 broadcast 192.168.0.255 - media: IEEE 802.11 Wireless Ethernet OFDM/36Mbps mode 11g - status: associated - ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac - country US ecm authmode WPA2/802.11i privacy ON deftxkey UNDEF - AES-CCM 3:128-bit txpower 21.5 bmiss 7 scanvalid 450 bgscan - bgscanintvl 300 bgscanidle 250 roam:rssi 7 roam:rate 5 protmode CTS - wme burst roaming MANUAL</screen> - - <para>DHCP Ñервер ашиглагдаагүй үед та анхдагч гарц болон - нÑрийн Ñерверийг гараар Ð±Ð°Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€ÑƒÑƒÐ»Ð°Ñ… Ñ…ÑÑ€ÑгтÑй болно:</para> - - <screen>&prompt.root; <userinput>route add default <replaceable>your_default_router</replaceable></userinput> -&prompt.root; <userinput>echo "nameserver <replaceable>your_DNS_server</replaceable>" >> /etc/resolv.conf</userinput></screen> - </sect5> - - <sect5 id="network-wireless-wpa-eap-tls"> - <title>EAP-TLS-Ñ‚Ñй WPA</title> - - <para>WPA-г ашиглах хоёр дахь арга нь 802.1X арын нÑвтрÑлт танилтын - ÑервертÑй цуг ашиглах Ñвдал юм. ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ð¾Ð»Ð´Ð¾Ð»Ð´ WPA-г - урьдчилан хуваалцÑан түлхүүр бүхий аюулгүй байдлын хувьд арай дутуу WPA-Personal-Ñ - Ñлгахын тулд WPA-Enterprise гÑдÑг. WPA-Enterprise дахь - нÑвтрÑлт танилт нь Extensible Authentication Protocol (EAP) - буюу өргөтгөÑөн нÑвтрÑлт танилтын протокол) дÑÑÑ€ Ñуурилдаг.</para> - - <para>EAP нь шифрлÑлтийн аргагүй ирдÑг бөгөөд харин шифрлÑгдÑÑн туннелийн - дотор EAP-ийг Ñуулгахаар шийдÑÑн байдаг. EAP нÑвтрÑлт танилтын - олон төрлүүд байдаг бөгөөд хамгийн түгÑÑмÑл аргууд нь EAP-TLS, EAP-TTLS - болон EAP-PEAP юм.</para> - - <para>EAP-TLS (EAP with Transport Layer Security) нь - <ulink url="http://www.wi-fi.org/">Wi-Fi alliance</ulink>-Ð°Ð°Ñ - хамгийн түрүүнд батламжлагдÑан EAP арга бөгөөд утаÑгүй ертөнц дÑÑ… - маш Ñайн дÑмжигдÑÑн нÑвтрÑлт танилтын протокол юм. EAP-TLS нь - ажиллахын тулд гурван Ñертификат шаарддаг: ÑдгÑÑÑ€ нь CA Ñертификат (бүх машин - дÑÑÑ€ ÑуулгагдÑан), таны нÑвтрÑлт танилтын Ñерверт зориулÑан Ñертификат, - утаÑгүй клиент бүрд зориулÑан клиентийн Ñертификат юм. ÐÐ½Ñ - EAP арга дÑÑÑ€ нÑвтрÑлт танилтын Ñервер болон утаÑгүй клиент нь - Ó©Ó©Ñ€ Ó©Ó©Ñ€Ñдийн Ñертификатыг бие биендÑÑ Ò¯Ð·Ò¯Ò¯Ð»Ð¶ нÑг нÑгнийгÑÑ - танин нÑвтрүүлдÑг бөгөөд Ñ‚Ñд ÑдгÑÑÑ€ Ñертификатыг танай байгууллагын - Ñертификатын удирдлага (CA) олгож баталгаажуулÑан болохыг - шалгадаг.</para> - - <para>Урьдын адил тохиргоог <filename>/etc/wpa_supplicant.conf</filename> - файлаар хийнÑ:</para> - - <programlisting>network={ - ssid="freebsdap" <co id="co-tls-ssid"/> - proto=RSN <co id="co-tls-proto"/> - key_mgmt=WPA-EAP <co id="co-tls-kmgmt"/> - eap=TLS <co id="co-tls-eap"/> - identity="loader" <co id="co-tls-id"/> - ca_cert="/etc/certs/cacert.pem" <co id="co-tls-cacert"/> - client_cert="/etc/certs/clientcert.pem" <co id="co-tls-clientcert"/> - private_key="/etc/certs/clientkey.pem" <co id="co-tls-pkey"/> - private_key_passwd="freebsdmallclient" <co id="co-tls-pwd"/> -}</programlisting> - - <calloutlist> - <callout arearefs="co-tls-ssid"> - <para>ÐÐ½Ñ Ñ‚Ð°Ð»Ð±Ð°Ñ€ нь ÑүлжÑÑний нÑрийг заана - (SSID).</para> - </callout> - - <callout arearefs="co-tls-proto"> - <para>Ðнд бид RSN (&ieee; 802.11i) протоколыг ашиглана, Ó©Ó©Ñ€Ó©Ó©Ñ€ Ñ…ÑлбÑл, - WPA2.</para> - </callout> - - <callout arearefs="co-tls-kmgmt"> - <para><literal>key_mgmt</literal> мөр нь бидний ашиглах - түлхүүр удирдах протоколыг заана. Бидний тохиолдолд ÑÐ½Ñ Ð½ÑŒ EAP - нÑвтрÑлт танилтыг ашиглаж байгаа WPA юм: - <literal>WPA-EAP</literal>.</para> - </callout> - - <callout arearefs="co-tls-eap"> - <para>ÐÐ½Ñ Ñ‚Ð°Ð»Ð±Ð°Ñ€Ñ‚ бид Ó©Ó©Ñ€Ñдийн холболтдоо зориулж EAP - аргыг заана.</para> - </callout> - - <callout arearefs="co-tls-id"> - <para><literal>identity</literal> талбар нь EAP-ийг таниулах - мөрийг агуулна.</para> - </callout> - - <callout arearefs="co-tls-cacert"> - <para><literal>ca_cert</literal> талбар нь CA Ñертификат - файлын замыг заана. ÐÐ½Ñ Ñ„Ð°Ð¹Ð» нь Ñерверийн Ñертификатыг шалгахад - Ñ…ÑÑ€ÑгтÑй.</para> - </callout> - - <callout arearefs="co-tls-clientcert"> - <para><literal>client_cert</literal> шугам клиентийн - Ñертификатын файлын замыг өгнө. ÐÐ½Ñ Ñертификат нь ÑүлжÑÑний - утаÑгүй клиент бүрийн хувьд давтагдашгүй байна.</para> - </callout> - - <callout arearefs="co-tls-pkey"> - <para><literal>private_key</literal> талбар нь - клиентийн Ñертификатын хувийн түлхүүрийн файлын замын нÑÑ€ - юм.</para> - </callout> - - <callout arearefs="co-tls-pwd"> - <para><literal>private_key_passwd</literal> талбар нь - хувийн түлхүүрийн нÑвтрÑÑ… үгийг агуулдаг.</para> - </callout> - </calloutlist> - - <para>ТÑгÑÑд дараах мөрүүдийг - <filename>/etc/rc.conf</filename> файлд нÑмнÑ:</para> - - <programlisting>wlans_ath0="wlan0" -ifconfig_wlan0="WPA DHCP"</programlisting> - - <para>Дараагийн алхам нь <filename>rc.d</filename> боломжийн - туÑламжтай интерфÑйÑийг боÑгож ажиллуулах Ñвдал юм:</para> - - <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput> + <screen>&prompt.root; <userinput>service netif start</userinput> Starting wpa_supplicant. DHCPREQUEST on wlan0 to 255.255.255.255 port 67 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 @@ -1507,7 +1333,7 @@ ifconfig_wlan0="WPA DHCP"</programlisting> <para>Дараагийн алхам бол интерфÑйÑийг боÑгож ажиллуулах Ñвдал юм:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput> + <screen>&prompt.root; <userinput>service netif start</userinput> Starting wpa_supplicant. DHCPREQUEST on wlan0 to 255.255.255.255 port 67 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 @@ -1911,7 +1737,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting> <para>Дараагийн алхам нь <application>hostapd</application>-г ÑхлүүлÑÑ…:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen> + <screen>&prompt.root; <userinput>service hostapd forcestart</userinput></screen> <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput> wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290 @@ -2117,13 +1943,13 @@ ubt0: Interface 0 endpoints: interrupt=0x81, bulk-in=0x82, bulk-out=0x2 ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3, wMaxPacketSize=49, nframes=6, buffer size=294</screen> - <para><filename>/etc/rc.d/bluetooth</filename> Ñкрипт нь + <para>&man.service.8; нь Bluetooth Ñтекийг ÑхлүүлÑÑ… болон зогÑооход Ñ…ÑÑ€ÑглÑгддÑг. Төхөөрөмжийг ÑалгахааÑаа өмнө Ñтекийг зогÑоох нь зөв байдаг, гÑхдÑÑ ÑÐ½Ñ Ð½ÑŒ (ихÑвчлÑн) Ñүйрлийн биш байдаг. Стекийг Ñхлүүлж байхад доор дурдÑантай Ñ‚Ó©ÑÑ‚Ñй гаралтыг та хүлÑÑн авах болно:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/bluetooth start ubt0</userinput> + <screen>&prompt.root; <userinput>service bluetooth start ubt0</userinput> BD_ADDR: 00:02:72:00:d4:1a Features: 0xff 0xff 0xf 00 00 00 00 00 <3-Slot> <5-Slot> <Encryption> <Slot offset> @@ -2448,7 +2274,7 @@ Bluetooth Profile Descriptor List: <para>Дараа нь <application>sdpd</application> дÑмонг ингÑж Ñхлүүлж болно:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/sdpd start</userinput></screen> + <screen>&prompt.root; <userinput>service sdpd start</userinput></screen> <para>ÐлÑын клиентүүдÑд Bluetooth үйлчилгÑÑг үзүүлÑхийг Ñ…Ò¯ÑÑÑн локал Ñерверийн програм нь үйлчилгÑÑг SDP дÑмонд бүртгÑÑ… болно. Ийм програмуудын нÑг нь @@ -3814,7 +3640,7 @@ margaux:ha=0123456789ab:tc=.def100</programlisting> <filename>/etc/rc.conf</filename> файлд <option>inetd_enable="YES"</option> тохируулга заагдÑан байх Ñ‘Ñтой:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/inetd restart</userinput></screen> + <screen>&prompt.root; <userinput>service inetd restart</userinput></screen> </step> </procedure> @@ -3846,7 +3672,7 @@ margaux:ha=0123456789ab:tc=.def100</programlisting> дахин уншихыг Ñ…ÑлнÑ. Ð¥ÑÑ€Ñв та Ñхний шатандаа <acronym>NFS</acronym>-г <filename>/etc/rc.conf</filename> файлд идÑвхжүүлÑÑ… Ñ…ÑÑ€ÑгтÑй болÑон бол харин дахин ачаалахыг Ñ…Ò¯ÑÑж болох юм.</para> - <screen>&prompt.root; <userinput>/etc/rc.d/mountd restart</userinput></screen> + <screen>&prompt.root; <userinput>service mountd restart</userinput></screen> </step> </procedure> @@ -4067,7 +3893,7 @@ cd /usr/src/etc; make distribution</programlisting> <step> <para>NFS Ñерверийг дахин аÑаана:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/nfsd restart</userinput></screen> + <screen>&prompt.root; <userinput>service nfsd restart</userinput></screen> </step> <step> @@ -4085,7 +3911,7 @@ cd /usr/src/etc; make distribution</programlisting> <step> <para>inetd-г дахин аÑаана:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/inetd restart</userinput></screen> + <screen>&prompt.root; <userinput>service inetd restart</userinput></screen> </step> <step> @@ -4969,235 +4795,6 @@ redirect_port tcp 192.168.0.3:80 80</programlisting> </sect2> </sect1> - <sect1 id="network-plip"> - <title>Parallel Line IP (PLIP) буюу ЗÑÑ€ÑгцÑÑ Ð¨ÑƒÐ³Ð°Ð¼Ñ‹Ð½ IP</title> - - <indexterm><primary>PLIP</primary></indexterm> - <indexterm> - <primary>Parallel Line IP</primary> - <see>PLIP</see> - </indexterm> - - <para>PLIP нь параллел буюу зÑÑ€ÑгцÑÑ Ð¿Ð¾Ñ€Ñ‚ÑƒÑƒÐ´Ñ‹Ð½ хооронд TCP/IP ажиллуулах - боломж олгодог. ÐÐ½Ñ Ð½ÑŒ ÑүлжÑÑний картгүй машинууд дÑÑÑ€ ÑÑвÑл зөөврийн компьютер - дÑÑÑ€ Ñуулгахад ашигтай байдаг. ÐÐ½Ñ Ñ…ÑÑÑгт бид дараах зүйлÑийг Ñ…ÑлÑлцÑÑ… - болно:</para> - - <itemizedlist> - <listitem> - <para>ЗÑÑ€ÑгцÑÑ (laplink) кабелийг хийх.</para> - </listitem> - - <listitem> - <para>PLIP-ÑÑÑ€ хоёр компьютерийг холбох.</para> - </listitem> - </itemizedlist> - - <sect2 id="network-create-parallel-cable"> - <title>ЗÑÑ€ÑгцÑÑ ÐºÐ°Ð±ÐµÐ»Ð¸Ð¹Ð³ хийх</title> - - <para>Та зÑÑ€ÑгцÑÑ ÐºÐ°Ð±ÐµÐ»Ð¸Ð¹Ð³ ихÑнх компьютерийн хангамжийн дÑлгүүрÑÑÑ Ñ…ÑƒÐ´Ð°Ð»Ð´Ð°Ð½ - авч болно. Ð¥ÑÑ€Ñв та Ñ‚Ñгж чадахгүй бол ÑÑвÑл та зүгÑÑÑ€ л Ñаж хийгддÑгийг мÑдÑхийг - Ñ…Ò¯ÑÑж байгаа бол дараах Ñ…Ò¯ÑнÑгт нь ердийн зÑÑ€ÑгцÑÑ Ñ…ÑвлÑгчийн ÐºÐ°Ð±ÐµÐ»Ð¸Ð°Ñ - тийм кабель Ñ…ÑрхÑн хийхийг харуулж байна.</para> - - <table frame="none"> - <title>СүлжÑÑнд зориулж зÑÑ€ÑгцÑÑ ÐºÐ°Ð±ÐµÐ»ÑŒ хийх нь</title> - - <tgroup cols="5"> - <thead> - <row> - <entry>A-нÑÑ€</entry> - - <entry>A-ТөгÑгөл</entry> - - <entry>B-ТөгÑгөл</entry> - - <entry>Тайлбар</entry> - - <entry>Post/Bit</entry> - </row> - </thead> - - <tbody> - <row> - <entry><literallayout>DATA0 --ERROR</literallayout></entry> - - <entry><literallayout>2 -15</literallayout></entry> - - <entry><literallayout>15 -2</literallayout></entry> - - <entry>Өгөгдөл</entry> - - <entry><literallayout>0/0x01 -1/0x08</literallayout></entry> - </row> - - <row> - <entry><literallayout>DATA1 -+SLCT</literallayout></entry> - - <entry><literallayout>3 -13</literallayout></entry> - - <entry><literallayout>13 -3</literallayout></entry> - - <entry>Өгөгдөл</entry> - - <entry><literallayout>0/0x02 -1/0x10</literallayout></entry> - </row> - - <row> - <entry><literallayout>DATA2 -+PE</literallayout></entry> - - <entry><literallayout>4 -12</literallayout></entry> - - <entry><literallayout>12 -4</literallayout></entry> - - <entry>Өгөгдөл</entry> - - <entry><literallayout>0/0x04 -1/0x20</literallayout></entry> - </row> - - <row> - <entry><literallayout>DATA3 --ACK</literallayout></entry> - - <entry><literallayout>5 -10</literallayout></entry> - - <entry><literallayout>10 -5</literallayout></entry> - - <entry>Strobe</entry> - - <entry><literallayout>0/0x08 -1/0x40</literallayout></entry> - </row> - - <row> - <entry><literallayout>DATA4 -BUSY</literallayout></entry> - - <entry><literallayout>6 -11</literallayout></entry> - - <entry><literallayout>11 -6</literallayout></entry> - - <entry>Өгөгдөл</entry> - - <entry><literallayout>0/0x10 -1/0x80</literallayout></entry> - </row> - - <row> - <entry>GND</entry> - - <entry>18-25</entry> - - <entry>18-25</entry> - - <entry>GND</entry> - - <entry>-</entry> - </row> - </tbody> - </tgroup> - </table> - </sect2> - - <sect2 id="network-plip-setup"> - <title>PLIP-ийг тохируулах</title> - - <para>ÐхлÑÑд та laplink кабель олж авах Ñ…ÑÑ€ÑгтÑй. - Дараа нь хоёр компьютер хоёулаа &man.lpt.4; драйверийн - дÑмжлÑгтÑй цөмтÑй ÑÑÑхийг шалгаарай:</para> - - <screen>&prompt.root; <userinput>grep lp /var/run/dmesg.boot</userinput> -lpt0: <Printer> on ppbus0 -lpt0: Interrupt-driven port</screen> - - <para>ЗÑÑ€ÑгцÑÑ Ð¿Ð¾Ñ€Ñ‚ нь таÑалдлаар удирдагддаг порт байх Ñ‘Ñтой - бөгөөд та өөрийн <filename>/boot/device.hints</filename> - файлдаа доор дурдÑантай Ñ‚Ó©ÑÑ‚Ñй мөрүүдтÑй байх Ñ‘Ñтой:</para> - - <programlisting>hint.ppc.0.at="isa" -hint.ppc.0.irq="7"</programlisting> - - <para>Дараа нь цөмийн тохиргооны файлд <literal>device plip</literal> - мөр байгаа ÑÑÑÑ… ÑÑвÑл цөмийн <filename>plip.ko</filename> модуль - дуудагдÑан ÑÑÑхийг шалгана. Ðль ч тохиолдолд таныг &man.ifconfig.8; ашиглан - үзүүлÑÑ… үед зÑÑ€ÑгцÑÑ ÑүлжÑÑний интерфÑÐ¹Ñ Ð³Ð°Ñ€Ñ‡ ирÑÑ… Ñ‘Ñтой:</para> - - <screen>&prompt.root; <userinput>ifconfig plip0</userinput> -plip0: flags=8810<POINTOPOINT,SIMPLEX,MULTICAST> mtu 1500</screen> - - <para>Компьютер бүрийн зÑÑ€ÑгцÑÑ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÑÐ¹Ñ ÑƒÑ€ÑƒÑƒ laplink кабелиа - залгана.</para> - - <para>СүлжÑÑний интерфÑйÑийн өгөгдлүүдийг хоёр талын хоёулан дÑÑÑ€ - <username>root</username> Ñ…ÑÑ€ÑглÑгчÑÑÑ€ тохируулна. ЖишÑÑ Ð½ÑŒ Ñ…ÑÑ€Ñв та - <hostid>host1</hostid> хоÑтыг Ó©Ó©Ñ€ <hostid>host2</hostid> машинтай - холбохыг Ñ…Ò¯ÑвÑл:</para> - - <programlisting> host1 <-----> host2 -IP Address 10.0.0.1 10.0.0.2</programlisting> - - <para><hostid>host1</hostid> дÑÑрх интерфÑйÑийг доор дурдÑаныг хийж тохируулна:</para> - - <screen>&prompt.root; <userinput>ifconfig plip0 10.0.0.1 10.0.0.2</userinput></screen> - - <para><hostid>host2</hostid> дÑÑрх интерфÑйÑийг доор дурдÑаныг хийж тохируулна:</para> - - <screen>&prompt.root; <userinput>ifconfig plip0 10.0.0.2 10.0.0.1</userinput></screen> - - - <para>Та одоо ажилладаг холболттой болÑон байх Ñ‘Ñтой. ДÑлгÑÑ€Ñнгүй мÑдÑÑллийг - &man.lp.4; болон &man.lpt.4; гарын авлагын хуудаÑÐ½ÑƒÑƒÐ´Ð°Ð°Ñ ÑƒÐ½ÑˆÐ¸Ð½Ð° уу.</para> - - <para>Та хоёр хоÑтыг хоёуланг нь <filename>/etc/hosts</filename> файлд - нÑмÑÑ… Ñ…ÑÑ€ÑгтÑй:</para> - - <programlisting>127.0.0.1 localhost.my.domain localhost -10.0.0.1 host1.my.domain host1 -10.0.0.2 host2.my.domain host2</programlisting> - - <para>Холболт ажиллаж байгааг баталгаажуулахын тулд хоÑÑ‚ бүр уруу очоод - нөгөө тал уруу ping хийнÑ. ЖишÑÑ Ð½ÑŒ <hostid>host1</hostid> дÑÑÑ€:</para> - - <screen>&prompt.root; <userinput>ifconfig plip0</userinput> -plip0: flags=8851<UP,POINTOPOINT,RUNNING,SIMPLEX,MULTICAST> mtu 1500 - inet 10.0.0.1 --> 10.0.0.2 netmask 0xff000000 -&prompt.root; <userinput>netstat -r</userinput> -Routing tables - -Internet: -Destination Gateway Flags Refs Use Netif Expire -host2 host1 UH 0 0 plip0 -&prompt.root; <userinput>ping -c 4 host2</userinput> -PING host2 (10.0.0.2): 56 data bytes -64 bytes from 10.0.0.2: icmp_seq=0 ttl=255 time=2.774 ms -64 bytes from 10.0.0.2: icmp_seq=1 ttl=255 time=2.530 ms -64 bytes from 10.0.0.2: icmp_seq=2 ttl=255 time=2.556 ms -64 bytes from 10.0.0.2: icmp_seq=3 ttl=255 time=2.714 ms - ---- host2 ping statistics --- -4 packets transmitted, 4 packets received, 0% packet loss -round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen> - - </sect2> - </sect1> - <sect1 id="network-ipv6"> <sect1info> <authorgroup> diff --git a/mn_MN.UTF-8/books/handbook/audit/chapter.xml b/mn_MN.UTF-8/books/handbook/audit/chapter.xml index ff0b08b64c..772cfe350f 100644 --- a/mn_MN.UTF-8/books/handbook/audit/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/audit/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 39825 + Original revision 40792 $FreeBSD$ --> @@ -209,7 +209,7 @@ requirements. --> <para>ТÑгÑÑд ÑиÑтемийг дахин ачаалах замаар ÑÑвÑл гараар аудит дÑмонг ажиллуулах замаар аудит дÑмжлÑгийг ÑхлүүлÑÑ… Ñ‘Ñтой:</para> - <programlisting>/etc/rc.d/auditd start</programlisting> + <programlisting>service auditd start</programlisting> </sect1> <sect1 id="audit-config"> diff --git a/mn_MN.UTF-8/books/handbook/book.xml b/mn_MN.UTF-8/books/handbook/book.xml index 3c1ca07945..0b43e34a57 100644 --- a/mn_MN.UTF-8/books/handbook/book.xml +++ b/mn_MN.UTF-8/books/handbook/book.xml @@ -10,7 +10,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40585 + Original revision 40979 $FreeBSD$ --> @@ -24,6 +24,8 @@ <pubdate>1999 оны хоёрдугаар Ñар</pubdate> + <releaseinfo>$FreeBSD$</releaseinfo> + <copyright> <year>1995</year> <year>1996</year> @@ -68,7 +70,6 @@ &tm-attrib.adaptec; &tm-attrib.adobe; &tm-attrib.apple; - &tm-attrib.corel; &tm-attrib.creative; &tm-attrib.cvsup; &tm-attrib.heidelberger; diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml index d9946e1dfc..c67357e54c 100644 --- a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40526 + Original revision 40684 $FreeBSD$ --> diff --git a/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml index 8adb49090f..dada064b30 100644 --- a/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40601 + Original revision 40876 $FreeBSD$ --> @@ -371,7 +371,7 @@ Elapsed Times for processes csh, агуулдаг. ÐÐ½Ñ Ñ…Ñл нь &sun;-ийн баримтаар <quote>D Ñ…Ñл</quote> гÑгддÑг бөгөөд C++ Ñ…ÑлтÑй тун Ñ‚Ó©ÑÑ‚Ñй юм. ÐÐ½Ñ Ñ…Ñлний талаарх гүнзгий Ñ…ÑлÑлцүүлÑг нь ÑÐ½Ñ Ð±Ð°Ñ€Ð¸Ð¼Ñ‚Ð°Ð°Ñ Ñ…Ò¯Ñ€ÑÑнÑÑÑ Ð³Ð°Ð´Ð½Ð° юм. ÐÐ½Ñ Ð½ÑŒ - <ulink url="http://wikis.sun.com/display/DTrace/Documentation"></ulink> + <ulink url="http://wikis.oracle.com/display/DTrace/Documentation"></ulink> хаÑг дÑÑÑ€ дÑлгÑÑ€Ñнгүй Ñ…ÑлÑлцÑгдÑÑн байдаг.</para> </sect1> </chapter> diff --git a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml index 5c58169935..0e7de5ff85 100644 --- a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml @@ -3,7 +3,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40628 + Original revision 41167 $FreeBSD$ --> @@ -91,7 +91,7 @@ <row> <entry>&a.announce.name;</entry> - <entry>Чухал үйл Ñвдлууд болон Ñ‚Ó©Ñлийн гол гол үе шатууд</entry> + <entry>Чухал үйл Ñвдлууд болон Ñ‚Ó©Ñлийн гол гол үе шатууд (зохицуулалттай)</entry> </row> <row> @@ -143,7 +143,7 @@ <row> <entry>&a.security-notifications.name;</entry> - <entry>Ðюулгүй байдлын мÑдÑгдлүүд</entry> + <entry>Ðюулгүй байдлын мÑдÑгдлүүд (зохицуулалттай)</entry> </row> <row> @@ -192,7 +192,7 @@ <row> <entry>&a.amd64.name;</entry> - <entry>FreeBSD-г AMD64 ÑиÑтемүүд уруу хөрвүүлÑÑ…</entry> + <entry>FreeBSD-г AMD64 ÑиÑтемүүд уруу хөрвүүлÑÑ… (зохицуулалттай)</entry> </row> <row> @@ -428,7 +428,7 @@ <row> <entry>&a.ports-announce.name;</entry> - <entry>Портын цуглуулгын тухай чухал мÑдÑÑнүүд болон зааврууд</entry> + <entry>Портын цуглуулгын тухай чухал мÑдÑÑнүүд болон зааврууд (зохицуулалттай)</entry> </row> <row> @@ -594,11 +594,6 @@ </row> <row> - <entry>&a.vendors.name;</entry> - <entry>ҮйлдвÑрлÑгчдийн урьдчилÑан хувилбарын зохицуулалт</entry> - </row> - - <row> <entry>&a.wip-status.name;</entry> <entry>FreeBSD-ийн Work-In-Progress буюу хийгдÑж байгаа ажлуудын төлөв</entry> </row> @@ -608,11 +603,6 @@ <entry>802.11 Ñтек, Ñ…ÑÑ€ÑгÑлүүд, драйверын хөгжүүлÑлтийн талаарх Ñ…ÑлÑлцүүлÑг</entry> </row> - - <row> - <entry>&a.www.name;</entry> - <entry><ulink url="&url.base;/index.html">www.FreeBSD.org</ulink>-ийн арчлагчид</entry> - </row> </tbody> </tgroup> </informaltable> @@ -1417,6 +1407,23 @@ </listitem> </varlistentry> + <varlistentry> + <term>&a.ops-announce.name;</term> + + <listitem> + <para><emphasis>ТөÑлийн дÑд бүтцийн талаарх + мÑдÑÑлÑл</emphasis></para> + + <para>ÐÐ½Ñ Ð·Ð°Ñ…Ð¸Ð´Ð»Ñ‹Ð½ жагÑаалт нь FreeBSD.org Ñ‚Ó©Ñлийн + дÑд бүтÑцтÑй холбоотой аÑуудлууд болон өөрчлөлтүүдийг + ÑонирхÑон хүмүүÑÑ‚ зориулагдÑан.</para> + + <para>ÐÐ½Ñ Ð·Ð¾Ñ…Ð¸Ñ†ÑƒÑƒÐ»Ð°Ð³Ð´Ñан жагÑаалт зөвхөн мÑдÑÑлÑл, зард зориулагдÑан + бөгөөд хариулт, Ñ…Ò¯ÑÑлт, Ñ…ÑлÑлцүүлÑг болон Ñанал бодолд + зориулагдаагүй.</para> + </listitem> + </varlistentry> + <varlistentry> <term>&a.performance.name;</term> @@ -1728,18 +1735,6 @@ </varlistentry> <varlistentry> - <term>&a.vendors.name;</term> - - <listitem> - <para><emphasis>ҮйлдвÑрлÑгчид</emphasis></para> - - <para>FreeBSD Ñ‚Ó©Ñөл болон FreeBSD-д зориулÑан програм хангамж ба - тоног төхөөрөмжийн үйлдвÑрлÑгчдийн хоорондох Ñ…ÑлÑлцүүлгүүдийн - зохицуулалт.</para> - </listitem> - </varlistentry> - - <varlistentry> <term>&a.virtualization.name;</term> <listitem> diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml index d32fd6c8e6..a027f95f5a 100644 --- a/mn_MN.UTF-8/books/handbook/install/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40601 + Original revision 41160 $FreeBSD$ --> @@ -578,10 +578,8 @@ <para>FreeBSD Ñуулгац нь таны компьютер ачаалах үед ÑÑ…ÑлдÑг— ÑÐ½Ñ Ð½ÑŒ Ó©Ó©Ñ€ үйлдлийн ÑиÑтемÑÑÑ ÑхлүүлдÑг програм биш. Таны компьютер ердийн үед хатуу диÑкÑн дÑÑÑ€ ÑуугдÑан үйлдлийн - ÑиÑтемÑÑÑ€ ÑхлÑж ачаалагддаг. ГÑхдÑÑ Ò¯Ò¯Ð½Ð¸Ð¹Ð³ Ð±Ð°Ñ - <quote>ачаалагдаж болдог</quote> уÑн диÑкнÑÑÑ Ñхлүүлж болохоор - тохируулж болдог. Орчин үеийн ихÑнх компьютерууд CDROM дотор буй - CDROM диÑк ÑÑвÑл USB диÑкнÑÑÑ ÑхлÑн ачаалагдаж чаддаг.</para> + ÑиÑтемÑÑÑ€ ÑхлÑж ачаалагддаг. ГÑхдÑÑ CDROM диÑк ÑÑвÑл USB диÑкнÑÑÑ + ÑхлÑн ачаалагдагдахаар тохируулж Ð±Ð°Ñ Ð±Ð¾Ð»Ð´Ð¾Ð³.</para> <tip> <para>Ð¥ÑÑ€Ñв та FreeBSD-г CDROM ÑÑвÑл DVD дÑÑÑ€ (худалдаж авÑан юм уу @@ -701,38 +699,21 @@ </step> </procedure> - <para>Ðчаалагдаж болдог уÑн диÑк бÑлдÑхийн тулд дараах алхмыг гүйцÑтгÑнÑ:</para> + <para>&os;/&arch.pc98;-д зориулж ачаалагдаж болдог уÑн диÑк бÑлдÑхийн тулд дараах алхмыг гүйцÑтгÑнÑ:</para> <procedure> <step> <title>Ðчаалагддаг уÑн диÑкний Image буюу Ð´Ò¯Ñ€Ñ Ñ„Ð°Ð¹Ð»Ñ‹Ð³ бÑлдÑÑ…</title> - <important> - <para>&os; 8.<replaceable>X</replaceable>-Ñ ÑхлÑÑд уÑн диÑк дÑÑрх Ð´Ò¯Ñ€Ñ Ð±Ð°Ð¹Ñ…Ð³Ò¯Ð¹ - байгааг Ñанаарай. &os;-г USB Ñанан ойн зөөгч ÑÑвÑл CDROM ÑÑвÑл - DVD ашиглаад Ñ…ÑрхÑн Ñуулгах талаар дÑÑÑ€ дурдÑан Ð·Ð°Ð°Ð²Ñ€ÑƒÑƒÐ´Ð°Ð°Ñ - үзÑÑÑ€Ñй.</para> - </important> - - <para>Ðчаалагддаг диÑкнүүд нь таны Ñуулгац файлыг хадгалÑан төхөөрөмжний - <filename>floppies/</filename> Ñан дотор байрладаг бөгөөд мөн - <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable>arch</replaceable>/<replaceable>version</replaceable>-RELEASE/floppies/</literal>. - хаÑÐ³Ð½Ð°Ð°Ñ Ð±Ð°Ñ Ñ…ÑƒÑƒÐ»Ð°Ð³Ð´Ð°Ð¶ болно. <replaceable>arch</replaceable> болон - <replaceable><version></replaceable> -ны оронд Ñ…Ò¯ÑÑÑн архитектур ба хувилбараа орлуулах Ñ…ÑÑ€ÑгтÑй. - ЖишÑÑ Ð½ÑŒ &os;/&arch.i386; &rel2.current;-RELEASE хувилбарын ачаалагддаг уÑн диÑкийг - <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/floppies/"></ulink> - хаÑÐ³Ð°Ð°Ñ Ñ‚Ð°Ñ‚Ð°Ð¶ авна.</para> + <para>&os;/&arch.pc98;-д зориулÑан ачаалагдах диÑкийг + <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/<replaceable>version</replaceable>-RELEASE/floppies/</literal> ÑÐ°Ð½Ð³Ð°Ð°Ñ Ñ‚Ð°Ñ‚Ð°Ð¶ авч болно. <replaceable>version</replaceable>-г Ñуулгах + хувилбараараа Ñолиорой.</para> <para>УÑн диÑкний images буюу Ð´Ò¯Ñ€Ñ Ñ„Ð°Ð¹Ð» нь <filename>.flp</filename> гÑÑÑн өргөтгөлтÑй байдаг. - <filename>floppies/</filename> Ñан нь Ñнз бүрийн Ð´Ò¯Ñ€Ñ Ñ„Ð°Ð¹Ð» агуулж байдаг бөгөөд - Ñуулгах төхөөрөмж болон FreeBSD-нхÑÑ Ñ…ÑƒÐ²Ð¸Ð»Ð±Ð°Ñ€Ñ‚ тохируулан Ñонголт хийдÑг. - ИхÑнх тохиолдолд танд дөрвөн ширхÑг уÑн диÑк Ñ…ÑÑ€Ñг болно. ТÑдгÑÑÑ€ нь - <filename>boot.flp</filename>, - <filename>kern1.flp</filename>, - <filename>kern2.flp</filename> болон - <filename>kern3.flp</filename> юм. Уг Ñанд буй - <filename>README.TXT</filename> Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ ÑƒÐ³ уÑн диÑктÑй холбоотой Ñүүлийн үеийн - мÑдÑÑллийг шалгаарай.</para> + <filename class="directory">floppies/</filename> Ñан нь Ñнз бүрийн Ð´Ò¯Ñ€Ñ Ñ„Ð°Ð¹Ð» агуулж байдаг. + <filename>boot.flp</filename> болон Ñуулгалтын Ñ‚Ó©Ñ€Ð»Ó©Ó©Ñ Ñ…Ð°Ð¼Ð°Ð°Ñ€Ð°Ð½ + <literal>kern.small*</literal> ÑÑвÑл <literal>kern*</literal> зÑÑ€Ñг + файлуудыг татаж аваарай.</para> <important> <para>ÐдгÑÑÑ€ Ð´Ò¯Ñ€Ñ Ñ„Ð°Ð¹Ð»Ñ‹Ð³ татаж авах FTP програм нь <emphasis>binary mode</emphasis> @@ -891,11 +872,10 @@ We can take no responsibility for lost disk contents!</literallayout> CDROM уруу диÑкÑÑ Ñ…Ð¸Ð¹Ð¶ ÑхлүүлÑÑ… Ñ…ÑÑ€ÑгтÑй.</para> <note> - <para>&os; 7.<replaceable>X</replaceable> хувилбаруудад + <para>&os;/&arch.pc98; хувилбаруудад Ñуулгалтын ачаалагдах боломжтой уÑн диÑкнүүд байдаг бөгөөд <xref linkend="install-boot-media"/> Ñ…ÑÑÑгт - тайлбарлаÑан шиг бÑлдÑж болно. ТÑдгÑÑрийн нÑг нь - ачаалагдах Ñхний диÑк + тайлбарлаÑан шиг бÑлдÑж болно. Ðхний диÑк нь <filename>boot.flp</filename> байна. ÐÐ½Ñ Ð´Ð¸Ñкийг өөрийн уÑн диÑкний хөтчид хийгÑÑд компьютераа ачаална.</para> @@ -2969,30 +2949,6 @@ Press [Enter] now to invoke an editor on /etc/exports тохиргоог цааш нь үргÑлжлүүлÑÑÑ€Ñй.</para> </sect2> - <sect2 id="linuxcomp"> - <title>Ð›Ð¸Ð½ÑƒÐºÑ Ñ‚Ð¾Ñ…Ð¸Ñ€Ð¾Ð¼Ð¶</title> - - <note> - <para>ÐÐ½Ñ Ñ…ÑÑÑг нь зөвхөн &os; 7.<replaceable>X</replaceable>-ийн Ñуулгалттай - хамааралтай бөгөөд Ñ…ÑÑ€Ñв та &os; 8.<replaceable>X</replaceable>-г Ñуулгах - бол ÑÐ½Ñ Ð´ÑлгÑц гарч ирÑхгүй.</para> - </note> - - <screen> User Confirmation Requested - Would you like to enable Linux binary compatibility? - - [ Yes ] No</screen> - - <para>&gui.yes; гÑж Ñонгоод - <keycap>Enter</keycap> дÑÑÑ€ дарвал ЛинукÑийн програмууд FreeBSD дÑÑÑ€ - ажиллах боломжтой болдог. Суулгац нь ЛинукÑтай тохиромжтой ажиллуулах - нÑмÑлт багцыг нÑмдÑг.</para> - - <para>Ð¥ÑÑ€Ñв та FTP-Ñ€ Ñуулгаж байгаа бол машин интернÑÑ‚ уруу холбогдох - Ñ…ÑÑ€ÑгтÑй болно. Заримдаа алÑад буй ftp байрлалд ЛинукÑийн тохиромжийн файлууд - байхгүй байдаг. ГÑвч үүнийг Ñүүлд Ñуулгах боломжтой.</para> - </sect2> - <sect2 id="mouse"> <title>Хулганы тохиргоо</title> @@ -4217,10 +4173,6 @@ Please press any key to reboot.</screen> <screen>&prompt.root; <userinput>cu -l /dev/cuau0</userinput></screen> - <para>&os; 7.<replaceable>X</replaceable> дÑÑÑ€ дараах тушаалыг ашиглана:</para> - - <screen>&prompt.root; <userinput>cu -l /dev/cuad0</userinput></screen> - </step> </procedure> @@ -4298,7 +4250,7 @@ Please press any key to reboot.</screen> <para>Уг Ñан нь дараах буулгац дүрÑнүүдийг агуулж байдаг:</para> <table frame="none"> - <title>FreeBSD 7.<replaceable>X</replaceable> ба 8.<replaceable>X</replaceable> ISO буулгац дүрÑний нÑÑ€ болон агуулга</title> + <title>&os; 8.<replaceable>X</replaceable> ISO буулгац дүрÑний нÑÑ€ болон агуулга</title> <tgroup cols="2"> <thead> @@ -4337,9 +4289,7 @@ Please press any key to reboot.</screen> USB Ñ…Ó©Ñ‚Ñ‡Ó©Ó©Ñ Ð°Ñ‡Ð°Ð°Ð»Ð¶ чаддаг машинуудад Ñуулгаж Ñ…ÑÑ€ÑглÑж болно. ÐÐ½Ñ Ð½ÑŒ <quote>livefs</quote> дÑÑÑ€ үндÑÑлÑÑÑн аврах горим руу ачаалахыг Ð±Ð°Ñ Ð´ÑмждÑг. Баримтжуулалтын - багцуудыг агуулдаг боловч буÑад багцуудыг агуулдаггүй. - ÐÐ½Ñ Ð´Ò¯Ñ€Ñ Ð½ÑŒ &os; 7.<replaceable>X</replaceable> хувилбаруудын - хувьд байдаггүй.</entry> + багцуудыг агуулдаг боловч буÑад багцуудыг агуулдаггүй.</entry> </row> <row> @@ -4383,13 +4333,6 @@ Please press any key to reboot.</screen> </tgroup> </table> - <note> - <para>&os; 7.3 ба &os; 8.0-Ñ Ó©Ð¼Ð½Ó©Ñ… &os; 7.<replaceable>X</replaceable> хувилбарууд нь - Ó©Ó©Ñ€ нÑÑ€ ашигладаг. - ТÑдгÑÑрийн ISO дүрÑний нÑÑ€Ñ <literal>&os;-</literal> гÑж - ÑÑ…ÑлдÑггүй.</para> - </note> - <para>Та <literal>bootonly</literal> ISO юм уу ÑÑвÑл <literal>disc1</literal> Ð´Ò¯Ñ€Ñ Ñ…Ð¾Ñ‘Ñ€Ñ‹Ð½ аль нÑгийг татаж авах <emphasis>Ñ‘Ñтой</emphasis>. <literal>disc1</literal> Ð´Ò¯Ñ€Ñ Ð½ÑŒ diff --git a/mn_MN.UTF-8/books/handbook/introduction/chapter.xml b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml index f62e733418..59c0d99b44 100644 --- a/mn_MN.UTF-8/books/handbook/introduction/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40601 + Original revision 41107 $FreeBSD$ --> @@ -656,7 +656,8 @@ RELENG_8 Ñалбарын нÑмÑлт хувилбарууд гарах болно.</para> <para>2011 оны 9 Ñард RELENG_9 Ñалбар Ò¯Ò¯ÑÑÑн. ÐÐ½Ñ Ñалбарын Ñхний - хувилбар &rel.current;-RELEASE байÑан бөгөөд &rel.current.date; гарÑан. + хувилбар 9.0-RELEASE байÑан бөгөөд 2012 оны 1 Ñард гарÑан. + Хамгийн Ñүүлийн &rel.current;-RELEASE нь &rel.current.date; гарÑан. RELENG_9 Ñалбарын нÑмÑлт хувилбарууд гарах болно.</para> <para>Одоогоор урт хугацааны хөгжүүлÑлтийн Ñ‚Ó©Ñлүүд 10.X-CURRENT (транк) Ñалбарт @@ -742,25 +743,34 @@ <variablelist> <varlistentry> - <term>SVN ба CVS репозитор<anchor + <term>SVN репозитор<anchor id="development-cvs-repository"/></term> <listitem> <indexterm> <primary>CVS</primary> - <secondary>репозитор</secondary> - </indexterm> + </indexterm> + + <indexterm> + <primary>CVS Repository</primary> + </indexterm> + <indexterm> <primary>ЗÑÑ€ÑгцÑÑ Ð¥ÑƒÐ²Ð¸Ð»Ð±Ð°Ñ€ÑƒÑƒÐ´Ñ‹Ð½ СиÑтем</primary> <see>CVS</see> </indexterm> + <indexterm> - <primary>SVN</primary> - <secondary>репозитор</secondary> + <primary>Subversion</primary> </indexterm> + <indexterm> - <primary>Subversion</primary> - <see>SVN</see> + <primary>Subversion Repository</primary> + </indexterm> + + <indexterm> + <primary>SVN</primary> + <!--<see>SVN</see>--> </indexterm> <para>&os;-ийн гол ÑÑ… мод нь &os;-Ñ‚Ñй цуг багцалÑан чөлөөтÑй байдаг @@ -775,33 +785,12 @@ гÑж үзÑÑн юм. Баримтжуулалтын Ñ‚Ó©Ñөл ба Портын цуглуулгын репозиториуд Ð±Ð°Ñ <application>CVS</application>-Ñ <application>SVN</application> руу - 2012 оны 5 ба 7 Ñаруудад Ñ‚ÑƒÑ Ñ‚ÑƒÑ ÑˆÐ¸Ð»Ð¶ÑÑн.</para> - - <para><literal>src/</literal> ба - <literal>ports/</literal> репозиториуд одоо - <application>SVN</application>-г - ашигладаг бөгөөд хуучин <application>CVS</application> дÑд бүтцÑÑÑ Ñ…Ð°Ð¼Ð°Ð°Ñ€Ð´Ð°Ð³ - <application>csup</application> зÑÑ€Ñг Ñ…ÑÑ€ÑглÑгчийн талын - Ñ…ÑÑ€ÑгÑлүүд Ñ…Ñвийн ажиллаÑан Ñ…ÑвÑÑÑ€ байгаа болно. ÐÐ½Ñ Ð·Ð¾Ñ€Ð¸Ð»Ð³Ð¾Ð¾Ñ€ - <application>SVN</application> репозитор дахь өөрчлөлтүүд нь - <application>CVS</application> Ñ€Ò¯Ò¯ ÑргÑÑд хөрвүүлÑгддÑг.</para> - - - <para><literal>src/</literal> ба <literal>ports/</literal>-Ñ - Ñлгаатай нь баримтжуулалтын <application>SVN</application> - репозитор <application>CVS</application> Ñ€Ò¯Ò¯ буцаж порт - хийгдÑÑгүй.</para> - <para>ҮндÑÑн <application>CVS</application> - <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi"> - репозитор</ulink> ÐÐУ-ийн Калифорнийн Санта Клара дахь машин дÑÑÑ€ - байрладаг бөгөөд Ñ‚ÑндÑÑÑ Ð´Ñлхий даÑар байрлаÑан Ñ…Ñд Ñ…ÑдÑн толин туÑгалын - машинууд уруу хувилагддаг. <link - linkend="current">-CURRENT</link> болон <link - linkend="stable">-STABLE</link> модуудыг агуулÑан <application>SVN</application> мод - таны өөрийн машин дÑÑÑ€ ч гÑÑÑн амархан хувилагдах боломжтой. - Үүнийг Ñ…ÑрхÑн хийх талаар дÑлгÑÑ€Ñнгүй мÑдÑÑллийг + 2012 оны 5 ба 7 Ñаруудад Ñ‚ÑƒÑ Ñ‚ÑƒÑ ÑˆÐ¸Ð»Ð¶ÑÑн. + &os; <literal>src/</literal> репозиторыг авах талаар <link linkend="synching">Өөрийн ÑÑ… модоо хамгийн Ñүүлийн түвшинд - аваачих</link> Ñ…ÑÑÑг уруу хандаж үзÑÑÑ€Ñй.</para> + аваачих</link> Ñ…ÑÑÑг, &os;-н портын цуглуулгыг Ñ…ÑрхÑн авах талаар + <link linkend="ports-using">Портын цуглуулгыг ашиглах</link> + Ñ…ÑÑÑг Ñ€Ò¯Ò¯ хандаж дÑлгÑÑ€Ñнгүй мÑдÑÑллийг үзÑÑÑ€Ñй.</para> </listitem> </varlistentry> diff --git a/mn_MN.UTF-8/books/handbook/jails/chapter.xml b/mn_MN.UTF-8/books/handbook/jails/chapter.xml index 7df18920a2..879a26e590 100644 --- a/mn_MN.UTF-8/books/handbook/jails/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/jails/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 39566 + Original revision 40900 $FreeBSD$ --> @@ -368,11 +368,11 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep </procedure> <para>Шоронд зориулагдÑан оруулга <filename>rc.conf</filename> файлд байгаа - тохиолдолд <filename>/etc/rc.d/jail</filename> Ñкрипт шоронг гараар ÑхлүүлÑÑ… + тохиолдолд &man.service.8; шоронг гараар ÑхлүүлÑÑ… ÑÑвÑл зогÑооход ашиглагдаж болох юм:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/jail start <replaceable>www</replaceable></userinput> -&prompt.root; <userinput>/etc/rc.d/jail stop <replaceable>www</replaceable></userinput></screen> + <screen>&prompt.root; <userinput>service jail start <replaceable>www</replaceable></userinput> +&prompt.root; <userinput>service jail stop <replaceable>www</replaceable></userinput></screen> <para>Одоогоор &man.jail.8;-г зогÑоох цÑвÑÑ€ зам байхгүй байгаа. ЦÑвÑÑ€ ÑиÑтемийн зогÑолтыг хийх тушаалуудыг шорон дотор ашиглах боломжгүй @@ -543,6 +543,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep боломжуудын Ñ…ÑÑ€ÑглÑÑг шаарддаг. Ð¥ÑÑ€Ñв доор үзүүлÑÑн алхмууд нь Ñ…ÑÑ‚Ñрхий төвөгтÑй Ñанагдвал &os; шоронгуудыг удирдах илүү Ñ…Ñлбар боломжийг олгодог бөгөөд ÑÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€Ð³Ð¾Ð¾Ð½Ñ‹Ñ… шиг төвөгтÑй биш + <filename role="package">sysutils/qjail</filename> ÑÑвÑл <filename role="package">sysutils/ezjail</filename> зÑÑ€Ñг Ñ…Ñлбар ÑиÑтемийг үзÑхийг зөвлөж байна.</para> </warning> @@ -831,11 +832,11 @@ jail_www_devfs_enable="YES"</programlisting> <step> <para>ÐÐ½Ñ Ò¯ÐµÐ´ шоронгууд нь бүтÑÑгдÑж ажиллахад бÑлтгÑгдÑÑн байна. ÐхлÑÑд шорон бүрийн хувьд шаардлагатай файлын - ÑиÑтемийг холбож дараа нь Ñ‚ÑдгÑÑрийг <filename>/etc/rc.d/jail</filename> + ÑиÑтемийг холбож дараа нь Ñ‚ÑдгÑÑрийг jail rc Ñкрипт ашиглан ÑхлүүлÑÑ… Ñ…ÑÑ€ÑгтÑй:</para> <screen>&prompt.root; <userinput>mount -a</userinput> -&prompt.root; <userinput>/etc/rc.d/jail start</userinput></screen> +&prompt.root; <userinput>service jail start</userinput></screen> </step> </procedure> @@ -905,7 +906,7 @@ jail_www_devfs_enable="YES"</programlisting> <step> <para>Шоронгуудыг зогÑоох зөв үе нь одоо байна:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/jail stop</userinput></screen> + <screen>&prompt.root; <userinput>service jail stop</userinput></screen> </step> <step> <para>ÐÑ… файлын ÑиÑтемүүдийг Ñалгах Ñ…ÑÑ€ÑгтÑй:</para> @@ -945,7 +946,7 @@ jail_www_devfs_enable="YES"</programlisting> шоронгуудыг ÑхлүүлÑÑ… Ñвдал юм:</para> <screen>&prompt.root; <userinput>mount -a</userinput> -&prompt.root; <userinput>/etc/rc.d/jail start</userinput></screen> +&prompt.root; <userinput>service jail start</userinput></screen> </step> </procedure> diff --git a/mn_MN.UTF-8/books/handbook/mail/chapter.xml b/mn_MN.UTF-8/books/handbook/mail/chapter.xml index 7aad16863f..4bb8d09f97 100644 --- a/mn_MN.UTF-8/books/handbook/mail/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/mail/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40216 + Original revision 40957 $FreeBSD$ --> @@ -1572,7 +1572,7 @@ define(`confDELIVERY_MODE',`deferred')dnl</programlisting> <para>Ñ‚ÑгÑÑд ÑцÑÑÑ‚ нь saslauthd дÑмонг ÑхлүүлнÑ:</para> - <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/saslauthd start</userinput></screen> + <screen>&prompt.root; <userinput>service saslauthd start</userinput></screen> <para>ÐÐ½Ñ Ð´Ñмон нь таны FreeBSD <filename>passwd</filename> мÑдÑÑллийн Ð±Ð°Ð°Ð·Ð°Ð°Ñ Ð½ÑвтрÑлт таниулахын тулд <application>sendmail</application>-ийн хувьд diff --git a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml index 8a9dfc74ab..31c4f99e33 100644 --- a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40609 + Original revision 41076 $FreeBSD$ --> @@ -14,23 +14,6 @@ <title>CDROM болон DVD ÐийтлÑгчид</title> <sect2> - <title>ЖижиглÑнгийн хайрцаглаÑан бүтÑÑгдÑхүүнүүд</title> - - <para>&os; нь хайрцаглаÑан бүтÑÑгдÑхүүн Ñ…ÑлбÑÑ€ÑÑÑ€ (&os; CD-үүд, - нÑмÑлт програм хангамж, болон Ñ…ÑвлÑÑÑн баримт) Ñ…Ñд Ñ…ÑдÑн жижиглÑн - Ñ…ÑƒÐ´Ð°Ð»Ð´Ð°Ð°Ð»Ð°Ð³Ñ‡Ð´Ð°Ð°Ñ Ð³Ð°Ñ€Ð´Ð°Ð³:</para> - - <itemizedlist> - <listitem> - <address> - <otheraddr>Frys Electronics</otheraddr> - WWW: <otheraddr><ulink url="http://www.frys.com/"></ulink></otheraddr> - </address> - </listitem> - </itemizedlist> - </sect2> - - <sect2> <title>CD болон DVD цуглуулгууд</title> <para>&os; CD болон DVD цуглуулгуудыг олон жижиглÑн Ñ…ÑƒÐ´Ð°Ð»Ð´Ð°Ð°Ð»Ð°Ð³Ñ‡Ð´Ð°Ð°Ñ @@ -236,8 +219,8 @@ <para><application>CTM</application> түгÑÑлтийн жагÑаалтуудын аль нÑгÑнд бүртгүүлÑÑ… Ñ…ÑÑ€ÑгтÑй. &a.ctm-cvs-cur.name; нь бүхÑл CVS модыг дÑмждÑг. &a.ctm-src-cur.name; нь - хөгжүүлÑлтийн Ñалбарын толгойг дÑмждÑг. &a.ctm-src-7.name; нь - 7.X хувилбарыг дÑмждÑг, гÑÑ… мÑÑ‚. (Ð¥ÑÑ€Ñв та өөрийгөө жагÑаалтад + хөгжүүлÑлтийн Ñалбарын толгойг дÑмждÑг. &a.ctm-src-9.name; нь + 9.X хувилбарыг дÑмждÑг, гÑÑ… мÑÑ‚. (Ð¥ÑÑ€Ñв та өөрийгөө жагÑаалтад Ñ…ÑрхÑн бүртгүүлÑхийг мÑдÑхгүй байгаа бол дÑÑрх жагÑаалтын нÑÑ€Ñн дÑÑÑ€ дарах юм уу ÑÑвÑл &a.mailman.lists.link; уруу очоод өөрийн Ñ…Ò¯ÑÑж байгаа жагÑаалтан дÑÑÑ€ÑÑ Ð´Ð°Ñ€Ð°Ñ… Ñ…ÑÑ€ÑгтÑй. БүртгÑÑ…Ñд @@ -496,6 +479,10 @@ <sect1 id="svn"> <title><application>Subversion</application> ашиглах нь</title> + <indexterm> + <primary>Subversion</primary> + </indexterm> + <sect2 id="svn-intro"> <title>Танилцуулга</title> @@ -555,15 +542,32 @@ <sect2 id="svn-usage"> <title><application>Subversion</application>-г ажиллуулах</title> - <para>ӨгөгдÑөн Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¾Ð¾Ñ Ñхийн цÑвÑÑ€ хувилбарыг татаж + <para>Ðхийн цÑвÑÑ€ хувилбарыг татаж локал Ñан руу авахад <command>svn</command> тушаалыг ашиглаж - болно. ИнгÑхдÑÑ:</para> + болно. ÐÐ½Ñ Ñанд байгаа файлуудыг <emphasis>локал ажлын + хувилбар</emphasis> гÑдÑг.</para> + <warning> + <para>Локал Ñан нь Ò¯Ò¯ÑÑÑн боловч <command>svn</command> + тушаалаар Ò¯Ò¯ÑгÑгдÑÑгүй бол татаж авахааÑаа өмнө + нÑрийг Ñолих юм уу уÑтгаарай. <command>svn</command>-ÑÑÑ€ + Ò¯Ò¯ÑгÑгдÑÑгүй Ñан дÑÑÑ€ татаж авах тохиолдолд татаж авч байгаа + файлууд нь байгаа файлуудтай зөрөх аÑуудал Ò¯Ò¯Ñч + болзошгүй.</para> + </warning> + + <para>ӨгөгдÑөн Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¾Ð¾Ñ Ñ‚Ð°Ñ‚Ð°Ð¶ авахдаа ÑÐ½Ñ Ð¼Ð°Ñгийн тушаалыг:</para> - <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/<replaceable>repository</replaceable>/<replaceable>branch</replaceable></literal> <replaceable>root</replaceable></userinput></screen> + <screen>&prompt.root; <userinput>svn checkout <replaceable>svn-mirror</replaceable>/<replaceable>repository</replaceable>/<replaceable>branch</replaceable> <replaceable>lwcdir</replaceable></userinput></screen> <para>гÑж ажиллуулах бөгөөд:</para> <itemizedlist> + <listitem> + <para><replaceable>svn-mirror</replaceable> нь + <link linkend="svn-mirrors">Subversion толин Ñайтууд</link> + дахь аль нÑгийн URL юм.</para> + </listitem> + <listitem> <para><replaceable>repository</replaceable> нь Ñ‚Ó©Ñлийн аль нÑг репозитор бөгөөд жишÑÑ Ð½ÑŒ <literal>base</literal>, @@ -584,7 +588,7 @@ </listitem> <listitem> - <para><replaceable>root</replaceable> нь зааж өгÑөн Ñалбарын + <para><replaceable>lwcdir</replaceable> нь зааж өгÑөн Ñалбарын агуулга байрлах Ñан юм. ÐÐ½Ñ Ð½ÑŒ ихÑвчлÑн <literal>ports</literal>-н хувьд <filename class="directory">/usr/ports</filename>, @@ -595,21 +599,44 @@ </listitem> </itemizedlist> - <para>Ðхийг Ñхний удаа татаж авахад удаж болно. - ДууÑтал нь хүлÑÑÑ… Ñ…ÑÑ€ÑгтÑй.</para> - - <para>Татаж авÑан Ñхийг татаж шинÑчлÑхдÑÑ Ð´Ð°Ñ€Ð°Ð°Ñ…Ð¸Ð¹Ð³ - ажиллуулна:</para> - - <screen>&prompt.root; <userinput>svn update <replaceable>root</replaceable></userinput></screen> - - <para>Ðхийг татаж авÑныхаа дараа баримтжуулалтыг - шинÑчлÑÑ… Ó©Ó©Ñ€ нÑг арга нь <filename - class="directory"><replaceable>root</replaceable></filename> - Ñангийн <filename>Makefile</filename>-Ñ€ дÑмжигдÑÑн - байдаг бөгөөд ингÑж ажиллуулж болно:</para> - - <screen>&prompt.root; <userinput>cd <replaceable>root</replaceable></userinput> + <para>ÐÐ½Ñ Ð½ÑŒ Портын цуглуулгыг ÐÐУ-н баруунд байрлах + Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¾Ð¾Ñ <acronym>HTTPS</acronym> протокол ашиглан локал ажлын хуулбарыг + <filename class="directory">/usr/ports</filename>-д Ñанд + байршуулж байгаа жишÑÑ ÑŽÐ¼. Ð¥ÑÑ€Ñв + <filename class="directory">/usr/ports</filename> Ñан + байгаа бөгөөд <command>svn</command>-ÑÑÑ€ Ò¯Ò¯ÑгÑгдÑÑгүй + бол өөрчлөх юм уу уÑтгахаа мартуузай.</para> + + <screen>&prompt.root; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/ports/head /usr/ports</userinput></screen> + + <para>ÐлÑын репозиторын бүрÑн Ñалбарыг Ñхний удаа татаж авах + ÑƒÑ‡Ñ€Ð°Ð°Ñ ÑƒÐ´Ð°Ð¶ магадгүй. ТÑвчÑÑртÑй байгаарай.</para> + + <para>Ðхний удаа татÑаныхаа дараа локал ажлын хуулбарыг + шинÑчлÑхдÑÑ:</para> + + <screen>&prompt.root; <userinput>svn update <replaceable>lwcdir</replaceable></userinput></screen> + + <para>ДÑÑрх жишÑÑн дÑÑÑ€ Ò¯Ò¯ÑгÑÑÑн + <filename class="directory">/usr/ports</filename>-г шинÑчлÑхдÑÑ:</para> + + <screen>&prompt.root; <userinput>svn update /usr/ports</userinput></screen> + + <para>Татаж Ð°Ð²Ð°Ñ…Ð°Ð°Ñ ÑˆÐ¸Ð½ÑчлÑÑ… нь хурдан бөгөөд өөрчлөгдÑөн + файлуудыг л татаж авдаг.</para> + + <para>Татаж авÑныхаа дараа локал ажлын хуулбарыг шинÑчлÑÑ… Ó©Ó©Ñ€ + нÑг арга нь <filename + class="directory">/usr/ports</filename>, + <filename class="directory">/usr/src</filename>, ба + <filename class="directory">/usr/doc</filename> Ñангууд дахь + <filename>Makefile</filename>-д байдаг. + <makevar>SVN_UPDATE</makevar>-г зааж өгөөд + <maketarget>update</maketarget> гÑж Ñ…ÑÑ€ÑглÑнÑ. + ЖишÑÑ Ð½ÑŒ <filename class="directory">/usr/src</filename>-г + шинÑчлÑхийн тулд:</para> + + <screen>&prompt.root; <userinput>cd /usr/src</userinput> &prompt.root; <userinput>make update SVN_UPDATE=yes</userinput></screen> </sect2> @@ -627,10 +654,11 @@ </sect1> <sect1 id="svn-mirrors"> - <title><application>Subversion</application> Ñайтууд</title> + <title><application>Subversion</application> толин Ñайтууд</title> <indexterm> - <primary>svn</primary> + <primary>Subversion Repository</primary> + <secondary>Mirror Sites</secondary> </indexterm> <para>Бүх толин туÑгалууд бүх репозиторыг агуулдаг.</para> @@ -703,6 +731,41 @@ </tbody> </tgroup> </informaltable> + + <para><acronym>HTTPS</acronym> нь &os; толин туÑгалыг хуурамчаар дуурайх + (<quote>man in the middle</quote> халдлага гÑгддÑг) ÑÑвÑл ÑцÑийн + Ñ…ÑÑ€ÑглÑгч Ñ€Ò¯Ò¯ муу агуулга шидÑÑ… зÑргÑÑÑ Ñ…Ð°Ð¼Ð³Ð°Ð°Ð»Ð°Ñ… боломжтой ашиглахыг + зөвлөдөг протокол юм.</para> + + <para><acronym>HTTPS</acronym> толин туÑгал руу хийх Ñхний холболтын + үеÑÑ€ Ñ…ÑÑ€ÑглÑгчÑÑÑ Ñерверийн <emphasis>fingerprint</emphasis>-г + аÑуудаг:</para> + + <screen>Error validating server certificate for 'https://svn0.us-west.freebsd.org:443': + - The certificate is not issued by a trusted authority. Use the + fingerprint to validate the certificate manually! +Certificate information: + - Hostname: svnmir.ysv.FreeBSD.org + - Valid: from Fri, 24 Aug 2012 22:04:04 GMT until Sat, 24 Aug 2013 22:04:04 GMT + - Issuer: clusteradm, FreeBSD.org, CA, US + - Fingerprint: 79:35:8f:ca:6d:34:d9:30:44:d1:00:af:33:4d:e6:11:44:4d:15:ec +(R)eject, accept (t)emporarily or accept (p)ermanently?</screen> + + <para>Fingerprint-г дÑÑрх Ñ…Ò¯ÑнÑгттÑй харьцуулж хараарай. + Ð¥ÑÑ€Ñв хурууны Ñ…ÑÑ Ñ‚Ð°Ð°Ñ€Ñ‡ байгаа бол Ñерверийн аюулгүй + байдлын Ñертификатыг түр ÑÑвÑл бүрмөÑөн зөвшөөрч болно. + Түр зуурын Ñертификат нь ÑервертÑй хийх нÑг удаагийн + ÑеÑÑÑÑÑ€ дууÑгавар болох бөгөөд дараагийн удаа шалгах + алхам дахин хийгдÑÑ… болно. Сертификатыг бүрмөÑөн зөвшөөрÑнөөр + нÑвтрÑÑ… Ñрхийг <filename role="directory">~/.subversion/auth/</filename> + Ñанд хадгалж Ñертификатын хугацаа дууÑтал Ñ…ÑÑ€ÑглÑгчÑÑÑ + хурууны Ñ…ÑÑг дахин шалгахыг аÑуудаггүй.</para> + + <para>Ð¥ÑÑ€Ñв <acronym>HTTPS</acronym>-г галт хана ÑÑвÑл + буÑад аÑÑƒÑƒÐ´Ð»Ð°Ð°Ñ Ð±Ð¾Ð»Ð¾Ð¾Ð´ Ñ…ÑÑ€ÑглÑÑ… боломжгүй бол арай илүү + хурдан <literal>SVN</literal> дараагийн Ñонголт байж + болох юм. Ðлийг ч ашиглах боломжгүй бол + <acronym>HTTP</acronym>-г ашиглаарай.</para> </sect1> <sect1 id="cvsup"> @@ -739,15 +802,6 @@ &os;-ийн толин туÑгал Ñайтууд дÑÑÑ€ ажиллаж байдаг <command>cvsupd</command> Ñервер юм.</para> - <para>&os;-ийн баримт болон захидлын жагÑаалтуудыг уншиж байхдаа та - <application>sup</application> гÑж Ñ…ÑлÑнийг харж болох юм. - <application>Sup</application> нь <application>CVSup</application>-ийн - өмнөх үе бөгөөд ижил зорилгоор ашиглагддаг байÑан. <application>CVSup</application> - нь sup-тай бараг л адилаар ашиглагддаг бөгөөд үнÑндÑÑ <command>sup</command> - ашиглаж болохоор тохиргооны файлуудыг ашигладаг. <application>CVSup</application> - нь илүү хурдан бөгөөд уÑн хатан ÑƒÑ‡Ñ€Ð°Ð°Ñ <application>Sup</application> - нь &os; Ñ‚Ó©Ñөлд ашиглагдахаа больÑон.</para> - <note> <para><application>csup</application> Ñ…ÑÑ€ÑгÑÑл нь <application>CVSup</application>-г C дÑÑÑ€ бичÑÑн хувилбар юм. Үүний хамгийн том давуу тал бол илүү хурдан бөгөөд @@ -1072,19 +1126,8 @@ src-all</programlisting> гÑж Ñ…ÑлÑÑ… бөгөөд таны клиент <quote>OK, Би ÑнÑ,ÑнÑ, Ñнийг авна.</quote> гÑж хариулна гÑÑÑн үг юм. Ðнхдагч тохиргоон дÑÑÑ€ <application>CVSup</application> клиент нь таны тохиргооны файлд ÑонгоÑон хаÑг болон - цуглуулгатай холбоотой бүх файлыг авна. ГÑхдÑÑ Ò¯Ò¯Ð½Ð¸Ð¹Ð³ та үргÑлж Ñ…Ò¯ÑÑхгүй байх, - ÑлангуÑа Ñ…ÑÑ€Ñв та <filename>doc</filename>, <filename>ports</filename>, ÑÑвÑл - <filename>www</filename> моднуудыг авч байгаа бол үүнийг хийхийг Ñ…Ò¯ÑÑхгүй - байх — ихÑнх Ñ…Ò¯Ð¼Ò¯Ò¯Ñ Ð´Ó©Ñ€Ó©Ð² ÑÑвÑл таван Ñ…Ñлийг уншиж чаддаггүй - бөгөөд тиймÑÑÑ Ñ‚ÑдÑнд Ñ…ÑлтÑй холбоотой файлуудыг татаж авах Ñ…ÑÑ€Ñггүй байдаг. - Ð¥ÑÑ€Ñв та портын цуглуулгыг <application>CVSup</application> хийж байгаа - бол та цуглуулга бүрийг туÑад нь заан өгч үүнийг тойрон гарч болно - (Ó©Ó©Ñ€Ó©Ó©Ñ€ Ñ…ÑлбÑл, <emphasis>ports-astrology</emphasis>, - <emphasis>ports-biology</emphasis>, гÑÑ… мÑÑ‚ÑÑÑ€ <emphasis>ports-all</emphasis> - гÑхийн оронд). ГÑхдÑÑ <filename>doc</filename> - болон <filename>www</filename> моднууд нь Ñ…ÑлтÑй холбоотой цуглуулгуудтай байдаггүй - болохоор та <application>CVSup</application>-ийн олон Ñайн боломжуудын - нÑгийг ашиглах Ñ‘Ñтой нь <filename>refuse</filename> юм.</para> + цуглуулгатай холбоотой бүх файлыг авна. Модыг Ñ…ÑÑÑгчлÑн татахын + тулд <filename>refuse</filename>-г ашиглана.</para> <para><filename>refuse</filename> файл нь үндÑÑндÑÑ <application>CVSup</application>-д Ñ†ÑƒÐ³Ð»ÑƒÑƒÐ»Ð³Ð°Ð°Ñ Ñ„Ð°Ð¹Ð» болгоныг @@ -1101,35 +1144,12 @@ src-all</programlisting> <para><filename>refuse</filename> файл нь маш Ñ…Ñлбар Ñ…ÑлбÑршилттÑй байдаг; ÑÐ½Ñ Ð½ÑŒ таны татаж авахыг Ñ…Ò¯ÑÑÑгүй файлууд ÑÑвÑл Ñангуудын нÑрийг агуулдаг. - ЖишÑÑ Ð½ÑŒ Ñ…ÑÑ€Ñв та Ðнгли болон Германаар бага зÑÑ€Ñг ÑÑ€ÑŒÐ´Ð³Ð°Ð°Ñ Ó©Ó©Ñ€ Ñ…ÑлÑÑÑ€ - Ñрьдаггүй бөгөөд баримтын Герман орчуулгыг авах Ñонирхолгүй байвал - өөрийн <filename>refuse</filename> файлд дараах:</para> - - <programlisting>doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_*</programlisting> - - <para>мөрүүд болон гÑÑ… мÑÑ‚ÑÑÑ€ буÑад Ñ…Ñлнүүдийн хувьд оруулж өгөх Ñ…ÑÑ€ÑгтÑй - (та бүрÑн жагÑаалтыг <ulink - url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">&os; - CVS архивыг</ulink> шалган олж болно).</para> - - <para>ÐÐ½Ñ Ð°ÑˆÐ¸Ð³Ñ‚Ð°Ð¹ боломжийг ашиглан удаан холболттой юм уу ÑÑвÑл Ó©Ó©Ñ€Ñдийн + ЖишÑÑ Ð½ÑŒ:</para> + + <programlisting>bin/ +usr.bin/</programlisting> + + <para>Удаан холболттой юм уу ÑÑвÑл Ó©Ó©Ñ€Ñдийн ИнтернÑтийн холболтод минутаар төлдөг Ñ…ÑÑ€ÑглÑгчид Ò¯Ð½Ñ Ñ†ÑнÑÑ‚Ñй хугацаагаа Ñ…ÑмнÑÑ… болно. Учир нь Ñ‚Ñд Ó©Ó©Ñ€Ñдийн Ñ…ÑзÑÑ Ñ‡ ашиглахгүй файлаа татаж авах шаардлагагүй болох юм. <application>CVSup</application>-ийн @@ -1212,10 +1232,8 @@ doc/zh_*</programlisting> түүний дÑд цуглуулгууд Ñ‚ÑƒÑ Ð±Ò¯Ñ€Ð¸Ð¹Ð³ хүлÑÑн авахтай адил юм. Цуглуулга хоорондын шаталÑан холбоонууд нь доорх жагÑаалт дахь догол ашиглалтаар туÑгагддаг.</para> - <para>Хамгийн түгÑÑмÑл Ñ…ÑÑ€ÑглÑгддÑг цуглуулгууд нь <literal>src-all</literal>, - болон <literal>ports-all</literal> юм. БуÑад цуглуулгуудыг туÑгай зорилгоор - зөвхөн жижиг бүлÑг Ñ…Ò¯Ð¼Ò¯Ò¯Ñ Ð°ÑˆÐ¸Ð³Ð»Ð°Ð´Ð°Ð³ бөгөөд зарим толин туÑгал Ñайтууд Ñ‚ÑдгÑÑрийг - бүгдийг агуулдаггүй байж болох юм.</para> + <para>Хамгийн түгÑÑмÑл Ñ…ÑÑ€ÑглÑгддÑг цуглуулгууд нь <literal>src-all</literal> + юм.</para> <variablelist> <varlistentry> @@ -1234,617 +1252,6 @@ doc/zh_*</programlisting> </varlistentry> <varlistentry> - <term><literal>ports-all release=cvs</literal></term> - - <listitem> - <para>&os;-ийн портын цуглуулга.</para> - - <important id="cvsup-collec-pbase-warn"> - <para>Ð¥ÑÑ€Ñв та бүхÑл <literal>ports-all</literal>-г (бүх портын мод) - шинÑчлÑхийг Ñ…Ò¯ÑÑхгүй байгаа бөгөөд доор жагÑаагдÑан дÑд цуглуулгуудын - нÑгийг ашиглаж байгаа бол <literal>ports-base</literal> - дÑд цуглуулгыг шинÑчилÑÑн ÑÑÑÑ…ÑÑ <emphasis>үргÑлж</emphasis> - шалгаж байх Ñ…ÑÑ€ÑгтÑй. <literal>ports-base</literal>-ÑÑÑ€ - танилцуулагдÑан портын бүтÑÑлтийн дÑд бүтцÑд Ñмар нÑгÑн өөрчлөлт - орох болгонд Ñ‚ÑдгÑÑÑ€ өөрчлөлтүүд нь <quote>жинхÑнÑ</quote> - портуудад тун удахгүй ашиглагдах нь бараг л тодорхой байдаг юм. - ТиймÑÑÑ Ñ…ÑÑ€Ñв та зөвхөн <quote>жинхÑнÑ</quote> портуудыг - шинÑчилж Ñ‚ÑдгÑÑÑ€ нь ÑˆÐ¸Ð½Ñ Ð±Ð¾Ð»Ð¾Ð¼Ð¶ÑƒÑƒÐ´Ñ‹Ð½ заримыг ашигладаг бол - Ñ‚ÑдгÑÑрийн бүтÑÑлт нь зарим нÑг ид шидийн алдааны мÑдÑгдÑлтÑйгÑÑÑ€ - амжилтгүй болох маш их магадлалтай юм. ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ð¾Ð»Ð´Ð¾Ð»Ð´ - <emphasis>хамгийн ÑÑ…Ñнд</emphasis> хийх зүйл бол - таны <literal>ports-base</literal> дÑд цуглуулга - хамгийн Ñүүлийн үеийнх ÑÑÑхийг шалгах Ñ…ÑÑ€ÑгтÑй юм.</para> - </important> - - <important id="cvsup-collec-index-warn"> - <para>Ð¥ÑÑ€Ñв та <filename>ports/INDEX</filename>-ийн - өөрийн локал хуулбарыг бүтÑÑÑ… гÑж байгаа бол - <literal>ports-all</literal> буюу бүх портыг - хүлÑÑж авах <emphasis>Ñ‘Ñтой</emphasis> (бүх портын мод). - <filename>ports/INDEX</filename>-г Ñ…ÑÑÑг модтой бүтÑÑхийг - дÑмждÑггүй. <ulink url="&url.books.faq;/applications.html#MAKE-INDEX"> - FAQ</ulink> хаÑгийг Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para> - </important> - - <variablelist> - <varlistentry> - <term><literal>ports-accessibility - release=cvs</literal></term> - - <listitem> - <para>Хөгжлийн бÑрхшÑÑлтÑй Ñ…ÑÑ€ÑглÑгчдÑд туÑлахад зориулÑан програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-arabic - release=cvs</literal></term> - - <listitem> - <para>Ðраб Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-archivers - release=cvs</literal></term> - - <listitem> - <para>Ðрхивлах Ñ…ÑÑ€ÑгÑлүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-astro - release=cvs</literal></term> - - <listitem> - <para>Одон оронтой холбоотой портууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-audio - release=cvs</literal></term> - - <listitem> - <para>Дууны дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-base - release=cvs</literal></term> - - <listitem> - <para>Портын цуглуулгын бүтÑÑÑ… дÑд бүтÑц - - төрөл бүрийн файлууд <filename>/usr/ports</filename> - Ñангийн <filename>Mk/</filename> болон - <filename>Tools/</filename> дÑд Ñангуудад байрладаг.</para> - - <note> - <para><link - linkend="cvsup-collec-pbase-warn">ДÑÑрх чухал - анхааруулгыг</link> Ò¯Ð·Ð½Ñ Ò¯Ò¯: та &os;-ийн - портын цуглуулгын Ñмар ч Ñ…ÑÑгийг шинÑчлÑхдÑÑ - ÑÐ½Ñ Ð´Ñд цуглуулгыг <emphasis>үргÑлж</emphasis> - шинÑчилж байх Ñ…ÑÑ€ÑгтÑй!</para> - </note> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-benchmarks - release=cvs</literal></term> - - <listitem> - <para>Бенчмаркууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-biology - release=cvs</literal></term> - - <listitem> - <para>Биологи.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-cad - release=cvs</literal></term> - - <listitem> - <para>Компьютерийн туÑламжтай дизайн хийх Ñ…ÑÑ€ÑгÑлүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-chinese - release=cvs</literal></term> - - <listitem> - <para>Ð¥Ñтад Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-comms - release=cvs</literal></term> - - <listitem> - <para>Холбооны програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-converters - release=cvs</literal></term> - - <listitem> - <para>Ñ‚ÑмдÑгтийн код хөрвүүлÑгчид.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-databases - release=cvs</literal></term> - - <listitem> - <para>ÐœÑдÑÑллийн баазууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-deskutils - release=cvs</literal></term> - - <listitem> - <para>Компьютер зохион бүтÑÑгдÑÑ…ÑÑÑ Ó©Ð¼Ð½Ó© - ширÑÑн дÑÑÑ€ байдаг байÑан зүйлÑ.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-devel - release=cvs</literal></term> - - <listitem> - <para>ХөгжүүлÑлтийн багажууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-dns - release=cvs</literal></term> - - <listitem> - <para>DNS-Ñ‚Ñй холбоотой програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-editors - release=cvs</literal></term> - - <listitem> - <para>ЗаÑварлагчид.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-emulators - release=cvs</literal></term> - - <listitem> - <para>БуÑад үйлдлийн ÑиÑтемүүдÑд зориулÑан ÑмулÑторууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-finance - release=cvs</literal></term> - - <listitem> - <para>Банк, Ñанхүү болон Ñ‚ÑдгÑÑртÑй холбоотой програмууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ftp - release=cvs</literal></term> - - <listitem> - <para>FTP клиент ба Ñерверийн багажууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-games - release=cvs</literal></term> - - <listitem> - <para>Тоглоомууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-german - release=cvs</literal></term> - - <listitem> - <para>Герман Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-graphics - release=cvs</literal></term> - - <listitem> - <para>Графикийн багажууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-hebrew - release=cvs</literal></term> - - <listitem> - <para>Ð¥Ñбрю Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-hungarian - release=cvs</literal></term> - - <listitem> - <para>Унгар Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-irc - release=cvs</literal></term> - - <listitem> - <para>Internet Relay Chat буюу чалчих багажууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-japanese - release=cvs</literal></term> - - <listitem> - <para>Япон Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-java - release=cvs</literal></term> - - <listitem> - <para>&java; багажууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-korean - release=cvs</literal></term> - - <listitem> - <para>Ð¡Ð¾Ð»Ð¾Ð½Ð³Ð¾Ñ Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-lang - release=cvs</literal></term> - - <listitem> - <para>Програмчлалын Ñ…Ñлнүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-mail - release=cvs</literal></term> - - <listitem> - <para>Захидлын програмууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-math - release=cvs</literal></term> - - <listitem> - <para>Тоо тооцоолох програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-misc - release=cvs</literal></term> - - <listitem> - <para>БуÑад багажууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-multimedia - release=cvs</literal></term> - - <listitem> - <para>Мультимедиа програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net - release=cvs</literal></term> - - <listitem> - <para>СүлжÑÑний програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-im - release=cvs</literal></term> - - <listitem> - <para>Шуурхай мÑдÑгдÑл (instant messaging) илгÑÑÑ… програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-mgmt - release=cvs</literal></term> - - <listitem> - <para>СүлжÑÑний удирдлагын програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-net-p2p - release=cvs</literal></term> - - <listitem> - <para>p2p ÑүлжÑÑ.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-news - release=cvs</literal></term> - - <listitem> - <para>USENET мÑдÑÑний програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-palm - release=cvs</literal></term> - - <listitem> - <para><trademark class="trade">Palm</trademark> төрлийн - төхөөрөмжүүдÑд зориулÑан програм хангамжийн дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-polish - release=cvs</literal></term> - - <listitem> - <para>Польш Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ports-mgmt - release=cvs</literal></term> - - <listitem> - <para>Портууд болон багцуудыг удирдах багажууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-portuguese - release=cvs</literal></term> - - <listitem> - <para>Португал Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-print - release=cvs</literal></term> - - <listitem> - <para>Ð¥ÑвлÑлтийн програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-russian - release=cvs</literal></term> - - <listitem> - <para>ÐžÑ€Ð¾Ñ Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-science - release=cvs</literal></term> - - <listitem> - <para>ШинжлÑÑ… ухаан.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-security - release=cvs</literal></term> - - <listitem> - <para>Ðюулгүй байдлын Ñ…ÑÑ€ÑгÑлүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-shells - release=cvs</literal></term> - - <listitem> - <para>Тушаалын мөрийн бүрхүүлүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-sysutils - release=cvs</literal></term> - - <listitem> - <para>СиÑтемийн Ñ…ÑÑ€ÑгÑлүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-textproc - release=cvs</literal></term> - - <listitem> - <para>текÑÑ‚ боловÑруулах Ñ…ÑÑ€ÑгÑлүүд (ширÑÑний Ñ…ÑвлÑл ордоггүй).</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-ukrainian - release=cvs</literal></term> - - <listitem> - <para>Украйн Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-vietnamese - release=cvs</literal></term> - - <listitem> - <para>Вьетнам Ñ…Ñлний дÑмжлÑг.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-www - release=cvs</literal></term> - - <listitem> - <para>World Wide - Web-Ñ‚Ñй холбоотой програм хангамж.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11 - release=cvs</literal></term> - - <listitem> - <para>X Цонхны ÑиÑтемийг дÑмжих портууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-clocks - release=cvs</literal></term> - - <listitem> - <para>X11 цагнууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-drivers - release=cvs</literal></term> - - <listitem> - <para>X11 драйверууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-fm - release=cvs</literal></term> - - <listitem> - <para>X11 файл менежерүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-fonts - release=cvs</literal></term> - - <listitem> - <para>X11 Ò¯Ñгийн маÑгууд ба Ò¯Ñгийн маÑгийн Ñ…ÑÑ€ÑгÑлүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-toolkits - release=cvs</literal></term> - - <listitem> - <para>X11 багажны цуглуулгууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-servers - release=cvs</literal></term> - - <listitem> - <para>X11 Ñерверүүд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-themes - release=cvs</literal></term> - - <listitem> - <para>X11 харуулах маÑгууд.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><literal>ports-x11-wm - release=cvs</literal></term> - - <listitem> - <para>X11 цонхны менежерүүд.</para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - </varlistentry> - - <varlistentry> <term><literal>projects-all release=cvs</literal></term> <listitem> <para>&os; Ñ‚Ó©Ñлийн архив дахь Ñхүүд.</para> @@ -2130,15 +1537,6 @@ doc/zh_*</programlisting> <para>&os; захидлын жагÑаалтын архив.</para> </listitem> </varlistentry> - - <varlistentry> - <term><literal>www release=current</literal></term> - - <listitem> - <para>Урьдчилан боловÑруулÑан &os; WWW Ñайтын файлууд - (ÑÑ… файлууд биш). WWW толин туÑгал Ñайтуудад Ñ…ÑÑ€ÑглÑгддÑг.</para> - </listitem> - </varlistentry> </variablelist> </sect2> diff --git a/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml index 19d0f02939..dc46c414ee 100644 --- a/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 1.144 + Original revision 41064 $FreeBSD$ --> @@ -1565,7 +1565,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting> <para>Ðрын програмыг ажиллуулна:</para> <screen>&prompt.root; <userinput>echo 'mythbackend_enable="YES"' >> /etc/rc.conf</userinput> -&prompt.root; <userinput>/usr/local/etc/rc.d/mythbackend start</userinput></screen> +&prompt.root; <userinput>service mythbackend start</userinput></screen> </sect2> </sect1> @@ -1603,10 +1603,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting> Ñкан хийгчийн дÑмжлÑг болон түүний төлвийн тухай мÑдÑÑллÑÑÑ€ таныг хангах <ulink url="http://www.sane-project.org/sane-supported-devices.html">дÑмжигдÑÑн - төхөөрөмжүүд</ulink>ийн жагÑаалттай байдаг. &os; 8.X-ÑÑÑ Ó©Ð¼Ð½Ó©Ñ… хувилбарууд - дÑÑÑ€ &man.uscanner.4; - гарын авлагын Ñ…ÑƒÑƒÐ´Ð°Ñ Ð½ÑŒ дÑмжигдÑÑн USB Ñкан хийгчдийн жагÑаалтыг - Ð±Ð°Ñ Ð°Ð³ÑƒÑƒÐ»Ð´Ð°Ð³.</para> + төхөөрөмжүүд</ulink>ийн жагÑаалттай байдаг.</para> </sect2> <sect2> @@ -1629,16 +1626,6 @@ device uhci device ohci device ehci</programlisting> - <para>&os; 8.X-ÑÑÑ Ó©Ð¼Ð½Ó©Ñ… ÑиÑтемүүдÑд дараах мөр Ð±Ð°Ñ - Ñ…ÑÑ€ÑгтÑй:</para> - - <programlisting>device uscanner</programlisting> - - <para>&os;-ийн ÑдгÑÑÑ€ хувилбарууд дÑÑÑ€ &man.uscanner.4; - төхөөрөмжийн драйвер нь USB Ñкан хийгчдийг дÑмждÑг. - &os; 8.0-Ñ Ñ…Ð¾Ð¹Ñˆ ÑÐ½Ñ Ð´ÑмжлÑгийг &man.libusb.3; Ñан - шууд хангадаг.</para> - <para>Зөв цөмөөр дахин ачаалÑны дараа өөрийн USB Ñкан хийгчийг залгана. Таны Ñкан хийгчийг таньж байгааг үзүүлÑÑ… мөр ÑиÑтемийн мÑдÑгдлийн буферт (&man.dmesg.8;) @@ -1646,14 +1633,9 @@ device ehci</programlisting> <screen>ugen0.2: <EPSON> at usbus0</screen> - <para>ÐÑвÑл &os; 7.X ÑиÑтем дÑÑÑ€:</para> - - <screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen> - - <para>Бидний ажиллуулж байгаа &os;-ийн - Ñ…ÑƒÐ²Ð¸Ð»Ð±Ð°Ñ€Ð°Ð°Ñ Ñ…Ð°Ð¼Ð°Ð°Ñ€Ñ‡ Ñкан хийгч нь <filename>/dev/ugen0.2</filename> ÑÑвÑл - <filename>/dev/uscanner0</filename> гÑÑÑн төхөөрөмжийн цÑгийг - ашиглаглаж байгааг ÑдгÑÑÑ€ мÑдÑгдлүүд харуулж байна. ÐÐ½Ñ Ð¶Ð¸ÑˆÑÑний + <para>Бидний ажиллуулж байгаа Ñкан хийгч нь <filename>/dev/ugen0.2</filename> + гÑÑÑн төхөөрөмжийн цÑгийг + ашиглаж байгааг ÑдгÑÑÑ€ мÑдÑгдлүүд харуулж байна. ÐÐ½Ñ Ð¶Ð¸ÑˆÑÑний хувьд &epson.perfection; 1650 USB Ñкан хийгчийг ашиглаÑан.</para> </sect3> @@ -1888,20 +1870,6 @@ device `epson:/dev/uscanner0' is a Epson GT-8200 flatbed scanner</screen> add path ugen0.2 mode 0660 group usb add path usb/0.2.0 mode 0666 group usb</programlisting> - <para>&os; 7.X Ñ…ÑÑ€ÑглÑгчдÑд <filename>/dev/uscanner0</filename> - гÑÑÑн зөв төхөөрөмжийн цÑг бүхий дараах мөрнүүд Ñ…ÑÑ€ÑгтÑй байдаг:</para> - - <programlisting>[system=5] -add path uscanner0 mode 660 group usb</programlisting> - - <para>Дараа нь дараах мөрийг <filename>/etc/rc.conf</filename> файлд - нÑмж машиныг дахин ачаална:</para> - - <programlisting>devfs_system_ruleset="system"</programlisting> - - <para>ÐдгÑÑÑ€ мөрнүүдийн тухай дÑлгÑÑ€Ñнгүй мÑдÑÑллийг &man.devfs.8; - гарын авлагын хуудаÑÐ½Ð°Ð°Ñ Ð¾Ð»Ð¶ болно.</para> - <para>Одоо Ñкан хийгчид хандах хандалтыг зөвшөөрөхийн тулд Ñ…ÑÑ€ÑглÑгчдийг <groupname><replaceable>usb</replaceable></groupname> бүлÑгт нÑмÑÑ… л үлдлÑÑ:</para> diff --git a/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml index be082a82db..2af87a4de8 100644 --- a/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40525 + Original revision 40792 $FreeBSD$ --> @@ -166,7 +166,7 @@ файл дотор байрлуулÑнаар <application>inetd</application>-г ÑиÑтем ачаалахад ÑÑ…ÑлдÑг болгож болно. Доор дурдÑан:</para> - <programlisting>/etc/rc.d/inetd rcvar</programlisting> + <programlisting>service inetd rcvar</programlisting> <para>тушаалыг өгөн одоо идÑвхтÑй байгаа тохиргоог харж болно.</para> @@ -257,7 +257,7 @@ TCP wrapping буюу TCP-ийн дундын Ñ…Ñналтыг идÑвхжүүР<example id="network-inetd-reread"> <title><application>inetd</application>-н тохиргооны файлыг дахин ачаалах нь</title> - <screen>&prompt.root; <userinput>/etc/rc.d/inetd reload</userinput></screen> + <screen>&prompt.root; <userinput>service inetd reload</userinput></screen> </example> <para>Тохиргооны файлын мөр бүр туÑдаа дÑмонг заана. @@ -751,7 +751,7 @@ IP хаÑгаар нь зааж өгÑөн 3 машин руу ÑкÑпортоР<para>ÑÑвÑл <command>mountd</command> &man.rc.8; Ñкриптийг зохих параметрийн хамт ажиллуулах Ñ…ÑÑ€ÑгтÑй:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/mountd onereload</userinput></screen> + <screen>&prompt.root; <userinput>service mountd onereload</userinput></screen> <para>rc Ñкриптийг Ñ…ÑÑ€ÑглÑÑ… зааврыг <xref linkend="configtuning-rcd"/> Ñ…ÑÑгÑÑÑ Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para> @@ -816,8 +816,8 @@ rpc_statd_enable="YES"</programlisting> <para>Програмыг дараах байдалтай ÑхлүүлнÑ:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/lockd start</userinput> -&prompt.root; <userinput>/etc/rc.d/statd start</userinput></screen> + <screen>&prompt.root; <userinput>service lockd start</userinput> +&prompt.root; <userinput>service statd start</userinput></screen> <para>Ð¥ÑÑ€Ñв <acronym>NFS</acronym> харилцагч болон <acronym>NFS</acronym> Ñервер талуудын хооронд жинхÑÐ½Ñ Ñ„Ð°Ð¹Ð» цоожлолт хийгдÑÑ… @@ -1457,7 +1457,7 @@ NIS домÑйн нÑрийг <literal>test-domain</literal> болгоно.</pa <application>ypserv</application> демоныг гараар ажиллуулах Ñ…ÑÑ€ÑгтÑй.</para> - <screen>&prompt.root; <userinput>/etc/rc.d/ypserv start</userinput></screen> + <screen>&prompt.root; <userinput>service ypserv start</userinput></screen> </sect4> @@ -1719,7 +1719,7 @@ NIS харилцагчийг Ñ…Ñд Ñ…ÑдÑн Ñнзаар тохируулж Ð Ñупер Ñ…ÑÑ€ÑглÑгчийн ÑрхÑÑÑ€ ажиллуулах Ñ…ÑÑ€ÑгтÑй:</para> <screen>&prompt.root; <userinput>/etc/netstart</userinput> -&prompt.root; <userinput>/etc/rc.d/ypbind start</userinput></screen> +&prompt.root; <userinput>service ypbind start</userinput></screen> <para>Үүний дараа, <command>ypcat passwd</command> тушаалыг өгч NIS Ñерверийн passwd буулгалтыг харж чадаж байх Ñ‘Ñтой.</para> @@ -1811,9 +1811,11 @@ NIS Ñерверийн хоцролтыг ихÑÑгÑдÑг. ÐÐ½Ñ Ð½ÑмÑÐ»Ñ <para>NIS өгөгдлийн Ñан дотор бүртгÑл нь байгаа ч, зарим Ñ…ÑÑ€ÑглÑгчдийг тухайн машин руу нÑвтрÑхийг хаах нÑг арга байна. Үүний тулд <literal>-<replaceable>username</replaceable></literal> гÑÑÑн мөрийг -харилцагч машин дÑÑÑ€ <filename>/etc/master.passwd</filename> файлын төгÑгөлд нÑмÑÑ… +буÑад мөрүүдийн адил форматаар харилцагч машин дÑÑÑ€ <filename>/etc/master.passwd</filename> файлын төгÑгөлд нÑмÑÑ… Ñ…ÑÑ€ÑгтÑй. Ðнд <replaceable>username</replaceable> гÑдÑг нь нÑвтрÑхийг нь хаах гÑж байгаа Ñ…ÑÑ€ÑглÑгчийн нÑÑ€ юм. +ХааÑан Ñ…ÑÑ€ÑглÑгчийн мөр <literal>+</literal> гÑж нÑÑÑÑн NIS Ñ…ÑÑ€ÑглÑгчийн +Ð¼Ó©Ñ€Ó©Ó©Ñ Ð´ÑÑÑ€ байх Ñ‘Ñтой. ДÑÑрх үйлдлийг хийхдÑÑ <command>vipw</command>-г ашиглахыг зөвлөж байна. <command>vipw</command> нь <filename>/etc/master.passwd</filename> файл дотор хийгдÑÑн өөрчлөлтийг Ñ…Ñнах бөгөөд өөрчлөлт хийж дууÑÑаны дараа нÑвтрÑÑ… үгийн Ñанг автоматаар @@ -1821,7 +1823,7 @@ NIS Ñерверийн хоцролтыг ихÑÑгÑдÑг. ÐÐ½Ñ Ð½ÑмÑÐ»Ñ <hostid>basie</hostid> хоÑÑ‚ дÑÑÑ€ нÑвтрÑхийг хаахыг Ñ…Ò¯ÑÑж байгаа бол:</para> <screen>basie&prompt.root; <userinput>vipw</userinput> -<userinput>[add -bill to the end, exit]</userinput> +<userinput>[add -bill::::::::: to the end, exit]</userinput> vipw: rebuilding the database... vipw: done @@ -1842,8 +1844,8 @@ uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucic xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/sbin/nologin pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin -+::::::::: -bill ++::::::::: basie&prompt.root;</screen> </sect2> @@ -2737,7 +2739,7 @@ dhcpd_ifaces="dc0"</programlisting> <para>Дараа нь, доорх тушаалыг өгөн Ñерверийг ажиллуулах Ñ…ÑÑ€ÑгтÑй:</para> - <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/isc-dhcpd start</userinput></screen> + <screen>&prompt.root; <userinput>service isc-dhcpd start</userinput></screen> <para>СерверийнхÑÑ Ñ‚Ð¾Ñ…Ð¸Ñ€Ð³Ð¾Ð¾Ð½Ñ‹ файлд өөрчлөлт оруулах бүрдÑÑ, <literal>SIGHUP</literal> дохиог <application>dhcpd</application>-д өгөх нь буÑад дÑмонуудын @@ -3066,7 +3068,7 @@ dhcpd_ifaces="dc0"</programlisting> Ñ…ÑзгаарлагдÑан байдаг. ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€Ð³Ð¾Ð¾Ð³Ð¾Ð¾Ñ€ Ñерверийг ажиллуулахын тулд дараах тушаалыг өгөх Ñ…ÑÑ€ÑгтÑй:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/named onestart</userinput></screen> + <screen>&prompt.root; <userinput>service named onestart</userinput></screen> <para><application>named</application> дÑмонг ÑиÑтем ачаалах үед ажиллуулдаг болгохын тулд <filename>/etc/rc.conf</filename> дотор дараах мөрүүдийг нÑмÑÑ… @@ -4252,7 +4254,6 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting> &man.service.8; Ñ…ÑÑ€ÑгÑлийг ашиглан дараах тушаалуудын аль нÑгийг ажиллуулж хийнÑ:</para> - <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/apache22 configtest</userinput></screen> <screen>&prompt.root; <userinput>service apache22 configtest</userinput></screen> <note> @@ -4264,10 +4265,9 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting> <para>Ð¥ÑÑ€Ñв <application>Apache</application> тохиргооны алдаа өгөөгүй бол <application>Apache</application> <command>httpd</command>-г - адил &man.rc.8; ба &man.service.8; механизмаар Ñхлүүлж + адил &man.service.8; механизмаар Ñхлүүлж болно:</para> - <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/apache22 start</userinput></screen> <screen>&prompt.root; <userinput>service apache22 start</userinput></screen> <para><command>httpd</command> үйлчилгÑÑг вÑб хөтөч дÑÑÑ€ @@ -4672,7 +4672,7 @@ FTP хандалтыг зөвшөөрөх Ñ‘Ñгүй Ó©Ó©Ñ€ Ñ…ÑÑ€ÑглÑгчд ажиллах боломжтой болох бөгөөд ÑÑвÑл дараах тушаалыг <username>root</username> ÑрхÑÑÑ€ ажиллуулан Ñхлүүлж болно:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/ftpd start</userinput></screen> + <screen>&prompt.root; <userinput>service ftpd start</userinput></screen> <para>Одоо та дараах тушаалыг өгөн FTP Ñервер Ñ€Ò¯Ò¯ нÑвтрÑн орж болно:</para> @@ -4934,7 +4934,7 @@ LDAP, NIS+, SQL өгөгдлийн Ñан, ÑÑвÑл хувиргаÑан нÑÐ <para>Үүний дараа Ñ…Ò¯ÑÑÑн үедÑÑ <application>Samba</application>-г ÑхлүүлÑхийн тулд дараах тушаалыг өгөхөд хангалттай:</para> - <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/samba start</userinput> + <screen>&prompt.root; <userinput>service samba start</userinput> Starting SAMBA: removing stale tdbs : Starting nmbd. Starting smbd.</screen> @@ -4951,7 +4951,7 @@ Starting smbd.</screen> <para><application>Samba</application>-г Ñ…Ò¯ÑÑÑн үедÑÑ Ð·Ð¾Ð³Ñоохын тулд дараах тушаалыг өгөхөд хангалттай:</para> - <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/samba stop</userinput></screen> + <screen>&prompt.root; <userinput>service samba stop</userinput></screen> <para><application>Samba</application> бол µsoft.windows; ÑүлжÑÑÑ‚Ñй өргөн хүрÑÑнд нÑгдмÑл ажиллах боломжийг олгодог нарийн төвөгтÑй програмын цогц юм. @@ -5305,7 +5305,7 @@ syslogd_flags="-a logclient.example.com -v -v"</programlisting> <para>ÐÐ½Ñ Ò¯ÐµÐ´ <command>syslogd</command> демоныг дахин ажиллуулж шалгах Ñ‘Ñтой:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput> + <screen>&prompt.root; <userinput>service syslogd restart</userinput> &prompt.root; <userinput>pgrep syslog</userinput></screen> <para>Ð¥ÑÑ€Ñв <acronym>PID</acronym> буцаагдвал Ñервер нь амжилттай @@ -5378,7 +5378,7 @@ syslogd_flags="-s -v -v"</programlisting> <para>ÐÑмÑÑний дараа өөрчлөлтийг хүчинтÑй болгохын тулд <command>syslogd</command>-г дахин ÑхлүүлÑÑ… шаардлагатай:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput></screen> + <screen>&prompt.root; <userinput>service syslogd restart</userinput></screen> <para>СүлжÑÑгÑÑÑ€ бүртгÑлийн мÑдÑгдлүүдийг илгÑÑж байгаа ÑÑÑхийг теÑÑ‚ хийхийн тулд клиент дÑÑÑ€ &man.logger.1;-г ашиглаж мÑдÑгдлийг @@ -5414,7 +5414,7 @@ syslogd_flags="-s -v -v"</programlisting> <programlisting>syslogd_flags="-d -a logclien.example.com -v -v"</programlisting> - <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput></screen> + <screen>&prompt.root; <userinput>service syslogd restart</userinput></screen> <para>Доор дурдÑантай Ñ‚Ó©ÑÑ‚Ñй дибаг өгөгдөл дахин ачаалÑны дараа дÑлгÑц дÑÑÑ€ хурдан гарч өнгөрнө:</para> @@ -5440,7 +5440,7 @@ rejected in rule 0 due to name mismatch.</screen> Зөв болгож заÑан дахин ачаалÑны дараа хүлÑÑж байÑан үр дүнгÑÑ Ñ…Ð°Ñ€Ð°Ñ… болно:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput> + <screen>&prompt.root; <userinput>service syslogd restart</userinput> logmsg: pri 56, flags 4, from logserv.example.com, msg syslogd: restart syslogd: restarted logmsg: pri 6, flags 4, from logserv.example.com, msg syslogd: kernel boot file is /boot/kernel/kernel diff --git a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml index a591304be5..8ce58bac70 100644 --- a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 39010 + Original revision 41154 $FreeBSD$ --> @@ -144,16 +144,6 @@ <title>Ð¥ÑÑ€ÑглÑгчийн PPP ашиглах</title> - <warning> - <para>&os; 8.0-Ñ ÑхлÑÑд цуваа портын төхөөрөмжийн цÑг - <filename>/dev/cuad<replaceable>N</replaceable></filename> гÑдгÑÑÑ - <filename>/dev/cuau<replaceable>N</replaceable></filename> болон - <filename>/dev/ttyd<replaceable>N</replaceable></filename> гÑдгÑÑÑ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> болж өөрчлөгдÑөн. - &os; 7.X Ñ…ÑÑ€ÑглÑгчид дараах зааврыг ÑдгÑÑÑ€ өөрчлөлттÑй уÑлдуулж - ойлгох Ñ‘Ñтой болно.</para> - </warning> - <sect2> <title>Ð¥ÑÑ€ÑглÑгчийн PPP</title> @@ -1732,18 +1722,6 @@ exit 1 <indexterm><primary>PPP</primary><secondary>алдааг олж заÑварлах</secondary></indexterm> - <warning> - <para>&os; 8.0-Ñ ÑхлÑÑд &man.sio.4; драйверыг - &man.uart.4; драйвераар ÑольÑон. Цуваа портын төхөөрөмжийн - цÑг - <filename>/dev/cuad<replaceable>N</replaceable></filename> гÑдгÑÑÑ - <filename>/dev/cuau<replaceable>N</replaceable></filename> болон - <filename>/dev/ttyd<replaceable>N</replaceable></filename> гÑдгÑÑÑ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> болж - өөрчлөгдÑөн. &os; 7.X-ийн Ñ…ÑÑ€ÑглÑгчид дараах зааврыг - ÑдгÑÑÑ€ өөрчлөлтүүдтÑй уÑлдуулж ойлгох Ñ‘Ñтой.</para> - </warning> - <para>ÐÐ½Ñ Ñ…ÑÑÑг нь PPP-г модемийн холболтоор ашиглах үед гарч болох цөөн аÑуудлуудыг хамрах болно. ЖишÑÑ Ð½ÑŒ магадгүй танд залгаж холбогдох гÑж байгаа ÑиÑтем чинь Ñг Ñмар хүлÑÑÑ… мөрүүдийг үзүүлÑхийг @@ -2794,7 +2772,7 @@ water.CS.Example localhost.Example. UGH 34 47641234 lo0 - 0.438 <para>Тохиргоог даруй идÑвхтÑй болгохын тулд та <username>root</username> Ñ…ÑÑ€ÑглÑгчÑÑÑ€ дараах тушаалыг ажиллуулж болно:</para> - <screen>&prompt.root; /etc/rc.d/routing start</screen> + <screen>&prompt.root; service routing start</screen> <para>FreeBSD-ийн цөмийг тохируулах талаар бичÑÑн <xref linkend="kernelconfig"/>-Ñ Ó©Ó©Ñ€Ð¸Ð¹Ð½ цөмийг дахин тохируулах талаар лавлана уу.</para> diff --git a/mn_MN.UTF-8/books/handbook/preface/preface.xml b/mn_MN.UTF-8/books/handbook/preface/preface.xml index 48ae9c1b4f..f90ee9e6c2 100644 --- a/mn_MN.UTF-8/books/handbook/preface/preface.xml +++ b/mn_MN.UTF-8/books/handbook/preface/preface.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 1.50 + Original revision 40743 $FreeBSD$ --> diff --git a/mn_MN.UTF-8/books/handbook/printing/chapter.xml b/mn_MN.UTF-8/books/handbook/printing/chapter.xml index bbbb1a5882..14972bb5c5 100644 --- a/mn_MN.UTF-8/books/handbook/printing/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/printing/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 1.125 + Original revision 41064 $FreeBSD$ --> @@ -184,11 +184,8 @@ <sect2 id="printing-intro-why"> <title>Яагаад заавал түр хадгалагчийг ашиглах Ñ‘Ñтой гÑж</title> - <para>Та ÑиÑтемийнхÑÑ Ñ†Ð¾Ñ€Ñ‹Ð½ ганц Ñ…ÑÑ€ÑглÑгч бол - хандалтын Ñ…Ñналт, толгой хуудаÑнууд ÑÑвÑл Ñ…ÑвлÑгчийн бүртгÑл танд Ñ…ÑÑ€Ñгггүй - байхад Ñагаад заавал түр хадгалагчийн талаар Ñанаа зовох Ñ‘Ñтой гÑж та - гайхаж байж болох юм. Ð¥ÑвлÑгч уруу шууд хандалтыг идÑвхжүүлÑÑ… - боломжтой байдаг боловч та түр хадгалагчийг Ñмар ч байÑан ашиглах Ñ‘Ñтой, + <para>Ганц Ñ…ÑÑ€ÑглÑгчийн ÑиÑтем дÑÑÑ€ түр хадгалагч Ñ…ÑÑ€ÑгтÑй Ñ…ÑвÑÑÑ€ + байдаг бөгөөд түр хадгалагчийг ашиглах Ñ‘Ñтой юм, учир нь:</para> <itemizedlist> @@ -222,14 +219,6 @@ <sect1 id="printing-intro-setup"> <title>ҮндÑÑн тохируулга</title> - <warning> - <para>&os; 8.0-Ð°Ð°Ñ ÑхлÑÑд цуваа портын төхөөрөмжийн цÑгүүд - <filename>/dev/ttyd<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> болж өөрчлөгдÑөн. - &os; 7.X Ñ…ÑÑ€ÑглÑгчид доорх баримтыг үзÑхдÑÑ ÑдгÑÑрийг - бодолцох Ñ…ÑÑ€ÑгтÑй.</para> - </warning> - <para><application>LPD</application> түр хадгалах ÑиÑтемтÑй Ñ…ÑвлÑгчдийг ашиглахын тулд өөрийн Ñ…ÑвлÑгчийн тоног төхөөрөмж болон <application>LPD</application> програм хангамжийг тохируулах Ñ…ÑÑ€ÑгтÑй болно. ÐÐ½Ñ Ð±Ð°Ñ€Ð¸Ð¼Ñ‚ нь тохиргооны @@ -1411,14 +1400,6 @@ $%&'()*+,-./01234567 <sect1 id="printing-advanced"> <title>Ð¥ÑвлÑгчийн илүү нарийн тохиргоо</title> - <warning> - <para>&os; 8.0-Ð°Ð°Ñ ÑхлÑÑд цуваа портын төхөөрөмжийн цÑгүүд - <filename>/dev/ttyd<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> болж өөрчлөгдÑөн. - &os; 7.X Ñ…ÑÑ€ÑглÑгчид доорх баримтыг үзÑхдÑÑ ÑдгÑÑрийг - бодолцох Ñ…ÑÑ€ÑгтÑй.</para> - </warning> - <para>ÐÐ½Ñ Ñ…ÑÑÑгт онцгой загварчлагдÑан файлыг шүүгчид, хуудаÑны толгой Ñ…ÑÑÑг, ÑүлжÑÑгÑÑÑ€ Ñ…ÑвлÑÑ… мөн Ñ…ÑвлÑгчийг Ñ…ÑÑ€ÑглÑÑ… Ñрх болон Ñ…Ñзгаарлалт гÑÑÑн зүйлүүдийн тухай зааварлах болно.</para> diff --git a/mn_MN.UTF-8/books/handbook/security/chapter.xml b/mn_MN.UTF-8/books/handbook/security/chapter.xml index 045eee50df..8bf812605e 100644 --- a/mn_MN.UTF-8/books/handbook/security/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/security/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40625 + Original revision 41064 $FreeBSD$ --> @@ -602,8 +602,7 @@ болон түүхийн төхөөрөмжүүдÑд хандахыг хориглодог. Илүү өндөр түвшингүүд бүр илүү олон үйлдлүүдийг Ñ…Ñзгаарладаг. Төрөл бүрийн аюулгүй байдлын түвшнүүдийн үйлчилгÑÑний талаарх дÑлгÑÑ€Ñнгүй тайлбарыг &man.security.7; гарын авлагын - хуудÑыг уншина уу (&os; 7.0-Ñ Ñ…ÑƒÑƒÑ‡Ð¸Ð½ хувилбаруудын хувьд &man.init.8; гарын - авлагын хуудÑыг уншина уу).</para> + хуудÑыг уншина уу.</para> <note> <para>Ðюулгүйн түвшинг 1 ÑÑвÑл илүү өндөр түвшнÑÑÑ€ дÑÑшлүүлÑÑ… нь X11 @@ -1163,7 +1162,7 @@ GAME GAG WELT OUT DOWN CHAT</screen> <para>OPIE-г ÑхлүүлÑн тохируулж нÑвтÑÑ€Ñний дараа танд иймÑрхүү тушаал хүлÑÑÑ… мөр харуулагдана:</para> -<screen>&prompt.user; <userinput>telnet example.com</userinput> + <screen>&prompt.user; <userinput>telnet example.com</userinput> Trying 10.0.0.1... Connected to example.com Escape character is '^]'. @@ -1355,9 +1354,11 @@ Enter secret pass phrase: <userinput><secret password></userinput> <programlisting># This line is required for POP3 connections: qpopper : ALL : allow</programlisting> - <para>ÐÐ½Ñ Ð¼Ó©Ñ€Ð¸Ð¹Ð³ нÑмÑнийхÑÑ Ð´Ð°Ñ€Ð°Ð° <application>inetd</application>-г дахин ÑхлүүлÑÑ… - Ñ…ÑÑ€ÑгтÑй. Үүнийг &man.kill.1; тушаал ÑÑвÑл <filename>/etc/rc.d/inetd</filename>-г - <parameter>restart</parameter> параметртай ашиглан хийж болно.</para> + <para>ÐÐ½Ñ Ð¼Ó©Ñ€Ð¸Ð¹Ð³ нÑмÑнийхÑÑ Ð´Ð°Ñ€Ð°Ð° <application>inetd</application>-г &man.service.8; ашиглан + дахин ÑхлүүлÑÑ… Ñ…ÑÑ€ÑгтÑй:</para> + + <screen>&prompt.root; <userinput>service inetd restart</userinput></screen> + </sect2> <sect2> @@ -1697,8 +1698,8 @@ Password: <userinput>xxxxxxxx</userinput> Verifying password - Password: <userinput>xxxxxxxx</userinput></screen> <para>Одоо <acronym>KDC</acronym> үйлчилгÑÑнүүдийг ÑхлүүлÑÑ… цаг болжÑÑ. - ҮйлчилгÑÑнүүдийг ÑхлүүлÑхдÑÑ <command>/etc/rc.d/kerberos start</command> болон - <command>/etc/rc.d/kadmind start</command> тушаалуудыг + ҮйлчилгÑÑнүүдийг ÑхлүүлÑхдÑÑ <command>service kerberos start</command> болон + <command>service kadmind start</command> тушаалуудыг ажиллуулна. ÐÐ½Ñ Ò¯ÐµÐ´ танд Ñмар ч kerberos хийгдÑÑн дÑмон байхгүйг Ñанаарай, гÑхдÑÑ Ñ‚Ð° <acronym>KDC</acronym>-ийн өөрийнх нь тушаалын Ð¼Ó©Ñ€Ó©Ó©Ñ Ò¯Ò¯ÑгÑÑÑн удирдагчид (Ñ…ÑÑ€ÑглÑгч) зориулÑан таÑалбарыг авч жагÑаан <acronym>KDC</acronym>-г ажиллаж байгаа @@ -1807,7 +1808,7 @@ kadmin><userinput> exit</userinput></screen> идÑвхжүүлÑÑ…Ñд бÑлÑн болжÑÑ. ÐÐ½Ñ Ð¶Ð¸ÑˆÑÑн дÑÑÑ€ бид <command>telnet</command> үйлчилгÑÑг <filename>/etc/inetd.conf</filename> файлд доор дурдÑантай Ñ‚Ó©ÑÑ‚Ñй мөрийг оруулан идÑвхжүүлж дараа нь &man.inetd.8; үйлчилгÑÑг - <command>/etc/rc.d/inetd restart</command> тушаалын туÑламжтай + <command>service inetd restart</command> тушаалын туÑламжтай дахин ачаалах болно:</para> <programlisting>telnet stream tcp nowait root /usr/libexec/telnetd telnetd -a user</programlisting> @@ -2945,11 +2946,11 @@ racoon_enable="yes"</programlisting> <programlisting>sshd_enable="YES"</programlisting> <para>ÐÐ½Ñ Ð½ÑŒ дараагийн удаа таны ÑиÑтем ÑхлÑÑ…Ñд <application>OpenSSH</application>-д - зориулÑан &man.sshd.8; дÑмон програмыг дуудна. Мөн <filename>/etc/rc.d/sshd</filename> - &man.rc.8; Ñкрипт ашиглан <application>OpenSSH</application>-г ÑхлүүлÑÑ… + зориулÑан &man.sshd.8; дÑмон програмыг дуудна. Мөн + &man.service.8; ашиглан <application>OpenSSH</application>-г ÑхлүүлÑÑ… боломжтой байдаг:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/sshd start</userinput></screen> + <screen>&prompt.root; <userinput>service sshd start</userinput></screen> </sect2> <sect2> @@ -3303,7 +3304,7 @@ user@unfirewalled-system.example.org's password: <userinput>*******</userinput>< дараа &man.sshd.8;-д өөрийн тохиргооны файлуудыг дахин дуудахыг дараах тушаалыг ажиллуулж та Ñ…Ñлж өгөх Ñ‘Ñтой:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/sshd reload</userinput></screen> + <screen>&prompt.root; <userinput>service sshd reload</userinput></screen> </sect2> <sect2> diff --git a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml index 68f32e6bf9..57df2bb515 100644 --- a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 39553 + Original revision 41085 $FreeBSD$ --> @@ -25,30 +25,30 @@ <indexterm><primary>цуваа холбоонууд</primary></indexterm> <para>&unix; нь цуваа холбоонуудад зориулÑан дÑмжлÑгтÑй үргÑлж байÑаар ирÑÑн. Тухайлбал хамгийн анхны &unix; машинууд Ñ…ÑÑ€ÑглÑгчийн оролт болон гаралтын - хувьд цуваа шугамууд дÑÑÑ€ тулгуурладаг байÑан. Дундаж <quote>терминал</quote> нь + хувьд цуваа шугамууд дÑÑÑ€ тулгуурладаг байÑан. Дундаж терминал нь ÑекундÑд 10 Ñ‚ÑмдÑгт дамжих цуваа Ñ…ÑвлÑгч болон Ð³Ð°Ñ€Ð°Ð°Ñ Ñ‚Ð¾Ð³Ñ‚Ð´Ð¾Ð³ байÑан Ñ‚ÑÑ€ үеÑÑ Ñ…Ð¾Ð¹Ñˆ - ÑŽÐ¼Ñ Ð°Ñар их өөрчлөгдÑÓ©Ó©Ñ€ ирÑÑн юм. ÐÐ½Ñ Ð±Ò¯Ð»Ñг нь FreeBSD дÑÑÑ€ цуваа холбоонуудыг + ÑŽÐ¼Ñ Ð°Ñар их өөрчлөгдÑÓ©Ó©Ñ€ ирÑÑн юм. ÐÐ½Ñ Ð±Ò¯Ð»Ñг нь &os; дÑÑÑ€ цуваа холбоонуудыг ашиглах зарим Ð°Ñ€Ð³ÑƒÑƒÐ´Ð°Ð°Ñ Ð´ÑƒÑ€Ð´Ð°Ñ… болно.</para> <para>ÐÐ½Ñ Ð±Ò¯Ð»Ð³Ð¸Ð¹Ð³ уншÑаны дараа, та дараах зүйлÑийг мÑдÑÑ… болно:</para> <itemizedlist> - <listitem><para>Өөрийн FreeBSD ÑиÑтемд терминалуудыг Ñ…ÑрхÑн холбох + <listitem><para>&os; ÑиÑтемд терминалуудыг Ñ…ÑрхÑн холбох талаар.</para></listitem> <listitem><para>ÐлÑын хоÑтууд уруу Ñ…ÑрхÑн модемоор залгаж холбогдох талаар.</para></listitem> - <listitem><para>ÐлÑын Ñ…ÑÑ€ÑглÑгчдийг модемоор таны ÑиÑтем уруу + <listitem><para>ÐлÑын Ñ…ÑÑ€ÑглÑгчдийг модемоор &os; ÑиÑтем уруу нÑвтрÑхийг Ñ…ÑрхÑн зөвшөөрөх талаар.</para></listitem> - <listitem><para>Цуваа конÑÐ¾Ð»Ð¾Ð¾Ñ Ó©Ó©Ñ€Ð¸Ð¹Ð½ ÑиÑтемийг Ñ…ÑрхÑн + <listitem><para>Цуваа конÑÐ¾Ð»Ð¾Ð¾Ñ &os; ÑиÑтемийг Ñ…ÑрхÑн ачаалах талаар.</para></listitem> </itemizedlist> <para>ÐÐ½Ñ Ð±Ò¯Ð»Ð³Ð¸Ð¹Ð³ уншихааÑаа өмнө та дараах зүйлÑийг гүйцÑтгÑÑ… Ñ…ÑÑ€ÑгтÑй:</para> <itemizedlist> - <listitem><para>Ð¨Ð¸Ð½Ñ Ñ†Ó©Ð¼Ð¸Ð¹Ð³ Ñ…ÑрхÑн тохируулан Ñуулгах талаар мÑдÑÑ… (<xref - linkend="kernelconfig"/>).</para></listitem> - <listitem><para>&unix; зөвшөөрлүүд болон процеÑÑуудыг ойлгох (<xref linkend="basics"/>).</para></listitem> - <listitem><para>FreeBSD дÑÑÑ€ ашиглахыг Ñ…Ò¯ÑÑж байгаа - цуваа тоног төхөөрөмжийн (модем ÑÑвÑл олон порттой карт) техникийн гарын авлагад + <listitem><para><link linkend="kernelconfig">Ð¨Ð¸Ð½Ñ Ñ†Ó©Ð¼Ð¸Ð¹Ð³ Ñ…ÑрхÑн тохируулан Ñуулгах</link> + талаар мÑдÑÑ….</para></listitem> + <listitem><para><link linkend="basics">&unix; зөвшөөрлүүд болон процеÑÑуудыг</link> + ойлгох.</para></listitem> + <listitem><para>&os; дÑÑÑ€ ашиглагддаг цуваа тоног төхөөрөмжийн техникийн гарын авлагад хандаж болохоор байх.</para></listitem> </itemizedlist> </sect1> @@ -56,15 +56,6 @@ <sect1 id="serial"> <title>Танилцуулга</title> - <warning> - <para>&os; 8.0-Ð°Ð°Ñ ÑхлÑÑд цуваа портын төхөөрөмжийн цÑгүүд - <filename>/dev/cuad<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/cuau<replaceable>N</replaceable></filename> ба - <filename>/dev/ttyd<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> болж өөрчлөгдÑөн. - &os; 7.X Ñ…ÑÑ€ÑглÑгчид доорх баримтыг үзÑхдÑÑ ÑдгÑÑрийг - бодолцох Ñ…ÑÑ€ÑгтÑй.</para> - </warning> <!-- XXX Write me! --> <sect2 id="serial-terminology"> @@ -72,31 +63,31 @@ <variablelist> <varlistentry> - <term>bps</term> + <term><acronym>bps</acronym></term> <listitem> <indexterm><primary>bits-per-second</primary></indexterm> - <para>Bits per Second буюу ÑекундÑд дамжуулах бит — + <para>Bits per Second <acronym>bps</acronym> буюу ÑекундÑд дамжуулах бит — өгөгдөл дамжих хурд</para> </listitem> </varlistentry> <varlistentry> - <term>DTE</term> + <term><acronym>DTE</acronym></term> <listitem> <indexterm><primary>DTE</primary></indexterm> - <para>Data Terminal Equipment буюу Өгөгдлийн Терминал Төхөөрөмж — + <para>Data Terminal Equipment <acronym>DTE</acronym> буюу Өгөгдлийн Терминал Төхөөрөмж — жишÑÑ Ð½ÑŒ таны компьютер</para> </listitem> </varlistentry> <varlistentry> - <term>DCE</term> + <term><acronym>DCE</acronym></term> <listitem> <indexterm><primary>DCE</primary></indexterm> - <para>Data Communications Equipment буюу Өгөгдлийн Холбоонуудын Төхөөрөмж — таны модем</para> + <para>Data Communications Equipment <acronym>DCE</acronym> буюу Өгөгдлийн Холбоонуудын Төхөөрөмж — таны модем</para> </listitem> </varlistentry> @@ -105,23 +96,22 @@ <listitem> <indexterm><primary>RS-232C кабелиуд</primary></indexterm> - <para>Тоног төхөөрөмжийн цуваа холбоонуудад зориулÑан EIA Ñтандарт</para> + <para>Тоног төхөөрөмжийн цуваа холбоонуудад зориулÑан андагч Ñтандарт. + Одоо <acronym>TIA</acronym>-232 гÑгддÑг.</para> </listitem> </varlistentry> </variablelist> <para>Холбоонуудын өгөгдлийн хурдны талаар Ñрихдаа ÑÐ½Ñ Ñ…ÑÑÑг <quote>baud</quote> гÑÑÑн ухагдахууныг ашигладаггүй. Baud нь тодорхой хугацаанд хийгдÑÑн цахилгааны - төлвийн шилжилтүүдийн тоог Ñ…ÑлдÑг бол <quote>bps</quote> (bits per second - буюу ÑекундÑд дамжуулах бит) нь Ñ…ÑÑ€ÑглÑгдÑÑ… <emphasis>зөв</emphasis> - ойлголт юм (ÑÐ½Ñ Ð½ÑŒ Ñмар ч байÑан Ñ…Ñцүү зөрүүд хүмүүÑÑ‚ тийм ч Ñршиг төвөг болдоггүй - юм шиг Ñанагддаг).</para> + төлвийн шилжилтүүдийн тоог Ñ…ÑлдÑг бол <acronym>bps</acronym> нь Ñ…ÑÑ€ÑглÑгдÑÑ… <emphasis>зөв</emphasis> + ойлголт юм.</para> </sect2> <sect2 id="serial-cables-ports"> <title>Кабелиуд болон Портууд</title> - <para>Өөрийн FreeBSD ÑиÑтем уруу модем ÑÑвÑл терминалыг холбохын тулд + <para>&os; ÑиÑтем уруу модем ÑÑвÑл терминалыг холбохын тулд танд компьютер дÑÑÑ€ чинь цуваа порт болон өөрийн цуваа төхөөрөмж уруу холбох зөв кабель Ñ…ÑÑ€ÑгтÑй болно. Ð¥ÑÑ€Ñв та өөрийн тоног төхөөрөмжтÑй болон шаардагдах кабельтай аль Ñ…Ñдийн танил болÑон бол ÑÐ½Ñ Ñ…ÑÑгийг айлгүйгÑÑÑ€ орхиж болно.</para> @@ -131,7 +121,7 @@ <para>Ð¥Ñд Ñ…ÑдÑн Ó©Ó©Ñ€ Ó©Ó©Ñ€ төрлийн цуваа кабелиуд байдаг. Бидний зорилгод нийцÑÑ… хоёр хамгийн нийтлÑг төрөл бол null-модем болон Ñтандарт - (<quote>straight буюу шууд</quote>) RS-232 кабелиуд юм. Таны тоног + RS-232 кабелиуд юм. Таны тоног төхөөрөмжийн баримт шаардлагатай кабелийн төрлийг тайлбарлах Ñ‘Ñтой.</para> @@ -147,9 +137,9 @@ буюу ДамжигдÑан Өгөгдөл зүү нь нөгөө талын <quote>Received Data</quote> буюу ХүлÑÑн авÑан Өгөгдөл зүү уруу ордог.</para> - <para>Та Ð±Ð°Ñ Ó©Ó©Ñ€Ð¸Ð¹Ð½ null-модем кабелийг терминалуудтай ажиллахаар болгож - болно (Ó©Ó©Ñ€Ó©Ó©Ñ€ Ñ…ÑлбÑл чанарын зорилгоор). ÐÐ½Ñ Ñ…Ò¯ÑнÑгт нь RS-232C - <link linkend="serialcomms-signal-names">дохионууд</link> болон + <para>null-модем кабелийг терминалуудтай ажиллахаар болгож + болно. ÐÐ½Ñ Ñ…Ò¯ÑнÑгт нь RS-232C + <link linkend="serialcomms-signal-names">дохионуудын нÑÑ€Ñ</link> болон DB-25 холбогч дÑÑрх зүүний тоонуудыг харуулж байна. Мөн Ñтандарт нь шууд холбогдох 1-Ñ€ зүүг 1-Ñ€ зүү <emphasis>Protective Ground</emphasis> буюу Хамгаалалтын Газар шугам уруу дууддаг боловч ÑÐ½Ñ Ð½ÑŒ ихÑвчлÑн орхигддог. @@ -247,7 +237,7 @@ </tgroup> </table> - <para>Одоо үед нийтлÑг байдаг Ó©Ó©Ñ€ хоёр Ñхемийг Ñнд үзүүлÑв.</para> + <para>Дараагийн хоёр Ñ…Ò¯ÑнÑгт нийтлÑг байдаг Ó©Ó©Ñ€ хоёр Ñхемийг үзүүлÑв.</para> <table frame="none" pgwide="1"> <title>DB-9-Ó©Ó©Ñ DB-9 Null-Модем кабель</title> @@ -437,8 +427,7 @@ </note> <para>ДÑÑрх дизайнууд нь хамгийн нийтлÑг юм шиг Ñанагддаг. Ó¨Ó©Ñ€ хувилбарууд - дÑÑÑ€ (<emphasis>RS-232 Made Easy</emphasis> номонд тайлбарлаÑнаар) - SG нь SG уруу, TD нь RD уруу, RTS болон CTS нь DCD уруу, DTR нь + дÑÑÑ€ SG нь SG уруу, TD нь RD уруу, RTS болон CTS нь DCD уруу, DTR нь DSR уруу болон ÑÑÑ€ÑгÑÑÑ€ холбогддог.</para> </sect4> @@ -449,7 +438,7 @@ <para>Стандарт цуваа кабель нь RS-232C дохионуудыг бүгдийг нь шууд нÑвтрүүлдÑг. Ó¨Ó©Ñ€Ó©Ó©Ñ€ Ñ…ÑлбÑл кабелийн нÑг талын <quote>Transmitted Data</quote> буюу ДамжигдÑан Өгөгдөл зүү нь нөгөө талын <quote>Transmitted Data</quote> буюу - ДамжигдÑан Өгөгдөл зүү уруу ордог. ÐÐ½Ñ Ð½ÑŒ модемийг таны FreeBSD ÑиÑтем уруу болон + ДамжигдÑан Өгөгдөл зүү уруу ордог. ÐÐ½Ñ Ð½ÑŒ модемийг таны &os; ÑиÑтем уруу болон зарим нÑг тохирох терминалиуд уруу холбоход Ñ…ÑÑ€ÑглÑгдÑÑ… кабелийн төрөл юм.</para> </sect4> @@ -458,20 +447,20 @@ <sect3 id="term-ports"> <title>Портууд</title> - <para>Цуваа портууд нь өгөгдлийг FreeBSD хоÑÑ‚ компьютер болон терминалын хооронд + <para>Цуваа портууд нь өгөгдлийг &os; хоÑÑ‚ компьютер болон терминалын хооронд дамжуулах төхөөрөмжүүд юм. ÐÐ½Ñ Ñ…ÑÑÑг нь Ñмар төрлийн портууд байдаг болон - FreeBSD дÑÑÑ€ Ñ‚ÑдгÑÑрт Ñ…ÑрхÑн ханддагийг тайлбарлах болно.</para> + &os; дÑÑÑ€ Ñ‚ÑдгÑÑрт Ñ…ÑрхÑн ханддагийг тайлбарлах болно.</para> <sect4 id="term-portkinds"> <title>Портуудын төрлүүд</title> <para>Ð¥Ñд Ñ…ÑдÑн төрлийн портууд байдаг. Та кабелийг худалдаж авах юм уу ÑÑвÑл - хийхÑÑÑÑÑ Ó©Ð¼Ð½Ó© ÑÐ½Ñ Ð½ÑŒ таны терминал болон FreeBSD ÑиÑтем дÑÑрх портуудад + хийхÑÑÑÑÑ Ó©Ð¼Ð½Ó© ÑÐ½Ñ Ð½ÑŒ таны терминал болон &os; ÑиÑтем дÑÑрх портуудад таарах ÑÑÑхийг шалгах Ñ…ÑÑ€ÑгтÑй.</para> - <para>ИхÑнх терминалууд DB-25 портуудтай байдаг. FreeBSD ажиллаж байгаа PC-үүд зÑÑ€Ñг - перÑонал компьютерууд нь DB-25 ÑÑвÑл DB-9 портуудтай байдаг. Ð¥ÑÑ€Ñв та - PC дÑÑÑ€ÑÑ Ð¾Ð»Ð¾Ð½ порттой цуваа карттай бол танд RJ-12 ÑÑвÑл RJ-45 портууд + <para>ИхÑнх терминалууд DB-25 портуудтай байдаг. ПерÑонал компьютерууд нь + DB-25 ÑÑвÑл DB-9 портуудтай байдаг. + PC дÑÑÑ€ÑÑ Ð¾Ð»Ð¾Ð½ порттой цуваа карттай бол RJ-12 ÑÑвÑл RJ-45 портууд байж болох юм.</para> <para>Тоног төхөөрөмжтÑй цуг ирÑÑн Ð±Ð°Ñ€Ð¸Ð¼Ñ‚Ð°Ð°Ñ Ð°ÑˆÐ¸Ð³Ð»Ð°Ñ… портын төрлийн тодорхойлолтыг @@ -481,7 +470,7 @@ <sect4 id="term-portnames"> <title>Портын нÑÑ€Ñ</title> - <para>FreeBSD дÑÑÑ€ цуваа порт бүрт <filename>/dev</filename> Ñан дахь + <para>&os; дÑÑÑ€ цуваа порт бүрт <filename class="directory">/dev</filename> Ñан дахь оруулгаар та ханддаг. Хоёр Ó©Ó©Ñ€ төрлийн оруулга байдаг:</para> <itemizedlist> @@ -490,7 +479,7 @@ <filename>/dev/ttyu<replaceable>N</replaceable></filename> гÑгддÑг бөгөөд <replaceable>N</replaceable> нь Ñ‚ÑгÑÑÑ ÑхлÑÑ… портын дугаар юм. Ерөнхийдөө дуудагдах портыг терминалуудад зориулж - ашигладаг. Data carrier detect (DCD) буюу өгөгдлийн зөөгч илрүүлÑÑ… + ашигладаг. Data carrier detect (<acronym>DCD</acronym>) буюу өгөгдлийн зөөгч илрүүлÑÑ… дохиог зөв ажиллахыг цуваа шугам батлахыг дуудагдах портууд нь шаарддаг.</para> </listitem> @@ -499,15 +488,15 @@ <filename>/dev/cuau<replaceable>N</replaceable></filename> гÑгддÑг. Дуудах портуудыг терминалуудад зориулж ихÑвчлÑн ашигладаггүй, зөвхөн модемуудад зориулж ашигладаг. Цуваа кабель ÑÑвÑл терминал нь - зөөгчийг илрүүлÑÑ… дохиог дÑмждÑггүй бол та дуудах портуудыг ашиглаж + зөөгчийг илрүүлÑÑ… дохиог дÑмждÑггүй бол дуудах портуудыг ашиглаж болох юм.</para> </listitem> </itemizedlist> - <para>Ð¥ÑÑ€Ñв та терминалыг Ñхний цуваа порт уруу (&ms-dos; дÑÑÑ€ <devicename>COM1</devicename>) + <para>Ð¥ÑÑ€Ñв терминалыг Ñхний цуваа порт уруу (<devicename>COM1</devicename>) холбоÑон бол терминалд хандахдаа <filename>/dev/ttyu0</filename> гÑж ашиглах болно. Ð¥ÑÑ€Ñв терминал нь хоёр дахь цуваа порт дÑÑÑ€ байгаа бол - (Ð±Ð°Ñ <devicename>COM2</devicename> гÑгддÑг) <filename>/dev/ttyu1</filename> + (<devicename>COM2</devicename>) <filename>/dev/ttyu1</filename> гÑÑ… мÑÑ‚ÑÑÑ€ ашиглах Ñ‘Ñтой.</para> </sect4> @@ -517,11 +506,11 @@ <sect2> <title>Цөмийн тохиргоо</title> - <para>FreeBSD нь анхдагчаар дөрвөн цуваа портыг дÑмждÑг. &ms-dos;-ийн + <para>&os; нь анхдагчаар дөрвөн цуваа портыг дÑмждÑг. &ms-dos;-ийн ертөнцөд ÑдгÑÑÑ€ нь <devicename>COM1</devicename>, <devicename>COM2</devicename>, <devicename>COM3</devicename>, болон - <devicename>COM4</devicename> гÑгддÑг. FreeBSD нь одоогоор + <devicename>COM4</devicename> гÑгддÑг. &os; нь одоогоор BocaBoard 1008 болон 2016 зÑÑ€Ñг <quote>дүлий</quote> олон порттой цуваа интерфÑÐ¹Ñ ÐºÐ°Ñ€Ñ‚ÑƒÑƒÐ´ болон Digiboard болон Stallion Technologies-ийн хийдÑг илүү ухаалаг олон порттой картуудыг дÑмждÑг. ГÑхдÑÑ Ð°Ð½Ñ…Ð´Ð°Ð³Ñ‡ цөм нь зөвхөн @@ -530,44 +519,17 @@ <para>Таны цуваа портуудыг таны цөм таньж байгаа ÑÑÑхийг харахын тулд цөмийг ачаалж байх үед мÑдÑгдлүүдийг үзÑÑ… Ñ…ÑÑ€ÑгтÑй ÑÑвÑл цөмийн ачаалалтын мÑдÑгдлүүдийг дахин харуулах <command>/sbin/dmesg</command> - тушаалыг ашиглах Ñ…ÑÑ€ÑгтÑй. ЯлангуÑа &os; 8.0 болон түүнÑÑÑ Ñ…Ð¾Ð¹ÑˆÑ…Ð¸ хувилбар - ашиглаж байгаа бол <literal>uart</literal>, &os; 7.4 болон түүнÑÑÑ Ó©Ð¼Ð½Ó©Ñ… хувилбар - бол <literal>sio</literal> - Ñ‚ÑмдÑгтүүдÑÑÑ€ ÑÑ…ÑлÑÑн мÑдÑгдлүүдийг хайгаарай.</para> - - <tip><para>СуулгаÑан &os; Ñ…ÑƒÐ²Ð¸Ð»Ð±Ð°Ñ€Ð°Ð°Ñ Ñ…Ð°Ð¼Ð°Ð°Ñ€Ð°Ð½ - <literal>uart</literal> ÑÑвÑл <literal>sio</literal> орÑон мÑдÑгдлүүдийг - харахын тулд дараах тушаалуудыг ашиглана:</para> - - <screen>&prompt.root; <userinput>/sbin/dmesg | grep 'uart'</userinput> -&prompt.root; <userinput>/sbin/dmesg | grep 'sio'</userinput></screen> - </tip> - - <para>ЖишÑÑ Ð½ÑŒ &os; 7.<replaceable>X</replaceable> - дөрвөн цуваа порттой ÑиÑтем дÑÑÑ€ ÑдгÑÑÑ€ нь цуваа порттой холбоотой - цөмийн ачаалалтын мÑдÑгдлүүд юм:</para> - - <screen>sio0 at 0x3f8-0x3ff irq 4 on isa -sio0: type 16550A -sio1 at 0x2f8-0x2ff irq 3 on isa -sio1: type 16550A -sio2 at 0x3e8-0x3ef irq 5 on isa -sio2: type 16550A -sio3 at 0x2e8-0x2ef irq 9 on isa -sio3: type 16550A</screen> - - <para>Ð¥ÑÑ€Ñв таны цөм бүх цуваа портуудыг чинь танихгүй байгаа бол - та өөрийн цөмийг <filename>/boot/device.hints</filename> файлд - тохируулах Ñ…ÑÑ€ÑгтÑй байж болох юм. Та өөртөө байхгүй төхөөрөмжүүдийн + тушаалыг ашиглах Ñ…ÑÑ€ÑгтÑй. <literal>uart</literal> + Ñ‚ÑмдÑгтүүдÑÑÑ€ ÑÑ…ÑлÑÑн мÑдÑгдлүүдийг хайгаарай:</para> + + <screen>&prompt.root; <userinput>/sbin/dmesg | grep 'uart'</userinput></screen> + + <para>Ð¥ÑÑ€Ñв цөм бүх цуваа портуудыг чинь танихгүй байгаа бол + <filename>/boot/device.hints</filename> файлд + тохируулах Ñ…ÑÑ€ÑгтÑй байж болох юм. Байхгүй төхөөрөмжүүдийн хувьд Ñ‚ÑдгÑÑÑ€ мөрүүдийг тайлбар болгох ÑÑвÑл бүрмөÑөн арилгаж болох юм.</para> - <para>Цуваа портууд болон олон порттой хавтангийн тохиргооны талаар дÑлгÑÑ€Ñнгүй мÑдÑÑллийг - &man.sio.4; гарын авлагын хуудаÑÐ½Ð°Ð°Ñ Ð»Ð°Ð²Ð»Ð°Ð½Ð° уу. - Ó¨Ó©Ñ€ хувилбарын FreeBSD дÑÑÑ€ урьд нь ашиглаж байÑан тохиргооны файл та ашиглаж байгаа - бол болгоомжтой байгаарай, учир нь төхөөрөмжийн тугууд болон ÑÐ¸Ð½Ñ‚Ð°ÐºÑ Ñ…ÑƒÐ²Ð¸Ð»Ð±Ð°Ñ€ÑƒÑƒÐ´ - хооронд өөрчлөгдÑөн байдаг.</para> - <note> <para><literal>IO_COM1 порт</literal> нь <literal>0x3f8</literal> хаÑг дÑÑрх портод зориулагдÑан орлуулалт юм, <literal>IO_COM2</literal> нь <literal>0x2f8</literal>-ийн @@ -586,11 +548,11 @@ sio3: type 16550A</screen> <title>Төхөөрөмжийн ТуÑгай файлууд</title> <para>Цөм дÑÑ… ихÑнх төхөөрөмжүүдÑд <quote>төхөөрөмжийн туÑгай файлууд</quote>ын - туÑламжтайгаар ханддаг бөгөөд ÑдгÑÑÑ€ файлууд нь <filename>/dev</filename> + туÑламжтайгаар ханддаг бөгөөд ÑдгÑÑÑ€ файлууд нь <filename class="directory">/dev</filename> Ñанд байдаг. <devicename>sio</devicename> төхөөрөмжид <filename>/dev/ttyu<replaceable>N</replaceable></filename> (dial-in буюу Ð³Ð°Ð´Ð½Ð°Ð°Ñ Ð·Ð°Ð»Ð³Ð°Ñ…) болон <filename>/dev/cuau<replaceable>N</replaceable></filename> - (call-out буюу дуудах) төхөөрөмжүүдийн туÑламжтай ханддаг. FreeBSD нь + (call-out буюу дуудах) төхөөрөмжүүдийн туÑламжтай ханддаг. &os; нь Ð±Ð°Ñ ÑхлүүлÑÑ… төхөөрөмжүүд (<filename>/dev/ttyu<replaceable>N</replaceable>.init</filename> болон <filename>/dev/cuau<replaceable>N</replaceable>.init</filename>) @@ -628,7 +590,7 @@ sio3: type 16550A</screen> идÑвхтÑй байдаг. Дахин онгойлгоход ÑÐ½Ñ Ð½ÑŒ анхдагч тохиргоо уруугаа буцдаг. Ðнхдагч олонлогт өөрчлөлтүүдийг хийхийн тулд та онгойлгоод <quote>Ñхний төлөвт</quote> төхөөрөмжийн тохиргоонуудыг тааруулж - болно. ЖишÑÑ Ð½ÑŒ <devicename>ttyu5</devicename>-ийн хувьд анхдагчаар + болно. ЖишÑÑ Ð½ÑŒ <devicename>ttyu5</devicename>-ийн хувьд <option>CLOCAL</option> горим, 8 бит холбоо, болон <option>XON/XOFF</option> урÑгалын Ñ…Ñналтыг идÑвхжүүлÑхийн тулд доор дурдÑаныг бичнÑ:</para> @@ -654,7 +616,7 @@ sio3: type 16550A</screen> өөрчлөхийг оролдоход хурд нь 57600 bps-Ñ Ñ…Ó©Ð´Ð»Ó©Ñ…Ð³Ò¯Ð¹ байх болно.</para> - <para>ÐœÑдÑÑж та Ñхний төлөвт болон түгжих төлөвт төхөөрөмжүүдийг зөвхөн + <para>Ðхний төлөвт болон түгжих төлөвт төхөөрөмжүүдийг зөвхөн <username>root</username> бүртгÑл бичдÑгÑÑÑ€ болгох Ñ…ÑÑ€ÑгтÑй.</para> </sect2> </sect1> @@ -672,20 +634,10 @@ sio3: type 16550A</screen> </sect1info> <title>Терминалууд</title> - <warning> - <para>&os; 8.0-Ð°Ð°Ñ ÑхлÑÑд цуваа портын төхөөрөмжийн цÑгүүд - <filename>/dev/cuad<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/cuau<replaceable>N</replaceable></filename> ба - <filename>/dev/ttyd<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> болж өөрчлөгдÑөн. - &os; 7.X Ñ…ÑÑ€ÑглÑгчид доорх баримтыг үзÑхдÑÑ ÑдгÑÑрийг - бодолцох Ñ…ÑÑ€ÑгтÑй.</para> - </warning> - <indexterm><primary>терминалууд</primary></indexterm> <para>Терминалууд нь таныг компьютерийнхаа конÑол дÑÑÑ€ байхгүй үед ÑÑвÑл ÑүлжÑÑнд - холбогдоогүй байхад амархан, Ò¯Ð½Ñ Ñ…Ñмд аргаар FreeBSD ÑиÑтем уруу хандах + холбогдоогүй байхад амархан, Ò¯Ð½Ñ Ñ…Ñмд аргаар &os; ÑиÑтем уруу хандах боломжийг олгодог. ÐÐ½Ñ Ñ…ÑÑÑг нь терминалуудыг FreeBSD-Ñ‚Ñй Ñ…ÑрхÑн ашиглах талаар тайлбарлана.</para> @@ -694,41 +646,22 @@ sio3: type 16550A</screen> <para>Ðнхдагч &unix; ÑиÑтемүүдÑд конÑол байгаагүй юм. Харин компьютерийн цуваа портуудад холбогдÑон терминалуудаар Ñ…Ò¯Ð¼Ò¯Ò¯Ñ Ð½ÑвтрÑн ороод програмууд ажиллуулдаг - байÑан байна. ÐÐ½Ñ Ð½ÑŒ зөвхөн текÑÑ‚ орчны ажил хийхийн тулд модем болон терминал - програм хангамж ашиглан алÑын ÑиÑтемд залган орохтой бараг Ñ‚Ó©ÑÑ‚Ñй юм.</para> + байÑан байна.</para> - <para>Одоогийн PC-үүд нь өндөр чанарын графикуудыг үзүүлж чадах конÑолуудтай - боловч цуваа порт дÑÑÑ€ нÑвтрÑÑ… ÑеÑÑ Ò¯Ò¯ÑгÑÑ… чадвар өнөөгийн бараг бүх - &unix; загварын үйлдлийн ÑиÑтемд байдаг бөгөөд FreeBSD ч Ð±Ð°Ñ Ò¯Ò¯Ð½Ð¸Ð¹ нÑгÑн + <para>Цуваа порт дÑÑÑ€ нÑвтрÑÑ… ÑеÑÑ Ò¯Ò¯ÑгÑÑ… чадвар өнөөгийн бараг бүх + &unix; загварын үйлдлийн ÑиÑтемд байдаг бөгөөд &os; ч Ð±Ð°Ñ Ò¯Ò¯Ð½Ð¸Ð¹ нÑгÑн адил юм. Ðшиглагдаагүй байгаа цуваа портод холбогдÑон терминалыг ашиглан - та нÑвтрÑн орж дурын текÑÑ‚ програмыг конÑол ÑÑвÑл X цонхны ÑиÑтем дÑÑÑ€ + та нÑвтрÑн орж дурын текÑÑ‚ програмыг конÑол ÑÑвÑл <command>xterm</command> цонхонд ажиллуулдаг байÑан шигÑÑÑ€ ажиллуулж болох юм.</para> - <para>БизнеÑийн Ñ…ÑÑ€ÑглÑгчийн хувьд та FreeBSD ÑиÑтемд олон терминалуудыг - холбож Ñ‚ÑдгÑÑрийг өөрийн ажилтнуудынхаа ширÑÑний компьютерууд дÑÑÑ€ байрлуулж - болох юм. ГÑрийн Ñ…ÑÑ€ÑглÑгчийн хувьд хуучин IBM PC ÑÑвÑл &macintosh; зÑÑ€Ñг - нөөц компьютер нь FreeBSD ажиллуулж байгаа илүү хүчтÑй компьютерт холбогдÑон - терминал болж болох юм. Та ганц Ñ…ÑÑ€ÑглÑгчийн байÑан компьютерийг хүчирхÑг олон + <para>&os; ÑиÑтемд олон терминалуудыг + холбож болох юм. Хуучин компьютер нь &os; ажиллуулж байгаа илүү хүчтÑй компьютерт холбогдÑон + терминал болж болох юм. ИнгÑÑнÑÑÑ€ ганц Ñ…ÑÑ€ÑглÑгчийн байÑан компьютерийг хүчирхÑг олон Ñ…ÑÑ€ÑглÑгчийн ÑиÑтем болгон хувиргаж болох юм.</para> - <para>FreeBSD-ийн хувьд гурван төрлийн терминал байдаг:</para> - - <itemizedlist> - <listitem> - <para><link linkend="term-dumb">Дүлий терминалууд</link></para> - </listitem> - - <listitem> - <para><link linkend="term-pcs">Терминал маÑгаар ажиллаж байгаа PC-үүд</link></para> - </listitem> - - <listitem> - <para><link linkend="term-x">X терминалууд</link></para> - </listitem> - </itemizedlist> - - <para>Дараах дÑд Ñ…ÑÑгүүд нь дÑÑрх төрлүүдийг тайлбарлах болно.</para> + <para>ÐÐ½Ñ Ñ…ÑÑÑгт &os;-н дÑмждÑг дүлий терминал, терминал Ñ…ÑлбÑÑ€ÑÑÑ€ ажиллаж байгаа компьютер, + болон X терминал гÑÑÑн гурван төрлийн терминалын талаар тайлбарлана.</para> <sect3 id="term-dumb"> <title>Дүлий терминалууд</title> @@ -741,13 +674,11 @@ sio3: type 16550A</screen> гÑÑ… зÑргүүдийг ажиллуулах хүчин чадал бүхий таны компьютерт Ñ‚ÑдгÑÑрийг холбодог.</para> - <para>Digital Equipment Corporation-ий VT-100 болон Wyse-ийн WY-75 - зÑÑ€Ñг олон үйлдвÑрлÑгчдийн хийÑÑн дүлий терминалуудын Ñ…ÑдÑн зуун төрөл байдаг. - Бараг бүх төрөл FreeBSD-Ñ‚Ñй цуг ажиллана. Зарим нÑг өндөр чанартай терминалууд + <para>Бараг бүх төрөл FreeBSD-Ñ‚Ñй цуг ажиллана. Зарим нÑг өндөр чанартай терминалууд график үзүүлж чаддаг боловч ÑдгÑÑÑ€ дÑвшилтÑÑ‚ боломжуудыг зөвхөн цөөн Ñ…ÑдÑн програм хангамжийн багцууд ашиглаж чаддаг.</para> - <para>Ðжилтнууд нь X цонхны ÑиÑтемийн зÑÑ€Ñг график програмуудад хандах шаардлагагүй + <para>Ðжилтнууд нь график програмуудад хандах шаардлагагүй ажлын орчинд дүлий терминалууд нь түгÑÑмÑл байдаг.</para> </sect3> @@ -760,8 +691,8 @@ sio3: type 16550A</screen> <emphasis>терминал ÑмулÑц хийх</emphasis> програм хангамж хоёр л Ñ…ÑÑ€ÑгтÑй болох юм.</para> - <para>Ийм тохиргоо гÑрт их нийтлÑг байдаг. ЖишÑÑ Ð½ÑŒ Ñ…ÑÑ€Ñв таны гÑÑ€ бүлийн хүн FreeBSD - ÑиÑтемийн чинь конÑол дÑÑÑ€ завгүй ажиллаж байвал та FreeBSD ÑиÑтем уруу терминал + <para>Ийм тохиргоо их ашигтай байдаг. ЖишÑÑ Ð½ÑŒ Ñ…ÑÑ€Ñв нÑг Ñ…ÑÑ€ÑглÑгч &os; + ÑиÑтемийн конÑол дÑÑÑ€ завгүй ажиллаж байвал Ó©Ó©Ñ€ Ñ…ÑÑ€ÑглÑгч &os; ÑиÑтем уруу терминал маÑгаар холбоÑон арай хүчин чадал багатай перÑонал компьютер дÑÑÑ€ÑÑÑ Ð·Ð°Ñ€Ð¸Ð¼ нÑг текÑÑ‚ орчны ажил зÑÑ€Ñг хийж байж болох юм.</para> @@ -784,17 +715,14 @@ sio3: type 16550A</screen> <note> <para>&os; дÑÑÑ€ төхөөрөмжийн дугаарууд нь нÑгÑÑÑ Ð±Ð¸Ñˆ Ñ‚ÑгÑÑÑ ÑÑ…ÑлдÑг - (жишÑÑ Ð½ÑŒ &ms-dos;-Ð¾Ð¾Ñ Ò¯Ò¯Ð´ÑлтÑй ÑиÑтемүүд дÑÑÑ€ байдаг шиг - биш). ÐÐ½Ñ Ð½ÑŒ юу гÑÑÑн үг Ð²Ñ Ð³ÑÑ…ÑÑÑ€ &ms-dos; дÑÑÑ€ тулгуурлаÑан - ÑиÑтемүүдийн <devicename>COM1</devicename> гÑж нÑрлÑдÑг порт + ÐÐ½Ñ Ð½ÑŒ <devicename>COM1</devicename> гÑж нÑрлÑдÑг порт &os; дÑÑÑ€ ихÑвчлÑн <filename>/dev/cuau0</filename> гÑгддÑг.</para> </note> <note> <para>Зарим Ñ…Ò¯Ð¼Ò¯Ò¯Ñ Ð¿Ð¾Ñ€Ñ‚Ñ‹Ð½ цуглуулгад байдаг Ó©Ó©Ñ€ програмууд ашиглахыг - илүүд үздÑг. Портуудад &man.cu.1; болон &man.tip.1;-Ñ‚Ñй - Ñ‚Ó©ÑÑ‚Ñй ажилладаг <filename role="package">comms/minicom</filename> зÑÑ€Ñг + илүүд үздÑг. <filename role="package">comms/minicom</filename> зÑÑ€Ñг цөөнгүй Ñ…ÑдÑн Ñ…ÑÑ€ÑгÑлүүд байдаг.</para> </note> </sect3> @@ -807,8 +735,7 @@ sio3: type 16550A</screen> Зөвхөн текÑÑ‚ орчны програмуудад зориулагдÑан биш Ñ‚ÑдгÑÑÑ€ нь харин X програм үзүүлж чаддаг.</para> - <para>ÐÐ½Ñ ÑÑдвийг гүйцÑд хамарч бүрÑн бүтÑн байлгах үүднÑÑÑ Ð±Ð¸Ð´ X терминалуудыг - танилцуулж байна. ГÑхдÑÑ ÑÐ½Ñ Ð±Ò¯Ð»Ñг X терминалуудыг Ñуулгах, тохируулах болон + <para>ÐÐ½Ñ Ð±Ò¯Ð»Ñг X терминалуудыг Ñуулгах, тохируулах болон Ñ‚ÑдгÑÑрийн Ñ…ÑÑ€ÑглÑÑг <emphasis>тайлбарлахгүй</emphasis>.</para> </sect3> </sect2> @@ -816,27 +743,27 @@ sio3: type 16550A</screen> <sect2 id="term-config"> <title>Тохиргоо</title> - <para>ÐÐ½Ñ Ñ…ÑÑÑг нь терминал дÑÑÑ€ нÑвтрÑÑ… ÑеÑÑ Ð¸Ð´ÑвхжүүлÑхийн тулд өөрийн FreeBSD ÑиÑтем + <para>ÐÐ½Ñ Ñ…ÑÑÑг нь терминал дÑÑÑ€ нÑвтрÑÑ… ÑеÑÑ Ð¸Ð´ÑвхжүүлÑхийн тулд өөрийн &os; ÑиÑтем дÑÑÑ€ таныг юу тохируулах Ñ…ÑÑ€ÑгтÑйг тайлбарлах болно. ÐÐ½Ñ Ð½ÑŒ цуваа порт дÑмжихÑÑÑ€ өөрийн цөмийг таныг аль Ñ…Ñдийн тохируулÑан байгаа гÑж үздÑг. Цуваа порт уруу терминал холбогдÑон бөгөөд таныг Ñ‚ÑÑ€ терминал уруу холбогдÑон байгаа гÑж тооцдог.</para> <para><command>init</command> процеÑÑ Ð½ÑŒ бүх процеÑÑийн Ñ…Ñналт болон - ÑиÑтемийн ÑхлүүлÑÑ… үе дÑÑ… Ñхний тохиргоог хариуцдагийг <xref linkend="boot"/>-Ñ - Ñанах Ñ…ÑÑ€ÑгтÑй. <command>init</command>-ийн хийдÑг үйлдлүүдийн нÑг нь + ÑиÑтемийн ÑхлүүлÑÑ… үе дÑÑ… Ñхний тохиргоог хариуцдаг. + <command>init</command>-ийн хийдÑг үйлдлүүдийн нÑг нь <filename>/etc/ttys</filename> файлыг уншиж байгаа терминалууд дÑÑÑ€ <command>getty</command> процеÑÑийг ÑхлүүлÑÑ… Ñвдал юм. <command>getty</command> процеÑÑ Ð½ÑŒ нÑвтрÑÑ… нÑрийг уншиж <command>login</command> програмыг ажиллуулахыг хариуцдаг.</para> - <para>ТиймÑÑÑ Ó©Ó©Ñ€Ð¸Ð¹Ð½ FreeBSD ÑиÑтемийн хувьд терминалуудыг тохируулахын + <para>&os; ÑиÑтемийн хувьд терминалуудыг тохируулахын тулд <username>root</username> Ñ…ÑÑ€ÑглÑгчÑÑÑ€ дараах алхмуудыг гүйцÑтгÑÑ… Ñ…ÑÑ€ÑгтÑй:</para> <procedure> <step> - <para><filename>/dev</filename> Ñан дахь оруулгад зориулж + <para><filename class="directory">/dev</filename> Ñан дахь оруулгад зориулж <filename>/etc/ttys</filename> файлд Ñ…ÑÑ€Ñв байхгүй бол цуваа портын мөрийг нÑмнÑ.</para> </step> @@ -868,15 +795,14 @@ sio3: type 16550A</screen> <para>ÐÑмÑлт алхам болгож хоёрдугаар алхам дÑÑÑ€ та Ó©Ó©Ñ€ <replaceable>getty</replaceable> төрлийг Ñ…ÑÑ€ÑглÑÑнд зориулан <filename>/etc/gettytab</filename>-д - оруулан Ò¯Ò¯ÑгÑж болох юм. ÐÐ½Ñ Ð±Ò¯Ð»Ñг нь үүнийг Ñ…ÑрхÑн хийхийг тайлбарлахгүй бөгөөд - дÑлгÑÑ€Ñнгүй мÑдÑÑллийг &man.gettytab.5; болон &man.getty.8; гарын + оруулан Ò¯Ò¯ÑгÑж болох юм. ДÑлгÑÑ€Ñнгүй мÑдÑÑллийг &man.gettytab.5; болон &man.getty.8; гарын авлагын хуудаÑÐ½ÑƒÑƒÐ´Ð°Ð°Ñ Ò¯Ð·Ñхийг зөвлөж байна.</para> <sect3 id="term-etcttys"> <title><filename>/etc/ttys</filename> уруу оруулгууд нÑмÑÑ… нь</title> <para><filename>/etc/ttys</filename> файл нь нÑвтрÑлтүүдийг зөвшөөрөхийг Ñ…Ò¯ÑÑÑн - таны FreeBSD ÑиÑтем дÑÑрх бүх портуудыг жагÑаадаг. ЖишÑÑ Ð½ÑŒ Ñхний виртуал конÑол + &os; ÑиÑтем дÑÑрх бүх портуудыг жагÑаадаг. ЖишÑÑ Ð½ÑŒ Ñхний виртуал конÑол <devicename>ttyv0</devicename> нь ÑÐ½Ñ Ñ„Ð°Ð¹Ð»Ð´ өөрийн оруулгатай байна. Та ÑÐ½Ñ Ð¾Ñ€ÑƒÑƒÐ»Ð³Ñ‹Ð³ ашиглан конÑол дÑÑÑ€ нÑвтрÑн орж чадна. ÐÐ½Ñ Ñ„Ð°Ð¹Ð» нь Ð±Ð°Ñ Ð±ÑƒÑад виртуал конÑолууд, цуваа портууд, болон пÑевдо tty-уудын оруулгуудыг Ð±Ð°Ñ Ð°Ð³ÑƒÑƒÐ»Ð´Ð°Ð³. Хатуугаар холбогдÑон терминалын хувьд @@ -884,18 +810,18 @@ sio3: type 16550A</screen> Ñ…ÑÑÑггүйгÑÑÑ€ (жишÑÑ Ð½ÑŒ <filename>/dev/ttyv0</filename> нь <devicename>ttyv0</devicename> гÑж жагÑаагдах болно) жагÑаадаг.</para> - <para>Ðнхдагч FreeBSD Ñуулгац нь <filename>/etc/ttys</filename> файлыг + <para>Ðнхдагч &os; Ñуулгац нь <filename>/etc/ttys</filename> файлыг Ñхний дөрвөн цуваа портын дÑмжлÑгтÑйгÑÑÑ€ агуулдаг: <devicename>ttyu0</devicename>-Ñ - <devicename>ttyu3</devicename> хооронд байна. Ð¥ÑÑ€Ñв та терминалыг ÑдгÑÑÑ€ + <devicename>ttyu3</devicename> хооронд байна. Терминалыг ÑдгÑÑÑ€ портуудын аль нÑгÑнд холбож байгаа бол Ó©Ó©Ñ€ оруулга нÑмÑÑ… шаардлагагүй юм.</para> <example id="ex-etc-ttys"> <title><filename>/etc/ttys</filename> уруу терминалын оруулгууд нÑмÑÑ… нь</title> - <para>Бид ÑиÑтемд хоёр терминал холбохыг Ñ…Ò¯ÑлÑÑ Ð³Ñж бодъё: Wyse-50 + <para>ÐÐ½Ñ Ð¶Ð¸ÑˆÑÑ Ñ…Ð¾Ñ‘Ñ€ терминалыг тохируулна: Wyse-50 болон VT-100 терминалыг ÑмулÑц хийх <application>Procomm</application> терминал програм хангамжийг ажиллуулж байгаа хуучин 286 IBM PC-г - терминал маÑгаар ашиглаÑ. Бид Wyse-ийг хоёр дахь цуваа порт уруу + терминал маÑгаар ашиглаÑ. Wyse-ийг хоёр дахь цуваа порт уруу холбож 286-г зургаа дахь цуваа порт уруу холбоё (олон порттой цуваа картын порт). <filename>/etc/ttys</filename> файл дахь харгалзах оруулгууд нь иймÑрхүү байна:</para> @@ -911,7 +837,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure <calloutlist> <callout arearefs="co-ttys-line1col1"> - <para>Ðхний талбар нь ихÑвчлÑн <filename>/dev</filename>-д байгаа + <para>Ðхний талбар нь ихÑвчлÑн <filename class="directory">/dev</filename>-д байгаа терминалын туÑгай файлын нÑрийг заадаг.</para> </callout> @@ -924,7 +850,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure <para><command>getty</command> програм нь нÑг (нÑмÑлт) параметр <replaceable>getty</replaceable> төрлийг өөрийн тушаалын мөрөнд хүлÑÑн авдаг. <replaceable>getty</replaceable> төрөл нь - терминалын шугам дахь bps хурд болон parity зÑÑ€Ñг шинжүүдийг + терминалын шугам дахь <acronym>bps</acronym> хурд болон parity зÑÑ€Ñг шинжүүдийг тохируулдаг. <command>getty</command> програм нь ÑдгÑÑÑ€ шинжүүдийг <filename>/etc/gettytab</filename> Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ ÑƒÐ½ÑˆÐ´Ð°Ð³.</para> @@ -934,7 +860,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure Бараг бүх тохиолдолд <literal>std</literal> текÑÑ‚ÑÑÑ€ ÑÑ…ÑлÑÑн оруулгууд нь hardwired буюу хатуугаар холбогдÑон терминалуудын хувьд ажилладаг. ÐдгÑÑÑ€ оруулгууд нь parity-г орхидог. - 110-Ð°Ð°Ñ 115200 хүртÑл bps хурд болгоны хувьд <literal>std</literal> + 110-Ð°Ð°Ñ 115200 хүртÑл <acronym>bps</acronym> хурд болгоны хувьд <literal>std</literal> оруулга байдаг. ÐœÑдÑÑж та өөрийнхөө оруулгыг ÑÐ½Ñ Ñ„Ð°Ð¹Ð»Ð´ нÑмж болно. &man.gettytab.5; гарын авлагын Ñ…ÑƒÑƒÐ´Ð°Ñ Ð¸Ð»Ò¯Ò¯ дÑлгÑÑ€Ñнгүй мÑдÑÑллийг өгөх болно.</para> @@ -976,7 +902,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure <callout arearefs="co-ttys-line1col5"> <para>Сүүлийн талбар нь порт аюулгүй ÑÑÑхийг заахад Ñ…ÑÑ€ÑглÑгддÑг. Портыг secure буюу аюулгүй болгох нь <username>root</username> - бүртгÑлийг (ÑÑвÑл Ñ…ÑÑ€ÑглÑгчийн ID 0 бүхий дурын бүртгÑлийг) Ñ‚ÑÑ€ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð¾Ñ + бүртгÑлийг (ÑÑвÑл Ñ…ÑÑ€ÑглÑгчийн <acronym>UID</acronym> 0 бүхий дурын бүртгÑлийг) Ñ‚ÑÑ€ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð¾Ñ Ð½ÑвтрÑхийг зөвшөөрч хангалттай итгÑÐ½Ñ Ð³ÑÑÑн үг юм. Insecure буюу аюулгүй биш портууд нь <username>root</username> нÑвтрÑлтүүдийг зөвшөөрдөггүй. Insecure буюу аюулгүй биш порт дÑÑÑ€ Ñ…ÑÑ€ÑглÑгчид нь @@ -985,7 +911,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure Ñ‘Ñтой юм.</para> <para>ТүгжÑÑÑ‚Ñй хаалганы цаана байгаа терминалын хувьд ч гÑÑÑн - <quote>insecure</quote> тохируулгыг ашиглах нь хамгийн зөв зүйтÑй + <literal>insecure</literal> тохируулгыг ашиглах нь хамгийн зөв зүйтÑй юм. Ð¥ÑÑ€Ñв танд Ñупер Ñ…ÑÑ€ÑглÑгчийн зөвшөөрлүүд Ñ…ÑÑ€ÑгтÑй бол нÑвтрÑн ороод <command>su</command> тушаалыг ашиглах нь их амархан байдаг.</para> @@ -1000,13 +926,13 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure <para><filename>/etc/ttys</filename> файлд шаардлагатай өөрчлөлтүүдийг хийÑний дараа <command>init</command> процеÑÑ ÑƒÑ€ÑƒÑƒ өөрийн тохиргооных нь файлыг - дахин уншуулахын тулд SIGHUP (hangup) дохиог илгÑÑÑ… Ñ…ÑÑ€ÑгтÑй. ЖишÑÑ Ð½ÑŒ:</para> + дахин уншуулахын тулд SIGHUP (hangup) дохиог илгÑÑÑ… Ñ…ÑÑ€ÑгтÑй:</para> <screen>&prompt.root; <userinput>kill -HUP 1</userinput></screen> <note> <para><command>init</command> нь үргÑлж ÑиÑтем дÑÑÑ€ ажиллаж байгаа Ñхний - процеÑÑ Ð±Ð°Ð¹Ð´Ð°Ð³ учир ÑÐ½Ñ Ð½ÑŒ үргÑлж PID 1-Ñ‚Ñй байна.</para> + процеÑÑ Ð±Ð°Ð¹Ð´Ð°Ð³ учир ÑÐ½Ñ Ð½ÑŒ үргÑлж процеÑÑ ID 1-Ñ‚Ñй байна.</para> </note> <para>Ð¥ÑÑ€Ñв бүгд зөв тохируулагдаж бүх кабелиуд нь байх Ñ‘Ñтой газраа байж @@ -1031,10 +957,10 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure терминал ÑмулÑц хийх програм хангамж ажиллуулж байгаа ÑÑÑхийг шалгаарай.</para> - <para>Кабель терминал болон FreeBSD компьютерт Ñайн холбогдÑон ÑÑÑхийг + <para>Кабель терминал болон &os; компьютерт Ñайн холбогдÑон ÑÑÑхийг шалгах Ñ…ÑÑ€ÑгтÑй. ÐÐ½Ñ Ð½ÑŒ зөв төрлийн кабель болохыг баталгаажуулж үзÑÑÑ€Ñй.</para> - <para>Терминал болон FreeBSD нь bps хурд болон parity тохиргоонууд дÑÑÑ€ + <para>Терминал болон &os; нь <acronym>bps</acronym> хурд болон parity тохиргоонууд дÑÑÑ€ тохирч байгаа ÑÑÑхийг шалгаарай. Ð¥ÑÑ€Ñв та видео дÑлгÑцийн терминалтай бол хар цагаан болон тод байдлын Ñ…Ñналтууд таарÑан ÑÑÑхийг үзÑÑÑ€Ñй. Ð¥ÑÑ€Ñв ÑÐ½Ñ Ð½ÑŒ Ñ…ÑвлÑÑ… терминал бол Ñ†Ð°Ð°Ñ Ð±Ð¾Ð»Ð¾Ð½ бÑÑ… Ñайн ÑÑÑхийг шалгаарай.</para> @@ -1082,7 +1008,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure <sect3> <title>ÐÑвтрÑлт хүлÑÑÑ… мөрийн оронд хог гарч ирвÑл</title> - <para>Терминал болон FreeBSD нь bps хурд болон parity тохиргоонууд дÑÑÑ€ тохирч + <para>Терминал болон &os; нь <acronym>bps</acronym> хурд болон parity тохиргоонууд дÑÑÑ€ тохирч байгаа ÑÑÑхийг шалгана. Зөв <replaceable>getty</replaceable> төрлийг ашиглаж байгаа ÑÑÑхийг баталгаажуулж <command>getty</command> процеÑÑуудыг шалгах Ñ…ÑÑ€ÑгтÑй. Ð¥ÑÑ€Ñв үгүй бол <filename>/etc/ttys</filename>-г @@ -1120,19 +1046,9 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure </sect1info> <title>Dial-in буюу Ð³Ð°Ð´Ð½Ð°Ð°Ñ Ð·Ð°Ð»Ð³Ð°Ñ… үйлчилгÑÑ</title> - <warning> - <para>&os; 8.0-Ð°Ð°Ñ ÑхлÑÑд цуваа портын төхөөрөмжийн цÑгүүд - <filename>/dev/cuad<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/cuau<replaceable>N</replaceable></filename> ба - <filename>/dev/ttyd<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> болж өөрчлөгдÑөн. - &os; 7.X Ñ…ÑÑ€ÑглÑгчид доорх баримтыг үзÑхдÑÑ ÑдгÑÑрийг - бодолцох Ñ…ÑÑ€ÑгтÑй.</para> - </warning> - <indexterm><primary>dial-in үйлчилгÑÑ</primary></indexterm> - <para>Өөрийн FreeBSD ÑиÑтемийг dial-in буюу Ð³Ð°Ð´Ð½Ð°Ð°Ñ Ð·Ð°Ð»Ð³Ð°Ñ… үйлчилгÑÑнд + <para>&os; ÑиÑтемийг dial-in буюу Ð³Ð°Ð´Ð½Ð°Ð°Ñ Ð·Ð°Ð»Ð³Ð°Ñ… үйлчилгÑÑнд зориулж тохируулах нь терминалууд холбохтой маш Ñ‚Ó©ÑÑ‚Ñй бөгөөд Ñлгаатай тал нь та терминалуудын оронд модемуудтай ажиллах юм.</para> @@ -1143,8 +1059,7 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure байдаг, учир нь гадаад модемууд нь хувирдаггүй RAM-д хадгалагдах параметрүүдÑÑÑ€ Ñ…Ð°Ð³Ð°Ñ Ñ‚Ð¾Ð³Ñ‚Ð¼Ð¾Ð»Ð¾Ð¾Ñ€ ихÑвчлÑн тохируулагдÑан байж болдог бөгөөд Ñ‚ÑдгÑÑÑ€ нь ихÑвчлÑн чухал RS-232 дохионуудын төлөвийг үзүүлдÑг гÑрлийн заагчтай байдаг. - Ðнивчих гÑрлүүд нь гийчдийн ÑÑтгÑлийг Ñ‚Ð°Ñ‚Ð°Ñ…Ð°Ð°Ñ Ð³Ð°Ð´Ð½Ð° гÑрлүүд нь Ð±Ð°Ñ Ð¼Ð¾Ð´ÐµÐ¼ зөв ажиллаж - байгаа ÑÑÑхийг харахад их ашигтай байдаг.</para> + </para> <para>Дотоод модемуудад ихÑвчлÑн хувирдаггүй RAM байдаггүй болохоор Ñ‚ÑдгÑÑрийн тохиргоо зөвхөн DIP шилжүүлÑгчдийг тохируулÑнаар Ñ…Ñзгаарлагдаж болох юм. @@ -1216,32 +1131,30 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure <para>2400 bps Ñ…ÑƒÑ€Ð´Ð°Ð°Ñ Ð´ÑÑш урÑгалын Ñ…Ñналтад <acronym>RTS</acronym> болон <acronym>CTS</acronym> дохионууд - FreeBSD-д Ñ…ÑÑ€ÑгтÑй байдаг. Мөн Ñ…ÑзÑÑ Ð´ÑƒÑƒÐ´Ð»Ð°Ð³Ð° хүлÑÑн авÑан ÑÑвÑл шугам таÑлагдÑаныг мÑдÑÑ… + &os;-д Ñ…ÑÑ€ÑгтÑй байдаг. Мөн Ñ…ÑзÑÑ Ð´ÑƒÑƒÐ´Ð»Ð°Ð³Ð° хүлÑÑн авÑан ÑÑвÑл шугам таÑлагдÑаныг мÑдÑÑ… <acronym>CD</acronym> дохио болон ÑеÑÑ Ð±Ò¯Ñ€Ñн гүйцÑд болÑны дараа модемийг дахин тохируулах <acronym>DTR</acronym> дохионууд Ñ…ÑÑ€ÑгтÑй байдаг. Зарим кабелиуд нь бүх Ñ…ÑÑ€ÑгцÑÑÑ‚Ñй дохионуудгүйгÑÑÑ€ холбогдÑон байдаг болохоор шугам таÑлагдах үед нÑвтрÑÑ… ÑеÑÑ Ð±Ð°Ð¹Ñ…Ð³Ò¯Ð¹ болохгүй байх зÑÑ€Ñг аÑуудлууд Ñ…ÑÑ€Ñв танд байгаа бол таны кабель аÑуудалтай байж болох юм.</para> - <para>БуÑад &unix; Ñ‚Ó©ÑÑ‚ үйлдлийн ÑиÑтемүүдийн адил FreeBSD нь + <para>БуÑад &unix; Ñ‚Ó©ÑÑ‚ үйлдлийн ÑиÑтемүүдийн адил &os; нь Ñ…ÑзÑÑ Ð´ÑƒÑƒÐ´Ð»Ð°Ð³Ñ‹Ð³ хүлÑÑн авÑан ÑÑвÑл шугам Ñ…ÑзÑÑ Ñ‚Ð°ÑлагдÑан болон дуудлагын дараа модемийг таÑалж дахин тохируулахыг мÑдÑÑ… тоног төхөөрөмжийн дохионуудыг - ашигладаг. FreeBSD нь модем уруу тушаалуудыг илгÑÑÑ… ÑÑвÑл Ð¼Ð¾Ð´ÐµÐ¼Ð¾Ð¾Ñ - төлвийн тайлангуудыг Ñ…Ð°Ñ€Ð°Ñ…Ð°Ð°Ñ Ð·Ð°Ð¹Ð»ÑхийдÑг. Ð¥ÑÑ€Ñв та модемуудыг - PC дÑÑÑ€ тулгуурлаÑан мÑдÑÑ Ñ‚Ð°Ð²Ð¸Ñ… ÑиÑтемүүд уруу холбохыг мÑддÑг бол - ÑÐ½Ñ Ð½ÑŒ болхи Ñанагдаж магадгүй юм.</para> + ашигладаг. &os; нь модем уруу тушаалуудыг илгÑÑÑ… ÑÑвÑл Ð¼Ð¾Ð´ÐµÐ¼Ð¾Ð¾Ñ + төлвийн тайлангуудыг Ñ…Ð°Ñ€Ð°Ñ…Ð°Ð°Ñ Ð·Ð°Ð¹Ð»ÑхийдÑг.</para> </sect3> </sect2> <sect2> <title>Цуваа интерфÑйÑийн ÑргÑцүүллүүд</title> - <para>FreeBSD нь NS8250-, NS16450-, NS16550-, болон NS16550A-дÑÑÑ€ + <para>&os; нь NS8250-, NS16450-, NS16550-, болон NS16550A-дÑÑÑ€ тулгуурлаÑан EIA RS-232C (CCITT V.24) холбооны интерфÑйÑүүдийг дÑмждÑг. 8250 болон 16450 интерфÑйÑүүд нь ганц Ñ‚ÑмдÑгтийн буфертай байдаг. 16550 төхөөрөмж нь ÑиÑтемийн ажиллагааг илүү Ñайн болгох 16 Ñ‚ÑмдÑгтийн буфертай - байдаг. (ЦÑвÑÑ€ 16550 дахь алдаанууд нь 16 Ñ‚ÑмдÑгтийн буферийн Ñ…ÑÑ€ÑглÑÑнÑÑÑ - зайлÑхийдÑг, тиймÑÑÑ Ñ…ÑÑ€Ñв боломжтой бол 16550A-г ашиглаарай). Ганц Ñ‚ÑмдÑгтийн + байдаг. ЦÑвÑÑ€ 16550 дахь алдаанууд нь 16 Ñ‚ÑмдÑгтийн буферийн Ñ…ÑÑ€ÑглÑÑнÑÑÑ + зайлÑхийдÑг, тиймÑÑÑ Ñ…ÑÑ€Ñв боломжтой бол 16550A-г ашиглаарай. Ганц Ñ‚ÑмдÑгтийн буфер бүхий төхөөрөмжүүд нь 16 Ñ‚ÑмдÑгтийн буфер бүхий төхөөрөмжүүдÑÑÑ Ð¸Ð»Ò¯Ò¯ ажил үйлдлийн ÑиÑтемÑÑÑ ÑˆÐ°Ð°Ñ€Ð´Ð´Ð°Ð³ ÑƒÑ‡Ñ€Ð°Ð°Ñ 16550A-дÑÑÑ€ тулгуурлаÑан цуваа интерфÑÐ¹Ñ ÐºÐ°Ñ€Ñ‚ÑƒÑƒÐ´Ñ‹Ð³ ÑрхÑмлÑÑ… нь зүйтÑй юм. Ð¥ÑÑ€Ñв ÑиÑтем олон идÑвхтÑй @@ -1286,8 +1199,8 @@ ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure <sect2> <title>Тохиргооны файлууд</title> - <para><filename>/etc</filename> Ñанд гурван ÑиÑтемийн тохиргооны - файл байдаг бөгөөд өөрийн FreeBSD ÑиÑтемд dial-up буюу гадагш + <para><filename class="directory">/etc</filename> Ñанд гурван ÑиÑтемийн тохиргооны + файл байдаг бөгөөд өөрийн &os; ÑиÑтемд dial-up буюу гадагш залгах боломжийг олгохын тулд та магадгүй заÑварлах Ñ…ÑÑ€ÑгтÑй болно. Ðхний <filename>/etc/gettytab</filename> нь <filename>/usr/libexec/getty</filename> демоны тохиргооны @@ -1436,7 +1349,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\ </indexterm> <para><filename>/etc/ttys</filename> файлын тохиргоо - <xref linkend="ex-etc-ttys"/> Ñ…ÑÑÑгт ÑригдÑан байгаа. + <link linkend="ex-etc-ttys"></link> Ñ…ÑÑÑгт ÑригдÑан байгаа. Модемуудын тохиргоо Ñ‚Ó©ÑÑ‚Ñй боловч бид Ó©Ó©Ñ€ терминалын төрлийг заахын тулд <command>getty</command> уруу Ó©Ó©Ñ€ нÑмÑлт өгөгдлүүдийг дамжуулах Ñ‘Ñтой. ТүгжигдÑÑн хурдтай болон таарах хурдтай тохиргоонуудын ерөнхий Ñ…ÑлбÑÑ€ нь @@ -1522,7 +1435,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\ <para>V.32, V.32bis, болон V.34 зÑÑ€Ñг өндөр хурдтай модемууд тоног төхөөрөмжийн (<literal>RTS/CTS</literal>) урÑгал Ñ…Ñналтыг - ашиглах Ñ…ÑÑ€ÑгтÑй. Та модемийн портуудын хувьд FreeBSD цөмд + ашиглах Ñ…ÑÑ€ÑгтÑй. Та модемийн портуудын хувьд &os; цөмд тоног төхөөрөмжийн урÑгалын Ñ…Ñналтын тугийг тохируулахын тулд <command>stty</command> тушаалуудыг <filename>/etc/rc.d/serial</filename> файлд нÑмж болно.</para> @@ -1543,8 +1456,7 @@ stty -f /dev/cuau1.init crtscts</programlisting> <title>Модемийн тохиргоонууд</title> <para>Ð¥ÑÑ€Ñв та хувирдаггүй RAM-д параметрүүд нь тогтмолоор тохируулагдÑан байж болох - модемтой бол параметрүүдийг тохируулахын тулд та терминал програм (&ms-dos; дÑÑÑ€ - <application>Telix</application> ÑÑвÑл FreeBSD дÑÑÑ€ <command>tip</command> гÑÑ… мÑÑ‚) ашиглах + модемтой бол параметрүүдийг тохируулахын тулд та терминал програм <command>tip</command> гÑÑ… мÑÑ‚) ашиглах Ñ…ÑÑ€ÑгтÑй болно. Ðхний хурдтай адил холболтын хурдыг ашиглан модем уруу холбогдохын тулд <command>getty</command> нь доор дурдÑан шаардлагуудтай таарахын тулд модемийн хувирдаггүй RAM-ийг Ñ…ÑÑ€ÑглÑж тохируулах болно:</para> @@ -1689,17 +1601,17 @@ AT&B2&W</programlisting> Ñнд байна.</para> <sect3> - <title>FreeBSD ÑиÑтемийг шалгах</title> + <title>&os; ÑиÑтемийг шалгах</title> - <para>Өөрийн модемийг өөрийн FreeBSD ÑиÑтемд залгаад ÑиÑтемÑÑ Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ… бөгөөд + <para>Өөрийн модемийг өөрийн &os; ÑиÑтемд залгаад ÑиÑтемÑÑ Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ… бөгөөд Ñ…ÑÑ€Ñв таны модем төлөв заах гÑрлүүдтÑй бол ÑиÑтемийн конÑол дÑÑÑ€ <prompt>login:</prompt> хүлÑÑÑ… мөр гарч ирÑÑ… үед модемийн <acronym>DTR</acronym> заагч аÑаж байгаа ÑÑÑхийг - шалгах Ñ…ÑÑ€ÑгтÑй — Ñ…ÑÑ€Ñв аÑаж байгаа бол FreeBSD нь тохирох холболтуудын + шалгах Ñ…ÑÑ€ÑгтÑй — Ñ…ÑÑ€Ñв аÑаж байгаа бол &os; нь тохирох холболтуудын порт дÑÑÑ€ <command>getty</command>-г Ñхлүүлж модемийг дуудлага хүлÑÑж авахыг хүлÑÑж байна гÑÑÑн үг юм.</para> - <para>Ð¥ÑÑ€Ñв <acronym>DTR</acronym> заагч аÑахгүй бол FreeBSD ÑиÑтем уруу - конÑолоор нÑвтрÑÑд FreeBSD нь зөв порт дÑÑÑ€ <command>getty</command> процеÑÑийг + <para>Ð¥ÑÑ€Ñв <acronym>DTR</acronym> заагч аÑахгүй бол &os; ÑиÑтем уруу + конÑолоор нÑвтрÑÑд &os; нь зөв порт дÑÑÑ€ <command>getty</command> процеÑÑийг ажиллуулахаар оролдож байгаа ÑÑÑхийг харахын тулд <command>ps ax</command> тушаалыг ажиллуулна. Та ÑдгÑÑртÑй Ñ‚Ó©ÑÑ‚Ñй мөрүүдийг процеÑÑуудын хамтаар харах Ñ‘Ñтой:</para> @@ -1768,7 +1680,7 @@ AT&B2&W</programlisting> </listitem> </itemizedlist> - <para>Ð¥ÑÑ€Ñв таныг залгахад FreeBSD ÑиÑтем дÑÑрх модем хариулахгүй байгаа бол + <para>Ð¥ÑÑ€Ñв таныг залгахад &os; ÑиÑтем дÑÑрх модем хариулахгүй байгаа бол <acronym>DTR</acronym> шалгагдах үед модем нь утÑанд хариулахаар тохируулагдÑан ÑÑÑхийг шалгаарай. Ð¥ÑÑ€Ñв модем зөв тохируулагдÑан юм шиг байвал <acronym>DTR</acronym> шугам шалгагдÑан ÑÑÑхийг модемийн заагч гÑрлүүдийг (гÑрлүүдтÑй бол) @@ -1786,32 +1698,21 @@ AT&B2&W</programlisting> <sect1 id="dialout"> <title>Dial-out буюу гадагш залгах үйлчилгÑÑ</title> - <warning> - <para>&os; 8.0-Ð°Ð°Ñ ÑхлÑÑд цуваа портын төхөөрөмжийн цÑгүүд - <filename>/dev/cuad<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/cuau<replaceable>N</replaceable></filename> болж өөрчлөгдÑөн. - &os; 7.X Ñ…ÑÑ€ÑглÑгчид доорх баримтыг үзÑхдÑÑ ÑдгÑÑрийг - бодолцох Ñ…ÑÑ€ÑгтÑй.</para> - </warning> - <indexterm><primary>dial-out үйлчилгÑÑ</primary></indexterm> <para>Дараах нь таны хоÑтыг модемоор Ó©Ó©Ñ€ компьютер уруу холбох зааврууд юм. ÐÐ½Ñ Ð½ÑŒ алÑын хоÑттой терминал ÑеÑÑ Ò¯Ò¯ÑгÑÑ…Ñд тохирох юм.</para> - <para>ÐÐ½Ñ Ð½ÑŒ BBS уруу нÑвтрÑн ороход ашигтай байдаг.</para> - <para>Ð¥ÑÑ€Ñв та PPP дÑÑÑ€ аÑуудалтай байгаа бол ИнтернÑÑ‚ дÑÑ… файлыг авахад ÑÐ½Ñ Ñ‚Ó©Ñ€Ð»Ð¸Ð¹Ð½ холболт нь туйлын ашигтай байж болох юм. Ð¥ÑÑ€Ñв та Ñмар нÑг зүйл FTP хийх Ñ…ÑÑ€ÑгтÑй бөгөөд PPP ÑвдÑÑ€ÑÑн бол терминал ÑеÑÑ Ð°ÑˆÐ¸Ð³Ð»Ð°Ð½ FTP хийж болно. Дараа нь түүнийг өөрийн машин уруу дамжуулахын тулд zmodem ашиглана.</para> <sect2 id="hayes-unsupported"> - <title>Миний Hayes модем дÑмжигдÑÑгүй байна, би юу хийх вÑ?</title> + <title>Hayes модем ашиглах нь</title> - <para>ЖинхÑнÑдÑÑ Ð±Ð¾Ð» <command>tip</command>-д зориулÑан гарын авлагын - Ñ…ÑƒÑƒÐ´Ð°Ñ Ñ…ÑƒÑƒÑ‡Ð¸Ñ€Ñан байгаа. Ðнгийн Hayes залгагч аль Ñ…Ñдийн цуг бүтÑÑгдÑÑн байгаа - болно. Өөрийн <filename>/etc/remote</filename> файлд ердөө л + <para>Ðнгийн Hayes залгагч <command>tip</command>-д цуг бүтÑÑгдÑÑн байгаа + болно. <filename>/etc/remote</filename> файлд <literal>at=hayes</literal>-г ашиглаарай.</para> <para>Hayes драйвер нь ÑˆÐ¸Ð½Ñ Ð¼Ð¾Ð´ÐµÐ¼ÑƒÑƒÐ´Ñ‹Ð½ дÑвшилтÑÑ‚ боломжуудын заримыг @@ -1826,7 +1727,7 @@ AT&B2&W</programlisting> </sect2> <sect2 id="direct-at"> - <title>ÐдгÑÑÑ€ <literal>AT</literal> тушаалуудыг би Ñ…ÑрхÑн оруулах Ñ‘Ñтой вÑ?</title> + <title><literal>AT</literal> тушаалуудыг ашиглах нь</title> <indexterm> <primary><filename>/etc/remote</filename></primary> @@ -1837,7 +1738,8 @@ AT&B2&W</programlisting> <programlisting>cuau0:dv=/dev/cuau0:br#19200:pa=none</programlisting> - <para>br боломжид таны модемийн дÑмждÑг хамгийн их bps хурдыг ашиглаарай. Дараа нь + <para><literal>br</literal> боломжид таны модемийн дÑмждÑг хамгийн их + <acronym>bps</acronym> хурдыг ашиглаарай. Дараа нь <command>tip cuau0</command> гÑж бичихÑд та өөрийн модемд холбогдох болно.</para> @@ -1854,9 +1756,9 @@ AT&B2&W</programlisting> </sect2> <sect2 id="gt-failure"> - <title>pn боломжийн <literal>@</literal> Ñ‚ÑмдÑг ажиллахгүй байна!</title> + <title><literal>@</literal> Ñ‚ÑмдÑг ажиллахгүй байна</title> - <para>УтаÑны дугаарын боломжийн <literal>@</literal> Ñ‚ÑмдÑг нь tip-ийг + <para>УтаÑны дугаарын боломжийн <literal>@</literal> Ñ‚ÑмдÑг нь <command>tip</command>-ийг <filename>/etc/phones</filename> Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ ÑƒÑ‚Ð°Ñны дугаар хайхыг заадаг. ГÑхдÑÑ <literal>@</literal> Ñ‚ÑмдÑг нь Ð±Ð°Ñ <filename>/etc/remote</filename> зÑÑ€Ñг боломжийн файлуудын туÑгай Ñ‚ÑмдÑгт юм. Үүнийг урагш ташуу Ð·ÑƒÑ€Ð°Ð°Ñ Ð°ÑˆÐ¸Ð³Ð»Ð°Ð½ @@ -1866,7 +1768,7 @@ AT&B2&W</programlisting> </sect2> <sect2 id="dial-command-line"> - <title>Тушаалын мөрөн дÑÑÑ€ би утаÑны дугаар уруу Ñ…ÑрхÑн залгах вÑ?</title> + <title>Тушаалын Ð¼Ó©Ñ€Ð½Ó©Ó©Ñ Ð·Ð°Ð»Ð³Ð°Ñ…</title> <para>Өөрийн <filename>/etc/remote</filename> файлд <quote>ердийн</quote> гÑгддÑг оруулгыг оруулна. ЖишÑÑ Ð½ÑŒ:</para> @@ -1892,10 +1794,11 @@ tip57600|Dial any phone number at 57600 bps:\ </sect2> <sect2 id="set-bps"> - <title>Би түүнийг хийх болгондоо bps хурдыг бичих Ñ…ÑÑ€ÑгтÑй юу?</title> + <title><acronym>bps</acronym> хурдыг тохируулах</title> <para><literal>tip1200</literal> ÑÑвÑл <literal>cu1200</literal>-ийн - хувьд оруулгыг хийнÑ, гÑхдÑÑ br боломжтой тохирох Ñмар ч bps хурдыг ашиглаж болно. + хувьд оруулгыг хийнÑ, гÑхдÑÑ <literal>br</literal> боломжтой тохирох + Ñмар ч <acronym>bps</acronym> хурдыг ашиглаж болно. <command>tip</command> нь боломжийн анхдагч утга бол 1200 bps гÑж үздÑг. <literal>tip1200</literal> оруулгыг хайдгийн учир нь ийм юм. ГÑхдÑÑ Ñ‚Ð° заавал 1200 bps хурдыг ашиглах шаардлагагүй юм.</para> @@ -1905,9 +1808,12 @@ tip57600|Dial any phone number at 57600 bps:\ <title>Би терминал ÑерверÑÑÑ€ Ñ…Ñд Ñ…ÑдÑн хоÑтууд уруу ханддаг</title> <para>Та холбогдох хүртлÑÑ Ñ…Ò¯Ð»ÑÑж <command>CONNECT <replaceable>host</replaceable></command> гÑж - тухай бүрт бичиж байхын оронд tip-ийн <literal>cm</literal> боломжийг + тухай бүрт бичиж байхын оронд <command>tip</command>-ийн <literal>cm</literal> боломжийг ашиглаж болно. ЖишÑÑ Ð½ÑŒ <filename>/etc/remote</filename> файл - дахь ÑдгÑÑÑ€ оруулгууд нь:</para> + дахь ÑдгÑÑÑ€ оруулгууд нь <hostid>pain</hostid> ÑÑвÑл <hostid>muffin</hostid> хоÑтууд уруу + холбогдохын тулд танд <command>tip pain</command> ÑÑвÑл <command>tip + muffin</command> гÑж бичих боломжийг Ð¾Ð»Ð³Ð¾Ñ…Ð¾Ð¾Ñ Ð³Ð°Ð´Ð½Ð° терминал Ñервер уруу + орохын тулд <command>tip deep13</command> гÑж бичих боломжийг Ð±Ð°Ñ Ð¾Ð»Ð³Ð¾Ð½Ð¾:</para> <programlisting>pain|pain.deep13.com|Forrester's machine:\ :cm=CONNECT pain\n:tc=deep13: @@ -1916,14 +1822,10 @@ muffin|muffin.deep13.com|Frank's machine:\ deep13:Gizmonics Institute terminal server:\ :dv=/dev/cuau2:br#38400:at=hayes:du:pa=none:pn=5551234:</programlisting> - <para><hostid>pain</hostid> ÑÑвÑл <hostid>muffin</hostid> хоÑтууд уруу - холбогдохын тулд танд <command>tip pain</command> ÑÑвÑл <command>tip - muffin</command> гÑж бичих боломжийг Ð¾Ð»Ð³Ð¾Ñ…Ð¾Ð¾Ñ Ð³Ð°Ð´Ð½Ð° терминал Ñервер уруу - орохын тулд <command>tip deep13</command> гÑж бичих боломжийг Ð±Ð°Ñ Ð¾Ð»Ð³Ð¾Ð½Ð¾.</para> </sect2> <sect2 id="tip-multiline"> - <title>Сайт болгоны хувьд нÑгÑÑÑ Ð¸Ñ… мөрийг tip оролдож чадах уу?</title> + <title><command>tip</command>-д нÑгÑÑÑ Ð¸Ð»Ò¯Ò¯ олон мөрийг ашиглах</title> <para>ÐÐ½Ñ Ð½ÑŒ их Ñургууль Ñ…Ñд Ñ…ÑдÑн модемийн шугамуудтай бөгөөд Ñ…ÑдÑн мÑнган оюутнууд Ñ‚ÑдгÑÑрийг ашиглахыг оролдох үед ихÑвчлÑн гардаг аÑуудал юм.</para> @@ -1952,19 +1854,12 @@ big-university 5551114</programlisting> </sect2> <sect2 id="multi-controlp"> - <title> - <keycombo action="simul"> - <keycap>Ctrl</keycap> - <keycap>P</keycap> - </keycombo> - хоÑлолыг нÑг удаа илгÑÑхийн тулд - <keycombo action="simul"> + <title>ХүчлÑÑ… Ñ‚ÑмдÑгтийг Ñ…ÑÑ€ÑглÑÑ…</title> + + <para><keycombo action="simul"> <keycap>Ctrl</keycap> <keycap>P</keycap> - </keycombo> - хоÑлолыг Ñагаад хоёр удаа дарах Ñ…ÑÑ€ÑгтÑй гÑж?</title> - - <para><keycombo action="simul"><keycap>Ctrl</keycap><keycap>P</keycap></keycombo> нь + </keycombo> нь анхдагч <quote>force буюу хүчлÑÑ…</quote> Ñ‚ÑмдÑгт бөгөөд <command>tip</command> тушаалд дараагийн Ñ‚ÑмдÑгт нь Ò¯ÑгÑн өгөгдөл гÑдгийг Ñ…ÑлÑÑ…Ñд Ñ…ÑÑ€ÑглÑгддÑг. Та хүчлÑÑ… Ñ‚ÑмдÑгтийг дурын Ñ‚ÑмдÑгт болгон <command>~s</command> тушаалаар @@ -2000,7 +1895,7 @@ big-university 5551114</programlisting> </sect2> <sect2 id="uppercase"> - <title>ГÑнÑÑ‚ миний бичÑÑн болгон том Ò¯ÑгÑÑÑ€ гараад байна??</title> + <title>Том Ò¯ÑÑг ашиглах</title> <para>Та ÑвдÑгдÑÑн caps-lock товчлуур бүхий Ñ…ÑÑ€ÑглÑгчдÑд туÑгайлан зориулагдÑан @@ -2037,7 +1932,7 @@ raisechar=^^</programlisting> </sect2> <sect2 id="tip-filetransfer"> - <title><command>tip</command>-ÑÑÑ€ би Ñаж файл дамжуулалтуудыг хийх вÑ?</title> + <title><command>tip</command> ашиглан файл дамжуулах</title> <para>Ð¥ÑÑ€Ñв та Ó©Ó©Ñ€ &unix; ÑиÑтемтÑй харьцаж байвал та <command>~p</command> (put буюу тавих) болон <command>~t</command> (take буюу авах) тушаалуудыг ашиглан файлуудыг илгÑÑж хүлÑÑн @@ -2062,7 +1957,7 @@ raisechar=^^</programlisting> </sect2> <sect2 id="zmodem-tip"> - <title><command>tip</command>-Ñ‚Ñй би <application>zmodem</application>-ийг Ñ…ÑрхÑн ажиллуулах вÑ?</title> + <title><command>tip</command>-Ñ‚Ñй <application>zmodem</application>-ийг ашиглах</title> <para>Файлуудыг хүлÑÑн авахын тулд алÑын машин дÑÑÑ€ програмыг илгÑÑж ÑÑ…ÑлнÑ. Дараа нь Ñ‚ÑдгÑÑрийг локалаар хүлÑÑн авч ÑхлÑхийн тулд <command>~C rz</command> @@ -2093,27 +1988,19 @@ raisechar=^^</programlisting> </sect1info> <title>Цуваа конÑолыг тохируулах нь</title> - <warning> - <para>&os; 8.0-Ð°Ð°Ñ ÑхлÑÑд цуваа портын төхөөрөмжийн цÑгүүд - <filename>/dev/ttyd<replaceable>N</replaceable></filename>-Ñ - <filename>/dev/ttyu<replaceable>N</replaceable></filename> болж өөрчлөгдÑөн. - &os; 7.X Ñ…ÑÑ€ÑглÑгчид доорх баримтыг үзÑхдÑÑ ÑдгÑÑрийг - бодолцох Ñ…ÑÑ€ÑгтÑй.</para> - </warning> - <indexterm><primary>цуваа конÑол</primary></indexterm> <sect2 id="serialconsole-intro"> <title>Танилцуулга</title> - <para>FreeBSD нь зөвхөн цуваа порт дÑÑÑ€ конÑол маÑгаар ашиглах дүлий терминал бүхий + <para>&os; нь цуваа порт дÑÑÑ€ конÑол маÑгаар ашиглах дүлий терминал бүхий ÑиÑтем дÑÑÑ€ ачаалах чадвартай байдаг. Ийм тохиргоо нь хоёр ангиллын хүмүүÑÑ‚ - ашигтай байх Ñ‘Ñтой бөгөөд ÑдгÑÑÑ€ нь гар ÑÑвÑл монитор байхгүй машинууд дÑÑÑ€ FreeBSD Ñуулгахыг + ашигтай байх Ñ‘Ñтой бөгөөд ÑдгÑÑÑ€ нь гар ÑÑвÑл монитор байхгүй машинууд дÑÑÑ€ &os; Ñуулгахыг Ñ…Ò¯ÑÑÑн ÑиÑтемийн админиÑтраторууд болон цөм ÑÑвÑл төхөөрөмжийн драйверуудыг дибаг хийхийг Ñ…Ò¯ÑÑÑн хөгжүүлÑгчид юм.</para> - <para><xref linkend="boot"/>-Ñ‚ тайлбарлаÑнаар FreeBSD нь гурван шаттай ÑхлүүлÑгчийг - Ñ…ÑÑ€ÑглÑдÑг. Ðхний хоёр шат нь ачаалах диÑк дÑÑрх FreeBSD-ийн зүÑмÑлийн ÑхлÑл дÑÑÑ€ + <para><link linkend="boot"></link>-Ñ‚ тайлбарлаÑнаар &os; нь гурван шаттай ÑхлүүлÑгчийг + Ñ…ÑÑ€ÑглÑдÑг. Ðхний хоёр шат нь ачаалах диÑк дÑÑрх &os;-ийн зүÑмÑлийн ÑхлÑл дÑÑÑ€ хадгалагддаг ачаалах блокийн кодод байдаг. Ðчаалах блок нь ачаалагч дуудагчийг (<filename>/boot/loader</filename>) гурав дахь шатны код болгон дуудаж ажиллуулдаг.</para> @@ -2157,35 +2044,34 @@ raisechar=^^</programlisting> </procedure> - <para>Ð¥ÑÑ€Ñв Ó©Ó©Ñ€ тохиргоо шаардлагатай бол <xref linkend="serialconsole-howto"/> - Ñ…ÑÑÑгт илүү гүнзгий тохиргооны тайлбар байгаа болно.</para> + <para>Ð¥ÑÑ€Ñв Ó©Ó©Ñ€ тохиргоо шаардлагатай бол дараагийн Ñ…ÑÑÑгт + илүү гүнзгий тохиргооны тайлбар байгаа болно.</para> </sect2> <sect2 id="serialconsole-howto"> - <title>Цуваа конÑолын тохиргоо</title> + <title>Цуваа конÑолын гүнзгий тохиргоо</title> <procedure> <step> <para>Цуваа кабель бÑлдÑнÑ.</para> <indexterm><primary>null-модем кабель</primary></indexterm> + <para>Танд null-модем кабель ÑÑвÑл Ñтандарт цуваа кабель болон null-модем хувиргагч Ñ…ÑÑ€ÑгтÑй болно. Цуваа кабелиудын тухай Ñ…ÑлÑлцүүлгийг - <xref linkend="serial-cables-ports"/> Ñ…ÑÑгÑÑÑ Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para> + <link linkend="serial-cables-ports"></link> Ñ…ÑÑгÑÑÑ Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para> </step> <step> <para>Гарыг Ñалгана.</para> - <para>ИхÑнх PC ÑиÑтемүүд нь Power-On Self-Test (POST) буюу аÑаах үеийн + <para>ИхÑнх PC ÑиÑтемүүд нь Power-On Self-Test (<acronym>POST</acronym>) буюу аÑаах үеийн теÑтийн үеÑÑ€ гарыг байгаа ÑÑÑхийг шалгадаг бөгөөд гар олдохгүй бол алдаа Ò¯Ò¯ÑгÑдÑг. Зарим машинууд нь гар байхгүйг чангаар мÑдÑÑлж залгагдтал нь цааш ачаалдаггүй.</para> <para>Ð¥ÑÑ€Ñв таны компьютер алдааг мÑдÑÑлÑÑн боловч цааш ачаалах юм бол - та Ñмар нÑг туÑгай зүйл хийх шаардлагагүй юм. (Phoenix BIOS ÑуулгагдÑан - зарим машинууд нь ердөө л <errorname>Keyboard failed</errorname> - гÑж мÑдÑÑлÑÑд Ñ…ÑвийнÑÑÑ€ цааш ачаалах болно.)</para> + та Ñмар нÑг туÑгай зүйл хийх шаардлагагүй юм.</para> <para>Ð¥ÑÑ€Ñв таны компьютер гар залгалгүйгÑÑÑ€ Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ…Ð°Ð°Ñ Ñ‚Ð°Ñ‚Ð³Ð°Ð»Ð·Ð²Ð°Ð» ÑÐ½Ñ Ð°Ð»Ð´Ð°Ð°Ð³ авч үзÑлгүйгÑÑÑ€ орхихоор болгож та BIOS-оо тохируулах Ñ…ÑÑ€ÑгтÑй болно @@ -2210,10 +2096,7 @@ raisechar=^^</programlisting> хулганаа Ð±Ð°Ñ Ñалгах шаардлагатай байж болох юм. Учир нь юу Ð²Ñ Ð³ÑвÑл &ps2; хулгана нь гартай цуг зарим тоног төхөөрөмжийг хуваалцдаг бөгөөд хулганаа залгаатай орхих нь гар шалгагчийг гар байÑаар байгаа гÑж - бодоход хүргÑн хуурч болох юм. AMI BIOS бүхий - Gateway 2000 Pentium 90 MHz ÑиÑтем ингÑдÑг гÑж - Ñригддаг. Ерөнхийдөө хулгана нь гаргүйгÑÑÑ€ олигтой ажиллахгүй - болохоор ÑÐ½Ñ Ð½ÑŒ аÑуудал биш юм.</para> + бодоход хүргÑн хуурч болох юм.</para> </note> </step> @@ -2221,21 +2104,15 @@ raisechar=^^</programlisting> <para>Дүлий терминалыг <devicename>COM1</devicename> уруу залгана (<devicename>sio0</devicename>).</para> - <para>Ð¥ÑÑ€Ñв танд дүлий терминал байхгүй бол та хуучин PC/XT-г модемийн + <para>Ð¥ÑÑ€Ñв танд дүлий терминал байхгүй бол та хуучин компьютер модемийн програмтай цуг, ÑÑвÑл Ó©Ó©Ñ€ &unix; хайрцаг дÑÑÑ€ цуваа портыг ашиглаж болох юм. Ð¥ÑÑ€Ñв танд <devicename>COM1</devicename> (<devicename>sio0</devicename>) байхгүй бол түүнтÑй болох Ñ…ÑÑ€ÑгтÑй. Одоогоор ачаалах блокуудыг дахин ÑмхÑтгÑлгүйгÑÑÑ€ ачаалах блокуудын хувьд <devicename>COM1</devicename>-Ñ Ó©Ó©Ñ€ портыг Ñонгох арга байхгүй. Ð¥ÑÑ€Ñв та <devicename>COM1</devicename>-г Ó©Ó©Ñ€ төхөөрөмжид ашиглаж байгаа бол та Ñ‚ÑÑ€ төхөөрөмжөө түр зуур Ñалгаад - FreeBSD Ñхлүүлж ажиллуулÑныхаа дараа ÑˆÐ¸Ð½Ñ Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ… блок болон цөмийг - Ñуулгах Ñ…ÑÑ€ÑгтÑй болно. (<devicename>COM1</devicename> нь - файл/тооцоолох/терминал Ñервер дÑÑÑ€ байдаг гÑж үздÑг; Ñ…ÑÑ€Ñв танд - <devicename>COM1</devicename> нь үнÑÑ…ÑÑÑ€ Ó©Ó©Ñ€ зүйлд Ñ…ÑÑ€ÑгтÑй байгаа - (бөгөөд та Ñ‚ÑÑ€ Ó©Ó©Ñ€ зүйлÑÑ <devicename>COM2</devicename> - (<devicename>sio1</devicename>) уруу шилжүүлж чадахгүй байгаа)) - бол та магадгүй ÑхлÑÑд ÑÐ½Ñ Ð±Ò¯Ñ… зүйл дÑÑÑ€ бүр Ñанаа зовох шаардлагагүй - байж болох юм.)</para> + &os; Ñхлүүлж ажиллуулÑныхаа дараа ÑˆÐ¸Ð½Ñ Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ… блок болон цөмийг + Ñуулгах Ñ…ÑÑ€ÑгтÑй болно.</para> </step> <step> @@ -2382,7 +2259,7 @@ raisechar=^^</programlisting> <step> <para>Машиныг ачаална.</para> - <para>Та өөрийн FreeBSD хайрцгийг ÑхлүүлÑÑ… үед ачаалах блокууд нь + <para>Та өөрийн &os; хайрцгийг ÑхлүүлÑÑ… үед ачаалах блокууд нь <filename>/boot.config</filename> файлын агуулгуудыг конÑол уруу гаргаж харуулах болно. ЖишÑÑ Ð½ÑŒ:</para> @@ -2446,7 +2323,7 @@ Keyboard: no</screen> <para>Ðчаалах процеÑÑийг таÑалдуулахын тулд конÑол дÑÑÑ€ <keycap>Enter</keycap>-Ñ Ó©Ó©Ñ€ дурын товчлуурыг дарах Ñ…ÑÑ€ÑгтÑй. Ðчаалах блокууд нь дараа нь Ñ‚Ð°Ð½Ð°Ð°Ñ Ð´Ð°Ñ€Ð°Ð°Ñ‡Ð¸Ð¹Ð½ - чинь үйлдлийг аÑуух болно. Та одоо иймÑрхүү мÑдÑгдÑл харах Ñ‘Ñтой:</para> + чинь үйлдлийг аÑуух болно:</para> <screen>>> FreeBSD/i386 BOOT Default: 0:ad(0,a)/boot/loader @@ -2470,7 +2347,7 @@ boot:</screen> <para>Ðчаалагч дуудагч дуудагдÑаны дараа та ачаалах процеÑÑийн гурав дахь шатанд байгаа бол ачаалагч дуудагчид зохих орчны хувьÑагчуудыг тохируулж дотоод конÑол болон цуваа конÑолын хооронд та шилжиж чадÑан Ñ…ÑвÑÑÑ€ байх - болно. <xref linkend="serialconsole-loader"/>-г Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para> + болно. <link linkend="serialconsole-loader"></link>-г Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para> </sect2> <sect2 id="serialconsole-summary"> @@ -2623,7 +2500,7 @@ boot:</screen> <para>Ðчаалах блокуудыг конÑолын ÑˆÐ¸Ð½Ñ Ñ…ÑƒÑ€Ð´ заагдÑан <makevar>BOOT_COMCONSOLE_SPEED</makevar> хувьÑагчтай цуг дахин ÑмхÑтгÑнÑ. Ð¨Ð¸Ð½Ñ Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ… блокуудыг бүтÑÑж Ñуулгах талаар - дÑлгÑÑ€Ñнгүй заавруудыг <xref linkend="serialconsole-com2"/>-Ñ + дÑлгÑÑ€Ñнгүй заавруудыг <link linkend="serialconsole-com2"></link>-Ñ Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para> <para>Ð¥ÑÑ€Ñв цуваа конÑол нь <option>-h</option> тохируулгатайгаар @@ -2647,9 +2524,7 @@ boot:</screen> <listitem> <para>Өөрийн <filename>/boot/loader.conf</filename> файлд <varname>comconsole_speed</varname> тохируулгыг - идÑвхжүүлнÑ.</para> - - <para>ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€ÑƒÑƒÐ»Ð³Ð° нь <filename>/boot/loader.conf</filename> + идÑвхжүүлнÑ. ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€ÑƒÑƒÐ»Ð³Ð° нь <filename>/boot/loader.conf</filename> файлд Ð±Ð°Ñ <varname>console</varname>, <varname>boot_serial</varname>, болон <varname>boot_multicons</varname> тохируулагдÑан ÑÑÑÑ…ÑÑÑ @@ -2677,7 +2552,7 @@ console="comconsole,vidconsole"</programlisting> <procedure> <step> - <para>Цөмийн Ñхийг авна. (<xref linkend="updating-upgrading"/> бүлгийг Ò¯Ð·Ð½Ñ Ò¯Ò¯)</para> + <para>Цөмийн Ñхийг авна. (<link linkend="updating-upgrading"></link> бүлгийг Ò¯Ð·Ð½Ñ Ò¯Ò¯)</para> </step> <step> @@ -2836,8 +2711,6 @@ ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting> <para>Гол Ñанаа нь график тоног төхөөрөмж ÑÑвÑл гар залгагдÑан байхыг шаарддаггүй тийм зориулагдÑан Ñерверүүдийг тохируулах боломжийг хүмүүÑÑ‚ зөвшөөрөх Ñвдал юм. - ИхÑнх ÑиÑтемүүд нь гаргүйгÑÑÑ€ ачаалах боломжийг танд олгох боловч харамÑалтай нь - график хувиргагчгүйгÑÑÑ€ танд ачаалахыг зөвшөөрдөггүй нÑлÑÑн Ñ…ÑдÑн ÑиÑтемүүд байдаг. AMI BIOS-уудтай машинуудыг график хувиргагч ÑуулгалгүйгÑÑÑ€ ачаалдаг болгож тохируулж болдог. ИнгÑхийн тулд ердөө л CMOS тохиргоон дахь <quote>graphics adapter</quote> тохируулгыг <quote>Not installed</quote> болгож өөрчилнө.</para> diff --git a/mn_MN.UTF-8/books/handbook/users/chapter.xml b/mn_MN.UTF-8/books/handbook/users/chapter.xml index a21494175d..5fb93fff51 100644 --- a/mn_MN.UTF-8/books/handbook/users/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/users/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 39362 + Original revision 41037 $FreeBSD$ --> @@ -31,27 +31,20 @@ <sect1 id="users-synopsis"> <title>Ерөнхий агуулга</title> - <para>FreeBSD ÑууÑан компьютерийг нÑг зÑÑ€Ñг олон Ñ…ÑÑ€ÑглÑгч Ñ…ÑÑ€ÑглÑж болдог. + <para>&os; ÑууÑан компьютерийг нÑг зÑÑ€Ñг олон Ñ…ÑÑ€ÑглÑгч Ñ…ÑÑ€ÑглÑж болдог. ÐœÑдÑÑж, тодорхой мөчид дÑлгÑцийн урд гар ашиглаж зөвхөн нÑг Ñ…ÑÑ€ÑглÑгч Ñуудаг ч - <footnote> - <para> <xref linkend="serialcomms"/> - бүлÑгт гарÑны дагуу олон терминал нÑÑгÑÑгүй л бол.</para> -</footnote>, олон Ñ…ÑÑ€ÑглÑгчид ÑүлжÑÑгÑÑÑ€ холбогдож Ó©Ó©Ñ€Ñдийнхөө ажлыг гүйцÑтгÑж чадна. + олон Ñ…ÑÑ€ÑглÑгчид ÑүлжÑÑгÑÑÑ€ холбогдож Ó©Ó©Ñ€Ñдийнхөө ажлыг гүйцÑтгÑж чадна. СиÑтемийг Ñ…ÑÑ€ÑглÑхийг Ñ…Ò¯ÑÑÑн Ñ…ÑÑ€ÑглÑгч нь бүртгÑлтÑй байх Ñ‘Ñтой.</para> <para>ÐÐ½Ñ Ð±Ò¯Ð»Ð³Ð¸Ð¹Ð³ уншÑаны дараа, та дараах зүйлÑийг мÑдÑÑ… болно:</para> <itemizedlist> <listitem> - <para>FreeBSD ÑиÑтем дÑÑ… Ñ…ÑÑ€ÑглÑгчдийн төрөл бүрийн бүртгÑлийн Ñлгаа.</para> + <para>&os; ÑиÑтем дÑÑ… Ñ…ÑÑ€ÑглÑгчдийн төрөл бүрийн бүртгÑлийн Ñлгаа.</para> </listitem> <listitem> - <para>Ð¥ÑÑ€ÑглÑгчийн бүртгÑл Ñ…ÑрхÑн нÑмÑÑ….</para> - </listitem> - - <listitem> - <para>Ð¥ÑÑ€ÑглÑгчийн бүртгÑлийг Ñ…ÑрхÑн уÑтгах.</para> + <para>Ð¥ÑÑ€ÑглÑгчийн бүртгÑл Ñ…ÑрхÑн нÑмÑÑ… болон уÑтгах.</para> </listitem> <listitem> @@ -72,8 +65,8 @@ <itemizedlist> <listitem> - <para>&unix; болон FreeBSD-н үндÑÑн ойлголт(<xref - linkend="basics"/>).</para> + <para> <link linkend="basics">&unix; болон FreeBSD-н үндÑийг</link> + ойлгох.</para> </listitem> </itemizedlist> </sect1> @@ -81,12 +74,11 @@ <sect1 id="users-introduction"> <title>Танилцуулга</title> - <para> - СиÑтем Ñ€Ò¯Ò¯ хандах бүх хандалт, мөн Ñ…ÑÑ€ÑглÑгчÑÑÑ Ð³Ò¯Ð¹Ñ†ÑтгÑгдÑж байгаа - үйлдлүүд нь бүгд бүртгÑлÑÑÑ€ зохицуулагдана. Тийм болохоор FreeBSD дÑÑÑ€ + <para>&os; ÑиÑтем Ñ€Ò¯Ò¯ хандах бүх хандалт, мөн Ñ…ÑÑ€ÑглÑгчÑÑÑ Ð³Ò¯Ð¹Ñ†ÑтгÑгдÑж байгаа + үйлдлүүд нь бүгд бүртгÑлÑÑÑ€ зохицуулагдана. Тийм болохоор &os; дÑÑÑ€ бүртгÑлийн зохицуулалт тун чухал.</para> - <para>FreeBSD ÑиÑтемийн бүртгÑл нь уг бүртгÑлÑÑ Ñ‚Ð¾Ð´Ð¾Ñ€Ñ…Ð¾Ð¹Ð»Ñон мÑдÑÑлÑл + <para>&os; ÑиÑтемийн бүртгÑл нь уг бүртгÑлÑÑ Ñ‚Ð¾Ð´Ð¾Ñ€Ñ…Ð¾Ð¹Ð»Ñон мÑдÑÑлÑл агуулж байдаг.</para> <variablelist> @@ -98,7 +90,8 @@ Ð¥ÑÑ€ÑглÑгчийн нÑÑ€ нь ÑÐ½Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ‚ ийм нÑÑ€ÑÑÑ€ цорын ганц байх Ñ‘Ñтой. Хоёр Ñ…ÑÑ€ÑглÑгч нÑг ижил нÑртÑй байж болохгүй. &man.passwd.5;;-д зааÑны дагуу зөв Ñ…ÑÑ€ÑглÑгчийн нÑÑ€ Ò¯Ò¯ÑгÑÑ… маш олон дүрÑм бий. Ерөнхийдөө, та найман Ñ‚ÑмдÑгтÑÑÑ Ñ…ÑÑ‚Ñ€Ñлгүй, цөөхөн - байж болно, бүгд бага Ò¯ÑгÑÑÑ€ бичигдÑÑ… нÑÑ€ Ñ…ÑÑ€ÑглÑнÑ.</para> + байж болно, бүгд бага Ò¯ÑгÑÑÑ€ бичигдÑÑ… нÑÑ€ Ñ…ÑÑ€ÑглÑнÑ. ÐÐ½Ñ Ð½ÑŒ хуучин програмуудын + хувьд нийцтÑй байдаг.</para> </listitem> </varlistentry> @@ -106,39 +99,41 @@ <term>Ðууц үг</term> <listitem> - <para>Бүх бүртгÑл нь харгалзах нууц үгтÑй. Ðууц үг нь хооÑон байж болох бөгөөд - ÑÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ð¾Ð»Ð´Ð¾Ð»Ð´ ÑиÑтем Ñ‚Ð°Ð½Ð°Ð°Ñ Ð½ÑƒÑƒÑ† үг шаардахгүй. ÐÐ½Ñ Ð½ÑŒ ердийн үед тийм Ñайн - Ñанаа биш бөгөөд бүх бүртгÑл өөрийн нууц үгтÑй байх Ñ…ÑÑ€ÑгтÑй.</para> + <para>Бүх бүртгÑл нь харгалзах нууц үгтÑй. Ðууц үг нь хооÑон байж болох боловч + Ñ‚ÑгÑхийг зөвлөдөггүй бөгөөд бүх бүртгÑл өөрийн нууц үгтÑй байх Ñ…ÑÑ€ÑгтÑй.</para> </listitem> </varlistentry> <varlistentry> - <term>Ð¥ÑÑ€ÑглÑгчийн ID (UID)</term> + <term>Ð¥ÑÑ€ÑглÑгчийн ID (<acronym>UID</acronym>)</term> <listitem> - <para>UID бол ихÑнхдÑÑ 0 ÑÑÑ 65535 хүртÑлх тоо байдаг ба<footnote id="users-largeuidgid"> - <para>UID/GID дугааруудыг 4294967295 гÑж их тоогоор Ñонгож болох боловч, + <para><acronym>UID</acronym> бол ихÑнхдÑÑ 0 ÑÑÑ 65535 хүртÑлх тоо байдаг ба + <footnote id="users-largeuidgid"> + <para><acronym>UID</acronym>s/<acronym>GID</acronym> дугааруудыг + 4294967295 гÑж их тоогоор Ñонгож болох боловч, ийм дугаарууд нь Ñ…ÑÑ€ÑглÑгчийн дугаартай тооцон боддог програмуудад хүндрÑл учруулах магадлалтай.</para> </footnote>, ÑиÑтемд Ñ…ÑÑ€ÑглÑгчийг уг ганц гоц тоогоор танихад Ñ…ÑÑ€ÑглÑгддÑг. - Дотоод ажиллагаандаа, FreeBSD нь UID дугаарыг Ñ…ÑÑ€ÑглÑж Ñ…ÑÑ€ÑглÑгчийг - таниж—FreeBSD-н Ñ…ÑÑ€ÑглÑгчийн нÑÑ€ ашигладаг бүх тушаалууд нь уг Ñ…ÑÑ€ÑглÑгчтÑй - ажиллахааÑаа өмнө ÑхлÑÑд ÑÐ½Ñ Ð´ÑƒÐ³Ð°Ð°Ñ€ руу нь хувиргадаг. - ТÑгÑÑ…ÑÑÑ€, Ñ…Ñд Ñ…ÑдÑн бүртгÑл нь Ñнз бүрийн нÑртÑй мөртлөө нÑг UID дугаартай байж болно - гÑÑÑн үг. Ð¥ÑÑ€Ñв тийм бол FreeBSD Ñ‚Ñд нарыг нÑг Ñ…ÑÑ€ÑглÑгч гÑж тооцно. ÐœÑдÑÑж танд ингÑж хийх + Дотоод ажиллагаандаа, &os; нь <acronym>UID</acronym> дугаарыг Ñ…ÑÑ€ÑглÑж Ñ…ÑÑ€ÑглÑгчийг + танихдаа ашигладаг. Ð¥ÑÑ€ÑглÑгчийн нÑÑ€ ашигладаг бүх тушаалууд нь уг Ñ…ÑÑ€ÑглÑгчтÑй + ажиллахааÑаа өмнө ÑхлÑÑд <acronym>UID</acronym> руу нь хувиргадаг. + ТÑгÑÑ…ÑÑÑ€, Ñ…Ñд Ñ…ÑдÑн бүртгÑл нь Ñнз бүрийн нÑртÑй мөртлөө нÑг <acronym>UID</acronym> дугаартай байж болно + гÑÑÑн үг. Ð¥ÑÑ€Ñв тийм бол &os; Ñ‚Ñд нарыг нÑг Ñ…ÑÑ€ÑглÑгч гÑж тооцно. ÐœÑдÑÑж танд ингÑж хийх шаардлага байхгүй.</para> </listitem> </varlistentry> <varlistentry> - <term>Бүлгийн ID (GID)</term> + <term>Бүлгийн ID (<acronym>GID</acronym>)</term> <listitem> <para> - GID бол ихÑнхдÑÑ 0 ÑÑÑ 65535 хүртÑлх тоо байдаг ба<footnoteref linkend="users-largeuidgid"/> - , + <acronym>GID</acronym> бол ихÑнхдÑÑ 0 ÑÑÑ 65535 хүртÑлх тоо байдаг ба + <footnoteref linkend="users-largeuidgid"/>, Ñ…ÑÑ€ÑглÑгчдийг бүлÑглÑÑÑн бүлгийг гоцолж танихад Ñ…ÑÑ€ÑглÑгддÑг. БүлÑг нь Ñ…ÑÑ€ÑглÑгчдийн - UID болгон руу хандалгүйгÑÑÑ€ бүлÑглÑгдÑÑн Ñ…ÑÑÑг Ñ…ÑÑ€ÑглÑгчдийг бүлгийн дугаараар нь + <acronym>UID</acronym> болгон руу хандалгүйгÑÑÑ€ бүлÑглÑгдÑÑн Ñ…ÑÑÑг Ñ…ÑÑ€ÑглÑгчдийг <acronym>GID</acronym> + бүлгийн дугаараар нь хандаж зохицуулахад Ñ…ÑÑ€ÑглÑдÑг зарчим. ÐÐ½Ñ Ð½ÑŒ зарим тохируулагч файлуудад маш их зай Ñ…ÑмнÑÑ…Ñд Ñ‚ÑƒÑ Ð±Ð¾Ð»Ð´Ð¾Ð³. ÐÑг Ñ…ÑÑ€ÑглÑгч нь нÑгÑÑÑ Ð¸Ð»Ò¯Ò¯ олон бүлÑгт байж болно.</para> </listitem> @@ -157,8 +152,8 @@ <term>Ðууц үг өөрчлөх давтамж</term> <listitem> - <para>Ðнхны горимоороо FreeBSD нь Ñ…ÑÑ€ÑглÑгчдийг тодорхой давтамжтай - нууц үгÑÑ Ñолихыг шаарддаггүй. ÐÐ½Ñ ÑˆÐ°Ð°Ñ€Ð´Ð»Ð°Ð³Ñ‹Ð³ нÑгж Ñ…ÑÑ€ÑглÑгчид + <para>Ðнхны горимоороо &os; нь Ñ…ÑÑ€ÑглÑгчдийг тодорхой давтамжтай + нууц үгÑÑ Ñолихыг шаарддаггүй. Ðууц үгийн шаардлагыг нÑгж Ñ…ÑÑ€ÑглÑгчид Ñ…ÑÑ€ÑгжүүлÑхгүй байх, ÑÑвÑл Ñ…ÑÑÑг буюу бүх Ñ…ÑÑ€ÑглÑгчдийг тодорхой хугацаа өнгөрÑөний дараа нууц үгÑÑ Ñолих Ñ‘Ñтойгоор Ñ…ÑÑ€Ñгжүүлж болно.</para> </listitem> @@ -168,10 +163,9 @@ <term>БүртгÑлийн хүчинтÑй огноо</term> <listitem> - <para>Ðнхны горимоороо FreeBSD нь бүртгÑлд Ñ…Ñзгаар тавьдаггүй. Ð¥ÑÑ€Ñв - та бүртгÑл Ò¯Ò¯ÑгÑÑ… үед уг бүртгÑл нь тодорхой хугацаанд хүчинтÑй байх - Ñ‘Ñтой гÑдгийг мÑдÑж байвал, жишÑÑлбÑл, Ñургуульд оюутнуудад Ñ…ÑÑ€ÑглÑгч - нÑÑхдÑÑ Ñ…ÑзÑÑ Ð´ÑƒÑƒÑахыг нь мÑдÑж байх зÑÑ€Ñг ийм тохиолдолд бүртгÑлд + <para>Ðнхны горимоороо &os; нь бүртгÑлд Ñ…Ñзгаар тавьдаггүй. Ð¥ÑÑ€Ñв + бүртгÑл нь тодорхой хугацаанд хүчинтÑй байх + бол жишÑÑлбÑл Ñургуульд оюутнуудын хувьд бүртгÑлд та хүчинтÑй байх огноог нь зааж өгч болдог. ХүчинтÑй огноо Ñ…ÑÑ‚Ñ€ÑÑ… үед Ñ…ÑÑ€ÑглÑгч ÑиÑтемд нÑвтÑрч чадахгүй бөгөөд харин уг бүртгÑлд хамаарч байÑан файл болон Ñангууд Ñ…ÑвÑÑÑ€ÑÑ Ð±Ð°Ð¹Ð½Ð°.</para> @@ -182,7 +176,7 @@ <term>Ð¥ÑÑ€ÑглÑгчийн бүтÑн нÑÑ€</term> <listitem> - <para>Ð¥ÑÑ€ÑглÑгчийн нÑÑ€ нь FreeBSD дÑÑÑ€ цор ганц гоц байх Ñ‘Ñтой + <para>Ð¥ÑÑ€ÑглÑгчийн нÑÑ€ нь &os; дÑÑÑ€ цор ганц гоц байх Ñ‘Ñтой бөгөөд ÑÐ½Ñ Ð½ÑŒ заавал Ñ…ÑÑ€ÑглÑгчийн жинхÑÐ½Ñ Ð½ÑÑ€ байх алба үгүй. Тийм ÑƒÑ‡Ñ€Ð°Ð°Ñ ÑÐ½Ñ Ð½ÑÑ€ нь уг бүртгÑлд тохирÑон нÑмÑлт мÑдÑÑлÑл байж болно.</para> @@ -196,8 +190,11 @@ <para>ГÑрийн Ñан гÑдÑг нь ÑиÑтем дÑÑÑ€ буй бүхлÑÑÑ€ нь бичÑÑн Ñангийн байршил бөгөөд Ñ…ÑÑ€ÑглÑгч ÑиÑтемд нÑвтÑрч оронгуут ÑÐ½Ñ Ñанд ÑÑ…Ñлж ордог. Ðнгийн тогтÑон журманд, бүх Ñ…ÑÑ€ÑглÑгчийн гÑрийн Ñангууд нь - <filename>/home/<replaceable>Ñ…ÑÑ€ÑглÑгчийн-нÑÑ€</replaceable></filename> - ÑÑвÑл <filename>/usr/home/<replaceable>Ñ…ÑÑ€ÑглÑгчийн-нÑÑ€</replaceable></filename> + <filename + class="directory">/home/<replaceable>username</replaceable></filename> + ÑÑвÑл + <filename + class="directory">/usr/home/<replaceable>username</replaceable></filename> -д байрлуулÑан байдаг. Ð¥ÑÑ€ÑглÑгч нь гÑрийн Ñан дотроо хувийн файлуудаа хадгалах бөгөөд мөн Ñ‚ÑÑ€ дотроо дурын Ñан Ò¯Ò¯ÑгÑÑ… боломжтой.</para> @@ -217,13 +214,13 @@ </variablelist> <para>БүртгÑлийн гол гурван төрөл бий: <link - linkend="users-superuser">Супер Ñ…ÑÑ€ÑглÑгч</link>, <link + linkend="users-superuser">Ñупер Ñ…ÑÑ€ÑглÑгч</link>, <link linkend="users-system">ÑиÑтем Ñ…ÑÑ€ÑглÑгч</link>, Ñ‚ÑгÑÑд <link linkend="users-user">Ñ…ÑÑ€ÑглÑгчийн бүртгÑл</link>. Супер Ñ…ÑÑ€ÑглÑгчийн бүртгÑлийг голдуу <username>root</username> гÑж нÑрлÑдÑг бөгөөд, Ñмар ч Ñрхийн Ñ…ÑзгаарлалтгүйгÑÑÑ€ ÑиÑтемийг зохицуулж чаддаг. СиÑтем Ñ…ÑÑ€ÑглÑгчид нь үйлчилгÑÑнүүдийг ажиллуулах ÑрхтÑй. - ÐцÑÑÑ‚ нь, Ñ…ÑÑ€ÑглÑгчийн бүртгÑл нь болохоор жирийн хүмүүÑÑ‚ + Ð¥ÑÑ€ÑглÑгчийн бүртгÑл нь болохоор жирийн хүмүүÑÑ‚ Ñ…ÑÑ€ÑглÑгддÑг бөгөөд нÑвтÑрч орох, захиагаа шалгах зÑÑ€Ñг үйлдÑлд ашиглагддаг.</para> </sect1> @@ -236,8 +233,8 @@ <secondary>Ñупер Ñ…ÑÑ€ÑглÑгч (root)</secondary> </indexterm> <para>Голдуу <username>root</username> гÑж нÑрлÑгдÑÑ… - Ñупер Ñ…ÑÑ€ÑглÑгчийн бүртгÑл нь ÑиÑтемийг зохицуулах зорилгоор - урьдчилан тохируулагдаж ирдÑг бөгөөд захиа шалгах, програм + Ñупер Ñ…ÑÑ€ÑглÑгчийн бүртгÑл нь ÑиÑтемийг удирдах зорилгоор + ашиглагддаг бөгөөд захиа шалгах, програм ажиллуулах, ÑиÑтемийн зарим үйлдлийг турших зÑÑ€Ñг үйлдÑлд Ñ…ÑÑ€ÑглÑÑ… Ñ…ÑÑ€Ñггүй.</para> @@ -248,13 +245,12 @@ ÑвдÑÑ… чадваргүй ÑƒÑ‡Ñ€Ð°Ð°Ñ Ð¾Ð½Ñ†Ð³Ð¾Ð¹ шаардлага гарахгүй л бол Ñнгийн Ñ…ÑÑ€ÑглÑгчийн бүртгÑлийг байнга Ñ…ÑÑ€ÑглÑÑ… нь Ñайн.</para> - <para>Та Ñупер Ñ…ÑÑ€ÑглÑгч байх үедÑÑ Ð³Ò¯Ð¹Ñ†ÑтгÑÑ… гÑж буй тушаалаа үргÑлж давхар + <para>Супер Ñ…ÑÑ€ÑглÑгч байх үедÑÑ Ð³Ò¯Ð¹Ñ†ÑтгÑÑ… гÑж буй тушаалаа үргÑлж давхар удаа ÑÑвÑл гурван удаа шалгаж байхгүй бол, нÑмÑлт зай авалт ÑÑвÑл Ñ‚ÑмдÑг дутÑÐ°Ð½Ð°Ð°Ñ Ð±Ð¾Ð»Ð¶ нөхөж баршгүй өгөгдлийн гарз гарч болзошгүй билÑÑ.</para> - <para>Ийм болохоор, ÑÐ½Ñ Ð±Ò¯Ð»Ð³Ð¸Ð¹Ð³ уншÑаны дараа таны хийх Ñ…ÑÑ€ÑгтÑй хамгийн - Ñхний зүйл тань, Ñ…ÑÑ€Ñв Ò¯Ò¯ÑгÑÑгүй бол ердийн Ñ…ÑÑ€ÑглÑÑндÑÑ Ð·Ð¾Ñ€Ð¸ÑƒÐ»Ð¶ - онцгой Ñрхгүй Ñ…ÑÑ€ÑглÑгчийн бүртгÑл өөртөө нÑÑÑ… юм. + <para>СиÑтемийн админиÑтраторын хувьд Ñ…ÑÑ€ÑглÑгчийн бүртгÑл нÑÑж ердийн Ñ…ÑÑ€ÑглÑÑндÑÑ Ð·Ð¾Ñ€Ð¸ÑƒÐ»Ð¶ + ашиглах нь зүйтÑй юм. ÐÐ½Ñ Ð°Ñ€Ð³Ð° нь олон Ñ…ÑÑ€ÑглÑгчтÑй ÑÑвÑл ганц Ñ…ÑÑ€ÑглÑгчтÑй машины аль алинд нь Ñ…ÑÑ€ÑгжигдÑÑ… Ñ…ÑÑ€ÑгтÑй. ÐÐ½Ñ Ð±Ò¯Ð»Ð³Ð¸Ð¹Ð½ Ñүүл Ñ…ÑÑÑгт нÑмÑлт бүртгÑл Ò¯Ò¯ÑгÑÑд, жирийн Ñ…ÑÑ€ÑглÑгч болон Ñупер @@ -324,7 +320,7 @@ <secondary>modifying</secondary> </indexterm> - <para>&unix; орчинд Ñ…ÑÑ€ÑглÑгчийн бүртгÑлийг өөрчилж болох маш + <para>&os; дÑÑÑ€ Ñ…ÑÑ€ÑглÑгчийн бүртгÑлийг өөрчилж болох маш олон тушаалууд байдаг. Доорх Ñ…ÑÑÑгт хамгийн түгÑÑмÑл Ñ…ÑÑ€ÑглÑгддÑг тушаалуудыг Ñ…ÑÑ€ÑглÑÑ… жишÑÑÑ‚Ñй нь хамт нÑгтгÑж харууллаа.</para> @@ -382,10 +378,11 @@ </indexterm> <indexterm><primary>skeleton directory</primary></indexterm> <para>&man.adduser.8; нь ÑˆÐ¸Ð½Ñ Ñ…ÑÑ€ÑглÑгч нÑмдÑг Ñнгийн програм. - ÐÐ½Ñ Ð½ÑŒ ÑиÑтемийн <filename>passwd</filename> болон <filename>group</filename> - файлуудад оруулга нÑмдÑг. Мөн ÑÐ½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ нь ÑˆÐ¸Ð½Ñ Ñ…ÑÑ€ÑглÑгчид зориулж гÑрийн Ñан - Ò¯Ò¯ÑгÑж, анхдагч тохируулгын файлуудыг (<quote>цÑгтÑй файлууд</quote>) - <filename>/usr/share/skel</filename> ÑÐ°Ð½Ð³Ð°Ð°Ñ Ñ…ÑƒÑƒÐ»Ð°Ð½, Ñ…ÑÑ€Ñв нÑмÑлт + Ð¨Ð¸Ð½Ñ Ñ…ÑÑ€ÑглÑгч нÑмÑÑ…Ñд ÑÐ½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ нь автоматаар <filename>passwd</filename> + болон <filename>group</filename> файлуудыг шинÑчилдÑг. + Мөн ÑÐ½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ нь ÑˆÐ¸Ð½Ñ Ñ…ÑÑ€ÑглÑгчид зориулж гÑрийн Ñан + Ò¯Ò¯ÑгÑж, анхдагч тохируулгын файлуудыг + <filename class="directory">/usr/share/skel</filename> ÑÐ°Ð½Ð³Ð°Ð°Ñ Ñ…ÑƒÑƒÐ»Ð°Ð½, Ñ…ÑÑ€Ñв нÑмÑлт Ñонголт хийÑÑн бол ÑˆÐ¸Ð½Ñ Ñ…ÑÑ€ÑглÑгч Ñ€Ò¯Ò¯ мÑндчилгÑÑний захиа илгÑÑдÑг.</para> <!-- old version @@ -469,11 +466,11 @@ Goodbye! <para>Ð¥ÑÑ€ÑглÑгчийн гÑрийн Ñанг уÑтгана (Ñ…ÑÑ€Ñв Ñ…ÑÑ€ÑглÑгч ÑзÑмшдÑг бол).</para> </step> <step> - <para><filename>/var/mail</filename> доторх уг Ñ…ÑÑ€ÑглÑгчид + <para><filename class="directory">/var/mail</filename> доторх уг Ñ…ÑÑ€ÑглÑгчид ирÑÑн захиануудыг уÑтгана.</para> </step> <step> - <para>Ð¥ÑÑ€ÑглÑгчийн ÑзÑмшиж байÑан файлуудыг <filename>/tmp</filename> гÑÑ… мÑтийн түр хадгалагч ÑÐ°Ð½Ð³Ð°Ð°Ñ ÑƒÑтгана.</para> + <para>Ð¥ÑÑ€ÑглÑгчийн ÑзÑмшиж байÑан файлуудыг <filename class="directory">/tmp</filename> гÑÑ… мÑтийн түр хадгалагч ÑÐ°Ð½Ð³Ð°Ð°Ñ ÑƒÑтгана.</para> </step> <step> <para>ÐцÑÑÑ‚ нь <filename>/etc/group</filename> дотор буй Ñ…ÑÑ€ÑглÑгчийн хамрагддаг бүх бүлгүүдÑÑÑ ÑƒÐ³ Ñ…ÑÑ€ÑглÑгчийг уÑтгана.</para> @@ -517,7 +514,7 @@ Removing files belonging to jru from /var/tmp/vi.recover: done. <para>&man.chpass.1; нь Ñ…ÑÑ€ÑглÑгчийн өгөгдлийн бааз болох нууц үг, бүрхүүл, мөн хувийн мÑдÑÑлÑл зÑргүүдийг өөрчилдөг.</para> - <para>Зөвхөн ÑиÑтем зохицуулагчид нь Ñупер Ñ…ÑÑ€ÑглÑгч болж + <para>Зөвхөн Ñупер Ñ…ÑÑ€ÑглÑгч &man.chpass.1;-г Ñ…ÑÑ€ÑглÑн буÑдын мÑдÑÑллийг өөрчлөх ÑрхтÑй.</para> <para>Ð¥ÑÑ€ÑглÑгчийн нÑрийг нÑмÑлт Ñонголт болгож Ó©Ð³Ó©Ñ…Ó©Ó©Ñ Ð±ÑƒÑад үед, Ñмар нÑгÑн @@ -573,8 +570,7 @@ Other information:</screen> &man.ypchfn.1;, болон &man.ypchsh.1; нартай ижилхÑн холбооÑ. NIS дÑмжлÑг автоматаар хийгдÑÑн байгаа. Тийм болохоор тушаалын урд нь <literal>yp</literal> угтвар залгах шаардлагагүй. - Ð¥ÑÑ€Ñв ÑÐ½Ñ Ñ‚Ð°Ð½Ñ‹Ð³ ÑргÑлзүүлж гайхуулах байдалд хүргÑж байвал Ñанаа - зовÑны Ñ…ÑÑ€Ñггүй. NIS нь <xref linkend="network-servers"/> + NIS Ñ…ÑрхÑн тохируулах талаар <link linkend="network-servers"></link> Ñ…ÑÑÑгт тайлбарлагдах болно.</para> </note> </sect2> @@ -591,7 +587,8 @@ Other information:</screen> <note> <para>Болчимгүй алдаа ÑÑвÑл зөвшөөрөөгүй өөрчлөлт Ð¾Ñ€ÑƒÑƒÐ»Ð°Ñ…Ð°Ð°Ñ - ÑÑргийлж, ÑˆÐ¸Ð½Ñ Ð½ÑƒÑƒÑ† үгийг ÑÑƒÑƒÐ»Ð³Ð°Ñ…Ð°Ð°Ñ Ó©Ð¼Ð½Ó© анхны нууц үгийг аÑуудаг.</para> + ÑÑргийлж, ÑˆÐ¸Ð½Ñ Ð½ÑƒÑƒÑ† үгийг ÑÑƒÑƒÐ»Ð³Ð°Ñ…Ð°Ð°Ñ Ó©Ð¼Ð½Ó© анхны нууц үгийг аÑуудаг. + Супер Ñ…ÑÑ€ÑглÑгч шууд Ñолих боломжтой.</para> </note> <example> @@ -650,11 +647,9 @@ passwd: done</screen> <primary>бүртгÑл</primary> <secondary>Ñ…Ñзгаарлалт</secondary> </indexterm> - <para>Ð¥ÑÑ€Ñв та олон Ñ…ÑÑ€ÑглÑгчтÑй бол, Ñ‚ÑдгÑÑрийн ÑиÑтем Ñ…ÑÑ€ÑглÑÑ… - боломжийг нь Ñ…Ñзгаарлах Ñанаа төрж магадгүй. ÐÑгж - Ñ…ÑÑ€ÑглÑгчид зориулж ÑиÑтемийн Ñ…ÑÑ€ÑглÑÑг удирдах Ñ…Ñд Ñ…ÑдÑн - аргыг FreeBSD хангаж өгдөг. ÐдгÑÑÑ€ Ñ…Ñзгаарлалт нь хоёр Ñ…ÑÑÑгт - хуваагддаг: диÑкний хуваарилалт, Ñ‚ÑгÑÑд буÑад нөөцийн Ñ…Ñзгаарлалтууд.</para> + <para>&os; нь Ñ…ÑÑ€ÑглÑгчдийн ÑиÑтем Ñ…ÑÑ€ÑглÑÑ… + боломжийг нь Ñ…Ñзгаарлах боломжтой байдаг. ÐдгÑÑÑ€ Ñ…Ñзгаарлалт нь хоёр Ñ…ÑÑÑгт + хуваагддаг: диÑкний хуваарилалт, Ñ‚ÑгÑÑд буÑад нөөцийн Ñ…Ñзгаарлалтууд.</para> <indexterm><primary>хуваарилалт</primary></indexterm> <indexterm> @@ -664,8 +659,8 @@ passwd: done</screen> <indexterm><primary>диÑкний хуваарилалт</primary></indexterm> <para>ДиÑкийн хуваарилалт нь Ñ…ÑÑ€ÑглÑгчийн диÑк Ñ…ÑÑ€ÑглÑÑ… Ñ…ÑмжÑÑг зааглаж өгдөг бөгөөд тухай бүрд уг Ñ…ÑмжÑÑг тооцож бодолгүй - шуурхай шалгах боломж өгдөг. Хуваарилалт нь <xref - linkend="quotas"/> бүлÑгт авч Ñ…ÑлÑлцÑгдÑÑн.</para> + шуурхай шалгах боломж өгдөг. Хуваарилалт нь <link + linkend="quotas"></link> бүлÑгт авч Ñ…ÑлÑлцÑгдÑÑн.</para> <para>БуÑад нөөцийн Ñ…Ñзгаарлалтуудад ПроцеÑÑор, Ñанах ойн Ñ…ÑмжÑÑ Ð±Ð¾Ð»Ð¾Ð½ буÑад Ñ…ÑÑ€ÑглÑгчийн Ñ…ÑÑ€ÑглÑÑ… нөөцүүд @@ -680,24 +675,30 @@ passwd: done</screen> гÑхдÑÑ &man.login.conf.5; гарын авлагад тодорхой бичигдÑÑн байгаа. Ð¥ÑÑ€ÑглÑгч бүрд нÑвтрÑÑ… ангилал заагдÑан байдаг гÑж Ñ…ÑлÑÑ…Ñд хангалттай (анхдагч утга нь <literal>default</literal>), - бөгөөд нÑвтрÑÑ… ангилал бүр өөртөө тодорхой нÑвтрÑÑ… чанаруудыг агуулÑан байдаг. ÐÑвтрÑÑ… чанар гÑдÑг нь - <literal><replaceable>нÑÑ€</replaceable>=<replaceable>утга</replaceable></literal> гÑÑÑн хоÑлол бөгөөд үүний <replaceable>нÑÑ€</replaceable> нь бидний мÑдÑÑ… Ñ…ÑÑ€ÑглÑгчийн нÑÑ€ ба <replaceable>утга</replaceable> нь нÑртÑй хамаатай боловÑруулагдÑан мөр байдаг. + бөгөөд нÑвтрÑÑ… ангилал бүр өөртөө тодорхой нÑвтрÑÑ… чанаруудыг + агуулÑан байдаг. ÐÑвтрÑÑ… чанар гÑдÑг нь + <literal><replaceable>нÑÑ€</replaceable>=<replaceable>утга</replaceable></literal> + гÑÑÑн хоÑлол бөгөөд үүний <replaceable>нÑÑ€</replaceable> нь бидний мÑдÑÑ… + Ñ…ÑÑ€ÑглÑгчийн нÑÑ€ ба <replaceable>утга</replaceable> нь + <replaceable>нÑÑ€</replaceable>Ñ‚Ñй хамаатай боловÑруулагдÑан мөр байдаг. ÐÑвтрÑÑ… ангилал ба чанарыг тохируулах нь харьцангуй амархан бөгөөд мөн &man.login.conf.5; дотор тодорхой бичигдÑÑн.</para> <note> - <para>СиÑтем ердийн үед шууд + <para>&os; ердийн үед шууд <filename>/etc/login.conf</filename> файлыг уншдаггүй, харин түргÑн хайж харахад илүүгÑÑÑ€ нь <filename>/etc/login.conf.db</filename> өгөгдлийн бааз файлыг уншдаг. - <filename>/etc/login.conf</filename> Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ <filename>/etc/login.conf.db</filename> файлыг Ò¯Ò¯ÑгÑхийн тулд дараах тушаалыг + <filename>/etc/login.conf</filename>-д заÑвар хийх бүртÑÑ + <filename>/etc/login.conf.db</filename> файлыг шинÑчлÑÑ… Ñ‘Ñтой бөгөөд ингÑхийн тулд дараах тушаалыг гүйцÑтгÑÑ… Ñ…ÑÑ€ÑгтÑй:</para> <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen> </note> - <para>Ðөөцийн Ñ…Ñзгаарлалт нь Ñнгийн нÑвтрÑÑ… Ñ‡Ð°Ð½Ð°Ñ€Ð°Ð°Ñ Ñ…Ð¾Ñ‘Ñ€ замаар Ñлгардаг. Ðхнийх нь, Ñ…Ñзгаарлалт бүр зөөлөн (одоогийн) ба хатуу + <para>Ðөөцийн Ñ…Ñзгаарлалт нь Ñнгийн нÑвтрÑÑ… Ñ‡Ð°Ð½Ð°Ñ€Ð°Ð°Ñ Ñ…Ð¾Ñ‘Ñ€ замаар + Ñлгардаг. Ðхнийх нь, Ñ…Ñзгаарлалт бүр зөөлөн (одоогийн) ба хатуу Ñ…Ñзгаарлалт гÑж байдаг. Зөөлөн Ñ…Ñзгаарлалт нь Ñ…ÑÑ€ÑглÑгчÑÑÑ€ юм уу програмаар тохируулагдаж болдог бөгөөд хатуу Ñ…ÑÐ·Ð³Ð°Ð°Ñ€Ð»Ð°Ð»Ñ‚Ð°Ð°Ñ Ð´ÑÑгүүр биш. Харин хатуу Ñ…Ñзгаарлалт нь Ñ…ÑÑ€ÑглÑгчÑÑÑ€ доошоо @@ -724,15 +725,14 @@ passwd: done</screen> <primary>Ñ…ÑÑ€ÑглÑгчийн Ñ…Ñзгаарлалт</primary> <secondary>coredumpsize</secondary> </indexterm> - <para>Програмаар Ò¯Ò¯ÑгÑгдÑÑн үндÑÑн файлын Ñ…ÑмжÑÑний Ñ…Ñзгаар нь + <para>Програмаар Ò¯Ò¯ÑгÑгдÑÑн core файлын Ñ…ÑмжÑÑний Ñ…Ñзгаар нь мÑдÑÑж диÑкний Ñ…ÑÑ€ÑглÑÑ… Ñ…Ñзгаарт багтана. (<literal>файлын Ñ…ÑмжÑÑ</literal>, ÑÑвÑл диÑк хуваарилалт г.м). ТÑгÑÑн Ñ…Ñдий ч, ÑÐ½Ñ Ð½ÑŒ диÑкний Ñ…ÑÑ€ÑглÑÑ… Ñ…ÑмжÑÑг Ñ…Ñнахад - Ñ…ÑÑ€ÑглÑгддÑг нÑг их чухал биш тохируулга: үндÑÑн файлыг + Ñ…ÑÑ€ÑглÑгддÑг нÑг их чухал биш тохируулга: core файлыг Ñ…ÑÑ€ÑглÑгчид Ó©Ó©Ñ€Ñдөө Ò¯Ò¯ÑгÑдÑггүй бөгөөд Ñ‚ÑдгÑÑрийг дандаа - уÑтгаад байдаггүй учир үүгÑÑÑ€ тохируулÑан үед том програмаар - Ñ…ÑÑ€ÑглÑгдÑÑ… диÑкний Ñ…ÑÑ€ÑглÑÑ Ñ…ÑÑ‚ÑÑ€Ñний ÑƒÐ»Ð¼Ð°Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ - ÑвдÑрч ( жишÑÑ Ð½ÑŒ, <application>emacs</application>) зогÑÐ¾Ñ…Ð¾Ð¾Ñ - ÑÑргийлж болох юм. + уÑтгаад байдаггүй учир үүгÑÑÑ€ тохируулÑан үед том програм + (жишÑÑ Ð½ÑŒ, <application>emacs</application>) ажиллахдаа + core файл Ò¯Ò¯Ñч диÑк дүүрÑÑ…ÑÑÑ ÑÑргийлж болох юм. </para> </listitem> </varlistentry> @@ -751,12 +751,8 @@ passwd: done</screen> <note> <para>ÐÐ½Ñ Ð½ÑŒ процеÑÑорын <emphasis>давтамж</emphasis> - дÑÑÑ€ тавигдÑан Ñ…ÑÑ€ÑглÑÑний Ñ…Ñзгаар бөгөөд &man.top.1; ба &man.ps.1;-н зарим талбарт харагддаг процеÑÑорын хувийг зааÑан заалт биш. - Хувиар Ñ…Ñзгаарлана гÑдÑг нь ÑÐ½Ñ Ð³Ð°Ñ€Ñ‹Ð½ авлагыг бичиж - байх үед боломжгүй байÑан ба боломжтой байÑан ч Ñ…ÑÑ€ÑглÑÑ… - шаардлага байхгүй: хөрвүүлÑгч—зарим ноцтой - үйлдлүүд — заримдаа процеÑÑорын давтамжийг 100% хувь - Ñ…ÑÑ€ÑглÑж чаддаг.</para> + дÑÑÑ€ тавигдÑан Ñ…ÑÑ€ÑглÑÑний Ñ…Ñзгаар бөгөөд &man.top.1; ба + &man.ps.1;-н зарим талбарт харагддаг процеÑÑорын хувийг зааÑан заалт биш.</para> </note> </listitem> </varlistentry> @@ -791,9 +787,9 @@ passwd: done</screen> процеÑÑийн тоо юм. Үүнд нүүрÑн талын болон ар талын процеÑÑууд багтана. ÐœÑдÑÑж, ÑÐ½Ñ Ð½ÑŒ <varname>kern.maxproc</varname>-д заагдÑан &man.sysctl.8; ÑиÑтемийн Ñ…ÑÐ·Ð³Ð°Ð°Ñ€Ð°Ð°Ñ Ñ…ÑÑ‚Ñрч болохгүй. Мөн Ñ‚ÑмдÑглÑж Ñ…ÑлÑÑ…Ñд, үүнийг Ñ…ÑÑ‚Ñрхий багаар тохируулбал - Ñ…ÑÑ€ÑглÑгчийн олон дахин нÑвтÑрч орох, дамжуулах хоолой ашиглах зÑÑ€Ñг бүтÑÑмжид нөлөөлөх болно. Том програмыг хөрвүүлÑÑ… - гÑÑ… мÑÑ‚ зарим гүйцÑтгÑл нь мөн олон процеÑÑ ÑˆÐ°Ð°Ñ€Ð´Ð´Ð°Ð³ - (жишÑÑ Ð½ÑŒ, &man.make.1;, &man.cc.1;, ба буÑад дундын хөрвүүлÑлтÑнд Ñ…ÑÑ€ÑглÑгддÑг процеÑÑорууд).</para> + Ñ…ÑÑ€ÑглÑгчийн олон дахин нÑвтÑрч орох, дамжуулах хоолой ашиглах + зÑÑ€Ñг бүтÑÑмжид нөлөөлөх болно. Том програмыг хөрвүүлÑÑ… + гÑÑ… мÑÑ‚ зарим гүйцÑтгÑл нь мөн олон процеÑÑ ÑˆÐ°Ð°Ñ€Ð´Ð´Ð°Ð³.</para> </listitem> </varlistentry> @@ -806,10 +802,12 @@ passwd: done</screen> <primary>Ñ…ÑÑ€ÑглÑгчийн Ñ…Ñзгаарлалт</primary> <secondary>memorylocked</secondary> </indexterm> - <para>ÐÐ½Ñ Ð½ÑŒ Ñмар нÑг процеÑÑ Ñанах ойд түгжÑÑн Ñанамж шаардах үед - Ñ…Ñзгаарлах хамгийн их Ñанах ойн Ñ…ÑмжÑÑ. (жишÑÑ Ð½ÑŒ, - &man.mlock.2;-г харна уу). Зарим &man.amd.8; гÑÑ… мÑÑ‚ ÑиÑтемийн ноцтой програмууд нь үндÑÑн Ñанах ойг түгждÑг - бөгөөд түр шилжүүлÑг хийх шаардлага гарах үед ÑиÑтемийн зохицуулалтанд туÑалдаггүй. </para> + <para>ÐÐ½Ñ Ð½ÑŒ Ñмар нÑг процеÑÑ Ñанах ойд &man.mlock.2; ашиглан түгжÑÑн + Ñанамж шаардах үед Ñ…Ñзгаарлах хамгийн их Ñанах ойн Ñ…ÑмжÑÑ ÑŽÐ¼. + Зарим &man.amd.8; гÑÑ… мÑÑ‚ + ÑиÑтемийн ноцтой програмууд нь үндÑÑн Ñанах ойг түгждÑг + бөгөөд swap хийх үед ÑиÑтемийн + зохицуулалтанд туÑалдаггүй. </para> </listitem> </varlistentry> @@ -823,7 +821,9 @@ passwd: done</screen> <secondary>memoryuse</secondary> </indexterm> <para>ÐÐ½Ñ Ð½ÑŒ Ñмар нÑг процеÑÑ Ñмар ч үед Ñ…ÑÑ€ÑглÑж болох хамгийн их - Ñанах ойн Ñ…ÑмжÑÑ. ÐÐ½Ñ Ð½ÑŒ үндÑÑн Ñанах ой болон ÑÑлгÑÑ… зайг хоёуланд хамаатай. Санах ойн Ñ…Ñзгаарлалтын бүгдийг нь хийдÑггүй ч ÑндÑÑÑ ÑхлÑÑ… нь зөв ÑхлÑлд тооцогдоно.</para> + Ñанах ойн Ñ…ÑмжÑÑ. ÐÐ½Ñ Ð½ÑŒ үндÑÑн Ñанах ой болон swap зай + хоёуланд хамаатай. Санах ойн Ñ…Ñзгаарлалт бүгдийг нь + хийдÑггүй ч ÑндÑÑÑ ÑхлÑÑ… нь зөв ÑхлÑлд тооцогдоно.</para> </listitem> </varlistentry> @@ -837,7 +837,7 @@ passwd: done</screen> <secondary>openfiles</secondary> </indexterm> <para>ÐÐ½Ñ Ð½ÑŒ процеÑÑийн нÑÑж болох файлуудын хамгийн их - Ñ…ÑмжÑÑ. FreeBSD дÑÑÑ€ Ñокет, мөн IPC Ñувгууд нь файл + Ñ…ÑмжÑÑ. &os; дÑÑÑ€ Ñокет, мөн IPC Ñувгууд нь файл Ñ…ÑлбÑÑ€ÑÑÑ€ Ñ…ÑÑ€ÑглÑгддÑг болохоор үүнийг маш багаар тохируулахаа тун болгоомжлох Ñ…ÑÑ€ÑгтÑй. СиÑтем даÑар Ñ…Ñзгаарлахын тулд <varname>kern.maxfiles</varname>-д зааж өгнө &man.sysctl.8;.</para> </listitem> @@ -852,9 +852,8 @@ passwd: done</screen> <primary>Ñ…ÑÑ€ÑглÑгчийн Ñ…Ñзгаарлалт</primary> <secondary>sbsize</secondary> </indexterm> - <para>ÐÐ½Ñ Ð½ÑŒ ÑүлжÑÑнд Ñ…ÑÑ€ÑглÑгдÑÑ… Ñанах ойн Ñ…Ñзгаар. Тийм болохоор - Ñ…ÑÑ€ÑглÑгчийн Ñ…ÑÑ€ÑглÑж болох mbufs юм. ÐÐ½Ñ Ð½ÑŒ хуучин ДоС Ñ…Ð°Ð»Ð´Ð»Ð°Ð³Ð°Ð°Ñ Ð¾Ð»Ð¾Ð½ Ñокет - нÑÑÑ… дайралтын ÑÑÑ€Ñг Ò¯Ò¯ÑгÑÑÑн гаралтай бөгөөд ÑүлжÑÑний + <para>ÐÐ½Ñ Ð½ÑŒ ÑүлжÑÑнд Ñ…ÑÑ€ÑглÑгдÑÑ… Ñанах ойн Ñ…Ñзгаар буюу + Ñ…ÑÑ€ÑглÑгчийн Ñ…ÑÑ€ÑглÑж болох mbufs юм. ÐÐ½Ñ Ð½ÑŒ ÑүлжÑÑний холболтыг Ñ…Ñзгаарлахад ерөнхийдөө Ñ…ÑÑ€ÑглÑгдÑж болно.</para> </listitem> </varlistentry> @@ -888,25 +887,28 @@ passwd: done</screen> </listitem> <listitem> - <para>Ð¥ÑдийгÑÑÑ€ ихÑнх Ñ…Ñзгаарлалтуудыг агуулÑан <filename>/etc/login.conf</filename> файл ÑиÑтемтÑй цуг ирдÑг ч гÑÑÑн зөвхөн ÑиÑтем + <para>Ð¥ÑдийгÑÑÑ€ ихÑнх Ñ…Ñзгаарлалтуудыг агуулÑан +<filename>/etc/login.conf</filename> файл ÑиÑтемтÑй цуг ирдÑг ч гÑÑÑн зөвхөн ÑиÑтем удирдагч та л таны ÑиÑтемд Ñмар нь хамаатайг мÑднÑ. Тохируулгыг Ñ…ÑÑ‚ их болговол ÑиÑтемÑÑ Ð±ÑƒÑ€ÑƒÑƒ Ñ…ÑÑ€ÑглÑгчдÑд нÑÑж өгөх бөгөөд Ñ…ÑÑ€Ñв Ñ…ÑÑ‚ багаар тохируулбал бүтÑÑмжид Ñ…ÑÑ‚ нарийдна. </para> </listitem> <listitem> - <para>X цонхны ÑиÑтемийн (X11) Ñ…ÑÑ€ÑглÑгчид буÑад Ñ…ÑÑ€ÑглÑгчдийг - бодвол илүү их нөөцөөр хангагдах Ñ…ÑÑ€ÑгтÑй. X11 нь Ó©Ó©Ñ€Ó©Ó© + <para><application>&xorg;</application> Ñ…ÑÑ€ÑглÑгчид буÑад Ñ…ÑÑ€ÑглÑгчдийг + бодвол илүү их нөөцөөр хангагдах Ñ…ÑÑ€ÑгтÑй. <application>&xorg;</application> нь Ó©Ó©Ñ€Ó©Ó© маш их нөөц авдаг бөгөөд Ð±Ð°Ñ Ñ…ÑÑ€ÑглÑгчдÑд олон програмыг зÑÑ€Ñг ажиллуулах боломж өгдөг.</para> </listitem> <listitem> - <para>Маш олон Ñ…Ñзгаарлалт нь Ñ…ÑÑ€ÑглÑгч дÑÑÑ€ бүхÑлд нь биш харин нÑгж процеÑÑууд дÑÑÑ€ тавигддаг гÑдгийг Ñанах Ñ…ÑÑ€ÑгтÑй. ЖишÑÑлбÑл, + <para>Маш олон Ñ…Ñзгаарлалт нь Ñ…ÑÑ€ÑглÑгч дÑÑÑ€ бүхÑлд нь биш харин + нÑгж процеÑÑууд дÑÑÑ€ тавигддаг гÑдгийг Ñанах Ñ…ÑÑ€ÑгтÑй. ЖишÑÑлбÑл, <varname>openfiles</varname> тохируулгыг 50 гÑвÑл, ÑÐ½Ñ Ð½ÑŒ Ñ…ÑÑ€ÑглÑгчийн ажиллуулж буй процеÑÑ Ð±Ð¾Ð»Ð³Ð¾Ð½ 50 файл нÑÑж болно гÑÑÑн үг. Тийм болохоор, Ñ…ÑÑ€ÑглÑгчийн нÑÑж болох файлуудын - нийт Ñ…ÑмжÑÑ Ð½ÑŒ <literal>openfiles</literal>-н утгыг <literal>maxproc</literal>-н утгаар үржүүлж гарна. ÐÐ½Ñ Ð½ÑŒ мөн Ñанах + нийт Ñ…ÑмжÑÑ Ð½ÑŒ <literal>openfiles</literal>-н утгыг + <literal>maxproc</literal>-н утгаар үржүүлж гарна. ÐÐ½Ñ Ð½ÑŒ мөн Ñанах ойн Ñ…ÑÑ€ÑглÑÑнд Ð±Ð°Ñ Ñ…ÑÑ€ÑгжинÑ.</para> </listitem> </itemizedlist> @@ -927,26 +929,24 @@ passwd: done</screen> <secondary>бүлÑг</secondary> </indexterm> <para>БүлÑг гÑдÑг нь Ñ…ÑÑ€ÑглÑгчдийн бүлÑглÑж жагÑааÑан жагÑаалт юм. Бүлгүүд нь - бүлгийн нÑÑ€ ба GID (бүлгийн ID)-аар танигддаг. FreeBSD (мөн ихÑнх буÑад &unix; + бүлгийн нÑÑ€ ба <acronym>GID</acronym> (бүлгийн ID)-аар танигддаг. &os; (мөн ихÑнх буÑад &unix; төрлийн ÑиÑтем) дÑÑÑ€, Ñ†Ó©Ð¼Ó©Ó©Ñ Ñ…ÑÑ€ÑглÑгчийн процеÑÑийг юм хийхÑд нь зөвшөөрөл - өгөхдөө хоёр зүйлийг Ñ…ÑÑ€ÑглÑж шийддÑгÑÑÑ Ð½Ñг нь Ñ…ÑÑ€ÑглÑгчийн ID, нөгөө нь - Ñ‚ÑÑ€ Ñ…ÑÑ€ÑглÑгчийн хамаардаг бүлÑг байдаг. Ð¥ÑÑ€ÑглÑгчийн ID Ð°Ð°Ñ Ñлгарах нь, - процеÑÑод холбогдÑон бүлгийн жагÑаалт Ð±Ð°Ñ Ð±Ð°Ð¹Ð´Ð°Ð³. Та магадгүй Ñ…ÑÑ€ÑглÑгчийн ÑÑвÑл - процеÑÑийн <quote>бүлгийн ID</quote> гÑж байнга ÑонÑох байх. ИхÑнхдÑÑ ÑÐ½Ñ Ð½ÑŒ - Ñ…ÑÑ€ÑглÑгчийн бүлгийг Ñрьж байдаг.</para> + өгөхдөө хоёр зүйлийг Ñ…ÑÑ€ÑглÑж шийддÑгÑÑÑ Ð½Ñг нь Ñ…ÑÑ€ÑглÑгчийн <acronym>UID</acronym>, нөгөө нь + Ñ‚ÑÑ€ Ñ…ÑÑ€ÑглÑгчийн хамаардаг бүлÑг байдаг. + ИхÑнхдÑÑ Ñ…ÑÑ€ÑглÑгчийн процеÑÑын <acronym>GID</acronym> нь жагÑаалтын Ñхний + бүлÑг байдаг.</para> - <para>Бүлгийн нÑрийг бүлгийн ID-д харгалзуулÑан бичлÑг + <para>Бүлгийн нÑрийг бүлгийн <acronym>GID</acronym>-д харгалзуулÑан бичлÑг <filename>/etc/group</filename> файлд бий. ÐÐ½Ñ Ð½ÑŒ Ñнгийн текÑÑ‚ файл бөгөөд тодорхойлох хоёр цÑгÑÑÑ€ таÑлагдÑан дөрвөн талбар байдаг. Ðхний талбар нь бүлгийн нÑÑ€, хоёр дахь нь нууцлалын - хөрвүүлÑлт хийгдÑÑн нууц үг, гурав дахь нь бүлгийн ID, Ñ‚ÑгÑÑд Ñүүлийнх - нь таÑлалаар туÑгаарлагдÑан гишүүдийн жагÑаалт. ÐÐ½Ñ Ð½ÑŒ гараар заÑварлагдаж - болох бөгөөд (мÑдÑÑж та заÑварлах үедÑÑ Ð±Ð¸Ñ‡Ð¸Ð³Ð»Ñлийн алдаа гаргахгүй байх - шаардлагатай!). БичиглÑлийн дÑлгÑÑ€Ñнгүй мÑдÑÑллийг + хөрвүүлÑлт хийгдÑÑн нууц үг, гурав дахь нь бүлгийн <acronym>GID</acronym>, Ñ‚ÑгÑÑд Ñүүлийнх + нь таÑлалаар туÑгаарлагдÑан гишүүдийн жагÑаалт. + БичиглÑлийн дÑлгÑÑ€Ñнгүй мÑдÑÑллийг &man.group.5; хуудаÑÐ½Ð°Ð°Ñ Ñ…Ð°Ñ€Ð½Ð° уу.</para> - <para>Ð¥ÑÑ€Ñв та <filename>/etc/group</filename> файлыг гараар заÑварлахыг - Ñ…Ò¯ÑÑхгүй бол, та &man.pw.8; тушаалыг бүлÑг нÑмÑÑ… болон заÑварлахад + <para>Супер Ñ…ÑÑ€ÑглÑгч <filename>/etc/group</filename>-г гараар заÑварлаж болно. + Мөн &man.pw.8; тушаалыг бүлÑг нÑмÑÑ… болон заÑварлахад Ñ…ÑÑ€ÑглÑж болно. ЖишÑÑлбÑл, дараах жишÑÑ Ð½ÑŒ <groupname>teamtwo</groupname> нÑртÑй бүлгийг нÑмж байна:</para> @@ -960,27 +960,26 @@ teamtwo:*:1100:</screen> </example> <para>ДÑÑрх <literal>1100</literal> гÑÑÑн дугаар нь - <groupname>teamtwo</groupname> нÑртÑй бүлгийн ID. Одоохондоо - <groupname>teamtwo</groupname> бүлÑгт гишүүд байхгүй байгаа болохоор - Ñ…ÑÑ€ÑгцÑÑгүй байна гÑÑÑн үг. Тийм болохоор <username>jru</username> нөхрийг - <groupname>teamtwo</groupname> бүлÑгт урьж оруулцгааÑ.</para> + <groupname>teamtwo</groupname> нÑртÑй бүлгийн <acronym>GID</acronym>. Одоохондоо + <groupname>teamtwo</groupname> бүлÑгт гишүүд байхгүй байгаа. + Дараах тушаал <username>jru</username> нөхрийг + <groupname>teamtwo</groupname> бүлÑгт нÑмнÑ.</para> <example> - <title>&man.pw.8; ашиглан бүлгийн гишүүдийн жагÑаалтыг тохируулах нь</title> + <title>&man.pw.8; ашиглан ÑˆÐ¸Ð½Ñ Ð±Ò¯Ð»Ñгт Ñ…ÑÑ€ÑглÑгчдийн бүртгÑл нÑмÑÑ… нь</title> <screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput> &prompt.root; <userinput>pw groupshow teamtwo</userinput> teamtwo:*:1100:jru</screen> </example> - <para><option>-M</option> тохируулгад өгөх утга нь бүлÑгт байх - таÑлалаар туÑгаарлагдÑан Ñ…ÑÑ€ÑглÑгчдийн жагÑаалт байна. Өмнөх - Ñ…ÑÑÑгт үзÑÑнÑÑÑ€, нууц үг хадгалдаг файлд Ñ…ÑÑ€ÑглÑгч бүрд бүлÑг заагдÑан - байдгийг бид мÑднÑ. СиÑтем Ñүүлд нь бичигдÑÑ… Ñ…ÑÑ€ÑглÑгчдийг автоматаар - бүлгийн жагÑаалтад нÑмж өгдөг. &man.pw.8; тушаалыг + <para><option>-M</option> тохируулгад өгөх утга нь ÑˆÐ¸Ð½Ñ (хооÑон) бүлÑгт байх ÑÑвÑл Ñолигдох + таÑлалаар туÑгаарлагдÑан Ñ…ÑÑ€ÑглÑгчдийн жагÑаалт байна. Ð¥ÑÑ€ÑглÑгчийн + хувьд ÑÐ½Ñ Ð±Ò¯Ð»Ð³Ð¸Ð¹Ð½ гишүүнчлÑл нь нууц үгийн файлд зааÑан Ñ…ÑÑ€ÑглÑгчийн + анхдагч бүлÑг дÑÑÑ€ нÑмÑгдÑÑд Ó©Ó©Ñ€ байна. &man.pw.8; тушаалыг <option>groupshow</option> гÑÑÑн Ñонголтоор ажиллуулахад Ñ…ÑÑ€ÑглÑгчид харуулагддаггүй бөгөөд, харин мÑдÑÑллүүд нь &man.id.1; юм уу Ó©Ó©Ñ€ ижил төрлийн - тушаалаар харуулагддаг. Ó¨Ó©Ñ€Ó©Ó©Ñ€ Ñ…ÑлбÑл, &man.pw.8; нь зөвхөн + тушаалаар харуулагддаг. &man.pw.8; нь зөвхөн <filename>/etc/group</filename> файлыг өөрчилдөг Ð±Ð¾Ð»Ð¾Ñ…Ð¾Ð¾Ñ Ð½ÑмÑлт мÑдÑÑллийг <filename>/etc/passwd</filename> Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ ÑƒÐ½ÑˆÐ´Ð°Ð³Ð³Ò¯Ð¹.</para> @@ -1004,12 +1003,11 @@ teamtwo:*:1100:jru,db</screen> uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen> </example> - <para>Ðнд харуулÑнаар, <username>jru</username> гÑдÑг гишүүн + <para>ÐÐ½Ñ Ð¶Ð¸ÑˆÑÑн дÑÑÑ€ <username>jru</username> гÑдÑг гишүүн <groupname>jru</groupname> болон <groupname>teamtwo</groupname> бүлгийн гишүүн байна.</para> - <para> &man.pw.8;-н талаар дÑлгÑÑ€Ñнгүй мÑдÑÑллийг өөрийнх нь гарын авлагааÑ, мөн - <filename>/etc/group</filename> файлын Ñ…ÑлбÑршилтийн мÑдÑÑллийг &man.group.5; гарын - Ð°Ð²Ð»Ð°Ð³Ð°Ð°Ñ Ñ…Ð°Ñ€Ð½Ð° уу.</para> + <para>ÐÐ½Ñ Ñ‚ÑƒÑˆÐ°Ð°Ð»Ñ‹Ð½ талаар болон <filename>/etc/group</filename> файлын Ñ…ÑлбÑршилтийн + мÑдÑÑллийг &man.pw.8; болон &man.group.5; гарын Ð°Ð²Ð»Ð°Ð³Ð°Ð°Ñ Ñ…Ð°Ñ€Ð½Ð° уу.</para> </sect1> </chapter> diff --git a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml index 365671719e..17d5c4c3fe 100644 --- a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 1.49 + Original revision 40781 $FreeBSD$ --> diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml index 6fdff95732..256f078fe0 100644 --- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 39948 + Original revision 41087 $FreeBSD$ --> @@ -73,18 +73,18 @@ <itemizedlist> <listitem> - <para>&unix; болон &os;-ийн үндÑүүдийг ойлгох (<xref - linkend="basics"/>).</para> + <para><link linkend="basics">&unix; болон &os;-ийн үндÑүүдийг</link> + ойлгох.</para> </listitem> - <listitem><para>&os;-г Ñ…ÑрхÑн Ñуулгах талаар мÑдÑÑ… (<xref - linkend="install"/>).</para></listitem> + <listitem><para><link linkend="install">&os;-г Ñ…ÑрхÑн Ñуулгах</link> талаар + мÑдÑÑ….</para></listitem> - <listitem><para>Өөрийн ÑүлжÑÑний холболтоо Ñ…ÑрхÑн тохируулах талаар мÑдÑÑ… (<xref - linkend="advanced-networking"/>).</para></listitem> + <listitem><para><link linkend="advanced-networking">СүлжÑÑний холболтоо Ñ…ÑрхÑн + </link> тохируулах талаар мÑдÑÑ….</para></listitem> - <listitem><para>ÐÑмÑлт гуравдагч програм хангамжуудыг Ñ…ÑрхÑн Ñуулгах талаар - мÑдÑÑ… (<xref linkend="ports"/>).</para></listitem> + <listitem><para><link linkend="ports">ÐÑмÑлт гуравдагч програм хангамжуудыг + Ñ…ÑрхÑн Ñуулгах</link> талаар мÑдÑÑ….</para></listitem> </itemizedlist> </sect1> @@ -95,7 +95,7 @@ <title>&os;-г зочин OS маÑгаар ашиглах</title> <sect2 id="virtualization-guest-parallels"> - <title>MacOS дÑÑрх Parallels</title> + <title>&macos; X дÑÑрх <application>Parallels</application></title> <para>&mac;-д зориулÑан <application>Parallels Desktop</application> нь &macos; 10.4.6 буюу түүнÑÑÑ Ð´ÑÑш хувилбарыг ашиглаж байгаа &intel; дÑÑÑ€ ÑуурилÑан @@ -108,7 +108,7 @@ <sect3 id="virtualization-guest-parallels-install"> <title>Parallels/&macos; X дÑÑÑ€ &os;-г Ñуулгах</title> - <para>&os;-г &macos; X/<application>Parallels</application> дÑÑÑ€ Ñуулгах Ñхний алхам нь + <para>&os;-г <application>Parallels</application> дÑÑÑ€ Ñуулгах Ñхний алхам нь &os;-г Ñуулгахад зориулж ÑˆÐ¸Ð½Ñ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð» машиныг Ò¯Ò¯ÑгÑÑ… Ñвдал юм. <guimenu>Guest OS Type</guimenu> буюу Зочин OS-ийн төрөл гÑж аÑуухад нь <guimenuitem>&os;</guimenuitem> гÑж Ñонгох Ñ…ÑÑ€ÑгтÑй:</para> @@ -176,15 +176,15 @@ </imageobject> </mediaobject> - <para>Таны &os; виртуал машин Ò¯Ò¯ÑгÑгдÑÑний дараа та &os;-г түүн - дÑÑÑ€ Ñуулгах Ñ…ÑÑ€ÑгтÑй болно. Ðлбан Ñ‘Ñны &os; CDROM ÑÑвÑл + <para>&os; виртуал машин Ò¯Ò¯ÑгÑгдÑÑний дараа &os;-г түүн + дÑÑÑ€ Ñуулгаж болно. Ðлбан Ñ‘Ñны &os; CDROM ÑÑвÑл албан Ñ‘Ñны FTP ÑÐ°Ð¹Ñ‚Ð°Ð°Ñ Ñ‚Ð°Ñ‚Ð°Ð½ авÑан ISO Ð´Ò¯Ñ€Ñ Ð°ÑˆÐ¸Ð³Ð»Ð°Ð½ - Ñуулгах нь зүйтÑй юм. Та өөрийн локал &mac; файлын ÑиÑтем дÑÑÑ€ÑÑ - тохирох ISO дүрÑÑ‚Ñй болонгуутаа ÑÑвÑл өөрийн &mac;-ийн CD хөтөч дÑÑÑ€ - CDROM-той болонгуутаа өөрийн &os; <application>Parallels</application> цонхны баруун + Ñуулгах нь зүйтÑй юм. Локал &mac; файлын ÑиÑтем дÑÑÑ€ÑÑ + тохирох ISO дүрÑийг хуулах юм уу ÑÑвÑл &mac;-ийн CD хөтөч дÑÑÑ€ + CDROM хийх Ñ…ÑÑ€ÑгтÑй. &os; <application>Parallels</application> цонхны баруун доод талд байгаа диÑкний дүрÑÑн дÑÑÑ€ дарах Ñ…ÑÑ€ÑгтÑй. ÐÐ½Ñ Ð½ÑŒ - таны виртуал машин дахь CDROM хөтчийг диÑк дÑÑрх ISO файл - ÑÑвÑл таны жинхÑÐ½Ñ CDROM хөтөчтÑй холбох боломжийг олгох + виртуал машин дахь CDROM хөтчийг диÑк дÑÑрх ISO файл + ÑÑвÑл жинхÑÐ½Ñ CDROM хөтөчтÑй холбох боломжийг олгох цонхыг харуулах болно.</para> <mediaobject> @@ -193,9 +193,9 @@ </imageobject> </mediaobject> - <para>Өөрийн CDROM ÑÑ…Ñ‚Ñй ÑÐ½Ñ Ñ…Ð¾Ð»Ð±Ð¾Ð»Ñ‚Ñ‹Ð³ хийÑнийхÑÑ Ð´Ð°Ñ€Ð°Ð° дахин ачаалах - дүрÑийг дарж өөрийн &os; машиныг Ñ…Ñвийн үед дахин ачаалдаг шигÑÑ - дахин ачаална. <application>Parallels</application> нь Ñ…Ñвийн BIOS-ийн хийдÑг шиг + <para>CDROM ÑÑ…Ñ‚Ñй ÑÐ½Ñ Ñ…Ð¾Ð»Ð±Ð¾Ð»Ñ‚Ñ‹Ð³ хийÑнийхÑÑ Ð´Ð°Ñ€Ð°Ð° дахин ачаалах + дүрÑийг дарж &os; машиныг Ñ…Ñвийн үед дахин ачаалдаг шигÑÑ + дахин ачаална. <application>Parallels</application> нь танд CDROM байгаа ÑÑÑхийг шалгах туÑгай BIOS-оор ÑхлÑÑ… болно.</para> <mediaobject> @@ -205,9 +205,8 @@ </mediaobject> <para>ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ð¾Ð»Ð´Ð¾Ð»Ð´ ÑÐ½Ñ Ð½ÑŒ &os;-ийн Ñуулгах зөөвөрлөгчийг олж - <xref linkend="install"/>-Ñ‚ тайлбарлагдÑаны адилаар - ердийн <application>sysinstall</application> дÑÑÑ€ ÑуурилÑан Ñуулгалтыг ÑхлүүлÑÑ… болно. - Та X11 ÑиÑтемийг Ñуулгаж болох боловч ÑÐ½Ñ ÑƒÐ´Ð°Ð°Ð´ + ердийн &os; Ñуулгалтыг ÑхлүүлÑÑ… болно. + Та <application>&xorg;</application> Ñуулгаж болох боловч ÑÐ½Ñ ÑƒÐ´Ð°Ð°Ð´ тохируулахыг битгий оролдоорой.</para> <mediaobject> @@ -228,7 +227,7 @@ </sect3> <sect3 id="virtualization-guest-parallels-configure"> - <title>&os;-г &macos; X/Parallels дÑÑÑ€ тохируулах</title> + <title>&os;-г <application>Parallels</application> дÑÑÑ€ тохируулах</title> <para>&os;-г <application>Parallels</application>-ийн туÑламжтай &macos; X дÑÑÑ€ амжилттайгаар ÑуулгаÑны дараа виртуалчлагдÑан ажиллагаанд зориулж ÑиÑтемийг @@ -247,7 +246,7 @@ <programlisting>kern.hz=100</programlisting> <para>ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€Ð³Ð¾Ð¾Ð³Ò¯Ð¹Ð³ÑÑÑ€, Ñул зогÑож байгаа &os; <application>Parallels</application> - зочин OS нÑг процеÑÑор бүхий &imac;-ийн CPU-ийн 15%-г ойролцоогоор + зочин нÑг процеÑÑор бүхий &imac;-ийн CPU-ийн 15%-г ойролцоогоор ашиглах болно. ÐÐ½Ñ Ó©Ó©Ñ€Ñ‡Ð»Ó©Ð»Ñ‚Ð¸Ð¹Ð½ дараа Ñ…ÑÑ€ÑглÑÑ Ð½ÑŒ 5% руу ойртох болно.</para> </step> @@ -255,8 +254,9 @@ <step> <title>Ð¨Ð¸Ð½Ñ Ñ†Ó©Ð¼Ð¸Ð¹Ð½ тохиргооны файлыг Ò¯Ò¯ÑгÑнÑ</title> - <para>Та бүх SCSI, FireWire, болон USB төхөөрөмжийн драйверуудыг - арилгаж болно. <application>Parallels</application> нь <option>ed</option> драйверийн + <para>Бүх SCSI, FireWire, болон USB төхөөрөмжийн драйверуудыг + цөмийн тохиргооны Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ Ð°Ñ€Ð¸Ð»Ð³Ð°Ð¶ болно. + <application>Parallels</application> нь <option>ed</option> драйверийн ашигладаг виртуал ÑүлжÑÑний адаптерийн боломжтой байдаг, Ñ‚ÑгÑÑ…ÑÑÑ€ &man.ed.4; болон &man.miibus.4;-д зориулÑÐ½Ð°Ð°Ñ Ð±ÑƒÑад бүх ÑүлжÑÑний төхөөрөмжүүдийг Ñ†Ó©Ð¼Ó©Ó©Ñ Ð°Ñ€Ð¸Ð»Ð³Ð°Ð¶ @@ -266,12 +266,12 @@ <step> <title>СүлжÑÑг тохируулна</title> - <para>Хамгийн Ñ…Ñлбар ÑүлжÑÑний тохиргоо бол таны хоÑÑ‚ &mac; шигÑÑÑ€ - ижил локал ÑүлжÑÑнд өөрийн виртуал машиныг холбохын тулд DHCP-г + <para>Хамгийн Ñ…Ñлбар ÑүлжÑÑний тохиргоо бол хоÑÑ‚ &mac; шигÑÑÑ€ + ижил локал ÑүлжÑÑнд виртуал машиныг холбохын тулд DHCP-г ашиглах Ñвдал юм. Үүнийг <filename>/etc/rc.conf</filename> файлд <literal>ifconfig_ed0="DHCP"</literal> гÑж - нÑмÑн хийж болно. СүлжÑÑний илүү нарийн тохиргоонууд <xref - linkend="advanced-networking"/>-д тайлбарлагдÑан + нÑмÑн хийж болно. СүлжÑÑний илүү нарийн тохиргоонууд <link + linkend="advanced-networking"></link>-д тайлбарлагдÑан байгаа.</para> </step> </procedure> @@ -578,7 +578,7 @@ xenbr1 8000.feffffffffff no vif0.1 </sect2> --> <sect2 id="virtualization-guest-virtualpc"> - <title>&windows; дÑÑрх Virtual PC</title> + <title>&windows; дÑÑрх <application>Virtual PC</application></title> <para>&windows;-д зориулÑан <application>Virtual PC</application> нь чөлөөтÑй татаж авахаар байдаг, µsoft;-ийн програм хангамж @@ -587,12 +587,12 @@ xenbr1 8000.feffffffffff no vif0.1 СиÑтемийн шаардлагууд</ulink> хуудÑыг Ò¯Ð·Ð½Ñ Ò¯Ò¯. µsoft.windows; дÑÑÑ€ <application>Virtual PC</application> ÑууÑны дараа Ñ…ÑÑ€ÑглÑгч виртуал машинаа тохируулж Ñ…Ò¯ÑÑÑн зочин үйлдлийн ÑиÑтемÑÑ Ñуулгах - шаардлагатай.</para> + боломжтой.</para> <sect3 id="virtualization-guest-virtualpc-install"> - <title>Virtual PC/µsoft.windows; дÑÑÑ€ &os; Ñуулгах нь</title> + <title><application>Virtual PC</application> дÑÑÑ€ &os; Ñуулгах нь</title> - <para>µsoft.windows;/<application>Virtual PC</application> дÑÑÑ€ + <para><application>Virtual PC</application> дÑÑÑ€ &os; Ñуулгах Ñхний алхам нь &os;-г Ñуулгах ÑˆÐ¸Ð½Ñ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð» машин Ò¯Ò¯ÑгÑÑ… Ñвдал юм. ÐÑуухад нь <guimenuitem>Create a virtual machine</guimenuitem> гÑÑÑн цÑÑийг Ñонгоно:</para> @@ -659,16 +659,16 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Өөрийн чинь &os; машин Ò¯Ò¯ÑгÑгдÑÑний дараа түүн дÑÑÑ€ - &os; Ñуулгах шаардлагатай болно. Үүнийг албан Ñ‘Ñны &os; + <para>&os; машин Ò¯Ò¯ÑгÑгдÑÑний дараа түүн дÑÑÑ€ + &os; Ñуулгах боломжтой болно. Үүнийг албан Ñ‘Ñны &os; CDROM ÑÑвÑл албан Ñ‘Ñны FTP хаÑÐ³Ð°Ð°Ñ Ñ‚Ð°Ñ‚Ð°Ð¶ авÑан ISO дүрÑнÑÑÑ - Ñуулгах нь зүйтÑй. Өөрийн &windows; файлын ÑиÑтем дÑÑÑ€ тохирÑон - ISO Ð´Ò¯Ñ€Ñ ÑÑвÑл CD хөтөчдөө CDROM хийÑнийхÑÑ Ð´Ð°Ñ€Ð°Ð° өөрийн виртуал + Ñуулгах нь зүйтÑй. &windows; файлын ÑиÑтем дÑÑÑ€ тохирÑон + ISO Ð´Ò¯Ñ€Ñ Ñ…ÑƒÑƒÐ»Ð°Ñ… ÑÑвÑл CD хөтөчдөө CDROM хийÑнийхÑÑ Ð´Ð°Ñ€Ð°Ð° өөрийн виртуал &os; машин дÑÑÑ€ хоёр дарж ÑхлүүлÑÑ… Ñ…ÑÑ€ÑгтÑй. Дараа нь <application>Virtual PC</application> цонхны <guimenu>CD</guimenu> цÑÑÑн дÑÑÑ€ дарж <guimenu>Capture ISO Image...</guimenu> - цÑÑийг Ñонгоно. ИнгÑÑнÑÑÑ€ таны виртуал машин дÑÑÑ€ CDROM - хөтчийг диÑк дÑÑÑ€ байгаа ISO файлтай ÑÑвÑл таны өөрийн жинхÑÐ½Ñ + цÑÑийг Ñонгоно. ИнгÑÑнÑÑÑ€ виртуал машин дÑÑÑ€ CDROM + хөтчийг диÑк дÑÑÑ€ байгаа ISO файлтай ÑÑвÑл жинхÑÐ½Ñ CDROM хөтөчтÑй холбох боломжийг олгох цонхыг гаргаж ирÑÑ… юм.</para> <mediaobject> @@ -683,12 +683,12 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Өөрийн CDROM ÑÑ…Ñ‚Ñй ÑÐ½Ñ Ñ…Ð¾Ð»Ð±Ð¾Ð»Ñ‚Ñ‹Ð³ хийÑний дараа өөрийн + <para>CDROM ÑÑ…Ñ‚Ñй ÑÐ½Ñ Ñ…Ð¾Ð»Ð±Ð¾Ð»Ñ‚Ñ‹Ð³ хийÑний дараа өөрийн &os; виртуал машиныг <guimenu>Action</guimenu> болон <guimenu>Reset</guimenu> цÑÑүүдийг Ñонгон дахин ачаалах - Ñ…ÑÑ€ÑгтÑй. <application>Virtual PC</application> нь Ñг л - Ñнгийн BIOS шалгадаг шиг л танд CDROM байгаа ÑÑÑхийг ÑхлÑн - шалгах туÑгай BIOS-оор дахин ÑхлÑн ачаалах болно.</para> + Ñ…ÑÑ€ÑгтÑй. <application>Virtual PC</application> нь + CDROM байгаа ÑÑÑхийг ÑхлÑн + шалгах туÑгай BIOS-оор дахин ачаалах болно.</para> <mediaobject> <imageobject> @@ -697,9 +697,8 @@ xenbr1 8000.feffffffffff no vif0.1 </mediaobject> <para>ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ð¾Ð»Ð´Ð¾Ð»Ð´ &os;-ийн Ñуулгац зөөвөрлөгчийг олж - <xref linkend="install"/> дÑÑÑ€ тайлбарлаÑан шиг Ñнгийн - <application>sysinstall</application> дÑÑÑ€ тулгуурлаÑан - Ñуулгалтыг ÑхлүүлнÑ. Та X11-ийг ÑÐ½Ñ Ò¯ÐµÐ´ Ñуулгаж болох боловч + &os; + Ñуулгалтыг ÑхлүүлнÑ. <application>&xorg;</application> тохируулахыг бүү оролдоорой.</para> <mediaobject> @@ -720,7 +719,7 @@ xenbr1 8000.feffffffffff no vif0.1 </sect3> <sect3 id="virtualization-guest-virtualpc-configure"> - <title>µsoft.windows;/Virtual PC дÑÑÑ€ &os;-г тохируулах нь</title> + <title><application>Virtual PC</application> дÑÑÑ€ &os;-г тохируулах нь</title> <para>µsoft.windows; дÑÑÑ€ <application>Virtual PC</application> ашиглан &os;-г амжилттай ÑуулгаÑны дараа виртуалчлагдÑан үйлдÑлд зориулж @@ -749,8 +748,8 @@ xenbr1 8000.feffffffffff no vif0.1 <step> <title>Цөмийн ÑˆÐ¸Ð½Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€Ð³Ð¾Ð¾Ð½Ñ‹ файл Ò¯Ò¯ÑгÑнÑ</title> - <para>Та SCSI, FireWire болон USB төхөөрөмжийн - бүх драйверуудыг уÑтгаж болно. <application>Virtual PC</application> + <para>SCSI, FireWire болон USB төхөөрөмжийн + бүх драйверуудыг цөмийн тохиргооны Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ ÑƒÑтгаж болно. <application>Virtual PC</application> нь &man.de.4; драйверийн ашигладаг виртуал ÑүлжÑÑний адаптерийн боломжтой бөгөөд Ñ‚ÑгÑÑ…ÑÑÑ€ &man.de.4; болон &man.miibus.4;-Ñ Ð±ÑƒÑад бүх ÑүлжÑÑний @@ -761,12 +760,12 @@ xenbr1 8000.feffffffffff no vif0.1 <title>СүлжÑÑг тохируулна</title> <para>Хамгийн Ñнгийн ÑүлжÑÑний тохиргоо нь - өөрийн ÑÑ… µsoft.windows; холбогдÑон - Ñ‚ÑÑ€ дотоод ÑүлжÑÑндÑÑ Ó©Ó©Ñ€Ð¸Ð¹Ð½ виртуал машиныг холбохдоо + µsoft.windows; холбогдÑон + Ñ‚ÑÑ€ дотоод ÑүлжÑÑндÑÑ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð» машиныг холбохдоо DHCP-ийг ашиглах Ñвдал юм. <literal>ifconfig_de0="DHCP"</literal> мөрийг <filename>/etc/rc.conf</filename> файлд нÑмж үүнийг хийнÑ. СүлжÑÑний илүү нарийн тохиргоонуудын - талаар <xref linkend="advanced-networking"/> дÑÑÑ€ + талаар <link linkend="advanced-networking"></link> дÑÑÑ€ тайлбарлаÑан байгаа болно.</para> </step> </procedure> @@ -776,7 +775,7 @@ xenbr1 8000.feffffffffff no vif0.1 </sect2> <sect2 id="virtualization-guest-vmware"> - <title>MacOS дÑÑрх VMware</title> + <title> &macos; дÑÑрх <application>VMware Fusion</application></title> <para>&mac;-д зориулÑан <application>VMware Fusion</application> нь &macos; 10.4.9 болон түүнÑÑÑ Ñ…Ð¾Ð¹ÑˆÑ… хувилбар бүхий @@ -785,13 +784,13 @@ xenbr1 8000.feffffffffff no vif0.1 &os; нь бүрÑн дÑмжигдÑÑн зочин үйлдлийн ÑиÑтем юм. &macos; X дÑÑÑ€ <application>VMware Fusion</application> ÑуулгаÑны дараа Ñ…ÑÑ€ÑглÑгч виртуал машинаа тохируулж Ñ…Ò¯ÑÑÑн зочин үйлдлийн - ÑиÑтемÑÑ Ñуулгах Ñ‘Ñтой.</para> + ÑиÑтемÑÑ Ñуулгах боломжтой.</para> <sect3 id="virtualization-guest-vmware-install"> - <title>VMware/&macos; X дÑÑÑ€ &os; Ñуулгах нь</title> + <title><application>VMware Fusion</application> дÑÑÑ€ &os; Ñуулгах нь</title> - <para>Ðхний алхам нь VMware Fusion-г ÑхлүүлнÑ, ингÑÑ…Ñд Виртуал Машины - Сан ачаалагдах болно. "New"-г дарж VM буюу виртуал машин Ò¯Ò¯ÑгÑнÑ:</para> + <para>Ðхний алхам нь <application>VMware Fusion</application>-г ÑхлүүлнÑ. + ИнгÑÑ…Ñд Виртуал Машины Сан ачаалагдах болно. "New"-г дарж виртуал машин Ò¯Ò¯ÑгÑнÑ:</para> <mediaobject> <imageobject> @@ -799,9 +798,9 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>ÐÐ½Ñ Ð½ÑŒ VM Ò¯Ò¯ÑгÑÑ…Ñд тань туÑлах New Virtual Machine + <para>ÐÐ½Ñ Ð½ÑŒ New Virtual Machine Assistant буюу Ð¨Ð¸Ð½Ñ Ð’Ð¸Ñ€Ñ‚ÑƒÐ°Ð» Машины ТуÑлагчийг ачаалах - бөгөөд Continue дарж үргÑлжлүүлнÑ:</para> + бөгөөд <guimenuitem>Continue</guimenuitem> дарж үргÑлжлүүлнÑ:</para> <mediaobject> <imageobject> @@ -811,8 +810,7 @@ xenbr1 8000.feffffffffff no vif0.1 <para><guimenuitem>Operating System</guimenuitem> гÑдÑг дÑÑÑ€ <guimenuitem>Other</guimenuitem> гÑдгийг Ñонгоод - <guimenuitem>&os;</guimenuitem> юм уу ÑÑвÑл та - 64-битийн дÑмжлÑг Ñ…Ò¯ÑÑж байгаа бол + <guimenuitem>&os;</guimenuitem> юм уу ÑÑвÑл <guimenuitem>&os; 64-bit</guimenuitem> гÑдгийг <guimenu>Version</guimenu> гÑдÑг дÑÑÑ€ Ñонгоорой:</para> @@ -822,7 +820,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>VM дүрÑний нÑÑ€ болон хадгалахыг Ñ…Ò¯ÑÑж байгаа Ñ‚ÑÑ€ + <para>Виртуал машины нÑÑ€ болон хадгалахыг Ñ…Ò¯ÑÑж байгаа Ñ‚ÑÑ€ Ñангийнхаа нÑрийг Ñонгоно:</para> <mediaobject> @@ -831,7 +829,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>VM-д зориулÑан Виртуал Хатуу ДиÑкийнхÑÑ Ñ…ÑмжÑÑг + <para>Виртуал машинд зориулÑан Виртуал Хатуу ДиÑкийнхÑÑ Ñ…ÑмжÑÑг Ñонгоно:</para> <mediaobject> @@ -840,7 +838,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>VM-ийг Ñуулгахдаа ISO Ð´Ò¯Ñ€Ñ ÑÑвÑл CD-ий аль нÑгнÑÑÑ Ñуулгахыг + <para>Виртуал машин Ñуулгахдаа ISO Ð´Ò¯Ñ€Ñ ÑÑвÑл CD-ий аль нÑгнÑÑÑ Ñуулгахыг Ñонгоно:</para> <mediaobject> @@ -849,7 +847,8 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Finish-ийг дарÑны дараа VM дахин ачаалах болно:</para> + <para><guimenuitem>Finish</guimenuitem>-ийг дарÑны дараа виртуал + машин дахин ачаалах болно:</para> <mediaobject> <imageobject> @@ -857,8 +856,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Ердийн Ñуулгадагтайгаа адил юм уу ÑÑвÑл <xref linkend="install"/>-Ñ‚ - зааÑны дагуу &os;-ийг Ñуулгана:</para> + <para>Ердийн Ñуулгадагтайгаа адил &os;-ийг Ñуулгана:</para> <mediaobject> <imageobject> @@ -867,10 +865,10 @@ xenbr1 8000.feffffffffff no vif0.1 </mediaobject> <para>Суулгаж дууÑÑаны дараа Санах ойн Ñ…ÑÑ€ÑглÑÑ Ð·ÑÑ€Ñг - VM-ийн тохиргоонуудыг өөрчилж болно:</para> + виртуал машины тохиргоонуудыг өөрчилж болно:</para> <note> - <para>VM-ийг ажиллаж байхад VM-ийн ÑиÑтемийн тоног төхөөрөмжийн + <para>Виртуал машин ажиллаж байхад виртуал машины ÑиÑтемийн тоног төхөөрөмжийн тохиргоонуудыг өөрчилж болдоггүй.</para> </note> @@ -880,7 +878,7 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>VM-ийн хандаж болох CPU-ийн тоо:</para> + <para>Виртуал машины хандаж болох CPU-ийн тоо:</para> <mediaobject> <imageobject> @@ -888,8 +886,8 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>CD-Rom төхөөрөмжийн төлөв. Ð¥ÑÑ€Ñв танд CD-Rom/ISO дахиж - Ñ…ÑÑ€Ñг болохгүй бол та ерөнхийдөө түүнийг VM-ÑÑÑ Ñалгаж болно.</para> + <para>CDROM төхөөрөмжийн төлөв. CD/DVD/ISO дахиж + Ñ…ÑÑ€Ñг болохгүй бол ерөнхийдөө виртуал Ð¼Ð°ÑˆÐ¸Ð½Ð°Ð°Ñ Ñалгаж болно.</para> <mediaobject> <imageobject> @@ -897,14 +895,14 @@ xenbr1 8000.feffffffffff no vif0.1 </imageobject> </mediaobject> - <para>Сүүлийн өөрчлөх юм нь ÑүлжÑÑнд VM Ñ…ÑрхÑн холбогдохыг - заах юм. ÐÑ… хоÑÑ‚Ð¾Ð¾Ñ Ð½ÑŒ гадна буÑад Ð¼Ð°ÑˆÐ¸Ð½ÑƒÑƒÐ´Ð°Ð°Ñ VM Ñ€Ò¯Ò¯ - холболт хийгддÑг байхыг та зөвшөөрөхийг Ñ…Ò¯ÑÑж байгаа бол + <para>Сүүлийн өөрчлөх юм нь ÑүлжÑÑнд виртуал машин Ñ…ÑрхÑн холбогдохыг + заах юм. ÐÑ… хоÑÑ‚Ð¾Ð¾Ñ Ð½ÑŒ гадна буÑад Ð¼Ð°ÑˆÐ¸Ð½ÑƒÑƒÐ´Ð°Ð°Ñ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð» машин Ñ€Ò¯Ò¯ + холболт хийхийн тулд <guimenuitem>Connect directly to the physical network (Bridged)</guimenuitem> буюу Физик ÑүлжÑÑнд шууд холбогдох (Гүүр хийгдÑÑн) гÑдгийг Ñонгоорой. Ð¥ÑÑ€Ñв Ñ‚Ñгж - Ñ…Ò¯ÑÑхгүй байгаа бол VM-ийг ИнтернÑÑ‚ Ñ€Ò¯Ò¯ хандах боломжтой - болгодог боловч ÑүлжÑÑнÑÑÑ VM Ñ€Ò¯Ò¯ хандах боломжгүй <guimenuitem>Share the + Ñ…Ò¯ÑÑхгүй байгаа бол виртуал машиныг ИнтернÑÑ‚ Ñ€Ò¯Ò¯ хандах боломжтой + болгодог боловч ÑүлжÑÑнÑÑÑ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð» машин руу хандах боломжгүй <guimenuitem>Share the host's internet connection (NAT)</guimenuitem> буюу хоÑтын интернÑтийн холболтыг (NAT) хуваалцах гÑÑÑн Ñонголтыг Ñонгохыг зөвлөдөг.</para> @@ -920,9 +918,9 @@ xenbr1 8000.feffffffffff no vif0.1 </sect3> <sect3 id="virtualization-guest-vmware-configure"> - <title>&os;-г &macos; X/VMware дÑÑÑ€ тохируулах нь</title> + <title>&os;-г <application>VMware Fusion</application> дÑÑÑ€ тохируулах нь</title> - <para>&macos; X дÑÑÑ€ <application>VMware</application>-ийн + <para>&macos; X дÑÑÑ€ <application>VMware Fusion</application>-ийн туÑламжтайгаар &os; амжилттай ÑуугдÑаны дараа виртуалчлагдÑан үйлдÑлд зориулж ÑиÑтемийг оновчтой болгохын тулд хийгдÑж болох Ñ…Ñд Ñ…ÑдÑн тохиргооны алхмууд байдаг.</para> @@ -931,7 +929,7 @@ xenbr1 8000.feffffffffff no vif0.1 <step> <title>Ðчаалагч дуудагчийн хувьÑагчуудыг тохируулна</title> - <para><application>VMware</application> орчин доор + <para><application>VMware Fusion</application> орчин доор &os;-ийн CPU-ийн Ñ…ÑÑ€ÑглÑÑг багаÑгахын тулд <option>kern.hz</option> тохируулгыг багаÑгах нь хамгийн чухал алхам юм. Дараах мөрийг <filename>/boot/loader.conf</filename>-д @@ -940,7 +938,7 @@ xenbr1 8000.feffffffffff no vif0.1 <programlisting>kern.hz=100</programlisting> <para>ÐÐ½Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€Ð³Ð¾Ð¾Ð³Ò¯Ð¹Ð³ÑÑÑ€ Ñул зогÑож байгаа &os; - <application>VMware</application> зочин OS нь + <application>VMware Fusion</application> зочин OS нь ганц процеÑÑор бүхий &imac;-ийн CPU-ний бараг 15%-ийг ашиглах болно. ÐÐ½Ñ Ó©Ó©Ñ€Ñ‡Ð»Ó©Ð»Ñ‚Ð¸Ð¹Ð½ дараа ашиглалт дөнгөж 5% хүрÑÑ… Ñ…ÑмжÑÑний байх болно.</para> @@ -949,8 +947,8 @@ xenbr1 8000.feffffffffff no vif0.1 <step> <title>Цөмийн ÑˆÐ¸Ð½Ñ Ñ‚Ð¾Ñ…Ð¸Ñ€Ð³Ð¾Ð¾Ð½Ñ‹ файл Ò¯Ò¯ÑгÑнÑ</title> - <para>Та FireWire, болон USB төхөөрөмжийн бүх л драйверуудыг - хаÑаж болно. <application>VMware</application> нь + <para>FireWire, болон USB төхөөрөмжийн бүх л драйверуудыг + цөмийн тохиргооны Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ Ñ…Ð°Ñаж болно. <application>VMware Fusion</application> нь &man.em.4; драйверийн ашигладаг виртуал ÑүлжÑÑний адаптераар хангадаг учир &man.em.4;-д зориулÑÐ½Ð°Ð°Ñ Ð±ÑƒÑад ÑүлжÑÑний бүх төхөөрөмжүүдийг Ñ†Ó©Ð¼Ó©Ó©Ñ Ñ…Ð°Ñаж болно.</para> @@ -960,12 +958,12 @@ xenbr1 8000.feffffffffff no vif0.1 <title>СүлжÑÑг тохируулна</title> <para>Хамгийн Ñ…Ñлбар ÑүлжÑÑний тохиргоо нь - өөрийн хоÑÑ‚ &mac; холбогдÑон байгаа дотоод ÑүлжÑÑндÑÑ - DHCP ашиглан өөрийн виртуал машинаа холбох Ñвдал + хоÑÑ‚ &mac; холбогдÑон байгаа дотоод ÑүлжÑÑндÑÑ + DHCP ашиглан виртуал машинаа холбох Ñвдал юм. <filename>/etc/rc.conf</filename> файлд <literal>ifconfig_em0="DHCP"</literal> мөрийг нÑмÑнÑÑÑ€ үүнийг хийж болно. СүлжÑÑний илүү дÑлгÑÑ€Ñнгүй тохиргоонуудын - талаар <xref linkend="advanced-networking"/>-д тайлбарлаÑан + талаар <link linkend="advanced-networking"></link>-д тайлбарлаÑан байгаа.</para> </step> </procedure> @@ -981,23 +979,23 @@ xenbr1 8000.feffffffffff no vif0.1 <itemizedlist> <listitem> - <para>ЗавÑрын Ñамбар (Clipboard) хуваалцах</para> + <para>ЗавÑрын Ñамбар (Clipboard) хуваалцах.</para> </listitem> <listitem> - <para>Хулганы заагчийн нÑгтгÑл</para> + <para>Хулганы заагчийн нÑгтгÑл.</para> </listitem> <listitem> - <para>ХоÑтын цагийн Ñинхрончлол</para> + <para>ХоÑтын цагийн Ñинхрончлол.</para> </listitem> <listitem> - <para>Цонхны Ñ…ÑмжÑÑ Ó©Ó©Ñ€Ñ‡Ð»Ó©Ñ… боломж</para> + <para>Цонхны Ñ…ÑмжÑÑ Ó©Ó©Ñ€Ñ‡Ð»Ó©Ñ… боломж.</para> </listitem> <listitem> - <para>Ð¥Ñлбар (Seamless) горим</para> + <para>Ð¥Ñлбар (Seamless) горим.</para> </listitem> </itemizedlist> @@ -1006,8 +1004,8 @@ xenbr1 8000.feffffffffff no vif0.1 </note> <para>ÐхлÑÑд <filename - role="package">emulators/virtualbox-ose-additions</filename> багцыг - &os; зочин дÑÑÑ€ Ñуулгана.</para> + role="package">emulators/virtualbox-ose-additions</filename> багц ÑÑвÑл портыг + &os; зочин дÑÑÑ€ Ñуулгана. ÐÐ½Ñ Ð½ÑŒ портыг Ñуулгах болно:</para> <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen> @@ -1021,10 +1019,10 @@ vboxservice_enable="YES"</programlisting> <programlisting>vboxservice_flags="--disable-timesync"</programlisting> - <para><literal>vboxvideo_drv</literal>-г - <command>Xorg -configure</command> таних Ñ‘Ñтой. Ð¥ÑÑ€Ñв үгүй бол + <para><literal>vboxvideo</literal> драйверыг + <command>Xorg -configure</command> автоматаар таних Ñ‘Ñтой. Ð¥ÑÑ€Ñв үгүй бол <application>&virtualbox;</application> видео картын - хувьд <filename>xorg.conf</filename>-г өөрчлөөрөй:</para> + хувьд <filename>/etc/X11/xorg.conf</filename>-г өөрчлөөрөй:</para> <programlisting>Section "Device" ### Available Driver options are:- @@ -1038,8 +1036,8 @@ vboxservice_enable="YES"</programlisting> BusID "PCI:0:2:0" EndSection</programlisting> - <para><literal>vboxmouse_drv</literal>-г ашиглахын тулд - <filename>xorg.conf</filename> дахь хулгахын Ñ…ÑÑгийг + <para><literal>vboxmouse</literal> драйверыг ашиглахын тулд + <filename>/etc/X11/xorg.conf</filename> дахь хулгахын Ñ…ÑÑгийг тохируулаарай:</para> <programlisting>Section "InputDevice" @@ -1047,8 +1045,8 @@ EndSection</programlisting> Driver "vboxmouse" EndSection</programlisting> - <para><acronym>HAL</acronym> Ñ…ÑÑ€ÑглÑгчид ÑÐ½Ñ Ñ„Ð°Ð¹Ð»Ñ‹Ð³ - <filename>/usr/local/etc/hal/fdi/policy/90-vboxguest.fdi</filename> гÑж юм уу ÑÑвÑл + <para><acronym>HAL</acronym> Ñ…ÑÑ€ÑглÑгчид дараах + <filename>/usr/local/etc/hal/fdi/policy/90-vboxguest.fdi</filename> файлыг Ò¯Ò¯ÑгÑÑ… юм уу ÑÑвÑл <filename>/usr/local/share/hal/fdi/policy/10osvendor/90-vboxguest.fdi</filename> Ñ„Ð°Ð¹Ð»Ð°Ð°Ñ Ñ…ÑƒÑƒÐ»Ð¶ Ò¯Ò¯ÑгÑÑ… шаардлагатай:</para> @@ -1088,16 +1086,7 @@ EndSection</programlisting> </sect1> <sect1 id="virtualization-host"> - <title>&os;-г хоÑÑ‚ буюу ÑÑ… OS маÑгаар ашиглах</title> - - <para>Олон жилийн туршид &os; нь аль нÑг виртуалчлах шийдлийн хувьд - албан Ñ‘Ñоор ÑÑ… OS маÑгаар ашиглагдах боломжгүй байлаа. Зарим Ñ…Ò¯Ð¼Ò¯Ò¯Ñ - &linux;-ийн хоёртын нийлÑмжтÑй давхаргыг Ñ…ÑÑ€ÑглÑдÑг - <application>VMware</application>-ийн ихÑвчлÑн хуучирÑан хувилбарыг (<filename - role="package">emulators/vmware3</filename> шиг) ашигладаг байлаа. - &os; 7.2 хувилбар гарÑны дөнгөж дараахан Sun-ий - <application>&virtualbox;</application>-ийн ÐÑÑлттÑй ÐÑ… Хувилбар - портын цуглуулгад &os;-ийн ÑÑ… програм Ñ…ÑлбÑÑ€ÑÑÑ€ орÑон.</para> + <title>&os;-г хоÑÑ‚ буюу ÑÑ… маÑгаар ашиглах</title> <para><application>&virtualbox;</application> нь идÑвхтÑйгÑÑÑ€ хөгжүүлÑгдÑж байгаа бүрÑн Ñ…ÑмжÑÑний виртуалчлалын багц бөгөөд &windows;, &macos;, @@ -1106,7 +1095,7 @@ EndSection</programlisting> адил Ñ…ÑмжÑÑгÑÑÑ€ ажиллуулах чадвартай юм. ÐÐ½Ñ Ð½ÑŒ нÑÑлттÑй Ñхийн тоног төхөөрөмж Ñ…ÑлбÑÑ€ÑÑÑ€ байдаг боловч хаалттай Ñ…ÑÑгүүд нь нÑмÑлт өргөтгөл Ñ…ÑлбÑÑ€ÑÑÑ€ байдаг. ÐдгÑÑÑ€ Ñ…ÑÑгүүдÑд USB 2.0 төхөөрөмжүүдийн - дÑмжлÑг зÑÑ€Ñг байдаг. ДÑлгÑÑ€Ñнгүй мÑдÑÑллийг + дÑмжлÑг байдаг. ДÑлгÑÑ€Ñнгүй мÑдÑÑллийг <application>&virtualbox;</application>-ийн викигийн <quote>Downloads</quote> Ñ…ÑƒÑƒÐ´Ð°Ñ <ulink url="http://www.virtualbox.org/wiki/Downloads"></ulink>-Ñ @@ -1115,23 +1104,21 @@ EndSection</programlisting> <sect2 id="virtualization-virtualbox-install"> <title>&virtualbox; Ñуулгах нь</title> - <para><application>&virtualbox;</application> нь &os;-ийн порт Ñ…ÑлбÑÑ€ÑÑÑ€ + <para><application>&virtualbox;</application> нь &os;-ийн багц ÑÑвÑл порт Ñ…ÑлбÑÑ€ÑÑÑ€ <filename role="package">emulators/virtualbox-ose</filename> Ñанд байрладаг. - &virtualbox; нь маш идÑвхтÑй хөгжүүлÑгддÑг ÑƒÑ‡Ñ€Ð°Ð°Ñ ÑуулгахааÑаа өмнө таны портын - мод хамгийн Ñүүлийн хувилбар байгаа ÑÑÑхийг шалгаарай. - Дараах тушаалыг ашиглан Ñуулгаж болно:</para> + Дараах тушаалыг ашиглан портыг Ñуулгаж болно:</para> <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>Тохиргооны цонхон дÑÑрх ÑÐ¾Ð½Ð³Ð¾Ð»Ñ‚ÑƒÑƒÐ´Ð°Ð°Ñ Ð°ÑˆÐ¸Ð³Ñ‚Ð°Ð¹ нÑг нь + <para>Тохиргооны цÑÑ Ð´ÑÑрх ÑÐ¾Ð½Ð³Ð¾Ð»Ñ‚ÑƒÑƒÐ´Ð°Ð°Ñ Ð°ÑˆÐ¸Ð³Ñ‚Ð°Ð¹ нÑг нь <literal>GuestAdditions</literal> буюу зочин нÑмÑлтүүд програмууд юм. ÐдгÑÑÑ€ нь хулганын заагчийн нÑгдÑл (хулганыг ÑÑ… болон зочин үйлдлийн ÑиÑтемийн хооронд гарын туÑгай хоÑлол дарж шилжих шаардлагагүйгÑÑÑ€ хуваалцан Ñ…ÑÑ€ÑглÑÑ… боломжийг бүрдүүлдÑг) болон ÑлангуÑа &windows; зочдын хувьд илүү хурдан видео харуулах зÑÑ€Ñг зочин үйлдлийн ÑиÑтемүүдийг Ñ…Ñд Ñ…ÑдÑн ашигтай боломжуудаар хангадаг. Зочны нÑмÑлтүүд нь - зочин үйлдлийн ÑиÑтемийг Ñуулгаж дууÑÑаны дараа <guimenu>Devices</guimenu> + зочинг Ñуулгаж дууÑÑаны дараа <guimenu>Devices</guimenu> цÑÑÑнд байх болно.</para> <para><application>&virtualbox;</application>-ийг анх удаа ÑхлүүлÑÑ…ÑÑÑÑÑ @@ -1165,9 +1152,7 @@ EndSection</programlisting> <para><filename class="devicefile">/dev/vboxnetctl</filename>-н анхдагч зөвшөөрлүүд нь Ñ…Ñзгаарлагдмал байдаг бөгөөд гүүр ÑүлжÑÑний хувьд өөрчлөх шаардлагатай - байдаг.</para> - - <para>Түр зуур шалгахын тулд:</para> + байдаг:</para> <screen>&prompt.root; <userinput>chown root:vboxusers /dev/vboxnetctl</userinput> &prompt.root; <userinput>chmod 0660 /dev/vboxnetctl</userinput></screen> @@ -1179,17 +1164,15 @@ EndSection</programlisting> perm vboxnetctl 0660</programlisting> <para><application>&virtualbox;</application>-ийг ажиллуулахын - тулд график орчны цÑÑнÑÑÑ <guimenuitem>Sun VirtualBox</guimenuitem>-г - Ñонгох юм уу ÑÑвÑл дараахийг терминал дÑÑÑ€ бичиж ажиллуулах + тулд <application>&xorg;</application> дÑÑÑ€ÑÑÑ Ð´Ð°Ñ€Ð°Ð°Ñ…Ð¸Ð¹Ð³ бичиж ажиллуулах Ñ…ÑÑ€ÑгтÑй:</para> <screen>&prompt.user; <userinput>VirtualBox</userinput></screen> <para><application>&virtualbox;</application>-ийг тохируулж ашиглах талаар дÑлгÑÑ€Ñнгүй мÑдÑÑллийг <ulink url="http://www.virtualbox.org"></ulink> - албан Ñ‘Ñны вÑб Ñайтад хандаж Ò¯Ð·Ð½Ñ Ò¯Ò¯. &os;-ийн порт нь хамгийн - Ñүүлийн үеийнх бөгөөд маш ÑрчимтÑй хөгжүүлÑлт хийгдÑж байдаг. - Хамгийн Ñүүлийн үеийн мÑдÑÑлÑл болон алдааг олж заÑварлах + албан Ñ‘Ñны вÑб Ñайтад хандаж Ò¯Ð·Ð½Ñ Ò¯Ò¯. + &os;-Ñ‚Ñй холбоотой мÑдÑÑлÑл болон алдааг олж заÑварлах заавруудыг &os;-ийн вики <ulink url="http://wiki.FreeBSD.org/VirtualBox"></ulink> дÑÑ… тохирох хуудÑанд хандаж Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para> @@ -1198,17 +1181,13 @@ perm vboxnetctl 0660</programlisting> <sect2 id="virtualization-virtualbox-usb-support"> <title>&virtualbox; USB дÑмжлÑг</title> - <note> - <para>ÐдгÑÑÑ€ алхмууд нь VirtualBox 4.0.0 болон түүнÑÑÑ Ñ…Ð¾Ð¹ÑˆÑ… хувилбарыг шаардана.</para> - </note> - <para>USB Ñ‚Ó©Ñ…Ó©Ó©Ñ€Ó©Ð¼Ð¶Ó©Ó©Ñ ÑƒÐ½ÑˆÐ¸Ñ… болон түүн Ñ€Ò¯Ò¯ бичихийн - тулд Ñ…ÑÑ€ÑглÑгчид оператор бүлгийн гишүүн байх Ñ‘Ñтой:</para> + тулд Ñ…ÑÑ€ÑглÑгчид <groupname>operator</groupname> бүлгийн гишүүн байх Ñ‘Ñтой:</para> <screen>&prompt.root; <userinput>pw groupmod operator -m <replaceable>jerry</replaceable></userinput></screen> <para>Дараа нь дараахийг <filename>/etc/devfs.rules</filename> - файлд нÑÐ¼Ð½Ñ (байхгүй бол Ò¯Ò¯ÑгÑÑÑ€Ñй):</para> + файлд нÑмÑÑ… юм уу ÑÑвÑл байхгүй бол Ò¯Ò¯ÑгÑÑÑ€Ñй:</para> <programlisting>[system=10] add path 'usb/*' mode 0660 group operator</programlisting> @@ -1221,7 +1200,7 @@ add path 'usb/*' mode 0660 group operator</programlisting> <para>Дараа нь devfs-г дахин ачаална:</para> - <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput></screen> + <screen>&prompt.root; <userinput>service devfs restart</userinput></screen> <para>USB-г одоо зочин үйлдлийн ÑиÑтем дÑÑÑ€ идÑвхжүүлж болно. USB төхөөрөмжүүд нь &virtualbox;-н тохиргоон дÑÑÑ€ @@ -1233,8 +1212,8 @@ add path 'usb/*' mode 0660 group operator</programlisting> <para>ХоÑтын DVD/CD хөтчүүдÑд зочин ÑиÑтемÑÑÑ Ñ…Ð°Ð½Ð´Ð°Ñ…Ð´Ð°Ð° физик хөтчийг хуваалцан Ñ…ÑÑ€ÑглÑÑ… замаар ханддаг. - GUI дÑÑÑ€ үүнийг виртуал машины Settings дÑÑ… Storage Ñ†Ð¾Ð½Ñ…Ð½Ð¾Ð¾Ñ - тохируулдаг. ÐхлÑÑд хооÑон IDE CD/DVD төхөөрөмж Ò¯Ò¯ÑгÑнÑ. + &virtualbox; дотор үүнийг виртуал машины Settings дÑÑ… Storage Ñ†Ð¾Ð½Ñ…Ð½Ð¾Ð¾Ñ + тохируулдаг. Шаардлагатай бол ÑхлÑÑд хооÑон IDE CD/DVD төхөөрөмж Ò¯Ò¯ÑгÑнÑ. Дараа нь виртуал CD/DVD хөтөч Ñонгохын тулд гарч ирÑÑ… цÑÑнÑÑÑ Ñ…Ð¾Ñтын хөтчийг Ñонгоно. <literal>Passthrough</literal> гÑж хаÑглагдÑан Ñонгох боломжтой хайрцаг гарч ирнÑ. @@ -1245,7 +1224,7 @@ add path 'usb/*' mode 0660 group operator</programlisting> <para><application>&virtualbox;</application> DVD/CD-г ажиллуухын тулд <acronym>HAL</acronym>-г ажиллуулах Ñ‘Ñтой бөгөөд ингÑхийн тулд <filename>/etc/rc.conf</filename>-д түүнийг идÑвхжүүлж - ÑхлүүлÑÑ… Ñ…ÑÑ€ÑгтÑй (Ñ…ÑÑ€Ñв ажиллаагүй байгаа бол):</para> + Ñ…ÑÑ€Ñв ажиллаагүй байгаа бол ÑхлүүлÑÑ… Ñ…ÑÑ€ÑгтÑй:</para> <programlisting>hald_enable="YES"</programlisting> @@ -1258,16 +1237,15 @@ add path 'usb/*' mode 0660 group operator</programlisting> болон <filename class="devicefile">/dev/pass<replaceable>N</replaceable></filename> файлуудад хандах зөвшөөрөл Ñ…ÑÑ€ÑгтÑй. Үүнийг хийхдÑÑ - <application>&virtualbox;</application> Ñ…ÑÑ€ÑглÑгчийг operator бүлÑг Ñ€Ò¯Ò¯ - нÑмж шийднÑ. ÐÐ½Ñ Ð±Ò¯Ð»Ñг нь Ð±Ð°Ñ Ð´ÑÑÑ€ дурдÑан төхөөрөмжүүдийн анхдагч - бүлÑг юм. ÐдгÑÑÑ€ төхөөрөмжүүдийн зөвшөөрлүүдийг заÑахдаа дараах мөрүүдийг + Ñ…ÑÑ€ÑглÑгчийг <groupname>operator</groupname> бүлÑг Ñ€Ò¯Ò¯ + нÑмж шийднÑ. ÐдгÑÑÑ€ төхөөрөмжүүдийн зөвшөөрлүүдийг заÑахдаа дараах мөрүүдийг <filename>/etc/devfs.conf</filename> файлд нÑмж хийж өгнө:</para> <programlisting>perm cd* 0600 perm xpt0 0660 perm pass* 0660</programlisting> - <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput></screen> + <screen>&prompt.root; <userinput>service devfs restart</userinput></screen> </sect2> <!-- diff --git a/mn_MN.UTF-8/books/handbook/x11/chapter.xml b/mn_MN.UTF-8/books/handbook/x11/chapter.xml index ec9253225b..44ca67dd4a 100644 --- a/mn_MN.UTF-8/books/handbook/x11/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/x11/chapter.xml @@ -2,7 +2,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40566 + Original revision 41025 $FreeBSD$ --> @@ -40,8 +40,7 @@ (болон Ñнд дурдагдаагүй буÑад програм хангамжийн багцуудад) хийгдÑÑн байдаг. X11-ийн Ðнхдагч бөгөөд албан Ñ‘Ñны хувилбар нь X.Org ÑÐ°Ð½Ð³Ð°Ð°Ñ Ð³Ð°Ñ€Ð³Ð°Ñан <application>&xorg;</application> бөгөөд түүний - лиценз нь &os;-ийн лицензтÑй ижил Ñ‚Ó©ÑÓ©Ó©Ñ‚Ñй билÑÑ. Мөн &os;-д зориулÑан - худалдаж авч болохоор Ð¥ Ñерверүүд байдаг.</para> + лиценз нь &os;-ийн лицензтÑй ижил Ñ‚Ó©ÑÓ©Ó©Ñ‚Ñй билÑÑ.</para> <para>X11-н дÑмждÑг дÑлгÑцтÑй холбоотой төхөөрөмжийн талаар <ulink @@ -122,7 +121,7 @@ гаралтын төхөөрөмж байж болох юм) мÑдÑÑллийг хүлÑÑж аван зохицуулах үйлдлүүдийг хариуцаж ажиллаж байдаг. X програм болгон (<application>XTerm</application> - ÑÑвÑл <application>&netscape;</application> гÑÑ… мÑÑ‚) уг Ñерверийн + ÑÑвÑл <application>Firefox</application> гÑÑ… мÑÑ‚) уг Ñерверийн <quote>үйлчлүүлÑгч</quote> нь юм. ҮйлчлүүлÑгч нь Ñервер уруу жишÑÑлбÑл <quote>ÑÐ½Ñ Ð±Ð°Ð¹Ñ€Ð»Ð°Ð»Ð´ цонх зурна уу</quote> гÑÑ… мÑтийн Ñ…Ò¯ÑÑлт илгÑÑж болдог байхад ÑерверÑÑÑ Ò¯Ð¹Ð»Ñ‡Ð»Ò¯Ò¯Ð»Ñгч Ñ€Ò¯Ò¯ жишÑÑлбÑл @@ -178,13 +177,10 @@ <para>Харин түүний оронд иймÑрхүү хариуцлагыг X нь <quote>Цонх зохицуулагч</quote> гÑж нÑрлÑгдÑÑ… програм руу дамжуулдаг. - Ð¥-д зориулÑан маш олон тооны цонх зохицуулагчид байдаг нь: - <application>AfterStep</application>, - <application>Blackbox</application>, <application>ctwm</application>, - <application>Enlightenment</application>, - <application>fvwm</application>, <application>Sawfish</application>, - <application>twm</application>, - <application>Window Maker</application> зÑÑ€Ñг бөгөөд Ó©Ó©Ñ€ олныг дурдаж болно. + Ð¥-д зориулÑан + <ulink + url="http://xwinman.org/">олон цонх зохицуулагчид</ulink> + байдаг. ÐдгÑÑÑ€ цонх зохицуулагч болгон Ñ‚ÑƒÑ Ñ‚ÑƒÑдаа Ó©Ó©Ñ€Ñдийн өөрийн гÑÑÑн төрөл бүрийн харуулах загвартай байдаг ба зарим нь өөртөө <quote>virtual desktops буюу хийÑвÑÑ€ компьютерийн дÑлгÑцийг</quote> @@ -193,8 +189,7 @@ ÐхлÑÑ…</quote> товч юм уу түүнтÑй ижил төхөөрөмж агуулж байдаг. Мөн зарим нь <quote>themeable буюу дÑлгÑцийн дурын өөрчлөлт</quote> хийж харагдах загваруудын бүрдлийг агуулан ÑÑлгÑж Ñ…ÑÑ€ÑглÑÑ… зÑргÑÑÑ€ - Ñ…ÑÑ€ÑглÑгдÑж байдаг билÑÑ. ÐдгÑÑÑ€ цонх зохицуулагчид болон мөн буÑад - зохицуулагчдыг портын цуглуулга доторх + Ñ…ÑÑ€ÑглÑгдÑж байдаг билÑÑ. Цонх зохицуулагчдыг портын цуглуулга доторх <filename>x11-wm</filename> төрөлд олж болно.</para> <para>Мөн түүнчлÑн <application>KDE</application> болон @@ -295,15 +290,11 @@ баримтлах нь тийм ч ухаалаг Ð±ÑƒÑ Ñанаа юм.</para> <para>Тийм болохоор Ð¥ програмуудыг хоорондоо адилхан харагдах - нийтлÑг загвартай байдаг гÑж бодох Ñ…ÑÑ€Ñггүй. MIT-Ñ Ð³Ð°Ñ€Ð³Ð°Ñан Athena ÑÑвÑл - <application>&motif;</application> ( - µsoft.windows; дÑÑрх багажнуудын олонлог түүн дÑÑÑ€ хийгдÑÑн, товойлгоÑон ирмÑгүүд - болон гурван Ñаарал ÑүүдÑртÑй), <application>OpenLook</application>, - болон буÑад маш олон, түгÑÑмÑл дÑлгÑÑ€ÑÑн багажны цуглуулгууд байдаг.</para> - - <para>Өнөөгийн ихÑнх ÑˆÐ¸Ð½Ñ Ð¥ програмууд нь <application>KDE</application>-н Ñ…ÑÑ€ÑглÑдÑг Qt, аль ÑÑвÑл + нийтлÑг загвартай байдаг гÑж бодох Ñ…ÑÑ€Ñггүй. + ТүгÑÑмÑл дÑлгÑÑ€ÑÑн багажны цуглуулгууд байдаг бөгөөд үүнд + <application>KDE</application>-н Ñ…ÑÑ€ÑглÑдÑг Qt, аль ÑÑвÑл <application>GNOME</application>-н Ñ…ÑÑ€ÑглÑдÑг GTK+ зÑÑ€Ñг орчин үеийн - багажнуудын олонлог Ñ…ÑÑ€ÑглÑдÑг. ÐÐ½Ñ Ð½ÑŒ &unix;-н харагдах дÑлгÑцийн маÑгийн хувьд зарим нÑг + багажнуудын олонлогийг дурдаж болно. ÐÐ½Ñ Ð½ÑŒ &unix;-н харагдах дÑлгÑцийн маÑгийн хувьд зарим нÑг давхцалд хүргÑÑ… бөгөөд ингÑÑнÑÑÑ€ мÑдÑÑж юмÑыг ÑˆÐ¸Ð½Ñ Ñ…ÑÑ€ÑглÑгчдийн хувьд илүү Ñ…Ñлбар болгох юм.</para> </sect2> </sect1> @@ -311,7 +302,7 @@ <sect1 id="x-install"> <title>X11-г Ñуулгах нь</title> - <para><application>&xorg;</application> бол &os;-н анхдагч X11 + <para><application>&xorg;</application> бол &os;-н X11 гүйцÑтгÑл юм. <application>&xorg;</application> нь X.Org ÑÐ°Ð½Ð³Ð°Ð°Ñ Ð³Ð°Ñ€Ð³Ð°Ñан Ð¥ цонхот ÑиÑтемийн Ð¥ Ñервер. <application>&xorg;</application> нь diff --git a/mn_MN.UTF-8/share/xml/mailing-lists.ent b/mn_MN.UTF-8/share/xml/mailing-lists.ent index 452e01a4f6..17da40fcb6 100644 --- a/mn_MN.UTF-8/share/xml/mailing-lists.ent +++ b/mn_MN.UTF-8/share/xml/mailing-lists.ent @@ -1,7 +1,7 @@ <!-- The FreeBSD Mongolian Documentation Project - Original revision 40624 + Original revision 40690 $FreeBSD$ @@ -319,6 +319,10 @@ <!ENTITY a.office "<ulink url='&a.office.url;'>FreeBSD дÑÑрх ОффиÑын програмууд</ulink>"> <!ENTITY a.office.name "<ulink url='&a.office.url;'>freebsd-office</ulink>"> +<!ENTITY a.ops-announce.url "&a.mailman.listinfo;/freebsd-ops-announce"> +<!ENTITY a.ops-announce "<ulink url='&a.ops-announce.url;'>ТөÑлийн ДÑд бүтцийн талаарх мÑдÑÑлÑл</ulink>"> +<!ENTITY a.ops-announce.name "<ulink url='&a.ops-announce.url;'>freebsd-ops-announce</ulink>"> + <!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance"> <!ENTITY a.performance "<ulink url='&a.performance.url;'>FreeBSD ажиллагааны захидлын жагÑаалт</ulink>"> <!ENTITY a.performance.name "<ulink url='&a.performance.url;'>freebsd-performance</ulink>"> diff --git a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml index ac91538a0d..21f0a9f285 100644 --- a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml - %SRCID% 40833 + %SRCID% 41177 --> <chapter id="advanced-networking"> @@ -924,23 +924,6 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting> linkend="config-network-ndis">NDIS</link>.</para> </note> - <para>Nadat het apparaatstuurprogramma is ingesteld onder &os; 7.X - is het ook nodig om de ondersteuning voor 802.11-netwerken waarvan het - stuurprogramma gebruik maakt in te stellen. Voor het - stuurprogramma &man.ath.4; zijn dit minimaal de modules - &man.wlan.4;, <literal>wlan_scan_ap</literal> en - <literal>wlan_scan_sta</literal>; de module &man.wlan.4; wordt - automatisch geladen met het stuurprogramma voor draadloze - apparaten, de overige modules dienen tijdens het opstarten - geladen te worden in <filename>/boot/loader.conf</filename>:</para> - - <programlisting>wlan_scan_ap_load="YES" -wlan_scan_sta_load="YES"</programlisting> - - <para>Sinds &os; 8.0 zijn deze modules deel van het - basisstuurprogramma &man.wlan.4; dat dynamisch met het stuurprogramma - voor de adapter wordt geladen.</para> - <para>Daarvoor zijn ook de modules nodig die cryptografische ondersteuning implementeren voor de te gebruiken veiligheidsprotocollen. Het is de bedoeling dat ze dynamisch @@ -983,13 +966,6 @@ device ath_hal # Ondersteuning voor PCI/cardbus chips options AH_SUPPORT_AR5146 # zet AR5146 tx/rx descriptors aan device ath_rate_sample # SampleRate verzendsnelheid-controle voor ath</programlisting> - <para>Beide van de volgende regels zijn nodig voor - &os; 7.X, voor andere versies van &os; zijn ze niet - nodig:</para> - - <programlisting>device wlan_scan_ap # 802.11 AP mode scanning -device wlan_scan_sta # 802.11 STA mode scanning</programlisting> - <para>Met deze informatie in het kernelinstellingenbestand kan de kernel opnieuw gecompileerd en de &os;-computer opnieuw opgestart worden.</para> @@ -1040,20 +1016,6 @@ freebsdap 00:11:95:c3:0d:ac 1 54M -83:96 100 EPS WPA</screen> niet nodig om de interface als up te markeren.</para> </note> - <note> - <para>In &os; 7.X wordt de apparaat-adapter, bijvoorbeeld - <devicename><replaceable>ath0</replaceable></devicename>, - direct gebruikt in plaats van het apparaat - <devicename>wlan</devicename>. Hierom is het nodig om beide - vorige regels te vervangen door:</para> - - <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput></screen> - - <para>In de rest van dit document dienen gebruikers van - &os; 7.X de opdracht- en instellingregels volgens dat schema - aan te passen.</para> - </note> - <para>De uitvoer van een scanverzoek vermeld elk gevonden BSS/IBSS-netwerk. Naast de naam van het netwerk, <literal>SSID</literal>, staat het <literal>BSSID</literal>, @@ -1165,13 +1127,6 @@ freebsdap 00:11:95:c3:0d:ac 1 54M -83:96 100 EPS WPA</screen> <programlisting>wlans_ath0="wlan0" ifconfig_wlan0="DHCP"</programlisting> - <note> - <para>Zoals eerder vermeld, is voor &os; 7.X alleen een - regel nodig voor de apparaat-adapter:</para> - - <programlisting>ifconfig_ath0="DHCP"</programlisting> - </note> - <para>Indien er meerdere toegangspunten zijn en het gewenst is om een specifieke te kiezen, kan dit met het SSID:</para> @@ -1401,7 +1356,7 @@ ifconfig_wlan0="WPA DHCP"</programlisting> <para>Hierna kan de interface geactiveerd worden:</para> - <screen>&prompt.root; <userinput><filename>service netif</filename> start</userinput> + <screen>&prompt.root; <userinput>service netif start</userinput> Starting wpa_supplicant. DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5 DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6 @@ -2322,7 +2277,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS</screen> Het is mogelijk om debugberichten in de laag die het 802.11 protocol ondersteunt aan te zetten door het programma <command>wlandebug</command> te gebruiken dat gevonden wordt - in <filename>/usr/src/tools/tools/net80211</filename>. + in <filename + class="directory">/usr/src/tools/tools/net80211</filename>. Bijvoorbeeld:</para> <screen>&prompt.root; <userinput>wlandebug -i <replaceable>ath0</replaceable> +scan+auth+debug+assoc</userinput> @@ -2932,8 +2888,8 @@ Success, response: OK, Success (0x20)</screen> <para>Om de dienst OBEX Object Push aan te bieden, moet de server &man.sdpd.8; draaien. Er moet een hoofdmap worden aangemaakt waarin alle binnenkomende objecten worden opgeslagen. Het - standaardpad naar de hoofdmap is - <filename>/var/spool/obex</filename>. Tenslotte moet de + standaardpad naar de hoofdmap is <filename + class="directory">/var/spool/obex</filename>. Tenslotte moet de OBEX-server op een geldig RFCOMM-kanaal worden gestart. De OBEX-server zal automatisch de dienst OBEX Object Push bij de plaatselijke SDP-daemon registeren. Het onderstaande voorbeeld @@ -3905,8 +3861,8 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover </listitem> <listitem> - <para>Er bestaan standaardbestanden voor het opstarten van het - systeem in <filename>/etc</filename> om een systeemstart + <para>Er bestaan standaardbestanden voor het opstarten van het systeem + in <filename class="directory">/etc</filename> om een systeemstart zonder schijf te detecteren en te ondersteunen.</para> </listitem> @@ -3927,10 +3883,10 @@ ifconfig_<literal>lagg<replaceable>0</replaceable></literal>="laggproto failover <itemizedlist> <listitem> - <para>De schijfloze werkstations gebruiken een gedeeld - bestandssysteem voor <filename>/</filename>, dat alleen - gelezen kan worden, en een gedeeld bestandssysteem voor - <filename>/usr</filename>, dat eveneens alleen gelezen kan + <para>De schijfloze werkstations gebruiken een gedeeld bestandssysteem + voor <filename class="directory">/</filename>, dat alleen + gelezen kan worden, en een gedeeld bestandssysteem voor <filename + class="directory">/usr</filename>, dat eveneens alleen gelezen kan worden.</para> <para>Het root-bestandssysteem is een kopie van een standaard @@ -4260,8 +4216,8 @@ margaux:ha=0123456789ab:tc=.def100</programlisting> <para>Om een opstartdiskette te maken, dient er een diskette in het diskettestation van de machine aanwezig te zijn waarop - <application>Etherboot</application> is geïnstalleerd, - daarna dient er naar de map <filename>src</filename> in de + <application>Etherboot</application> is geïnstalleerd, daarna dient + er naar de map <filename class="directory">src</filename> in de mapboom van <application>Etherboot</application> gegaan te worden, en het volgende ingetypt te worden:</para> @@ -4324,9 +4280,9 @@ margaux:ha=0123456789ab:tc=.def100</programlisting> <procedure> <step> - <para>Maak een map aan van waaruit - <application>tftpd</application> de bestanden serveert, - bijvoorbeeld <filename>/tftpboot</filename>.</para> + <para>Maak een map aan van waaruit <application>tftpd</application> + de bestanden serveert, bijvoorbeeld <filename + class="directory">/tftpboot</filename>.</para> </step> <step> @@ -4356,8 +4312,8 @@ margaux:ha=0123456789ab:tc=.def100</programlisting> </step> </procedure> - <para>De map <filename>tftpboot</filename> kan overal op de - server geplaatst worden. De plaats dient zowel in + <para>De map <filename class="directory">tftpboot</filename> kan overal + op de server geplaatst worden. De plaats dient zowel in <filename>inetd.conf</filename> als in <filename>dhcpd.conf</filename> ingesteld te worden.</para> @@ -4531,7 +4487,7 @@ cd /usr/src/etc; make distribution</programlisting> <sect4> <title>Draaien met een alleen-lezen - <filename>/usr</filename></title> + <filename class="directory">/usr</filename></title> <indexterm> <primary>schijfloos werken</primary> @@ -4542,7 +4498,7 @@ cd /usr/src/etc; make distribution</programlisting> <para>Indien het schijfloze werkstation is ingesteld om X te draaien, is het nodig om het instellingenbestand van <application>XDM</application> te wijzigen, dat standaard - het foutenlogboek in <filename>/usr</filename> + het foutenlogboek in <filename class="directory">/usr</filename> plaatst.</para> </sect4> @@ -4556,8 +4512,8 @@ cd /usr/src/etc; make distribution</programlisting> <command>tar</command> of <command>cpio</command>.</para> <para>In deze situatie zijn er af en toe problemen met de - speciale bestanden in <filename>/dev</filename>, vanwege - verschillen in de groottes van grote/kleine integers. Een + speciale bestanden in <filename class="directory">/dev</filename>, + vanwege verschillen in de groottes van grote/kleine integers. Een oplossing voor dit probleem is om een map van de niet-&os;-server te exporteren, deze map op een &os;-machine aan te koppelen, en &man.devfs.5; te gebruiken om de @@ -4615,8 +4571,8 @@ cd /usr/src/etc; make distribution</programlisting> <procedure> <step> <para>Kies een map uit voor een installatie van &os; die over NFS - aangekoppeld kan worden. Bijvoorbeeld een map als - <filename>/b/tftpboot/FreeBSD/install</filename>.</para> + aangekoppeld kan worden. Bijvoorbeeld een map als <filename + class="directory">/b/tftpboot/FreeBSD/install</filename>.</para> <screen>&prompt.root; <userinput>export NFSROOTDIR=/b/tftpboot/FreeBSD/install</userinput> &prompt.root; <userinput>mkdir -p ${NFSROOTDIR}</userinput></screen> @@ -4740,7 +4696,8 @@ mijnhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro <filename>/etc/rc</filename> dat u over NFS opstartte en draait het het script <filename>/etc/rc.initdiskless</filename>. Lees het commentaar in dit script om te begrijpen wat er gebeurt. Het is nodig om - <filename>/etc</filename> en <filename>/var</filename> geheugen-backed + <filename class="directory">/etc</filename> en <filename + class="directory">/var</filename> geheugen-backed te maken omdat deze mappen schrijfbaar moeten zijn, maar de NFS-rootmap is alleen-lezen.</para> @@ -4750,10 +4707,10 @@ mijnhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro &prompt.root; <userinput>tar -c -v -f conf/base/var.cpio.gz --format cpio --gzip var</userinput></screen> <para>Wanneer het systeem opstart, zullen er geheugen-bestandssystemen - voor <filename>/etc</filename> en <filename>/var</filename> worden - aangemaakt en aangekoppeld, en zal de inhoud van de - <filename>cpio.gz</filename>-bestanden er naartoe worden - gekopieerd.</para> + voor <filename class="directory">/etc</filename> en <filename + class="directory">/var</filename> worden aangemaakt en aangekoppeld, + en zal de inhoud van de <filename>cpio.gz</filename>-bestanden er + naartoe worden gekopieerd.</para> </sect2> <sect2 id="network-pxe-setting-up-dhcp"> diff --git a/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml index 593f90d9f1..d3f236c61e 100644 --- a/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml @@ -4,7 +4,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/audit/chapter.xml - %SRCID% 40792 + %SRCID% 41181 --> <!-- Need more documentation on praudit, auditreduce, etc. Plus more info @@ -115,9 +115,9 @@ requirements. --> systeem te genereren, trail bestands data kan erg groot worden wanneer er erg precieze details worden gevraagd, wat enkele gigabytes per week kan behalen in sommige configuraties. - Beheerders moeten rekening houden met voldoende schijfruimte - voor grote audit configuraties. Bijvoorbeeld het kan gewenst - zijn om eigen bestandsysteem aan <filename>/var/audit</filename> + Beheerders moeten rekening houden met voldoende schijfruimte voor + grote audit configuraties. Bijvoorbeeld het kan gewenst zijn om eigen + bestandsysteem aan <filename class="directory">/var/audit</filename> toe te wijzen zo dat andere bestandssystemen geen hinder ondervinden als het audit bestandssysteem onverhoopt vol raakt.</para> @@ -662,8 +662,8 @@ trailer,133</programlisting> <para>Leden van de <groupname>audit</groupname> groep krijgen permissie om de audit trails te lezen in - <filename>/var/audit</filename>; standaard is deze groep leeg en - kan alleen de <username>root</username> gebruiker deze + <filename class="directory">/var/audit</filename>; standaard is deze + groep leeg en kan alleen de <username>root</username> gebruiker deze audit trails lezen. Gebruikers kunnen toegevoegd worden aan de <groupname>audit</groupname> groep zodat onderzoek rechten kunnen worden gedelegeerd aan de geruiker. Omdat de mogelijkheid van diff --git a/nl_NL.ISO8859-1/books/handbook/book.xml b/nl_NL.ISO8859-1/books/handbook/book.xml index 8c13ce597d..ce5fd1f9e1 100644 --- a/nl_NL.ISO8859-1/books/handbook/book.xml +++ b/nl_NL.ISO8859-1/books/handbook/book.xml @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/book.xml - %SRCID% 40585 + %SRCID% 40979 --> <!ENTITY % chapters SYSTEM "chapters.ent"> @@ -59,7 +59,6 @@ &tm-attrib.adaptec; &tm-attrib.adobe; &tm-attrib.apple; - &tm-attrib.corel; &tm-attrib.creative; &tm-attrib.cvsup; &tm-attrib.heidelberger; diff --git a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml index a58b0e1e39..9fe1f9da56 100644 --- a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml @@ -12,7 +12,7 @@ that might make this chapter too large. $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/dtrace/chapter.xml - %SRCID% 40686 + %SRCID% 40876 --> <chapter id="dtrace"> @@ -404,7 +404,7 @@ Elapsed Times for processes csh, genoemd door de documentatie van &sun;, en lijkt sterk op C++. Een diepgaande discussie over de taal valt buiten het bereik van dit document. Het wordt uitgebreid behandeld op <ulink - url="http://wikis.sun.com/display/&dtrace;/Documentation"></ulink>.</para> + url="http://wikis.oracle.com/display/DTrace/Documentation"></ulink>.</para> </sect1> </chapter> diff --git a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml index 65b58244a9..c275f3e0b7 100644 --- a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.xml - %SRCID% 40690 + %SRCID% 41167 --> <appendix id="eresources"> @@ -106,7 +106,8 @@ <row> <entry>&a.announce.name;</entry> - <entry>Belangrijke gebeurtenissen en projectdoelen</entry> + <entry>Belangrijke gebeurtenissen en projectdoelen + (gemodereerd)</entry> </row> <row> @@ -171,7 +172,7 @@ <row> <entry>&a.security-notifications.name;</entry> - <entry>Beveiligingswaarschuwingen</entry> + <entry>Beveiligingswaarschuwingen (gemodereerd)</entry> </row> <row> @@ -229,7 +230,7 @@ <row> <entry>&a.amd64.name;</entry> - <entry>Porten van &os; naar AMD64-systemen</entry> + <entry>Porten van &os; naar AMD64-systemen (gemodereerd)</entry> </row> <row> @@ -523,7 +524,7 @@ <entry>&a.ports-announce.name;</entry> <entry>Belangrijk nieuws en belangrijke instructies over de - Portscollectie</entry> + Portscollectie (gemodereerd)</entry> </row> <row> @@ -727,13 +728,6 @@ </row> <row> - <entry>&a.vendors.name;</entry> - - <entry>Coördinatie van vooruitgaven met - wederverkopers</entry> - </row> - - <row> <entry>&a.wip-status.name;</entry> <entry>&os; Werk-In-Uitvoering status</entry> @@ -745,13 +739,6 @@ <entry>Discussies over de ontwikkeling van de 802.11-stack, gereedschappen en stuurprogramma's.</entry> </row> - - <row> - <entry>&a.www.name;</entry> - - <entry>Beheerders van <ulink - url="&url.base;/index.html">www.FreeBSD.org</ulink></entry> - </row> </tbody> </tgroup> </informaltable> @@ -1671,8 +1658,8 @@ zijn in veranderingen en zaken die te maken hebben met de infrastructuur van het FreeBSD.org project.</para> - <para>Deze lijst is strict voor aankondigingen: geen antwoorden, - verzoeken, discussies of meningen.</para> + <para>Deze gemodereerde lijst is strict voor aankondigingen: geen + antwoorden, verzoeken, discussies of meningen.</para> </listitem> </varlistentry> @@ -2006,17 +1993,6 @@ </varlistentry> <varlistentry> - <term>&a.vendors.name;</term> - - <listitem> - <para><emphasis>Verkopers</emphasis></para> - - <para>Coördinatie en discussie tussen het &os;-project - en verkopers van software en hardware voor &os;.</para> - </listitem> - </varlistentry> - - <varlistentry> <term>&a.virtualization.name;</term> <listitem> diff --git a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml index 1aca285049..f705266e10 100644 --- a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.xml - %SRCID% 40792 + %SRCID% 40900 --> <chapter id="jails"> <chapterinfo> @@ -594,7 +594,8 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep <para>Deze opstelling vereist uitgebreide kennis en ervaring van &os; en zijn mogelijkheden. Als onderstaande stappen te lastig lijken te zijn, wordt aangeraden om een simpeler - systeem te bekijken zoals + systeem te bekijken zoals <filename + role="package">sysutils/qjail</filename> of <filename role="package">sysutils/ezjail</filename>, welke een simpele manier geeft voor het beheren van &os; jails en niet zo complex is als deze opstelling.</para> diff --git a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml index 15dff1c754..f405a6172e 100644 --- a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/multimedia/chapter.xml - %SRCID% 40792 + %SRCID% 41064 --> <chapter id="multimedia"> @@ -1779,9 +1779,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting> <application>SANE</application> heeft een lijst met <ulink url="http://www.sane-project.org/sane-supported-devices.html">ondersteunde apparaten</ulink> waarin gekeken kan worden of een scanner - wordt ondersteund en wat de status voor ondersteuning is. Op systemen - van vóór &os; 8.X staat in de handleidingpagina van - &man.uscanner.4; een lijst met ondersteunde USB-scanners.</para> + wordt ondersteund en wat de status voor ondersteuning is.</para> </sect2> <sect2> @@ -1808,15 +1806,6 @@ device ohci device uscanner device ehci</programlisting> - <para>Op systemen van vóór &os; 8.X is de volgende - regel ook nodig:</para> - - <programlisting>device uscanner</programlisting> - - <para>Op deze versies van &os; biedt het apparaat &man.uscanner.4; - ondersteuning voor de USB-scanners. Sinds &os; 8.0 ondersteunt - de bibliotheek &man.libusb.3; dit direct.</para> - <para>Na een herstart met de juiste kernel kan de USB-scanner aangesloten worden. Een regel die de detectie van uw scanner aangeeft zou in de berichtenbuffer van het systeem @@ -1824,15 +1813,9 @@ device ehci</programlisting> <screen>ugen0.2: <EPSON> at usbus0</screen> - <para>Of op een &os; 7.X systeem:</para> - - <screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen> - - <para>Deze berichten geven aan dat de scanner òfwel - <filename>/dev/ugen0.2</filename> òf - <filename>/dev/uscanner0</filename> als apparaatknooppunt - gebruikt afhankelijk van de versie van &os; die we draaien. Voor dit - voorbeeld was een &epson.perfection; 1650 USB-scanner + <para>Deze berichten geven aan dat de scanner + <filename>/dev/ugen0.2</filename> als apparaatknooppunt gebruikt. + Voor dit voorbeeld was een &epson.perfection; 1650 USB-scanner gebruikt.</para> </sect3> @@ -2082,22 +2065,6 @@ device `epson:/dev/uscanner0' is a Epson GT-8200 flatbed scanner</screen> add path ugen0.2 mode 0660 group usb add path usb/0.2.0 mode 0666 group usb</programlisting> - <para>Gebruikers van &os; 7.X hebben waarschijnlijk de volgende - regels met het juiste apparaatknooppunt, - <filename>/dev/uscanner0</filename>, nodig:</para> - - <programlisting>[system=5] -add path uscanner0 mode 0660 group usb</programlisting> - - <para>Daarna kan de volgende regel aan - <filename>/etc/rc.conf</filename> toegevoegd worden en dient - een machine herstart te worden:</para> - - <programlisting>devfs_system_ruleset="system"</programlisting> - - <para>Meer informatie over de bovenstaande instellingen staan in - de hulppagina voor &man.devfs.8;.</para> - <para>Nu dienen er alleen nog gebruikers aan de groep <groupname><replaceable>usb</replaceable></groupname> toegevoegd te worden om toegang tot de scanner toe te staan:</para> diff --git a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml index 8764791c9a..895273080d 100644 --- a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml - %SRCID% 40792 + %SRCID% 41154 --> <chapter id="ppp-and-slip"> @@ -155,17 +155,6 @@ <title>Gebruikmaken van gebruiker-PPP</title> - <warning> - <para>Met ingang van &os; 8.0 zijn apparaatknooppunten voor - seriële poorten hernoemd van - <filename>/dev/cuad<replaceable>N</replaceable></filename> naar - <filename>/dev/cuau<replaceable>N</replaceable></filename> en van - <filename>/dev/ttyd<replaceable>N</replaceable></filename> naar - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - Gebruikers van &os; 7.X dienen de volgende documentatie met deze - wijzigingen te lezen.</para> - </warning> - <sect2> <title>Gebruiker-PPP</title> @@ -1971,18 +1960,6 @@ exit 1 <secondary>troubleshooten</secondary> </indexterm> - <warning> - <para>Met ingang van &os; 8.0 vervangt het stuurprogramma - &man.uart.4; het stuurprogramma &man.sio.4;. Apparaatknooppunten voor - seriële poorten zijn hernoemd van - <filename>/dev/cuad<replaceable>N</replaceable></filename> naar - <filename>/dev/cuau<replaceable>N</replaceable></filename> en van - <filename>/dev/ttyd<replaceable>N</replaceable></filename> naar - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - Gebruikers van &os; 7.X zullen de documentatie met deze - veranderingen moeten lezen.</para> - </warning> - <para>Deze sectie behandelt een paar problemen die kunnen optreden wanneer PPP wordt gebruikt over een modemverbinding. Bijvoorbeeld, misschien moet u exact weten wat de prompt is diff --git a/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml index 96e699b633..7c7854820e 100644 --- a/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/printing/chapter.xml - %SRCID% 40750 + %SRCID% 41064 --> <chapter id="printing"> @@ -192,12 +192,8 @@ <title>Waarom het wachtrijsysteem gebruikt zou moeten worden</title> - <para>Als er maar één gebruiker is op een systeem, - staat terecht ter discussie waarom het wachtrijsysteem nodig is - als toegangscontrole, voorbladen en printerstatistieken niet - nodig zijn. Hoewel directe toegang tot de printer is in te - stellen, is het raadzaam het wachtrijsysteem toch te - gebruiken, omdat:</para> + <para>Het wachtrijsysteem biedt nog steeds voordelen op een systeem met + een enkele gebruiker en dient gebruikt te worden omdat:</para> <itemizedlist> <listitem> @@ -232,15 +228,6 @@ <sect1 id="printing-intro-setup"> <title>Standaardinstallatie</title> - <warning> - <para>Vanaf &os; 8.0; zijn de apparaatknooppunten - voor seriële poorten hernoemd van - <filename>/dev/ttyd<replaceable>N</replaceable></filename> naar - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X gebruikers moeten de volgende documentatie aanpassen - naar aanleiding van deze wijzigingen.</para> - </warning> - <para>Om printers met het <application>LPD</application> wachtrijsysteem te kunnen gebruiken, dienen zowel de printerhardware als de <application>LPD</application> software @@ -1546,15 +1533,6 @@ $%&'()*+,-./01234567 <sect1 id="printing-advanced"> <title>Geavanceerde printerinstallatie</title> - <warning> - <para>Vanaf &os; 8.0; zijn de apparaatknooppunten - voor seriële poorten hernoemd van - <filename>/dev/ttyd<replaceable>N</replaceable></filename> naar - <filename>/dev/ttyu<replaceable>N</replaceable></filename>. - &os; 7.X gebruikers moeten de volgende documentatie aanpassen - naar aanleiding van deze wijzigingen.</para> - </warning> - <para>Deze sectie behandelt het gebruik van filters om speciaal opgemaakte tekst en voorbladen af te drukken, via het netwerk af te drukken en printergebruik te beperken en statistieken bij te diff --git a/nl_NL.ISO8859-1/books/handbook/security/chapter.xml b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml index 32aa2cab9e..e5f1a54a0a 100644 --- a/nl_NL.ISO8859-1/books/handbook/security/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.xml - %SRCID% 40792 + %SRCID% 41064 --> <chapter id="security"> @@ -695,9 +695,7 @@ wordt toegang tot rauwe apparaten ontzegd. Hogere niveaus beperken nog meer bewerkingen. Lees, voor een volledige beschrijving van het effect van de verschillende - veiligheidsniveaus, de handleidingpagina &man.security.7; (of de - handleidingpagina van &man.init.8; voor uitgaven ouder dan &os; - 7.0).</para> + veiligheidsniveaus, de handleidingpagina &man.security.7;.</para> <note> <para>Het ophogen van het veiligheidsniveau naar 1 of hoger kan diff --git a/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml index 12fa953e2e..e147ce2b70 100644 --- a/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml @@ -4,7 +4,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.xml - %SRCID% 40566 + %SRCID% 41025 --> <chapter id="x11"> @@ -47,8 +47,7 @@ De standaard en officiele smaak van X11 in &os; is <application>&xorg;</application>, de X11-server die is ontwikkeld door de X.Org Foundation onder een licentie die - veel lijkt op degene die door &os; wordt gebruikt. Er zijn ook - commerciële X-servers voor &os; beschikbaar.</para> + veel lijkt op degene die door &os; wordt gebruikt.</para> <para>Meer informatie over de videohardware die X11 ondersteunt kan gevonden worden op de <ulink @@ -134,8 +133,8 @@ en andere invoer- of uitvoerapparaten (i.e., een <quote>tablet</quote> kan als invoerapparaat worden gebruikt, en een videoprojector kan een alternatief uitvoerapparaat zijn). - Iedere X applicatie (zoals <application>XTerm</application>, of - <application>&netscape;</application>) is een + Iedere X applicatie (zoals <application>XTerm</application> of + <application>Firefox</application>) is een <quote>cliënt</quote>. Een cliënt stuurt berichten naar de server zoals <quote>teken een venster op deze coördinaten</quote> en de server stuurt berichten terug @@ -188,15 +187,8 @@ <para>In plaats daarvan delegeert X deze verantwoordelijkheid aan een applicatie die <quote>Window Manager</quote> heet. Er zijn - tientallen window managers voor X: - <application>AfterStep</application>, - <application>Blackbox</application>, - <application>ctwm</application>, - <application>Enlightenment</application>, - <application>fvwm</application>, - <application>Sawfish</application>, - <application>twm</application>, - <application>Window Maker</application> en vele anderen. Elk + <ulink url="http://xwinman.org/">tientallen window managers</ulink> + beschikbaar voor X. Elk van deze window managers heeft een eigen voorkomen en werking. Er zijn window managers met <quote>virtual desktops</quote> of met eigen toetscombinaties om de desktop te beheren; of hebben @@ -310,15 +302,7 @@ stijl of widgets te verplichten.</para> <para>X applicaties hebben dus niet allemaal hetzelfde uiterlijk. - Er zijn populaire widgetsets en variaties, inclusief de - originele Athena widgetset van MIT, - <application>&motif;</application> (waarvan de widgetset van - µsoft.windows; is afgeleid: schuine randen en drie - gradaties grijs), <application>OpenLook</application> en - anderen.</para> - - <para>De meeste nieuwe X applicaties gebruiken een modern - uitziende widgetset: Qt, gebruikt door + Er zijn populaire widgetsets en variaties, inclusief Qt, gebruikt door <application>KDE</application>, of GTK+ van het <application>GNOME</application> project. Vanuit dit oogpunt lijkt het enigszins op de &unix; desktop, wat het makkelijker @@ -329,8 +313,8 @@ <sect1 id="x-install"> <title>X11 installeren</title> - <para><application>&xorg;</application> is de standaard X11 - implementatie voor &os;. <application>&xorg;</application> is + <para><application>&xorg;</application> is de X11-implementatie voor + &os;. <application>&xorg;</application> is de X11 server van de open source implementatie die is uitgebracht door de X.Org Foundation. <application>&xorg;</application> is gebaseerd op de code van diff --git a/nl_NL.ISO8859-1/htdocs/Makefile b/nl_NL.ISO8859-1/htdocs/Makefile index 09daf27d22..6dc8a13b7f 100644 --- a/nl_NL.ISO8859-1/htdocs/Makefile +++ b/nl_NL.ISO8859-1/htdocs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ # %SOURCE% en_US.ISO8859-1/htdocs/Makefile -# %SRCID% 40439 +# %SRCID% 41060 # XXX rene r40275 (Google Analytics) not merged in (yet) @@ -17,7 +17,6 @@ DOCS= about.xml DOCS+= administration.xml DOCS+= applications.xml DOCS+= art.xml -DOCS+= availability.xml DOCS+= docs.xml DOCS+= features.xml DOCS+= internet.xml @@ -48,11 +47,9 @@ DEPENDSET.community=usergroups events #DATA+= freebsd.css #DATA+= index.css #DATA+= robots.txt -DATA+= vendors.html # Subdirectories # XML -#SUBDIR= FAQ #SUBDIR+= advocacy #SUBDIR+= commercial #SUBDIR+= community @@ -80,7 +77,6 @@ DATA+= vendors.html #SUBDIR+= security #SUBDIR+= snapshots #SUBDIR+= support -#SUBDIR+= tutorials .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= doc #SUBDIR+= ports diff --git a/nl_NL.ISO8859-1/htdocs/about.xml b/nl_NL.ISO8859-1/htdocs/about.xml index 6cf65901d5..4f17b84459 100644 --- a/nl_NL.ISO8859-1/htdocs/about.xml +++ b/nl_NL.ISO8859-1/htdocs/about.xml @@ -34,13 +34,13 @@ <p>&os; biedt vandaag geavanceerde <a href="&base;/features.html">mogelijkheden</a> voor netwerken, - prestatie, veiligheid en compatibiliteit die nog steeds ontbreken in - andere besturingssystemen, zelfs in de beste commerciële.</p> + prestatie, veiligheid en compatibiliteit die nog steeds ontbreken in + andere besturingssystemen, zelfs in de beste commerciële.</p> <h2>Krachtige Internetoplossingen</h2> <p>&os; kan dienen als een ideale <a href="&base;/internet.html"> - Internet of Intranet</a> server. Het biedt robuuste netwerkdiensten + Internet of Intranet</a> server. Het biedt robuuste netwerkdiensten onder de zwaarste belastingen en maakt efficiënt gebruik van het geheugen om goede reactietijden te geven voor duizenden gelijktijdige gebruikersprocessen.</p> diff --git a/nl_NL.ISO8859-1/htdocs/administration.xml b/nl_NL.ISO8859-1/htdocs/administration.xml index 399859f49f..a12df9fe3b 100644 --- a/nl_NL.ISO8859-1/htdocs/administration.xml +++ b/nl_NL.ISO8859-1/htdocs/administration.xml @@ -6,7 +6,7 @@ <!-- Vertaald door: Rene Ladan %SOURCE% en_US.ISO8859-1/htdocs/administration.xml - %SRCID% 40181 + %SRCID% 41185 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -58,8 +58,6 @@ <li><a href="#t-backups">Back-upbeheerders</a></li> <li><a href="#t-bugmeister">Bugmeisters & GNATS Beheerders</a></li> <li><a href="#t-clusteradm">Clusterbeheerders</a></li> - <li><a href="#t-pcvs">CVS ports Reservoir Beheerders</a></li> - <li><a href="#t-ncvs">CVS src Reservoir Beheerders</a></li> <li><a href="#t-cvsup-master">CVSup Mirror Site Coördinatoren</a></li> <li><a href="#t-dnsadm">DNS Beheerders</a></li> @@ -67,6 +65,7 @@ Coördinatoren</a></li> <li><a href="#t-perforce-admin">Perforce Reservoir Beheerders</a></li> <li><a href="#t-postmaster">Postmeesterteam</a></li> + <li><a href="#t-subversion">Subversion Beheerders</a></li> <li><a href="#t-webmaster">Webmasterteam</a></li> </ul> </li> @@ -127,10 +126,9 @@ <li>&a.tabthorpe; <<a href="mailto:tabthorpe@FreeBSD.org">tabthorpe@FreeBSD.org</a>></li> <li>&a.marcus; <<a href="mailto:marcus@FreeBSD.org">marcus@FreeBSD.org</a>></li> <li>&a.bapt; <<a href="mailto:bapt@FreeBSD.org">bapt@FreeBSD.org</a>></li> + <li>&a.bdrewery; <<a href="mailto:bdrewery@FreeBSD.org">bdrewery@FreeBSD.org</a>></li> <li>&a.decke; <<a href="mailto:decke@FreeBSD.org">decke@FreeBSD.org</a>></li> - <li>&a.beat; <<a href="mailto:beat@FreeBSD.org">beat@FreeBSD.org</a>></li> <li>&a.erwin; <<a href="mailto:erwin@FreeBSD.org">erwin@FreeBSD.org</a>></li> - <li>&a.linimon; <<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>></li> <li>&a.itetcu; <<a href="mailto:itetcu@FreeBSD.org">itetcu@FreeBSD.org</a>></li> <li>&a.miwi; <<a href="mailto:miwi@FreeBSD.org">miwi@FreeBSD.org</a>></li> </ul> @@ -347,7 +345,6 @@ <li>&a.eadler; <<a href="mailto:eadler@FreeBSD.org">eadler@FreeBSD.org</a><</li> <li>&a.gavin; <<a href="mailto:gavin@FreeBSD.org">gavin@FreeBSD.org</a><</li> <li>&a.gonzo; <<a href="mailto:gonzo@FreeBSD.org">gonzo@FreeBSD.org</a><</li> - <li>&a.linimon; <<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>></li> </ul> <h3><a name="t-clusteradm">Clusterbeheerders</a> @@ -372,44 +369,6 @@ <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> </ul> - <h3><a name="t-pcvs">CVS ports Reservoir Beheerders</a> - <<a href="mailto:pcvs@FreeBSD.org">pcvs@FreeBSD.org</a>></h3> - - <p>De CVS ports Reservoir Beheerders mogen direct het reservoir wijzigen - zonder het CVS-gereedschap te gebruiken. Het is hun verantwoordelijkheid - om technische problemen die in het reservoir opduiken snel op te lossen. - De CVS ports Reservoir Beheerders hebben de machtiging om commits - ongedaan te maken als dit nodig is om een technisch probleem met CVS op te - lossen. Verzoeken voor repo-kopiën dienen aan de Reservoir Beheerders - gericht te worden.</p> - - <ul> - <li>&a.marcus; <<a href="mailto:marcus@FreeBSD.org">marcus@FreeBSD.org</a>></li> - <li>&a.joe; <<a href="mailto:joe@FreeBSD.org">joe@FreeBSD.org</a>></li> - <li>&a.kuriyama; <<a href="mailto:kuriyama@FreeBSD.org">kuriyama@FreeBSD.org</a>></li> - <li>&a.markm; <<a href="mailto:markm@FreeBSD.org">markm@FreeBSD.org</a>></li> - <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> - </ul> - - <h3><a name="t-ncvs">CVS src Resrevoir Beheerders</a> - <<a href="mailto:ncvs@FreeBSD.org">ncvs@FreeBSD.org</a>></h3> - - <p>De CVS src Reservoir Beheerders mogen direct het reservoir wijzigen - zonder het CVS-gereedschap te gebruiken. Het is hun verantwoordelijkheid - om technische problemen die in het reservoir opduiken snel op te lossen. - De CVS src Reservoir Beheerders hebben de machtiging om commits - ongedaan te maken als dit nodig is om een technisch probleem met CVS op te - lossen. Verzoeken voor repo-kopiën dienen aan de Reservoir Beheerders - gericht te worden.</p> - - <ul> - <li>&a.joe; <<a href="mailto:joe@FreeBSD.org">joe@FreeBSD.org</a>></li> - <li>&a.kuriyama; <<a href="mailto:kuriyama@FreeBSD.org">kuriyama@FreeBSD.org</a>></li> - <li>&a.markm; <<a href="mailto:markm@FreeBSD.org">markm@FreeBSD.org</a>></li> - <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> - <li>&a.peter; <<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>></li> - </ul> - <h3><a name="t-cvsup-master">CVSup Mirror Site Coördinatoren</a> <<a href="mailto:cvsup-master@FreeBSD.org">cvsup-master@FreeBSD.org</a>></h3> @@ -488,6 +447,17 @@ <li>&a.dhw; <<a href="mailto:dhw@FreeBSD.org">dhw@FreeBSD.org</a>></li> </ul> + <h3><a name="t-subversion">Subversion Beheerders</a> <svnadm@></h3> + + <p>Het &os; Subversion-team is verantwoordelijk voor het onderhouden van de + werking van de Subversion reservoirs.</p> + + <ul> + <li>&a.bz; <<a href="mailto:bz@FreeBSD.org">bz@FreeBSD.org</a>></li> + <li>&a.peter; <<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>></li> + <li>&a.simon; <<a href="mailto:simon@FreeBSD.org">simon@FreeBSD.org</a>></li> + </ul> + <h3><a name="t-webmaster">Webmasterteam</a> <<a href="mailto:webmaster@FreeBSD.org">webmaster@FreeBSD.org</a>></h3> diff --git a/nl_NL.ISO8859-1/htdocs/applications.xml b/nl_NL.ISO8859-1/htdocs/applications.xml index d49a19b6e2..78d367f76d 100644 --- a/nl_NL.ISO8859-1/htdocs/applications.xml +++ b/nl_NL.ISO8859-1/htdocs/applications.xml @@ -6,7 +6,7 @@ <!-- Vertaald door: Rene Ladan %SOURCE% en_US.ISO8859-1/htdocs/applications.xml - %SRCID% 40446 + %SRCID% 40845 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -53,17 +53,19 @@ gebruikt wordt:</p> <ul> - <li><b>Internetdiensten. </b> Vele Internetproviders (ISPs) + <li><b>Internetdiensten. </b> Vele Internetproviders (ISPs) vinden &os; ideaal om WWW, Usenet nieuws, FTP, email, en andere diensten te draaien. Direct te gebruiken software - zoals de <a href="http://www.apache.org/">Apache</a> webserver - of de <a href="http://proftpd.org">ProFTPD</a> FTP-server maken - het eenvoudig om een zaak- of gemeenschapsgerichte ISP op te zetten. - Natuurlijk, met &os;'s onverslaanbare <a + zoals de <a href="http://nginx.org">nginx</a> of <a + href="http://www.apache.org/">Apache</a> webserver + of de <a href="http://proftpd.org">ProFTPD</a> of + <a href="http://security.appspot.com/vsftpd.html">vsftpd</a> + FTP-server maken het eenvoudig om een zaak- of gemeenschapsgerichte + ISP op te zetten. Natuurlijk, met &os;'s onverslaanbare <a href="&base;/internet.html"> netwerkdienst</a>, zullen uw gebruikers genieten van razendsnelle, betrouwbare diensten.</li> - <li><b>X Window werkstation. </b> Van een goedkope X-terminal + <li><b>X Window werkstation. </b> Van een goedkope X-terminal tot een geavanceerd X-display werkt &os; behoorlijk goed. Gratis X-software (<a href="http://x.org/">X.Org</a>™) wordt met het systeem geleverd. @@ -73,29 +75,32 @@ industriestandaardbibliotheken <a href="http://www.opengroup.org/motif">Motif</a>® en <a href="http://www.opengl.org">OpenGL</a>® worden ondersteund. - Zowel de <a href="http://www.kde.org">KDE</a> en <a - href="http://www.gnome.org">GNOME</a> bureaubladomgevingen - hebben volledige ondersteuning en bieden kantoorfunctionaliteit, + De <a href="http://xfce.org/">Xfce</a> en <a + href="http://lxde.org/">LXDE</a>-producten bieden een + bureaubladomgeving aan. De <a href="http://www.kde.org">KDE</a> en + <a href="http://www.gnome.org">GNOME</a> bureaubladomgevingen + hebben ook volledige ondersteuning en bieden kantoorfunctionaliteit, verder is goede functionaliteit beschikbaar in de producten <a href="http://www.libreoffice.org/">LibreOffice</a>, <a href="http://www.openoffice.org/">OpenOffice.Org</a> en <a href="http://www.softmaker.de/tml_en.htm">TextMaker</a>.</li> - <li><b>Netwerken. </b> Van pakketten filteren tot routing tot + <li><b>Netwerken. </b> Van pakketten filteren tot routing tot naamdiensten leveren, &os; kan van elke PC een Internet firewall, email-gastheer, printserver, PC/NFS-server, en meer maken.</li> - <li><b>Software-ontwikkeling. </b> Een pakket aan - ontwikkelgereedschappen wordt met &os; geleverd, inclusief - de GNU C/C++ compiler en debugger. + <li><b>Software-ontwikkeling. </b> Een pakket aan + ontwikkelgereedschappen wordt met &os; geleverd, inclusief de GNU + C/C++ compiler en debugger. De clang-suite gebaseerd op LLVM + wordt ook aangeboden en zal uiteindelijk de GNU-suite vervangen. Ontwikkelen in &java; en Tcl/Tk is ook mogelijk, en esoterischere talen zoals Icon werken ook prima. En de gedeelde bibliotheken van &os; zijn altijd eenvoudig te bouwen en gebruiken geweest. U kunt ook kiezen uit een groot aantal populaire en krachtige tekstverwerkers zoals XEmacs en Vim.</li> - <li><b>Netsurfen. </b> Een echt UNIX werkstation is een prachtige + <li><b>Netsurfen. </b> Een echt UNIX werkstation is een prachtige surfplank voor Internet. Versies voor &os; van <a href="http://www.chromium.org/Home">Chromium</a>, <a href="http://www.mozilla.org/firefox/">Firefox</a> @@ -104,7 +109,7 @@ eigen webpagina's, lees Usenet nieuws, en verzend en ontvang email met een &os; systeem op uw bureau.</li> - <li><b>Onderwijs en onderzoek.</b>&os; is een + <li><b>Onderwijs en onderzoek. </b>&os; is een uitstekend onderzoeksplatform omdat het de complete broncode bevat. Studenten en onderzoekers van besturingssystemen of andere velden van computerwetenschappen kunnen enorm diff --git a/nl_NL.ISO8859-1/htdocs/availability.xml b/nl_NL.ISO8859-1/htdocs/availability.xml deleted file mode 100644 index a1f55fedc7..0000000000 --- a/nl_NL.ISO8859-1/htdocs/availability.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN" -"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [ -<!ENTITY title "Over de beschikbaarheid van &os;"> -]> -<!-- - Vertaald door: Siebrand Mazeland / Rene Ladan - %SOURCE% en_US.ISO8859-1/htdocs/availability.xml - %SRCID% 39632 - --> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="refresh" content="5;url=&base;/index.html"/> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> - - <title>&title;</title> - - <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword> - - </head> - - <body class="navinclude.about"> - <p>De inhoud van deze pagina is opgenomen in de <a - href="&base;/index.html">standaard &os; webpagina</a>. Deze - pagina hoort over een paar seconden automatisch door te sturen. - Als dat niet zo is, volg dan de link en werk uw favorieten bij. - We verontschuldigen ons voor het ongemak.</p> - </body> -</html> diff --git a/nl_NL.ISO8859-1/htdocs/index.xsl b/nl_NL.ISO8859-1/htdocs/index.xsl index 7762ee8387..8f20e191ac 100644 --- a/nl_NL.ISO8859-1/htdocs/index.xsl +++ b/nl_NL.ISO8859-1/htdocs/index.xsl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/htdocs/index.xsl - %SRCID% 40573 + %SRCID% 41116 --> <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN" "http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [ @@ -77,10 +77,9 @@ <h2><a href="&enbase;/releases/">NIEUWSTE UITGAVEN</a></h2> <ul id="frontreleaseslist"> <li>Productie: <a - href="&u.rel.announce;">&rel.current;</a>, <a - href="&u.rel2.announce;">&rel2.current;</a></li> + href="&u.rel.announce;">&rel.current;</a></li> <li>Verouderd: <a - href="&u.rel3.announce;">&rel3.current;</a></li> + href="&u.rel2.announce;">&rel2.current;</a></li> <xsl:if test="'&beta.testing;' != 'IGNORE'"> <li>Aanstaand: <a href="&base;/where.html#helptest"> diff --git a/nl_NL.ISO8859-1/htdocs/internet.xml b/nl_NL.ISO8859-1/htdocs/internet.xml index 096bead47f..5b3c477b85 100644 --- a/nl_NL.ISO8859-1/htdocs/internet.xml +++ b/nl_NL.ISO8859-1/htdocs/internet.xml @@ -120,7 +120,7 @@ <h2>Hoge prestaties <em>en</em> beveiliging</h2> <p>De &os; ontwikkelaar zijn net zo druk met beveiliging als - met prestaties. &os; bevat kernelondersteuning voor + met prestaties. &os; bevat kernelondersteuning voor IP firewalling en andere diensten als IP proxy gateways. Als uw bedrijfsservers zijn aangesloten op Internet, kan iedere computer waarop &os; draait dienst doen als netwerk-firewall diff --git a/nl_NL.ISO8859-1/htdocs/mailto.xml b/nl_NL.ISO8859-1/htdocs/mailto.xml index e6bdec7837..d059f897f1 100644 --- a/nl_NL.ISO8859-1/htdocs/mailto.xml +++ b/nl_NL.ISO8859-1/htdocs/mailto.xml @@ -5,7 +5,7 @@ ]> <!-- Vertaald door: Rene Ladan %SOURCE% en_US.ISO8859-1/htdocs/mailto.xml - %SRCID% 39632 + %SRCID% 40901 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -48,7 +48,7 @@ <h2><a href="&base;/administration.html">Wie is waarvoor verantwoordelijk</a></h2> - <p>Publieke Relaties & Bedrijfsrelaties, Beveiligingsofficier, + <p>Marketing, Bugmeister, Beveiligingsofficier, Postmeester, Webmaster etc.</p> </body> diff --git a/nl_NL.ISO8859-1/htdocs/publish.xml b/nl_NL.ISO8859-1/htdocs/publish.xml index b12b5dffaf..ee1da9e7d0 100644 --- a/nl_NL.ISO8859-1/htdocs/publish.xml +++ b/nl_NL.ISO8859-1/htdocs/publish.xml @@ -33,9 +33,9 @@ </tr> </table> - Hier vindt u de omslagen van vele aan &os; gerelateerde publicaties. Als u - nog meer publicaties of CD-ROMs over &os; kent, laat het ons dan weten op - <a href="mailto:www@FreeBSD.org">www@FreeBSD.org</a>, zodat ze aan deze + Hier vindt u de omslagen van vele aan &os; gerelateerde publicaties. Als + u nog meer publicaties of CD-ROMs over &os; kent, laat het ons dan weten + op <a href="mailto:www@FreeBSD.org">www@FreeBSD.org</a>, zodat ze aan deze site kunnen worden toegevoegd. <p>Het <a href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/index.html">&os; @@ -119,7 +119,7 @@ width="150" height="235" alt="boekomslag"/></a></td> <td>BSD mit Methode, M. Schulze, B. Roehrig, M. Hoelzer en andere, - C&L Computer und Literatur Verlag, 1998, 850 pagina's. 2 + C&L Computer und Literatur Verlag, 1998, 850 pagina's. 2 CD-ROMs, &os; 2.2.6, NetBSD 1.2.1 en 1.3.2, OpenBSD 2.2 en 2.3. DM 98,-.</td> </tr> @@ -182,7 +182,7 @@ <td><a href="http://www.freebsdmall.com/cgi-bin/fm/bsdhandbk"><img src="&enbase;/gifs/bsdi-handbook.png" width="171" height="220" alt="boekomslag"/></a></td> <td>De 1e editie van het &os; Handboek is een uitvoerige tutorial en naslagwerk over &os;. Het behandelt de installatie en het alledaagse - gebruik van &os; en nog veel meer. April 2000, BSDi. ISBN + gebruik van &os; en nog veel meer. April 2000, BSDi. ISBN 1-57176-241-8</td> </tr> @@ -213,8 +213,8 @@ The Networker's Guide behandelt de integratie van &os; in typische bedrijfsnetwerken met speciale nadruk op de samenwerking met Windows 95/98/ME/NT/2K.<br/> - Engelse versie: 2000, Addison Wesley. ISBN 0-201-70481-1<br/> - Japanse versie: 2001, Pearson Education Japan. ISBN 4-89471-464-7</td> + Engelse versie: 2000, Addison Wesley. ISBN 0-201-70481-1<br/> + Japanse versie: 2001, Pearson Education Japan. ISBN 4-89471-464-7</td> </tr> <tr> @@ -227,7 +227,7 @@ systeem en software van derde partijen; en over het werkend krijgen van geluid, X Window, uw netwerk en printen; het bouwen van uw eigen kernel; en upgraden. Tweede editie, december 2001, - The Bit Tree Press. ISBN 0-9712045-1-9</td> + The Bit Tree Press. ISBN 0-9712045-1-9</td> </tr> <tr> @@ -704,6 +704,5 @@ van de <a href="http://www.fultus.com/" target="_blank">Fultus</a> website.</td> NetBSD 1.4.1 en OpenBSD 2.5.</td> </tr> </table> - </body> </html> diff --git a/nl_NL.ISO8859-1/htdocs/relnotes.xml b/nl_NL.ISO8859-1/htdocs/relnotes.xml index e7b7f2afa7..83f4e52b00 100644 --- a/nl_NL.ISO8859-1/htdocs/relnotes.xml +++ b/nl_NL.ISO8859-1/htdocs/relnotes.xml @@ -152,8 +152,8 @@ <p>HTML in een enkel bestand, PDF en platte tekstversies van de uitgavedocumentatie voor &os;-CURRENT, -STABLE en recente -RELEASE versies staan op de <a - href="http://people.FreeBSD.org/~bmah/relnotes/">Uitgavedocumentatie - Snapshot Site</a>. De versies op deze site worden + href="http://people.FreeBSD.org/~bmah/relnotes/">Uitgavedocumentatie + Snapshot Site</a>. De versies op deze site worden vaak bijgewerkt, maar niet met regelmaat.</p> </body> diff --git a/nl_NL.ISO8859-1/htdocs/vendors.html b/nl_NL.ISO8859-1/htdocs/vendors.html deleted file mode 100644 index 54532805db..0000000000 --- a/nl_NL.ISO8859-1/htdocs/vendors.html +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- $FreeBSD$ - Vertaald door: Siebrand Mazeland / Rene Ladan - %SOURCE% en_US.ISO8859-1/htdocs/vendors.html - %SRCID% 39534 ---> -<html> - <head> - <meta http-equiv="refresh" content="5;url=../doc/nl_NL.ISO8859-1/books/handbook/mirrors.html" /> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>Leveranciers van FreeBSD</title> - </head> - - <body bgcolor="#ffffff"> - <p>De lijst met leveranciers die FreeBSD ter beschikking hebben - is beschikbaar <a - href="../doc/nl_NL.ISO8859-1/books/handbook/mirrors.html">als - onderdeel van het FreeBSD handboek</a>. Deze pagina hoort u - over een paar seconden automatisch daar naar door te sturen. Als dat niet - zo is, volg dan de link en werk uw favorieten bij. We - verontschuldigen ons voor het ongemak.</p> - </body> -</html> diff --git a/nl_NL.ISO8859-1/htdocs/where.xml b/nl_NL.ISO8859-1/htdocs/where.xml index 4ffd6f1899..0c7c1e0e46 100644 --- a/nl_NL.ISO8859-1/htdocs/where.xml +++ b/nl_NL.ISO8859-1/htdocs/where.xml @@ -6,7 +6,7 @@ ]> <!-- Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/htdocs/where.xml - %SRCID% 40536 + %SRCID% 41269 --> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -76,7 +76,7 @@ </tr> <tr> <td></td> - <td>amd64</td> + <td>amd64<br/>(x86-64, x64)</td> <td><a href="&url.rel;/amd64/amd64/&rel.current;-RELEASE">[Distributie]</a></td> <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">[ISO]</a></td> </tr> @@ -122,7 +122,7 @@ </tr> <tr> <td></td> - <td>amd64</td> + <td>amd64<br/>(x86-64, x64)</td> <td><a href="&url.rel;/amd64/&rel2.current;-RELEASE">[Distributie]</a></td> <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> @@ -144,6 +144,7 @@ <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distributie]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> + <!-- <tr> <td colspan="2">&os; &rel3.current;-RELEASE</td> <td colspan="2"></td> @@ -154,28 +155,29 @@ </tr> <tr> <td></td> - <td>amd64</td> - <!--<td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distributie]</a></td>--> + <td>amd64<br/>(x86-64, x64)</td> + <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distributie]</a></td> <td colspan="2" align="right"><a href="&url.rel;/am64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>i386</td> - <!--<td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distributie]</a></td>--> + <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distributie]</a></td> <td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>pc98</td> - <!--<td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distributie]</a></td>--> + <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distributie]</a></td> <td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>sparc64</td> - <!--<td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distributie]</a></td>--> + <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distributie]</a></td> <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> + --> </tbody> </table> diff --git a/nl_NL.ISO8859-1/share/xml/navibar.l10n.ent b/nl_NL.ISO8859-1/share/xml/navibar.l10n.ent index 3ac7c08099..bc420bd62e 100644 --- a/nl_NL.ISO8859-1/share/xml/navibar.l10n.ent +++ b/nl_NL.ISO8859-1/share/xml/navibar.l10n.ent @@ -3,7 +3,7 @@ <!-- $FreeBSD$ %SOURCE% share/xml/navibar.ent - %SRCID% 39773 + %SRCID% 41115 --> <!ENTITY nav.about ' @@ -106,9 +106,9 @@ <li><a href="&enbase;/releases/">Uitgave-informatie</a> <ul> <li>Productie-uitgave:<br/> - <a href="&u.rel.announce;">&rel.current;</a> <a href="&u.rel2.announce;">&rel2.current;</a></li> + <a href="&u.rel.announce;">&rel.current;</a></li> <li>Productie-uitgave (verouderd):<br/> - <a href="&u.rel3.announce;">&rel3.current;</a></li> + <a href="&u.rel2.announce;">&rel2.current;</a></li> <!-- <li><a href="&enbase;/snapshots/">Snapshot-uitgaven</a></li>--> &beta.listitem; &beta2.listitem; diff --git a/ru_RU.KOI8-R/articles/contributing/article.xml b/ru_RU.KOI8-R/articles/contributing/article.xml index d08553b27a..4789111ac8 100644 --- a/ru_RU.KOI8-R/articles/contributing/article.xml +++ b/ru_RU.KOI8-R/articles/contributing/article.xml @@ -7,7 +7,7 @@ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/contributing/article.xml,v 1.3 2006/03/28 16:40:29 gad Exp $ - Original revision: r34267 + Original revision: r40773 --> <article lang='ru'> @@ -93,7 +93,7 @@ <listitem> <para>ðÅÒÉÏÄÉÞÅÓËÉ ÞÉÔÁÊÔÅ FAQ É òÕËÏ×ÏÄÓÔ×Ï. åÓÌÉ ÞÔÏ-ÔÏ ÏÐÉÓÁÎÏ ÐÌÏÈÏ, ÕÓÔÁÒÅÌÏ ÉÌÉ ÄÁÖÅ ÐÏÌÎÏÓÔØÀ ÎÅÐÒÁ×ÉÌØÎÏ, ÄÁÊÔÅ ÎÁÍ ÚÎÁÔØ. - åÝ£ ÌÕÞÛÅ, ÅÓÌÉ ×Ù ÐÒÉÛÌ£ÔÅ ÎÁÍ ÉÓÐÒÁ×ÌÅÎÉÅ (×ÙÕÞÉÔØ SGML ÎÅ ÔÁË + åÝ£ ÌÕÞÛÅ, ÅÓÌÉ ×Ù ÐÒÉÛÌ£ÔÅ ÎÁÍ ÉÓÐÒÁ×ÌÅÎÉÅ (×ÙÕÞÉÔØ Docbook ÎÅ ÔÁË ÓÌÏÖÎÏ, ÎÏ É ÐÒÏÔÉ× ÐÏÓÌÁÎÉÊ × ÆÏÒÍÁÔÅ ASCII ÎÉËÔÏ ×ÏÚÒÁÖÁÔØ ÎÅ ÂÕÄÅÔ).</para> </listitem> @@ -232,7 +232,7 @@ <sect2> <title>÷ÙÂÅÒÉÔÅ ÏÄÉÎ ÉÚ ÐÕÎËÔÏ× ÓÏ ÓÔÒÁÎÉÞËÉ <quote>ÉÄÅÊ</quote></title> - <para><ulink url="&url.base;/projects/ideas/">óÐÉÓÏË ÐÒÏÅËÔÏ× + <para><ulink url="http://wiki.freebsd.org/IdeasPage">óÐÉÓÏË ÐÒÏÅËÔÏ× É ÉÄÅÊ ÄÌÑ ÄÏÂÒÏ×ÏÌØÃÅ×</ulink> ÔÁËÖÅ ÄÏÓÔÕÐÅÎ ÄÌÑ ÌÀÄÅÊ, ÖÅÌÁÀÝÉÈ ÐÏÍÏÞØ ÐÒÏÅËÔÕ &os;. óÐÉÓÏË ÐÏÓÔÏÑÎÎÏ ÏÂÎÏ×ÌÑÅÔÓÑ É ÓÏÄÅÒÖÉÔ ÐÕÎËÔÙ, ËÁË ÄÌÑ ÐÒÏÇÒÁÍÍÉÓÔÏ×, ÔÁË É ÄÌÑ ÎÅ @@ -337,10 +337,7 @@ <para>ðÒÅÄÐÏÞÔÉÔÅÌØÎÙÍ ÆÏÒÍÁÔÏÍ &man.diff.1; ÄÌÑ ÐÏÓÙÌËÉ ÐÁÔÞÅÊ Ñ×ÌÑÅÔÓÑ ÕÎÉÆÉÃÉÒÏ×ÁÎÎÁÑ ×ÙÄÁÞÁ, ÓÏÚÄÁ×ÁÅÍÁÑ ËÏÍÁÎÄÏÊ <command>diff - -u</command>. ïÄÎÁËÏ ÄÌÑ ÐÁÔÞÅÊ, ËÏÔÏÒÙÅ ÓÕÝÅÓÔ×ÅÎÎÏ ÉÚÍÅÎÑÀÔ ËÁËÏÊ-ÔÏ - ÂÌÏË ËÏÄÁ, ËÏÎÔÅËÓÔÎÙÊ ÆÏÒÍÁÔ, ÓÏÚÄÁ×ÁÅÍÙÊ ËÏÍÁÎÄÏÊ <command>diff - -c</command>, ÍÏÖÅÔ ÏËÁÚÁÔØÓÑ ÂÏÌÅÅ ÞÉÔÁÅÍÙÍ É ÐÏÜÔÏÍÕ ÂÏÌÅÅ - ÐÒÅÄÐÏÞÔÉÔÅÌØÎÙÍ.</para> + -u</command>.</para> <indexterm> <primary><command>diff</command></primary> @@ -348,27 +345,16 @@ <para>ë ÐÒÉÍÅÒÕ:</para> - <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen> - - <para>ÉÌÉ</para> - - <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen> - - <para>ÂÕÄÕÔ ÓÏÚÄÁ×ÁÔØ ÔÁËÏÊ ÎÁÂÏÒ ËÏÎÔÅËÓÔÎÙÈ diff-ÆÁÊÌÏ× ÄÌÑ ÄÁÎÎÏÇÏ - ÆÁÊÌÁ Ó ÉÓÈÏÄÎÙÍ ÔÅËÓÔÏÍ ÉÌÉ ÃÅÌÏÊ ÉÅÒÁÒÈÉÉ ËÁÔÁÌÏÇÏ×.</para> - - <para>ðÏÄÏÂÎÙÍ ÖÅ ÏÂÒÁÚÏÍ</para> - <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen> <para>ÉÌÉ</para> - <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen> + <screen>&prompt.user; <userinput>diff -u -r -N olddir newdir</userinput></screen> - <para>ÓÄÅÌÁÀÔ ÔÏ ÖÅ ÓÁÍÏÅ, ÎÏ × ÕÎÉÆÉÃÉÒÏ×ÁÎÎÏÍ diff-ÆÏÒÍÁÔÅ.</para> + <para>ÓÏÚÄÁÓÔ ÎÁÂÏÒ ÐÁÔÞÅÊ × ÕÎÉÆÉÃÉÒÏ×ÁÎÎÏÍ ÆÏÒÍÁÔÅ ÄÌÑ ËÏÎËÒÅÔÎÏÇÏ + ÆÁÊÌÁ Ó ÉÓÈÏÄÎÙÍ ÔÅËÓÔÏÍ ÉÌÉ ÄÌÑ ÉÅÒÁÒÈÉÉ ËÁÔÁÌÏÇÏ×.</para> - <para>äÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ËÉ ÐÏ - ËÏÍÁÎÄÅ &man.diff.1;.</para> + <para>äÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÍÏÖÎÏ ÎÁÊÔÉ × &man.diff.1;.</para> <para>ðÏÓÌÅ ÔÏÇÏ, ËÁË ×Ù ÐÏÌÕÞÉÌÉ ÎÁÂÏÒ diff-ÆÁÊÌÏ× (ËÏÔÏÒÙÅ ×Ù ÍÏÖÅÔÅ ÐÒÏÔÅÓÔÉÒÏ×ÁÔØ ËÏÍÁÎÄÏÊ &man.patch.1;), ×Ù ÄÏÌÖÎÙ ÐÒÉÓÌÁÔØ ÉÈ ÄÌÑ @@ -391,10 +377,10 @@ &man.uuencode.1;. ðÒÉÎÉÍÁÀÔÓÑ ÔÁËÖÅ É ÁÒÈÉ×Ù, ÓÏÚÄÁÎÎÙÅ ÐÒÏÇÒÁÍÍÏÊ &man.shar.1;.</para> - <para>åÓÌÉ ×ÁÛÅ ÉÚÍÅÎÅÎÉÅ ÐÏÔÅÎÃÉÁÌØÎÏ ÍÏÖÅÔ ÏËÁÚÁÔØÓÑ ÓÏÍÎÉÔÅÌØÎÙÍ - (ÎÁÐÒÉÍÅÒ, ×Ù ÎÅ Õ×ÅÒÅÎÙ × ÏÔÓÕÔÓÔ×ÉÉ ÌÉÃÅÎÚÉÏÎÎÙÈ ÏÇÒÁÎÉÞÅÎÉÊ - ÏÔÎÏÓÉÔÅÌØÎÏ ÅÇÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÉÌÉ ÐÒÏÓÔÏ ÎÅ ÇÏÔÏ×Ù ×ÙÐÕÓÔÉÔØ ÅÇÏ ÂÅÚ - ÔÝÁÔÅÌØÎÏÊ ÐÒÏ×ÅÒËÉ, ÔÏ ×Ù ÄÏÌÖÎÙ ÐÏÓÌÁÔØ ÅÇÏ ÎÁÐÒÑÍÕÀ × ÓÐÉÓÏË + <para>åÓÌÉ ×ÁÛÅ ÉÚÍÅÎÅÎÉÅ ÐÏÔÅÎÃÉÁÌØÎÏ ÍÏÖÅÔ ÏËÁÚÁÔØÓÑ ÓÏÍÎÉÔÅÌØÎÙÍ, + ÎÁÐÒÉÍÅÒ, ×Ù ÎÅ Õ×ÅÒÅÎÙ × ÏÔÓÕÔÓÔ×ÉÉ ÌÉÃÅÎÚÉÏÎÎÙÈ ÏÇÒÁÎÉÞÅÎÉÊ + ÏÔÎÏÓÉÔÅÌØÎÏ ÅÇÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ, ÔÏ ×Ù ÄÏÌÖÎÙ ÐÏÓÌÁÔØ ÅÇÏ ÎÁÐÒÑÍÕÀ + × ÓÐÉÓÏË ÒÁÓÓÙÌËÉ &a.core;, Á ÎÅ ÞÅÒÅÚ &man.send-pr.1;. ÷ ÓÐÉÓËÅ ÒÁÓÓÙÌËÉ &a.core; ÕÞÁÓÔ×ÕÅÔ ÇÏÒÁÚÄÏ ÍÅÎØÛÅÅ ËÏÌÉÞÅÓÔ×Ï ÌÀÄÅÊ, ËÏÔÏÒÙÅ ×ÙÐÏÌÎÑÀÔ ÏÓÎÏ×ÎÕÀ ÅÖÅÄÎÅ×ÎÕÀ ÒÁÂÏÔÕ ÎÁÄ FreeBSD. úÁÍÅÔØÔÅ, ÞÔÏ ÜÔÁ ÇÒÕÐÐÁ @@ -497,7 +483,7 @@ 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$</programlisting> + $&os;$</programlisting> <para>äÌÑ ×ÁÛÅÇÏ ÕÄÏÂÓÔ×Á ËÏÐÉÑ ÜÔÏÇÏ ÔÅËÓÔÁ ÒÁÚÍÅÝÅÎÁ × ÆÁÊÌÅ <filename>/usr/share/examples/etc/bsd-style-copyright</filename>. @@ -527,8 +513,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <para>æÉÎÁÎÓÏ×ÁÑ ÐÏÍÏÝØ ÍÏÖÅÔ ÂÙÔØ ÎÁÐÒÁ×ÌÅÎÁ × ×ÉÄÅ ÞÅËÏ× ÎÁ ÁÄÒÅÓ: <address> The FreeBSD Foundation - <street>7321 Brockway Dr.</street> - <city>Boulder</city>, <state>CO</state> <postcode>80303</postcode> + <street>P.O. Box 20247</street> + <city>Boulder</city>, + <state>CO</state> <postcode>80308</postcode> <country>USA</country> </address> </para> @@ -557,16 +544,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. url="&url.base;/donations/">òÕËÏ×ÏÄÓÔ×Õ ãÅÎÔÒÁ ÐÏÖÅÒÔ×Ï×ÁÎÉÊ</ulink>.</para> </sect3> - - <sect3> - <title>ðÏÍÏÝØ × ×ÉÄÅ ÄÏÓÔÕÐÁ × Internet</title> - - <para>íÙ ×ÓÅÇÄÁ ×ÏÓÐÏÌØÚÕÅÍÓÑ ÎÏ×ÙÍ ÚÅÒËÁÌÉÒÕÀÝÉÍ ÓÅÒ×ÅÒÏÍ ÄÌÑ FTP, WWW - ÉÌÉ <command>cvsup</command>. åÓÌÉ ×Ù ÚÁÈÏÔÉÔÅ ×ÙÓÔÕÐÉÔØ × ÒÏÌÉ - ÔÁËÏÇÏ ÚÅÒËÁÌÁ, ÐÏÖÁÌÕÊÓÔÁ, ÏÂÒÁÔÉÔÅÓØ Ë ÓÔÁÔØÅ Ï <ulink - url="&url.articles.hubs;/index.html">ÚÅÒËÁÌÉÒÏ×ÁÎÉÉ FreeBSD</ulink> - ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÌÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.</para> - </sect3> </sect2> </sect1> </article> diff --git a/ru_RU.KOI8-R/articles/cups/article.xml b/ru_RU.KOI8-R/articles/cups/article.xml index 42c67da577..280c872dd0 100644 --- a/ru_RU.KOI8-R/articles/cups/article.xml +++ b/ru_RU.KOI8-R/articles/cups/article.xml @@ -7,7 +7,7 @@ $FreeBSD$ - Original revision: r36335 + Original revision: r39632 --> <!-- @@ -18,7 +18,7 @@ Translation: Taras Korenko, <article lang="ru"> <articleinfo> <title>õÎÉ×ÅÒÓÁÌØÎÁÑ óÉÓÔÅÍÁ ðÅÞÁÔÉ Unix ÎÁ FreeBSD</title> - <pubdate>$FreeBSD$</pubdate> + <authorgroup> <author> <firstname>Chess</firstname> @@ -34,6 +34,8 @@ Translation: Taras Korenko, &tm-attrib.general; </legalnotice> + <pubdate>$FreeBSD$</pubdate> + <releaseinfo>$FreeBSD$</releaseinfo> <abstract> diff --git a/ru_RU.KOI8-R/articles/custom-gcc/article.xml b/ru_RU.KOI8-R/articles/custom-gcc/article.xml index cd4ed25ab6..ab804dd1b3 100644 --- a/ru_RU.KOI8-R/articles/custom-gcc/article.xml +++ b/ru_RU.KOI8-R/articles/custom-gcc/article.xml @@ -5,7 +5,7 @@ <!-- The FreeBSD Russian Documentation Project $FreeBSD$ - Original revision: r34679 + Original revision: r39632 --> <!-- ðÅÒÅ×ÏÄ: ëÏÒÅÎËÏ ôÁÒÁÓ --> diff --git a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml index fe1b3d814f..5667839049 100644 --- a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml +++ b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml @@ -7,7 +7,7 @@ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml,v 1.9 2006/02/05 17:43:22 marck Exp $ - Original revision: r32632 + Original revision: r39632 --> <article lang="ru"> @@ -32,6 +32,7 @@ <pubdate>$FreeBSD$</pubdate> <releaseinfo>$FreeBSD$</releaseinfo> + <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; &tm-attrib.general; diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml index 6f801e5da8..cd97842656 100644 --- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml +++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml @@ -9,7 +9,7 @@ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml,v 1.5 2005/06/12 13:52:24 gad Exp $ - Original revision: r33355 + Original revision: r39632 --> <article xmlns:xi="http://www.w3.org/2001/XInclude" lang="ru"> diff --git a/ru_RU.KOI8-R/articles/fonts/article.xml b/ru_RU.KOI8-R/articles/fonts/article.xml index f4d4a6dc71..9a4bf433c1 100644 --- a/ru_RU.KOI8-R/articles/fonts/article.xml +++ b/ru_RU.KOI8-R/articles/fonts/article.xml @@ -8,7 +8,7 @@ $FreeBSD$ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fonts/article.xml,v 1.5 2005/12/06 17:56:24 gad Exp $ - Original revision: r38183 + Original revision: r39632 --> <!-- Recently, I wanted to figure out how to use some additional fonts that @@ -55,6 +55,8 @@ <pubdate>7 Á×ÇÕÓÔÁ 1996</pubdate> + <releaseinfo>$FreeBSD$</releaseinfo> + <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; &tm-attrib.adobe; @@ -65,8 +67,6 @@ &tm-attrib.general; </legalnotice> - <releaseinfo>$FreeBSD$</releaseinfo> - <abstract> <para>üÔÏÔ ÄÏËÕÍÅÎÔ ÓÏÄÅÒÖÉÔ ÏÐÉÓÁÎÉÅ ÒÁÚÌÉÞÎÙÈ ÆÁÊÌÏ× ÛÒÉÆÔÏ×, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó FreeBSD É ÄÒÁÊ×ÅÒÏÍ ÓÉÓÔÅÍÎÏÊ ËÏÎÓÏÌÉ, ÓÉÓÔÅÍÏÊ diff --git a/ru_RU.KOI8-R/articles/geom-class/article.xml b/ru_RU.KOI8-R/articles/geom-class/article.xml index 0e49f23870..84519dde73 100644 --- a/ru_RU.KOI8-R/articles/geom-class/article.xml +++ b/ru_RU.KOI8-R/articles/geom-class/article.xml @@ -6,7 +6,7 @@ The FreeBSD Russian Documentation Project $FreeBSD$ $FreeBSDru$ - Original revision: r38183 + Original revision: r40540 --> <!-- ðÅÒÅ×ÏÄ: ôÁÒÁÓ ëÏÒÅÎËÏ --> @@ -108,7 +108,8 @@ <listitem> <para>óÔÒÁÎÉÃÁ ÓÐÒÁ×ÏÞÎÉËÁ &man.style.9; — ÄÏËÕÍÅÎÔÉÒÕÅÔ ÓÏÇÌÁÛÅÎÉÑ Ï ÓÔÉÌÅ ÏÆÏÒÍÌÅÎÉÑ ËÏÄÁ, ËÏÔÏÒÙÅ ÏÂÑÚÁÎÙ ÂÙÔØ ÓÏÂÌÀÄÅÎÙ - ÅÓÌÉ ×Ù ÐÌÁÎÉÒÕÅÔÅ ÐÅÒÅÄÁÔØ ×ÁÛ ËÏÄ × CVS-ÄÒÅ×Ï FreeBSD.</para> + ÅÓÌÉ ×Ù ÐÌÁÎÉÒÕÅÔÅ ÐÅÒÅÄÁÔØ ×ÁÛ ËÏÄ × Subversion ÒÅÐÏÚÉÔÏÒÉÊ + FreeBSD.</para> </listitem> </itemizedlist> </sect2> diff --git a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml index 12cc7934dd..18ca8654cb 100644 --- a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml +++ b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml @@ -5,7 +5,7 @@ <!-- The FreeBSD Russian Documentation Project $FreeBSD$ - Original revision: r34581 + Original revision: r39632 --> <!-- ðÅÒÅ×ÏÄ: ôÁÒÁÓ ëÏÒÅÎËÏ --> @@ -22,13 +22,13 @@ </affiliation> </author> - <pubdate>$FreeBSD$</pubdate> - <copyright> <year>2008</year> <holder role="mailto:manolis@FreeBSD.org">Manolis Kiagias</holder> </copyright> + <pubdate>$FreeBSD$</pubdate> + <releaseinfo>$FreeBSD$</releaseinfo> <legalnotice id="trademarks" role="trademarks"> diff --git a/ru_RU.KOI8-R/articles/hubs/article.xml b/ru_RU.KOI8-R/articles/hubs/article.xml index bc1c80c660..1b6ceb4569 100644 --- a/ru_RU.KOI8-R/articles/hubs/article.xml +++ b/ru_RU.KOI8-R/articles/hubs/article.xml @@ -7,7 +7,7 @@ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/hubs/article.xml,v 1.21 2007/05/15 18:39:34 gad Exp $ - Original revision: r38826 + Original revision: r39701 --> <article lang="ru"> @@ -163,14 +163,11 @@ <para>üÔÉ ÔÒÅÂÏ×ÁÎÉÑ × ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ ÏÐÒÅÄÅÌÑÀÔÓÑ ÍÁËÓÉÍÁÌØÎÙÍ ÏÖÉÄÁÅÍÙÍ ËÏÌÉÞÅÓÔ×ÏÍ ËÌÉÅÎÔÏ× (ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ ÓÅÒ×ÅÒÁ). ôÁËÖÅ, ÎÁ ÔÒÅÂÕÅÍÙÅ ÒÅÓÕÒÓÙ ×ÌÉÑÅÔ ÓÐÉÓÏË ÓÅÒ×ÉÓÏ×, ËÏÔÏÒÙÅ ×Ù ÂÕÄÅÔÅ - ÐÒÅÄÏÓÔÁ×ÌÑÔØ. úÅÒËÁÌÏ FTP É/ÉÌÉ HTTP ÎÅ ÔÒÅÂÕÀÔ ÏÓÏÂÅÎÎÏ ÍÎÏÇÏ - ÒÅÓÕÒÓÏ×; ÚÎÁÞÉÔÅÌØÎÏ ÂÏÌØÛÅ ÐÁÍÑÔÉ É ×ÙÞÉÓÌÉÔÅÌØÎÏÊ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ - ÐÏÔÒÅÂÌÑÀÔ CVSup, rsync ÉÌÉ AnonCVS. ïÓÏÂÅÎÎÏ "ÐÒÏÖÏÒÌÉ×ÙÍ" ÐÏ ÐÁÍÑÔÉ - Ñ×ÌÑÅÔÓÑ rsync; CVSup ÔÒÅÂÕÅÔ ÄÏÓÔÁÔÏÞÎÏÊ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ - ÐÒÏÃÅÓÓÏÒÁ. äÌÑ ÐÒÅÄÏÓÔÁ×ÌÅÎÉÑ ÄÏÓÔÕÐÁ ÐÏ AnonCVS ÈÏÒÏÛÅÊ ÉÄÅÅÊ ÂÕÄÅÔ - ÓÏÚÄÁÎÉÅ ×ÉÒÔÕÁÌØÎÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ × ÐÁÍÑÔÉ (MFS) ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ - 300 MB ÒÁÚÍÅÒÏÍ, ÔÁË ÞÔÏ ÕÞÔÉÔÅ ÜÔÏ ÐÒÉ ÐÌÁÎÉÒÏ×ÁÎÉÉ. ÷ÏÔ ÎÅËÏÔÏÒÙÅ - ÓÏ×ÅÔÙ ÐÏ ËÏÎÆÉÇÕÒÁÃÉÉ ÁÐÐÁÒÁÔÎÏÊ ÞÁÓÔÉ ÓÅÒ×ÅÒÁ:</para> + ÐÒÅÄÏÓÔÁ×ÌÑÔØ. úÅÒËÁÌÁ FTP É/ÉÌÉ HTTP ÎÅ ÔÒÅÂÕÀÔ ÏÓÏÂÅÎÎÏ ÍÎÏÇÏ + ÒÅÓÕÒÓÏ×. âÕÄØÔÅ ÎÁ ÞÅËÕ, ÅÓÌÉ ÐÌÁÎÉÒÕÅÔÅ ÐÒÅÄÏÓÔÁ×ÌÑÔØ rsync. + ÷ÙÂÏÒ rsync ÍÏÖÅÔ ÉÍÅÔØ ÏÇÒÏÍÎÏÅ ×ÌÉÑÎÉÅ ÎÁ ÔÒÅÂÏ×ÁÎÉÑ Ë ÁÐÐÁÒÁÔÎÙÍ + ÒÅÓÕÒÓÁÍ, ÐÏÓËÏÌØËÕ rsync ÐÒÉÚÎÁÎ "ÐÒÏÖÏÒÌÉ×ÙÍ" ÐÏ ÐÁÍÑÔÉ. + ÷ÏÔ ÎÅËÏÔÏÒÙÅ ÓÏ×ÅÔÙ ÐÏ ËÏÎÆÉÇÕÒÁÃÉÉ ÁÐÐÁÒÁÔÎÏÊ ÞÁÓÔÉ ÓÅÒ×ÅÒÁ:</para> <para>äÌÑ ÕÍÅÒÅÎÎÏ ÐÏÓÅÝÁÅÍÏÇÏ ÓÁÊÔÁ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÅÇÏ <application>Rsync</application>, ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÃÅÓÓÏÒ diff --git a/ru_RU.KOI8-R/articles/laptop/article.xml b/ru_RU.KOI8-R/articles/laptop/article.xml index 88cfb7ba0d..cd04c6f422 100644 --- a/ru_RU.KOI8-R/articles/laptop/article.xml +++ b/ru_RU.KOI8-R/articles/laptop/article.xml @@ -7,15 +7,13 @@ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/laptop/article.xml,v 1.15 2007/05/15 07:58:44 gad Exp $ - Original revision: r29400 + Original revision: r39632 --> <article lang="ru"> <articleinfo> <title>FreeBSD ÎÁ ÌÜÐÔÏÐÁÈ</title> - <pubdate>$FreeBSD$</pubdate> - <abstract> <para><literal>ðÅÒÅ×ÏÄ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË ÷ÉÔÁÌÉÊ âÏÇÄÁÎÏ×</literal></para> <para>FreeBSD, ÚÁ ÎÅËÏÔÏÒÙÍ ÉÓËÌÀÞÅÎÉÅÍ, ÐÒÅËÒÁÓÎÏ ÒÁÂÏÔÁÅÔ ÎÁ @@ -31,6 +29,8 @@ &tm-attrib.general; </legalnotice> + <pubdate>$FreeBSD$</pubdate> + <releaseinfo>$FreeBSD$</releaseinfo> </articleinfo> diff --git a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml index 0fa6878fb8..df404544ca 100644 --- a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml +++ b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml @@ -10,7 +10,7 @@ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/pr-guidelines/article.xml,v 1.4 2005/12/16 20:08:02 gad Exp $ - Original revision: r38826 + Original revision: r39632 --> <!-- @@ -218,11 +218,16 @@ </glossentry> <glossentry> - <glossterm>repocopy</glossterm> + <glossterm>repocopy (ÕÓÔÁÒÅ×ÛÅÅ)</glossterm> <glossdef> <para>òÅÛÅÎÉÅ ÐÒÏÂÌÅÍÙ ÚÁ×ÉÓÉÔ ÏÔ ÚÁ×ÅÒÛÅÎÉÑ ÏÐÅÒÁÃÉÉ ËÏÐÉÒÏ×ÁÎÉÑ ÒÅÐÏÚÉÔÏÒÉÑ (×ÎÕÔÒÅÎÎÉÅ ÏÐÅÒÁÃÉÉ ÒÅÐÏÚÉÔÏÒÉÑ CVS).</para> + + <para>õÞÉÔÙ×ÁÑ ÔÏ, ÞÔÏ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ ×ÓÅ ÒÅÐÏÚÉÔÏÒÉÉ ÉÓÐÏÌØÚÕÀÔ + Subversion, × ÜÔÏÍ ÓÏÓÔÏÑÎÉÉ ÂÏÌÅÅ ÎÅÔ ÎÅÏÂÈÏÄÉÍÏÓÔÉ. ÷ Subversion + ÉÚÎÁÞÁÌØÎÏ ÐÒÉÓÕÔÓÔ×ÕÀÔ ÏÐÅÒÁÃÉÉ ËÏÐÉÒÏ×ÁÎÉÑ É ÐÅÒÅÍÅÝÅÎÉÑ + ÆÁÊÌÏ×.</para> </glossdef> </glossentry> diff --git a/ru_RU.KOI8-R/articles/problem-reports/article.xml b/ru_RU.KOI8-R/articles/problem-reports/article.xml index 1cfaa31a72..df0c165964 100644 --- a/ru_RU.KOI8-R/articles/problem-reports/article.xml +++ b/ru_RU.KOI8-R/articles/problem-reports/article.xml @@ -7,7 +7,7 @@ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/problem-reports/article.xml,v 1.20 2006/04/05 04:28:40 gad Exp $ - Original revision: r33563 + Original revision: r39655 --> <article lang="ru"> @@ -18,7 +18,6 @@ <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; - &tm-attrib.cvsup; &tm-attrib.ibm; &tm-attrib.intel; &tm-attrib.sparc; @@ -93,7 +92,7 @@ <emphasis>ÎÅ</emphasis> Ñ×ÌÑÅÔÓÑ ÐÒÁ×ÉÌØÎÙÍ ÄÅÊÓÔ×ÉÅÍ, Á ÔÏÌØËÏ ÐÒÉ×ÏÄÉÔ Ë ÒÁÚÏÞÁÒÏ×ÁÎÉÀ ×ÁÓ É ÒÁÚÒÁÂÏÔÞÉËÏ×. é ÎÁÏÂÏÒÏÔ, ÅÓÔØ ÓÌÕÞÁÉ, ËÏÇÄÁ ÍÏÖÅÔ ÂÙÔØ ÎÕÖÎÏ ÐÏÓÌÁÔØ ÓÏÏÂÝÅÎÉÅ Ï ÞÅÍ-ÔÏ, ÎÅ Ñ×ÌÑÀÝÅÍÓÑ - ÏÛÉÂËÏÊ—Ë ÐÒÉÍÅÒÕ, ÚÁÐÒÏÓ ÎÁ ÄÏÒÁÂÏÔËÕ ÉÌÉ ÒÁÓÛÉÒÅÎÉÅ + ÏÛÉÂËÏÊ — Ë ÐÒÉÍÅÒÕ, ÚÁÐÒÏÓ ÎÁ ÄÏÒÁÂÏÔËÕ ÉÌÉ ÒÁÓÛÉÒÅÎÉÅ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔÉ.</para> <para>îÏ ËÁË ÖÅ ÏÐÒÅÄÅÌÉÔØ, ÞÔÏ Ñ×ÌÑÅÔÓÑ ÏÛÉÂËÏÊ, Á ÞÔÏ ÎÅÔ? ðÒÏÓÔÙÍ @@ -109,12 +108,6 @@ <itemizedlist> <listitem> - <para>úÁÐÒÏÓÙ ÎÁ ÒÁÓÛÉÒÅÎÉÅ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔÉ. ïÂÙÞÎÏ ÈÏÒÏÛÅÊ ÉÄÅÅÊ - Ñ×ÌÑÅÔÓÑ ÏÚ×ÕÞÉ×ÁÎÉÅ ÜÔÏÇÏ × ÓÐÉÓËÁÈ ÒÁÓÓÙÌËÉ ÄÏ ÔÏÇÏ, ËÁË ÐÏÓÙÌÁÔØ - ÓÏÏÂÝÅÎÉÅ Ï ÐÒÏÂÌÅÍÅ.</para> - </listitem> - - <listitem> <para>õ×ÅÄÏÍÌÅÎÉÅ Ï ÏÂÎÏ×ÌÅÎÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ËÏÔÏÒÏÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÓÔÏÒÏÎÎÉÍÉ ÒÁÚÒÁÂÏÔÞÉËÁÍÉ (× ÏÓÎÏ×ÎÏÍ ÐÏÒÔÙ, ÎÏ ÔÁËÖÅ É ËÏÍÐÏÎÅÎÔÙ ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÙ, ÒÁÚÒÁÂÁÔÙ×ÁÅÍÙÅ ÓÔÏÒÏÎÎÉÍÉ @@ -279,7 +272,7 @@ <para>äÌÑ ÏÓÎÏ×ÎÏÇÏ ËÏÄÁ &os; ×Ù ÄÏÌÖÎÙ ÔÝÁÔÅÌØÎÏ ÉÚÕÞÉÔØ ÓÏÄÅÒÖÉÍÏÅ ÆÁÊÌÁ <filename>/usr/src/UPDATING</filename> ÉÌÉ ÅÇÏ ÔÅËÕÝÕÀ ×ÅÒÓÉÀ ÐÏ ÁÄÒÅÓÕ <ulink - url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/UPDATING"></ulink>. + url="http://svnweb.freebsd.org/base/head/UPDATING?view=log"></ulink>. (åÓÌÉ ×Ù ÐÅÒÅÈÏÄÉÔÅ Ó ÏÄÎÏÊ ×ÅÒÓÉÉ ÎÁ ÄÒÕÇÕÀ, ÏÓÏÂÅÎÎÏ ÅÓÌÉ ×Ù ÏÂÎÏ×ÌÑÅÔÅÓØ ÄÏ &os.current;, ÔÏ × ÜÔÏÍ ÆÁÊÌÅ ×Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÍÎÏÇÏ ×ÁÖÎÏÊ ÉÎÆÏÒÍÁÃÉÉ).</para> @@ -288,9 +281,9 @@ ÏÂÒÁÔÉÔØÓÑ Ë ÆÁÊÌÕ <filename>/usr/ports/UPDATING</filename> (ÉÚÍÅÎÅÎÉÑ, ËÁÓÁÀÝÉÅÓÑ ÉÎÄÉ×ÉÄÕÁÌØÎÙÈ ÐÏÒÔÏ×) ÉÌÉ Ë <filename>/usr/ports/CHANGES</filename> (ÉÚÍÅÎÅÎÉÑ, ËÁÓÁÀÝÉÅÓÑ ×ÓÅÊ - ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×). ïÎÉ ÔÁËÖÅ ÄÏÓÔÕÐÎÙ ÞÅÒÅÚ ÉÎÔÅÒÆÅÊÓ CVSweb: <ulink - url="http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/UPDATING"></ulink> É - <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/CHANGES"></ulink>.</para> + ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×). ïÎÉ ÔÁËÖÅ ÄÏÓÔÕÐÎÙ ÞÅÒÅÚ ÉÎÔÅÒÆÅÊÓ svnweb: <ulink + url="http://svnweb.freebsd.org/ports/head/UPDATING?view=log"></ulink> + É <ulink url="http://svnweb.freebsd.org/ports/head/CHANGES?view=log"></ulink>.</para> </listitem> </itemizedlist> </section> @@ -375,12 +368,11 @@ (ÓÕÝÅÓÔ×ÕÅÔ ÓÐÅÃÉÁÌØÎÏÅ ÐÏÌÅ ÄÌÑ ÅÇÏ ×ËÌÀÞÅÎÉÑ, ÓÍÏÔÒÉÔÅ ÎÉÖÅ) É ÎÁ ËÁËÏÊ ÁÒÈÉÔÅËÔÕÒÅ. óÏÏÂÝÉÔÅ, ÉÓÐÏÌØÚÕÅÔÅ ÌÉ ×Ù release ×ÅÒÓÉÀ (ÕÓÔÁÎÏ×ÉÌÉ Ó ËÏÍÐÁËÔ-ÄÉÓËÁ ÌÉÂÏ ÚÁÇÒÕÚÉÌÉ) ÉÌÉ ÓËÁÞÁÌÉ - Å£ Ó ÐÏÍÏÝØÀ &man.cvsup.1; (ÅÓÌÉ ÔÁË, ÔÏ ËÁË ÄÁ×ÎÏ ×Ù - ÏÂÎÏ×ÌÑÌÉÓØ). åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÊÔÅ &os.current;, ÔÏ ÐÅÒ×ÙÊ - ×ÏÐÒÏÓ, ËÏÔÏÒÙÊ ×ÁÍ ÍÏÇÕÔ ÚÁÄÁÔØ, ÂÕÄÅÔ ÐÒÏ ÄÁÔÕ ÐÏÓÌÅÄÎÅÇÏ - ÏÂÎÏ×ÌÅÎÉÑ, ÔÁË ËÁË ÉÓÐÒÁ×ÌÅÎÉÑ ÄÌÑ ÜÔÏÊ ×ÅÔËÉ ÉÍÅÀÔ ÔÅÎÄÅÎÃÉÀ - (ÏÓÏÂÅÎÎÏ ÄÌÑ ÓÅÒØ£ÚÎÙÈ ÐÒÏÂÌÅÍ) ÐÏÑ×ÌÑÔØÓÑ ÓÌÉÛËÏÍ - ÂÙÓÔÒÏ.</para> + Å£ Ó ÐÏÍÏÝØÀ Subversion (É ÅÓÌÉ ÔÁË, ÔÏ ÓÏÏÂÝÉÔÅ ÎÏÍÅÒ + ÒÅ×ÉÚÉÉ). åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ &os.current;, ÔÏ ÐÅÒ×ÙÊ ×ÏÐÒÏÓ, + ËÏÔÏÒÙÊ ×ÁÍ ÍÏÇÕÔ ÚÁÄÁÔØ, ÂÕÄÅÔ ÐÒÏ ÎÏÍÅÒ ÒÅ×ÉÚÉÉ, ÔÁË ËÁË + ÉÓÐÒÁ×ÌÅÎÉÑ ÄÌÑ ÜÔÏÊ ×ÅÔËÉ (ÏÓÏÂÅÎÎÏ × ÓÌÕÞÁÅ ÓÅÒØ£ÚÎÙÈ + ÐÒÏÂÌÅÍ) ÉÍÅÀÔ ÔÅÎÄÅÎÃÉÀ ÐÏÑ×ÌÑÔØÓÑ ÓÌÉÛËÏÍ ÂÙÓÔÒÏ.</para> </listitem> <listitem> @@ -597,13 +589,13 @@ <option>-c</option> ÉÌÉ <option>-u</option> ×ÍÅÓÔÅ Ó ËÏÍÁÎÄÏÊ &man.diff.1; ÄÌÑ ÓÏÚÄÁÎÉÑ ËÏÎÔÅËÓÔÎÏÇÏ ÉÌÉ ÕÎÉÆÉÃÉÒÏ×ÁÎÎÏÇÏ diff-ÆÁÊÌÁ (ÕÎÉÆÉÃÉÒÏ×ÁÎÎÙÊ ÆÏÒÍÁÔ ÐÒÅÄÐÏÞÔÉÔÅÌÅÎ), - É ÏÂÑÚÁÔÅÌØÎÏ ÕËÁÖÉÔÅ ÔÏÞÎÙÅ ÎÏÍÅÒÁ ×ÅÒÓÉÊ CVS ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ×Ù + É ÏÂÑÚÁÔÅÌØÎÏ ÕËÁÖÉÔÅ ÔÏÞÎÙÅ ÎÏÍÅÒÁ SVN ÒÅ×ÉÚÉÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ×Ù ÉÚÍÅÎÑÌÉ, ÞÔÏÂÙ ÒÁÚÒÁÂÏÔÞÉËÉ, ËÏÔÏÒÙÅ ÂÕÄÕÔ ÞÉÔÁÔØ ×ÁÛÅ ÓÏÏÂÝÅÎÉÅ, ÓÍÏÇÌÉ ÌÅÇËÏ ÅÇÏ ÐÒÉÍÅÎÉÔØ. äÌÑ ÐÒÏÂÌÅÍ, Ó×ÑÚÁÎÎÙÈ Ó ÑÄÒÏÍ ÉÌÉ Ó - ÂÁÚÏ×ÙÍÉ ÕÔÉÌÉÔÁÍÉ ÐÒÅÄÐÏÞÔÉÔÅÌØÎÅÅ ÂÕÄÅÔ ÐÁÔÞ ÏÔÎÏÓÉÔÅÌØÎÏ ×ÅÔËÉ - &os.current; (ÉÌÉ HEAD CVS), Ô.Ë. ×ÅÓØ ÎÏ×ÙÊ ËÏÄ ÄÏÌÖÅÎ ÂÙÔØ ÓÎÁÞÁÌÁ - ÐÒÏÔÅÓÔÉÒÏ×ÁÎ × ÎÅÊ. ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÔÅÓÔÉÒÏ×ÁÎÉÑ ËÏÄ ÂÕÄÅÔ - ÉÎÔÅÇÒÉÒÏ×ÁÎ × ×ÅÔ×Ø &os.stable;.</para> + ÂÁÚÏ×ÙÍÉ ÕÔÉÌÉÔÁÍÉ, ÐÒÅÄÐÏÞÔÉÔÅÌØÎÅÅ ÂÕÄÅÔ ÐÁÔÞ ÏÔÎÏÓÉÔÅÌØÎÏ ×ÅÔËÉ + &os.current; (ÉÌÉ Subversion-×ÅÔËÉ HEAD), ÔÁË ËÁË ×ÅÓØ ÎÏ×ÙÊ ËÏÄ + ÄÏÌÖÅÎ ÂÙÔØ ÓÎÁÞÁÌÁ ÐÒÏÔÅÓÔÉÒÏ×ÁÎ × ÎÅÊ. ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÔÅÓÔÉÒÏ×ÁÎÉÑ + ËÏÄ ÂÕÄÅÔ ÉÎÔÅÇÒÉÒÏ×ÁÎ × ×ÅÔ×Ø &os.stable;.</para> <para>åÓÌÉ ×Ù ×ÓÔÁ×ÌÑÅÔÅ ÐÁÔÞ × ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ, ÕÞÔÉÔÅ, ÞÔÏ ÎÅËÏÔÏÒÙÅ ÐÏÞÔÏ×ÙÅ ÐÒÏÇÒÁÍÍÙ ÉÍÅÀÔ ÔÅÎÄÅÎÃÉÀ ÚÁÍÅÎÑÔØ ÔÁÂÕÌÑÃÉÉ ÓÅÒÉÅÊ ÐÒÏÂÅÌÏ×, @@ -672,9 +664,8 @@ <listitem> <para><emphasis>Confidential:</emphasis> ðÒÅÄ×ÁÒÉÔÅÌØÎÏ ÚÁÐÏÌÎÅÎÏ ËÁË <literal>no</literal>, ÅÇÏ ÉÚÍÅÎÅÎÉÅ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ, ÔÁË ËÁË ÎÅÔ - ÔÁËÏÇÏ ÐÏÎÑÔÉÑ, ËÁË ËÏÎÆÉÄÅÎÃÉÁÌØÎÏÅ ÓÏÏÂÝÅÎÉÅ Ï - ÐÒÏÂÌÅÍÅ—ÂÁÚÁ ÄÁÎÎÙÈ PR ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ ÐÏ ×ÓÅÍÕ ÍÉÒÕ - ÐÏÓÒÅÄÓÔ×ÏÍ <application>CVSup</application>.</para> + ÔÁËÏÇÏ ÐÏÎÑÔÉÑ, ËÁË ËÏÎÆÉÄÅÎÃÉÁÌØÎÏÅ ÓÏÏÂÝÅÎÉÅ Ï ÐÒÏÂÌÅÍÅ — + ÂÁÚÁ ÄÁÎÎÙÈ PR ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ ÐÏ ×ÓÅÍÕ ÍÉÒÕ.</para> </listitem> </itemizedlist> @@ -922,7 +913,7 @@ </itemizedlist> <para>÷ÏÔ ÔÅËÕÝÉÊ ÐÅÒÅÞÅÎØ ËÁÔÅÇÏÒÉÊ (×ÚÑÔ ÉÚ - <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/gnu/usr.bin/send-pr/categories"></ulink>):</para> + <ulink url="http://svnweb.freebsd.org/base/head/gnu/usr.bin/send-pr/categories"></ulink>):</para> <itemizedlist> <listitem> @@ -931,11 +922,6 @@ </listitem> <listitem> - <para><literal>alpha:</literal> ÐÒÏÂÌÅÍÙ, ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ - ÐÌÁÔÆÏÒÍÙ Alpha.</para> - </listitem> - - <listitem> <para><literal>amd64:</literal> ÐÒÏÂÌÅÍÙ, ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ ÐÌÁÔÆÏÒÍÙ AMD64.</para> </listitem> diff --git a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml index 3a97dbbbce..058f84cd2d 100644 --- a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml +++ b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml @@ -3,7 +3,7 @@ The FreeBSD Russian Documentation Project $FreeBSD$ - Original revision: r39870 + Original revision: r40684 --> <chapter id="bsdinstall"> <chapterinfo> @@ -276,7 +276,9 @@ <ulink url="http://en.wikipedia.org/wiki/List_of_disk_partitioning_software">ÕÔÉÌÉÔ</ulink>. <ulink url="http://gparted.sourceforge.net/livecd.php">GParted Live</ulink> ÜÔÏ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÅÍÙÊ ÚÁÇÒÕÚÏÞÎÙÊ ÄÉÓÔÒÉÂÕÔÉ×, - × ËÏÔÏÒÙÊ ×ËÌÀÞÅÎ ÒÅÄÁËÔÏÒ ÒÁÚÄÅÌÏ× GParted. ôÁËÖÅ GParted ×ËÌÀÞÅÎ + × ËÏÔÏÒÙÊ ×ËÌÀÞÅÎ ÒÅÄÁËÔÏÒ ÒÁÚÄÅÌÏ× + <application>GParted</application>. ôÁËÖÅ + <application>GParted</application> ×ËÌÀÞÅÎ × ÍÎÏÇÉÅ ÄÒÕÇÉÅ ÄÉÓÔÒÉÂÕÔÉ×Ù Live CD ÏÔ Linux.</para> <warning> @@ -315,7 +317,7 @@ ÚÁÄÅÊÓÔ×Ï×ÁÔØ ÄÌÑ ÕÓÔÁÎÏ×ËÉ &os;.</para> <para>ðÏÄÏÂÎÏÅ ÐÅÒÅÒÁÓÐÒÅÄÅÌÅÎÉÅ ÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÏÄÎÉÍ ÉÚ Ä×ÕÈ - ÓÐÏÓÏÂÏ×.</para> + ÓÐÏÓÏÂÏ×:</para> <orderedlist> <listitem> @@ -396,8 +398,8 @@ ×ËÒÁÄÙ×ÁÀÔÓÑ × ÐÒÏÃÅÓÓ ÒÁÚÒÁÂÏÔËÉ. ÷ ÏÞÅÎØ ÒÅÄËÉÈ ÓÌÕÞÁÑÈ ÜÔÉ ÏÛÉÂËÉ ×ÌÉÑÀÔ ÎÁ ÐÒÏÃÅÓÓ ÕÓÔÁÎÏ×ËÉ. ëÁË ÔÏÌØËÏ ÜÔÉ ÐÒÏÂÌÅÍÙ ÏÂÎÁÒÕÖÉ×ÁÀÔÓÑ É ÉÓÐÒÁ×ÌÑÀÔÓÑ, ÉÈ ÏÐÉÓÁÎÉÅ ÐÏÐÁÄÁÅÔ × <ulink - url="&url.base;/releases/9.0R/errata.html">ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ - &os;</ulink>, ÎÁÈÏÄÑÝÉÅÓÑ ÎÁ ÓÁÊÔÅ &os;. ðÒÏ×ÅÒØÔÅ ÓÏÏÂÝÅÎÉÑ + url="&url.base;/releases/&rel.current;R/errata.html">ÓÏÏÂÝÅÎÉÑ Ï + ÏÛÉÂËÁÈ &os;</ulink>, ÎÁÈÏÄÑÝÉÅÓÑ ÎÁ ÓÁÊÔÅ &os;. ðÒÏ×ÅÒØÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÅÒÅÄ ÕÓÔÁÎÏ×ËÏÊ É ÕÂÅÄÉÔÅÓØ, ÞÔÏ ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÏÂÌÅÍÙ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÚÁÔÒÏÎÕÔØ ÕÓÔÁÎÏ×ËÕ.</para> @@ -945,7 +947,8 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen> <para>ðÏÓÌÅ ÐÒÏÃÅÄÕÒÙ ÏÐÒÅÄÅÌÅÎÉÑ ÕÓÔÒÏÊÓÔ× ×Ù Õ×ÉÄÉÔÅ <xref linkend="bsdinstall-choose-mode"/>. õÓÔÁÎÏ×ÏÞÎÙÊ ÎÏÓÉÔÅÌØ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÏÄÎÉÍ ÉÚ ÔÒ£È ÓÐÏÓÏÂÏ×: ÄÌÑ ÕÓÔÁÎÏ×ËÉ &os;, ËÁË - "live CD", ÉÌÉ ÐÒÏÓÔÏ ÄÌÑ ÄÏÓÔÕÐÁ Ë ÏÂÏÌÏÞËÅ &os;. éÓÐÏÌØÚÕÊÔÅ + <link linkend="using-live-cd">Live CD</link>, + ÉÌÉ ÐÒÏÓÔÏ ÄÌÑ ÄÏÓÔÕÐÁ Ë ÏÂÏÌÏÞËÅ &os;. éÓÐÏÌØÚÕÊÔÅ ËÌÁ×ÉÛÉ ÎÁ×ÉÇÁÃÉÉ ÄÌÑ ×ÙÂÏÒÁ ÏÐÃÉÉ, Á <keycap>Enter</keycap> — ÄÌÑ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ×ÙÂÏÒÁ.</para> @@ -2685,4 +2688,36 @@ login:</screen> </qandaset> </sect2> </sect1> + + <sect1 id="using-live-cd"> + <title>éÓÐÏÌØÚÏ×ÁÎÉÅ Live CD</title> + + <para>&os; Live CD ÎÁÈÏÄÉÔÓÑ ÎÁ ÔÏÍ ÖÅ CD ÄÉÓËÅ, ÞÔÏ É ÕÓÔÁÎÏ×ÏÞÎÁÑ + ÐÒÏÇÒÁÍÍÁ. üÔÏ ÕÄÏÂÎÏ ÄÌÑ ÔÅÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ËÏÔÏÒÙÅ ×Ó£ ÅÝÅ ÒÁÚÍÙÛÌÑÀÔ + Ï ÐÒÉÇÏÄÎÏÓÔÉ ÄÌÑ ÎÉÈ ïó &os; É ÖÅÌÁÀÔ ÐÒÏ×ÅÒÉÔØ ÎÅËÏÔÏÒÙÅ ÆÕÎËÃÉÏÎÁÌØÎÙÅ + ×ÏÚÍÏÖÎÏÓÔÉ ÄÏ ÎÁÞÁÌÁ ÕÓÔÁÎÏ×ËÉ.</para> + + <note> + <para>ðÒÉ ÒÁÂÏÔÅ Ó Live CD ÓÌÅÄÕÅÔ ÕÞÅÓÔØ ÓÌÅÄÕÀÝÅÅ:</para> + + <itemizedlist> + <listitem> + <para>äÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÓÔÕÐÁ Ë ÓÉÓÔÅÍÅ ÎÅÏÂÈÏÄÉÍÏ ÏÓÕÝÅÓÔ×ÉÔØ + ÁÕÔÅÎÔÉÆÉËÁÃÉÀ. äÏÐÕÓÔÉÍÏÅ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ — + <literal>root</literal>, ÐÁÒÏÌØ — ÐÕÓÔÏÊ.</para> + </listitem> + + <listitem> + <para>ôÁË ËÁË ÓÉÓÔÅÍÁ ÒÁÂÏÔÁÅÔ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ Ó CD, + ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔØ ÂÕÄÅÔ ÚÁÍÅÔÎÏ ÎÉÖÅ ÞÅÍ Õ ÓÉÓÔÅÍÙ, ÕÓÔÁÎÏ×ÌÅÎÎÏÊ + ÎÁ ÖÅÓÔËÉÊ ÄÉÓË.</para> + </listitem> + + <listitem> + <para>Live CD ÐÒÅÄÏÓÔÁ×ÌÑÅÔ × ÒÁÓÐÏÒÑÖÅÎÉÅ ËÏÍÁÎÄÎÕÀ ÓÔÒÏËÕ, + Á ÎÅ ÇÒÁÆÉÞÅÓËÉÊ ÉÎÔÅÒÆÅÊÓ.</para> + </listitem> + </itemizedlist> + </note> + </sect1> </chapter> diff --git a/share/pgpkeys/beech.key b/share/pgpkeys/beech.key index ec59d22dca..d78528e972 100644 --- a/share/pgpkeys/beech.key +++ b/share/pgpkeys/beech.key @@ -1,35 +1,50 @@ <!-- $FreeBSD$ --> <!-- -sh addkey.sh beech ECBFDC44; +sh addkey.sh beech 68DFAE1F; --> <programlisting role="pgpfingerprint"><![CDATA[ -pub 1024D/ECBFDC44 2011-08-29 - Key fingerprint = 6921 47CC 8B61 7C02 70EF 4D00 16B4 EAB7 ECBF DC44 +pub 2048D/68DFAE1F 2013-02-26 + Key fingerprint = D58B 3E9D B0E3 E081 EC6F 69D9 CDA3 51DD 68DF AE1F uid Beech Rintoul <beech@freebsd.org> -sub 1024g/F1FD1C3D 2011-08-29 +sub 2048g/960F45D9 2013-02-26 ]]></programlisting> <programlisting role="pgpkey"><![CDATA[ -----BEGIN PGP PUBLIC KEY BLOCK----- -mQGiBE5b5cQRBADUMThWYK/+cy0IO39D+w5sREzc5rvsCh8Ia0n7EIh7BqL0LrO2 -AGRjImOC2GCDdXNTS84RD+/TwonAOWK6tLn4wDTuYJQqi/0Z3IrPob7jKKwhK4o8 -zVwb4XLLWKTV+nfKbeUfcrp7eeD0mDRX3YJ1b0piT8AFkLjqQGiF4L7VrwCgkO8C -uIffCwAV6oAFo+taWxeNQNcD/3luZVyWCffbWXHAYuXIBCwX3/9ehSqS1u7RL88b -2xD0D9ZAaXC3kiv/ccu1ZSUx+olq2uHTHfFRdeoH26OOS1yMD9x0oyyY/hfpiWHU -MOG4ZMkV0M+vdIGKOyCoQj13bUYgEYxoOT2FR8rjMWtdy7kgyJrVk0k5b3px9Jd2 -qGlMA/9eqgeEQuZsXoX1mT/0ZgDp4PRxnQ6RJ174HPM4zgG3bhEiAhUAz56NSCR5 -mKq5Lj2FqWq8jlb7mVD+hL/taKIBBAGBjaXhotkTY0Lhpp0SzgVtkDGsmgKxlqfh -ZQqLC4cgTLsqAYQOt0IqlK54cLkwwm21VeO6q4Mo0HSiuLVdUrQhQmVlY2ggUmlu -dG91bCA8YmVlY2hAZnJlZWJzZC5vcmc+iGIEExECACIFAk5b5cQCGwMGCwkIBwMC -BhUIAgkKCwQWAgMBAh4BAheAAAoJEBa06rfsv9xEs0oAnRCR2Md2jKcIx8F2WPDM -sQAaSqlzAJ4h+qVgOzfFULS50q+1kvB/PJ3C6bkBDQROW+XEEAQAp1lE3HT9kFTH -XeaNi+IMfaorNcaYkHmGwqHuTiKXTWDmhbUEIqT8jsPcRVF1etw7gK7l5eNilQsE -qHd9IgBx4SfP/j3rl6wH9tYx53013NZTrDcR8C37+9HhFO2xwHMCXEk+4rSkyBZ4 -D62qtZeiYouL6Y2vfhEsYJcy1tgRWocAAwUD/3RQo+7vgIMIGbQVcGcQNFKHLj6/ -WMSVDIuRj5fm22TYnqTVBbOUOEEXXPnops5+K0X9sv6QXFb2mqkPQR2Hed1RNIdo -vp834XCFS6frYNdc1ulPSAevsFwBR9ub9fQS7Ca7m98n16M7xIl2QTktQQl/RuGb -fIIHpH2i7AuB+RcKiEkEGBECAAkFAk5b5cQCGwwACgkQFrTqt+y/3ETvMwCfQk/G -2zlUtzB5mYNsSNNHflFIGSoAniU7mn15Z82cwMAE75DMhQKaBHYD -=Fb+t +mQMuBFEsS9ARCACeJJ0k7CU+53G9GGNcDfJil1iS3QZlgIgCRXnH6zkyWrwCOL0V +JeGa3EzIvYGyQy+nunwmSmfVSpn5bZYu9S0feACLPVOXs5bHIm8TwEhq2xZkTdtb +uZXe8+TSqRYqo9rE0szZ1+8zMTvuv8VWlSV5bfSsZad3BexdVvVSY7VXT3ew9KuZ +PsKikkjNFkEuNYjx1rbNwoAG2hN78oeyZVRF+M4oascxT54Rk3QohS3NgFhI/GFZ +eJsplVUyQhBjfjs7TETCQ3rdNnJSz/7YYXQVmlh+m+XL8z3Vwh8PDPUeqy3rNwTd +KFaCU/yFLXCE+WP55FRxb8fHoYvUrTW5MGunAQD29x/4HoFP2ulTV4VLN2bnRK5R +yS++Ijwt35E8DBdcNwgAhN+AyGnql+bA4BvbJQ6LUejNyAXM/3mmGIgho/58cDrJ +oYbonXk10FTrNMUurSuCS7VaVl9lPux/Rvhy8XhzGtqTe7B6BmM3i4C9VQr98u9U +LxkdA6nCZoe0oNZcaNRQWusCiSkb2w7h9IbUVPfgrQrmd80U+uFhTNg0aCGDfhfV +Ihpp1Y8WQa1zNSElBBAwVO2+g2rXFnzUrFIrwV3dYA498t6lHB75ByF9YXhzkuv3 +TzZgj8mnZiFhXUx7mlaKeEbP1Me+QzvWFRW0nXizwzNwf8Bho+fgLCO/SG83WNml +XiTFUMHP6nzicwwc0S+YuzxM+6/8FkCJqzubPzETAwf/fIdH/cC2blP8jQJxXrPf +3raotWPqk2F8EbdpLBIpz4YJ1nwTDbboPDFdDK6/8rvvLA2VLZ8dSOyHZYy80gni +gzA6uPMbFW7q9xftBRW2kaNaUAkRyaBG2S/CvX+7IYD/OmU7YN7gpEP4mAZ7BWeE +A+RAEvUByrUqhsGeeX6oMT0JMq/8C+mz1o6Coza9QqPznJdTv8tHW9avgnFu3nHT +TeWbn/RHkhDvbV4X0hu9CoHrVdOFqvnPqSBKaVQsTM15ZynKoMELK+Uk4jey/DyJ +HdTwzQgch8yCC6GbMHrowgpf04CJN9Ov3/uKBFXU3/DMuFc0oiXpIfE/DC1WzYMY +rrQhQmVlY2ggUmludG91bCA8YmVlY2hAZnJlZWJzZC5vcmc+iHoEExEIACIFAlEs +S9ACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEM2jUd1o364faYEA/Am4 +DBaFHTlgOdZGzqYqMqIsdGhOHH+d2EpnsC1mDW/NAQCjwSwHZYMf0cv00Y1rbjvk ++Iageuyp6rIOdiQ0Pksc1rkCDQRRLEvQEAgAp8Q394Hz77rS0OB/sc8klQcOfEAi +HsEnYjYBm1VIP5GMhShC9mzzw9Je0kCMdWLHWBXc1VsyMcH15luy+rwJBr2YgVwV +mK5gml/jOSc9dm58YoUXikKO3dJ44kM5JSxfLDfLMDH4TTTmEyGf7RyFlxWO7VVa +qAz6bsmklHbGxXRC4lGTYF8+4vGJYlc7Y/GaV+mC39hfDaXho1w1O1SpcvKBZWsb +k0oHgGzlNl5gn1S00ZOjusXHtkUtGsHj8tPGXurBW7aac5iRwMbLbcOy7aD368oV +kSGUGjHcx1Z9u4O/g3uPUdnsXsI/N7HYLb6dMpumAl/IwEjFXwju/Jxr0wADBgf/ +SNK1Nsg0a97MAci9O1Qp57awCrWB73hNwGw+qC3xSduWmlS4MLZH+DGocv9JOHhW +d180tTf081svVnWYURaubWsI5N6vgywcXkYt+yvqUcLvttQXYeJS2jTL+1vRErkp +oEueYzJhZ+sVk+0gG+R6dtsWSwWWXYQ1LdlVeXhbbVWqs3kvGq5IQP0ZngvC8OsC +tCat6hzTEIlbhSVErdKsrVBYMELZWleJX5RcbX9rPykTJqyH/2bANBAT8uLROHAk +pQ4rnQD3TeCSmP0pDYT4TWAcpxe69aU/a6p591kW0CI7dSZVHrao6q+hmHLWDk4K +ELGLyiM/IaOrKyDBPi8C/IhhBBgRCAAJBQJRLEvQAhsMAAoJEM2jUd1o364fA+cB +ALaWj7vG0OqUqGgLxCdSZw6bCME/vU/TNRmn0IgAYOQTAQDe/sdsNUs/MzFJi0re +0roDMXVUSkNFP4PN4u5jyuzVBQ== +=EWeR -----END PGP PUBLIC KEY BLOCK----- ]]></programlisting> diff --git a/share/pgpkeys/des.key b/share/pgpkeys/des.key index 616967e978..8137329ea9 100644 --- a/share/pgpkeys/des.key +++ b/share/pgpkeys/des.key @@ -39,23 +39,32 @@ uikdYQWU/nb1yJs5oQ3lhYUu7LpX27e7TjleB37amW4UMphqHz9lXyRqHX5hVpDP uLJ7jefs02VCbuO8tIUlLOid7StE3ykleeC2aM65nnpFqIK4xZokk+7Cp+XyOA8d W8xl1PJhkPdH0tvNJf2p0J5YZ+D9UIf5Tvn2Rr6ESXo0cj3CiEYEEBECAAYFAlEg wCgACgkQjCoKrXja4si7EwCeNIbYJqIgQ7rjgX7UICpNCVno1pQAn1NRQib0FL8U -jw/z0DhdBaaf/59JtCZEYWctRXJsaW5nIFNtw7hyZ3JhdiA8ZGVzQGZyZWVic2Qu -b3JnPokCPgQTAQIAKAUCUR4FiwIbAwUJA4aK3wYLCQgHAwIGFQgCCQoLBBYCAwEC -HgECF4AACgkQu5tHG/lOh7JD6w/+KSs9hAA1GQqq1V4viDGtqgnAXTjDezzfFdDa -13VYK4DHPHUrcArNUUJ/M1pdPcAT60BfrVNF6yFNClTZmVd81/K/Cxj4wT5PbPRt -UgNY8dRgPJpy5iCbtnW+4Kr2/mFCzJOX9uNgsIhpFy6vw1Nx2HYhXjYcfNaxm+uU -KZ53iSR0AW462EsJkdQzFrlT/nyhhtFZpcrS4lCv40ms4SH2IQHfSWZqw6LeR7ok -lVCBSiXyKTXP9Dfs5VUcjhYQ1ZljTNPCVmr6/nBXinzva75amHhoxPu0atHpcdqv -SVcSbcp3t4Ce5rElIi/iVeVSrOcsAXAKvqp+17M3iiCCxZCQfk28S/FJqK/GS+RG -MzEJQyELEUK/b5HMmLfzIya6sV4+wOzEhdyqAr+UFI/+ddHHCPZj0LsbVzcoQQJJ -NE3LPfaJ3IpBkFN7mE8iSthZnwvU6FroBoA7BW2J+09a7CH3yZXL+AhF0wU7627c -ZF+yF3J/E6eRd0hXHwg62EGQ4hso9EOignKku8NTzzpilWyQxvrw+Yu+YcDVERsv -TpkG1Br7yX0eIi/mU7L0S+8QD5nruLqzG5wprygWfmjHe61FEVYX4AeYoGnRAAMg -HETVs43e7C1Kor6vAkEdABQvjEylkpztmA+rNxcQzSfkOWHlFk02u9pk01kcQDY2 -lNx05C6IRgQQEQIABgUCUR4F/AAKCRAw1DpuZOviICm/AJ4/6OrGNhVnY//y4BF3 -EkYAcvef4QCfctk6IlzbKo/HmVLEda6feIYzKDmIRgQQEQIABgUCUSDAKAAKCRCM -KgqteNriyGNnAJ9EfvK/Mo80TSNzJJrMAEbcDpacZgCePJiKCrmyI3E2rSChz5pQ -+LjrmUy0JkRhZy1FcmxpbmcgU23DuHJncmF2IDxkZXNAdXNpdC51aW8ubm8+iQI+ +jw/z0DhdBaaf/59JiEYEEBECAAYFAlEiG7QACgkQ20zMSyow1yl9+gCfaBxoRVna +DjU86WOczePMRR4N+3wAn1jBe0v8M+fsu3FFgf3wTeVj1AwKiEYEEBECAAYFAlEj +PyMACgkQMb2z3Qo1ykh5tACfZG5thQCbK9G3Yc5+WoTDdkIGM/YAn3/VJfnL7UGe +19O+DycgxF5+GF4BiEYEExECAAYFAlEnxdwACgkQnEF2jC40NZ/p8gCfb/ux1BxT +cxyKeIQRXpBoxrbh8+sAniSgOgRukbXaNzi264RfPzk0OST+tCZEYWctRXJsaW5n +IFNtw7hyZ3JhdiA8ZGVzQGZyZWVic2Qub3JnPokCPgQTAQIAKAUCUR4FiwIbAwUJ +A4aK3wYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQu5tHG/lOh7JD6w/+KSs9 +hAA1GQqq1V4viDGtqgnAXTjDezzfFdDa13VYK4DHPHUrcArNUUJ/M1pdPcAT60Bf +rVNF6yFNClTZmVd81/K/Cxj4wT5PbPRtUgNY8dRgPJpy5iCbtnW+4Kr2/mFCzJOX +9uNgsIhpFy6vw1Nx2HYhXjYcfNaxm+uUKZ53iSR0AW462EsJkdQzFrlT/nyhhtFZ +pcrS4lCv40ms4SH2IQHfSWZqw6LeR7oklVCBSiXyKTXP9Dfs5VUcjhYQ1ZljTNPC +Vmr6/nBXinzva75amHhoxPu0atHpcdqvSVcSbcp3t4Ce5rElIi/iVeVSrOcsAXAK +vqp+17M3iiCCxZCQfk28S/FJqK/GS+RGMzEJQyELEUK/b5HMmLfzIya6sV4+wOzE +hdyqAr+UFI/+ddHHCPZj0LsbVzcoQQJJNE3LPfaJ3IpBkFN7mE8iSthZnwvU6Fro +BoA7BW2J+09a7CH3yZXL+AhF0wU7627cZF+yF3J/E6eRd0hXHwg62EGQ4hso9EOi +gnKku8NTzzpilWyQxvrw+Yu+YcDVERsvTpkG1Br7yX0eIi/mU7L0S+8QD5nruLqz +G5wprygWfmjHe61FEVYX4AeYoGnRAAMgHETVs43e7C1Kor6vAkEdABQvjEylkpzt +mA+rNxcQzSfkOWHlFk02u9pk01kcQDY2lNx05C6IRgQQEQIABgUCUR4F/AAKCRAw +1DpuZOviICm/AJ4/6OrGNhVnY//y4BF3EkYAcvef4QCfctk6IlzbKo/HmVLEda6f +eIYzKDmIRgQQEQIABgUCUSDAKAAKCRCMKgqteNriyGNnAJ9EfvK/Mo80TSNzJJrM +AEbcDpacZgCePJiKCrmyI3E2rSChz5pQ+LjrmUyIRgQQEQIABgUCUSIbtAAKCRDb +TMxLKjDXKXoxAJ43qP0Lp4F9eA5KR/e5S/cSWZ/leQCeM+RVI8WDr92fRaE9skT/ +soc21p6IRgQQEQIABgUCUSM/IwAKCRAxvbPdCjXKSGJeAKDMVmTkBtg/cOYvTacH +jekRD1TQOACdEyzYHGRSX0Lf8vj9a/+S+ZWKXGeIRgQTEQIABgUCUSfF3AAKCRCc +QXaMLjQ1nwDqAJ0c4siPyNX1g73tOl0B6XiWAgY93wCggWnbGF9XUe8uXh5hhya0 +pDlCwAO0JkRhZy1FcmxpbmcgU23DuHJncmF2IDxkZXNAdXNpdC51aW8ubm8+iQI+ BBMBAgAoBQJRHgXGAhsDBQkDhorfBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK CRC7m0cb+U6HspLJD/9QOrhIw9opMlbU/xcJgyumIO1SIYW/hiXBC7fYk8p8Yw66 ii8Sd3QuUbJ1dZI0q6jkL49shxD7q/DEo1WxnY2nj0j50mo0MVcp1qrPeA3eusAs @@ -70,122 +79,131 @@ j19AhtqDdXucK2tljXxGAi2QAPoEPx9XPn46AFhwfSVgikCrZ78ydVtUp1r9qL9+ VtlL6w1VZXSf40v4M/TpHPM6bRxN69N0pSWNER+JHUs37e+gKnbDA6CBiN9Fn4hG BBARAgAGBQJRHgX8AAoJEDDUOm5k6+Ig/SMAmQHLNhqQ0wIJFgymUa7/CBybe2MH AJwOiNYRWq20Nn22EWCOZKCvNC+NL4hGBBARAgAGBQJRIMAiAAoJEIwqCq142uLI -Zk8AnjGk+fbPvxcXeIXcGVpzgYRrFA9SAKCP/Ds0yJE82zEp8sNQdCb7V1Q3i9HR -/tH8ARAAAQEAAAAAAAAAAAAAAAD/2P/gABBKRklGAAEBAQBIAEgAAP/bAEMADQkK -CwoIDQsKCw4ODQ8TIBUTEhITJxweFyAuKTEwLiktLDM6Sj4zNkY3LC1AV0FGTE5S -U1IyPlphWlBgSlFST//CAAsIASAA8AEBEQD/xAAaAAEAAwEBAQAAAAAAAAAAAAAA -AQIDBAUG/9oACAEBAAAAAfpwAAAAAApx0trprYAAAjz+W9tb2nXWQAAR49a2vteZ -tfawAAeVz0nW99JWtptIABj49K6a3ve0Wm+uoAB5nLivrppomZa7SAA8XGjS+t9J -tKNdbgAR4NIX000vNrGl9QAMPGrSb6a3s2mYtfcADj8utJ010mb6Ui2t95ABx+TF -aynbXemN9NtemQAcvjRSiNsOzv4vO6Ovr3t0AA+bmMsdNduPq9DDm67ab6ayAHzd -qr2vHF098Sva2usgB4fn9Nei0V49+6+bXWZ6ZADwvP6G+seT0aejbn5fR0tfokAP -O8iWm/ncltPUpbk6e7XfaQAx+eytrjw1jbpi2Wnsa91gAOT5p2V5eX0ujXTyNp7+ -nvAAR8rzadjLn7LurlaevuAAfOeZG21rWtrPHbv9eQADwPIwno6Lr7Z46fQ6gAEe -D5nLnfo6OnSMKex6YAAy8Hm8/OL9HWvTX6HUAAeV5+XNy0i28219T25BEgYeHWla -c2VTXp6/W7gISHD83w29DotEY8jp6+70NQESZeH5FaVjs9Totfnxt1dFOzQAed4n -JSERGntd1rUi17eR9BYB895mUIERHf7PSiZp896PsbgfEVggCtvS9bpZ+Jy9Gvoe -loHw8ICCUROt81tdLX9H07nwyAITKBNptpaZ19X0Z+DWTAEhJM3tK09XvfEFxEhM -SC02tKLej//EACcQAAICAQMDBQEBAQEAAAAAAAECAAMRBBASEyEwICIxQEEyFDNQ -/9oACAEBAAEFAv8AyWZVh1GZzsMHKAtOZgIP17NR34zOw9AP1bbja3ZRsIPSIDn6 -Wpsyf4X0j61rcK1hPeDYesQfPn1R7/A2EEH2LfdcfQNh4F8355hB8+W44q3Gw9IH -oHn1P/P82Gw9AnKdRZzEDbfnl1P/ADEO2ZkzFhgDiBpnYzpKYKROOIs/PLqO9Qhh -26oWf6GJL2Ac8yra1uMdnEqdzEtyRsjE+WxuTrGhh5ELWuBXWCcGEd6p8ixczjiL -xhUGAQRPK4xqB8nbjmcJgQntK4PQNhE8uq7WoTygg3fCjOYsXbkMwb1eXWj3jso/ -mLsxCgvzf8SJ8S1chLIjb1+XVLHi/wAwGZxLn5TlOtK7u62DH+lc9ZY/uNNmZmfl -fx5LU51uOMVu0WWMckEzgZ0jEqOTU5boNOliDsR/SfHzAMDy31h0mYhEtX3WVHCR -agXWholbFekuba+pa1CotIimVd289ow7RTCcoDHQNOGDXyUe7BSIoUX/AAv8iVD2 -+fUr74Dic4pnKc4HWdQCC4Qv2PfaheR+hf3LbZiGZEwDOEVJjE/WxKxylacF+g8s -HfZTMxTmDEEcQntNIn0bDhDH7g75imZ7BoXnLJrErGE+hqHyYY4h3zA85TOSqkyl -ct57bVqU68luXLciFYRtiYmIixEzNOuPPbqUrl9zXNASprtDTExOE6UemFSIFJgE -CyteyfHkexaxfqWaMc+mu7ETDDExMRqgZ0otfcLta7VqjB18VupCx7ckn1o7IadQ -r+jExuRyXR29OAhh4LtSzxm8dWpZZXalnqd+CKe9VpQpar+A+UEg16tliX1vuzBZ -fd1CIDA2JXqCIrq31hY6zrWTJO4mdgxEr1UVgw+6rlTXqQYDnfP2syu5kiOHXYfb -0tvGz//EACkQAAEDAwQBBAIDAQAAAAAAAAEAESECMUAQEiAwIjJBUWEDUBNxgZH/ -2gAIAQEABj8C/U+RZeFLq7L1K6kZG38U/aesuczZ+P0/KYdMYf8AHT/qb363wSU5 -zRTnHOfNq/VXx40up43OCeTCn7Q3UwVHAl18w6Y6z21fPCNHKs6gcJC9KtgV5x5z -muV9Y4q6LasNN1N8EjjtHCysrKSoKBGjd5gPw3J6CvIpty9afchKAosLqL4ZHGyv -UD/aYVlNuKni/wA4B5W1gKcQ9n2mzGRqOCeluAwWHt2AYD1I+wUZbCSnJ0hMYPOy -nAeoqIHJqpCcdIrpsLhbqbdbUSVMnocJjB6CD7rabJx0tYdjVeQXieROkL7xYXmN -yir/ALrJTC3DyleJxoqIXrPNwmrT0nOcFNWozoW4ZzexX//EACoQAAICAQMEAgEF -AAMAAAAAAAABESExEEFRMEBhcSCBoZGxwdHhUPDx/9oACAEBAAE/If8AiUsoQwHe -TN0voNucS5+xf0BhH27HAluMpBrhQnqRkas2hNNSuzbhSzFrdyP3SyRaGESSJjb5 -fuISV2T5kJKNlkkViEIw1RMCewTlSuw5R2Flu5k3xCFqtHHiHPYT/fZIsXwC1QtF -k88dg0vihx4FkWhaFojbRZENUcdZuGb2JlvkxjEIQhCeki+Cvv1pB4NtH8BIRJuM -gx8GL46zY8sQY9CQgmuSb08iCRtOxPhiG4ENhY6v75hoYyn4D8ZGU0JTYsEXTHlS -Iqv1BSZGeGbhYXVWHurGWxkYCH53oUWk4yew1FQSmOUNKIoa1ZeDijsiuTUJtn6P -5QyNYsP0Oo6pj0tI4yZGQnAkKi3ZQEZE2IiJJw8ClUS8FUJhBrIuR+hVVQ+jhhFp -TL6r+AmOoeSzFAl2C8BcBFQyzzHoeSmKEW3IMGNldWHnWSjdqR4nRiOWQNJcWYeG -YDGmDpky6Ea02Y09VrmswhnE1DLpo1Cc6KHLkULMScjcwCtF0PJRY3YsCX9dX6um -Xxkwk3pUTJzKFAaJbhHJC8m4JIjfk5mQwq/khQ8oQm/WIpzsPo8kkDJkeNMjgbDw -ia2IkmLv7FNCIZUVvM7jDYm9CoF1m1VVMaadFWTkLmm461zglMMT3TIwbEjy8HBK -G3YgkZ1aks1vPIwtoEalkDEhna+u1Kg9uDX4RFAtS3KRfchXEw3DII0tnAnRhxCG -OIOYjOxhaQ2zI6vhwND/AAyDl7BI/wAjy5JUiaKKbMiMWMmMmVA4EjQsuduC8Iz2 -FnsVlTuNA2JjlEwRGrErcSLC3N+xA21Y10lbMUtft9g6Q0tkTDzKHnJYfZInQMi5 -LSWKGQQY1YggKcLsZ94gcUF0VCKVYkLEoP7Joj7H/kJWnsrYpJe+x4aDehGRCNEy -IFBKT/yjjwQ17fjsJN+lyIxw3hEbNKHqRzAxZIMhBVKcf6OoQ2+vOfR4RtRYS2H5 -Jw0aihTPQg0MykVjRQJhErcRLy9kMyFjq/qIXInj01uN9NGiNHf7BDSFNaUXUtGO -LpshC0Iuyb7kJ7Jbp/r8bIc5t5Bjyx/BrSVsfyQPp+dEQPQSEKw5IGztE4ZXRoXp -JKl9GI9aRf8AIoUbvG+kEEaKY7IgluWRXAopxw6DN+tL6LR/2SQM55RGKBzuYvT4 -oyCBVKkh2EXA16TGyVlH5FMofZxwez8n7xw35/XHmNv2SIYQkeyNMcqZ8ojwa+Ep -9eCPJD5IFomJiZJJVkbYPlCElpWkcC2PtU9J0nQ5tXDFPd/GjUjQ46MdNfGRMuvD -9n//2gAIAQEAAAAQAAAAAAAgAAAFlAAAJ2YAAFDcAAGl8AAByqAAMusAAYGwAA/O -sAArC/AAVfGAALJdAAs74gAIPTgAPrYgApm7gALFfgAAtbAAdDiAAeiIAAJQ+AAK -AgAAZmwAAKcgAABCIEBJGQGBgtgCC+lIAWz1oABz/wCAGerI4FDae4CRqfZHfEPN -4V6KxP/EACoQAQACAgEDAwQCAwEBAAAAAAEAESExQVFhcRAwgSBAkaGx4dHw8cFQ -/9oACAEBAAE/EP8A5PmNDuGvwRPxHL7QKqJbv+YFj4kM7Tq//J1G6OH7ZQFWg5Y6 -zmlMHjrEZ9bFuphog6EZdwFZgxZllLPmY5P7v7l6LPswRAAtXiMUdJf7xCnX/JC7 -My+swZkixMM8Q9Ag3dw6jWzhHZ9kVqF5HL0mPaFqOGYdPzBoubQU3FUOoPxF8wsu -OO15OpAJLHX2FfuBXk6l6lM28y4Vgx5IOO0Fc/mF8zhFxYfiAuWCXxK2pcccjzz9 -gpTQD5tEpQbSbRfmCdU2yxwDzcqtagKxBmJ0jSbaDtXBEE0++9nQw/H93N1PrWrZ -mYBcyqjHWLFkfOu0HLFu4dkdxYTWZvXr4949SFsH1ab8x3b3jalVizfBL3kxPOFA -pndg4vUMv3FKlVmKyKjoK97LlOBjriY0bKxHT2jm/WGiLG9SxKhxABfxC6YxeJlJ -VJ8Rj1Fw6w+9UKFCNzChomJ59HTCgG6xGcIVoS84jwU1+5umZ0gIzNGOY6gZsVh7 -e7rb0Zyr+pvcRTfEAaLvrKksYFgG75j4shKqGXCCsnMVQBso5nEj1GE29d5tF5F/ -mOMjXWXq4zP1vdABumpuriMZN5esxRFW6QF7zE63NgjUxdAuhcNIBoWdnUMG9O7l -FnUcKUTBhXg/zLsSkdi3LkySUk89yQs0eFDz/mKUnA6pgA44Ne6NEGBUtVi3zEOk -ZFVxBmMJjEAKDfWWGrDdwRUChFHxG/aWk2G93OslRAoNM2RGlRe4m0hMuFwU4MiF -JEFWocrMj4lb0MEPcZkyGutsNZ4ENk1DzCmvLvAHJO93Aph+JfVriJ+XmAGAx6zC -17gbqKiAFuUeP0mBFV3BLT5D3b7pIvxEOU2OzFb6oKq49CUBYWa4J8UBLFih0TEH -OJdGYMixz8xC8u6m61L/ADDHdGWle/utxXCDmJLZlvcSpl03NSyHoOMRqwVOvk0T -E6v+JiQQwuomAkzFwcS5JhiobUbhws2+GU3Cg91bVj/glTZsMVXRBvMxAosObl6i -h4hoRqtSkW8GUwvYYACAvLLEIcsfqXZ2YqJVGwQdsmBOkZ73Cl2MS7d6B7qbFz5E -IqQNI8MzrjBmXYpl7dWb2MVd5griYYJa7ManduCqZ28EBo0etIJay+WGwSGsTamf -nLBe61Lokt/lcFcXvNNM14hg0HLDPdXRHXVBoWMWLAw/4mgIlikiIorQclx4lVBR -0Zc7mwco5J6U2/qFcQoLhto8SoKm73KUNuCFausveLgKF+z75OtJUWpAFrzAqNGS -WleTQbm8mKQMK8xLVjR1lqUAqro4lpKnIz5S4cY5kF15lTSCbS9kvagMBoioWcsv -HaBLH9CAJnP6DP8A5DFFBZ44+wUFRvntCifAl2mM2JVagDa57zFFNwOnzJcDVA7V -NflvzDTPjdRnUDghLljSktAzW3piEYLy+D/yBRRo+woKlN8y63lNE21vxDNK15nT -ZvFssFu7zXEdwNByyhpJl3bGSUAVw4ggynG8/uJaou7gBtEHUZTyu+o/YKx6FwL/ -AC3LAcPxHXUR7bSnJPMuJTQiBYOtRetoaC6uUYUus1xKce89JQkJdWl2dZpnDllf -sga+xJ5paPLLrqZULTiIOBM5iGr+ZkjVn8R3LDjEUByn7lyJm7bh0q00YQO6eWrg -KGRyczW4n7fYnaXi8sBPMwdYdyzt8S0sGu0UKalfEYKdRrdNLzq4NZozeeCCBW8q -kIngWfEXPBwnRAoA49/Gfera6ECMZAsT5gKqnIywt6iKZloiWRGhh4gtG+lwF5Pz -MbgfzM8JNjfHeEZbcQk5AYqBQl9T2T6rIBcL8jKoAw0B2lhrbqQ89dOGUVXd0+Is -e0pRDvfZFMOdXxD7B1GZARI/yEfnJxjf9TRZzUXLmwj+obBr3cUV6MvgREy+LM+T -FML2QbmaNdfiVizjjpK+3r/6XDi10gHjMIdQXQi1FvUIGBQLG4XgIaACfkNmefJB -nlsenb2lAtaCXlOv/ZmMXbayRVbPRUckSW+espHOHr1lwa5NnlCqXVOPBjXSpriI -SF0hVuVQwyrSjyQAjbSciNXDoU5PZuV87fmIUUc95rBGF+hH0o05GL0L6INZGz+J -rWat/AywEjbwPiGSNzExYQFEZei7y8Edbom3yssdi2tMJAdR7CtX2RutxR0ZfUlX -H6R6wXOnqRKbfwhogaSkhwQ8Gv8AFg5Zeb+SUcmRlIrOjlgJVeHV6ssw0czCXL4U -ggb1+H+Z3HU5Pj6nxPMuLf0p6mSmVHxMyafJBsxQhleCdQmlnS8Ytt5VyyZx45mN -Tv8AoFcjB41yOZSUPzf3PBwuPoCYY4m/QJXrzOZx6GYnohcmesvwp/oILqwVBmSa -MzLOq4UzDiH2ZWifFfJA5E0jfo0bSPoHcm/pCJKhD0ZX0DUGDO5B5hSXxxBEKO4f -b751MbzGxyuSDAGYlj/sepr6T036Kr6NenHoMH0DBuViDZXJ6tAfnduD/wCT/9mJ -Aj4EEwECACgFAlEeBXECGwMFCQOGit8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheA -AAoJELubRxv5ToeyePAP/ifxgj8cS619uTgEhXSTvjzwQGaND9RuxcGVqrv9FYDt -byBM8WTVrpZzBOrzZRlb8cVIYiiCcEtH7W1aDssBbyB3ML5dCgIcS6wh6OXaM9nV -+rrCWfcmrWddNuqwqNtqUV6gv208RrORiyjGXCT/UTEZaUZ4xZW6j/WTT2k0xfWh -84Bq+le4oXBvDYEMW3CgawC0SfKwLzd5WF4UUG5R5H/wARben5jtw2aUX5kAa5A+ -peOZXWKiBc1QSJbPnoeAgJZ5IUrldDxgPPs8jeKnkI3A9sWHjg/tQWlcWGL9mcD4 -5sztQo9vqtQwEG6Pe/2oJXdCYF2VMZHkYvcrfr7ivXO/0ZkEKMjbrBMEuuUyWegg -CidgeGooV8AiqMsA4mBFdbMUnC1Te0TIzi6Hy0EznLzv6XiOmV9jkYB9I5V3abGd -Vt13h5IU2u1/u81IgcGcn7N9GpEVH3uJMRxJUX1+sX3pAgEt4q3tiG15ot5Jr+m9 -8hoMoOUZXI9wb5tCoUpLEQ/UykIiwmiDuGoCQEOMTSXZx/Ajow3MuaEQ9A/bweJo -25v8v5FXmI1RQTLtD9H/c0qNyNFibsHrgXJxi2jOslhHva5NM10jdT19Xsti52d1 -F7kpp4PHHYXenulrhW8QecicgSALwa43eUfArHPMoqc5fCBce2D+Giy8IRin4T/C -iEYEEBECAAYFAlEeBfMACgkQMNQ6bmTr4iBzjQCfZtVcoO+5OXHtKZLp+4fLJ2r1 -dQIAn0JgvPdEroWRVpc4U8or8NZuIS6WiEYEEBECAAYFAlEgwCgACgkQjCoKrXja -4siM1ACfZ+WVANsfv/rHLHChzwJp+MdZl5oAn3pIogQvStk4une97IC5ASMGNjsB +Zk8AnjGk+fbPvxcXeIXcGVpzgYRrFA9SAKCP/Ds0yJE82zEp8sNQdCb7V1Q3i4hG +BBARAgAGBQJRIhu0AAoJENtMzEsqMNcp9z0AoL0WdPFK/WkcfMyPFTeRn0EzUBSM +AJ0QmJTVv8/resNcpr/6wxfk0XQEpohGBBARAgAGBQJRIz8jAAoJEDG9s90KNcpI +XroAnjZcF/pkawalXzZl11Bc08OgUG+LAKC0RjxrhZ1O/z0dlt6URb7/xljfFohG +BBMRAgAGBQJRJ8XcAAoJEJxBdowuNDWfg74AniggyvpQWt3D78yGKz32qmy8YaXL +AJ98H+qfuKs7AyLMliIdTa5RLLN9nNHR/tH8ARAAAQEAAAAAAAAAAAAAAAD/2P/g +ABBKRklGAAEBAQBIAEgAAP/bAEMADQkKCwoIDQsKCw4ODQ8TIBUTEhITJxweFyAu +KTEwLiktLDM6Sj4zNkY3LC1AV0FGTE5SU1IyPlphWlBgSlFST//CAAsIASAA8AEB +EQD/xAAaAAEAAwEBAQAAAAAAAAAAAAAAAQIDBAUG/9oACAEBAAAAAfpwAAAAAApx +0trprYAAAjz+W9tb2nXWQAAR49a2vteZtfawAAeVz0nW99JWtptIABj49K6a3ve0 +Wm+uoAB5nLivrppomZa7SAA8XGjS+t9JtKNdbgAR4NIX000vNrGl9QAMPGrSb6a3 +s2mYtfcADj8utJ010mb6Ui2t95ABx+TFaynbXemN9NtemQAcvjRSiNsOzv4vO6Ov +r3t0AA+bmMsdNduPq9DDm67ab6ayAHzdqr2vHF098Sva2usgB4fn9Nei0V49+6+b +XWZ6ZADwvP6G+seT0aejbn5fR0tfokAPO8iWm/ncltPUpbk6e7XfaQAx+eytrjw1 +jbpi2Wnsa91gAOT5p2V5eX0ujXTyNp7+nvAAR8rzadjLn7LurlaevuAAfOeZG21r +WtrPHbv9eQADwPIwno6Lr7Z46fQ6gAEeD5nLnfo6OnSMKex6YAAy8Hm8/OL9HWvT +X6HUAAeV5+XNy0i28219T25BEgYeHWlac2VTXp6/W7gISHD83w29DotEY8jp6+70 +NQESZeH5FaVjs9Totfnxt1dFOzQAed4nJSERGntd1rUi17eR9BYB895mUIERHf7P +SiZp896PsbgfEVggCtvS9bpZ+Jy9GvoeloHw8ICCUROt81tdLX9H07nwyAITKBNp +tpaZ19X0Z+DWTAEhJM3tK09XvfEFxEhMSC02tKLej//EACcQAAICAQMDBQEBAQEA +AAAAAAECAAMRBBASEyEwICIxQEEyFDNQ/9oACAEBAAEFAv8AyWZVh1GZzsMHKAtO +ZgIP17NR34zOw9AP1bbja3ZRsIPSIDn6Wpsyf4X0j61rcK1hPeDYesQfPn1R7/A2 +EEH2LfdcfQNh4F8355hB8+W44q3Gw9IHoHn1P/P82Gw9AnKdRZzEDbfnl1P/ADEO +2ZkzFhgDiBpnYzpKYKROOIs/PLqO9Qhh26oWf6GJL2Ac8yra1uMdnEqdzEtyRsjE ++WxuTrGhh5ELWuBXWCcGEd6p8ixczjiLxhUGAQRPK4xqB8nbjmcJgQntK4PQNhE8 +uq7WoTygg3fCjOYsXbkMwb1eXWj3jso/mLsxCgvzf8SJ8S1chLIjb1+XVLHi/wAw +GZxLn5TlOtK7u62DH+lc9ZY/uNNmZmflfx5LU51uOMVu0WWMckEzgZ0jEqOTU5bo +NOliDsR/SfHzAMDy31h0mYhEtX3WVHCRagXWholbFekuba+pa1CotIimVd289ow7 +RTCcoDHQNOGDXyUe7BSIoUX/AAv8iVD2+fUr74Dic4pnKc4HWdQCC4Qv2PfaheR+ +hf3LbZiGZEwDOEVJjE/WxKxylacF+g8sHfZTMxTmDEEcQntNIn0bDhDH7g75imZ7 +BoXnLJrErGE+hqHyYY4h3zA85TOSqkylct57bVqU68luXLciFYRtiYmIixEzNOuP +PbqUrl9zXNASprtDTExOE6UemFSIFJgECyteyfHkexaxfqWaMc+mu7ETDDExMRqg +Z0otfcLta7VqjB18VupCx7ckn1o7IadQr+jExuRyXR29OAhh4LtSzxm8dWpZZXal +nqd+CKe9VpQpar+A+UEg16tliX1vuzBZfd1CIDA2JXqCIrq31hY6zrWTJO4mdgxE +r1UVgw+6rlTXqQYDnfP2syu5kiOHXYfb0tvGz//EACkQAAEDAwQBBAIDAQAAAAAA +AAEAESECMUAQEiAwIjJBUWEDUBNxgZH/2gAIAQEABj8C/U+RZeFLq7L1K6kZG38U +/aesuczZ+P0/KYdMYf8AHT/qb363wSU5zRTnHOfNq/VXx40up43OCeTCn7Q3UwVH +Al18w6Y6z21fPCNHKs6gcJC9KtgV5x5zmuV9Y4q6LasNN1N8EjjtHCysrKSoKBGj +d5gPw3J6CvIpty9afchKAosLqL4ZHGyvUD/aYVlNuKni/wA4B5W1gKcQ9n2mzGRq +OCeluAwWHt2AYD1I+wUZbCSnJ0hMYPOynAeoqIHJqpCcdIrpsLhbqbdbUSVMnocJ +jB6CD7rabJx0tYdjVeQXieROkL7xYXmNyir/ALrJTC3DyleJxoqIXrPNwmrT0nOc +FNWozoW4ZzexX//EACoQAAICAQMEAgEFAAMAAAAAAAABESExEEFRMEBhcSCBoZGx +wdHhUPDx/9oACAEBAAE/If8AiUsoQwHeTN0voNucS5+xf0BhH27HAluMpBrhQnqR +kas2hNNSuzbhSzFrdyP3SyRaGESSJjb5fuISV2T5kJKNlkkViEIw1RMCewTlSuw5 +R2Flu5k3xCFqtHHiHPYT/fZIsXwC1QtFk88dg0vihx4FkWhaFojbRZENUcdZuGb2 +JlvkxjEIQhCeki+Cvv1pB4NtH8BIRJuMgx8GL46zY8sQY9CQgmuSb08iCRtOxPhi +G4ENhY6v75hoYyn4D8ZGU0JTYsEXTHlSIqv1BSZGeGbhYXVWHurGWxkYCH53oUWk +4yew1FQSmOUNKIoa1ZeDijsiuTUJtn6P5QyNYsP0Oo6pj0tI4yZGQnAkKi3ZQEZE +2IiJJw8ClUS8FUJhBrIuR+hVVQ+jhhFpTL6r+AmOoeSzFAl2C8BcBFQyzzHoeSmK +EW3IMGNldWHnWSjdqR4nRiOWQNJcWYeGYDGmDpky6Ea02Y09VrmswhnE1DLpo1Cc +6KHLkULMScjcwCtF0PJRY3YsCX9dX6umXxkwk3pUTJzKFAaJbhHJC8m4JIjfk5mQ +wq/khQ8oQm/WIpzsPo8kkDJkeNMjgbDwia2IkmLv7FNCIZUVvM7jDYm9CoF1m1VV +MaadFWTkLmm461zglMMT3TIwbEjy8HBKG3YgkZ1aks1vPIwtoEalkDEhna+u1Kg9 +uDX4RFAtS3KRfchXEw3DII0tnAnRhxCGOIOYjOxhaQ2zI6vhwND/AAyDl7BI/wAj +y5JUiaKKbMiMWMmMmVA4EjQsuduC8Iz2FnsVlTuNA2JjlEwRGrErcSLC3N+xA21Y +10lbMUtft9g6Q0tkTDzKHnJYfZInQMi5LSWKGQQY1YggKcLsZ94gcUF0VCKVYkLE +oP7Joj7H/kJWnsrYpJe+x4aDehGRCNEyIFBKT/yjjwQ17fjsJN+lyIxw3hEbNKHq +RzAxZIMhBVKcf6OoQ2+vOfR4RtRYS2H5Jw0aihTPQg0MykVjRQJhErcRLy9kMyFj +q/qIXInj01uN9NGiNHf7BDSFNaUXUtGOLpshC0Iuyb7kJ7Jbp/r8bIc5t5Bjyx/B +rSVsfyQPp+dEQPQSEKw5IGztE4ZXRoXpJKl9GI9aRf8AIoUbvG+kEEaKY7IgluWR +XAopxw6DN+tL6LR/2SQM55RGKBzuYvT4oyCBVKkh2EXA16TGyVlH5FMofZxwez8n +7xw35/XHmNv2SIYQkeyNMcqZ8ojwa+Ep9eCPJD5IFomJiZJJVkbYPlCElpWkcC2P +tU9J0nQ5tXDFPd/GjUjQ46MdNfGRMuvD9n//2gAIAQEAAAAQAAAAAAAgAAAFlAAA +J2YAAFDcAAGl8AAByqAAMusAAYGwAA/OsAArC/AAVfGAALJdAAs74gAIPTgAPrYg +Apm7gALFfgAAtbAAdDiAAeiIAAJQ+AAKAgAAZmwAAKcgAABCIEBJGQGBgtgCC+lI +AWz1oABz/wCAGerI4FDae4CRqfZHfEPN4V6KxP/EACoQAQACAgEDAwQCAwEBAAAA +AAEAESExQVFhcRAwgSBAkaGx4dHw8cFQ/9oACAEBAAE/EP8A5PmNDuGvwRPxHL7Q +KqJbv+YFj4kM7Tq//J1G6OH7ZQFWg5Y6zmlMHjrEZ9bFuphog6EZdwFZgxZllLPm +Y5P7v7l6LPswRAAtXiMUdJf7xCnX/JC7My+swZkixMM8Q9Ag3dw6jWzhHZ9kVqF5 +HL0mPaFqOGYdPzBoubQU3FUOoPxF8wsuOO15OpAJLHX2FfuBXk6l6lM28y4Vgx5I +OO0Fc/mF8zhFxYfiAuWCXxK2pcccjzz9gpTQD5tEpQbSbRfmCdU2yxwDzcqtagKx +BmJ0jSbaDtXBEE0++9nQw/H93N1PrWrZmYBcyqjHWLFkfOu0HLFu4dkdxYTWZvXr +4949SFsH1ab8x3b3jalVizfBL3kxPOFApndg4vUMv3FKlVmKyKjoK97LlOBjriY0 +bKxHT2jm/WGiLG9SxKhxABfxC6YxeJlJVJ8Rj1Fw6w+9UKFCNzChomJ59HTCgG6x +GcIVoS84jwU1+5umZ0gIzNGOY6gZsVh7e7rb0Zyr+pvcRTfEAaLvrKksYFgG75j4 +shKqGXCCsnMVQBso5nEj1GE29d5tF5F/mOMjXWXq4zP1vdABumpuriMZN5esxRFW +6QF7zE63NgjUxdAuhcNIBoWdnUMG9O7lFnUcKUTBhXg/zLsSkdi3LkySUk89yQs0 +eFDz/mKUnA6pgA44Ne6NEGBUtVi3zEOkZFVxBmMJjEAKDfWWGrDdwRUChFHxG/aW +k2G93OslRAoNM2RGlRe4m0hMuFwU4MiFJEFWocrMj4lb0MEPcZkyGutsNZ4ENk1D +zCmvLvAHJO93Aph+JfVriJ+XmAGAx6zC17gbqKiAFuUeP0mBFV3BLT5D3b7pIvxE +OU2OzFb6oKq49CUBYWa4J8UBLFih0TEHOJdGYMixz8xC8u6m61L/ADDHdGWle/ut +xXCDmJLZlvcSpl03NSyHoOMRqwVOvk0TE6v+JiQQwuomAkzFwcS5JhiobUbhws2+ +GU3Cg91bVj/glTZsMVXRBvMxAosObl6ih4hoRqtSkW8GUwvYYACAvLLEIcsfqXZ2 +YqJVGwQdsmBOkZ73Cl2MS7d6B7qbFz5EIqQNI8MzrjBmXYpl7dWb2MVd5griYYJa +7ManduCqZ28EBo0etIJay+WGwSGsTamfnLBe61Lokt/lcFcXvNNM14hg0HLDPdXR +HXVBoWMWLAw/4mgIlikiIorQclx4lVBR0Zc7mwco5J6U2/qFcQoLhto8SoKm73KU +NuCFausveLgKF+z75OtJUWpAFrzAqNGSWleTQbm8mKQMK8xLVjR1lqUAqro4lpKn +Iz5S4cY5kF15lTSCbS9kvagMBoioWcsvHaBLH9CAJnP6DP8A5DFFBZ44+wUFRvnt +CifAl2mM2JVagDa57zFFNwOnzJcDVA7VNflvzDTPjdRnUDghLljSktAzW3piEYLy ++D/yBRRo+woKlN8y63lNE21vxDNK15nTZvFssFu7zXEdwNByyhpJl3bGSUAVw4gg +ynG8/uJaou7gBtEHUZTyu+o/YKx6FwL/AC3LAcPxHXUR7bSnJPMuJTQiBYOtReto +aC6uUYUus1xKce89JQkJdWl2dZpnDllfsga+xJ5paPLLrqZULTiIOBM5iGr+ZkjV +n8R3LDjEUByn7lyJm7bh0q00YQO6eWrgKGRyczW4n7fYnaXi8sBPMwdYdyzt8S0s +Gu0UKalfEYKdRrdNLzq4NZozeeCCBW8qkIngWfEXPBwnRAoA49/Gfera6ECMZAsT +5gKqnIywt6iKZloiWRGhh4gtG+lwF5PzMbgfzM8JNjfHeEZbcQk5AYqBQl9T2T6r +IBcL8jKoAw0B2lhrbqQ89dOGUVXd0+Ise0pRDvfZFMOdXxD7B1GZARI/yEfnJxjf +9TRZzUXLmwj+obBr3cUV6MvgREy+LM+TFML2QbmaNdfiVizjjpK+3r/6XDi10gHj +MIdQXQi1FvUIGBQLG4XgIaACfkNmefJBnlsenb2lAtaCXlOv/ZmMXbayRVbPRUck +SW+espHOHr1lwa5NnlCqXVOPBjXSpriISF0hVuVQwyrSjyQAjbSciNXDoU5PZuV8 +7fmIUUc95rBGF+hH0o05GL0L6INZGz+JrWat/AywEjbwPiGSNzExYQFEZei7y8Ed +bom3yssdi2tMJAdR7CtX2RutxR0ZfUlXH6R6wXOnqRKbfwhogaSkhwQ8Gv8AFg5Z +eb+SUcmRlIrOjlgJVeHV6ssw0czCXL4Uggb1+H+Z3HU5Pj6nxPMuLf0p6mSmVHxM +yafJBsxQhleCdQmlnS8Ytt5VyyZx45mNTv8AoFcjB41yOZSUPzf3PBwuPoCYY4m/ +QJXrzOZx6GYnohcmesvwp/oILqwVBmSaMzLOq4UzDiH2ZWifFfJA5E0jfo0bSPoH +cm/pCJKhD0ZX0DUGDO5B5hSXxxBEKO4fb751MbzGxyuSDAGYlj/sepr6T036Kr6N +enHoMH0DBuViDZXJ6tAfnduD/wCT/9mJAj4EEwECACgFAlEeBXECGwMFCQOGit8G +CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJELubRxv5ToeyePAP/ifxgj8cS619 +uTgEhXSTvjzwQGaND9RuxcGVqrv9FYDtbyBM8WTVrpZzBOrzZRlb8cVIYiiCcEtH +7W1aDssBbyB3ML5dCgIcS6wh6OXaM9nV+rrCWfcmrWddNuqwqNtqUV6gv208RrOR +iyjGXCT/UTEZaUZ4xZW6j/WTT2k0xfWh84Bq+le4oXBvDYEMW3CgawC0SfKwLzd5 +WF4UUG5R5H/wARben5jtw2aUX5kAa5A+peOZXWKiBc1QSJbPnoeAgJZ5IUrldDxg +PPs8jeKnkI3A9sWHjg/tQWlcWGL9mcD45sztQo9vqtQwEG6Pe/2oJXdCYF2VMZHk +Yvcrfr7ivXO/0ZkEKMjbrBMEuuUyWeggCidgeGooV8AiqMsA4mBFdbMUnC1Te0TI +zi6Hy0EznLzv6XiOmV9jkYB9I5V3abGdVt13h5IU2u1/u81IgcGcn7N9GpEVH3uJ +MRxJUX1+sX3pAgEt4q3tiG15ot5Jr+m98hoMoOUZXI9wb5tCoUpLEQ/UykIiwmiD +uGoCQEOMTSXZx/Ajow3MuaEQ9A/bweJo25v8v5FXmI1RQTLtD9H/c0qNyNFibsHr +gXJxi2jOslhHva5NM10jdT19Xsti52d1F7kpp4PHHYXenulrhW8QecicgSALwa43 +eUfArHPMoqc5fCBce2D+Giy8IRin4T/CiEYEEBECAAYFAlEeBfMACgkQMNQ6bmTr +4iBzjQCfZtVcoO+5OXHtKZLp+4fLJ2r1dQIAn0JgvPdEroWRVpc4U8or8NZuIS6W +iEYEEBECAAYFAlEgwCgACgkQjCoKrXja4siM1ACfZ+WVANsfv/rHLHChzwJp+MdZ +l5oAn3pIogQvStk4une97IC5ASMGNjsBiEYEEBECAAYFAlEiG7QACgkQ20zMSyow +1yl7LACeO0g1lrJoLf9DBNrnG7oV4GgpPb0AoNpq7h/iWhYZWD4YczKRJlHKwUbN +iEYEEBECAAYFAlEjPyMACgkQMb2z3Qo1ykiXaACgiEPRev3hILDHrg8rw7R3AE5I +GcQAn1sTiBpllnghiqvye5uSIHH/6U1viEYEExECAAYFAlEnxdwACgkQnEF2jC40 +NZ8WnwCeJJqzQ1eLfdxZne4icCjcM+tG1wsAn06wGYhBfQaldmQKt0TBMSTZMenl uQINBFEeA+sBEAC+qZvq9DYNrjZowfhbAobXCDXZO4ObLLvWEP7oL5AGpBcMSQVZ QcmhhQ0T+E32ZfGVAgW747DDPodEuGqc3n5Uc4q/jrBw/9+mJwAaZUQOkKqnEQT+ o7vFuj85BOpN7/rBr9P+atZpmvJGe7TsrXvJZytEqNJ8/1iv3M7EhqxWnT3uFYiW @@ -209,6 +227,6 @@ cQ8t/7n2yovsdqyTTv2D/ZJMFJsqaM+foW08jyoK5+im6hhPfPOs7PYl3xEaVWy3 DeuRkZCyJDyt7WGuE6UfnKH1t24tBDvQEeC/FRT/KboKid7BpSGmGEwH7wyGOWcA N5eF3/hjJXvULM8CpzZz5f0gyRWDI81P+G7KkNYrh69rHScP8AO3WP6jG8r3xIFC maNTtSyMU9A54ib2sgN0GwxijcvwPyqT -=IVjy +=ToCZ -----END PGP PUBLIC KEY BLOCK----- ]]></programlisting> diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml index 9a6db0e536..87da907016 100644 --- a/share/pgpkeys/pgpkeys-developers.xml +++ b/share/pgpkeys/pgpkeys-developers.xml @@ -1516,6 +1516,11 @@ &pgpkey.matthew; </sect2> + <sect2 id="pgpkey-tmseck"> + <title>&a.tmseck;</title> + &pgpkey.tmseck; + </sect2> + <sect2 id="pgpkey-stas"> <title>&a.stas;</title> &pgpkey.stas; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index 2a9607de6b..07c08d9e09 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -375,6 +375,7 @@ <!ENTITY pgpkey.tj SYSTEM "tj.key"> <!ENTITY pgpkey.tmclaugh SYSTEM "tmclaugh.key"> <!ENTITY pgpkey.tmm SYSTEM "tmm.key"> +<!ENTITY pgpkey.tmseck SYSTEM "tmseck.key"> <!ENTITY pgpkey.tobez SYSTEM "tobez.key"> <!ENTITY pgpkey.tota SYSTEM "tota.key"> <!ENTITY pgpkey.trasz SYSTEM "trasz.key"> diff --git a/share/pgpkeys/tmseck.key b/share/pgpkeys/tmseck.key new file mode 100644 index 0000000000..4584d5fdf6 --- /dev/null +++ b/share/pgpkeys/tmseck.key @@ -0,0 +1,49 @@ +<!-- $FreeBSD$ --> +<!-- +sh addkey.sh tmseck DF46EE05; +--> +<programlisting role="pgpfingerprint"><![CDATA[ +pub 1024D/DF46EE05 2000-11-22 + Key fingerprint = A38F AE66 6B11 6EB9 5D1A B67D 2444 2FE1 DF46 EE05 +uid Thomas-Martin Seck (Privat 2) <tmseck@netcologne.de> +uid Thomas-Martin Seck (Privat) <tmseck@web.de> +uid Thomas-Martin Seck (FreeBSD) <tmseck@FreeBSD.org> +sub 2048g/3DC33B0F 2000-11-22 +]]></programlisting> +<programlisting role="pgpkey"><![CDATA[ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGhBDocG/ERBAC6QZ2lUZYVTAqov7yLfcDY6CFKncdQH1k0aV65fME1va1nelTy +qIE9+1unTXyFCTY8ZWhlrgblwH7oSHkVgk+WOOcBVEYvjY9n3Y5reNqKV3Qj3gYH +GzSheBeRvgDgKKF0kaG01sQby7zneJMDepy4JkuMiXqc+S9nM75Gf7naawCg+viP +cLaa0z0UzbO341zHTgerHacD901GiZS6SgHrjmGKorhmul/CPyIN5OIdbt9YJANh +/R+w8c1XCgbmuHS0gCHiyYG1Sy1rRhbptlqWxEhJjZSud3Ne2Hxh16IUFhTrFqr3 +xgkH6FiGw+a0tD6Jk44UBsbdgNcU7Qr424phgga4yDYjn+lDW0RkO89ElhHZsrLj +uGkD/1Ela0htkQoWgZW0I0XO+LNBsnuxPwqqG3vM1VLhSzrFH0CHKeQqYt9iHV/M +eD1KIdIXzoPBfRbFLM1ktE/3AlomrgXp9WtxfXhzWNcWFzYLUajAxlGYD2wT+3H7 +Tpm1/hKQcJJG2xMRCyeZcOf+pTWaqCbLLTsy0G+MY/j5Rug1tDRUaG9tYXMtTWFy +dGluIFNlY2sgKFByaXZhdCAyKSA8dG1zZWNrQG5ldGNvbG9nbmUuZGU+iGIEExEC +ABoFCwcKAwQDFQMCAxYCAQIXgAUCQR+T+AIZAQASB2VHUEcAAQEJECREL+HfRu4F +hQsAoIYCMipK3ugbNfOUW+1BMpPiNnm8AJ9kyX6rm8M8Doj/qCKJF36gxrTo/7Qr +VGhvbWFzLU1hcnRpbiBTZWNrIChQcml2YXQpIDx0bXNlY2tAd2ViLmRlPohfBBMR +AgAXBQI6HBvxBQsHCgMEAxUDAgMWAgECF4AAEgkQJEQv4d9G7gUHZUdQRwABAbOv +AJ4y63dcgJXV9Vcw0SUMdJ66IK7d6ACgzX0WCMIVWiNBey1/ZHOgHaE5Kku0MVRo +b21hcy1NYXJ0aW4gU2VjayAoRnJlZUJTRCkgPHRtc2Vja0BGcmVlQlNELm9yZz6I +YgQTEQIAIgUCUTZfLgIbIwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQJEQv +4d9G7gUH7wCfUxSv8PJY/gF8wYEY9xC2YJdK9yQAnjOz54d/B3GGMsBiAKzM8qZT +zTXruQINBDocHF0QCACoDJirnOAYUdRKgOpFrDupOuSPexu6Dz6WRxV1hNwaAajD +lmgHK+7W8Yb0wd+8bKASi7aonkbZOhRfkJ5DbrjgqNGyJjCRHgqGboyGyR9Mezyc +W5kNLNWhwtBiBU/5zExgSQaQKHOvQeFXIfa9gJQy9hn4qMAXs80jvns1siNwbQHn +TKRP35G7FI69FS5tBfEFata3qyhv2KP2yxlRyTv532yq2k1di07vXKEiS/UrbFJ7 +tRpO+cfXy0iXADtRMPt4EMeBffmDI7B2DS75Hn3RArKjk9/8AvuFLbkgbdEzvsB4 +l706H+ziB7X9YmDDkKFpMW/SONbCWETrjK7KP0wnAAQLB/94xzi6sqLcJhVp4QBH +ekzCYoxrUmlb+wH8DerIftT4S2BpV6cF2vVD2KfmDpwmZ3MaF83OvaT7dcZ8fZ1r +1afkqIpXdwjI70c3cKOAnrZkVZAma6E9EYvi1Ww8mxLJ+ClvWh7fVpQmppqJMfdM +ZgU5egCYliv/QQGp+SyNXNOkfttIsA8EWruJo/33nAvG0bqzwh7X+SQsK4MVidD1 +7/5srXHMlBN5zBqRaRq0lakpT8xDlB2NqlQTMb6wnHscV3ZqUzaszEXvhXnUwSPr +a820urDh6o/hnsF/VH7gCJmkkVV7Ei1MjIp8H6Zs0A8se/XlYlf5OlZB8chqJ+mP +r2tuiE0EGBECAAYFAjocHF0AEgkQJEQv4d9G7gUHZUdQRwABAZtlAJdyRMT4dZ2D +wiimJm8jZ2BOhV/UAKCBrBb3jVIe9FUC3JpwMajuZ1gbSg== +=p6Le +-----END PGP PUBLIC KEY BLOCK----- +]]></programlisting> diff --git a/share/security/advisories/FreeBSD-SA-13:01.bind.asc b/share/security/advisories/FreeBSD-SA-13:01.bind.asc new file mode 100644 index 0000000000..6629d41ad9 --- /dev/null +++ b/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 <URL:http://security.FreeBSD.org/>. + +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 +described in <URL:http://www.FreeBSD.org/handbook/makeworld.html>. + +Restart the named(8) daemon, or reboot your 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 + +Restart the named(8) daemon, or reboot your system. + +4) Alternatively, install and run BIND from the Ports Collection after +the correction date. The following versions and newer versions of +BIND installed from the Ports Collection are not affected by this +vulnerability: + + bind98-9.8.4.1 + bind99-9.9.2.1 + +VI. Correction details + +The following list contains the revision numbers of each file that was +corrected in FreeBSD. + +Branch/path Revision +- ------------------------------------------------------------------------- +stable/9/ r245163 +releng/9.0/ r246989 +releng/9.1/ r246989 +- ------------------------------------------------------------------------- + +VII. References + +https://kb.isc.org/article/AA-00828 + +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5688 + +The latest revision of this advisory is available at +http://security.FreeBSD.org/advisories/FreeBSD-SA-13:01.bind.asc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (FreeBSD) + +iEYEARECAAYFAlEjf8MACgkQFdaIBMps37JUigCeIvjGL59H2froSeFqfPvlzM7L +XpAAni7nW5GZt4AE3eSDQwE4ivCne6SK +=Rxq4 +-----END PGP SIGNATURE----- diff --git a/share/security/advisories/FreeBSD-SA-13:02.libc.asc b/share/security/advisories/FreeBSD-SA-13:02.libc.asc new file mode 100644 index 0000000000..6911c9bda1 --- /dev/null +++ b/share/security/advisories/FreeBSD-SA-13:02.libc.asc @@ -0,0 +1,114 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +============================================================================= +FreeBSD-SA-13:02.libc Security Advisory + The FreeBSD Project + +Topic: glob(3) related resource exhaustion + +Category: core +Module: libc +Announced: 2013-02-19 +Affects: All supported versions of FreeBSD. +Corrected: 2013-02-05 09:53:32 UTC (stable/7, 7.4-STABLE) + 2013-02-19 13:27:20 UTC (releng/7.4, 7.4-RELEASE-p12) + 2013-02-05 09:53:32 UTC (stable/8, 8.3-STABLE) + 2013-02-19 13:27:20 UTC (releng/8.3, 8.3-RELEASE-p6) + 2013-02-05 09:53:32 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-2010-2632 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit <URL:http://security.FreeBSD.org/>. + +I. Background + +The glob(3) function is a pathname generator that implements the rules for +file name pattern matching used by the shell. + +II. Problem Description + +GLOB_LIMIT is supposed to limit the number of paths to prevent against +memory or CPU attacks. The implementation however is insufficient. + +III. Impact + +An attacker that is able to exploit this vulnerability could cause excessive +memory or CPU usage, resulting in a Denial of Service. A common target for +a remote attacker could be ftpd(8). + +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 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:02/libc.patch +# fetch http://security.FreeBSD.org/patches/SA-13:02/libc.patch.asc +# gpg --verify libc.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 <URL:http://www.FreeBSD.org/handbook/makeworld.html>. + +Restart all daemons, 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 + +Restart all daemons, or reboot the system. + +VI. Correction details + +The following list contains the revision numbers of each file that was +corrected in FreeBSD. + +Branch/path Revision +- ------------------------------------------------------------------------- +stable/7/ r246357 +releng/7.4/ r246989 +stable/8/ r246357 +releng/8.3/ r246989 +stable/9/ r246357 +releng/9.0/ r246989 +releng/9.1/ r246989 +- ------------------------------------------------------------------------- + +VII. References + +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-2632 + +The latest revision of this advisory is available at +http://security.FreeBSD.org/advisories/FreeBSD-SA-13:02.libc.asc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (FreeBSD) + +iEYEARECAAYFAlEjf80ACgkQFdaIBMps37JFUgCfUrw8Ky4U19COja6fna49Calv +z/YAn1JSGxzHCo8vLj4XhtXqrQt68or4 +=mCPv +-----END PGP SIGNATURE----- diff --git a/share/security/patches/SA-13:01/bind.patch b/share/security/patches/SA-13:01/bind.patch new file mode 100644 index 0000000000..00ee3c228d --- /dev/null +++ b/share/security/patches/SA-13:01/bind.patch @@ -0,0 +1,18 @@ +Index: contrib/bind9/bin/named/query.c +=================================================================== +--- contrib/bind9/bin/named/query.c ++++ contrib/bind9/bin/named/query.c +@@ -5183,10 +5183,12 @@ + isc_result_t result; + isc_uint32_t ttl = ISC_UINT32_MAX; + ++ dns_rdataset_init(&rdataset); ++ + result = dns_db_getoriginnode(db, &node); + if (result != ISC_R_SUCCESS) + goto cleanup; +- dns_rdataset_init(&rdataset); ++ + result = dns_db_findrdataset(db, node, version, dns_rdatatype_soa, + 0, 0, &rdataset, NULL); + if (result != ISC_R_SUCCESS) diff --git a/share/security/patches/SA-13:01/bind.patch.asc b/share/security/patches/SA-13:01/bind.patch.asc new file mode 100644 index 0000000000..dad8551674 --- /dev/null +++ b/share/security/patches/SA-13:01/bind.patch.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (FreeBSD) + +iEYEABECAAYFAlEjf/cACgkQFdaIBMps37LjHwCfQ0g0m9lvCY/AZmzYq6NfupNU +cjQAn1ovam14yAE0+WT3FAhOM0lr7INw +=gwXh +-----END PGP SIGNATURE----- diff --git a/share/security/patches/SA-13:02/libc.patch b/share/security/patches/SA-13:02/libc.patch new file mode 100644 index 0000000000..ad9b9608f4 --- /dev/null +++ b/share/security/patches/SA-13:02/libc.patch @@ -0,0 +1,215 @@ +Index: lib/libc/gen/glob.c +=================================================================== +--- lib/libc/gen/glob.c (revision 246357) ++++ lib/libc/gen/glob.c (working copy) +@@ -94,6 +94,25 @@ __FBSDID("$FreeBSD$"); + + #include "collate.h" + ++/* ++ * glob(3) expansion limits. Stop the expansion if any of these limits ++ * is reached. This caps the runtime in the face of DoS attacks. See ++ * also CVE-2010-2632 ++ */ ++#define GLOB_LIMIT_BRACE 128 /* number of brace calls */ ++#define GLOB_LIMIT_PATH 65536 /* number of path elements */ ++#define GLOB_LIMIT_READDIR 16384 /* number of readdirs */ ++#define GLOB_LIMIT_STAT 1024 /* number of stat system calls */ ++#define GLOB_LIMIT_STRING ARG_MAX /* maximum total size for paths */ ++ ++struct glob_limit { ++ size_t l_brace_cnt; ++ size_t l_path_lim; ++ size_t l_readdir_cnt; ++ size_t l_stat_cnt; ++ size_t l_string_cnt; ++}; ++ + #define DOLLAR '$' + #define DOT '.' + #define EOS '\0' +@@ -153,15 +172,18 @@ static const Char *g_strchr(const Char *, wchar_t) + static Char *g_strcat(Char *, const Char *); + #endif + static int g_stat(Char *, struct stat *, glob_t *); +-static int glob0(const Char *, glob_t *, size_t *); +-static int glob1(Char *, glob_t *, size_t *); +-static int glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *); +-static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t *); +-static int globextend(const Char *, glob_t *, size_t *); +-static const Char * ++static int glob0(const Char *, glob_t *, struct glob_limit *); ++static int glob1(Char *, glob_t *, struct glob_limit *); ++static int glob2(Char *, Char *, Char *, Char *, glob_t *, ++ struct glob_limit *); ++static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, ++ struct glob_limit *); ++static int globextend(const Char *, glob_t *, struct glob_limit *); ++static const Char * + globtilde(const Char *, Char *, size_t, glob_t *); +-static int globexp1(const Char *, glob_t *, size_t *); +-static int globexp2(const Char *, const Char *, glob_t *, int *, size_t *); ++static int globexp1(const Char *, glob_t *, struct glob_limit *); ++static int globexp2(const Char *, const Char *, glob_t *, int *, ++ struct glob_limit *); + static int match(Char *, Char *, Char *); + #ifdef DEBUG + static void qprintf(const char *, Char *); +@@ -171,8 +193,8 @@ int + glob(const char * __restrict pattern, int flags, + int (*errfunc)(const char *, int), glob_t * __restrict pglob) + { ++ struct glob_limit limit = { 0, 0, 0, 0, 0 }; + const char *patnext; +- size_t limit; + Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot; + mbstate_t mbs; + wchar_t wc; +@@ -186,11 +208,10 @@ glob(const char * __restrict pattern, int flags, + pglob->gl_offs = 0; + } + if (flags & GLOB_LIMIT) { +- limit = pglob->gl_matchc; +- if (limit == 0) +- limit = ARG_MAX; +- } else +- limit = 0; ++ limit.l_path_lim = pglob->gl_matchc; ++ if (limit.l_path_lim == 0) ++ limit.l_path_lim = GLOB_LIMIT_PATH; ++ } + pglob->gl_flags = flags & ~GLOB_MAGCHAR; + pglob->gl_errfunc = errfunc; + pglob->gl_matchc = 0; +@@ -243,11 +264,17 @@ glob(const char * __restrict pattern, int flags, + * characters + */ + static int +-globexp1(const Char *pattern, glob_t *pglob, size_t *limit) ++globexp1(const Char *pattern, glob_t *pglob, struct glob_limit *limit) + { + const Char* ptr = pattern; + int rv; + ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ limit->l_brace_cnt++ >= GLOB_LIMIT_BRACE) { ++ errno = 0; ++ return (GLOB_NOSPACE); ++ } ++ + /* Protect a single {}, for find(1), like csh */ + if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS) + return glob0(pattern, pglob, limit); +@@ -266,7 +293,8 @@ static int + * If it fails then it tries to glob the rest of the pattern and returns. + */ + static int +-globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, size_t *limit) ++globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, ++ struct glob_limit *limit) + { + int i; + Char *lm, *ls; +@@ -436,7 +464,7 @@ globtilde(const Char *pattern, Char *patbuf, size_ + * if things went well, nonzero if errors occurred. + */ + static int +-glob0(const Char *pattern, glob_t *pglob, size_t *limit) ++glob0(const Char *pattern, glob_t *pglob, struct glob_limit *limit) + { + const Char *qpatnext; + int err; +@@ -529,7 +557,7 @@ compare(const void *p, const void *q) + } + + static int +-glob1(Char *pattern, glob_t *pglob, size_t *limit) ++glob1(Char *pattern, glob_t *pglob, struct glob_limit *limit) + { + Char pathbuf[MAXPATHLEN]; + +@@ -547,7 +575,7 @@ static int + */ + static int + glob2(Char *pathbuf, Char *pathend, Char *pathend_last, Char *pattern, +- glob_t *pglob, size_t *limit) ++ glob_t *pglob, struct glob_limit *limit) + { + struct stat sb; + Char *p, *q; +@@ -563,6 +591,15 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_ + if (g_lstat(pathbuf, &sb, pglob)) + return(0); + ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ limit->l_stat_cnt++ >= GLOB_LIMIT_STAT) { ++ errno = 0; ++ if (pathend + 1 > pathend_last) ++ return (GLOB_ABORTED); ++ *pathend++ = SEP; ++ *pathend = EOS; ++ return (GLOB_NOSPACE); ++ } + if (((pglob->gl_flags & GLOB_MARK) && + pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) + || (S_ISLNK(sb.st_mode) && +@@ -606,7 +643,7 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_ + static int + glob3(Char *pathbuf, Char *pathend, Char *pathend_last, + Char *pattern, Char *restpattern, +- glob_t *pglob, size_t *limit) ++ glob_t *pglob, struct glob_limit *limit) + { + struct dirent *dp; + DIR *dirp; +@@ -652,6 +689,19 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_ + size_t clen; + mbstate_t mbs; + ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ limit->l_readdir_cnt++ >= GLOB_LIMIT_READDIR) { ++ errno = 0; ++ if (pathend + 1 > pathend_last) ++ err = GLOB_ABORTED; ++ else { ++ *pathend++ = SEP; ++ *pathend = EOS; ++ err = GLOB_NOSPACE; ++ } ++ break; ++ } ++ + /* Initial DOT must be matched literally. */ + if (dp->d_name[0] == DOT && *pattern != DOT) + continue; +@@ -702,14 +752,15 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_ + * gl_pathv points to (gl_offs + gl_pathc + 1) items. + */ + static int +-globextend(const Char *path, glob_t *pglob, size_t *limit) ++globextend(const Char *path, glob_t *pglob, struct glob_limit *limit) + { + char **pathv; + size_t i, newsize, len; + char *copy; + const Char *p; + +- if (*limit && pglob->gl_pathc > *limit) { ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ pglob->gl_matchc > limit->l_path_lim) { + errno = 0; + return (GLOB_NOSPACE); + } +@@ -737,6 +788,12 @@ static int + for (p = path; *p++;) + continue; + len = MB_CUR_MAX * (size_t)(p - path); /* XXX overallocation */ ++ limit->l_string_cnt += len; ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ limit->l_string_cnt >= GLOB_LIMIT_STRING) { ++ errno = 0; ++ return (GLOB_NOSPACE); ++ } + if ((copy = malloc(len)) != NULL) { + if (g_Ctoc(path, copy, len)) { + free(copy); diff --git a/share/security/patches/SA-13:02/libc.patch.asc b/share/security/patches/SA-13:02/libc.patch.asc new file mode 100644 index 0000000000..24b9b52cf0 --- /dev/null +++ b/share/security/patches/SA-13:02/libc.patch.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (FreeBSD) + +iEYEABECAAYFAlEjf/0ACgkQFdaIBMps37Kw1ACfX+M73KQtFkdrAhFWVyVm2G44 +DLYAn2SoJT4c98Frj75ttappPsvFDgVk +=H9Gv +-----END PGP SIGNATURE----- diff --git a/share/xml/advisories.xml b/share/xml/advisories.xml index b6bdfc7b9c..432c60cd24 100644 --- a/share/xml/advisories.xml +++ b/share/xml/advisories.xml @@ -5,6 +5,26 @@ </cvs:keyword> <year> + <name>2013</name> + + <month> + <name>2</name> + + <day> + <name>19</name> + + <advisory> + <name>FreeBSD-SA-13:02.libc</name> + </advisory> + + <advisory> + <name>FreeBSD-SA-13:01.bind</name> + </advisory> + </day> + </month> + </year> + + <year> <name>2012</name> <month> diff --git a/share/xml/authors.ent b/share/xml/authors.ent index 195f7e9778..2244cad0f1 100644 --- a/share/xml/authors.ent +++ b/share/xml/authors.ent @@ -62,6 +62,8 @@ <!ENTITY a.alm "Andrew Moore <email>alm@FreeBSD.org</email>"> +<!ENTITY a.am "Atul Mukker <email>am@FreeBSD.org</email>"> + <!ENTITY a.ambrisko "Doug Ambrisko <email>ambrisko@FreeBSD.org</email>"> <!ENTITY a.amdmi3 "Dmitry Marakasov <email>amdmi3@FreeBSD.org</email>"> @@ -216,6 +218,8 @@ <!ENTITY a.cawimm "Charles A. Wimmer <email>cawimm@FreeBSD.org</email>"> +<!ENTITY a.cbzimmer "Chris Zimmernmann <email>cbzimmer@FreeBSD.org</email>"> + <!ENTITY a.cel "Chuck Lever <email>cel@FreeBSD.org</email>"> <!ENTITY a.ceri "Ceri Davies <email>ceri@FreeBSD.org</email>"> @@ -730,6 +734,8 @@ <!ENTITY a.kiri "Kazuhiko Kiriyama <email>kiri@FreeBSD.org</email>"> +<!ENTITY a.kishore "Kishore Sampathkumar <email>kishore@FreeBSD.org</email>"> + <!ENTITY a.kjc "Kenjiro Cho <email>kjc@FreeBSD.org</email>"> <!ENTITY a.kmacy "Kip Macy <email>kmacy@FreeBSD.org</email>"> @@ -1316,6 +1322,8 @@ <!ENTITY a.tmm "Thomas Möstl <email>tmm@FreeBSD.org</email>"> +<!ENTITY a.tmseck "Thomas-Martin Seck <email>tmseck@FreeBSD.org</email>"> + <!ENTITY a.tobez "Anton Berezin <email>tobez@FreeBSD.org</email>"> <!ENTITY a.tom "Tom Hukins <email>tom@FreeBSD.org</email>"> diff --git a/share/xml/developers.ent b/share/xml/developers.ent index eb3e84aa48..1e1b9a45bd 100644 --- a/share/xml/developers.ent +++ b/share/xml/developers.ent @@ -31,6 +31,7 @@ $FreeBSD$ <!ENTITY a.alex "Alexander Langer"> <!ENTITY a.alexbl "Alexander Botero-Lowry"> <!ENTITY a.alfred "Alfred Perlstein"> +<!ENTITY a.am "Atul Mukker"> <!ENTITY a.ambrisko "Doug Ambrisko"> <!ENTITY a.amdmi3 "Dmitry Marakasov"> <!ENTITY a.amorita "Akio Morita"> @@ -106,6 +107,7 @@ $FreeBSD$ <!ENTITY a.carl "Carl Delsey"> <!ENTITY a.carvay "J. Vicente Carrasco Vayá"> <!ENTITY a.cawimm "Charles A. Wimmer"> +<!ENTITY a.cbzimmer "Chris Zimmermann"> <!ENTITY a.cel "Chuck Lever"> <!ENTITY a.ceri "Ceri Davies"> <!ENTITY a.cg "Cameron Grant"> @@ -176,6 +178,7 @@ $FreeBSD$ <!ENTITY a.dirk "Dirk Frömberg"> <!ENTITY a.dmarion "Damjan Marion"> <!ENTITY a.dmlb "Duncan Barclay"> +<!ENTITY a.don "Don Wilde"> <!ENTITY a.dru "Dru Lavigne"> <!ENTITY a.dryice "Dryice Liu"> <!ENTITY a.dt "Dmitrij Tejblum"> @@ -351,6 +354,7 @@ $FreeBSD$ <!ENTITY a.kib "Konstantin Belousov"> <!ENTITY a.kientzle "Tim Kientzle"> <!ENTITY a.kiri "Kazuhiko Kiriyama"> +<!ENTITY a.kishore "Kishore Sampathkumar"> <!ENTITY a.kjc "Kenjiro Cho"> <!ENTITY a.kmacy "Kip Macy"> <!ENTITY a.kmoore "Kris Moore"> @@ -640,6 +644,7 @@ $FreeBSD$ <!ENTITY a.tjr "Tim J. Robbins"> <!ENTITY a.tmclaugh "Tom McLaughlin"> <!ENTITY a.tmm "Thomas Möstl"> +<!ENTITY a.tmseck "Thomas-Martin Seck"> <!ENTITY a.tobez "Anton Berezin"> <!ENTITY a.tom "Tom Hukins"> <!ENTITY a.tomsoft "Thomas-Henning von Kamptz"> @@ -713,7 +718,7 @@ $FreeBSD$ <!-- Below we list the various hats. --> <!-- FreeBSD Bugmeister --> -<!ENTITY a.bugmeister '&a.eadler;, &a.gavin;, &a.gonzo;, &a.linimon;'> +<!ENTITY a.bugmeister '&a.eadler;, &a.gavin;, &a.gonzo;'> <!-- FreeBSD Doc Engineering Team --> <!ENTITY a.doceng '&a.gjb;, &a.blackend;, &a.gabor;, &a.hrs;'> @@ -722,7 +727,7 @@ $FreeBSD$ <!ENTITY a.donations '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'> <!-- FreeBSD Ports Manager Team --> -<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.decke;, &a.beat;, &a.erwin;, &a.linimon;, &a.itetcu;, &a.miwi;'> +<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.bdrewery;, &a.decke;, &a.erwin;, &a.itetcu;, &a.miwi;'> <!-- FreeBSD Release Engineering Teams --> <!ENTITY a.re.members '&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;'> diff --git a/share/xml/navibar.ent b/share/xml/navibar.ent index ebb8bf3dc9..61bf8960c7 100644 --- a/share/xml/navibar.ent +++ b/share/xml/navibar.ent @@ -96,9 +96,9 @@ <li><a href="&base;/releases/">Release Information</a> <ul> <li>Production Release: <br /> - <a href="&u.rel.announce;">&rel.current;</a> <a href="&u.rel2.announce;">&rel2.current;</a></li> + <a href="&u.rel.announce;">&rel.current;</a></li> <li>Production (Legacy) Release:<br /> - <a href="&u.rel3.announce;">&rel3.current;</a></li> + <a href="&u.rel2.announce;">&rel2.current;</a></li> <!-- <li><a href="&base;/snapshots/">Snapshot Releases</a></li>--> &beta.listitem; &beta2.listitem; diff --git a/share/xml/news.xml b/share/xml/news.xml index a6afd1487c..0949914800 100644 --- a/share/xml/news.xml +++ b/share/xml/news.xml @@ -31,6 +31,54 @@ <name>2013</name> <month> + <name>3</name> + + <day> + <name>14</name> + + <event> + <title>New &os; Foundation Technical Staff Member: Konstantin + Belousov</title> + + <p>The &os; Foundation is pleased to announce that + Konstantin Belousov has been hired as its first full-time + member of technical staff, a key milestone of the + Foundation's investment in staff for 2013.</p> + + <p><a + href="http://freebsdfoundation.blogspot.com/2013/03/foundation-announces-new-technical.html">Read + more...</a></p> + </event> + </day> + + <day> + <name>12</name> + + <event> + <p>New member for the Ports Management team: + <a href="mailto:bdrewery@FreeBSD.org">Bryan Drewery</a></p> + </event> + </day> + + <day> + <name>3</name> + + <event> + <title>October-December 2012 Status Report</title> + <p>The October to December 2012 Status Report is <a + href="&enbase;/news/status/report-2012-10-2012-12.html">now + available</a> with 27 entries.</p> + </event> + <event> + <title>July-September 2012 Status Report</title> + <p>The July to September 2012 Status Report is <a + href="&enbase;/news/status/report-2012-07-2012-09.html">now + available</a> with 12 entries.</p> + </event> + </day> + </month> + + <month> <name>2</name> <day> @@ -41,6 +89,16 @@ <a href="mailto:pclin@FreeBSD.org">Po-Chien Lin</a> (ports)</p> </event> </day> + + <day> + <name>1</name> + + <event> + <p>New committer: + <a href="mailto:tmseck@FreeBSD.org">Thomas-Martin Seck</a> (ports)</p> + </event> + </day> + </month> <month> @@ -218,10 +276,6 @@ href="http://blog.pcbsd.org/2012/12/pc-bsd-9-1-now-available/">announces</a> the availablilty of PC-BSD 9.1.</p> </event> - </day> - - <day> - <name>18</name> <event> <p>New committer: |