PERFORCE change 90949 for review
Alan Cox
alc at FreeBSD.org
Thu Feb 2 18:40:42 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=90949
Change 90949 by alc at alc_home on 2006/02/03 02:39:48
IFC @90949
Affected files ...
.. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#5 integrate
.. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml#2 integrate
.. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml#2 integrate
.. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml#2 integrate
.. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml#3 integrate
.. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/multimedia/chapter.sgml#3 integrate
.. //depot/projects/superpages/src/UPDATING#4 integrate
.. //depot/projects/superpages/src/contrib/openbsm/CHANGELOG#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/LICENSE#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/README#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/TODO#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/VERSION#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/audit/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/audit/audit.8#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/audit/audit.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/audit_warn.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/auditd.8#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/auditd.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/auditd.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/praudit/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/praudit/praudit.1#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bin/praudit/praudit.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bsm/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bsm/audit.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_internal.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_kevents.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_record.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_uevents.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/bsm/libbsm.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/compat/endian.h#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/etc/audit_class#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/etc/audit_control#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/etc/audit_event#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/etc/audit_user#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/etc/audit_warn#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_class.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_control.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_event.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_free_token.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_io.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_mask.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_token.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_user.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_audit.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_class.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_control.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_event.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_flags.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_io.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_mask.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_notify.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_token.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_user.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/libbsm/libbsm.3#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/audit.2#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/audit.log.5#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/audit_class.5#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/audit_control.5#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/audit_event.5#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/audit_user.5#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/audit_warn.5#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/auditctl.2#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/auditon.2#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/getaudit.2#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/getauid.2#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/setaudit.2#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/man/setauid.2#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/tools/Makefile#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/tools/audump.c#1 branch
.. //depot/projects/superpages/src/etc/Makefile#3 integrate
.. //depot/projects/superpages/src/etc/defaults/rc.conf#6 integrate
.. //depot/projects/superpages/src/etc/mtree/BSD.var.dist#2 integrate
.. //depot/projects/superpages/src/etc/rc.d/Makefile#5 integrate
.. //depot/projects/superpages/src/etc/rc.d/auditd#1 branch
.. //depot/projects/superpages/src/etc/rc.d/hostapd#1 branch
.. //depot/projects/superpages/src/games/fortune/datfiles/fortunes#5 integrate
.. //depot/projects/superpages/src/lib/Makefile#4 integrate
.. //depot/projects/superpages/src/lib/libbsm/Makefile#1 branch
.. //depot/projects/superpages/src/lib/libc/stdlib/malloc.3#3 integrate
.. //depot/projects/superpages/src/release/picobsd/bridge/config#2 integrate
.. //depot/projects/superpages/src/release/picobsd/bridge/crunch.conf#2 integrate
.. //depot/projects/superpages/src/release/picobsd/build/picobsd#2 integrate
.. //depot/projects/superpages/src/sbin/geom/class/concat/geom_concat.c#4 integrate
.. //depot/projects/superpages/src/sbin/geom/class/eli/geli.8#3 integrate
.. //depot/projects/superpages/src/sbin/geom/class/eli/geom_eli.c#4 integrate
.. //depot/projects/superpages/src/sbin/geom/class/label/geom_label.c#3 integrate
.. //depot/projects/superpages/src/sbin/geom/class/mirror/geom_mirror.c#3 integrate
.. //depot/projects/superpages/src/sbin/geom/class/nop/geom_nop.c#3 integrate
.. //depot/projects/superpages/src/sbin/geom/class/raid3/geom_raid3.c#3 integrate
.. //depot/projects/superpages/src/sbin/geom/class/shsec/geom_shsec.c#3 integrate
.. //depot/projects/superpages/src/sbin/geom/class/stripe/geom_stripe.c#3 integrate
.. //depot/projects/superpages/src/sbin/geom/core/geom.c#3 integrate
.. //depot/projects/superpages/src/sbin/geom/core/geom.h#2 integrate
.. //depot/projects/superpages/src/sbin/geom/misc/subr.c#3 integrate
.. //depot/projects/superpages/src/sbin/geom/misc/subr.h#3 integrate
.. //depot/projects/superpages/src/share/man/man4/Makefile#5 integrate
.. //depot/projects/superpages/src/share/man/man4/audit.4#1 branch
.. //depot/projects/superpages/src/share/man/man4/le.4#1 branch
.. //depot/projects/superpages/src/share/man/man4/man4.i386/Makefile#3 integrate
.. //depot/projects/superpages/src/share/man/man4/man4.i386/ce.4#2 integrate
.. //depot/projects/superpages/src/share/man/man4/man4.i386/cs.4#4 integrate
.. //depot/projects/superpages/src/share/man/man4/man4.i386/ep.4#4 integrate
.. //depot/projects/superpages/src/share/man/man4/man4.sparc64/sbus.4#2 integrate
.. //depot/projects/superpages/src/share/man/man4/ng_pppoe.4#3 integrate
.. //depot/projects/superpages/src/share/man/man4/pcn.4#3 integrate
.. //depot/projects/superpages/src/share/man/man4/pty.4#3 integrate
.. //depot/projects/superpages/src/share/man/man4/vlan.4#3 integrate
.. //depot/projects/superpages/src/share/man/man5/devfs.rules.5#3 integrate
.. //depot/projects/superpages/src/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/superpages/src/share/man/man8/picobsd.8#2 integrate
.. //depot/projects/superpages/src/share/man/man9/Makefile#5 integrate
.. //depot/projects/superpages/src/share/man/man9/condvar.9#2 integrate
.. //depot/projects/superpages/src/share/man/man9/mutex.9#2 integrate
.. //depot/projects/superpages/src/share/man/man9/rwlock.9#1 branch
.. //depot/projects/superpages/src/share/man/man9/sema.9#2 integrate
.. //depot/projects/superpages/src/share/man/man9/sx.9#2 integrate
.. //depot/projects/superpages/src/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/superpages/src/sys/bsm/audit.h#2 integrate
.. //depot/projects/superpages/src/sys/bsm/audit_internal.h#1 branch
.. //depot/projects/superpages/src/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/superpages/src/sys/bsm/audit_record.h#1 branch
.. //depot/projects/superpages/src/sys/coda/coda_vnops.c#3 integrate
.. //depot/projects/superpages/src/sys/conf/NOTES#7 integrate
.. //depot/projects/superpages/src/sys/conf/files#9 integrate
.. //depot/projects/superpages/src/sys/conf/files.i386#3 integrate
.. //depot/projects/superpages/src/sys/conf/files.sparc64#3 integrate
.. //depot/projects/superpages/src/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/superpages/src/sys/dev/bge/if_bgereg.h#4 integrate
.. //depot/projects/superpages/src/sys/dev/pci/vga_pci.c#2 integrate
.. //depot/projects/superpages/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/concat/g_concat.c#4 integrate
.. //depot/projects/superpages/src/sys/geom/concat/g_concat.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/eli/g_eli.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/eli/g_eli.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/eli/g_eli_crypto.c#2 integrate
.. //depot/projects/superpages/src/sys/geom/eli/g_eli_ctl.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/eli/g_eli_key.c#2 integrate
.. //depot/projects/superpages/src/sys/geom/eli/pkcs5v2.c#2 integrate
.. //depot/projects/superpages/src/sys/geom/eli/pkcs5v2.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/gate/g_gate.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/gate/g_gate.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/label/g_label.c#2 integrate
.. //depot/projects/superpages/src/sys/geom/label/g_label.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/label/g_label_iso9660.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/label/g_label_msdosfs.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/label/g_label_ufs.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/mirror/g_mirror.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/mirror/g_mirror.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate
.. //depot/projects/superpages/src/sys/geom/nop/g_nop.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/raid3/g_raid3.c#4 integrate
.. //depot/projects/superpages/src/sys/geom/raid3/g_raid3.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate
.. //depot/projects/superpages/src/sys/geom/shsec/g_shsec.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/shsec/g_shsec.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/stripe/g_stripe.c#3 integrate
.. //depot/projects/superpages/src/sys/geom/stripe/g_stripe.h#2 integrate
.. //depot/projects/superpages/src/sys/geom/zero/g_zero.c#3 integrate
.. //depot/projects/superpages/src/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/superpages/src/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/superpages/src/sys/kern/tty_pts.c#5 integrate
.. //depot/projects/superpages/src/sys/kern/vfs_lookup.c#3 integrate
.. //depot/projects/superpages/src/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/superpages/src/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/superpages/src/sys/modules/Makefile#6 integrate
.. //depot/projects/superpages/src/sys/modules/le/Makefile#1 branch
.. //depot/projects/superpages/src/sys/net/if_bridge.c#7 integrate
.. //depot/projects/superpages/src/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/superpages/src/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/superpages/src/sys/netinet/ip_ipsec.c#1 branch
.. //depot/projects/superpages/src/sys/netinet/ip_ipsec.h#1 branch
.. //depot/projects/superpages/src/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/superpages/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/superpages/src/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/superpages/src/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/superpages/src/sys/pci/agp_i810.c#3 integrate
.. //depot/projects/superpages/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/superpages/src/sys/sys/vnode.h#4 integrate
.. //depot/projects/superpages/src/sys/ufs/ufs/ufs_extattr.c#4 integrate
.. //depot/projects/superpages/src/sys/vm/vm_object.c#8 integrate
.. //depot/projects/superpages/src/sys/vm/vnode_pager.c#4 integrate
.. //depot/projects/superpages/src/tools/regression/geom_eli/nokey.t#1 branch
.. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate
.. //depot/projects/superpages/src/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate
.. //depot/projects/superpages/www/en/developers.sgml#5 integrate
.. //depot/projects/superpages/www/en/news/news.xml#7 integrate
.. //depot/projects/superpages/www/en/projects/ideas/index.sgml#2 integrate
.. //depot/projects/superpages/www/en/releases/6.1R/todo.sgml#5 integrate
.. //depot/projects/superpages/www/es/includes.xsl#5 integrate
.. //depot/projects/superpages/www/share/sgml/advisories.xml#5 integrate
Differences ...
==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.162 2006/01/05 20:03:37 delphij Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.163 2006/02/02 14:17:52 jcamou Exp $
-->
<chapter id="kernelconfig">
@@ -376,7 +376,7 @@
<tip>
<para>By default, when you build a custom kernel,
- <emphasis>all</emphasis> kernel modules also will be rebuilded.
+ <emphasis>all</emphasis> kernel modules will be rebuilt as well.
If you want to update a kernel faster or to build only custom
modules, you should edit <filename>/etc/make.conf</filename>
before starting to build the kernel:</para>
==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#5 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.406 2006/01/28 11:50:13 pav Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.407 2006/01/31 20:03:05 brd Exp $
-->
<appendix id="mirrors">
@@ -387,7 +387,6 @@
(Use <command>cvs login</command> and enter the password
<quote>anoncvs</quote> when prompted.)</para>
</listitem>
- <!-- anoncvs.FreeBSD.org is sufferring hardware troubles at the moment ...
<listitem>
<para><emphasis>USA</emphasis>:
freebsdanoncvs at anoncvs.FreeBSD.org:/home/ncvs
@@ -397,7 +396,6 @@
SSH2 HostKey: 1024 52:02:38:1a:2f:a8:71:d3:f5:83:93:8d:aa:00:6f:65 ssh_host_dsa_key.pub</programlisting>
</listitem>
- -->
<listitem>
<para><emphasis>USA</emphasis>:
anoncvs at anoncvs1.FreeBSD.org:/home/ncvs (ssh only - no
==== //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml#2 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml,v 1.26 2005/07/23 12:13:12 marck Exp $
- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml,v 1.117 2005/07/23 12:10:04 marck Exp $
+ $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml,v 1.27 2006/01/31 20:22:47 bvs Exp $
+ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml,v 1.119 2006/01/29 17:32:56 gad Exp $
- Original revision: 1.367
+ Original revision: 1.376
-->
<chapter id="advanced-networking">
@@ -58,7 +58,7 @@
</listitem>
<listitem>
- <para>ëÁË ÎÁÓÔÒÏÉÔØ ATM × &os; 5.X.</para>
+ <para>ëÁË ÎÁÓÔÒÏÉÔØ ATM.</para>
</listitem>
</itemizedlist>
@@ -869,7 +869,7 @@
ÐÒÉ ÐÏÍÏÝÉ &man.sysctl.8;:</para>
<screen>&prompt.root; <userinput>sysctl net.link.ether.bridge.enable=1</userinput>
-&prompt.root; <userinput>sysctl net.link.ether.bridge.config="wi0,xl0"</userinput>
+&prompt.root; <userinput>sysctl net.link.ether.bridge.config="wi0 xl0"</userinput>
&prompt.root; <userinput>sysctl net.inet.ip.forwarding=1</userinput></screen>
<para>÷ ×ÅÒÓÉÑÈ &os;, ÐÒÅÄÛÅÓÔ×ÕÀÝÉÈ 5.2, ×ÍÅÓÔÏ ÕËÁÚÁÎÎÙÈ ÎÕÖÎÏ
@@ -1226,7 +1226,7 @@
&man.ndis.4;. ðÏÄ <username>root</username>:</para>
<screen>&prompt.root; <userinput>cd /usr/src/sys/modules/ndis</userinput>
-&prompt.root; <userinput>make && make install</userinput></screen>
+&prompt.root; <userinput>make && make install</userinput></screen>
<para>ïÐÒÅÄÅÌÉÔÅ ÍÅÓÔÏÐÏÌÏÖÅÎÉÅ ÆÁÊÌÏ× ÄÌÑ ×ÁÛÅÊ ËÁÒÔÙ. ïÂÙÞÎÏ
ÉÈ ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ ×ÈÏÄÑÝÅÍ × ËÏÍÐÌÅËÔ CD ÉÌÉ ÎÁ Web-ÓÁÊÔÅ
@@ -1308,7 +1308,7 @@
<contrib>ôÅËÓÔ ÐÒÅÄÏÓÔÁ×ÉÌ </contrib>
<affiliation>
- <address><email>pav at oook.cz</email></address>
+ <address><email>pav at FreeBSD.org</email></address>
</affiliation>
</author>
</authorgroup>
@@ -1364,6 +1364,11 @@
ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3,
wMaxPacketSize=49, nframes=6, buffer size=294</screen>
+ <note>
+ <para>óÔÅË ÐÒÏÔÏËÏÌÏ× Bluetooth ÚÁÐÕÓËÁÅÔÓÑ ×ÒÕÞÎÕÀ ×Ï &os; 6.0, É ×Ï
+ &os; 5.X, ÐÅÒÅÄ 5.5. üÔÏ ÄÅÌÁÅÔÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ ÞÅÒÅÚ &man.devd.8;
+ ×Ï &os; 5.5, 6.1 É × ÂÏÌÅÅ ÎÏ×ÙÈ ×ÅÒÓÉÑÈ.</para>
+
<para>óËÏÐÉÒÕÊÔÅ ÆÁÊÌ
<filename>/usr/share/examples/netgraph/bluetooth/rc.bluetooth</filename>
× ËÁËÏÅ-ÎÉÂÕÄØ ÐÏÄÈÏÄÑÝÅÅ ÍÅÓÔÏ, ÎÁÐÒÉÍÅÒ, × ÆÁÊÌ
@@ -1385,6 +1390,7 @@
Number of ACL packets: 8
Max. SCO packet size: 64 bytes
Number of SCO packets: 8</screen>
+ </note>
</sect2>
<indexterm><primary>HCI</primary></indexterm>
@@ -1619,8 +1625,17 @@
ÚÁÐÒÏÓÉÔØ PIN-ËÏÄ. ÷×ÅÄÉÔÅ ÔÏÔ ÖÅ ÓÁÍÙÊ ËÏÄ, ÞÔÏ ÎÁÈÏÄÉÔÓÑ ×
<filename>hcsecd.conf</filename>. ôÅÐÅÒØ ×ÁÛ ðë É ÕÄÁÌ£ÎÎÏÅ ÕÓÔÒÏÊÓÔ×Ï
ÓÐÁÒÅÎÙ. áÌØÔÅÒÎÁÔÉ×ÎÙÍ ÓÐÏÓÏÂÏÍ Ñ×ÌÑÅÔÓÑ ÉÎÉÃÉÁÃÉÑ ÐÒÏÃÅÓÓÁ ÓÏÚÄÁÎÉÑ
- ÐÁÒÙ ÎÁ ÕÄÁÌ£ÎÎÏÍ ÕÓÔÒÏÊÓÔ×Å. îÉÖÅ ÄÁ£ÔÓÑ ÐÒÉÍÅÒ ×ÙÄÁÞÉ ÐÒÏÔÏËÏÌÁ
- ËÏÍÁÎÄÙ <command>hcsecd</command>:</para>
+ ÐÁÒÙ ÎÁ ÕÄÁÌ£ÎÎÏÍ ÕÓÔÒÏÊÓÔ×Å.</para>
+
+ <para>÷Ï &os; 5.5, 6.1 É × ÂÏÌÅÅ ÎÏ×ÙÈ, ÓÌÅÄÕÀÝÁÑ ÓÔÒÏËÁ ÍÏÖÅÔ ÂÙÔØ
+ ÄÏÂÁ×ÌÅÎÁ Ë <filename>/etc/rc.conf</filename>, ÞÔÏÂÙ
+ <application>hcsecd</application> ÚÁÐÕÓËÁÌÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ ×Ï ×ÒÅÍÑ ÓÔÁÒÔÁ
+ ÓÉÓÔÅÍÙ:</para>
+
+ <programlisting>hcsecd_enable="YES"</programlisting>
+
+ <para>îÉÖÅ ÄÁ£ÔÓÑ ÐÒÉÍÅÒ ×ÙÄÁÞÉ ÐÒÏÔÏËÏÌÁ
+ ËÏÍÁÎÄÙ <application>hcsecd</application>:</para>
<programlisting>hcsecd[16484]: Got Link_Key_Request event from 'ubt0hci', remote bdaddr 0:80:37:29:19:a4
hcsecd[16484]: Found matching entry, remote bdaddr 0:80:37:29:19:a4, name 'Pav's T39', link key doesn't exist
@@ -1699,7 +1714,19 @@
<screen>&prompt.user; <userinput>sdpcontrol -a 00:01:03:fc:6e:ec search OPUSH</userinput></screen>
<para>÷Ï &os; ÐÒÅÄÏÓÔÁ×ÌÅÎÉÅ ÓÅÒ×ÉÓÏ× ËÌÉÅÎÔÁÍ Bluetooth ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ
- ÓÅÒ×ÅÒÏÍ &man.sdpd.8;:</para>
+ ÓÅÒ×ÅÒÏÍ &man.sdpd.8;. ÷Ï &os; 5.5, 6.1 É × ÂÏÌÅÅ ÎÏ×ÙÈ, ÓÌÅÄÕÀÝÁÑ ÓÔÒÏËÁ
+ ÍÏÖÅÔ ÂÙÔØ ÄÏÂÁ×ÌÅÎÁ × ÆÁÊÌ <filename>/etc/rc.conf</filename>:</para>
+
+ <programlisting>sdpd_enable="YES"</programlisting>
+
+ <para>ðÏÓÌÅ ÜÔÏÇÏ <application>sdpd</application> ÄÁÅÍÏÎ ÍÏÖÅÔ ÂÙÔØ ÚÁÐÕÝÅÎ
+ Ó ÐÏÍÏÝØÀ:</para>
+
+ <screen>&prompt.root; <userinput>/etc/rc.d/sdpd start</userinput></screen>
+
+ <para>÷Ï &os; 6.0, É ×Ï &os; 5.X ÐÅÒÅÄ 5.5,
+ <application>sdpd</application> ÎÅ ÉÎÔÅÇÒÉÒÏ×ÁÎ × ÓËÒÉÐÔÙ ÚÁÇÒÕÚËÉ
+ ÓÉÓÔÅÍÙ. ïÎ ÄÏÌÖÅÎ ÚÁÐÕÓËÁÔØÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ ËÏÍÁÎÄÏÊ:</para>
<screen>&prompt.root; <userinput>sdpd</userinput></screen>
@@ -2748,7 +2775,7 @@
<programlisting>#!/bin/sh
export DESTDIR=/data/misc/diskless
mkdir -p ${DESTDIR}
-cd /usr/src; make world && make kernel
+cd /usr/src; make world && make kernel
cd /usr/src/etc; make distribution</programlisting>
<para>ëÁË ÔÏÌØËÏ ÜÔÏ ÂÕÄÅÔ ÓÄÅÌÁÎÏ, ×ÁÍ ÍÏÖÅÔ ÐÏÔÒÅÂÏ×ÁÔØÓÑ
@@ -3343,6 +3370,12 @@
ÄÒÕÇÏÊ ÄÌÑ ÐÏÄËÌÀÞÅÎÉÑ Ë ì÷ó. ÷ÓÅ ÍÁÛÉÎÙ × ÌÏËÁÌØÎÏÊ ÓÅÔÉ
ÐÏÄËÌÀÞÁÀÔÓÑ ÞÅÒÅÚ ÓÅÔÅ×ÏÊ ËÏÎÃÅÎÔÒÁÔÏÒ ÉÌÉ ËÏÍÍÕÔÁÔÏÒ.</para>
+ <note>
+ <para>óÕÝÅÓÔ×ÕÅÔ ÍÎÏÇÏ ÓÐÏÓÏÂÏ× ÐÏÄÓÏÅÄÉÎÉÔØ ÌÏËÁÌØÎÕÀ ÓÅÔØ Ë
+ Internet ÞÅÒÅÚ ÛÌÀÚ &os;. üÔÏÔ ÐÒÉÍÅÒ ÐÏËÁÚÙ×ÁÅÔ ÛÌÀÚ c
+ Ä×ÕÍÑ ÓÅÔÅ×ÙÍÉ ËÁÒÔÁÍÉ.</para>
+ </note>
+
<mediaobject>
<imageobject>
<imagedata fileref="advanced-networking/natd">
@@ -3881,9 +3914,10 @@
<itemizedlist>
<listitem>
<para>îÅÈ×ÁÔËÁ ÁÄÒÅÓÏ×. óÅÇÏÄÎÑ ÜÔÏ ÎÅ ÔÁËÁÑ ÂÏÌØÛÁÑ ÐÒÏÂÌÅÍÁ, ÔÁË ËÁË
- ÓÔÁÌÉ ÐÒÉÍÅÎÑÔØÓÑ ÁÄÒÅÓÎÙÅ ÐÒÏÓÔÒÁÎÓÔ×Á ÄÌÑ ÞÁÓÔÎÙÈ ÓÅÔÅÊ
- (<hostid role="ipaddr">10.0.0.0/8</hostid>, <hostid
- role="ipaddr">192.168.0.0/24</hostid> É ÔÁË ÄÁÌÅÅ) É ÔÅÈÎÏÌÏÇÉÑ
+ ÓÔÁÌÉ ÐÒÉÍÅÎÑÔØÓÑ ÁÄÒÅÓÎÙÅ ÐÒÏÓÔÒÁÎÓÔ×Á ÄÌÑ ÞÁÓÔÎÙÈ ÓÅÔÅÊ (RFC1918)
+ (<hostid role="ipaddr">10.0.0.0/8</hostid>,
+ <hostid role="ipaddr">172.16.0.0/12</hostid> É <hostid
+ role="ipaddr">192.168.0.0/24</hostid>) É ÔÅÈÎÏÌÏÇÉÑ
ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÓÅÔÅ×ÙÈ ÁÄÒÅÓÏ× (<acronym>NAT</acronym> - Network
Address Translation).</para>
</listitem>
@@ -4163,8 +4197,8 @@
<screen>&prompt.root; <userinput>ifconfig gif0 create</userinput>
&prompt.root; <userinput>ifconfig gif0</userinput>
gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280
-&prompt.root; <userinput>ifconfig gif0 tunnel <replaceable>MY_IPv4_ADDR</replaceable> <replaceable>HIS_IPv4_ADDR</replaceable></userinput>
-&prompt.root; <userinput>ifconfig gif0 inet6 alias <replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable></userinput></screen>
+&prompt.root; <userinput>ifconfig gif0 tunnel <replaceable>MY_IPv4_ADDR MY_IPv4_REMOTE_TUNNEL_ENDPOINT_ADDR</replaceable></userinput>
+&prompt.root; <userinput>ifconfig gif0 inet6 alias <replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR MY_IPv6_REMOTE_TUNNEL_ENDPOINT_ADDR</replaceable></userinput></screen>
<para>úÁÍÅÎÉÔÅ ÓÌÏ×Á, ÎÁÐÉÓÁÎÎÙÅ ÚÁÇÌÁ×ÎÙÍÉ ÂÕË×ÁÍÉ, ÉÎÆÏÒÍÁÃÉÅÊ, ËÏÔÏÒÕÀ
×ÁÍ ÄÁÌ ×ÙÛÅÓÔÏÑÝÉÊ ÕÚÅÌ 6bone.</para>
@@ -4351,7 +4385,7 @@
</authorgroup>
</sect1info>
- <title>áÓÉÎÈÒÏÎÎÙÊ ÒÅÖÉÍ ÐÅÒÅÄÁÞÉ (ATM) × &os; 5.X</title>
+ <title>áÓÉÎÈÒÏÎÎÙÊ ÒÅÖÉÍ ÐÅÒÅÄÁÞÉ (ATM)</title>
<sect2>
<title>ëÌÁÓÓÉÞÅÓËÁÑ ÎÁÓÔÒÏÊËÁ IP ÞÅÒÅÚ ATM (PVC)</title>
==== //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml#2 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml,v 1.18 2005/06/14 06:56:28 andy Exp $
- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml,v 1.35 2005/05/04 18:00:39 andy Exp $
+ $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml,v 1.19 2006/01/31 20:22:47 bvs Exp $
+ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml,v 1.36 2006/01/29 16:34:11 gad Exp $
- Original revision: 1.137
+ Original revision: 1.142
-->
<chapter id="basics">
@@ -164,7 +164,7 @@
<para>ìÀÂÏÊ ÍÎÏÇÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÉÓÔÅÍÅ ÎÕÖÅÎ ÓÐÏÓÏ ÏÔÌÉÞÁÔØ ËÁÖÄÏÇÏ
<quote>ÐÏÌØÚÏ×ÁÔÅÌÑ</quote> ÏÔ ÏÓÔÁÌØÎÙÈ. ÷ FreeBSD (É ×ÓÅÈ
- &unix; ÐÏÄÏÂÎÙÈ ÏÐÅÒÁÃÉÏÎÎÙÈ ÓÉÓÔÅÍÁÈ), ÜÔÁ ÚÁÄÁÞÁ ÒÅÛÁÅÔÓÑ ÐÕÔÅÍ
+ &unix;-ÐÏÄÏÂÎÙÈ ÏÐÅÒÁÃÉÏÎÎÙÈ ÓÉÓÔÅÍÁÈ), ÜÔÁ ÚÁÄÁÞÁ ÒÅÛÁÅÔÓÑ ÐÕÔÅÍ
<quote>×ÈÏÄÁ</quote> ÐÏÌØÚÏ×ÁÔÅÌÑ × ÓÉÓÔÅÍÕ ÐÅÒÅÄ ÚÁÐÕÓËÏÍ ËÁËÉÈ-ÌÉÂÏ
ÐÒÏÇÒÁÍÍ. õ ËÁÖÄÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ ÅÓÔØ ÕÎÉËÁÌØÎÏÅ ÉÍÑ (<quote>ÉÍÑ
ÐÏÌØÚÏ×ÁÔÅÌÑ</quote>) É ÐÅÒÓÏÎÁÌØÎÙÊ, ÓÅËÒÅÔÎÙÊ ËÌÀÞ
@@ -594,8 +594,8 @@
<sect2info>
<authorgroup>
<author>
- <firstname>ôÏÍ</firstname>
- <surname>òÏÄÅÓ</surname>
+ <firstname>Tom</firstname>
+ <surname>Rhodes</surname>
<contrib>ôÅËÓÔ ÐÒÅÄÏÓÔÁ×ÉÌ </contrib>
</author>
</authorgroup>
@@ -610,7 +610,7 @@
<para>üÔÉ ÆÌÁÇÉ ÄÏÂÁ×ÌÑÀÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ ËÏÎÔÒÏÌÑ ÎÁÄ
ÆÁÊÌÁÍÉ, ÏÂÅÓÐÅÞÉ×ÁÑ (ÐÒÉ ÏÐÒÅÄÅÌÅÎÎÙÈ ÕÓÌÏ×ÉÑÈ) ÎÅ×ÏÚÍÏÖÎÏÓÔØ ÉÈ
- ÕÄÁÌÅÎÉÑ ÄÁÖÅ ÐÏÌØÚÏ×ÁÔÅÌÀ <username>root</username>.</para>
+ ÕÄÁÌÅÎÉÑ ÉÌÉ ÉÚÍÅÎÅÎÉÑ ÄÁÖÅ ÐÏÌØÚÏ×ÁÔÅÌÀ <username>root</username>.</para>
<para>æÁÊÌÏ×ÙÅ ÆÌÁÇÉ ÉÚÍÅÎÑÀÔÓÑ ÐÒÉ ÐÏÍÏÝÉ ÕÔÉÌÉÔÙ &man.chflags.1;
ÐÏÓÒÅÄÓÔ×ÏÍ ÐÒÏÓÔÏÇÏ ÉÎÔÅÒÆÅÊÓÁ. ë ÐÒÉÍÅÒÕ, ÞÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ
@@ -655,8 +655,9 @@
ÍÏÎÔÉÒÏ×ÁÎÉÑ ×ÓÅÈ ÄÒÕÇÉÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ.</para>
<para>ôÏÞËÏÊ ÍÏÎÔÉÒÏ×ÁÎÉÑ ÎÁÚÙ×ÁÅÔÓÑ ËÁÔÁÌÏÇ, ËÏÔÏÒÙÊ ÂÕÄÅÔ
- ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ËÏÒÎÀ ÐÒÉÍÏÎÔÉÒÏ×ÁÎÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ. óÔÁÎÄÁÒÔÎÙÅ
- ÔÏÞËÉ ÍÏÎÔÉÒÏ×ÁÎÉÑ ×ËÌÀÞÁÀÔ <filename>/usr</filename>,
+ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ËÏÒÎÀ ÐÒÉÍÏÎÔÉÒÏ×ÁÎÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ.
+ âÏÌÅÅ ÄÅÔÁÌØÎÏ ÜÔÏ ÏÐÉÓÙ×ÁÅÔÓÑ × <xref linkend="disk-organization">.
+ óÔÁÎÄÁÒÔÎÙÅ ÔÏÞËÉ ÍÏÎÔÉÒÏ×ÁÎÉÑ ×ËÌÀÞÁÀÔ <filename>/usr</filename>,
<filename>/var</filename>, <filename>/tmp</filename>,
<filename>/mnt</filename> É
<filename>/cdrom</filename>. üÔÉ ËÁÔÁÌÏÇÉ ÏÂÙÞÎÏ ÐÅÒÅÞÉÓÌÅÎÙ ×
@@ -679,7 +680,7 @@
<entry>ïÐÉÓÁÎÉÅ</entry>
</row>
</thead>
- <tbody>
+ <tbody valign="top">
<row>
<entry><filename class="directory">/</filename></entry>
<entry>ëÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ.</entry>
@@ -788,9 +789,16 @@
<row>
<entry><filename class="directory">/tmp/</filename></entry>
- <entry>÷ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ (ÞÁÓÔÏ ÍÏÎÔÉÒÕÅÔÓÑ ËÁË
- &man.mfs.8;; ÏÂÙÞÎÏ ÓÏÄÅÒÖÉÍÏÅ ÜÔÏÇÏ ËÁÔÁÌÏÇÁ
- ÔÅÒÑÅÔÓÑ ×Ï ×ÒÅÍÑ ÐÅÒÅÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ).</entry>
+ <entry>÷ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ. óÏÄÅÒÖÉÍÏÅ
+ <filename class="directory">/tmp</filename> ÏÂÙÞÎÏ
+ ÔÅÒÑÅÔÓÑ ×Ï ×ÒÅÍÑ ÐÅÒÅÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ. æÁÊÌÏ×ÁÑ
+ ÓÉÓÔÅÍÁ × ÐÁÍÑÔÉ ÞÁÓÔÏ ÍÏÎÔÉÒÕÅÔÓÑ ×
+ <filename class="directory">/tmp</filename>. üÔÏ
+ ÍÏÖÅÔ ÂÙÔØ Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÏ Ó ÐÏÍÏÝØÀ ÐÅÒÅÍÅÎÎÙÈ
+ ÏÔÎÏÓÉÔÅÌØÎÏ tmpmfs ÉÚ &man.rc.conf.5; (ÉÌÉ ÖÅ Ó
+ ÐÏÍÏÝØÀ ÚÁÐÉÓÉ × <filename>/etc/fstab</filename>;
+ ÏÂÒÁÝÁÊÔÅÓØ Ë &man.mdmfs.8;, ÉÌÉ × ÓÌÕÞÁÅ
+ FreeBSD 4.X Ë &man.mfs.8;).</entry>
</row>
@@ -879,7 +887,14 @@
<row>
<entry><filename class="directory">/var/</filename></entry>
<entry>æÁÊÌÙ ÖÕÒÎÁÌÏ× ÏÂÝÅÇÏ ÎÁÚÎÁÞÅÎÉÑ, ×ÒÅÍÅÎÎÙÅ,
- ÐÅÒÅÍÅÝÁÅÍÙÅ ÆÁÊÌÙ É ÆÁÊÌÙ ÏÞÅÒÅÄÅÊ.</entry>
+ ÐÅÒÅÍÅÝÁÅÍÙÅ ÆÁÊÌÙ É ÆÁÊÌÙ ÏÞÅÒÅÄÅÊ. æÁÊÌÏ×ÁÑ
+ ÓÉÓÔÅÍÁ × ÐÁÍÑÔÉ ÉÎÏÇÄÁ ÍÏÎÔÉÒÕÅÔÓÑ ×
+ <filename class="directory">/var</filename>. üÔÏ
+ ÍÏÖÅÔ ÂÙÔØ Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÏ Ó ÐÏÍÏÝØÀ ÐÅÒÅÍÅÎÎÙÈ
+ ÏÔÎÏÓÉÔÅÌØÎÏ varmfs ÉÚ &man.rc.conf.5; (ÉÌÉ ÖÅ Ó
+ ÐÏÍÏÝØÀ ÚÁÐÉÓÉ × <filename>/etc/fstab</filename>;
+ ÏÂÒÁÝÁÊÔÅÓØ Ë &man.mdmfs.8;, ÉÌÉ × ÓÌÕÞÁÅ
+ FreeBSD 4.X Ë &man.mfs.8;).</entry>
</row>
<row>
@@ -899,8 +914,10 @@
<row>
<entry><filename class="directory">/var/tmp/</filename></entry>
- <entry>÷ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÎÅÏÂÈÏÄÉÍÏ ÓÏÈÒÁÎÑÔØ ÍÅÖÄÕ
- ÐÅÒÅÚÁÇÒÕÚËÁÍÉ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ.</entry>
+ <entry>÷ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÏÂÙÞÎÏ ÓÏÈÒÁÎÑÀÔÓÑ ×Ï ×ÒÅÍÑ
+ ÐÅÒÅÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ, ÅÓÌÉ ÔÏÌØËÏ
+ <filename class="directory">/var</filename> ÎÅ Ñ×ÌÑÅÔÓÑ
+ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÏÊ × ÐÁÍÑÔÉ.</entry>
</row>
<row>
@@ -939,7 +956,7 @@
<firstterm>ÐÕÔØ</firstterm> Ë ÆÁÊÌÕ ÂÕÄÅÔ
<filename>foo/bar/readme.txt</filename>.</para>
- <para>ëÁÔÁÌÏÇÉ ÈÒÁÎÑÔÓÑ × ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍÁÈ. ëÁÖÄÁÑ ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ
+ <para>ëÁÔÁÌÏÇÉ É ÆÁÊÌÙ ÈÒÁÎÑÔÓÑ × ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ. ëÁÖÄÁÑ ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ
ÓÏÄÅÒÖÉÔ ÏÄÉÎ ËÁÔÁÌÏÇ ÎÁ ×ÅÒÈÎÅÍ ÕÒÏ×ÎÅ, ÎÁÚÙ×ÁÅÍÙÊ
<firstterm>ËÏÒÎÅ×ÙÍ ËÁÔÁÌÏÇÏÍ</firstterm> ÜÔÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ.
üÔÏÔ ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÄÒÕÇÉÅ ËÁÔÁÌÏÇÉ.</para>
@@ -1199,7 +1216,7 @@
</row>
</thead>
- <tbody>
+ <tbody valign="top">
<row>
<entry><literal>a</literal></entry>
@@ -2201,9 +2218,6 @@
<screen>&prompt.user; <userinput>chsh -s /usr/local/bin/bash</userinput></screen>
- <para>ôÁËÖÅ ÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ <command>chsh</command> ÂÅÚ ÐÁÒÁÍÅÔÒÏ× É
- ÉÚÍÅÎÉÔØ ÉÎÔÅÒÐÒÅÔÁÔÏÒ ÐÏ ÕÍÏÌÞÁÎÉÀ × ÒÅÄÁËÔÏÒÅ.</para>
-
<note>
<para>éÎÔÅÒÐÒÅÔÁÔÏÒ, ËÏÔÏÒÙÊ ×Ù ÂÕÄÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ,
<emphasis>ÏÂÑÚÁÔÅÌØÎÏ</emphasis> ÄÏÌÖÅÎ ÂÙÔØ × ÆÁÊÌÅ
==== //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml#2 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml,v 1.10 2005/09/25 10:04:06 marck Exp $
- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml,v 1.16 2005/09/25 09:51:46 marck Exp $
+ $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml,v 1.11 2006/01/31 20:22:47 bvs Exp $
+ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml,v 1.18 2006/01/30 18:28:28 gad Exp $
- Original revision: 1.56
+ Original revision: 1.63
-->
<chapter id="desktop">
@@ -320,7 +320,7 @@
<note>
<para>ðÌÁÇÉÎ <application>linuxpluginwrapper</application> ÒÁÂÏÔÁÅÔ
- ÔÏÌØËÏ ÎÁ ÁÒÈÉÔÅËÔÕÒÅ i386.</para>
+ ÔÏÌØËÏ ÎÁ ÁÒÈÉÔÅËÔÕÒÅ &i386;.</para>
</note>
</sect2>
@@ -333,11 +333,7 @@
<para><application>Opera</application> ÜÔÏ ÏÞÅÎØ ÂÙÓÔÒÙÊ,
ÐÏÌÎÏÃÅÎÎÙÊ É ÓÏ×ÍÅÓÔÉÍÙÊ ÓÏ ÓÔÁÎÄÁÒÔÁÍÉ ÂÒÁÕÚÅÒ. ïÎ ÐÏÓÔÁ×ÌÑÅÔÓÑ
× Ä×ÕÈ ×ÁÒÉÁÎÔÁÈ: <quote>ÒÏÄÎÁÑ</quote> ÄÌÑ FreeBSD ×ÅÒÓÉÑ É ×ÅÒÓÉÑ,
- ÚÁÐÕÓËÁÅÍÁÑ × ÒÅÖÉÍÅ ÜÍÕÌÑÃÉÉ Linux.
- äÌÑ ËÁÖÄÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ ÅÓÔØ ÂÅÓÐÌÁÔÎÁÑ ×ÅÒÓÉÑ
- ÂÒÁÕÚÅÒÁ, ÐÏËÁÚÙ×ÁÀÝÁÑ ÂÁÎÎÅÒÙ, É ×ÅÒÓÉÑ ÂÅÚ
- ÂÁÎÎÅÒÏ×, ËÏÔÏÒÕÀ ÍÏÖÎÏ ËÕÐÉÔØ ÎÁ <ulink
- url="http://www.opera.com">×Å ÓÁÊÔÅ Opera</ulink>.</para>
+ ÚÁÐÕÓËÁÅÍÁÑ × ÒÅÖÉÍÅ ÜÍÕÌÑÃÉÉ Linux.</para>
<para>äÌÑ ÒÁÂÏÔÙ × ÓÅÔÉ Ó ÐÏÍÏÝØÀ FreeBSD ×ÅÒÓÉÉ
<application>Opera</application> ÕÓÔÁÎÏ×ÉÔÅ
@@ -460,7 +456,7 @@
<entry><application>OpenOffice.org</application></entry>
<entry>ÂÏÌØÛÁÑ</entry>
<entry>ÏÞÅÎØ ÔÑÖÅÌÁÑ</entry>
- <entry><application>GCC 3.1</application>, <application>&jdk; 1.3</application>, <application>Mozilla</application></entry>
+ <entry><application>&jdk; 1.4</application>, <application>Mozilla</application></entry>
</row>
</tbody>
</tgroup>
@@ -603,10 +599,10 @@
É &macos; X. äÏÐÏÌÎÉÔÅÌØÎÕÀ
ÉÎÆÏÒÍÁÃÉÀ ÏÂ <application>OpenOffice.org</application> ÍÏÖÎÏ
ÎÁÊÔÉ ÎÁ <ulink url="http://www.openoffice.org/">×Å ÓÁÊÔÅ
- OpenOffice</ulink>. ðÏÌÕÞÉÔØ ÓÐÅÃÉÆÉÞÎÕÀ ÄÌÑ FreeBSD ÉÎÆÏÒÍÁÃÉÀ É
+ OpenOffice.org</ulink>. ðÏÌÕÞÉÔØ ÓÐÅÃÉÆÉÞÎÕÀ ÄÌÑ FreeBSD ÉÎÆÏÒÍÁÃÉÀ É
ÚÁÇÒÕÚÉÔØ ÐÁËÅÔÙ ÍÏÖÎÏ Ó ×Å ÓÁÊÔÁ ËÏÍÁÎÄÙ ÐÏÒÔÉÒÏ×ÁÎÉÑ
OpenOffice ÎÁ FreeBSD (<ulink
- url="http://porting.openoffice.org/freebsd/">FreeBSD OpenOffice
+ url="http://porting.openoffice.org/freebsd/">FreeBSD OpenOffice.org
Porting Team</ulink>).</para>
<para>äÌÑ ÕÓÔÁÎÏ×ËÉ <application>OpenOffice.org</application>,
@@ -617,176 +613,50 @@
<note>
<para>üÔÁ ÏÐÅÒÁÃÉÑ ÄÏÌÖÎÁ ÒÁÂÏÔÁÔØ ÄÌÑ ÌÀÂÏÇÏ ÒÅÌÉÚÁ (-RELEASE) &os;.
åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÉÎÙÅ ×ÅÒÓÉÉ (-STABLE, -CURRENT), ÎÕÖÎÙÊ ÐÁËÅÔ
- ÍÏÖÅÔ ÂÙÔØ ÚÁÇÒÕÖÅÎ Ó ÓÁÊÔÁ ÇÒÕÐÐÙ ÐÏÄÄÅÒÖËÉ OpenOffice É ÚÁÔÅÍ
+ ÍÏÖÅÔ ÂÙÔØ ÚÁÇÒÕÖÅÎ Ó ÓÁÊÔÁ ÇÒÕÐÐÙ ÐÏÄÄÅÒÖËÉ <application>OpenOffice.org</application> É ÚÁÔÅÍ
ÕÓÔÁÎÏ×ÌÅÎ ÐÒÉ ÐÏÍÏÝÉ &man.pkg.add.1;. îÁ ÓÁÊÔÅ ×Ù ÎÁÊÄÅÔÅ ËÁË
ÐÏÓÌÅÄÎÉÊ ÓÔÁÂÉÌØÎÙÊ ÒÅÌÉÚ, ÔÁË É ÔÅËÕÝÕÀ ×ÅÒÓÉÀ, ÎÁÈÏÄÑÝÕÀÓÑ ×
ÒÁÚÒÁÂÏÔËÅ.</para>
</note>
- <para>ðÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ ÚÁÐÕÓÔÉÔÅ ÐÒÏÇÒÁÍÍÕ ÎÁÓÔÒÏÊËÉ É
- ×ÙÂÅÒÉÔÅ <option>standard workstation installation</option>.
- úÁÐÕÓÔÉÔÅ ÜÔÕ ËÏÍÁÎÄÕ ÉÚ ÐÏÄ ÐÏÌØÚÏ×ÁÔÅÌÑ, ËÏÔÏÒÙÊ ÂÕÄÅÔ
- ÉÓÐÏÌØÚÏ×ÁÔØ <application>OpenOffice.org</application>:</para>
+ <para>ðÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ ÐÒÏÓÔÏ ÎÁÂÅÒÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ ÄÌÑ
+ ÚÁÐÕÓËÁ <application>OpenOffice.org</application>:</para>
+
+ <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
- <screen>&prompt.user; <userinput>openoffice-setup</userinput></screen>
+ <note>
+ <para>÷Ï ×ÒÅÍÑ ÐÅÒ×ÏÇÏ ÚÁÐÕÓËÁ, ×ÁÍ ÂÕÄÕÔ ÚÁÄÁÎÙ ÎÅÓËÏÌØËÏ ×ÏÐÒÏÓÏ×
+ É × ×ÁÛÅÊ ÄÏÍÁÛÎÅÊ ÄÉÒÅËÔÏÒÉÉ ÂÕÄÅÔ ÓÏÚÄÁÎ ËÁÔÁÌÏÇ
+ <filename>.openoffice.org2</filename>.</para>
+ </note>
<para>åÓÌÉ ÐÁËÅÔÙ <application>OpenOffice.org</application>
ÎÅÄÏÓÔÕÐÎÙ, ÍÏÖÎÏ ×ÙÂÒÁÔØ ËÏÍÐÉÌÑÃÉÀ ÐÏÒÔÁ. ïÄÎÁËÏ, ×Ù ÄÏÌÖÎÙ
ÐÏÍÎÉÔØ, ÞÔÏ ÜÔÏ ÐÏÔÒÅÂÕÅÔ ÍÎÏÇÏ ÍÅÓÔÁ ÎÁ ÄÉÓËÅ É ËÏÍÐÉÌÑÃÉÑ
ÂÕÄÅÔ ÄÏ×ÏÌØÎÏ ÄÏÌÇÏÊ.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-1.1</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-2.0</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para>ðÏÔÏÍ ÚÁÐÕÓÔÉÔÅ ÎÁÓÔÒÏÊËÕ ÐÏÄ ÐÏÌØÚÏ×ÁÔÅÌÅÍ, ËÏÔÏÒÙÊ ÂÕÄÅÔ
- ÉÓÐÏÌØÚÏ×ÁÔØ <application>OpenOffice.org</application> É ×ÙÂÅÒÉÔÅ
- <option>standard workstation installation</option>:</para>
+ <note>
+ <para>åÓÌÉ ×Ù ÈÏÔÉÔÅ ÓÏÂÒÁÔØ ÌÏËÁÌÉÚÏ×ÁÎÎÕÀ ×ÅÒÓÉÀ, ÔÏ ×ÍÅÓÔÏ
+ ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ÉÓÐÏÌØÚÕÊÔÅ ÓÌÅÄÕÀÝÅÅ:</para>
- <screen>&prompt.user; <userinput>cd /usr/ports/editors/openoffice</userinput>
-&prompt.user; <userinput>make install-user</userinput></screen>
+ <screen>&prompt.root; <userinput>make LOCALIZED_LANG=<replaceable>your_language</replaceable> install clean</userinput></screen>
- <para>åÓÌÉ ×Ù ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÌÏËÁÌÉÚÏ×ÁÎÎÕÀ ×ÅÒÓÉÀ, ×ÏÔ ÄÏÓÔÕÐÎÙÅ
- ÐÏÒÔÙ:</para>
+ <para>÷ÁÍ ÓÌÅÄÕÅÔ ÉÚÍÅÎÉÔØ
+ <replaceable>your_language</replaceable> ÎÁ ËÏÒÒÅËÔÎÙÊ ISO
+ ËÏÄ ÑÚÙËÁ. óÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÑÚÙËÏ×ÙÈ ËÏÄÏ× ÄÏÓÔÕÐÅÎ ×
+ ÆÁÊÌÅ <filename>files/Makefile.localized</filename>, ÒÁÓÐÏÌÏÖÅÎÎÙÊ
+ × ÄÉÒÅËÔÏÒÉÉ ÐÏÒÔÁ.</para>
+ </note>
- <informaltable frame="none" pgwide="1">
- <tgroup cols="2">
- <colspec colwidth="1*">
- <colspec colwidth="2*">
- <thead>
- <row>
- <entry>ñÚÙË</entry>
- <entry>ðÏÒÔ</entry>
- </row>
- </thead>
+ <para>ðÏÓÌÅ ÔÏÇÏ, ËÁË ÜÔÏ ÂÙÌÏ ÓÄÅÌÁÎÏ
+ <application>OpenOffice.org</application> ÍÏÖÅÔ ÂÙÔØ ÚÁÐÕÝÅÎ
+ ËÏÍÁÎÄÏÊ:</para>
- <tbody>
- <row>
- <entry>áÒÁÂÓËÉÊ</entry>
- <entry><filename role="package">arabic/openoffice-1.1</filename></entry>
- </row>
-
- <row>
- <entry>÷ÅÎÇÅÒÓËÉÊ</entry>
- <entry><filename role="package">hungarian/openoffice-1.1</filename></entry>
- </row>
-
- <row>
- <entry>çÏÌÌÁÎÄÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-nl</filename></entry>
- </row>
-
- <row>
- <entry>çÒÅÞÅÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-el</filename></entry>
- </row>
-
- <row>
- <entry>äÁÔÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-dk</filename></entry>
- </row>
-
- <row>
- <entry>éÓÐÁÎÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-es</filename></entry>
- </row>
-
- <row>
- <entry>éÔÁÌØÑÎÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-it</filename></entry>
- </row>
-
- <row>
- <entry>ëÁÔÁÌÁÎÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-ca</filename></entry>
- </row>
-
- <row>
- <entry>ëÉÔÁÊÓËÉÊ (ÔÒÁÄÉÃÉÏÎÎÙÊ)</entry>
- <entry><filename role="package">chinese/openoffice-1.1-zh_TW</filename></entry>
- </row>
-
- <row>
- <entry>ëÉÔÁÊÓËÉÊ (ÕÐÒÏÝÅÎÎÙÊ)</entry>
- <entry><filename role="package">chinese/openoffice-1.1-zh_CN</filename></entry>
- </row>
-
- <row>
- <entry>ëÏÒÅÊÓËÉÊ</entry>
- <entry><filename role="package">korean/openoffice-1.1</filename></entry>
- </row>
-
- <row>
- <entry>îÅÍÅÃËÉÊ</entry>
- <entry><filename role="package">german/openoffice-1.1</filename></entry>
- </row>
-
- <row>
- <entry>ðÏÌØÓËÉÊ</entry>
- <entry><filename role="package">polish/openoffice-1.1</filename></entry>
- </row>
-
- <row>
- <entry>ðÏÒÔÕÇÁÌØÓËÉÊ (âÒÁÚÉÌÉÑ)</entry>
- <entry><filename role="package">portuguese/openoffice-1.1-pt_BR</filename></entry>
- </row>
-
- <row>
- <entry>ðÏÒÔÕÇÁÌØÓËÉÊ</entry>
- <entry><filename role="package">portuguese/openoffice-1.1-pt_PT</filename></entry>
- </row>
-
- <row>
- <entry>òÕÓÓËÉÊ</entry>
- <entry><filename role="package">russian/openoffice-1.1</filename></entry>
- </row>
-
- <row>
- <entry>óÌÏ×ÁÃËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-sk</filename></entry>
- </row>
+ <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
- <row>
- <entry>óÌÏ×ÅÎÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-sl_SI</filename></entry>
- </row>
-
- <row>
- <entry>ôÕÒÅÃËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-tr</filename></entry>
- </row>
-
- <row>
- <entry>æÉÎÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-fi</filename></entry>
- </row>
-
- <row>
- <entry>æÒÁÎÃÕÚÓËÉÊ</entry>
- <entry><filename role="package">french/openoffice-1.1</filename></entry>
- </row>
-
- <row>
- <entry>þÅÛÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-cs</filename></entry>
- </row>
-
- <row>
- <entry>û×ÅÄÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-se</filename></entry>
- </row>
-
- <row>
- <entry>üÓÔÏÎÓËÉÊ</entry>
- <entry><filename role="package">editors/openoffice-1.1-et</filename></entry>
- </row>
-
- <row>
- <entry>ñÐÏÎÓËÉÊ</entry>
- <entry><filename role="package">japanese/openoffice-1.1</filename></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
</sect2>
</sect1>
==== //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml#3 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml,v 1.15 2006/01/03 13:41:21 bvs Exp $
- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml,v 1.20 2006/01/03 07:10:55 gad Exp $
+ $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml,v 1.16 2006/01/31 20:22:47 bvs Exp $
+ $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml,v 1.21 2006/01/30 16:20:05 gad Exp $
- Original revision: 1.125
+ Original revision: 1.127
-->
<chapter id="linuxemu">
@@ -327,7 +327,7 @@
<para>äÌÑ ELF-ÆÁÊÌÏ× ÉÎÏÇÄÁ ÔÒÅÂÕÅÔÓÑ ÓÄÅÌÁÔØ ÔÁË ÎÁÚÙ×ÁÅÍÙÊ
<quote>branding</quote> (ÍÁÒËÉÒÏ×ÁÔØ ÅÇÏ). åÓÌÉ ÐÏÐÙÔÁÔØÓÑ
- ÚÁÐÕÓÔÉÔØ ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÊ ELF-ÆÁÊÌ, ×Ù ÐÏÌÕÞÉÔÅ ÓÌÅÄÕÀÝÅÅ ÓÏÏÂÝÅÎÉÅ
+ ÚÁÐÕÓÔÉÔØ ÎÅ ÍÁÒËÉÒÏ×ÁÎÎÙÊ ELF-ÆÁÊÌ, ×Ù ÐÏÌÕÞÉÔÅ ÓÌÅÄÕÀÝÅÅ ÓÏÏÂÝÅÎÉÅ
ÏÂ ÏÛÉÂËÅ:</para>
<screen>&prompt.user; <userinput>./ÍÏÑ-linux-elf-ÐÒÏÇÒÁÍÍÁ</userinput>
@@ -377,16 +377,9 @@
<sect1info>
<authorgroup>
<author>
- <firstname>Murray</firstname>
- <surname>Stokely</surname>
- <contrib>ïÂÎÏ×ÉÌ ÄÌÑ Mathematica 4.X </contrib>
- </author>
- </authorgroup>
- <authorgroup>
- <author>
- <firstname>Bojan</firstname>
- <surname>Bistrovic</surname>
- <contrib>ïÂßÅÄÉÎÅÎÏ Ó ÒÁÂÏÔÏÊ </contrib>
+ <firstname>Boris</firstname>
+ <surname>Hollas</surname>
+ <contrib>ïÂÎÏ×ÉÌ ÄÌÑ Mathematica 5.X </contrib>
</author>
</authorgroup>
</sect1info>
@@ -399,80 +392,96 @@
</indexterm>
<para>îÉÖÅ ÏÐÉÓÁÎÏ, ËÁË ÕÓÔÁÎÏ×ÉÔØ Linux–×ÅÒÓÉÀ ÐÁËÅÔÁ
- <application>&mathematica; 4.X</application>
+ <application>&mathematica; 5.X</application>
ÎÁ ÓÉÓÔÅÍÕ FreeBSD.</para>
- <para>Linux–×ÅÒÓÉÑ <application>&mathematica;</application> ÏÔÌÉÞÎÏ
- ÒÁÂÏÔÁÅÔ ÐÏÄ FreeBSD, ÏÄÎÁËÏ
- ×ÙÐÏÌÎÑÅÍÙÅ ÆÁÊÌÙ, ÐÏÓÔÁ×ÌÑÅÍÙÅ Wolfram, ÄÏÌÖÎÙ ÂÙÔØ ÍÁÒËÉÒÏ×ÁÎÙ
- ÕÔÉÌÉÔÏÊ &man.brandelf.1;, ÞÔÏÂÙ FreeBSD ÚÎÁÌÁ Ï ÎÅÏÂÈÏÄÉÍÏÓÔÉ
- ÉÓÐÏÌØÚÏ×ÁÎÉÑ Linux ABI ÄÌÑ ÉÈ ×ÙÐÏÌÎÅÎÉÑ.</para>
-
- <para>Linux–×ÅÒÓÉÀ ÐÁËÅÔÁ <application>&mathematica;</application>
+ <para>Linux ×ÅÒÓÉÑ <application>&mathematica;</application>
ÉÌÉ <application>&mathematica; for Students</application>
ÍÏÖÎÏ ÚÁËÁÚÁÔØ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ × ËÏÍÐÁÎÉÉ Wolfram ÐÏ ÁÄÒÅÓÕ
<ulink url="http://www.wolfram.com/"></ulink>.</para>
<sect2>
- <title>íÁÒËÉÒÏ×ËÁ Ä×ÏÉÞÎÙÈ ÆÁÊÌÏ× Linux</title>
+ <title>éÓÐÏÌØÚÏ×ÁÎÉÅ ÕÓÔÁÎÏ×ÝÉËÁ &mathematica;</title>
- <para>ä×ÏÉÞÎÙÅ ÆÁÊÌÙ Linux ÎÁÈÏÄÑÔÓÑ × ËÁÔÁÌÏÇÅ
- <filename>Unix</filename> ÎÁ ËÏÍÐÁËÔ-ÄÉÓËÅ Ó ÄÉÓÔÒÉÂÕÔÉ×ÏÍ
- <application>&mathematica;</application> ÏÔ Wolfram.
- óËÏÐÉÒÕÊÔÅ ÜÔÏÔ ËÁÔÁÌÏÇ (×ÍÅÓÔÅ ÓÏ ×ÓÅÍÉ ÐÏÄËÁÔÁÌÏÇÁÍÉ) ÎÁ ×ÁÛ
- ÖÅÓÔËÉÊ ÄÉÓË, ÞÔÏÂÙ ÐÒÏÍÁÒËÉÒÏ×ÁÔØ (ÕÔÉÌÉÔÏÊ &man.brandelf.1;)
- Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ Linux ÐÅÒÅÄ ÉÎÓÔÁÌÌÑÃÉÅÊ:</para>
-
- <screen>&prompt.root; <userinput>mount /cdrom</userinput>
-&prompt.root; <userinput>cp -rp /cdrom/Unix/ /localdir/</userinput>
-&prompt.root; <userinput>brandelf -t Linux /localdir/Files/SystemFiles/Kernel/Binaries/Linux/*</userinput>
-&prompt.root; <userinput>brandelf -t Linux /localdir/Files/SystemFiles/FrontEnd/Binaries/Linux/*</userinput>
-&prompt.root; <userinput>brandelf -t Linux /localdir/Files/SystemFiles/Installation/Binaries/Linux/*</userinput>
-&prompt.root; <userinput>brandelf -t Linux /localdir/Files/SystemFiles/Graphics/Binaries/Linux/*</userinput>
-&prompt.root; <userinput>brandelf -t Linux /localdir/Files/SystemFiles/Converters/Binaries/Linux/*</userinput>
-&prompt.root; <userinput>brandelf -t Linux /localdir/Files/SystemFiles/LicenseManager/Binaries/Linux/mathlm</userinput>
-&prompt.root; <userinput>cd /localdir/Installers/Linux/</userinput>
-&prompt.root; <userinput>./MathInstaller</userinput></screen>
+ <para>óÎÁÞÁÌÁ ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ &os;, ÞÔÏ Linux ÂÉÎÁÒÎÉËÉ ÏÔ
+ <application>&mathematica;</application> ÉÓÐÏÌØÚÕÀÔ Linux
+ ABI. óÁÍÙÊ ÐÒÏÓÔÏÊ ÐÕÔØ ÓÄÅÌÁÔØ ÜÔÏ—ÕÓÔÁÎÏ×ÉÔØ ÍÁÒËÕ
+ ELF Linux ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ×ÓÅÈ ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÈ Ä×ÏÉÞÎÙÈ
+ ÆÁÊÌÏ× Ó ÐÏÍÏÝØÀ ËÏÍÁÎÄÙ:</para>
- <para>÷Ù ÔÁËÖÅ ÍÏÖÅÔÅ ÕÓÔÁÎÏ×ÉÔØ ÍÁÒËÕ ELF Linux ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ×ÓÅÈ
- ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÈ Ä×ÏÉÞÎÙÈ ÆÁÊÌÏ× Ó ÐÏÍÏÝØÀ ËÏÍÁÎÄÙ:</para>
-
<screen>&prompt.root; <userinput>sysctl kern.fallback_elf_brand=3</userinput></screen>
- <para>FreeBSD ÂÕÄÅÔ ÓÞÉÔÁÔØ, ÞÔÏ ×ÓÅ ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÅ Ä×ÏÉÞÎÙÅ
+ <para>&os; ÂÕÄÅÔ ÓÞÉÔÁÔØ, ÞÔÏ ×ÓÅ ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÅ Ä×ÏÉÞÎÙÅ
ELF-ÆÁÊÌÙ ÉÓÐÏÌØÚÕÀÔ Linux ABI, É ×Ù ÓÍÏÖÅÔÅ
ÚÁÐÕÓÔÉÔØ MathInstaller ÐÒÑÍÏ Ó CDROM.</para>
+
+ <para>ôÅÐÅÒØ, ÓËÏÐÉÒÕÊÔÅ ÆÁÊÌ <filename>MathInstaller</filename> ÎÁ
+ ×ÁÛ Ö£ÓÔËÉÊ ÄÉÓË:</para>
+
+ <screen>&prompt.root; <userinput>mount /cdrom</userinput>
+&prompt.root; <userinput>cp /cdrom/Unix/Installers/Linux/MathInstaller /localdir/</userinput></screen>
+
+ <para>É × ÜÔÏÍ ÆÁÊÌÅ ÚÁÍÅÎÉÔÅ <literal>/bin/sh</literal> ×
+ × ÐÅÒ×ÏÊ ÓÔÒÏËÅ ÎÁ <literal>/compat/linux/bin/sh</literal>.
+ üÔÉÍ ÍÙ ÕÂÅÄÉÍÓÑ, ÞÔÏ ÕÓÔÁÎÏ×ÝÉË ÂÕÄÅÔ ×ÙÐÏÌÎÑÔØÓÑ Linux
+ ×ÅÒÓÉÅÊ &man.sh.1;. äÁÌØÛÅ, ÚÁÍÅÎÉÔÅ ×ÓÅ ×ÈÏÖÄÅÎÉÑ
+ <literal>Linux)</literal> ÎÁ <literal>FreeBSD)</literal> Ó
+ ÐÏÍÏÝØÀ ÔÅËÓÔÏ×ÏÇÏ ÒÅÄÁËÔÏÒÁ ÉÌÉ Ó ÐÏÍÏÝØÀ ÓËÒÉÐÔÁ,
+ ÐÒÅÄÓÔÁ×ÌÅÎÎÏÇÏ ÎÉÖÅ, × ÓÌÅÄÕÀÝÅÊ ÇÌÁ×Å. üÔÏ ÕËÁÖÅÔ
+ ÕÓÔÁÎÏ×ÝÉËÕ <application>&mathematica;</application>,
+ ×ÙÚÙ×ÁÀÝÅÍÕ <command>uname -s</command> ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ
+ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ, ÏÔÎÏÓÉÔØÓÑ Ë &os;, ËÁË Ë Linux
+ ÐÏÄÏÂÎÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÅ. ôÅÐÅÒØ, ÚÁÐÕÓË
+ <command>MathInstaller</command> ÕÓÔÁÎÏ×ÉÔ
+ <application>&mathematica;</application>.</para>
+ </sect2>
+
+ <sect2>
+ <title>Modifying the &mathematica; Executables</title>
+
+ <para>óËÒÉÐÔÙ ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ, ËÏÔÏÒÙÅ
+ <application>&mathematica;</application> ÓÏÚÄÁÌÁ ×Ï
+ ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÄÏÌÖÎÙ ÂÙÔØ ÉÚÍÅÎÅÎÅÎÙ ÐÅÒÅÄ ÔÅÍ, ËÁË
+ ×Ù ÓÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÈ. åÓÌÉ ×Ù ×ÙÂÒÁÌÉ
+ <filename role="directory">/usr/local/bin</filename> ×
+ ËÁÞÅÓÔ×Å ÄÉÒÅËÔÏÒÉÉ ÄÌÑ ÐÏÍÅÝÅÎÉÑ ÉÓÐÏÌÎÑÅÍÙÈ ÆÁÊÌÏ×
+ <application>&mathematica;</application>, ÔÏ ×Ù ÏÂÎÁÒÕÖÉÔÅ
+ × ÜÔÏÍ ËÁÔÁÌÏÇÅ ÓÓÙÌËÉ ÎÁ ÆÁÊÌÙ <filename>math</filename>,
+ <filename>mathematica</filename>, <filename>Mathematica</filename>, É
+ <filename>MathKernel</filename>. ÷ ËÁÖÄÏÍ ÉÚ ÎÉÈ ÚÁÍÅÎÉÔÅ
+ <literal>Linux)</literal> ÎÁ <literal>FreeBSD)</literal> Ó
+ ÐÏÍÏÝØÀ ÔÅËÓÔÏ×ÏÇÏ ÒÅÄÁËÔÏÒÁ ÉÌÉ Ó ÐÏÍÏÝØÀ ÓÌÅÄÕÀÝÅÇÏ ÓËÒÉÐÔÁ
+ ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ:</para>
+
+ <programlisting>#!/bin/sh
+cd /usr/local/bin
+for i in math mathematica Mathematica MathKernel
+ do sed 's/Linux)/FreeBSD)/g' $i > $i.tmp
+ sed 's/\/bin\/sh/\/compat\/linux\/bin\/sh/g' $i.tmp > $i
+ rm $i.tmp
+ chmod a+x $i
+done</programlisting>
</sect2>
<sect2>
<title>ðÏÌÕÞÅÎÉÅ ÐÁÒÏÌÑ Ë ÐÁËÅÔÕ &mathematica;</title>
- <para>ðÒÅÖÄÅ ÞÅÍ ÚÁÐÕÓËÁÔØ <application>&mathematica;</application>,
- ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÐÏÌÕÞÉÔØ ÏÔ ËÏÍÐÁÎÉÉ Wolfram ÐÁÒÏÌØ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ
- <quote>ÉÄÅÎÔÉÆÉËÁÔÏÒÕ ÍÁÛÉÎÙ</quote>.</para>
-
<indexterm>
<primary>Ethernet</primary>
<secondary>MAC-ÁÄÒÅÓ</secondary>
</indexterm>
- <para>ðÏÓÌÅ ÔÏÇÏ, ËÁË ×Ù ÕÓÔÁÎÏ×ÉÌÉ ÎÅÏÂÈÏÄÉÍÙÅ ÂÉÂÌÉÏÔÅËÉ É
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list