PERFORCE change 141426 for review
John Birrell
jb at FreeBSD.org
Sat May 10 18:49:24 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=141426
Change 141426 by jb at freebsd3 on 2008/05/10 18:48:32
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#74 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#16 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#13 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#19 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#29 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/build#1 branch
.. //depot/projects/dtrace/ports/UPDATING#71 integrate
.. //depot/projects/dtrace/src/UPDATING#31 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-upgrade#4 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-vendor#2 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/INSTALL#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/NEWS#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/aclocal.m4#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/config.guess#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/config.sub#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/configure#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/configure.in#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/dist.mk#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/include/curses.h.in#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/man/curs_threads.3x#2 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/man/form.3x#5 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/man/terminfo.tail#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/misc/terminfo.src#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_addch.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_bkgd.c#5 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_delwin.c#5 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_freeall.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_getch.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_initscr.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newterm.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newwin.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_overlay.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_restart.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_set_term.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_ungetch.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_window.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/resizeterm.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/use_window.c#3 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/wresize.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/curses.priv.h#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/fifo_defs.h#4 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_data.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_napms.c#5 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_options.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_trace.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_tstp.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_twait.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/tty_update.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/progs/dump_entry.c#6 integrate
.. //depot/projects/dtrace/src/contrib/pf/pfctl/parse.y#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#9 integrate
.. //depot/projects/dtrace/src/include/readpassphrase.h#4 integrate
.. //depot/projects/dtrace/src/kerberos5/usr.bin/krb5-config/Makefile#4 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#11 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#11 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/getsockopt.2#8 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/setfib.2#1 branch
.. //depot/projects/dtrace/src/lib/libftpio/ftpio.c#6 integrate
.. //depot/projects/dtrace/src/lib/ncurses/ncurses/ncurses_cfg.h#5 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#20 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#19 integrate
.. //depot/projects/dtrace/src/share/man/man4/malo.4#3 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#42 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#30 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#50 integrate
.. //depot/projects/dtrace/src/sys/conf/options#50 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#15 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/firewire/firewire.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/firewire/fwohci.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#19 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#34 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#38 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#33 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_event.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_lockf.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_param.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_socket.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#32 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.master#24 integrate
.. //depot/projects/dtrace/src/sys/kern/systrace_args.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#25 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_export.c#8 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/pmap.c#3 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#22 integrate
.. //depot/projects/dtrace/src/sys/net/if.c#16 integrate
.. //depot/projects/dtrace/src/sys/net/if_atmsubr.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#17 integrate
.. //depot/projects/dtrace/src/sys/net/if_fwsubr.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.h#4 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.c#12 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.h#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_iso88025subr.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_loop.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/if_stf.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/if_var.h#9 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.c#3 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.h#2 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#15 integrate
.. //depot/projects/dtrace/src/sys/net/route.h#8 integrate
.. //depot/projects/dtrace/src/sys/net/rtsock.c#11 integrate
.. //depot/projects/dtrace/src/sys/netatalk/at_extern.h#5 integrate
.. //depot/projects/dtrace/src/sys/netatalk/at_proto.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.c#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_atm.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_gif.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_mcast.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#22 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_rmx.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_var.h#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fastfwd.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw.h#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#30 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_input.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_mroute.h#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_options.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_output.c#18 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_var.h#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_os_bsd.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#19 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#9 integrate
.. //depot/projects/dtrace/src/sys/netipx/ipx_proto.c#5 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#13 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/bootp_subr.c#7 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#20 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/bus.h#6 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/bus_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#17 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/upa.c#4 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#27 integrate
.. //depot/projects/dtrace/src/sys/sys/domain.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/mbuf.h#17 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#52 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#43 integrate
.. //depot/projects/dtrace/src/sys/sys/socket.h#12 integrate
.. //depot/projects/dtrace/src/sys/sys/socketvar.h#10 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.h#30 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#30 integrate
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#30 integrate
.. //depot/projects/dtrace/src/sys/vm/pmap.h#11 integrate
.. //depot/projects/dtrace/src/usr.bin/netstat/route.c#13 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#25 integrate
.. //depot/projects/dtrace/src/usr.sbin/setfib/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.sbin/setfib/setfib.1#1 branch
.. //depot/projects/dtrace/src/usr.sbin/setfib/setfib.c#1 branch
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#2 (text+ko) ====
@@ -28,7 +28,7 @@
<holder role="mailto:sonicy at otenet.gr">Manolis Kiagias</holder>
</copyright>
- <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v 1.2 2008/02/12 07:40:35 ale Exp $</releaseinfo>
+ <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v 1.3 2008/05/10 13:32:28 blackend Exp $</releaseinfo>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -153,7 +153,7 @@
<para>The driver will create a kernel module, which should be loaded
at system startup. You will need to add the following line to the
- <filename>/boot/loader.conf</filename> file:
+ <filename>/boot/loader.conf</filename> file:</para>
<programlisting>nvidia_load="YES"</programlisting>
@@ -263,9 +263,9 @@
you should be able to perform most of the above settings by
entering the following commands (as root):</para>
- <screen>&prompt.root; nvidia-xconfig --add-argb-glx-visuals
-&prompt.root; nvidia-xconfig --composite
-&prompt.root; nvidia-xconfig --depth=24</screen>
+ <screen>&prompt.root; <userinput>nvidia-xconfig --add-argb-glx-visuals</userinput>
+&prompt.root; <userinput>nvidia-xconfig --composite</userinput>
+&prompt.root; <userinput>nvidia-xconfig --depth=24</userinput></screen>
<para>You may wish to run <command>nvidia-xonfig -A |more</command>
to see a list of all the options offered by the above
@@ -278,12 +278,12 @@
<para>Installing <application>Compiz Fusion</application>
is as simple as any other port:</para>
- <screen>&prompt.root; cd /usr/ports/x11-wm/compiz-fusion
-&prompt.root; make install clean</screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/x11-wm/compiz-fusion</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
<para>Make sure to select the <quote>EXTRA</quote> plugins and the
<quote>EMERALD</quote> window decorator from the options dialog that
- appears. If you are using <application>Gnome</application>, or
+ appears. If you are using <application>GNOME</application>, or
already have support for <command>gconf</command> in your system, you
may also wish to select <quote>gconf support</quote>. In this way,
your effect settings will be integrated with the other desktop settings,
@@ -297,8 +297,8 @@
<para>When the installation is finished, start your graphic desktop and
at a terminal, enter the following commands (as a normal user):</para>
- <screen>compiz --replace --sm-disable --ignore-desktop-hints ccp &
-emerald --replace &</screen>
+ <screen>&prompt.user; <userinput>compiz --replace --sm-disable --ignore-desktop-hints ccp &</userinput>
+&prompt.user; <userinput>emerald --replace &</userinput></screen>
<para>Your screen will flicker for a few seconds, as your window manager
(e.g. <application>Metacity</application> if you are using
@@ -319,7 +319,7 @@
<para>Save this in your home directory as, for example,
<filename>start-compiz</filename> and make it executable:</para>
- <screen>chmod +x ~/start-compiz</screen>
+ <screen>&prompt.user; <userinput>chmod +x ~/start-compiz</userinput></screen>
<para>Then use the GUI to add it to
<guimenuitem>Startup Programs</guimenuitem>
@@ -332,7 +332,7 @@
execute (again as a normal user) the
<application>Compiz Config Settings Manager</application>:</para>
- <screen>ccsm</screen>
+ <screen>&prompt.user; <userinput>ccsm</userinput></screen>
<note>
<para>In <application>GNOME</application>, this can also be found in
@@ -365,8 +365,8 @@
<answer>
<para>You are probably missing a setting in
<filename>/etc/X11/xorg.conf</filename>. Review this file
- carefully and check especially the DefaultDepth and
- AddARGBGLXVisuals directives.</para>
+ carefully and check especially the <literal>DefaultDepth</literal> and
+ <literal>AddARGBGLXVisuals</literal> directives.</para>
</answer>
</qandaentry>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#74 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.931 2008/05/06 04:47:37 sam Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.932 2008/05/09 23:40:39 julian Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -12089,6 +12089,11 @@
to multi-bss support (aka vaps).</entry>
<entry>800036</entry>
</row>
+ <row>
+ <entry>8.0-CURRENT after addition of multi routing
+ table support (a.k.a. setfib(1), setfib(2)) </entry>
+ <entry>800037</entry>
+ </row>
</tbody>
</tgroup>
</table>
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#16 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.283
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.21 2008/05/05 11:29:38 loader Exp $
+ Original Revision: 1.285
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.22 2008/05/09 14:04:32 loader Exp $
-->
<chapter id="disks">
@@ -214,7 +214,7 @@
<userinput>A</userinput> £¬FreeBSD ½«Ê¹ÓÃÈ«²¿µÄ´ÅÅÌ¡£µ±±»¸æÖª
<quote>remain cooperative with any future possible operating
systems</quote>ʱ£¬»Ø´ð <literal>YES</literal>¡£Ê¹ÓÃ
- <userinput>W</userinput> ±£´æ¸Õ²ÅµÄÐ޸ġ£ÏÖÔÚʹÓà <userinput>q</userinput>
+ <keycap>W</keycap> ±£´æ¸Õ²ÅµÄÐ޸ġ£ÏÖÔÚʹÓà <keycap>Q</keycap>
Í˳ö FDISK ±à¼Æ÷¡£ÏÂÃæ»á¿´µ½ÓÐ¹Ø <quote>Ö÷Òýµ¼Çø</quote>
µÄÐÅÏ¢¡£ ÏÖÔÚÄúÒѾÔÚÔËÐеÄϵͳÉÏÌí¼ÓÁËÒ»¸ö´ÅÅÌ£¬
Òò´ËÓ¦¸ÃÑ¡Ôñ <literal>None</literal>¡£</para>
@@ -236,7 +236,7 @@
ģʽÏ´ú±íÕû¸ö slice¡£ÆäËü·ÖÇø×÷Ϊһ°ã·ÖÇøÀ´Ê¹Óá£</para>
<para><application>sysinstall</application> µÄ±êÇ©±à¼Æ÷Óà <literal>e</literal>
- ±íʾ·Ç root ºÍ·Ç swap ·ÖÇø¡£ÔÚ±êÇ©±à¼Æ÷ÖУ¬¿ÉÒÔʹÓüüÈë<userinput>C</userinput>
+ ±íʾ·Ç root ºÍ·Ç swap ·ÖÇø¡£ÔÚ±êÇ©±à¼Æ÷ÖУ¬¿ÉÒÔʹÓüüÈë <keycap>C</keycap>
´´½¨Ò»¸öÎļþϵͳ¡£µ±ÌáʾÕâÊÇ·ñÊÇÒ»¸ö FS£¨Îļþϵͳ£©»ò swap ʱ£¬Ñ¡Ôñ
<literal>FS</literal>£¬È»ºó¸ø³öÒ»¸ö¼ÓÔص㣨È磺 <filename>/mnt</filename>£©¡£
µ±ÔÚ post-install ģʽʱÌí¼ÓÒ»¸ö´ÅÅÌ£¬ <application>sysinstall</application>
@@ -244,7 +244,7 @@
</para>
<para>ÏÖÔÚÒѾ׼±¸°Ñбêǩдµ½´ÅÅÌÉÏ£¬È»ºó´´½¨Ò»¸öÎļþϵͳ£¬¿ÉÒÔ°´ÏÂ
- <userinput>W</userinput>¡£³öÏÖÈκδíÎ󶼻᲻ÄÜ´´½¨ÐµķÖÇø¡£¿ÉÒÔÍ˳ö±êÇ©±à¼
+ <keycap>W</keycap>¡£³öÏÖÈκδíÎ󶼻᲻ÄÜ´´½¨ÐµķÖÇø¡£¿ÉÒÔÍ˳ö±êÇ©±à¼
Æ÷È»ºóÖØÐÂÖ´ÐÐ <application>sysinstall</application> ¡£</para>
</step>
@@ -756,17 +756,17 @@
<para>×îºóÒ»²½ÊÇ´´½¨½«Òª¹Ò½ÓÎļþϵͳµÄĿ¼¡£
Õâ¸öĿ¼±ØÐëÊÇÊôÓÚ½«Òª¹Ò½ÓÎļþϵͳµÄÓû§µÄ¡£
ÒÔ <username>root</username> Éí·ÝΪÓû§½¨Á¢ÊôÓÚ¸ÃÓû§µÄ
- <filename>/mnt/<replaceable>$USER</replaceable></filename>
- (´Ë´¦ <replaceable>$USER</replaceable> Ó¦Ìæ»»³ÉÓû§µÄµÇ¼Ãû)£º</para>
+ <filename>/mnt/<replaceable>username</replaceable></filename>
+ (´Ë´¦ <replaceable>username</replaceable> Ó¦Ìæ»»³ÉÓû§µÄµÇ¼Ãû)£º</para>
- <screen>&prompt.root; <userinput>mkdir /mnt/$USER</userinput>
-&prompt.root; <userinput>chown <replaceable>$USER</replaceable>:<replaceable>$USER</replaceable> /mnt/<replaceable>$USER</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>mkdir /mnt/<replaceable>username</replaceable></userinput>
+&prompt.root; <userinput>chown <replaceable>user</replaceable>:<replaceable>user</replaceable> /mnt/<replaceable>user</replaceable></userinput></screen>
<para>¼ÙÉèÒѾ²åÈëÁËÒ»¸ö USB ¶Á¿¨É豸£¬ ²¢ÇÒϵͳ½«Æäʶ±ðΪ
<filename>/dev/da0s1</filename>£¬ ÓÉÓÚÕâЩÉ豸ͨ³£ÊÇ FAT
Îļþϵͳ£¬ Óû§¿ÉÒÔÕâÑù¹Ò½ÓËüÃÇ£º</para>
- <screen>&prompt.user; <userinput>mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/<replaceable>$USER</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/<replaceable>username</replaceable></userinput></screen>
<para>Èç¹û°Î³öÉ豸 (±ØÐëÊ×ÏȽ«Æä¶ÔÓ¦µÄ´ÅÅ̾íжÏÂ)£¬
ÔòÄú»áÔÚϵͳÏûÏ¢»º³åÇøÖп´µ½ÀàËÆÏÂÃæµÄÐÅÏ¢£º</para>
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#13 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
- Original Revision: 1.181
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.17 2008/04/21 06:46:26 loader Exp $
+ Original Revision: 1.183
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.18 2008/05/09 14:04:32 loader Exp $
-->
<chapter id="kernelconfig">
@@ -241,10 +241,11 @@
Ŀ¼ÏÂÃ棬 ¸´ÖÆ <filename>GENERIC</filename> ÅäÖÃÎļþ£¬
²¢¸øÕâ¸öÎļþÆðÒ»¸öÈÝÒ×±æÈϵÄÃû³Æ£¬ Ëü¾ÍÊÇÄúµÄÄÚºËÃû³Æ¡£ÀýÈ磺</para>
<screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf</userinput>
-&prompt.root; <userinput>cp GENERIC MYKERNEL</userinput></screen>
+&prompt.root; <userinput>cp GENERIC <replaceable>MYKERNEL</replaceable></userinput></screen>
<para>ͨ³££¬Õâ¸öÃû³ÆÊÇ´óдµÄ£¬Èç¹ûÄúÕýά»¤×Ŷą̀²»Í¬Ó²¼þµÄ&os;»úÆ÷£¬
- ÒÔÄú»úÆ÷µÄÓòÃûÀ´ÃüÃûÊǷdz£ºÃµÄÖ÷Òâ¡£ÎÒÃÇ°ÑËüÃüÃûΪ<filename>MYKERNEL</filename>¾ÍÊÇÕâ¸öÔÒò¡£
+ ÒÔÄú»úÆ÷µÄÓòÃûÀ´ÃüÃûÊǷdz£ºÃµÄÖ÷Òâ¡£ÎÒÃÇ°ÑËüÃüÃûΪ
+ <filename><replaceable>MYKERNEL</replaceable></filename>¾ÍÊÇÕâ¸öÔÒò¡£
</para>
<tip>
@@ -277,7 +278,8 @@
</para>
</note>
- <para>ÏÖÔھͿÉÒÔÓÃÄúϲ»¶µÄÎı¾±à¼Æ÷À´±à¼ <filename>MYKERNEL</filename> ÁË¡£
+ <para>ÏÖÔھͿÉÒÔÓÃÄúϲ»¶µÄÎı¾±à¼Æ÷À´±à¼
+ <filename><replaceable>MYKERNEL</replaceable></filename> ÁË¡£
Èç¹ûÄú¸Õ¸Õ¿ªÊ¼Ê¹Óà FreeBSD£¬ Ψһ¿ÉÓõıà¼Æ÷ºÜ¿ÉÄÜÊÇ
<application>vi</application>£¬ ËüµÄʹÓñȽϸ´ÔÓ£¬ ÏÞÓÚƪ·ù£¬
ÕâÀï²»Óè½éÉÜ£¬ Äú¿ÉÒÔÔÚ <link
@@ -462,7 +464,7 @@
<programlisting>ident GENERIC</programlisting>
<para>ÕâÊÇÄں˵ÄÃû×Ö¡£ ÄúÓ¦¸ÃÈ¡Ò»¸ö×Ô¼ºµÄÃû×Ö£¬
- ÀýÈçÈ¡Ãû½Ð <literal>MYKERNEL</literal>£¬
+ ÀýÈçÈ¡Ãû½Ð <literal><replaceable>MYKERNEL</replaceable></literal>£¬
Èç¹ûÄúÒ»Ö±ÔÚ°´ÕÕÇ°ÃæµÄ˵Ã÷×öµÄ»°¡£
Äú·ÅÔÚ
<literal>ident</literal> ºóÃæµÄ×Ö·û´®ÔÚÆô¶¯ÄÚºËʱ»áÏÔʾ³öÀ´£¬
@@ -1282,7 +1284,7 @@
·ñÔòÀàËÆ &man.ps.1; ÕâÑùµÄÃüÁî¿ÉÄÜÎÞ·¨Õý³£¹¤×÷¡£
ΪÁËÍê³ÉÕâÒ»µã£¬ ÐèÒªÐÞ¸ÄĿ¼µÄÃû×Ö£º</para>
- <screen>&prompt.root; <userinput>mv /boot/kernel /boot/kernel.bad</userinput>
+ <screen>&prompt.root; <userinput>mv /boot/kernel <replaceable>/boot/kernel.bad</replaceable></userinput>
&prompt.root; <userinput>mv /boot/<replaceable>kernel.good</replaceable> /boot/kernel</userinput></screen>
</note>
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#9 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.177
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml,v 1.11 2008/02/09 13:33:15 loader Exp $
+ Original Revision: 1.179
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml,v 1.12 2008/05/09 14:04:32 loader Exp $
-->
<chapter id="ppp-and-slip">
@@ -233,7 +233,11 @@
<sect3>
<title><application>PPP</application>×Ô¶¯»¯ÅäÖÃ</title>
- <indexterm><primary>PPP</primary><secondary>configuration</secondary></indexterm>
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>configuration</secondary>
+ </indexterm>
+
<para> <command>ppp</command>ºÍ<command>pppd</command>(PPPµÄÄں˼¶ÊµÏÖ)
¶¼Ê¹ÓÃ<filename>/etc/ppp</filename>Ŀ¼ÖеÄÅäÖÃÎļþ¡£ Óû§¼¶ PPP
µÄÀý×Ó¿ÉÒÔÔÚ <filename>/usr/share/examples/ppp/</filename> ÖÐÕÒµ½¡£</para>
@@ -245,7 +249,11 @@
<sect4 id="userppp-staticIP">
<title>PPPºÍ¾²Ì¬IPµØÖ·</title>
- <indexterm><primary>PPP</primary><secondary>with static IP addresses</secondary></indexterm>
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>with static IP addresses</secondary>
+ </indexterm>
+
<para>ÄúÐèÒª±à¼ÅäÖÃÎļþ<filename>/etc/ppp/ppp.conf</filename>£¬ ÈçÏÂËùʾ¡£</para>
<note>
@@ -256,7 +264,7 @@
<programlisting>1 default:
2 set log Phase Chat LCP IPCP CCP tun command
3 ident user-ppp VERSION (built COMPILATIONDATE)
-4 set device /dev/cuaa0
+4 set device /dev/cuad0
5 set speed 115200
6 set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \
7 \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT"
@@ -305,8 +313,11 @@
<listitem>
<para>±êÃ÷modemÒªÁ¬½ÓµÄ¶Ë¿ÚºÅ¡£ <devicename>COM1</devicename> ¶ÔÓ¦µÄÉ豸ÊÇ
- <filename>/dev/cuaa0</filename>£¬ ¶ø <devicename>COM2</devicename>
- ¶ÔÓ¦µÄÔòÊÇ <filename>/dev/cuaa1</filename>¡£</para>
+ <filename>/dev/cuad0</filename>£¨»òÕß &os; 5.X ÏÂ
+ <filename>/dev/cuaa0</filename>£©
+ ¶ø <devicename>COM2</devicename>
+ ¶ÔÓ¦µÄÔòÊÇ <filename>/dev/cuad1</filename>£¨»òÕß
+ <filename>/dev/cuaa1</filename>£©¡£</para>
</listitem>
</varlistentry>
@@ -322,7 +333,11 @@
<varlistentry>
<term>ÐÐ 6 & 7£º</term>
- <indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm>
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>user PPP</secondary>
+ </indexterm>
+
<listitem>
<para>²¦ºÅ×Ö·û´®¡£ Óû§¼¶ PPP ʹÓÃÒ»ÖÖÓë &man.chat.8;³ÌÐòÏàËƵÄÓï·¨¡£
Çë²Î¿¼Áª»úÊÖ²áÁ˽âÕâÖÖÓïÑÔµÄÏà¹ØÐÅÏ¢¡£</para>
@@ -472,8 +487,16 @@
<sect4 id="userppp-dynamicIP">
<title>PPPºÍ¶¯Ì¬IPµØÖ·</title>
- <indexterm><primary>PPP</primary><secondary>with dynamic IP addresses</secondary></indexterm>
- <indexterm><primary>IPCP</primary></indexterm>
+
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>with dynamic IP addresses</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>IPCP</primary>
+ </indexterm>
+
<para>Èç¹ûISPû¸øÄúÖ¸¶¨¾²Ì¬µÄIPµØÖ·£¬ <command>ppp</command>Òª±»ÅäÖóÉÄܹ»Óë¶Ô·½ÐÉÌÈ·¶¨±¾µØºÍÔ¶³ÌµØÖ·¡£
ÒªÍê³ÉÕâÏ×÷£¬ ÏÈÒª<quote>²Â</quote>Ò»¸öIPµØÖ·£¬ È»ºóÔÊÐí
<command>ppp</command>ÔÚÁ¬½ÓºóʹÓÃIPÅäÖÃÐÒé(IPCP)½øÐÐÕýÈ·ÅäÖá£
@@ -542,8 +565,12 @@
<sect4>
<title>½ÓÊÕ²¦Èë</title>
- <indexterm><primary>PPP</primary><secondary>receiving
- incoming calls</secondary></indexterm>
+
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>receiving incoming calls</secondary>
+ </indexterm>
+
<para>µ±ÒªÅäÖà <application>ppp</application>½ÓÊÜÀ´×ÔLANÉϵÄ
²¦Èëʱ£¬ ÄúÐèÒª¾ö¶¨ÊÇ·ñ½«°üת¸øLAN¡£ Èç¹ûÊǵĻ°£¬ Äú¾Í±ØÐë´Ó LAN
×ÓÍøÖиø¶Ô·½·ÖÅäÒ»¸öIP£¬ ÐèÒªÔÚÎļþ <filename>/etc/ppp/ppp.conf</filename>
@@ -582,7 +609,7 @@
<para><command>ppp</command> ÃüÁîͨ³£±ØÐëÒÔ <username>root</username>
Óû§µÄÉí·ÝÔËÐС£ Èç¹ûÏ£ÍûÒÔÆÕͨÓû§µÄÉí·ÝÆô¶¯ <command>ppp</command>
·þÎñ (¾ÍÏñÏÂÃæÃèÊöµÄÄÇÑù)£¬ ¾Í±ØÐë°Ñ´ËÓû§¼ÓÈë
- <username>network</username> ×飬 ʹÆä»ñµÃÔËÐÐ <command>ppp</command>
+ <groupname>network</groupname> ×飬 ʹÆä»ñµÃÔËÐÐ <command>ppp</command>
µÄȨÏÞ¡£</para>
<para>Äú»¹ÐèҪʹÓÃ<command>allow</command>ÃüÁîʹÓû§ÄÜ·ÃÎÊÅäÖÃÎÄ
@@ -595,7 +622,10 @@
<sect4>
<title>¶¯Ì¬IPÓû§µÄPPP Shell</title>
- <indexterm><primary>PPP shells</primary></indexterm>
+
+ <indexterm>
+ <primary>PPP shells</primary>
+ </indexterm>
<para>´´½¨Ò»¸öÃûΪ<filename>/etc/ppp/ppp-shell</filename>Îļþ£¬ ¼ÓÈëÒÔÏÂÄÚÈÝ£º</para>
<programlisting>#!/bin/sh
@@ -637,7 +667,10 @@
<sect4>
<title>¾²Ì¬IPÓû§µÄShell </title>
- <indexterm><primary>PPP shells</primary></indexterm>
+
+ <indexterm>
+ <primary>PPP shells</primary>
+ </indexterm>
<para>ÏñÉÏÃæÄÇÑù´´½¨<filename>ppp-shell</filename>Îļþ£¬
Ϊÿ¸ö¾²Ì¬·ÖÅäIPÓû§´´½¨Ò»¸öµ½ <filename>ppp-shell</filename>µÄ
@@ -717,11 +750,18 @@
<sect4 id="userppp-mgetty">
<title><command>mgetty</command>ºÍAutoPPP</title>
+
+ <indexterm>
+ <primary><command>mgetty</command></primary>
+ </indexterm>
+
<indexterm>
- <primary><command>mgetty</command></primary>
- </indexterm>
- <indexterm><primary>AutoPPP</primary></indexterm>
- <indexterm><primary>LCP</primary></indexterm>
+ <primary>AutoPPP</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>LCP</primary>
+ </indexterm>
<para>ÔÚÅäÖúͱàÒë<command>mgetty</command>
ʱÆôÓà <literal>AUTO_PPP</literal>Ñ¡Ïî
@@ -768,9 +808,19 @@
<sect4>
<title>MS Extensions</title>
- <indexterm><primary>DNS</primary></indexterm>
- <indexterm><primary>NetBIOS</primary></indexterm>
- <indexterm><primary>PPP</primary><secondary>Microsoft extensions</secondary></indexterm>
+
+ <indexterm>
+ <primary>DNS</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>NetBIOS</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>PPP</primary><secondary>Microsoft extensions</secondary>
+ </indexterm>
+
<para>¿ÉÒÔÅäÖÃPPPÒÔÌṩDNSºÍNetBIOSÓòÃû·þÎñÆ÷µØÖ·¡£</para>
<para>ÒªÔÚ PPP 1.x °æ±¾ÖÐÆôÓÃÕâЩÀ©Õ¹£¬ ÐèÒªÔÚ
@@ -873,12 +923,16 @@
<sect3 id="userppp-nat">
<title>ʹÓÃPPPÍøÂçµØÖ··Òë</title>
- <indexterm><primary>PPP</primary><secondary>NAT</secondary></indexterm>
+
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>NAT</secondary>
+ </indexterm>
<para>PPP ¿ÉÒÔʹÓÃÄÚ½¨µÄ NAT£¬ ¶øÎÞÐèÄÚºËÖ§³Ö¡£
Äú¿ÉÒÔÔÚ <filename>/etc/ppp/ppp.conf</filename> ÖмÓÈëÈçÏÂÅäÖÃÀ´ÆôÓÃËü£º</para>
- <programlisting>nat enable yes</programlisting>
+ <programlisting>nat enable yes</programlisting>
<para> PPP NATÒ²¿ÉÒÔʹÓÃÃüÁîÐÐÑ¡Ïî
<literal>-nat</literal>Æô¶¯¡£ ÔÚ
@@ -886,20 +940,23 @@
<literal>ppp_nat</literal> Ï ²¢Ä¬ÈÏÆôÓá£</para>
<para>Èç¹ûÄúʹÓÃÁËÕâ¸öÌØÐÔ£¬ Äú»¹»á·¢ÏÖÔÚ
-<filename>/etc/ppp/ppp.conf</filename>ÖÐÒÔÏÂ
- Ñ¡Ïî¶ÔÓÚÆôÓÃincoming connections forwardingÊÇÓÐÓõģº</para>
+ <filename>/etc/ppp/ppp.conf</filename>ÖÐÒÔÏÂ
+ Ñ¡Ïî¶ÔÓÚÆôÓÃincoming connections forwardingÊÇÓÐÓõģº</para>
- <programlisting>nat port tcp 10.0.0.2:ftp ftp
+ <programlisting>nat port tcp 10.0.0.2:ftp ftp
nat port tcp 10.0.0.2:http http</programlisting>
<para>»òÕßÍêÈ«²»ÐÅÈÎÍâÀ´µÄÇëÇó</para>
- <programlisting>nat deny_incoming yes</programlisting>
+ <programlisting>nat deny_incoming yes</programlisting>
</sect3>
<sect3 id="userppp-final">
<title>×îºóµÄϵͳÅäÖÃ</title>
- <indexterm><primary>PPP</primary><secondary>configuration</secondary></indexterm>
+
+ <indexterm>
+ <primary>PPP</primary><secondary>configuration</secondary>
+ </indexterm>
<para>ÏÖÔÚÄúÒÑÅäÖÃÁË<command>ppp</command>£¬ µ«ÔÚÕæÕý¹¤×÷֮ǰ»¹ÓÐһЩÊÂÇéÒª×ö¡£
¼´ÐÞ¸Ä <filename>/etc/rc.conf</filename>¡£</para>
@@ -931,13 +988,15 @@
</note>
<para>Îñ±ØÔÚ
- <filename>/etc/rc.conf</filename> ÖУ¬ °Ñ·ÓɳÌÐòÉèÖÃΪ <literal>NO</literal>£º</para>
+ <filename>/etc/rc.conf</filename> ÖУ¬
+ °Ñ·ÓɳÌÐòÉèÖÃΪ <literal>NO</literal>£º</para>
<programlisting>router_enable="NO"</programlisting>
<indexterm>
- <primary><application>routed</application></primary>
- </indexterm>
+ <primary><application>routed</application></primary>
+ </indexterm>
+
<para>²»Æô¶¯ <command>routed</command> ·þÎñ³ÌÐò·Ç³£ÖØÒª£¬ ÒòΪ
<command>routed</command> ×Ü»áɾµôÓÉ <command>ppp</command>
Ëù½¨Á¢µÄĬÈÏ·ÓÉ¡£</para>
@@ -965,7 +1024,10 @@
3 add 0 0 HISADDR
4 !bg sendmail -bd -q30m</programlisting>
- <indexterm><primary>SMTP</primary></indexterm>
+ <indexterm>
+ <primary>SMTP</primary>
+ </indexterm>
+
<para>Èç¹ûÄú²»Ï²»¶ÕâÑù×ö£¬ ¿ÉÒÔÉèÁ¢Ò»¸ö
<quote>dfilter</quote> ÒÔ×èÖ¹ SMTP ´«Êä¡£
²Î¿¼Ïà¹ØÎļþÁ˽â¸ü¶àϸ½Ú¡£</para>
@@ -1080,7 +1142,11 @@
<sect2>
<title>ÉèÁ¢Äں˼¶PPP</title>
- <indexterm><primary>PPP</primary><secondary>kernel PPP</secondary></indexterm>
+
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>kernel PPP</secondary>
+ </indexterm>
<para>ÔÚ¿ªÊ¼ÉèÖÃÄں˼¶PPPʱ£¬ ÐèҪȷÐÅ<command>pppd</command>ÒѾ±»¶¨Î»ÔÚ<filename>/usr/sbin</filename> ÖÐ
ÇÒ´æÔÚ<filename>/etc/ppp</filename>Ŀ¼¡£</para>
@@ -1093,7 +1159,11 @@
ÄúҪͨ¹ýPPP´®ÐÐÏß»òmodemÏß°ÑÄúµÄ»úÆ÷Á¬½Óµ½»¥ÁªÍøÉÏ¡£</para>
</listitem>
- <indexterm><primary>PPP</primary><secondary>server</secondary></indexterm>
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>server</secondary>
+ </indexterm>
+
<listitem>
<para>×÷Ϊ<quote>·þÎñÆ÷</quote> —¼ÆËã»úÒѾλÓÚÍøÂçÉÏ£¬ ÇÒ±»ÓÃÓÚͨ¹ýPPPÓëÆäËü¼ÆËã»úÁ¬½Ó¡£</para>
</listitem>
@@ -1120,8 +1190,16 @@
</sect2info>
<title>ʹÓÃ<command>pppd</command>×÷Ϊ¿Í»§¶Ë</title>
- <indexterm><primary>PPP</primary><secondary>client</secondary></indexterm>
- <indexterm><primary>Cisco</primary></indexterm>
+
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>client</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>Cisco</primary>
+ </indexterm>
+
<para>ÏÂÃæÕâ¸ö <filename>/etc/ppp/options</filename>Ñ¡ÏîÎļþÄܹ»±»ÓÃÀ´ÓëCISCOÖն˷þÎñÆ÷µÄ
PPPÏßÁ¬½Ó¡£</para>
@@ -1133,10 +1211,10 @@
passive # wait for LCP packets
domain ppp.foo.com # put your domain name here
-:<remote_ip> # put the IP of remote PPP host here
+:<replaceable>remote_ip</replaceable> # put the IP of remote PPP host here
# it will be used to route packets via PPP link
# if you didn't specified the noipdefault option
- # change this line to <local_ip>:<remote_ip>
+ # change this line to <replaceable>local_ip</replaceable>:<replaceable>remote_ip</replaceable>
defaultroute # put this if you want that PPP server will be your
# default router</programlisting>
@@ -1191,7 +1269,10 @@
kermit -y /etc/ppp/kermit.dial
pppd /dev/tty01 19200</programlisting>
- <indexterm><primary>Kermit</primary></indexterm>
+ <indexterm>
+ <primary>Kermit</primary>
+ </indexterm>
+
<para><filename>/etc/ppp/kermit.dial</filename> ÊÇÒ»¸ö <application>Kermit</application>
½Å±¾£¬ Ëü»áÍê³É²¦ºÅ£¬ ²¢ÔÚÔ¶³ÌÖ÷»úÉÏÍê³ÉËùÓÐÐèÒªµÄÉí·ÝÑéÖ¤¹ý³Ì
(Õâ·ÝÎĵµµÄ×îºóÓÐÒ»¸ö½Å±¾ÊµÀý)¡£</para>
@@ -1217,7 +1298,8 @@
kermit -y /etc/ppp/kermit.hup
/etc/ppp/ppptest</programlisting>
- <para>ͨ¹ýÖ´ÐÐ<filename>/usr/etc/ppp/ppptest</filename>£¬ ¿´¿´<command>pppd</command> ÊÇ·ñÈÔÔÚÔËÐУº</para>
+ <para>ͨ¹ýÖ´ÐÐ<filename>/usr/etc/ppp/ppptest</filename>£¬
+ ¿´¿´<command>pppd</command> ÊÇ·ñÈÔÔÚÔËÐУº</para>
<programlisting>#!/bin/sh
pid=`pgrep pppd`
@@ -1259,7 +1341,7 @@
<para><filename>/etc/ppp/options</filename>£º</para>
- <programlisting>/dev/cuaa1 115200
+ <programlisting>/dev/cuad1 115200
crtscts # enable hardware flow control
modem # modem control line
@@ -1268,12 +1350,12 @@
# if the remote host doesn't send your IP during
# IPCP negotiation, remove this option
passive # wait for LCP packets
-domain <your.domain> # put your domain name here
+domain <replaceable>your.domain</replaceable> # put your domain name here
: # put the IP of remote PPP host here
# it will be used to route packets via PPP link
# if you didn't specified the noipdefault option
- # change this line to <local_ip>:<remote_ip>
+ # change this line to <replaceable>local_ip</replaceable>:<replaceable>remote_ip</replaceable>
defaultroute # put this if you want that PPP server will be
# your default router</programlisting>
@@ -1284,9 +1366,9 @@
<para>ÒÔϵÄÄÚÈÝÓ¦¸Ã·ÅÔÚÒ»ÐÐÄÚ¡£</para>
</note>
- <programlisting>ABORT BUSY ABORT 'NO CARRIER' "" AT OK ATDT<phone.number>
- CONNECT "" TIMEOUT 10 ogin:-\\r-ogin: <login-id>
- TIMEOUT 5 sword: <password></programlisting>
+ <programlisting>ABORT BUSY ABORT 'NO CARRIER' "" AT OK ATDT<replaceable>phone.number</replaceable>
+ CONNECT "" TIMEOUT 10 ogin:-\\r-ogin: <replaceable>login-id</replaceable>
+ TIMEOUT 5 sword: <replaceable>password</replaceable></programlisting>
<para>Ò»µ©ÕâЩ±»°²×°ÇÒÐÞ¸ÄÕýÈ·£¬ ÄúËùÒª×öµÄ¾ÍÊÇÔËÐÐ<command>pppd</command>£¬ ¾ÍÏñÕâÑù£º</para>
@@ -1519,7 +1601,10 @@
</sect1info>
<title><acronym>PPP</acronym> Á¬½Ó¹ÊÕÏÅųý</title>
- <indexterm><primary>PPP</primary><secondary>troubleshooting</secondary></indexterm>
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>troubleshooting</secondary>
+ </indexterm>
<para>±¾½Ú½«½²Êöͨ¹ýmodemÁ¬½ÓʹÓÃPPPʱ¿ÉÄܳöÏÖµÄÎÊÌâ¡£
ÀýÈ磬 Äú¿ÉÄÜÐèҪȷÇеØÖªµÀÄú²¦ÈëµÄϵͳ»á³öÏÖÒ»¸öÔõÑùµÄÃüÁîÐÐÌáʾ·û¡£
@@ -1543,7 +1628,9 @@
Äú¾Í»áÔÚ <devicename>sio1</devicename> »ò <devicename>COM2</devicename>
ÉÏÕÒµ½Ëü¡£ Èç¹û modem É豸Á¬½ÓÔÚ <devicename>sio1</devicename>
½Ó¿Ú (ÔÚ DOS ÖгÆΪ<devicename>COM2</devicename>)£¬
- ÄÇôÄúµÄ modem ½«»áÊÇ <filename>/dev/cuaa1</filename>¡£</para>
+ ÄÇôÄúµÄ modem ½«»áÊÇ <filename>/dev/cuad1</filename>
+ £¨»òÕß &os;nbsp;5.X ϵÄ
+ <filename>/dev/cuaa1</filename>£©¡£</para>
</sect2>
<sect2>
@@ -1560,10 +1647,11 @@
<para>ÏÖÔÚÎÒÃÇÒѾ´ò¿ªÁË<command>ppp</command>¡£</para>
- <screen>ppp ON example> <userinput>set device <filename>/dev/cuaa1</filename></userinput></screen>
+ <screen>ppp ON example> <userinput>set device <filename>/dev/cuad1</filename></userinput></screen>
<para>ÉèÖÃmodemÉ豸£¬ ÔÚ±¾Àý×ÓÖÐÊÇ
- <devicename>cuaa1</devicename>¡£</para>
+ <devicename>cuad1</devicename> £¨»òÕß &os; 5.X ϵÄ
+ <filename>/dev/cuaa1</filename>£©¡£</para>
<screen>ppp ON example> <userinput>set speed 115200</userinput></screen>
@@ -1579,7 +1667,7 @@
<para>Çл»µ½ <quote>ÖÕ¶Ë</quote>ÑùÎÒÃǾÍÄÜÊÖ¶¯µØ¿ØÖÆÕą̂ modem µÄģʽ¡£</para>
- <programlisting>deflink: Entering terminal mode on <filename>/dev/cuaa1</filename>
+ <programlisting>deflink: Entering terminal mode on <filename>/dev/cuad1</filename>
type '~h' for help</programlisting>
<screen><userinput>at</userinput>
@@ -1733,7 +1821,12 @@
</sect1info>
<title>ʹÓûùÓÚÒÔÌ«ÍøµÄPPP(PPPoE)</title>
- <indexterm><primary>PPP</primary><secondary>over Ethernet</secondary></indexterm>
+
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>over Ethernet</secondary>
+ </indexterm>
+
<indexterm>
<primary>PPPoE</primary>
<see>PPP, over Ethernet (ÒÔÌ«ÍøÉ쵀 PPP)</see>
@@ -1840,10 +1933,12 @@
<sect2 id="ppp-3com">
- <title>´øÓÐÒ»¸ö&tm.3com; <trademark class="registered">HomeConnect</trademark>ADSL ModemµÄPPPOEË«ÖØÁ¬½Ó</title>
+ <title>´øÓÐÒ»¸ö&tm.3com;
+ <trademark class="registered">HomeConnect</trademark>
+ ADSL ModemµÄPPPOEË«ÖØÁ¬½Ó</title>
<para>Õâ¸ö modem ²»×ñÑ <ulink
- url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516</ulink>
+ url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516</ulink>
(<emphasis>A Method for transmitting PPP over Ethernet
(PPPoE)</emphasis>£¬ Æä×÷ÕßΪ L. Mamakos¡¢ K. Lidl¡¢ J. Evarts¡¢
D. Carrel¡¢ D. Simone ÒÔ¼° R. Wheeler)¡£
@@ -1870,7 +1965,12 @@
<sect1 id="pppoa">
<title>ʹÓà ATM É쵀 <application>PPP</application> (PPPoA)</title>
- <indexterm><primary>PPP</primary><secondary>over ATM</secondary></indexterm>
+
+ <indexterm>
+ <primary>PPP</primary>
+ <secondary>over ATM</secondary>
+ </indexterm>
+
<indexterm>
<primary>PPPoA</primary>
<see>»ùÓÚATMµÄPPP</see>
@@ -2123,17 +2223,17 @@
<para>Ê×ÏÈ£¬ ÄúÐèҪȷÈϵ÷Öƽâµ÷Æ÷ËùÁ¬½ÓµÄ´®¿Ú¡£
Ðí¶àÈË»áÉèÖÃÒ»¸ö·ûºÅÁ¬½Ó£¬ ÀýÈç
<filename>/dev/modem</filename>£¬ ÓÃÒÔÖ¸Ïòʵ¼ÊµÄÉ豸Ãû£¬
- <filename>/dev/cuaaN</filename> (»òÔÚ &os; 6.X ÏÂÊÇ
- <filename>/dev/cuadN</filename>)¡£ ÕâÑùÄú¾Í¿ÉÒÔ¶Ôʵ¼ÊµÄÉ豸Ãû½øÐгéÏó£¬
+ <filename>/dev/cuadN</filename> (»òÔÚ &os; 5.X ÏÂÊÇ
+ <filename>/dev/cuaaN</filename>)¡£ ÕâÑùÄú¾Í¿ÉÒÔ¶Ôʵ¼ÊµÄÉ豸Ãû½øÐгéÏó£¬
ÒÔ±¸µ÷Öƽâµ÷Æ÷»»µ½ÆäËû´®¿Úʱ·½±ãµ÷ÕûÖ®Óá£
²»È»£¬ ÔÚϵͳÖÐÐÞ¸ÄÒ»´ó¶Ñ <filename>/etc</filename> ϵÄÎļþÒÔ¼°
<filename>.kermrc</filename> ½«ÊǷdz£Âé·³µÄÊÂÇ飡</para>
<note>
- <para><filename>/dev/cuaa0</filename> (»ò &os; 6.X
- ÖÐµÄ <filename>/dev/cuad0</filename>) ¶ÔÓ¦
- <devicename>COM1</devicename>£¬ ¶ø <filename>cuaa1</filename>
- (»ò <filename>/dev/cuad1</filename>) Ôò¶ÔÓ¦
+ <para><filename>/dev/cuad0</filename> (»ò &os; 5.X
+ Ï嵀 <filename>/dev/cuaa0</filename>) ¶ÔÓ¦
+ <devicename>COM1</devicename>£¬ ¶ø <filename>cuad1</filename>
+ (»ò <filename>/dev/cuaa1</filename>) Ôò¶ÔÓ¦
<devicename>COM2</devicename>£¬ µÈµÈ¡£</para>
</note>
@@ -2223,7 +2323,12 @@
<sect3>
<title>´´½¨Ò»¸öSLIPÁ¬½Ó</title>
- <indexterm><primary>SLIP</primary><secondary>connecting with</secondary></indexterm>
+
+ <indexterm>
+ <primary>SLIP</primary>
+ <secondary>connecting with</secondary>
+ </indexterm>
+
<procedure>
<step>
<para>ÔÚÃüÁîÌáʾ·ûÖ®ºóÊäÈë <command>slip</command> ½øÐв¦ºÅ£¬
@@ -2247,8 +2352,8 @@
output ***\x0d, echo \x0aCONNECTED\x0a</programlisting>
<para>µ±È»£¬ Äú»¹ÐèÒªÐÞ¸ÄÓû§ÃûºÍ¿ÚÁîÀ´Âú×ãʵ¼ÊÐèÒª¡£
- Íê³ÉÕâЩ²Ù×÷Ö®ºó£¬ Ö»ÐèÔÚ <application>Kermit</application> Ìáʾ·ûÖ®ºóÊäÈë
- <command>slip</command> ¾Í¿ÉÒÔÁ¬½ÓÁË¡£</para>
+ Íê³ÉÕâЩ²Ù×÷Ö®ºó£¬ Ö»ÐèÔÚ <application>Kermit</application>
+ Ìáʾ·ûÖ®ºóÊäÈë <command>slip</command> ¾Í¿ÉÒÔÁ¬½ÓÁË¡£</para>
<note>
<para>½«ÃÜÂëÒÔ´¿Îı¾µÄÐÎʽ´æ·ÅÔÚÎļþϵͳÎÞÂÛÈçºÎ¶¼ÊǸö <emphasis>»µ</emphasis> Ö÷Òâ¡£
@@ -2352,7 +2457,11 @@
<sect2 id="slips">
<title>ÉèÖÃSLIP·þÎñÆ÷</title>
- <indexterm><primary>SLIP</primary><secondary>server</secondary></indexterm>
+
+ <indexterm>
+ <primary>SLIP</primary>
+ <secondary>server</secondary>
+ </indexterm>
<para>±¾ÎÄÌṩÁËÔÚ FreeBSD ÉÏÉèÖà SLIP ·þÎñ£¬
Ò²¾ÍÊÇÈçºÎÅäÖÃÄúµÄϵͳ£¬ ʹÆäÄÜÔÚÔ¶³Ì SLIP
@@ -2423,8 +2532,8 @@
<programlisting>/etc/sliphome/slip.login 0 19200 Shelmerg dc-slip sl-helmer 0xfffffc00 autocomp</programlisting>
<para>Èç¹ûÒ»ÇÐ˳Àû
- <filename>/etc/sliphome/slip.login</filename> ½«ÔÚ <command>sliplogin</command>
- °ó¶¨µÄ SLIP ½Ó¿ÚÉÏ·¢³ö
+ <filename>/etc/sliphome/slip.login</filename> ½«ÔÚ
+ <command>sliplogin</command> °ó¶¨µÄ SLIP ½Ó¿ÚÉÏ·¢³ö
<command>ifconfig</command> (Ç°ÊöµÄÀý×ÓÖÐÊÇ SLIP ½Ó¿Ú
0£¬ ÕâÊÇ <filename>slip.login</filename> µÄµÚÒ»¸ö²ÎÊý)£¬
ÒÔÉèÖñ¾µØ IP µØÖ· (<hostid>dc-slip</hostid>)¡¢ Ô¶³Ì IP µØÖ·
@@ -2433,7 +2542,8 @@
ÒÔ¼°ÈκÎÆäËû±êÖ¾ (<literal>autocomp</literal>)¡£
Èç¹û·¢Éú´íÎó£¬ <command>sliplogin</command> ͨ³£»áͨ¹ý
<application>syslogd</application> µÄ daemon facility
- ¼ÇÏÂÓÐÓõÄÐÅÏ¢£¬ Ç°Õß»á°ÑÕâЩÐÅÏ¢±£´æµ½ <filename>/var/log/messages</filename>
+ ¼ÇÏÂÓÐÓõÄÐÅÏ¢£¬ Ç°Õß»á°ÑÕâЩÐÅÏ¢±£´æµ½
+ <filename>/var/log/messages</filename>
(²Î¼û &man.syslogd.8; ºÍ &man.syslog.conf.5; ÒÔ¼°
<filename>/etc/syslog.conf</filename> µÄÁª»úÊֲᣬ ÒÔÁ˽â
<application>syslogd</application> ÔڼǼʲô£¬
@@ -2443,8 +2553,15 @@
<sect3>
<title>ÄÚºËÅäÖÃ</title>
- <indexterm><primary>kernel</primary><secondary>configuration</secondary></indexterm>
- <indexterm><primary>SLIP</primary></indexterm>
+
+ <indexterm>
+ <primary>kernel</primary>
+ <secondary>configuration</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>SLIP</primary>
+ </indexterm>
<para>&os; µÄĬÈÏÄÚºË (<filename>GENERIC</filename>)
ÌṩÁË SLIP (&man.sl.4;) Ö§³Ö£» ʹÓö¨ÖƵÄÄÚºËʱ£¬
@@ -2597,11 +2714,16 @@
IP ½Úµã¶Ô SLIP ¿Í»§¶Ë IP µØÖ·½øÐÐ ARP ÇëÇóʱ£¬
SLIP ·þÎñÆ÷»áÒÔ×ÔÒѵÄÒÔÌ«ÍøMACµØÖ·×÷Ϊ»ØÓ¦¡£</para>
- <indexterm><primary>Ethernet (ÒÔÌ«Íø)</primary><secondary>MAC address (MAC µØÖ·)</secondary></indexterm>
+ <indexterm>
+ <primary>Ethernet (ÒÔÌ«Íø)</primary>
+ <secondary>MAC address (MAC µØÖ·)</secondary>
+ </indexterm>
+
<para>µ±Ê¹ÓÃÒÔÉϵÄÀý×Óʱ£¬ Ò»¶¨Òª½«
- ÒÔÌ«ÍøMACµØÖ·(<hostid role="mac">00:11:22:33:44:55</hostid>)Ìæ»»³ÉÄúϵͳÍø¿¨µÄMACµØÖ·£¬ ·ñÔò<quote>ARP´úÀí</quote>½«
- ÍêÈ«ÎÞ·¨¹¤×÷!Äú¿ÉÒԲ鿴<command>netstat -i</command>Êä³ö½á¹ûÒÔÈ¡µÃÒÔÌ«ÍøMACµØÖ·;
- Êä³öµÄµÚ¶þÐÐÓ¦¸ÃÊÇÕâÑù£º</para>
+ ÒÔÌ«ÍøMACµØÖ· £¨<hostid role="mac">00:11:22:33:44:55</hostid>£©
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list