Date: Tue, 17 Oct 2006 04:06:02 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 108016 for review Message-ID: <200610170406.k9H462Mb072571@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=108016 Change 108016 by jb@jb_zoo on 2006/10/17 04:05:56 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#21 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#4 integrate .. //depot/projects/dtrace/ports/CHANGES#8 integrate .. //depot/projects/dtrace/ports/MOVED#25 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#5 integrate .. //depot/projects/dtrace/ports/UPDATING#18 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/MKterminfo.sh#4 integrate .. //depot/projects/dtrace/src/contrib/traceroute/traceroute.8#6 integrate .. //depot/projects/dtrace/src/contrib/traceroute/traceroute.c#5 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#18 integrate .. //depot/projects/dtrace/src/etc/disktab#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#10 integrate .. //depot/projects/dtrace/src/etc/rc.d/auto_linklocal#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/cleartmp#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/idmapd#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/dtrace/src/lib/libc/i386/sys/i386_get_ldt.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/locale/wctype.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/freopen.c#4 integrate .. //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_init.c#5 integrate .. //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_select.c#4 integrate .. //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_sig.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_fork.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#9 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/dtrace/src/lib/msun/i387/fenv.h#4 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate .. //depot/projects/dtrace/src/sbin/Makefile#7 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.8#6 integrate .. //depot/projects/dtrace/src/sbin/idmapd/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/idmapd/idmapd.8#4 integrate .. //depot/projects/dtrace/src/sbin/kldload/kldload.8#4 integrate .. //depot/projects/dtrace/src/share/man/man1/builtin.1#4 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_schedparam.3#5 integrate .. //depot/projects/dtrace/src/share/man/man4/ipfirewall.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/ndis.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/pcm.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/sis.4#4 integrate .. //depot/projects/dtrace/src/share/man/man5/disktab.5#4 integrate .. //depot/projects/dtrace/src/share/man/man5/hosts.equiv.5#4 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/dtrace/src/share/man/man9/ktr.9#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/africa#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/asia#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/australasia#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/backward#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/europe#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/northamerica#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/southamerica#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/yearistype.sh#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/zone.tab#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/syscalls.master#10 integrate .. //depot/projects/dtrace/src/sys/arm/arm/fusu.S#5 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/dtrace/src/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/dtrace/src/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_signal.h#4 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#11 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#15 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#9 integrate .. //depot/projects/dtrace/src/sys/conf/kern.post.mk#8 integrate .. //depot/projects/dtrace/src/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi_debug.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi_disk.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfireg.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfivar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/support.s#6 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux.h#5 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_proto.h#12 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_syscall.h#12 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysent.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/linux/syscalls.master#12 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/support.S#5 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/sys_generic.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/sys_process.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#12 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/dtrace/src/sys/modules/aio/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/linux/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/modules/mem/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/uart/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/pci/agp.c#6 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/copyinout.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/support.S#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/support.S#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#11 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#13 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/systm.h#10 integrate .. //depot/projects/dtrace/src/sys/sys/umtx.h#6 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#7 integrate .. //depot/projects/dtrace/src/usr.bin/expand/expand.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/tr/tr.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/unexpand/unexpand.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/arp/arp.c#5 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#13 integrate .. //depot/projects/dtrace/www/en/gnome/contact.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/Makefile#5 integrate .. //depot/projects/dtrace/www/en/gnome/docs/bugging.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/develfaq.sgml#5 integrate .. //depot/projects/dtrace/www/en/gnome/docs/example-Makefile.sgml#6 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq216.sgml#1 branch .. //depot/projects/dtrace/www/en/gnome/docs/porting.sgml#5 integrate .. //depot/projects/dtrace/www/en/gnome/images/Makefile#5 integrate .. //depot/projects/dtrace/www/en/gnome/images/ss214-1-tn.png#3 delete .. //depot/projects/dtrace/www/en/gnome/images/ss214-1.png#3 delete .. //depot/projects/dtrace/www/en/gnome/images/ss214-2-tn.png#3 delete .. //depot/projects/dtrace/www/en/gnome/images/ss214-2.png#3 delete .. //depot/projects/dtrace/www/en/gnome/index.xsl#7 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#11 integrate .. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#6 integrate .. //depot/projects/dtrace/www/en/platforms/sparc.sgml#4 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/approvals.sgml#3 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/schedule.sgml#7 integrate .. //depot/projects/dtrace/www/share/sgml/navibar.ent#3 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#6 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#5 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#4 (text+ko) ==== @@ -23,7 +23,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.4 2006/05/16 21:01:38 keramida Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.5 2006/10/16 12:35:23 keramida Exp $</pubdate> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -498,15 +498,15 @@ standards for non-technical reasons.</para></listitem> <listitem><para>Companies interested in promoting an evolving - standard that can become the core of other companies' commercial - products should be wary of the GPL. Regardless of the license + standard, which can become the core of other companies' commercial + products, should be wary of the GPL. Regardless of the license used, the resulting software will usually devolve to whoever actually makes the majority of the engineering changes and most understands the state of the system. The GPL simply adds additional legal friction to the result.</para></listitem> - <listitem><para>Large companies in which Open Source code is being - created should be aware that programmers appreciate Open Source + <listitem><para>Large companies, in which Open Source code is + developed, should be aware that programmers appreciate Open Source because it leaves the software available to the employee when they change employers. Some companies encourage this behavior as an employment perk, especially when the software involved is not ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/article.sgml#3 (text+ko) ==== @@ -17,7 +17,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/building-products/article.sgml,v 1.6 2006/01/07 04:12:33 jkoshy Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/building-products/article.sgml,v 1.7 2006/10/16 11:59:08 keramida Exp $</pubdate> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -28,7 +28,7 @@ <title>Abstract</title> <para>The FreeBSD project is a worldwide, voluntary, and - collaborative project developing a portable and high-quality + collaborative project, which develops a portable and high-quality operating system. The FreeBSD project distributes the source code for its product under a liberal license, with the intention of encouraging the use of its code. Collaborating @@ -164,7 +164,7 @@ <listitem> <simpara>FreeBSD source code is distributed under a liberal BSD license facilitating its adoption in commercial products - <citation>Mon2005</citation> with the minimum of hassle.</simpara> + <citation>Mon2005</citation> with minimum hassle.</simpara> </listitem> <listitem> <simpara>The FreeBSD project has excellent engineering @@ -219,7 +219,7 @@ <listitem> <simpara>As a Unix compatible environment for the management functions of high-end storage and networking devices, - running on a separate processor 'blade'.</simpara> + running on a separate processor <quote>blade</quote>.</simpara> <simpara>FreeBSD provides the tools for creating dedicated OS and application program images. Its implementation of a BSD unix API is mature and tested. FreeBSD can also @@ -246,7 +246,7 @@ url="http://www.rtems.com/">RTEMS</ulink>; and <ulink url="http://ecos.sourceware.org/">eCOS</ulink>.</simpara>; <simpara>There are many full-fledged development environments - in the 13,000-strong collection of applications ported and + in the &os.numports;-strong collection of applications ported and packaged with FreeBSD.</simpara> </listitem> @@ -278,7 +278,7 @@ <itemizedlist> <listitem> <simpara>A complete system that can cross-host itself for - the following architectures: alpha, amd64, ia64, i386, + the following architectures: alpha (up to &os; version 6.X), amd64, ia64, i386, sparc64, powerpc (see &man.build.7;).</simpara> </listitem> <listitem> @@ -351,7 +351,7 @@ composed in flexible ways.</simpara> </listitem> <listitem> - <simpara>Over 13,000 ported applications, both commercial + <simpara>Over &os.numports; ported applications, both commercial and open-source, managed via the FreeBSD ports collection.</simpara> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#21 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.156 2006/10/08 13:18:57 syrinx Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.157 2006/10/14 08:13:05 joel Exp $ --> <!-- NOTE TO NEW COMMITTERS: Core and committers lists are sorted in alphabetical order by last name. Please keep in mind that fact while @@ -1155,10 +1155,6 @@ </listitem> <listitem> - <para>&a.msmith;</para> - </listitem> - - <listitem> <para>&a.des;</para> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#15 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.32 2006/09/30 20:41:53 joel Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.33 2006/10/14 08:13:05 joel Exp $ --> <itemizedlist> <listitem> @@ -204,6 +204,10 @@ </listitem> <listitem> + <para>&a.msmith; (1996 - 2003)</para> + </listitem> + + <listitem> <para>&a.semenu; (1998 - 2003)</para> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#3 (text+ko) ==== @@ -23,7 +23,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.4 2006/02/18 19:15:20 brueffer Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.6 2006/10/16 11:41:22 keramida Exp $</pubdate> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -229,12 +229,12 @@ <programlisting>//depot/projects/smpng/... //<replaceable>client</replaceable>/...</programlisting> - <para>The <literal>...</literal> should taken literally. It + <para>The <literal>...</literal> should be taken literally. It is a <application>Perforce</application> idiom for saying <quote>this directory and all files and directories below it.</quote></para> - <para>A View can contain multiple mappings. Let's say you + <para>A Perforce <quote>view</quote> can contain multiple mappings. Let's say you want to map in both the SMPng tree and the NFS tree. Your View might look like:</para> @@ -533,7 +533,7 @@ <screen>&prompt.user; <userinput>p4 edit <replaceable>filename</replaceable></userinput></screen> - <para>This marks the file on the server as being in the edit state, + <para>This marks the file on the server as being in the <emphasis>edit</emphasis> state, which then allows it to be submitted after changes are made, or marks it for special handling when doing an integration or sync operation. Note that editing is not exclusive in @@ -582,10 +582,46 @@ change, and what its change number was. A change can be examined in detail via the <command>p4 describe <replaceable>changenumber</replaceable></command> command. This - will provide the submit log and the diffs of the actual change. - It is common to use the <option>-du</option> or - <option>-dc</option> flags to produce unified or context diffs - instead of the native diff format.</para> + will provide the submit log and the diffs of the actual change.</para> + + <para>Commonly, the <command>p4 describe</command> command is used in one + of three ways:</para> + + <variablelist> + <varlistentry> + <term><command>p4 describe -s <replaceable>CHANGE</replaceable></command></term> + + <listitem> + <para>List a short description of + changeset <emphasis>CHANGE</emphasis>, including the commit log of + the particular changeset and a list of the files it affected.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><command>p4 describe -du <replaceable>CHANGE</replaceable></command></term> + + <listitem> + <para>List a description of changeset <emphasis>CHANGE</emphasis>, + including the commit log of the particular changeset, a list of the + files it affected and a patch for each modified file, in a format + similar to <quote>unified diff</quote> patches (but not exactly the + same).</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><command>p4 describe -dc <replaceable>CHANGE</replaceable></command></term> + + <listitem> + <para>List a description of changeset <emphasis>CHANGE</emphasis>, + including the commit log of the particular changeset, a list of the + files it affected and a patch for each modified file, in a format + similar to <quote>context diff</quote> patches (but not exactly the + same).</para> + </listitem> + </varlistentry> + </variablelist> <para>The <command>p4 filelog <replaceable>filename</replaceable></command> command will show @@ -664,10 +700,19 @@ <para>If you want to add a whole tree of files, run a command like:</para> - <screen>&prompt.user; <userinput>find . -type f |xargs p4 add</userinput></screen> + <screen>&prompt.user; <userinput>find . -type f | xargs p4 add</userinput></screen> + + <note> + <para><application>Perforce</application> can track UNIX symlinks too, so + you can probably + use <quote><command>\! -type d</command></quote> as the + matching expression in &man.find.1; above. We don't commit symlinks + into the source tree of &os; though, so this should not be + necessary.</para> + </note> <para>Doing a <command>p4 submit</command> will then copy the file - to the Depot on the server. It is very important to only add + to the depot on the server. It is very important to only add files, not directories. Explicitly adding a directory will cause <application>Perforce</application> to treat it like a file, which is not what you want.</para> @@ -677,7 +722,7 @@ <screen>&prompt.user; <userinput>p4 delete <replaceable>filename</replaceable></userinput></screen> - <para>This will mark the file for deletion from the Depot the next + <para>This will mark the file for deletion from the depot the next time that a submit is run. It will also remove the local copy of the file, so beware.</para> @@ -704,9 +749,9 @@ coerce the permissions on the files if needed. Then run the following commands:</para> - <screen>&prompt.user; <userinput>p4 diff -se ... |xargs p4 edit</userinput> -&prompt.user; <userinput>p4 diff -sd ... |xargs p4 delete</userinput> -&prompt.user; <userinput>find . -type f |xargs p4 add</userinput></screen> + <screen>&prompt.user; <userinput>p4 diff -se ... | xargs p4 edit</userinput> +&prompt.user; <userinput>p4 diff -sd ... | xargs p4 delete</userinput> +&prompt.user; <userinput>find . -type f | xargs p4 add</userinput></screen> <para>The first command tells <application>Perforce</application> to look for files that have changed, even if they are not open. The @@ -717,8 +762,14 @@ method, but it works because <application>Perforce</application> will only add the files that it does not already know about. The result of running these commands will be a set of files that are - opened for edit, removal, or add, as appropriate. Just do a - <command>p4 submit</command> after that.</para> + opened for edit, removal, or add, as appropriate.</para> + + <para>Verify the active changelist with:</para> + + <screen>&prompt.user; <userinput>p4 changelist</userinput> +&prompt.user; <userinput>p4 diff -du</userinput></screen> + + <para>and just do a <command>p4 submit</command> after that.</para> </sect1> <sect1 id="renaming-files"> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#4 (text+ko) ==== @@ -37,7 +37,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.77 2006/08/29 19:45:44 blackend Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.78 2006/10/16 13:05:47 keramida Exp $</pubdate> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -98,7 +98,7 @@ FreeBSD development where all new changes first enter the system. FreeBSD-STABLE is the development branch from which major releases are made. Changes go into this branch at a different pace, and - with general assumption that they have first gone into + with the general assumption that they have first gone into FreeBSD-CURRENT and have been thoroughly tested by our user community.</para> @@ -134,16 +134,54 @@ <emphasis>RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></emphasis> branches updated.</para> - <para><xref linkend="release-proc"> discusses the - different phases of the release engineering process leading up to - the actual system build and <xref linkend="release-build"> - describes the actual build process. <xref - linkend="extensibility"> describes how the base - release may be extended by third parties and <xref - linkend="lessons-learned"> details some of the - lessons learned through the release of FreeBSD 4.4. Finally, - <xref linkend="future"> presents future directions - of development.</para> + <sect2> + <title>What this article describes</title> + + <para>The following sections of this article describe:</para> + + <variablelist> + <varlistentry> + <term><xref linkend="release-proc"></term> + + <listitem> + <para>The different phases of the release engineering process + leading up to the actual system build.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><xref linkend="release-build"></term> + + <listitem> + <para>The actual build process.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><xref linkend="extensibility"></term> + + <listitem> + <para>How the base release may be extended by third parties.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><xref linkend="lessons-learned"></term> + + <listitem> + <para>Some of the lessons learned through the release of &os; 4.4.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><xref linkend="future"></term> + + <listitem> + <para>Future directions of development.</para> + </listitem> + </varlistentry> + </variablelist> + </sect2> </sect1> <!-- Release Process --> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v 1.53 2006/07/07 08:31:43 delphij Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v 1.54 2006/10/16 19:15:36 danger Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -86,6 +86,7 @@ <title>Kernel</title> &chap.dma; + &chap.kernelbuild; &chap.kerneldebug; </part> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#3 (text+ko) ==== @@ -6,7 +6,7 @@ Chapters should be listed in the order in which they are referenced. - $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent,v 1.21 2004/02/15 22:56:09 simon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent,v 1.22 2006/10/16 19:15:36 danger Exp $ --> <!-- Part one --> @@ -23,6 +23,7 @@ <!-- Part three - Kernel --> <!ENTITY chap.dma SYSTEM "dma/chapter.sgml"> +<!ENTITY chap.kernelbuild SYSTEM "kernelbuild/chapter.sgml"> <!ENTITY chap.kerneldebug SYSTEM "kerneldebug/chapter.sgml"> <!-- Part five - Architectures --> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.386 2006/10/13 10:53:53 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.387 2006/10/16 10:12:41 keramida Exp $ --> <chapter id="advanced-networking"> @@ -2512,7 +2512,7 @@ <programlisting>option IPFIREWALL_DEFAULT_TO_ACCEPT</programlisting> - <para>The second is to set the firewall type to accept in the + <para>The second is to set the firewall type to <quote><literal>open</literal></quote> in the <filename>rc.conf</filename> file:</para> <programlisting>firewall_type="open"</programlisting> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.167 2006/06/28 17:34:00 joel Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.169 2006/10/16 19:18:09 danger Exp $ --> <chapter id="kernelconfig"> @@ -297,62 +297,31 @@ </para> <procedure> - <title>Procedure 1. Building a Kernel the <quote>Traditional</quote> Way</title> - - <step> - <para>Run &man.config.8; to generate the kernel source code.</para> - - <screen>&prompt.root; <userinput>/usr/sbin/config <replaceable>MYKERNEL</replaceable></userinput></screen> - </step> + <title>Building a Kernel</title> <step> - <para>Change into the build directory. &man.config.8; will print - the name of this directory after being run as above.</para> + <para>Change to the <filename + role="directory">/usr/src</filename> directory:</para> - <screen>&prompt.root; <userinput>cd ../compile/<replaceable>MYKERNEL</replaceable></userinput></screen> + <screen>&prompt.root; <userinput>cd /usr/src</userinput></screen> </step> <step> - <para>Compile the kernel.</para> - - <screen>&prompt.root; <userinput>make depend</userinput> -&prompt.root; <userinput>make</userinput></screen> - </step> + <para>Compile the kernel:</para> - <step> - <para>Install the new kernel.</para> - - <screen>&prompt.root; <userinput>make install</userinput></screen> - </step> - </procedure> - - <procedure> - <title>Procedure 2. Building a Kernel the <quote>New</quote> - Way</title> - - <step> - <para>Change to the <filename>/usr/src</filename> directory.</para> - - <screen>&prompt.root; <userinput>cd /usr/src</userinput></screen> - </step> - - <step> - <para>Compile the kernel.</para> - <screen>&prompt.root; <userinput>make buildkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen> </step> <step> - <para>Install the new kernel.</para> + <para>Install the new kernel:</para> <screen>&prompt.root; <userinput>make installkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen> </step> </procedure> - + <note> - <para>This method of kernel building requires full source files. If you - only installed the kernel source, use the traditional method, as - described above.</para> + <para>It is required to have full &os; source tree to build the + kernel.</para> </note> <tip> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.116 2006/05/30 23:08:24 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.118 2006/10/16 09:14:38 danger Exp $ --> <chapter id="multimedia"> @@ -423,10 +423,6 @@ <title>Setting Default Values for Mixer Channels</title> - <note> - <para>This is only supported in &os; 5.3-RELEASE and later.</para> - </note> - <para>The default values for the different mixer channels are hardcoded in the sourcecode of the &man.pcm.4; driver. There are a lot of different applications and daemons that allow @@ -435,6 +431,7 @@ solution, we want to have default values at the driver level. This is accomplished by defining the appropriate values in <filename>/boot/device.hints</filename>. E.g.:</para> + <programlisting>hint.pcm.0.vol="100"</programlisting> <para>This will set the volume channel to a default value of @@ -706,12 +703,6 @@ name hardcoded in them, you might find it useful to make symbolic links to the proper devices:</para> - <screen>&prompt.root; <userinput>ln -sf /dev/acd0c /dev/dvd</userinput> -&prompt.root; <userinput>ln -sf /dev/racd0c /dev/rdvd</userinput></screen> - - <para>On FreeBSD 5.X, which uses &man.devfs.5; there - is a slightly different set of recommended links:</para> - <screen>&prompt.root; <userinput>ln -sf /dev/acd0 /dev/dvd</userinput> &prompt.root; <userinput>ln -sf /dev/acd0 /dev/rdvd</userinput></screen> @@ -728,17 +719,6 @@ special DVD-ROM functions, requires write permission on the DVD devices.</para> - <indexterm> - <primary>kernel options</primary> - <secondary>CPU_ENABLE_SSE</secondary> - </indexterm> - - <para>Some of the ports discussed rely on the following kernel - options to build correctly. Before attempting to build, add - this option to the kernel configuration file, build a new kernel, and reboot:</para> - - <programlisting>options CPU_ENABLE_SSE</programlisting> - <para>To enhance the shared memory X11 interface, it is recommended that the values of some &man.sysctl.8; variables should be increased:</para> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.91 2006/10/13 14:11:00 remko Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.93 2006/10/16 07:54:12 danger Exp $ --> <chapter id="network-servers"> @@ -841,7 +841,7 @@ <para>If real locking between the <acronym>NFS</acronym> clients and <acronym>NFS</acronym> server is not required, it is - possible to let the <acronym>NFS</acronym>client do locking + possible to let the <acronym>NFS</acronym> client do locking locally by passing <option>-L</option> to &man.mount.nfs.8;. Refer to the &man.mount.nfs.8; manual page for further details. </para> @@ -1325,13 +1325,6 @@ <para>This section will deal with setting up a sample NIS environment.</para> - <note><para>This section assumes that you are running - FreeBSD 3.3 or later. The instructions given here will - <emphasis>probably</emphasis> work for any version of FreeBSD - greater than 3.0, but there are no guarantees that this is - true.</para></note> - - <sect3> <title>Planning</title> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.301 2006/10/13 09:14:54 remko Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.303 2006/10/14 03:50:18 trhodes Exp $ --> <chapter id="security"> @@ -125,7 +125,7 @@ servers — meaning that external entities can connect and talk to them. As yesterday's mini-computers and mainframes become today's desktops, and as computers become networked and - internetwork, security becomes an even bigger issue.</para> + inter-networked, security becomes an even bigger issue.</para> <para>System security also pertains to dealing with various forms of attack, including attacks that attempt to crash, or otherwise make a @@ -2296,6 +2296,10 @@ Issued Expires Principal Aug 27 15:37:58 Aug 28 01:37:58 krbtgt/EXAMPLE.ORG@EXAMPLE.ORG</screen> + <para>The ticket can then be revoked when you have + finished:</para> + + <screen>&prompt.user; <userinput>k5destroy</userinput></screen> </sect2> <sect2> @@ -2319,7 +2323,7 @@ <application>Kerberos</application> enabled daemons and a workstation — the server must have a <filename>keytab</filename> file. This file - contains the servers host key, which allows it and the + contains the server's host key, which allows it and the <acronym>KDC</acronym> to verify each others identity. It must be transmitted to the server in a secure fashion, as the security of the server can be broken if the key is made public. @@ -2349,8 +2353,8 @@ you can use <command>kadmin</command> from the <application>Kerberos</application> server. The <command>add --random-key</command> command will let you add the - servers host principal, and the <command>ext</command> command - will allow you to extract the servers host principal to its own + server's host principal, and the <command>ext</command> command + will allow you to extract the server's host principal to its own keytab. For example:</para> <screen>&prompt.root; <userinput>kadmin</userinput> ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.27 2006/07/03 15:36:58 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml,v 1.28 2006/10/15 18:24:59 blackend Exp $ Original revision: 1.331 --> @@ -97,7 +97,7 @@ </sect1> <sect1 id="install-pre"> - <title>Tâches de Pré-installation</title> + <title>Tâches de pré-installation</title> <sect2 id="install-inventory"> <title>Inventoriez votre ordinateur</title> @@ -132,7 +132,7 @@ table comme celle-ci:</para> <table pgwide="1" frame="none"> - <title>Exemple d'Inventaire de Périphériques</title> + <title>Exemple d'inventaire de périphériques</title> <tgroup cols="4"> <colspec colwidth="2*"> @@ -301,7 +301,7 @@ <para>Une installation minimale de FreeBSD prend aussi peu que 100 Mo d'espace disque. Cependant c'est vraiment une installation - <emphasis>minimale</emphasis>, ne laissant presqu'aucun espace + <emphasis>minimale</emphasis>, ne laissant presque aucun espace pour vos propres fichiers. Un minimum plus réaliste est 250 Mo sans environnement graphique, et 350 Mo ou plus si vous désirez une interface graphique. Si vous avez l'intention d'installer @@ -2349,7 +2349,7 @@ où <replaceable>n</replaceable> est un nombre qui change pour chaque disque. Mais vous pouvez choisir une autre - organisation si vous le préferrez.</entry> + organisation si vous le préférez.</entry> </row> </tbody> </tgroup> @@ -2485,7 +2485,7 @@ </mediaobject> </figure> - <para>La taille par defaut proposée créera une partition qui + <para>La taille par défaut proposée créera une partition qui occupera le reste de la tranche. Si vous utilisez les tailles de partitions comme décrit dans l'exemple précédent, alors effacez la valeur proposée en utilisant <keycap>Backspace</keycap>, @@ -3266,7 +3266,7 @@ Where files uploaded by anonymous FTP users will go.</screen> - <para>Le répertoire racine du ftp sera placé dans + <para>Le répertoire racine du FTP sera placé dans <filename>/var</filename> par défaut. Si vous n'avez pas de place à cet endroit pour les besoins prévus du FTP, le répertoire <filename>/usr</filename> pourra être @@ -4160,7 +4160,7 @@ surveiller quelles machines demandent des verrous et la fréquence de ces demandes. Alors que ces options sont parfaites pour le déboguage, elles ne sont pas - nécessaires pour le bon fonctionnement des seveurs et + nécessaires pour le bon fonctionnement des serveurs et clients <acronym>NFS</acronym>.</para> <para>En parcourant la liste, l'option suivante est @@ -5175,7 +5175,7 @@ Inutile de dire, que vous devez vous assurer d'avoir un moyen de retrouver le mot de passe si vous l'oubliez. Notez que le mot de passe que vous taperez ne s'affichera pas, il ne sera - pas non plus remplacé par des astériques.</para> + pas non plus remplacé par des astérisques.</para> <screen>Changing local password for root. New password : ==== //depot/projects/dtrace/ports/CHANGES#8 (text+ko) ==== @@ -10,6 +10,14 @@ All ports committers are allowed to commit to this file. +20061014: +AUTHOR: gnome@FreeBSD.org +The following changes have been introduced to the GNOME porting process +during the GNOME 2.16 update: + +* GNOME is now installed into LOCALBASE. Any port which makes use of the + gnomeprefix component will have its PREFIX forced to LOCALBASE + 20060930: AUTHOR: portmgr@FreeBSD.org The following functional changes were made to bsd.port.mk: @@ -1219,4 +1227,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.61 2006/09/30 19:26:32 linimon Exp $ +$FreeBSD: ports/CHANGES,v 1.62 2006/10/14 09:31:38 marcus Exp $ ==== //depot/projects/dtrace/ports/MOVED#25 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1163 2006/10/12 00:44:14 maho Exp $ +# $FreeBSD: ports/MOVED,v 1.1166 2006/10/16 00:18:35 marcus Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -1306,7 +1306,6 @@ print/txfonts||2004-12-19|already included in the teTeX distribution databases/sqlite|databases/sqlite2|2004-12-23|port renamed print/acroread5|print/acroread|2004-12-23|last Acrobat Reader port remaining -graphics/gimp-devel|graphics/gimp|2004-12-24|GIMP 2.2 is now stable x11-toolkits/xtermcontrol|x11/xtermcontrol|2004-12-25|new category multimedia/gstreamer-player||2004-12-26|Unmaintained by developers www/horde2|www/horde|2004-12-26|Resurrect www/horde @@ -1677,7 +1676,6 @@ ukrainian/ooodict-uk_UA||2005-11-01|localized version should be built via knob net/libicq0|net/libicq|2005-11-01|leaf port removed mail/ximian-connector|mail/evolution-exchange|2005-11-04|POOF! Now it's called evolution-exchange! -editors/gedit-plugins||2005-11-04|This component is unmaintained, and has succumbed to code rot www/pyphany||2005-11-04|Has been merged into epiphany editors/abiword-devel|editors/abiword|2005-11-04|Has been merged into abiword editors/abiword-plugins-devel|editors/abiword-plugins|2005-11-04|Has been merged into abiword-plugins @@ -2444,7 +2442,6 @@ net/lam7|net/lam|2006-08-21|Replace lam-6 which was deprecated devel/py-ui||2006-08-25|Has expired: PyUI does not work with well with current versions of graphics/py-opengl and has not been developed in over two years. Python game development should be done with devel/py-game instead net-im/jabber-msn||2006-08-25|Has expired: Depends on broken net-im/jabber, please use net-im/jabber-pymsn instead -net-im/gaim-devel|net-im/gaim|2006-08-26|Remove since gaim's maintainer don't want to add it now graphics/GIFgraph|graphics/p5-GD-Graph|2006-08-27|broken, use graphics/p5-GD-Graph instead www/p5-Apache-SizeLimit||2006-09-02|unresolvable conflict with www/mod_perl www/firefox10|www/firefox|2006-09-02|Security vulnerabilities ==== //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#6 (text+ko) ==== @@ -1,9 +1,9 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.132 2006/08/14 13:24:18 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.135 2006/10/15 03:42:39 marcus Exp $ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.370 2006/04/27 01:40:22 ahze Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $ # # Please view me with 4 column tabs! >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610170406.k9H462Mb072571>