Date: Sun, 22 Aug 2010 11:40:57 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 182744 for review Message-ID: <201008221140.o7MBevRt091656@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@182744?ac=10 Change 182744 by rene@rene_acer on 2010/08/22 11:40:36 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#68 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#30 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#23 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#86 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#18 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#22 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#26 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#55 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#34 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/install/adduser2.scr#2 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/install/config-keymap.scr#1 branch .. //depot/projects/docproj_nl/share/sgml/freebsd-html.dsl#4 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#33 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#21 integrate .. //depot/projects/docproj_nl/www/en/security/security.sgml#14 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#26 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#7 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#68 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.939 2010/08/13 08:47:40 bapt Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.944 2010/08/22 02:19:14 bf Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -1433,6 +1433,11 @@ </listitem> <listitem> + <para>Carlo Strub + <email>c-s@c-s.li</email></para> + </listitem> + + <listitem> <para>Carlos A. M. dos Santos <email>unixmania@gmail.com</email></para> </listitem> @@ -4073,6 +4078,11 @@ </listitem> <listitem> + <para>James P. Howard, II + <email>jh@jameshoward.us</email></para> + </listitem> + + <listitem> <para>James Raftery <email>james@now.ie</email></para> </listitem> @@ -4462,6 +4472,11 @@ </listitem> <listitem> + <para>Jim Riggs + <email>ports@christianserving.org</email></para> + </listitem> + + <listitem> <para>Jim Shewmaker <email>jim@bluenotch.com</email></para> </listitem> @@ -10583,8 +10598,8 @@ </listitem> <listitem> - <para>exprim - <email>probyte@deviate.fi</email></para> + <para>Piotr Szerman + <email>pmsz@tlen.pl</email></para> </listitem> <listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#30 (text+ko) ==== @@ -12,7 +12,7 @@ <corpauthor>The &os; Documentation Project</corpauthor> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1126 2010/08/10 10:11:15 pgj Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1130 2010/08/20 13:58:43 jkois Exp $</pubdate> <copyright> <year>1995</year> @@ -846,15 +846,6 @@ </row> <row> - <entry><literal>pdb</literal></entry> - - <entry>Palm Pilot database format, for use with - the <ulink - url="http://www.iSilo.com/">iSilo</ulink>; - reader.</entry> - </row> - - <row> <entry><literal>pdf</literal></entry> <entry>Adobe's Portable Document Format</entry> @@ -1111,13 +1102,9 @@ </question> <answer> - <para>DaemonNews provides commercial training and support for - &os;. More information can be found at their <ulink - url="http://www.bsdmall.com/">BSD Mall</ulink> site.</para> - <para>The &os; Mall provides commercial &os; support. You can get more information at their <ulink - url="http://www.freebsdmall.com/">web site</ulink>.</para> + url="http://www.freebsdmall.com/cgi-bin/fm">web site</ulink>.</para> <para>BSD Certification Group, Inc. provides system administration certifications for DragonFly BSD, &os;, NetBSD, @@ -4170,7 +4157,7 @@ url="http://www.openoffice.org">OpenOffice.org</ulink></application>; office suite works natively on &os;. The &linux; version of <application><ulink - url="http://www.sun.com/staroffice/">StarOffice</ulink></application>, + url="http://www.oracle.com/us/products/applications/open-office/index.html">Oracle Open Office</ulink></application>, the value-added closed-source version of OpenOffice.org, also works on &os;.</para> @@ -4322,22 +4309,10 @@ </question> <answer> - <para>Yes. The following pages tell you exactly how to set up - &linux; <application>&oracle;</application> on &os;:</para> - - <itemizedlist> - <listitem> - <para><ulink - url="http://www.unixcities.com/oracle/index.html">http://www.unixcities.com/oracle/index.html</ulink>; - </para> - </listitem> - - <listitem> - <para><ulink - url="http://www.shadowcom.net/freebsd-oracle9i/">http://www.shadowcom.net/freebsd-oracle9i/</ulink>; - </para> - </listitem> - </itemizedlist> + <para>Yes. Instructions on how to set up &linux; + <application>&oracle;</application> on &os; can be found + under <ulink + url="http://www.shadowcom.net/freebsd-oracle9i/">http://www.shadowcom.net/freebsd-oracle9i/</ulink>.</para>; </answer> </qandaentry> </qandaset> @@ -4449,9 +4424,9 @@ <answer> <para>After installing the <filename role="package">news/inn</filename> package or port, an - excellent place to start is <ulink - url="http://www.visi.com/~barr/INN.html">Dave Barr's INN Page</ulink> - where you will find the INN FAQ.</para> + excellent place to start are the <ulink + url="http://www.eyrie.org/~eagle/faqs/inn.html">INN + FAQ</ulink>.</para> </answer> </qandaentry> @@ -5344,7 +5319,7 @@ <listitem> <para>&os; includes a read-only NTFS driver. For more information, see &man.mount.ntfs.8;. A port of <ulink - url="http://www.ntfs-3g.org"><application>ntfs-3g</application></ulink>; + url="http://www.tuxera.com/community/"><application>ntfs-3g</application></ulink>; supports write operations on NTFS (see <filename role="package">sysutils/fusefs-ntfs</filename>).</para> </listitem> @@ -6872,7 +6847,7 @@ <para>The X Window System (commonly <literal>X11</literal>) is the most widely available windowing system capable of running on &unix; or &unix; like systems, including &os;. - <ulink url= "http://www.x.org">The X.Org Foundation</ulink> + <ulink url= "http://www.x.org/wiki/">The X.Org Foundation</ulink> administers the <ulink url="http://en.wikipedia.org/wiki/X_Window_System_core_protocol">X protocol standards</ulink>, with the current reference implementation, version 11 @@ -6912,7 +6887,7 @@ released that software as <application>X11R6.7.0</application>. A separate but related project, <ulink - url="http://www.freedesktop.org">freedesktop.org</ulink>; + url="http://www.freedesktop.org/wiki/">freedesktop.org</ulink>; (or <literal>fd.o</literal> for short), is working on rearchitecting the original &xfree86; code to offload more work onto the graphics cards (with the goal of increased @@ -8155,7 +8130,7 @@ <para>There are three bandwidth management tools available for &os;. &man.dummynet.4; is integrated into &os; as part of &man.ipfw.4;. <ulink - url="http://www.csl.sony.co.jp/person/kjc/programs.html">ALTQ</ulink>; + url="http://www.sonycsl.co.jp/person/kjc/programs.html">ALTQ</ulink>; has been integrated into &os; as part of &man.pf.4;. Bandwidth Manager from <ulink url="http://www.etinc.com/">Emerging Technologies</ulink> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.112 2008/12/23 18:59:03 trhodes Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.113 2010/08/18 20:23:36 blackend Exp $ # # Build the FreeBSD Handbook. # @@ -57,6 +57,7 @@ IMAGES_EN+= install/boot-loader-menu.scr IMAGES_EN+= install/boot-mgr.scr IMAGES_EN+= install/config-country.scr +IMAGES_EN+= install/config-keymap.scr IMAGES_EN+= install/console-saver1.scr IMAGES_EN+= install/console-saver2.scr IMAGES_EN+= install/console-saver3.scr ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#23 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.430 2010/05/12 23:20:35 thompsa Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.431 2010/08/21 12:34:10 blackend Exp $ --> <chapter id="advanced-networking"> @@ -4115,6 +4115,7 @@ export DESTDIR=/data/misc/diskless mkdir -p ${DESTDIR} cd /usr/src; make buildworld && make buildkernel +make installworld && make installkernel cd /usr/src/etc; make distribution</programlisting> <para>Once done, you may need to customize your ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.88 2010/06/18 09:47:34 jkois Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.89 2010/08/17 12:33:39 jkois Exp $ --> <appendix id="bibliography"> @@ -613,8 +613,7 @@ <para>Simon Garfinkel, Daniel Weise, Steven Strassmann. <emphasis>The UNIX-HATERS Handbook</emphasis>. IDG Books Worldwide, Inc., 1994. ISBN 1-56884-203-1. Out of print, but available <ulink - url="http://research.microsoft.com/~daniel/unix-haters.html">; - online</ulink>.</para> + url="http://www.simson.net/ref/ugh.pdf">online</ulink>.</para>; </listitem> <listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.295 2010/08/10 08:51:37 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.297 2010/08/21 20:49:54 blackend Exp $ --> <chapter id="disks"> @@ -2664,7 +2664,7 @@ size during the backup, files that are created/deleted during the backup and more. She presented the results at LISA V in Oct. 1991. See <ulink - url="http://berdmann.dyndns.org/zwicky/testdump.doc.html">torture-testing + url="http://www.coredumps.de/doc/dump/zwicky/testdump.doc.html ">torture-testing Backup and Archive Programs</ulink>.</para> </sect2> @@ -2686,187 +2686,36 @@ two copies of each.</para> - <indexterm><primary>fix-it floppies</primary></indexterm> - <para>Second, determine that the boot and fix-it floppies - (<filename>boot.flp</filename> and <filename>fixit.flp</filename>) - have all your devices. The easiest way to check is to reboot your - machine with the boot floppy in the floppy drive and check the boot - messages. If all your devices are listed and functional, skip on to - step three.</para> - - <para>Otherwise, you have to create two custom bootable - floppies which have a kernel that can mount all of your disks - and access your tape drive. These floppies must contain: - <command>fdisk</command>, <command>bsdlabel</command>, - <command>newfs</command>, <command>mount</command>, and - whichever backup program you use. These programs must be - statically linked. If you use <command>dump</command>, the - floppy must contain <command>restore</command>.</para> + <indexterm><primary>livefs CD</primary></indexterm> + <para>Second, burn a <quote>livefs</quote> CDROM. This CDROM + contains support for booting into a &os; + <quote>livefs</quote> rescue mode allowing the user to + perform many tasks like running &man.dump.8;, + &man.restore.8;, &man.fdisk.8;, &man.bsdlabel.8;, + &man.newfs.8;, &man.mount.8;, and more. Livefs CD image for + &os;/&arch.i386; &rel.current;-RELEASE is available + from <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-&arch.i386;-livefs.iso"></ulink>.</para>; <para>Third, create backup tapes regularly. Any changes that you make after your last backup may be irretrievably lost. Write-protect the backup tapes.</para> - <para>Fourth, test the floppies (either <filename>boot.flp</filename> - and <filename>fixit.flp</filename> or the two custom bootable - floppies you made in step two.) and backup tapes. Make notes of the - procedure. Store these notes with the bootable floppy, the + <para>Fourth, test the <quote>livefs</quote> CDROM + you made in step two and backup tapes. Make notes of the + procedure. Store these notes with the CDROM, the printouts and the backup tapes. You will be so distraught when restoring that the notes may prevent you from destroying your backup tapes (How? In place of <command>tar xvf /dev/sa0</command>, you might accidentally type <command>tar cvf /dev/sa0</command> and over-write your backup tape).</para> - <para>For an added measure of security, make bootable floppies and two + <para>For an added measure of security, make <quote>livefs</quote> CDROM and two backup tapes each time. Store one of each at a remote location. A remote location is NOT the basement of the same office building. A number of firms in the World Trade Center learned this lesson the hard way. A remote location should be physically separated from your computers and disk drives by a significant distance.</para> - - <example> - <title>A Script for Creating a Bootable Floppy</title> - - <programlisting><![ CDATA [#!/bin/sh -# -# create a restore floppy -# -# format the floppy -# -PATH=/bin:/sbin:/usr/sbin:/usr/bin - -fdformat -q fd0 -if [ $? -ne 0 ] -then - echo "Bad floppy, please use a new one" - exit 1 -fi - -# place boot blocks on the floppy -# -bsdlabel -w -B /dev/fd0c fd1440 - -# -# newfs the one and only partition -# -newfs -t 2 -u 18 -l 1 -c 40 -i 5120 -m 5 -o space /dev/fd0a - -# -# mount the new floppy -# -mount /dev/fd0a /mnt - -# -# create required directories -# -mkdir /mnt/dev -mkdir /mnt/bin -mkdir /mnt/sbin -mkdir /mnt/etc -mkdir /mnt/root -mkdir /mnt/mnt # for the root partition -mkdir /mnt/tmp -mkdir /mnt/var - -# -# populate the directories -# -if [ ! -x /sys/compile/MINI/kernel ] -then - cat << EOM -The MINI kernel does not exist, please create one. -Here is an example config file: -# -# MINI -- A kernel to get FreeBSD onto a disk. -# -machine "i386" -cpu "I486_CPU" -ident MINI -maxusers 5 - -options INET # needed for _tcp _icmpstat _ipstat - # _udpstat _tcpstat _udb -options FFS #Berkeley Fast File System -options FAT_CURSOR #block cursor in syscons or pccons -options SCSI_DELAY=15 #Be pessimistic about Joe SCSI device -options NCONS=2 #1 virtual consoles -options USERCONFIG #Allow user configuration with -c XXX - -config kernel root on da0 swap on da0 and da1 dumps on da0 - -device isa0 -device pci0 - -device fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr -device fd0 at fdc0 drive 0 - -device ncr0 - -device scbus0 - -device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr -device npx0 at isa? port "IO_NPX" irq 13 vector npxintr - -device da0 -device da1 -device da2 - -device sa0 - -pseudo-device loop # required by INET -pseudo-device gzip # Exec gzipped a.out's -EOM - exit 1 -fi - -cp -f /sys/compile/MINI/kernel /mnt - -gzip -c -best /sbin/init > /mnt/sbin/init -gzip -c -best /sbin/fsck > /mnt/sbin/fsck -gzip -c -best /sbin/mount > /mnt/sbin/mount -gzip -c -best /sbin/halt > /mnt/sbin/halt -gzip -c -best /sbin/restore > /mnt/sbin/restore - -gzip -c -best /bin/sh > /mnt/bin/sh -gzip -c -best /bin/sync > /mnt/bin/sync - -cp /root/.profile /mnt/root - -chmod 500 /mnt/sbin/init -chmod 555 /mnt/sbin/fsck /mnt/sbin/mount /mnt/sbin/halt -chmod 555 /mnt/bin/sh /mnt/bin/sync -chmod 6555 /mnt/sbin/restore - -# -# create minimum file system table -# -cat > /mnt/etc/fstab <<EOM -/dev/fd0a / ufs rw 1 1 -EOM - -# -# create minimum passwd file -# -cat > /mnt/etc/passwd <<EOM -root:*:0:0:Charlie &:/root:/bin/sh -EOM - -cat > /mnt/etc/master.passwd <<EOM -root::0:0::0:0:Charlie &:/root:/bin/sh -EOM - -chmod 600 /mnt/etc/master.passwd -chmod 644 /mnt/etc/passwd -/usr/sbin/pwd_mkdb -d/mnt/etc /mnt/etc/master.passwd - -# -# umount the floppy and inform the user -# -/sbin/umount /mnt -echo "The floppy has been unmounted and is now ready."]]></programlisting> - - </example> - </sect3> <sect3> @@ -2879,23 +2728,16 @@ <para>If the hardware has been damaged, the parts should be replaced before attempting to use the computer.</para> - <para>If your hardware is okay, check your floppies. If you are using - a custom boot floppy, boot single-user (type <literal>-s</literal> - at the <prompt>boot:</prompt> prompt). Skip the following - paragraph.</para> - - <para>If you are using the <filename>boot.flp</filename> and - <filename>fixit.flp</filename> floppies, keep reading. Insert the - <filename>boot.flp</filename> floppy in the first floppy drive and + <para>If your hardware is okay, insert the + <quote>livefs</quote> CDROM in the CDROM drive and boot the computer. The original install menu will be displayed on - the screen. Select the <literal>Fixit--Repair mode with CDROM or - floppy.</literal> option. Insert the - <filename>fixit.flp</filename> when prompted. + the screen. Select the correct country, then choose + <guimenuitem>Fixit -- Repair mode with CDROM/DVD/floppy or + start a shell.</guimenuitem> option and select the + <guimenuitem>CDROM/DVD -- Use the live filesystem + CDROM/DVD</guimenuitem> item. The tool <command>restore</command> and the other programs that you need are - located in <filename class="directory">/mnt2/rescue</filename> - (<filename class="directory">/mnt2/stand</filename> for - &os; versions older than 5.2).</para> - + located in <filename class="directory">/mnt2/rescue</filename>.</para> <para>Recover each file system separately.</para> <indexterm> @@ -2913,7 +2755,7 @@ bsdlabel was damaged, use <command>bsdlabel</command> to re-partition and label the disk to match the label that you printed and saved. Use <command>newfs</command> to re-create the file systems. Re-mount the root - partition of the floppy read-write (<command>mount -u -o rw + partition of the disk read-write (<command>mount -u -o rw /mnt</command>). Use your backup program and backup tapes to recover the data for this file system (e.g. <command>restore vrf /dev/sa0</command>). Unmount the file system (e.g. <command>umount ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.400 2010/08/08 06:15:24 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.410 2010/08/20 10:09:42 blackend Exp $ --> <chapter id="install"> @@ -75,7 +75,7 @@ <para>In general, these installation instructions are written for &i386; (<quote>PC compatible</quote>) architecture computers. Where applicable, instructions specific to other - platforms (for example, Alpha) will be listed. Although this + platforms will be listed. Although this guide is kept as up to date as possible, you may find minor differences between the installer and what is shown here. It is suggested that you use this chapter as a general guide rather @@ -101,7 +101,7 @@ Depending on the method you choose to install &os;, you may also need a floppy drive, a supported CDROM drive, and in some case a network adapter. This will be covered by the <xref - linkend="install-floppies">.</para> + linkend="install-boot-media">.</para> <sect3> <title>&os;/&arch.i386; and &os;/&arch.pc98;</title> @@ -123,32 +123,14 @@ <indexterm><primary>Alpha</primary></indexterm> - <para>To install &os;/&arch.alpha;, you will need a supported - platform (see <xref linkend="install-hardware-supported">) - and a dedicated disk for &os;. It is not possible to share - a disk with another operating system at this time. This - disk will need to be attached to a SCSI controller which is - supported by the SRM firmware or an IDE disk assuming the - SRM in your machine supports booting from IDE disks.</para> - - <indexterm><primary>ARC</primary></indexterm> - <indexterm><primary>Alpha BIOS</primary></indexterm> - <indexterm><primary>SRM</primary></indexterm> - - <para>You will need the SRM console firmware for your - platform. In some cases, it is possible to switch between - AlphaBIOS (or ARC) firmware and SRM. In others it will be - necessary to download new firmware from the vendor's Web - site.</para> - - <note> <para>Support for the Alpha was removed beginning with &os; 7.0. The &os; 6.<replaceable>X</replaceable> series of releases is the last containing support for this - architecture.</para> - </note> - + architecture. Please check the <ulink + url="http://www.FreeBSD.org/releases/index.html">Release + Information</ulink> page of the &os; web site for more + information.</para> </sect3> <sect3> @@ -402,16 +384,7 @@ <para>You can use a commercial tool such as <application>&partitionmagic;</application>, or a free tool such as <application>GParted</application>, to resize your partitions and make space for - FreeBSD. The <filename>tools</filename> directory on the CDROM - contains two free software tools which can carry out this task, namely - <application>FIPS</application> and - <application>PResizer</application>. Documentation for both - of these is available in the same directory. - <application>FIPS</application>, - <application>PResizer</application>, and - <application>&partitionmagic;</application> can resize - <acronym>FAT16</acronym> and <acronym>FAT32</acronym> - partitions — used in &ms-dos; through &windows; ME. Both + &os;. Both <application>&partitionmagic;</application> and <application>GParted</application> are known to work on <acronym>NTFS</acronym>. <application>GParted</application> @@ -473,58 +446,6 @@ </example> </sect3> - - <sect3> - <title>Disk Layouts for the Alpha</title> - - <indexterm><primary>Alpha</primary></indexterm> - - <para>You will need a dedicated disk for FreeBSD on the - Alpha. It is not possible to share a disk with another - operating system at this time. Depending on the specific - Alpha machine you have, this disk can either be a SCSI disk - or an IDE disk, as long as your machine is capable of - booting from it.</para> - - <para>Following the conventions of the Digital / Compaq - manuals all SRM input is shown in uppercase. SRM is case - insensitive.</para> - - <para>To find the names and types of disks in your machine, use - the <literal>SHOW DEVICE</literal> command from the SRM - console prompt:</para> - - <screen>>>><userinput>SHOW DEVICE</userinput> -dka0.0.0.4.0 DKA0 TOSHIBA CD-ROM XM-57 3476 -dkc0.0.0.1009.0 DKC0 RZ1BB-BS 0658 -dkc100.1.0.1009.0 DKC100 SEAGATE ST34501W 0015 -dva0.0.0.0.1 DVA0 -ewa0.0.0.3.0 EWA0 00-00-F8-75-6D-01 -pkc0.7.0.1009.0 PKC0 SCSI Bus ID 7 5.27 -pqa0.0.0.4.0 PQA0 PCI EIDE -pqb0.0.1.4.0 PQB0 PCI EIDE</screen> - - <para>This example is from a Digital Personal Workstation - 433au and shows three disks attached to the machine. The - first is a CDROM drive called <devicename>DKA0</devicename> and - the other two are disks and are called - <devicename>DKC0</devicename> and - <devicename>DKC100</devicename> respectively.</para> - - <para>Disks with names of the form <devicename>DKx</devicename> - are SCSI disks. For example <devicename>DKA100</devicename> - refers to a SCSI disk with SCSI target ID 1 on the first SCSI bus (A), - whereas <devicename>DKC300</devicename> refers to a SCSI disk - with SCSI ID 3 on the third SCSI bus (C). Devicename <devicename> - PKx</devicename> refers to the SCSI host bus adapter. As - seen in the <literal>SHOW DEVICE</literal> output SCSI - CDROM drives are treated as any other SCSI hard disk drive.</para> - - <para>IDE disks have names similar to <devicename>DQx</devicename>, - while <devicename>PQx</devicename> is the associated IDE - controller.</para> - - </sect3> </sect2> <sect2> @@ -665,16 +586,16 @@ <para>If you have purchased FreeBSD on CD or DVD then you already have everything you need, and should proceed to the next section - (<xref linkend="install-floppies">).</para> + (<xref linkend="install-boot-media">).</para> <para>If you have not obtained the FreeBSD 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 that section, you should come back here, and read on to - <xref linkend="install-floppies">.</para> + <xref linkend="install-boot-media">.</para> </sect2> - <sect2 id="install-floppies"> + <sect2 id="install-boot-media"> <title>Prepare the Boot Media</title> <para>The FreeBSD installation process is started by booting your @@ -757,7 +678,7 @@ must use &man.dd.1; to write the image directly to the disk:</para> - <screen>&prompt.root; <userinput>dd if=&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen> + <screen>&prompt.root; <userinput>dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen> </step> </procedure> @@ -934,9 +855,10 @@ <literal>Floppy</literal>, <literal>CDROM</literal>, <literal>First Hard Disk</literal>, and so on.</para> - <para>If you needed to prepare boot floppies, then make sure that the - floppy disk is selected. If you are booting from the CDROM then - make sure that that is selected instead. In case of doubt, you + <para>If you are booting from the CDROM then make sure that + the CDROM is selected. If you are booting from a USB disk or + a floppy disk then + make sure that is selected instead. In case of doubt, you should consult the manual that came with your computer, and/or its motherboard.</para> @@ -945,16 +867,23 @@ </step> <step> - <para>If you needed to prepare boot floppies, as described in - <xref linkend="install-floppies">, then one of them will be the - first boot disc, probably the one containing - <filename>boot.flp</filename>. Put this disc in your floppy - drive.</para> + <para>If you prepared a <quote>bootable</quote> USB stick, as described in + <xref linkend="install-boot-media">, then plug in your USB + stick before turning on the computer.</para> <para>If you are booting from CDROM, then you will need to turn on the computer, and insert the CDROM at the first opportunity.</para> + <note> + <para>For &os; 7.3 and previous versions, 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> + </note> + <para>If your computer starts up as normal and loads your existing operating system, then either:</para> @@ -982,6 +911,7 @@ will see a display similar to this (version information omitted):</para> <screen>Booting from CD-Rom... +645MB medium detected CD Loader 1.2 Building the boot loader arguments @@ -989,12 +919,12 @@ Relocating the loader and the BTX Starting the BTX loader -BTX loader 1.00 BTX version is 1.01 -Console: internal video/keyboard +BTX loader 1.00 BTX version is 1.02 +Consoles: internal video/keyboard BIOS CD is cd0 BIOS drive C: is disk0 BIOS drive D: is disk1 -BIOS 639kB/261120kB available memory +BIOS 636kB/261056kB available memory FreeBSD/i386 bootstrap loader, Revision 1.1 @@ -1029,7 +959,7 @@ </step> <step> - <para>Whether you booted from floppy or CDROM, the + <para>Whether you booted from CDROM, USB stick or floppy, the boot process will then get to the &os; boot loader menu:</para> @@ -1048,66 +978,7 @@ </procedure> </sect3> - <sect3> - <title>Booting for the Alpha</title> - - <indexterm><primary>Alpha</primary></indexterm> - - <procedure> - <step> - <para>Start with your computer turned off.</para> - </step> - - <step> - <para>Turn on the computer and wait for a boot monitor - prompt.</para> - </step> - - <step> - <para>If you needed to prepare boot floppies, as described in - <xref linkend="install-floppies"> then one of them will be the - first boot disc, probably the one containing - <filename>boot.flp</filename>. Put this disc in your floppy - drive and type the following command to boot the disk - (substituting the name of your floppy drive if - necessary):</para> - - <screen>>>><userinput>BOOT DVA0 -FLAGS '' -FILE ''</userinput></screen> - - <para>If you are booting from CDROM, insert the CDROM into - the drive and type the following command to start the - installation (substituting the name of the appropriate - CDROM drive if necessary):</para> - <screen>>>><userinput>BOOT DKA0 -FLAGS '' -FILE ''</userinput></screen> - </step> - - <step> - <para>FreeBSD will start to boot. If you are booting from a - floppy disc, at some point you will see the message:</para> - - <screen>Insert disk labelled "Kernel floppy 1" and press any key...</screen> - - <para>Follow these instructions by removing the - <filename>boot.flp</filename> disc, insert the - <filename>kern1.flp</filename> disc, and press - <keycap>Enter</keycap>.</para> - </step> - - <step> - <para>Whether you booted from floppy or CDROM, the - boot process will then get to this point:</para> - - <screen>Hit [Enter] to boot immediately, or any other key for command prompt. -Booting [kernel] in 9 seconds... _</screen> - - <para>Either wait ten seconds, or press <keycap>Enter</keycap>. This - will then launch the kernel configuration menu.</para> - </step> - </procedure> - - </sect3> - <sect3> <title>Booting for &sparc64;</title> @@ -1257,7 +1128,7 @@ <para>For &os; 6.2 and later, after the procedure of device probing, you will see <xref linkend="config-country">. Use the arrow key to choose a country, region, or group. Then press - <keycap>Enter</keycap>, it will set your country and keymap + <keycap>Enter</keycap>, it will set your country easily. It is also easy to exit the <application>sysinstall</application> program and start over again. </para> @@ -1272,6 +1143,22 @@ </mediaobject> </figure> + <para>If you selected <guimenuitem>United States</guimenuitem> + as country, the standard American keyboard map will be used, + if a different country is chosen the following menu will be + displayed. Use the arrow keys to choose the correct keyboard + map and press <keycap>Enter</keycap>.</para> + + <figure id="config-keymap"> + <title>Selecting Keyboard Menu</title> + + <mediaobject> + <imageobject> + <imagedata fileref="install/config-keymap" format="PNG"> + </imageobject> + </mediaobject> + </figure> + <figure id="sysinstall-exit"> <title>Select Sysinstall Exit</title> @@ -2213,16 +2100,12 @@ reviewing the help, pressing <keycap>Enter</keycap> will return to the Select Distributions Menu.</para> - <para>If a graphical user interface is desired then a distribution - set that is preceded by an <literal>X</literal> should be - chosen. The configuration of the X server and selection of a default + <para>If a graphical user interface is desired then the + configuration of the X server and selection of a default desktop must be done after the installation of &os;. More - information regarding the configuration of a X server can be + information regarding the installation and configuration of a X server can be found in <xref linkend="x11">.</para> - <para><application>&xorg;</application> is the default version of X11 - that is installed.</para> - <para>If compiling a custom kernel is anticipated, select an option which includes the source code. For more information on why a custom kernel should be built or how to build a custom kernel, see @@ -3164,6 +3047,12 @@ <sect2 id="linuxcomp"> <title>Linux Compatibility</title> + <note> + <para>This part only applies to &os; 7.X installation, if + you install &os; 8.X this screen will not be + proposed.</para> + </note> + <screen> User Confirmation Requested Would you like to enable Linux binary compatibility? @@ -3608,15 +3497,23 @@ confirm exiting the installation:</para> <screen> User Confirmation Requested - Are you sure you wish to exit? The system will reboot (be sure to - remove any floppies/CDs/DVDs from the drives). + Are you sure you wish to exit? The system will reboot. [ Yes ] No</screen> - <para>Select &gui.yes; and remove the floppy if - booting from the floppy. The CDROM drive is locked until the machine - starts to reboot. The CDROM drive is then unlocked and the disk can - be removed from drive (quickly).</para> + <para>Select &gui.yes;. If you are booting from the CDROM drive + the following message will remind you to remove the + disk:</para> + + <screen> Message + Be sure to remove the media from the drive. + + [ OK ] + [ Press enter or space ]</screen> + + <para>The CDROM drive is locked until the machine + starts to reboot then the disk can + be removed from drive (quickly). Press &gui.ok; to reboot.</para> <para>The system will reboot so watch for any error messages that may appear, see <xref linkend="freebsdboot"> for more @@ -4043,30 +3940,6 @@ the command line.</para> </sect3> - - <sect3> - <title>&os;/&arch.alpha; Bootup</title> - - <indexterm><primary>Alpha</primary></indexterm> - - <para>Once the install procedure has finished, you will be - able to start FreeBSD by typing something like this to the - SRM prompt:</para> - - <screen>>>><userinput>BOOT DKC0</userinput></screen> - - <para>This instructs the firmware to boot the specified - disk. To make FreeBSD boot automatically in the future, use - these commands:</para> - - <screen><prompt>>>></prompt> <userinput>SET BOOT_OSFLAGS A</userinput> -<prompt>>>></prompt> <userinput>SET BOOT_FILE ''</userinput> -<prompt>>>></prompt> <userinput>SET BOOTDEF_DEV DKC0</userinput> -<prompt>>>></prompt> <userinput>SET AUTO_ACTION BOOT</userinput></screen> - - <para>The boot messages will be similar (but not identical) to - those produced by FreeBSD booting on the &i386;.</para> - </sect3> </sect2> <sect2 id="shutdown"> @@ -4406,6 +4279,15 @@ </author> <!-- May 2001 --> </authorgroup> + + <authorgroup> + <author> + <firstname>Marc</firstname> + <surname>Fonvieille</surname> + <contrib>Updated by </contrib> + </author> + </authorgroup> + <!-- August 2010 --> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008221140.o7MBevRt091656>