Date: Tue, 10 Apr 2012 12:28:25 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 209355 for review Message-ID: <201204101228.q3ACSPAl047102@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@209355?ac=10 Change 209355 by rene@rene_acer on 2012/04/10 12:27:29 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#53 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#134 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#36 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#22 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#135 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#40 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#42 integrate .. //depot/projects/docproj_nl/www/en/releases/8.3R/relnotes-detailed.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/8.3R/schedule.sgml#5 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#137 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#45 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#53 (text+ko) ==== @@ -9,7 +9,7 @@ <corpauthor>The &os; Documentation Project</corpauthor> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.316 2012/03/24 18:21:49 eadler Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.317 2012/04/03 12:07:47 gavin Exp $</pubdate> <copyright> <year>1999</year> @@ -77,7 +77,7 @@ <row> <entry><emphasis>Main Subversion Root</emphasis></entry> <entry> - <literal>svn+ssh://</literal><hostid role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename> (see also <xref linkend="vcs.operations">). + <literal>svn+ssh://</literal><hostid role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename> (see also <xref linkend="subversion-primer">). </entry> </row> @@ -255,7 +255,8 @@ <para>It is assumed that you are already familiar with the basic operation of the version control systems in use. Traditionally this was - CVS, but as of June 2008, Subversion is used for the src tree.</para> + CVS, but as of June 2008, Subversion is used for the src tree. + Subversion is covered in <xref linkend="subversion-primer">.</para> <para>The &a.cvsadm; are the <quote>owners</quote> of the repository and are responsible for direct modification of it for the purposes of ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#134 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1075 2012/03/30 18:12:42 ak Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1077 2012/04/07 14:45:09 crees Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -6115,6 +6115,11 @@ </listitem> <listitem> + <para>Mark Felder + <email>feld@feld.me</email></para> + </listitem> + + <listitem> <para>Mark Foster <email>mark@foster.cc</email></para> </listitem> @@ -6324,6 +6329,11 @@ </listitem> <listitem> + <para>Masaki TAGAWA + <email>masaki@club.kyutech.ac.jp</email></para> + </listitem> + + <listitem> <para>Masanobu Saitoh <email>msaitoh@spa.is.uec.ac.jp</email></para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml,v 1.16 2012/03/19 04:57:07 wblock Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml,v 1.18 2012/04/02 15:50:31 wblock Exp $ --> <chapter id="pccard"> @@ -12,22 +12,24 @@ <para>This chapter will talk about the FreeBSD mechanisms for writing a device driver for a PC Card or CardBus device. However, - at the present time, it just documents how to add a driver to an + at present it just documents how to add a new device to an existing pccard driver.</para> <sect1 id="pccard-adddev"> - <title>Adding a device</title> + <title>Adding a Device</title> - <para>Devices drivers know what devices they - support. There is a table of supported devices in the - kernel that drivers use to attach to a device.</para> + <para>Device drivers know what devices they support. There is a + table of supported devices in the kernel that drivers use to + attach to a device.</para> <sect2 id="pccard-overview"> <title>Overview</title> <indexterm><primary>CIS</primary></indexterm> <para>PC Cards are identified in one of two ways, both based on - information in the <acronym>CIS</acronym> of the card. The + the <firstterm>Card Information Structure</firstterm> + (<acronym role="Card Information Structure">CIS</acronym>) + stored on the card. The first method is to use numeric manufacturer and product numbers. The second method is to use the human readable strings that are also contained in the CIS. The PC Card bus @@ -35,34 +37,33 @@ design pattern to help the driver writer match devices to his driver.</para> - <para>OEMs manufacturers often develop a reference design for - a PC Card product sell this design to other companies to - market. Those companies refine - the design, market the product to their target audience or - geographic area and put their own name plate onto the card. - The refinements to the physical card typically are - very minor, if any changes are made at all. However, - to strengthen their brand, - these vendors place their company name in the human - strings in the CIS space, but leave the manufacturer and - product ids unchanged.</para> + <para>Original equipment manufacturers (<acronym>OEM</acronym>s) + often develop a reference design for a PC Card product, then + sell this design to other companies to market. Those + companies refine the design, market the product to their + target audience or geographic area, and put their own name + plate onto the card. The refinements to the physical card are + typically very minor, if any changes are made at all. To + strengthen their brand, these vendors place their company name + in the human readable strings in the CIS space, but leave the + manufacturer and product IDs unchanged.</para> <indexterm><primary>NetGear</primary></indexterm> <indexterm><primary>Linksys</primary></indexterm> <indexterm><primary>D-Link</primary></indexterm> - <para>Because of this practice, FreeBSD drivers tend to - use the numeric IDs. Using numeric IDs and a centralized - database complicates adding IDs and support for cards to the - system. One must carefully check to see who really made the - card, especially when it appears that the vendor who made the - card from might already have a different manufacturer id - listed in the central database. Linksys, D-Link and NetGear - are a number of US Manufacturers of LAN hardware that often - sell the same design. These same designs can be sold in Japan - under names such as Buffalo and Corega. Yet often, these - devices will all have the same manufacturer and product - id.</para> + <para>Because of this practice, FreeBSD drivers usually rely on + numeric IDs for device identification. Using numeric IDs and + a centralized database complicates adding IDs and support for + cards to the system. One must carefully check to see who + really made the card, especially when it appears that the + vendor who made the card might already have a different + manufacturer ID listed in the central database. Linksys, + D-Link, and NetGear are a number of US manufacturers of LAN + hardware that often sell the same design. These same designs + can be sold in Japan under names such as Buffalo and Corega. + Often, these devices will all have the same manufacturer and + product IDs.</para> <para>The PC Card bus code keeps a central database of card information, but not which driver is associated with them, in @@ -72,11 +73,11 @@ devices.</para> <para>Finally, some really low end devices do not contain - manufacturer identification at all. These devices require - that one matches them using the human readable CIS strings. + manufacturer identification at all. These devices must be + detected by matching the human readable CIS strings. While it would be nice if we did not need this method as a fallback, it is necessary for some very low end CD-ROM players - and ethernet cards. This method should generally be + and Ethernet cards. This method should generally be avoided, but a number of devices are listed in this section because they were added prior to the recognition of the <acronym>OEM</acronym> nature of the PC Card business. When @@ -86,64 +87,67 @@ <sect2 id="pccard-pccarddevs"> <title>Format of <filename>pccarddevs</filename></title> - <para>There are four sections of the + <para>There are four sections in the <filename>pccarddevs</filename> files. The first section - lists the manufacturer numbers for those vendors that use + lists the manufacturer numbers for vendors that use them. This section is sorted in numerical order. The next section has all of the products that are used by these vendors, along with their product ID numbers and a description string. The description string typically is not used (instead we set the device's description based on the human readable CIS, even if we match on the numeric version). These two - sections are then repeated for those devices that use the - string matching method. Finally, C-style comments are allowed - anywhere in the file.</para> + sections are then repeated for devices that use the + string matching method. Finally, C-style comments enclosed in + <literal>/*</literal> and <literal>*/</literal> characters are + allowed anywhere in the file.</para> <para>The first section of the file contains the vendor IDs. Please keep this list sorted in numeric order. Also, please coordinate changes to this file because we share it with NetBSD to help facilitate a common clearing house for this - information. For example:</para> + information. For example, here are the first few vendor + IDs:</para> -<programlisting>vendor FUJITSU 0x0004 Fujitsu Corporation + <programlisting>vendor FUJITSU 0x0004 Fujitsu Corporation vendor NETGEAR_2 0x000b Netgear vendor PANASONIC 0x0032 Matsushita Electric Industrial Co. vendor SANDISK 0x0045 Sandisk Corporation</programlisting> - <para>shows the first few vendor ids. Chances are very good + <para>Chances are very good that the <literal>NETGEAR_2</literal> entry is really an OEM that NETGEAR purchased cards from and the author of support for those cards was unaware at the time that Netgear was using - someone else's id. These entries are fairly straightforward. - There is the vendor keyword used to denote the kind of line - that this is. There is the name of the vendor. This name - will be repeated later in the pccarddevs file, as well as used - in the driver's match tables, so keep it short and a valid C - identifier. There is a numeric ID, in hex, for the + someone else's ID. These entries are fairly straightforward. + The vendor keyword denotes the kind of line that this is, + followed by the name of the vendor. This name will be + repeated later in <filename>pccarddevs</filename>, as + well as used in the driver's match tables, so keep it short + and a valid C identifier. A numeric ID in hex identifies the manufacturer. Do not add IDs of the form <literal>0xffffffff</literal> or <literal>0xffff</literal> - because these are reserved ids (the former is 'no id set' - while the latter is sometimes seen in extremely poor quality - cards to try to indicate 'none). Finally there is a string - description of the company that makes the card. This string - is not used in FreeBSD for anything but commentary - purposes.</para> + because these are reserved IDs (the former is + <quote>no ID set</quote> while the latter is sometimes seen in + extremely poor quality cards to try to indicate + <quote>none</quote>). Finally there is a string description + of the company that makes the card. This string is not used + in FreeBSD for anything but commentary purposes.</para> <para>The second section of the file contains the products. As - you can see in the following example:</para> + shown in this example, the format is similar to the vendor + lines:</para> -<programlisting>/* Allied Telesis K.K. */ + <programlisting>/* Allied Telesis K.K. */ product ALLIEDTELESIS LA_PCM 0x0002 Allied Telesis LA-PCM /* Archos */ product ARCHOS ARC_ATAPI 0x0043 MiniCD</programlisting> - <para>the format is similar to the vendor lines. There is the - product keyword. Then there is the vendor name, repeated from - above. This is followed by the product name, which is used by - the driver and should be a valid C identifier, but may also - start with a number. There is then the product id for this - card, in hex. As with the vendors, there is the same + <para>The + <literal>product</literal> keyword is followed by the vendor + name, repeated from above. This is followed by the product + name, which is used by the driver and should be a valid C + identifier, but may also start with a number. As with the + vendors, the hex product ID for this card follows the same convention for <literal>0xffffffff</literal> and <literal>0xffff</literal>. Finally, there is a string description of the device itself. This string typically is @@ -151,39 +155,39 @@ construct a string from the human readable CIS entries, but it can be used in the rare cases where this is somehow insufficient. The products are in alphabetical order by - manufacturer, then numerical order by product id. They have a + manufacturer, then numerical order by product ID. They have a C comment before each manufacturer's entries and there is a blank line between entries.</para> <para>The third section is like the previous vendor section, but - with all of the manufacturer numeric ids as - <literal>-1</literal>. <literal>-1</literal> means - <quote>match anything you find</quote> in the FreeBSD pccard + with all of the manufacturer numeric IDs set to + <literal>-1</literal>, meaning + <quote>match anything found</quote> in the FreeBSD pccard bus code. Since these are C identifiers, their names must be unique. Otherwise the format is identical to the first section of the file.</para> <para>The final section contains the entries for those cards - that we must match with string entries. This sections' format - is a little different than the generic section:</para> + that must be identified by string entries. This section's + format is a little different from the generic section:</para> -<programlisting>product ADDTRON AWP100 { "Addtron", "AWP-100&spWireless&spPCMCIA", "Version&sp01.02", NULL } + <programlisting>product ADDTRON AWP100 { "Addtron", "AWP-100&spWireless&spPCMCIA", "Version&sp01.02", NULL } product ALLIEDTELESIS WR211PCM { "Allied&spTelesis&spK.K.", "WR211PCM", NULL, NULL } Allied Telesis WR211PCM</programlisting> - <para>We have the familiar product keyword, followed by the - vendor name followed by the card name, just as in the second - section of the file. However, then we deviate from that - format. There is a {} grouping, followed by a number of - strings. These strings correspond to the vendor, product and - extra information that is defined in a CIS_INFO tuple. These - strings are filtered by the program that generates - <filename>pccarddevs.h</filename> to replace &sp with a - real space. NULL strings mean that the corresponding part - of the entry should be ignored. In the example I have picked, - there is a bad entry. It should not contain the version - number in it unless that is critical for the operation of the - card. Sometimes vendors will have many different versions of - the card in the field that all work, in which case that + <para>The familiar <literal>product</literal> keyword is + followed by the vendor name and the card name, just as in the + second section of the file. Here the format deviates from + that used earlier. There is a {} grouping, followed by a + number of strings. These strings correspond to the vendor, + product, and extra information that is defined in a CIS_INFO + tuple. These strings are filtered by the program that + generates <filename>pccarddevs.h</filename> to replace &sp + with a real space. NULL strings mean that the corresponding + part of the entry should be ignored. The example shown here + contains a bad entry. It should not contain the version + number unless that is critical for the operation of the card. + Sometimes vendors will have many different versions of the + card in the field that all work, in which case that information only makes it harder for someone with a similar card to use it with FreeBSD. Sometimes it is necessary when a vendor wishes to sell many different parts under the same @@ -195,7 +199,7 @@ </sect2> <sect2 id="pccard-probe"> - <title>Sample probe routine</title> + <title>Sample Probe Routine</title> <indexterm> <primary>PC Card</primary> @@ -241,9 +245,10 @@ first entry that it matches. Some drivers may use this mechanism to convey additional information about some cards to the rest of the driver, so there may be some variance in the - table. The only requirement is that if you have a different - table, the first element of the structure you have a table of - be a struct pccard_product.</para> + table. The only requirement is that each row of the table + must have a <function>struct</function> + <structname>pccard_product</structname> as the first + element.</para> <para>Looking at the table <structname>wi_pccard_products</structname>, one notices that @@ -251,41 +256,41 @@ <function>PCMCIA_CARD(<replaceable>foo</replaceable>, <replaceable>bar</replaceable>, <replaceable>baz</replaceable>)</function>. The - <replaceable>foo</replaceable> part is the manufacturer id + <replaceable>foo</replaceable> part is the manufacturer ID from <filename>pccarddevs</filename>. The - <replaceable>bar</replaceable> part is the product. The + <replaceable>bar</replaceable> part is the product ID. <replaceable>baz</replaceable> is the expected function number - that for this card. Many pccards can have multiple functions, + for this card. Many pccards can have multiple functions, and some way to disambiguate function 1 from function 0 is needed. You may see <literal>PCMCIA_CARD_D</literal>, which - includes the device description from the - <filename>pccarddevs</filename> file. You may also see + includes the device description from + <filename>pccarddevs</filename>. You may also see <literal>PCMCIA_CARD2</literal> and <literal>PCMCIA_CARD2_D</literal> which are used when you need - to match CIS both CIS strings and manufacturer numbers, in the + to match both CIS strings and manufacturer numbers, in the <quote>use the default description</quote> and <quote>take the description from pccarddevs</quote> flavors.</para> </sect2> <sect2 id="pccard-add"> - <title>Putting it all together</title> + <title>Putting it All Together</title> - <para>So, to add a new device, one must do the following steps. - First, one must obtain the identification information from the + <para>To add a new device, one must first obtain the + identification information from the device. The easiest way to do this is to insert the device into a PC Card or CF slot and issue - <command>devinfo -v</command>. You will likely see something - like:</para> + <command>devinfo -v</command>. Sample output:</para> <programlisting> cbb1 pnpinfo vendor=0x104c device=0xac51 subvendor=0x1265 subdevice=0x0300 class=0x060700 at slot=10 function=1 cardbus1 pccard1 unknown pnpinfo manufacturer=0x026f product=0x030c cisvendor="BUFFALO" cisproduct="WLI2-CF-S11" function_type=6 at function=0</programlisting> - <para>as part of the output. The manufacturer and product are - the numeric IDs for this product. While the cisvendor and - cisproduct are the strings that are present in the CIS that - describe this product.</para> + <para><literal>manufacturer</literal> + and <literal>product</literal> are the numeric IDs for this + product, while <literal>cisvendor</literal> and + <literal>cisproduct</literal> are the product description + strings from the CIS.</para> <para>Since we first want to prefer the numeric option, first try to construct an entry based on that. The above card has @@ -295,8 +300,8 @@ <programlisting>vendor BUFFALO 0x026f BUFFALO (Melco Corporation)</programlisting> - <para>so we are good there. Looking for an entry for this card, - we do not find one. Instead we find:</para> + <para>But there is no entry for this particular card. + Instead we find:</para> <programlisting>/* BUFFALO */ product BUFFALO WLI_PCM_S11 0x0305 BUFFALO AirStation 11Mbps WLAN @@ -304,22 +309,23 @@ product BUFFALO LPC3_CLT 0x030a BUFFALO LPC3-CLT Ethernet Adapter product BUFFALO WLI_CF_S11G 0x030b BUFFALO AirStation 11Mbps CF WLAN</programlisting> - <para>we can just add</para> + <para>To add the device, we can just add this entry to + <filename>pccarddevs</filename>:</para> <programlisting>product BUFFALO WLI2_CF_S11G 0x030c BUFFALO AirStation ultra 802.11b CF</programlisting> - <para>to <filename>pccarddevs</filename>. Presently, there is a - manual step to regenerate the - <filename>pccarddevs.h</filename> file used to convey these - identifiers to the client driver. The following steps - must be done before you can use them in the driver:</para> + <para>At present, there is a + manual step to regenerate + <filename>pccarddevs.h</filename>, used to convey these + identifiers to the client driver. The following steps must be + done before you can use them in the driver:</para> <screen>&prompt.root; <userinput>cd src/sys/dev/pccard</userinput> -&prompt.root; <userinput>make -f Makefile.pccarddevs</userinput> -</screen> +&prompt.root; <userinput>make -f Makefile.pccarddevs</userinput></screen> - <para>Once these steps are complete, you can add the card to the - driver. That is a simple operation of adding one line:</para> + <para>Once these steps are complete, the card can be added to + the driver. That is a simple operation of adding one + line:</para> <programlisting>static const struct pccard_product wi_pccard_products[] = { PCMCIA_CARD(3COM, 3CRWE737A, 0), @@ -334,39 +340,37 @@ line before the line that I added, but that is simply to highlight the line. Do not add it to the actual driver. Once you have added the line, you can recompile your kernel or - module and try to see if it recognizes the device. If it does - and works, please submit a patch. If it does not work, please - figure out what is needed to make it work and submit a patch. - If it did not recognize it at all, you have done something - wrong and should recheck each step.</para> + module and test it. If the device is recognized and works, + please submit a patch. If it does not work, please figure out + what is needed to make it work and submit a patch. If the + device is not recognized at all, you have done something wrong + and should recheck each step.</para> <para>If you are a FreeBSD src committer, and everything appears to be working, then you can commit the changes to the tree. - However, there are some minor tricky things that you need to - worry about. First, you must commit the - <filename>pccarddevs</filename> file to the tree. After you - have done that, you must regenerate - <filename>pccarddevs.h</filename> and commit it as a second - commit (this is to make sure that the right - $FreeBSD$ tag is in the latter file). Finally, - you need to commit the additions to the driver.</para> + However, there are some minor tricky things to be considered. + <filename>pccarddevs</filename> must be committed to the tree + first. Then <filename>pccarddevs.h</filename> must be + regenerated and committed as a second step, ensuring that the + right $FreeBSD$ tag is in the latter file. + Finally, commit the additions to the driver.</para> </sect2> <sect2 id="pccard-pr"> - <title>Submitting a new device</title> + <title>Submitting a New Device</title> - <para>Many people send entries for new devices to the author - directly. Please do not do this. Please submit them as a PR - and send the author the PR number for his records. This makes - sure that entries are not lost. When submitting a PR, it is - unnecessary to include the <filename>pccardevs.h</filename> - diffs in the patch, since those will be regenerated. It is - necessary to include a description of the device, as well as - the patches to the client driver. If you do not know the - name, use OEM99 as the name, and the author will adjust OEM99 - accordingly after investigation. Committers should not commit - OEM99, but instead find the highest OEM entry and commit one - more than that.</para> + <para>Please do not send entries for new devices to the author + directly. Instead, submit them as a PR and send the author + the PR number for his records. This ensures that entries are + not lost. When submitting a PR, it is unnecessary to include + the <filename>pccardevs.h</filename> diffs in the patch, since + those will be regenerated. It is necessary to include a + description of the device, as well as the patches to the + client driver. If you do not know the name, use OEM99 as the + name, and the author will adjust OEM99 accordingly after + investigation. Committers should not commit OEM99, but + instead find the highest OEM entry and commit one more than + that.</para> </sect2> </sect1> </chapter> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#3 (text+ko) ==== @@ -1,20 +1,20 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml,v 1.20 2008/11/18 07:32:15 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml,v 1.21 2012/04/02 15:42:38 wblock Exp $ --> <chapter id="introduction"> <chapterinfo> <authorgroup> <author> - <firstname>Murray</firstname> - <surname>Stokely</surname> - <contrib>Contributed by </contrib> + <firstname>Murray</firstname> + <surname>Stokely</surname> + <contrib>Contributed by </contrib> </author> <author> - <firstname>Jeroen</firstname> - <surname>Ruigrok van der Werven</surname> + <firstname>Jeroen</firstname> + <surname>Ruigrok van der Werven</surname> </author> </authorgroup> </chapterinfo> @@ -33,7 +33,6 @@ profession. The information in this chapter might be aimed toward the beginning programmer; indeed, it could serve useful for the programmer unfamiliar with the &os; platform.</para> - </sect1> <sect1 id="introduction-bsdvision"> @@ -44,188 +43,214 @@ ideology as well as usability, performance and stability.</para> </sect1> - + <sect1 id="introduction-archguide"> <title>Architectural Guidelines</title> <para>Our ideology can be described by the following - guidelines</para> + guidelines</para> <itemizedlist> - <listitem><para>Do not add new functionality unless an - implementor cannot complete a real application without - it.</para></listitem> + <listitem> + <para>Do not add new functionality unless an implementor + cannot complete a real application without it.</para> + </listitem> - <listitem><para>It is as important to decide what a system is - not as to decide what it is. Do not serve all the world's - needs; rather, make the system extensible so that additional - needs can be met in an upwardly compatible - fashion.</para></listitem> + <listitem> + <para>It is as important to decide what a system is + not as to decide what it is. Do not serve all the world's + needs; rather, make the system extensible so that additional + needs can be met in an upwardly compatible + fashion.</para> + </listitem> - <listitem><para>The only thing worse than generalizing from one - example is generalizing from no examples at - all. </para></listitem> + <listitem> + <para>The only thing worse than generalizing from one example + is generalizing from no examples at all.</para> + </listitem> - <listitem><para>If a problem is not completely understood, it is - probably best to provide no solution at all.</para></listitem> + <listitem> + <para>If a problem is not completely understood, it is + probably best to provide no solution at all.</para> + </listitem> - <listitem><para>If you can get 90 percent of the desired effect - for 10 percent of the work, use the simpler - solution.</para></listitem> + <listitem> + <para>If you can get 90 percent of the desired effect for 10 + percent of the work, use the simpler solution.</para> + </listitem> - <listitem><para>Isolate complexity as much as - possible.</para></listitem> + <listitem> + <para>Isolate complexity as much as possible.</para> + </listitem> - <listitem><para>Provide mechanism, rather than policy. In - particular, place user interface policy in the client's - hands.</para></listitem> + <listitem> + <para>Provide mechanism, rather than policy. In particular, + place user interface policy in the client's hands.</para> + </listitem> + </itemizedlist> - </itemizedlist> - - <para>From Scheifler & Gettys: "X Window System"</para> - + <para>From Scheifler & Gettys: "X Window System"</para> </sect1> <sect1 id="introduction-layout"> - <title>The Layout of + <title>The Layout of <filename class="directory">/usr/src</filename></title> <para>The complete source code to FreeBSD is available from our public repository. The source code is normally installed in - <filename class="directory">/usr/src</filename> which contains the - following subdirectories:</para> + <filename class="directory">/usr/src</filename> which contains + the following subdirectories:</para> <para> <informaltable frame="none" pgwide="1"> - <tgroup cols="2"> + <tgroup cols="2"> <thead> <row> <entry>Directory</entry> <entry>Description</entry> </row> </thead> - + <tbody> <row> - <entry><filename class="directory">bin/</filename></entry> - <entry>Source for files in - <filename>/bin</filename></entry> + <entry><filename + class="directory">bin/</filename></entry> + <entry>Source for files in + <filename>/bin</filename></entry> </row> - + <row> - <entry><filename class="directory">cddl/</filename></entry> + <entry><filename + class="directory">cddl/</filename></entry> <entry>Utilities covered by the Common Development and Distribution License</entry> </row> <row> - <entry><filename class="directory">contrib/</filename></entry> - <entry>Source for files from contributed software.</entry> + <entry><filename + class="directory">contrib/</filename></entry> + <entry>Source for files from contributed + software.</entry> </row> <row> - <entry><filename class="directory">crypto/</filename></entry> - <entry>Cryptographical sources</entry> + <entry><filename + class="directory">crypto/</filename></entry> + <entry>Cryptographical sources</entry> </row> <row> - <entry><filename class="directory">etc/</filename></entry> - <entry>Source for files in <filename - class="directory">/etc</filename></entry> + <entry><filename + class="directory">etc/</filename></entry> + <entry>Source for files in <filename + class="directory">/etc</filename></entry> </row> <row> - <entry><filename class="directory">games/</filename></entry> - <entry>Source for files in <filename - class="directory">/usr/games</filename></entry> + <entry><filename + class="directory">games/</filename></entry> + <entry>Source for files in <filename + class="directory">/usr/games</filename></entry> </row> <row> - <entry><filename class="directory">gnu/</filename></entry> - <entry>Utilities covered by the GNU Public License</entry> + <entry><filename + class="directory">gnu/</filename></entry> + <entry>Utilities covered by the GNU Public + License</entry> </row> <row> - <entry><filename class="directory">include/</filename></entry> - <entry>Source for files in <filename - class="directory">/usr/include</filename></entry> + <entry><filename + class="directory">include/</filename></entry> + <entry>Source for files in <filename + class="directory">/usr/include</filename></entry> </row> <row> - <entry><filename - class="directory">kerberos5/</filename></entry> - <entry>Source for Kerberos version 5</entry> + <entry><filename + class="directory">kerberos5/</filename></entry> + <entry>Source for Kerberos version 5</entry> </row> <row> - <entry><filename class="directory">lib/</filename></entry> - <entry>Source for files in <filename - class="directory">/usr/lib</filename></entry> + <entry><filename + class="directory">lib/</filename></entry> + <entry>Source for files in <filename + class="directory">/usr/lib</filename></entry> </row> - + <row> - <entry><filename class="directory">libexec/</filename></entry> - <entry>Source for files in <filename - class="directory">/usr/libexec</filename></entry> + <entry><filename + class="directory">libexec/</filename></entry> + <entry>Source for files in <filename + class="directory">/usr/libexec</filename></entry> </row> <row> - <entry><filename - class="directory">release/</filename></entry> - <entry>Files required to produce a FreeBSD release</entry> + <entry><filename + class="directory">release/</filename></entry> + <entry>Files required to produce a FreeBSD + release</entry> </row> <row> - <entry><filename class="directory">rescue/</filename></entry> - <entry>Build system for the - <filename class="directory">/rescue</filename> utilities</entry> + <entry><filename + class="directory">rescue/</filename></entry> + <entry>Build system for the + <filename class="directory">/rescue</filename> + utilities</entry> </row> <row> - <entry><filename class="directory">sbin/</filename></entry> - <entry>Source for files in <filename - class="directory">/sbin</filename></entry> + <entry><filename + class="directory">sbin/</filename></entry> + <entry>Source for files in <filename + class="directory">/sbin</filename></entry> </row> <row> - <entry><filename class="directory">secure/</filename></entry> - <entry>FreeSec sources</entry> + <entry><filename + class="directory">secure/</filename></entry> + <entry>FreeSec sources</entry> </row> <row> - <entry><filename class="directory">share/</filename></entry> - <entry>Source for files in <filename - class="directory">/usr/share</filename></entry> + <entry><filename + class="directory">share/</filename></entry> + <entry>Source for files in <filename + class="directory">/usr/share</filename></entry> </row> <row> - <entry><filename class="directory">sys/</filename></entry> - <entry>Kernel source files</entry> + <entry><filename + class="directory">sys/</filename></entry> + <entry>Kernel source files</entry> </row> <row> - <entry><filename class="directory">tools/</filename></entry> - <entry>Tools used for maintenance and testing of - FreeBSD</entry> + <entry><filename + class="directory">tools/</filename></entry> + <entry>Tools used for maintenance and testing of + FreeBSD</entry> </row> <row> - <entry><filename - class="directory">usr.bin/</filename></entry> - <entry>Source for files in <filename - class="directory">/usr/bin</filename></entry> - </row> + <entry><filename + class="directory">usr.bin/</filename></entry> + <entry>Source for files in <filename + class="directory">/usr/bin</filename></entry> + </row> <row> - <entry><filename - class="directory">usr.sbin/</filename></entry> - <entry>Source for files in <filename - class="directory">/usr/sbin</filename></entry> - </row> - </tbody> + <entry><filename + class="directory">usr.sbin/</filename></entry> + <entry>Source for files in <filename + class="directory">/usr/sbin</filename></entry> + </row> + </tbody> </tgroup> - </informaltable> - </para> + </informaltable></para> </sect1> </chapter> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml,v 1.30 2012/02/13 15:12:50 wblock Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml,v 1.31 2012/04/03 13:27:00 gjb Exp $ --> <chapter id="bsdinstall"> @@ -2631,9 +2631,8 @@ <secondary>troubleshooting</secondary> </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 &os; with &ms-dos; or &windows;.</para> + troubleshooting, such as common problems people have + reported.</para> <sect2> <title>What to Do If Something Goes Wrong</title> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#36 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.126 2012/03/01 13:02:58 ryusuke Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.129 2012/04/08 23:22:35 ryusuke Exp $ --> <chapter id="desktop"> @@ -598,17 +598,18 @@ <application>KOffice</application>, make sure you have an up-to-date version of <application>KDE</application>.</para> - <para>To install <application>KOffice</application> as a + <para>To install <application>KOffice</application> for + <application>KDE4</application> as a package, issue the following command:</para> - <screen>&prompt.root; <userinput>pkg_add -r koffice</userinput></screen> + <screen>&prompt.root; <userinput>pkg_add -r koffice-kde4</userinput></screen> <para>If the package is not available, you can use the Ports Collection. For instance, to install <application>KOffice</application> for - <application>KDE3</application>, do:</para> + <application>KDE4</application>, do:</para> - <screen>&prompt.root; <userinput>cd /usr/ports/editors/koffice-kde3</userinput> + <screen>&prompt.root; <userinput>cd /usr/ports/editors/koffice-kde4</userinput> &prompt.root; <userinput>make install clean</userinput></screen> </sect2> @@ -1263,8 +1264,8 @@ <row> <entry><application>KOffice</application></entry> - <entry><literal>koffice</literal></entry> - <entry><filename role="package">editors/koffice-kde3</filename></entry> + <entry><literal>koffice-kde4</literal></entry> + <entry><filename role="package">editors/koffice-kde4</filename></entry> </row> <row> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#22 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.143 2012/01/16 18:41:21 manolis Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.144 2012/04/03 13:27:40 gjb Exp $ --> <chapter id="introduction"> @@ -672,7 +672,7 @@ in the 10.X-CURRENT (trunk) branch, and SNAPshot releases of 10.X on CD-ROM (and, of course, on the net) are continually made available from <ulink - url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/">the snapshot + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/">the snapshot server</ulink> as work progresses.</para> </sect2> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#135 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1173 2012/03/22 04:09:20 eadler Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1175 2012/04/02 20:31:56 wblock Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -9378,20 +9378,39 @@ ${CP} -p ${PREFIX}/etc/orbit.conf.sample ${PREFIX}/etc/orbit.conf ; \ fi</programlisting> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204101228.q3ACSPAl047102>