Date: Tue, 14 May 2002 19:42:53 -0700 (PDT) From: Chris Costello <chris@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11347 for review Message-ID: <200205150242.g4F2gr627245@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11347 Change 11347 by chris@chris_holly on 2002/05/14 19:42:28 Integ. Affected files ... ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 integrate ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/md5.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/accept.2#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/listen.2#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/release.7#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/MAKEDEV.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/jail.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mtree.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/newsyslog.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/vinum.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypbind.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/zic.8#2 integrate ... //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#2 integrate Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 (text+ko) ==== @@ -25,7 +25,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.114 2002/05/09 00:24:17 obrien Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.121 2002/05/13 22:00:39 imp Exp $</pubdate> <copyright> <year>1999</year> @@ -151,7 +151,7 @@ <para>Committers are encouraged to seek review for their work as part of the normal development process, regardless of the area of the - tree where the work is occuring.</para> + tree where the work is occurring.</para> </sect1> <sect1 id="cvs.operations"> @@ -498,18 +498,18 @@ <tbody> <row> <entry><literal>U</literal></entry> - <entry>The file was updated with no trouble.</entry> + <entry>The file was updated without trouble.</entry> </row> <row> <entry><literal>P</literal></entry> - <entry>The file was updated with no trouble (you will only see + <entry>The file was updated without trouble (you will only see this when working against a remote repo).</entry> </row> <row> <entry><literal>M</literal></entry> - <entry>The file had been modified, and was merged with no + <entry>The file had been modified, and was merged without conflicts.</entry> </row> @@ -611,6 +611,11 @@ </row> <row> + <entry><option>-c</option></entry> + <entry>Uses the context diff format.</entry> + </row> + + <row> <entry><option>-N</option></entry> <entry>Shows missing or added files.</entry> </row> @@ -620,7 +625,7 @@ <para>You always want to use <option>-u</option>, since unified diffs are much easier to read than almost any other - diff format (in some circumstances, context diffs may be + diff format (in some circumstances, context diffs generated with the <option>-c</option> option may be better, but they are much bulkier). A unified diff consists of a series of hunks. Each hunk begins with a line that starts with two <literal>@</literal> signs and specifies where in the @@ -635,7 +640,7 @@ with <option>-r</option> or <option>-D</option> as in <command>checkout</command> or <command>update</command>, or even view the diffs between two arbitrary versions - (with no regard for what you have locally) by specifying + (without regard for what you have locally) by specifying <emphasis>two</emphasis> versions with <option>-r</option> or <option>-D</option>.</para> </listitem> @@ -755,7 +760,7 @@ and also makes it harder to understand just what functional changes were made. In the case of documentation files, it can make the job of the translation teams more complicated, - as it becomes difficult for them to detemrine exactly what + as it becomes difficult for them to determine exactly what content changes need to be translated.</para> <para>Avoid committing changes to multiple files in one go @@ -779,7 +784,7 @@ <para>Also, ALWAYS specify which files to commit explicitly on the command line, so you do not accidentally commit other files than the ones you intended - <command>cvs commit</command> - with no arguments will commit every modification in your + without any arguments will commit every modification in your current working directory and every subdirectory.</para> </listitem> </orderedlist> @@ -935,7 +940,7 @@ This includes all of the commit messages as well as any other mail addressed to the &a.committers; and &a.developers;. Really large mailboxes which have taken up permanent residence on - <hostid>hub</hostid> often get <quote>accidently</quote> truncated + <hostid>hub</hostid> often get <quote>accidentally</quote> truncated without warning, so forward it or read it and you will not lose it.</para> </listitem> @@ -1319,7 +1324,7 @@ <para>developers is all committers. This list was created to be a forum for the committers <quote>community</quote> issues. Examples are Core - voting, announcements, etc. This listis + voting, announcements, etc. This list is <emphasis>not</emphasis> intended as a place for code reviews or a replacement for the &a.arch; or the &a.audit;. In fact using it as such hurts the FreeBSD Project as it gives a sense of a @@ -1483,24 +1488,22 @@ <para>As noted, breaking some of these rules can be grounds for suspension or, upon repeated offense, permanent removal of - commit privileges. Three or more members of core - acting in unison, + commit privileges. Individual members of core have the power to temporarily suspend commit privileges until core as a whole has the chance to review the issue. In case of an <quote>emergency</quote> (a committer doing damage to the repository), a temporary suspension may also - be done by the repository meisters or any other member of core - who may happen to be awake at the time. Only core as a whole - has the authority to suspend commit privileges for any - significant length of time or to remove them permanently, the - latter generally only being done after consultation with - committers. This rule does not exist to set core up as a bunch + be done by the repository meisters. + Only a 2/3 majority of core + has the authority to suspend commit privileges for longer + than a week or to remove them permanently. + This rule does not exist to set core up as a bunch of cruel dictators who can dispose of committers as casually as empty soda cans, but to give the project a kind of safety fuse. - If someone is seriously out of control, it is important to be + If someone is out of control, it is important to be able to deal with this immediately rather than be paralyzed by debate. In all cases, a committer whose privileges are - suspended or revoked is entitled to a <quote>hearing</quote>, + suspended or revoked is entitled to a <quote>hearing</quote> by core, the total duration of the suspension being determined at that time. A committer whose privileges are suspended may also request a review of the decision after 30 days and every 30 days @@ -2228,6 +2231,27 @@ wra(i)th.</para> </answer> </qandaentry> + + <qandaentry> + <question> + <para>What is the proper procedure for updating the checksum + for a port's distfile when the file changes without a + version change?</para> + </question> + + <answer> + <para>When the checksum for a port's distfile is updated due + to the author updating the file without changing the port's + revision, the commit message should include a summary of + the relevant diffs between the original and new distfile to + ensure that the distfile has not been corrupted or + maliciously altered. If the current version of the port + has been in the ports tree for a while, a copy of the old + distfile will usually be available on the ftp servers; + otherwise the author or maintainer should be contacted to + find out why the distfile has changed.</para> + </answer> + </qandaentry> </qandadiv> </qandaset> </sect1> ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 (text+ko) ==== @@ -18,7 +18,7 @@ <articleinfo> <title>Contributors to FreeBSD</title> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.179 2002/05/10 13:55:30 keramida Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.181 2002/05/13 02:06:25 tjr Exp $</pubdate> <abstract> <para>This article lists individuals and organizations who have @@ -1819,6 +1819,7 @@ <para>&a.ade;,</para> <para>&a.asami;,</para> + <para>&a.knu;,</para> <para>&a.kris;,</para> <para>&a.sobomax;,</para> <para>&a.steve;,</para> @@ -5789,6 +5790,10 @@ </listitem> <listitem> + <para>Peter Avalos <email>pavalos@theshell.com</email></para> + </listitem> + + <listitem> <para>Peter Childs <email>pjchilds@imforei.apana.org.au</email></para> </listitem> ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 (text+ko) ==== @@ -16,7 +16,7 @@ <articleinfo> <title>FreeBSD on Laptops</title> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/laptop/article.sgml,v 1.6 2002/04/13 23:10:30 keramida Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/laptop/article.sgml,v 1.8 2002/05/14 20:58:51 trhodes Exp $</pubdate> <abstract> <para>FreeBSD works fine on most laptops, with a few caveats. @@ -24,7 +24,7 @@ to different hardware requirements from desktops, are discussed below.</para> </abstract> - </articleinfo> + </articleinfo> <para>FreeBSD is often thought of as a server operating system, but it works just fine on the desktop, and if you want to use it on @@ -39,143 +39,146 @@ Microsoft Windows). This article aims to discuss some of these issues.</para> - <sect1> - <title>XFree86</title> + <sect1> + <title>XFree86</title> - <para>Recent versions of XFree86 work with most display adapters - available on laptops these days. Acceleration may not be - supported, but a generic SVGA configuration should work.</para> + <para>Recent versions of XFree86 work with most display adapters + available on laptops these days. Acceleration may not be + supported, but a generic SVGA configuration should work.</para> - <para>Check your laptop documentation for which card you have, - and check in the XFree86 documentation (or setup program) - to see whether it is specifically supported. If it is not, use - a generic device (do not go for a name which just looks - similar). In XFree86 version 4, you can try your luck - with the command <userinput>XFree86 -configure</userinput> - which auto-detects a lot of configurations.</para> + <para>Check your laptop documentation for which card you have, + and check in the XFree86 documentation (or setup program) + to see whether it is specifically supported. If it is not, use + a generic device (do not go for a name which just looks + similar). In XFree86 version 4, you can try your luck + with the command <userinput>XFree86 -configure</userinput> + which auto-detects a lot of configurations.</para> - <para>The problem often is configuring the monitor. Common - resources for XFree86 focus on CRT monitors; getting a - suitable modeline for an LCD display may be tricky. You may - be lucky and not need to specify a modeline, or just need to - specify suitable HorizSync and VertRefresh ranges. If that - does not work, the best option is to check web resources - devoted to configuring X on laptops (these are often - linux-oriented sites but it does not matter because both systems - use XFree86) and copy a modeline posted by someone for similar - hardware.</para> + <para>The problem often is configuring the monitor. Common + resources for XFree86 focus on CRT monitors; getting a + suitable modeline for an LCD display may be tricky. You may + be lucky and not need to specify a modeline, or just need to + specify suitable HorizSync and VertRefresh ranges. If that + does not work, the best option is to check web resources + devoted to configuring X on laptops (these are often + linux-oriented sites but it does not matter because both systems + use XFree86) and copy a modeline posted by someone for similar + hardware.</para> - <para>Most laptops come with two buttons on their pointing - devices, which is rather problematic in X (since the middle - button is commonly used to paste text); you can map a - simultaneous left-right click in your X configuration to - a middle button click with the line</para> + <para>Most laptops come with two buttons on their pointing + devices, which is rather problematic in X (since the middle + button is commonly used to paste text); you can map a + simultaneous left-right click in your X configuration to + a middle button click with the line</para> -<programlisting> -Option "Emulate3Buttons" -</programlisting> + <programlisting> + Option "Emulate3Buttons" + </programlisting> - <para>in the XF86Config file in the <literal>InputDevice</literal> section (for XFree86 - version 4; for version 3, put just the line <literal>Emulate3Buttons</literal>, - without the quotes, in the <literal>Pointer</literal> section.)</para> - </sect1> + <para>in the XF86Config file in the <literal>InputDevice</literal> + section (for XFree86 version 4; for version 3, put just the line + <literal>Emulate3Buttons</literal>, without the quotes, in the + <literal>Pointer</literal> section.)</para> + </sect1> - <sect1> - <title>Modems</title> - <para> - Laptops usually come with internal (on-board) modems. - Unfortunately, this almost always means they are <quote>winmodems</quote> whose - functionality is implemented in software, for which only windows - drivers are normally available (though a few drivers are beginning - to show up for other operating systems). Otherwise, you - need to buy an external modem: the most compact option is - probably a PC-Card (PCMCIA) modem, discussed below, but - serial or USB modems may be cheaper. Generally, regular - modems (non-winmodems) should work fine. - </para> + <sect1> + <title>Modems</title> + <para> + Laptops usually come with internal (on-board) modems. + Unfortunately, this almost always means they are + <quote>winmodems</quote> whose + functionality is implemented in software, for which only windows + drivers are normally available (though a few drivers are beginning + to show up for other operating systems). Otherwise, you + need to buy an external modem: the most compact option is + probably a PC Card (PCMCIA) modem, discussed below, but + serial or USB modems may be cheaper. Generally, regular + modems (non-winmodems) should work fine. + </para> - </sect1> + </sect1> - <sect1> - <title>PCMCIA (PC-card) devices</title> + <sect1> + <title>PCMCIA (PC Card) devices</title> - <para> Most laptops come with PCMCIA (also called PC-card) - slots; these are supported fine under FreeBSD. Look through - your boot-up messages (using dmesg) and see whether these were - detected correctly (they should appear as - <devicename>pccard0</devicename>, - <devicename>pccard1</devicename> etc on devices like - <devicename>pcic0</devicename>).</para> + <para> Most laptops come with PCMCIA (also called PC Card) + slots; these are supported fine under FreeBSD. Look through + your boot-up messages (using dmesg) and see whether these were + detected correctly (they should appear as + <devicename>pccard0</devicename>, + <devicename>pccard1</devicename> etc on devices like + <devicename>pcic0</devicename>).</para> - <para>FreeBSD currently supports 16-bit PCMCIA cards, but not - 32-bit (<quote>CardBus</quote>) cards. A database of supported cards is in - the file <filename>/etc/defaults/pccard.conf</filename>. Look - through it, and preferably buy cards listed there. Cards not - listed may also work as <quote>generic</quote> devices: in particular most - modems (16-bit) should work fine, provided they are not - winmodems (these do exist even as PC-cards, so watch out). If - your card is recognised as a generic modem, note that the - default pccard.conf file specifies a delay time of 10 seconds - (to avoid freezes on certain modems); this may well be - over-cautious for your modem, so you may want to play with it, - reducing it or removing it totally.</para> + <para>FreeBSD currently supports 16-bit PCMCIA cards, but not + 32-bit (<quote>CardBus</quote>) cards. A database of supported + cards is in the file <filename>/etc/defaults/pccard.conf</filename>. + Look through it, and preferably buy cards listed there. Cards not + listed may also work as <quote>generic</quote> devices: in + particular most modems (16-bit) should work fine, provided they + are not winmodems (these do exist even as PC Cards, so watch out). + If your card is recognised as a generic modem, note that the + default pccard.conf file specifies a delay time of 10 seconds + (to avoid freezes on certain modems); this may well be + over-cautious for your modem, so you may want to play with it, + reducing it or removing it totally.</para> - <para>Some parts of <filename>pccard.conf</filename> may need editing. Check the irq - line, and be sure to remove any number already being used: in - particular, if you have an on board sound card, remove irq 5 - (otherwise you may experience hangs when you insert a card). - Check also the available memory slots; if your card is not - being detected, try changing it to one of the other allowed - values (listed in the man page &man.pccardc.8;). - </para> + <para>Some parts of <filename>pccard.conf</filename> may need + editing. Check the irq line, and be sure to remove any number + already being used: in particular, if you have an on board sound + card, remove irq 5 (otherwise you may experience hangs when you + insert a card). Check also the available memory slots; if your + card is not being detected, try changing it to one of the other + allowed values (listed in the man page &man.pccardc.8;). + </para> - <para>If it is not running already, start the pccardd daemon. - (To enable it at boot time, add - <programlisting>pccard_enable="YES"</programlisting> to - <filename>/etc/rc.conf</filename>). Now your cards should be - detected when you insert and remove them, and you should get - log messages about new devices being enabled.</para> + <para>If it is not running already, start the pccardd daemon. + (To enable it at boot time, add + <programlisting>pccard_enable="YES"</programlisting> to + <filename>/etc/rc.conf</filename>). Now your cards should be + detected when you insert and remove them, and you should get + log messages about new devices being enabled.</para> - <para>There have been major changes to the pccard code - (including ISA routing of interrupts, for machines whose - PCIBIOS FreeBSD can not seem to use) before the FreeBSD 4.4 - release. If you have problems, try upgrading your system.</para> + <para>There have been major changes to the pccard code + (including ISA routing of interrupts, for machines whose + PCIBIOS FreeBSD can not seem to use) before the FreeBSD 4.4 + release. If you have problems, try upgrading your system.</para> - </sect1> + </sect1> - <sect1> + <sect1> - <title>Power management</title> + <title>Power management</title> - <para>Unfortunately, this is not very reliably supported under - FreeBSD. If you are lucky, some functions may work reliably; - or they may not work at all.</para> + <para>Unfortunately, this is not very reliably supported under + FreeBSD. If you are lucky, some functions may work reliably; + or they may not work at all.</para> - <para>To enable this, you may need to compile a kernel with - power management support (<literal>device apm0</literal>) or - add the option <literal>enable apm0</literal> to <filename>/boot/loader.conf</filename>, and - also enable the apm daemon at boot time (line - <literal>apm_enable="YES"</literal> in - <filename>/etc/rc.conf</filename>). The apm commands are - listed in the &man.apm.8; manpage. For instance, - <command>apm -b</command> gives you battery status (or 255 if - not supported), <command>apm -Z</command> puts the laptop on - standby, <command>apm -z</command> (or zzz) suspends it. To - shutdown and power off the machine, use <command>shutdown -p</command>. - Again, some or all of these functions may not work very well - or at all. You may find that laptop suspension/standby works - in console mode but not under X (that is, the screen does not - come on again; in that case, switch to a virtual console - (using Ctrl-Alt-F1 or another function key) and then execute - the apm command. - </para> + <para>To enable this, you may need to compile a kernel with + power management support (<literal>device apm0</literal>) or + add the option <literal>enable apm0</literal> to + <filename>/boot/loader.conf</filename>, and + also enable the apm daemon at boot time (line + <literal>apm_enable="YES"</literal> in + <filename>/etc/rc.conf</filename>). The apm commands are + listed in the &man.apm.8; manpage. For instance, + <command>apm -b</command> gives you battery status (or 255 if + not supported), <command>apm -Z</command> puts the laptop on + standby, <command>apm -z</command> (or zzz) suspends it. To + shutdown and power off the machine, use <command>shutdown -p</command>. + Again, some or all of these functions may not work very well + or at all. You may find that laptop suspension/standby works + in console mode but not under X (that is, the screen does not + come on again; in that case, switch to a virtual console + (using Ctrl-Alt-F1 or another function key) and then execute + the apm command. + </para> - <para>The X window system (XFree86) also includes display power - management (look at the &man.xset.1; man page, and search for - dpms there). You may want to investigate this. However, this, - too, works inconsistently on laptops: it - often turns off the display but does not turn off the - backlight.</para> + <para>The X window system (XFree86) also includes display power + management (look at the &man.xset.1; man page, and search for + dpms there). You may want to investigate this. However, this, + too, works inconsistently on laptops: it + often turns off the display but does not turn off the + backlight.</para> - </sect1> + </sect1> </article> ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/mh/article.sgml,v 1.15 2002/03/27 01:16:43 keramida Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/mh/article.sgml,v 1.16 2002/05/13 10:40:26 keramida Exp $ --> <!-- FreeBSD Documentation Project --> <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN"> @@ -46,7 +46,7 @@ email MH has done an excellent job keeping the configuration of each of these tools consistent and uniform. In fact, if you are not quite sure how something is supposed to work or what the - arguments for some command are supposed to be then you can + arguments for some command are supposed to be, then you can generally guess and be right. Each MH command is consistent about how it handles reading the configuration files and how it takes arguments on the command line. One useful thing to @@ -73,7 +73,7 @@ <para>This primer is not a full comprehensive explanation of how MH works. This is just intended to get you started on the road to happier, faster mail reading. You should read the man pages - for the various commands. Also you might want to read the <ulink + for the various commands. You might also want to read the <ulink URL="news:comp.mail.mh">comp.mail.mh</ulink> newsgroup. Also you can read the <ulink URL="http://www.cis.ohio-state.edu/hypertext/faq/usenet/mh-faq/part1/faq.html">FAQ @@ -88,7 +88,7 @@ <command>show</command>, <command>scan</command>, <command>next</command>, <command>prev</command>, <command>rmm</command>, <command>rmf</command>, and <command>msgchk</command>. One of the best things about MH is the - consistent interface between programs. A few things to keep in + consistent interface between programs. One thing to keep in mind when using these commands is how to specify message lists. In the case of <command>inc</command> this does not really make any sense but with commands like <command>show</command> it is useful to @@ -112,7 +112,7 @@ <keycap>return</keycap> you will be well on your way to getting started with MH. The first time you run <command>inc</command> it will setup your account to use all the MH defaults and ask you - about creating a Mail directory. If you have mail waiting to + about creating a <filename>Mail</filename> directory under your HOME directory. If you have mail waiting to be downloaded you will see something that looks like:</para> <informalexample> @@ -144,7 +144,7 @@ plain POP3 for downloading your email. MH has support for a few different dialects of POP. More than likely you will never ever need to use them though. While you can do more complex - things with inc such as audit files and scan format files this + things with <command>inc</command> such as audit files and scan format files this will get you going.</para> <para>The <command>msgchk</command> command is used to get information @@ -340,7 +340,7 @@ <para>Whenever you create a new folder a new directory is going to be created underneath your MH <filename>Mail</filename> directory, and messages in that folder are going to be stored in that - directory. When new email comes in that new email is thrown + directory. When a new email message comes, it is thrown into your <filename>inbox</filename> directory with a file name that is equivalent to the message number. So even if you did not have any of the MH tools to read your email you could still use @@ -449,7 +449,7 @@ <term><option>-date</option></term> <listitem> - <para>find emails with a matching dat</para> + <para>find emails with a matching date</para> </listitem> </varlistentry> @@ -513,7 +513,7 @@ not cc'd on freebsd-questions) and the subject is pci</quote>. It should look through your folder and find all messages sent to the freebsd-hackers list that are not cc'd - to the freebsd-questions list that contain something on pci in + to the freebsd-questions list and contain <quote>pci</quote> in the subject line. Ordinarily you might have to worry about something called operator precedence. Remember in math how you evaluate from left to right and you do multiplication and @@ -599,10 +599,10 @@ Subject: headers already in it. You are then sent into your editor where you fill in the header information and then type the body of your message below the dashed lines in the message. - Then to the <command>whatnow</command> program. When you are at the + When you leave the editor, the <command>whatnow</command> program is run. When you are at the <prompt>What now?</prompt> prompt you can tell it to <command>send</command>, <command>list</command>, <command>edit</command>, - <command>edit</command>, <command>push</command>, and <command>quit</command>. Most + <command>push</command>, and <command>quit</command>. Most of these commands are self-explanatory. So the message sending process involves copying a component file, editing your email, and then telling the <command>whatnow</command> program what to do with @@ -654,8 +654,9 @@ will see the <prompt>What now?</prompt> prompt and you can type in <userinput>send</userinput> or <userinput>s</userinput> and hit <keycap>return</keycap>. Then the FreeBSD core team will receive - their just rewards. As I mentioned earlier you can also use - other commands, for example <command>quit</command> if you do not want + their just rewards. As I mentioned earlier, you can also use + other commands at the <prompt>What now?</prompt> prompt. + For example you can use <command>quit</command>, if you do not want to send the message.</para> <para>The <command>forw</command> command is stunningly similar. The @@ -669,8 +670,8 @@ exactly the same as <command>comp</command>. You go through the exact same message sending process.</para> - <para>The <command>repl</command> command will reply to whatever your - current message is, unless you give it a different message to + <para>The <command>repl</command> command will reply to the + current message, unless you give it a different message to reply to. <command>repl</command> will do its best to go ahead and fill in some of the email headers already. So you will notice that the <literal>To:</literal> header already has the address of the ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 (text+ko) ==== @@ -47,7 +47,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.23 2002/04/25 19:37:13 bmah Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.25 2002/05/13 23:12:59 brian Exp $</pubdate> <abstract> <para>This paper describes the approach used by the FreeBSD release engineering team to make production quality releases @@ -134,15 +134,15 @@ available to keep systems on the <emphasis>RELENG_4_3 </emphasis> and <emphasis>RELENG_4_4</emphasis> branches updated.</para> - <para><link linkend="release-proc">Section 2</link> discusses the + <para><xref linkend="release-proc"> discusses the different phases of the release engineering process leading up to - the actual system build and <link linkend="release-build">section - 3</link> describes the actual build process. <link - linkend="extensibility">Section 4</link> describes how the base - release may be extended by third parties and <link - linkend="lessons-learned">section 5</link> details some of the + the actual system build and <xref linkend="release-build"> + describes the actual build process. <xref + linkend="extensibility"> describes how the base + release may be extended by third parties and <xref + linkend="lessons-learned"> details some of the lessons learned through the release of FreeBSD 4.4. Finally, - <link linkend="future">section 6</link> presents future directions + <xref linkend="future"> presents future directions of development.</para> </sect1> @@ -610,7 +610,7 @@ <emphasis>manifest</emphasis> can be created with a simple command:</para> - <screen>/stage/cdrom&prompt.root; <userinput>find . -type f | sed -e 's/\^.\///' | sort > filename.txt</userinput></screen> + <screen>/stage/cdrom&prompt.root; <userinput>find . -type f | sed -e 's/^\.\///' | sort > filename.txt</userinput></screen> <para>The specific requirements of each CD are outlined below.</para> ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#2 (text+ko) ==== @@ -23,7 +23,7 @@ <corpauthor>The FreeBSD Documentation Project</corpauthor> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.437 2002/05/06 14:43:30 mwlucas Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.439 2002/05/14 03:30:14 bmah Exp $</pubdate> <copyright> <year>1995</year> @@ -3816,9 +3816,9 @@ You have asked mail to the domain (e.g., domain.net) to be forwarded to a specific host (in this case, relay.domain.net) by using an MX record, but the relay machine does not recognize - itself as domain.net. Add domain.net to /etc/sendmail.cw + itself as domain.net. Add domain.net to /etc/mail/local-host-names (if you are using FEATURE(use_cw_file)) or add "Cw domain.net" - to /etc/sendmail.cf. + to /etc/mail/sendmail.cf. </literallayout> <para>The current version of the <ulink @@ -6476,7 +6476,7 @@ Sites that wish to exchange their mail via UUCP must install another sendmail configuration file.</para> - <para>Tweaking <filename>/etc/sendmail.cf</filename> manually is + <para>Tweaking <filename>/etc/mail/sendmail.cf</filename> manually is considered something for purists. Sendmail version 8 comes with a new approach of generating config files via some &man.m4.1; @@ -7169,7 +7169,7 @@ the branch will be renamed to 4.6-STABLE.</para> <para>For more information on version numbers and the - various CVS branches, refer the + various CVS branches, refer to the <ulink url="../../articles/releng/article.html">Release Engineering</ulink> article.</para> </answer> ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.121 2002/05/10 16:12:14 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.124 2002/05/14 20:49:07 dannyboy Exp $ --> <chapter id="cutting-edge"> @@ -561,7 +561,7 @@ </indexterm> <para><application>CTM</application>, on the other hand, does not interactively compare the sources you have with those on the master - archive or otherwise pull them across.. Instead, a script which + archive or otherwise pull them across. Instead, a script which identifies changes in files since its previous run is executed several times a day on the master CTM machine, any detected changes being compressed, stamped with a sequence-number and encoded for @@ -683,7 +683,7 @@ </sect2> <sect2> - <title>Update <filename>/etc/group</filename></title> + <title>Update the files of <filename>/etc</filename></title> <para>The <filename>/etc</filename> directory contains a large part of your system's configuration information, as well as scripts @@ -697,13 +697,13 @@ <para>There have been occasions when the installation part of <quote>make world</quote> has expected certain usernames or groups to exist. When performing an upgrade it is likely that these - groups did not exist. This caused problems when upgrading.</para> + users or groups did not exist. This caused problems when upgrading.</para> - <para>The most recent example of this is when the <quote/ppp/ group - (later renamed <quote/network/) was added. Users had the - installation process fail for them when parts of the - <filename>ppp</filename> subsystem were installed using a - non-existent (for them) group name.</para> + <para>A recent example of this is when the + <username>smmsp</username> user was added. Users had the + installation process fail for them when + <command>mtree</command> was trying to create + <filename>/var/spool/clientmqueue</filename>.</para> <para>The solution is to examine <filename>/usr/src/etc/group</filename> and compare its list of @@ -713,6 +713,18 @@ the same GID but a different name to those in <filename>/usr/src/etc/group</filename>.</para> + <para>Since 4.6-RELEASE you can run &man.mergemaster.8; in + pre-buildworld mode by providing the <option>-p</option> option. + This will compare only those files that are essential for the success + of <maketarget>buildworld</maketarget> or + <maketarget>installworld</maketarget>. If your old version of + <command>mergemaster</command> does not support <option>-p</option>, + use the new version in the source tree when running for the first + time:</para> + + <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput> +&prompt.root; <userinput>./mergemaster.sh -p</userinput></screen> + <tip> <para>If you are feeling particularly paranoid, you can check your system to see which files are owned by the group you are @@ -930,7 +942,7 @@ <screen>&prompt.root; <userinput>make buildworld</userinput></screen> - <para>It is now possible to specify a -j option to + <para>It is now possible to specify a <option>-j</option> option to <command>make</command> which will cause it to spawn several simultaneous processes. This is most useful on multi-CPU machines. However, since much of the compiling process is IO bound rather @@ -962,7 +974,7 @@ </indexterm> <para>Many factors influence the build time, but currently a 500 MHz - Pentium 3 with 128 MB of RAM takes about 2 hours to build + Pentium III with 128 MB of RAM takes about 2 hours to build the &os.stable; tree, with no tricks or shortcuts used during the process. A &os.current; tree will take somewhat longer.</para> </sect3> @@ -1099,7 +1111,7 @@ merge the temporary file with the currently installed file, or view the &man.diff.1; results again.</para> - <para>Choosing to delete the temporary will tell &man.mergemaster.8; that we + <para>Choosing to delete the temporary file will tell &man.mergemaster.8; that we wish to keep our current file unchanged, and to delete the one that is new. This option is not the most recommended one, unless you see no reason to change the current file. You can get help at any time by @@ -1418,7 +1430,7 @@ <answer> <para>There is no easy answer to this one, as it depends on the - nature of the change. For example, if you just ran CVSup, and + nature of the change. For example, if you just ran <application>CVSup</application>, and it has shown the following files as being updated,</para> <screen><filename>src/games/cribbage/instr.c</filename> @@ -1500,7 +1512,7 @@ corners.</para> <para>If you want to live dangerously then make the world, passing - the <makevar>NOCLEAN</makevar> definition to make, like + the <makevar>NOCLEAN</makevar> definition to <command>make</command>, like this:</para> <screen>&prompt.root; <userinput>make -DNOCLEAN world</userinput></screen> @@ -1552,23 +1564,6 @@ </answer> </qandaentry> - <indexterm><primary>NFS</primary></indexterm> - <qandaentry> - <question> - <para>Can I use one machine as a <emphasis/master/ to upgrade lots - of machines (NFS)?</para> - </question> - - <answer> - <para>This is a fairly easy task, and can save hours of compile - time for many machines. Simply run the - <makevar>buildworld</makevar> on a central - machine, and then NFS mount <filename>/usr/src</filename> and - <filename>/usr/obj</filename> on the remote machine and - <makevar>installworld</makevar> there.</para> - </answer> - </qandaentry> - <qandaentry> <question> <para>How can I speed up making the world?</para> @@ -1601,11 +1596,11 @@ <listitem> <para>Also in <filename>/etc/make.conf</filename>, set - <makevar>CFLAGS</makevar> to something like <quote>-O - -pipe</quote>. The optimization <quote>-O2</quote> is much + <makevar>CFLAGS</makevar> to something like <option>-O + -pipe</option>. The optimization <option>-O2</option> is much slower, and the optimization difference between - <quote>-O</quote> and <quote>-O2</quote> is normally - negligible. <quote>-pipe</quote> lets the compiler use + <option>-O</option> and <option>-O2</option> is normally + negligible. <option>-pipe</option> lets the compiler use pipes rather than temporary files for communication, which saves disk access (at the expense of memory).</para> </listitem> @@ -1711,6 +1706,10 @@ </authorgroup> </sect1info> <title>Tracking for multiple machines</title> + <indexterm> + <primary>NFS</primary> + <secondary>installing multiple machines</secondary> + </indexterm> <para>If you have multiple machines that you want to track the same source tree, then having all of them download sources and ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.165 2002/05/09 20:16:50 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.174 2002/05/14 21:17:48 trhodes Exp $ --> <chapter id="install"> @@ -899,7 +899,7 @@ <para>A collapsible list of all the drivers that are currently marked as <quote>active</quote>, subdivided into groups such as <literal>Storage</literal>, and <literal>Network</literal>. Each - driver is shown as a description, its two three letter driver + driver is shown as a description, its two or three letter driver name, and the IRQ and memory port used by that driver. In addition, if an active driver conflicts with another active driver then <literal>CONF</literal> is shown next to the driver name. @@ -2212,7 +2212,7 @@ Choosing the right amount of swap space can be a bit of an art. A good rule of thumb is that your swap space should be two or three times as much as the - available physical memory (RAM). So if you have + available physical memory (RAM). You should also have at least 64MB of swap, so if you have less than 32MB of RAM in your computer then set the swap amount to 64MB.</para><para> @@ -2921,7 +2921,7 @@ <listitem> <para>The IP address to be used for this interface was - (192.168.0.1).</para> + 192.168.0.1</para> </listitem> </varlistentry> @@ -2959,7 +2959,7 @@ <para>Choosing <guibutton>[ Yes ]</guibutton> and pressing <keycap>Enter</keycap> will bring the machine up on the network and be ready for use after leaving - leaving the installation.</para> + the installation.</para> </sect2> <sect2 id="gateway"> @@ -2999,7 +2999,7 @@ <para>Select <guibutton>[ Yes ]</guibutton> if you wish to configure these services during install. An additional - confirmation will display.</para> + confirmation will display:</para> <screen> User Confirmation Requested The Internet Super Server (inetd) allows a number of simple Internet @@ -3072,7 +3072,7 @@ <para>To allow anonymous FTP, use the arrow keys to select <guibutton>[ Yes ]</guibutton> and press <keycap>Enter</keycap>. - The following screens (or similar) will display:</para> + The following screen (or similar) will display:</para> <figure id="anon-ftp2"> <title>Default Anonymous FTP Configuration</title> @@ -3137,7 +3137,7 @@ <para>This is a text editor called <command>ee</command>. Use the instructions to change the message or change the message later using a text editor of your choice. Note the file name/location - at the bottom.</para> + at the bottom of the editor screen.</para> <para>Press <keycap>Esc</keycap> and a pop-up menu will default to <guimenuitem>a) leave editor</guimenuitem>. Press @@ -3165,7 +3165,7 @@ <keycap>Enter</keycap>.</para> <para>If <guibutton>[ Yes ]</guibutton> is chosen, a message will - pop-up indicating that the exports file must be created.</para> + pop-up indicating that the <filename>exports</filename> file must be created.</para> <screen> Message Operating as an NFS server means that you must first configure an @@ -3175,10 +3175,10 @@ [ OK ]</screen> <para>Press <keycap>Enter</keycap> to continue. A text editor will - start allowing the exports file to be created and edited.</para> + start allowing the <filename>exports</filename> file to be created and edited.</para> <figure id="nfs-server-edit"> - <title>Editing the Exports File</title> + <title>Editing <filename>exports</filename></title> <mediaobject> <imageobject> @@ -3189,7 +3189,7 @@ <para>Use the instructions to add the actual exported filesystems now or later using a text editor of your choice. Note the - filename/location at the bottom of the editor screen.</para> + file name/location at the bottom of the editor screen.</para> <para>Press <keycap>Esc</keycap> and a pop-up menu will default to <guimenuitem>a) leave editor</guimenuitem>. Press @@ -3411,12 +3411,12 @@ </mediaobject> </figure> - <para>A commonly used option is the screensaver. Use the arrow keys >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205150242.g4F2gr627245>