PERFORCE change 103189 for review

John Birrell jb at FreeBSD.org
Fri Aug 4 19:54:28 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=103189

Change 103189 by jb at jb_freebsd2 on 2006/08/04 19:53:58

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#3 integrate
.. //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml#2 integrate
.. //depot/projects/dtrace/ports/CHANGES#4 integrate
.. //depot/projects/dtrace/ports/MOVED#9 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.mail.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#5 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.subdir.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.python.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#5 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/security-check.awk#2 integrate
.. //depot/projects/dtrace/src/bin/sh/histedit.c#3 integrate
.. //depot/projects/dtrace/src/etc/rc.d/Makefile#5 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#9 integrate
.. //depot/projects/dtrace/src/lib/Makefile#5 integrate
.. //depot/projects/dtrace/src/lib/libc/resolv/res_init.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/resolv/res_send.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/kse.2#3 integrate
.. //depot/projects/dtrace/src/lib/libthread_db/arch/powerpc/libc_r_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libthread_db/arch/powerpc/libpthread_md.c#1 branch
.. //depot/projects/dtrace/src/libexec/rtld-elf/rtld.c#3 integrate
.. //depot/projects/dtrace/src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate
.. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#4 integrate
.. //depot/projects/dtrace/src/share/doc/papers/timecounter/timecounter.ms#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/acpi.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/devctl.4#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/ng_ether.4#3 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/loader/main.c#3 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/loader/main.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/bktr/CHANGELOG.TXT#3 integrate
.. //depot/projects/dtrace/src/sys/dev/dpt/dpt_scsi.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/fe/if_fe.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/ixgb/if_ixgb.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/patm/if_patm_intr.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/sym/sym_fw1.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/sym/sym_fw2.h#3 integrate
.. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs.h#3 integrate
.. //depot/projects/dtrace/src/sys/geom/bde/g_bde_work.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#8 integrate
.. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#11 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/identcpu.c#7 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/tsc.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_tc.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_bus.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#8 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_ether.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/dtrace/src/sys/pci/ncr.c#4 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.c#5 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_object.c#6 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#9 integrate
.. //depot/projects/dtrace/www/en/projects/acpi/completed.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/acpi/index.sgml#2 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#3 (text+ko) ====

@@ -11,7 +11,7 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.11 2006/06/19 00:16:16 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.12 2006/08/04 17:26:26 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -609,6 +609,12 @@
       <emphasis>real</emphasis> destination directory, and not
       one of the symlinks that points to it.</para></note>
 
+    <para>For incremental builds, packages should be uploaded
+      using <command>rsync</command> so we do not put too much
+      strain on the mirrors:</para>
+
+    <screen>&prompt.root; <userinput>rsync -n -r -v -l -t -p --delete packages/ portmgr at ftp-master:w/ports/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/ | tee log</userinput></screen>
+
     <para>Distfiles can be transferred via
       <command>rsync</command>:</para>
 

==== //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml#2 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.23 2005/10/17 13:34:41 bvs Exp $
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.133 2005/10/17 08:07:15 gad Exp $
+     $FreeBSD: doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.24 2006/08/04 16:34:30 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.135 2006/08/04 16:33:24 marck Exp $
 
-     Original revision: 1.435
+     Original revision: 1.440
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -151,7 +151,7 @@
       <title>óÏÚÄÁÎÉÅ ÉÎÆÏÒÍÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×</title>
 
       <para>éÍÅÅÔÓÑ Ä×Á ÉÎÆÏÒÍÁÃÉÏÎÎÙÈ ÆÁÊÌÁ, ËÏÔÏÒÙÅ ÔÒÅÂÕÀÔÓÑ ÄÌÑ ÌÀÂÏÇÏ
-        ÐÏÒÔÁ, ×ÎÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, Ñ×ÌÑÅÔÓÑ ÌÉ ÏÎ ÐÁËÁÄÖÅÍ ÉÌÉ ÎÅÔ.  üÔÏ
+        ÐÏÒÔÁ, ×ÎÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, Ñ×ÌÑÅÔÓÑ ÌÉ ÏÎ ÐÁËÅÔÏÍ ÉÌÉ ÎÅÔ.  üÔÏ
         <filename>pkg-descr</filename> É <filename>pkg-plist</filename>.
         ðÒÅÆÉËÓ <filename>pkg-</filename> ÏÔÌÉÞÁÅÔ ÉÈ ÏÔ ÄÒÕÇÉÈ ÆÁÊÌÏ×.</para>
 
@@ -195,7 +195,7 @@
 
         <para>úÄÅÓØ ÐÅÒÅÞÉÓÌÑÀÔÓÑ ×ÓÅ ÆÁÊÌÙ, ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÙÅ ÐÏÒÔÏÍ.  åÇÏ
           ÔÁËÖÅ ÎÁÚÙ×ÁÀÔ <quote>ÓÐÉÓËÏÍ ÄÌÑ ÕÐÁËÏ×ËÉ</quote>, ÐÏÔÏÍÕ ÞÔÏ
-          ÐÁËÁÄÖ ÇÅÎÅÒÉÒÕÅÔÓÑ ÕÐÁËÏ×ËÏÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ÚÄÅÓØ ÕËÁÚÁÎÙ.
+          ÐÁËÅÔ ÇÅÎÅÒÉÒÕÅÔÓÑ ÕÐÁËÏ×ËÏÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ÚÄÅÓØ ÕËÁÚÁÎÙ.
           éÍÅÎÁ ÐÕÔÅÊ ÕËÁÚÙ×ÁÀÔÓÑ ÏÔÎÏÓÉÔÅÌØÎÏ ÕÓÔÁÎÏ×ÏÞÎÏÇÏ ÐÒÅÆÉËÓÁ
           (ÏÂÙÞÎÏ <filename>/usr/local</filename> ÉÌÉ
           <filename>/usr/X11R6</filename>).  åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÐÅÒÅÍÅÎÎÙÅ
@@ -232,6 +232,41 @@
 	    linkend="porting-autoplist">Á×ÔÏÍÁÔÉÞÅÓËÏÍ ÐÏÓÔÒÏÅÎÉÉ ÓÐÉÓËÁ
 	    ÕÐÁËÏ×ËÉ</link> ÍÏÖÅÔ ÐÏÍÏÞØ ÓÜËÏÎÏÍÉÔØ ×ÒÅÍÑ.</para>
         </note>
+
+        <para>óÕÝÅÓÔ×ÕÅÔ ÔÏÌØËÏ ÏÄÎÏ ÉÓËÌÀÞÅÎÉÅ, ËÏÇÄÁ Õ ÐÏÒÔÁ ÍÏÖÅÔ
+          ÏÔÓÕÔÓÔ×Ï×ÁÔØ <filename>pkg-plist</filename>.  åÓÌÉ ÐÏÒÔ
+          ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÌÉÛØ ÎÅÓËÏÌØËÏ ÆÁÊÌÏ×, Á ×ÏÚÍÏÖÎÏ, É ËÁÔÁÌÏÇÏ×, ÔÏ
+          ÏÎÉ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÞÉÓÌÅÎÙ × ÐÅÒÅÍÅÎÎÙÈ
+          <makevar>PLIST_FILES</makevar> É <makevar>PLIST_DIRS</makevar>,
+          ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ, ×ÎÕÔÒÉ ÆÁÊÌÁ <filename>Makefile</filename> ÐÏÒÔÁ.
+          ë ÐÒÉÍÅÒÕ, ÍÙ ÍÏÖÅÍ ÏÂÏÊÔÉÓØ ÂÅÚ ÆÁÊÌÁ
+          <filename>pkg-plist</filename> Õ ÐÒÉ×ÅÄ£ÎÎÏÇÏ ×ÙÛÅ ÐÏÒÔÁ
+          <filename>oneko</filename>, ÄÏÂÁ×É× ÓÌÅÄÕÀÝÉÅ ÓÔÒÏËÉ ×
+          <filename>Makefile</filename>:</para>
+
+        <programlisting>PLIST_FILES=	bin/oneko \
+		lib/X11/app-defaults/Oneko \
+		lib/X11/oneko/cat1.xpm \
+		lib/X11/oneko/cat2.xpm \
+		lib/X11/oneko/mouse.xpm
+PLIST_DIRS=	lib/X11/oneko</programlisting>
+
+        <para>ëÏÎÅÞÎÏ, ÐÅÒÅÍÅÎÎÁÑ <makevar>PLIST_DIRS</makevar> ÎÅ ÄÏÌÖÎÁ
+          ÚÁÄÁ×ÁÔØÓÑ, ÅÓÌÉ ÐÏÒÔ ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÎÉËÁËÉÈ ËÁÔÁÌÏÇÏ×.</para>
+
+        <para>ïÂÒÁÔÎÏÊ ÓÔÏÒÏÎÏÊ ÔÁËÏÇÏ ÓÐÏÓÏÂÁ ÐÅÒÅÞÉÓÌÅÎÉÑ ÆÁÊÌÏ× É
+          ËÁÔÁÌÏÇÏ× ÐÏÒÔÁ Ñ×ÌÑÅÔÓÑ ÎÅ×ÏÚÍÏÖÎÏÓÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
+          ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÅÊ ËÏÍÁÎÄ, ÏÐÉÓÁÎÎÙÈ × &man.pkg.create.1;.
+          ðÏÜÔÏÍÕ ÏÎ ÐÏÄÈÏÄÉÔ ÄÌÑ ÐÒÏÓÔÙÈ ÐÏÒÔÏ×, ÞÔÏ ÄÅÌÁÅÔ ÉÈ ÅÝ£ ÂÏÌÅÅ
+          ÐÒÏÓÔÙÍÉ.  ïÄÎÏ×ÒÅÍÅÎÎÏ Ó ÜÔÉÍ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÍÏÍÅÎÔÏÍ Ñ×ÌÑÅÔÓÑ
+          ÕÍÅÎØÛÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÆÁÊÌÏ× × ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×.  ðÏÖÁÌÕÊÓÔÁ,
+          ÐÏÄÕÍÁÊÔÅ ÎÁÄ ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÜÔÏÊ ÔÅÈÎÉËÉ, ÐÒÅÖÄÅ ÞÅÍ ÓÏÚÄÁ×ÁÔØ
+          <filename>pkg-plist</filename>.</para>
+
+        <para>äÁÌÅÅ ÍÙ Õ×ÉÄÉÍ, ËÁË ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÁÊÌÙ
+          <filename>pkg-plist</filename> É <makevar>PLIST_FILES</makevar>
+          ×ÙÐÏÌÎÅÎÉÑ <link linkend="porting-plist">ÂÏÌÅÅ ÓÌÏÖÎÙÈ
+          ÚÁÄÁÞ</link>.</para>
       </sect2>
     </sect1>
 
@@ -247,7 +282,7 @@
       <title>ôÅÓÔÉÒÏ×ÁÎÉÅ ÐÏÒÔÁ</title>
 
       <para>÷Ù ÄÏÌÖÎÙ ÕÄÏÓÔÏ×ÅÒÉÔØÓÑ, ÞÔÏ ÐÒÁ×ÉÌÁ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔÁ ×ÙÐÏÌÎÑÀÔ
-	ÉÍÅÎÎÏ ÔÏ, ÞÔÏ ×Ù ÈÏÔÉÔÅ, ×ËÌÀÞÁÑ ÓÏÚÄÁÎÉÅ ÐÁËÁÄÖÁ ÄÌÑ ÐÏÒÔÁ.  ÷ÏÔ
+	ÉÍÅÎÎÏ ÔÏ, ÞÔÏ ×Ù ÈÏÔÉÔÅ, ×ËÌÀÞÁÑ ÓÏÚÄÁÎÉÅ ÐÁËÅÔÁ ÄÌÑ ÐÏÒÔÁ.  ÷ÏÔ
 	ÔÅ ×ÁÖÎÙÅ ×ÅÝÉ, ËÏÔÏÒÙÅ ×Ù ÄÏÌÖÎÙ ÐÒÏ×ÅÒÉÔØ.</para>
 
       <itemizedlist>
@@ -310,7 +345,7 @@
 	ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ.  ðÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ ÛÁÇÁ 3 ÐÒÏ×ÅÒØÔÅ, ÞÔÏ ×ÓÅ ÎÏ×ÙÅ
 	ËÁÔÁÌÏÇÉ ÂÙÌÉ ÕÓÐÅÛÎÏ ÕÄÁÌÅÎÙ.	ôÁËÖÅ ÐÏÐÒÏÂÕÊÔÅ ÚÁÐÕÓÔÉÔØ
 	ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ÐÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ ÛÁÇÁ 4, ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ, ÞÔÏ
-	ÏÎÏ ÒÁÂÏÔÁÅÔ ÐÒÁ×ÉÌØÎÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÚ ÐÁËÁÄÖÁ.</para>
+	ÏÎÏ ÒÁÂÏÔÁÅÔ ÐÒÁ×ÉÌØÎÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÚ ÐÁËÅÔÁ.</para>
     </sect1>
 
     <sect1 id="porting-portlint">
@@ -323,7 +358,7 @@
 	ðÏÒÔÏ×.  ÷ ÞÁÓÔÎÏÓÔÉ, ×Ù ÍÏÖÅÔÅ ÚÁÈÏÔÅÔØ ÐÒÏ×ÅÒÉÔØ, ÐÒÁ×ÉÌØÎÏ ÌÉ
 	ÓÆÏÒÍÉÒÏ×ÁÎ ÆÁÊÌ <link linkend="porting-samplem">Makefile</link> É
 	ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍ ÌÉ ÏÂÒÁÚÏÍ ÎÁÉÍÅÎÏ×ÁÎ <link
-	linkend="porting-pkgname">ÐÁËÁÄÖ</link>.</para>
+	linkend="porting-pkgname">ÐÁËÅÔ</link>.</para>
     </sect1>
 
     <sect1 id="porting-submitting">
@@ -336,7 +371,7 @@
       <para>ôÅÐÅÒØ, ËÏÇÄÁ ×Ù ÓÞÁÓÔÌÉ×Ù ÏÔ Ó×ÏÅÇÏ ÐÅÒ×ÏÇÏ ÐÏÒÔÁ, ÅÄÉÎÓÔ×ÅÎÎÏÅ,
 	ÞÔÏ ÏÓÔÁÌÏÓØ ÓÄÅÌÁÔØ, ÜÔÏ ×ËÌÀÞÉÔØ ÅÇÏ × ÏÓÎÏ×ÎÏÅ ÄÅÒÅ×Ï ÐÏÒÔÏ×
 	FreeBSD É ÏÓÞÁÓÔÌÉ×ÉÔØ ÜÔÉÍ ×ÓÅÈ ÏÓÔÁÌØÎÙÈ.  îÁÍ ÎÅ ÎÕÖÅÎ ÎÉ ×ÁÛ
-	ËÁÔÁÌÏÇ <filename>work</filename>, ÎÉ ÐÁËÁÄÖ
+	ËÁÔÁÌÏÇ <filename>work</filename>, ÎÉ ÐÁËÅÔ
 	<filename>pkgname.tgz</filename>, ÔÁË ÞÔÏ ÕÄÁÌÉÔÅ ÉÈ ÐÒÑÍÏ ÓÅÊÞÁÓ.
 	úÁÔÅÍ ÐÒÏÓÔÏ ×ËÌÀÞÉÔÅ ×Ù×ÏÄ ËÏÍÁÎÄÙ
 	<command>shar `find port_dir`</command> × ÓÏÏÂÝÅÎÉÅ ÏÂ ÏÛÉÂËÅ É ÐÏÛÌÉÔÅ
@@ -369,7 +404,7 @@
 
       <para>ðÏ×ÔÏÒÉÍ ÅÝ£ ÒÁÚ, ÞÔÏ <emphasis>ÎÅ ÎÕÖÎÏ ×ËÌÀÞÁÔØ ÎÉ ÏÒÉÇÉÎÁÌØÎÙÊ
 	ÆÁÊÌ Ó ÄÉÓÔÒÉÂÕÔÉ×ÏÍ, ÎÉ ËÁÔÁÌÏÇ <filename>work</filename>,
-	ÎÉ ÐÁËÁÄÖ, ÐÏÓÔÒÏÅÎÎÙÊ ×ÁÍÉ ËÏÍÁÎÄÏÊ
+	ÎÉ ÐÁËÅÔ, ÐÏÓÔÒÏÅÎÎÙÊ ×ÁÍÉ ËÏÍÁÎÄÏÊ
 	<command>make package</command></emphasis>.</para>
 
       <para>ðÏÓÌÅ ÔÏÇÏ ËÁË ×Ù ÐÏÓÌÁÌÉ ÐÏÒÔ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÔÅÒÐÉÔÅ.
@@ -669,11 +704,11 @@
 	<command>configure</command>, ÎÅ ÎÕÖÎÏ ×ËÌÀÞÁÔØ ÆÁÊÌÙ diff ÄÌÑ
 	<command>configure</command> (ÏÎÉ ÞÁÓÔÅÎØËÏ ×ÙÒÁÓÔÁÀÔ ÄÏ ÎÅÓËÏÌØËÉÈ
 	ÔÙÓÑÞ ÓÔÒÏË!); ÚÁÄÁÊÔÅ <literal>USE_AUTOCONF_VER=213</literal> É
-	×ËÌÀÞÉÔÅ ÄÉÆÆ-ÆÁÊÌ ÄÌÑ <filename>configure.in</filename>.</para>
+	×ËÌÀÞÉÔÅ diff-ÆÁÊÌ ÄÌÑ <filename>configure.in</filename>.</para>
 
       <para>ëÒÏÍÅ ÔÏÇÏ, ÅÓÌÉ ×Ù ÕÄÁÌÑÅÔÅ ÆÁÊÌ, ÔÏ ÜÔÏ ÍÏÖÎÏ ÓÄÅÌÁÔØ É × ÃÅÌÉ
 	<maketarget>post-extract</maketarget>, Á ÎÅ ×ÎÕÔÒÉ ÐÁÔÞÁ.  ëÁË ÔÏÌØËÏ
-	×Ù ÂÕÄÅÔÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ ÐÏÌÕÞÁÀÝÉÍÓÑ ÄÉÆÆ-ÆÁÊÌÏÍ, ÒÁÚÂÅÊÔÅ ÅÇÏ ÎÁ
+	×Ù ÂÕÄÅÔÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ ÐÏÌÕÞÁÀÝÉÍÓÑ diff-ÆÁÊÌÏÍ, ÒÁÚÂÅÊÔÅ ÅÇÏ ÎÁ
 	ÎÅÓËÏÌØËÏ ÐÏ ÏÄÎÏÍÕ ÐÁÔÞÕ ÎÁ ÏÔÄÅÌØÎÙÊ ÆÁÊÌ.</para>
     </sect1>
 
@@ -706,7 +741,7 @@
       <para>ðÒÉ ÎÁÌÉÞÉÉ ÒÁÚÕÍÎÙÈ ÏÔ×ÅÔÏ× ÎÁ ÚÁÄÁ×ÁÅÍÙÅ ×ÏÐÒÏÓÙ, ÐÏÄÈÏÄÑÝÉÈ ÐÏ
 	ÕÍÏÌÞÁÎÉÀ, ÔÁËÖÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÐÒÏ×ÅÒÑÔØ ÐÅÒÅÍÅÎÎÕÀ
 	<makevar>PACKAGE_BUILDING</makevar> É ×ÙËÌÀÞÁÔØ ÉÎÔÅÒÁËÔÉ×ÎÙÊ ÓËÒÉÐÔ,
-	ÅÓÌÉ ÏÎ ÅÓÔØ.  üÔÏ ÐÏÚ×ÏÌÉÔ ÎÁÍ ÓÔÒÏÉÔØ ÐÁËÁÄÖÉ ÄÌÑ ÐÏÍÅÝÅÎÉÑ ÎÁ
+	ÅÓÌÉ ÏÎ ÅÓÔØ.  üÔÏ ÐÏÚ×ÏÌÉÔ ÎÁÍ ÓÔÒÏÉÔØ ÐÁËÅÔÙ ÄÌÑ ÐÏÍÅÝÅÎÉÑ ÎÁ
 	ËÏÍÐÁËÔ-ÄÉÓËÉ É FTP-ÓÅÒ×ÅÒÙ.</para>
     </sect1>
   </chapter>
@@ -775,15 +810,15 @@
             ÍÏÎÏÔÏÎÎÏ Õ×ÅÌÉÞÉ×ÁÀÝÅÅÓÑ ÞÉÓÌÏ, ËÏÔÏÒÏÅ ÏÂÎÕÌÑÅÔÓÑ ÐÒÉ ËÁÖÄÏÍ
             Õ×ÅÌÉÞÅÎÉÉ ÚÎÁÞÅÎÉÑ ÐÅÒÅÍÅÎÎÏÊ <makevar>PORTVERSION</makevar> (ÔÏ
             ÅÓÔØ ËÁÖÄÙÊ ÒÁÚ, ËÏÇÄÁ ÓÏÚÄÁÔÅÌÑÍÉ ×ÙÐÕÓËÁÅÔÓÑ ÎÏ×ÙÊ ÏÆÉÃÉÁÌØÎÙÊ
-            ÒÅÌÉÚ), É ÄÏÂÁ×ÌÑÅÔÓÑ Ë ÉÍÅÎÉ ÐÁËÁÄÖÁ, ÅÓÌÉ ÏÎÏ ÎÅ ÒÁ×ÎÏ ÎÕÌÀ.
+            ÒÅÌÉÚ), É ÄÏÂÁ×ÌÑÅÔÓÑ Ë ÉÍÅÎÉ ÐÁËÅÔÁ, ÅÓÌÉ ÏÎÏ ÎÅ ÒÁ×ÎÏ ÎÕÌÀ.
             éÚÍÅÎÅÎÉÑ × <makevar>PORTREVISION</makevar> ÉÓÐÏÌØÚÕÀÔÓÑ
             Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÙÍÉ ÉÎÓÔÒÕÍÅÎÔÁÍÉ (ÎÁÐÒÉÍÅÒ, &man.pkg.version.1;)
-            ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÆÁËÔÁ ÐÏÑ×ÌÅÎÉÑ ÎÏ×ÏÇÏ ÐÁËÁÄÖÁ.</para>
+            ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÆÁËÔÁ ÐÏÑ×ÌÅÎÉÑ ÎÏ×ÏÇÏ ÐÁËÅÔÁ.</para>
 
           <para>úÎÁÞÅÎÉÅ <makevar>PORTREVISION</makevar> ÄÏÌÖÎÏ Õ×ÅÌÉÞÉ×ÁÔØÓÑ
             ËÁÖÄÙÊ ÒÁÚ, ËÏÇÄÁ × ÐÏÒÔÅ FreeBSD ÄÅÌÁÀÔÓÑ ÉÚÍÅÎÅÎÉÑ, ËÏÔÏÒÙÅ
             ÄÏÓÔÁÔÏÞÎÏ ÓÉÌØÎÏ ÚÁÔÒÁÇÉ×ÁÀÔ ÓÏÄÅÒÖÉÍÏÅ ÉÌÉ ÓÔÒÕËÔÕÒÕ
-            ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÐÁËÁÄÖÁ.</para>
+            ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÐÁËÅÔÁ.</para>
 
           <para>ðÒÉÍÅÒÙ ÓÌÕÞÁÅ×, ËÏÇÄÁ ÚÎÁÞÅÎÉÅ <makevar>PORTREVISION</makevar>
             ÄÏÌÖÎÏ ÂÙÔØ Õ×ÅÌÉÞÅÎÏ:</para>
@@ -797,20 +832,20 @@
             <listitem>
 	      <para>éÚÍÅÎÅÎÉÑ × ÆÁÊÌÅ <filename>Makefile</filename> ÐÏÒÔÁ ÄÌÑ
                 ×ËÌÀÞÅÎÉÑ É ×ÙËÌÀÞÅÎÉÑ ÐÁÒÁÍÅÔÒÏ×, ÏÐÒÅÄÅÌÑÅÍÙÈ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ
-                ÐÁËÁÄÖÁ.</para>
+                ÐÁËÅÔÁ.</para>
             </listitem>
 
             <listitem>
-	      <para>éÚÍÅÎÅÎÉÑ × ÓÐÉÓËÅ ÕÐÁËÏ×ËÉ ÉÌÉ × ÐÏ×ÅÄÅÎÉÉ ÐÁËÁÄÖÁ ×Ï
+	      <para>éÚÍÅÎÅÎÉÑ × ÓÐÉÓËÅ ÕÐÁËÏ×ËÉ ÉÌÉ × ÐÏ×ÅÄÅÎÉÉ ÐÁËÅÔÁ ×Ï
                 ×ÒÅÍÑ ÅÇÏ ÕÓÔÁÎÏ×ËÉ (ÎÁÐÒÉÍÅÒ, ÉÚÍÅÎÅÎÉÅ ÓËÒÉÐÔÁ, ÇÅÎÅÒÉÒÕÀÝÅÇÏ
-	        ÎÁÞÁÌØÎÙÅ ÄÁÎÎÙÅ ÄÌÑ ÐÁËÁÄÖÁ, ÔÁËÉÅ, ËÁË ssh-ËÌÀÞÉ ÄÌÑ
+	        ÎÁÞÁÌØÎÙÅ ÄÁÎÎÙÅ ÄÌÑ ÐÁËÅÔÁ, ÔÁËÉÅ, ËÁË ssh-ËÌÀÞÉ ÄÌÑ
 	        ÈÏÓÔÁ).</para>
             </listitem>
 
             <listitem>
 	      <para>õ×ÅÌÉÞÅÎÉÅ ×ÅÒÓÉÉ ÄÉÎÁÍÉÞÅÓËÏÊ ÂÉÂÌÉÏÔÅËÉ, ÏÔ ËÏÔÏÒÏÊ
                 ÚÁ×ÉÓÉÔ ÐÏÒÔ (× ÜÔÏÍ ÓÌÕÞÁÅ ÔÏÔ, ËÔÏ ÐÏÐÙÔÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ
-                ÓÔÁÒÙÊ ÐÁËÁÄÖ ÐÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ ÂÉÂÌÉÏÔÅËÉ,
+                ÓÔÁÒÙÊ ÐÁËÅÔ ÐÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ ÂÉÂÌÉÏÔÅËÉ,
                 ÎÅ ÓÍÏÖÅÔ ÜÔÏÇÏ ÓÄÅÌÁÔØ, ÐÏÔÏÍÕ ÞÔÏ ÐÒÉ ÜÔÏÍ ÂÕÄÅÔ ÄÅÌÁÔØÓÑ
                 ÐÏÉÓË ÓÔÁÒÏÊ ÂÉÂÌÉÏÔÅËÉ libfoo.x, Á ÎÅ libfoo.(x+1)).</para>
             </listitem>
@@ -833,28 +868,28 @@
           <itemizedlist>
             <listitem>
 	      <para>éÚÍÅÎÅÎÉÑ ÓÔÉÌÑ × ÓËÅÌÅÔÅ ÐÏÒÔÁ ÂÅÚ ÆÕÎËÃÉÏÎÁÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ
-	        × ÐÁËÁÄÖÅ.</para>
+	        × ÐÁËÅÔÅ.</para>
             </listitem>
 
             <listitem>
 	      <para>éÚÍÅÎÅÎÉÑ × ÐÅÒÅÍÅÎÎÏÊ <makevar>MASTER_SITES</makevar> ÉÌÉ
 	        ÄÒÕÇÉÅ ÆÕÎËÃÉÏÎÁÌØÎÙÅ ÉÚÍÅÎÅÎÉÑ ÐÏÒÔÁ, ËÏÔÏÒÙÅ ÎÅ ÚÁÔÒÁÇÉ×ÁÀÔ
-	        ÐÏÌÕÞÁÀÝÅÇÏÓÑ ÐÁËÁÄÖÁ.</para>
+	        ÐÏÌÕÞÁÀÝÅÇÏÓÑ ÐÁËÅÔÁ.</para>
             </listitem>
 
             <listitem>
 	      <para>ôÒÉ×ÉÁÌØÎÙÅ ÐÁÔÞÉ Ë ÄÉÓÔÒÉÂÕÔÉ×ÎÏÍÕ ÆÁÊÌÕ, ÔÁËÉÅ, ËÁË
 	        ÉÓÐÒÁ×ÌÅÎÉÑ ÏÐÅÞÁÔÏË, ËÏÔÏÒÙÅ ÎÅ ÔÁË ÕÖ ×ÁÖÎÙ, ÞÔÏ ÐÏÌØÚÏ×ÁÔÅÌÉ
-	        ÐÁËÁÄÖÁ ÄÏÌÖÎÙ ÏÚÁÂÏÔÉÔØÓÑ ÏÂÎÏ×ÌÅÎÉÅÍ.</para>
+	        ÐÁËÅÔÁ ÄÏÌÖÎÙ ÏÚÁÂÏÔÉÔØÓÑ ÏÂÎÏ×ÌÅÎÉÅÍ.</para>
             </listitem>
 
             <listitem>
 	      <para>éÓÐÒÁ×ÌÅÎÉÑ, ËÁÓÁÀÝÉÅÓÑ ÜÔÁÐÁ ÐÏÓÔÒÏÅÎÉÑ, ËÏÔÏÒÙÅ ÄÅÌÁÀÔ
-	        ×ÏÚÍÏÖÎÙÍ ÐÏÓÔÒÏÅÎÉÅ ÐÁËÁÄÖÁ, ÅÓÌÉ ÒÁÎÅÅ ÜÔÏ ÂÙÌÏ ÎÅ×ÏÚÍÏÖÎÏ
+	        ×ÏÚÍÏÖÎÙÍ ÐÏÓÔÒÏÅÎÉÅ ÐÁËÅÔÁ, ÅÓÌÉ ÒÁÎÅÅ ÜÔÏ ÂÙÌÏ ÎÅ×ÏÚÍÏÖÎÏ
 	        ÓÄÅÌÁÔØ (ÐÏËÁ ÉÚÍÅÎÅÎÉÑ ÎÅ ÐÒÉ×ÏÄÑÔ Ë ÉÚÍÅÎÅÎÉÀ ÒÁÂÏÔÙ ÎÁ ÌÀÂÙÈ
 	        ÄÒÕÇÉÈ ÐÌÁÔÆÏÒÍÁÈ, ÎÁ ËÏÔÏÒÙÈ ÐÏÒÔ ÒÁÎÅÅ ÓÔÒÏÉÌÓÑ).  ôÁË ËÁË
-	        <makevar>PORTREVISION</makevar> ÏÔÒÁÖÁÅÔ ÓÏÄÅÒÖÉÍÏÅ ÐÁËÁÄÖÁ,
-                ÔÏ, ÅÓÌÉ ÒÁÎÅÅ ÐÁËÁÄÖ ÎÅ ÓÔÒÏÉÌÓÑ, ÔÏ ÎÅÔ ÎÕÖÄÙ Õ×ÅÌÉÞÉ×ÁÔØ
+	        <makevar>PORTREVISION</makevar> ÏÔÒÁÖÁÅÔ ÓÏÄÅÒÖÉÍÏÅ ÐÁËÅÔÁ,
+                ÔÏ, ÅÓÌÉ ÒÁÎÅÅ ÐÁËÅÔ ÎÅ ÓÔÒÏÉÌÓÑ, ÔÏ ÎÅÔ ÎÕÖÄÙ Õ×ÅÌÉÞÉ×ÁÔØ
 	        <makevar>PORTREVISION</makevar> ÄÌÑ ÏÔÍÅÔËÉ ÉÚÍÅÎÅÎÉÑ.</para>
             </listitem>
           </itemizedlist>
@@ -863,7 +898,7 @@
             ÔÏÍ, ÞÔÏ ÎÕÖÎÏ ÓÐÒÁÛÉ×ÁÔØ ÓÅÂÑ, Ñ×ÌÑÅÔÓÑ ÌÉ ×ÎÏÓÉÍÏÅ × ÐÏÒÔ
             ÉÚÍÅÎÅÎÉÅ ÔÁËÉÍ, ÞÔÏ ÏÔ ÎÅÇÏ ×ÙÉÇÒÁÀÔ ×ÓÅ (× ×ÉÄÅ
             ÕÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÉÑ, ÉÓÐÒÁ×ÌÅÎÉÑ ÉÌÉ ÂÌÁÇÏÄÁÒÑ ÔÏÍÕ, ÞÔÏ ÎÏ×ÙÊ
-            ÐÁËÁÄÖ ÂÕÄÅÔ ×ÏÏÂÝÅ ÒÁÂÏÔÏÓÐÏÓÏÂÎÙÍ), É ÐÒÉÍÉÔÅ ×Ï ×ÎÉÍÁÎÉÅ ÔÏÔ
+            ÐÁËÅÔ ÂÕÄÅÔ ×ÏÏÂÝÅ ÒÁÂÏÔÏÓÐÏÓÏÂÎÙÍ), É ÐÒÉÍÉÔÅ ×Ï ×ÎÉÍÁÎÉÅ ÔÏÔ
             ÆÁËÔ, ÞÔÏ ÐÒÉ ÜÔÏÍ ×ÓÅ, ËÔÏ ÒÅÇÕÌÑÒÎÏ ÏÂÎÏ×ÌÑÀÔ Ó×Ï£ ÄÅÒÅ×Ï ÐÏÒÔÏ×,
             ÂÕÄÕÔ ÏÂÑÚÁÎÙ ÜÔÏ ÓÄÅÌÁÔØ.  åÓÌÉ ÜÔÏ ÔÁË, ÔÏ ÐÅÒÅÍÅÎÎÁÑ
             <makevar>PORTREVISION</makevar> ÄÏÌÖÎÁ ÂÙÔØ Õ×ÅÌÉÞÅÎÁ.</para>
@@ -882,17 +917,17 @@
           <para>÷ ÓÉÔÕÁÃÉÑÈ, ÐÏÄÏÂÎÙÈ ÜÔÏÊ, ÄÏÌÖÎÏ ÂÙÔØ Õ×ÅÌÉÞÅÎÏ ÚÎÁÞÅÎÉÅ
             <makevar>PORTEPOCH</makevar>.  åÓÌÉ ÚÎÁÞÅÎÉÅ
             <makevar>PORTEPOCH</makevar> ÎÅ ÒÁ×ÎÏ ÎÕÌÀ, ÔÏ ÏÎÏ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
-            ÉÍÅÎÉ ÐÁËÁÄÖÁ, ËÁË ÏÐÉÓÁÎÏ × ÒÁÚÄÅÌÅ ×ÙÛÅ.  úÎÁÞÅÎÉÅ
+            ÉÍÅÎÉ ÐÁËÅÔÁ, ËÁË ÏÐÉÓÁÎÏ × ÒÁÚÄÅÌÅ ×ÙÛÅ.  úÎÁÞÅÎÉÅ
             <makevar>PORTEPOCH</makevar> ÎÉËÏÇÄÁ ÎÅ ÄÏÌÖÎÏ ÕÍÅÎØÛÁÔØÓÑ ÉÌÉ
             ÓÂÒÁÓÙ×ÁÔØÓÑ × ÎÏÌØ, ÐÏÔÏÍÕ ÞÔÏ ÜÔÏ ÐÒÉ×ÅÄ£Ô Ë ÏÛÉÂËÅ ÓÒÁ×ÎÅÎÉÑ Ó
-            ÐÁËÁÄÖÅÍ Ó ÍÅÎØÛÉÍ ÎÏÍÅÒÏÍ ÜÐÏÈÉ (ÔÏ ÅÓÔØ ÔÏ, ÞÔÏ ÐÁËÁÄÖ ÕÓÔÁÒÅÌ,
+            ÐÁËÅÔÏÍ Ó ÍÅÎØÛÉÍ ÎÏÍÅÒÏÍ ÜÐÏÈÉ (ÔÏ ÅÓÔØ ÔÏ, ÞÔÏ ÐÁËÅÔ ÕÓÔÁÒÅÌ,
             ÏÂÎÁÒÕÖÅÎÏ ÎÅ ÂÕÄÅÔ): ÎÏÍÅÒ ÎÏ×ÏÊ ×ÅÒÓÉÉ (ÎÁÐÒÉÍÅÒ,
             <literal>1.0,1</literal> × ÐÒÉÍÅÒÅ ×ÙÛÅ) ÏÓÔÁÎÅÔÓÑ ÍÅÎØÛÅ, ÞÅÍ
             ÎÏÍÅÒ ÐÒÅÄÙÄÕÝÅÊ ×ÅÒÓÉÉ (20000801), ÏÄÎÁËÏ ÓÕÆÆÉËÓ
             <literal>,1</literal> ÉÎÔÅÒÐÒÅÔÉÒÕÅÔÓÑ ÒÁÚÌÉÞÎÙÍÉ
             Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÙÍÉ ÕÔÉÌÉÔÁÍÉ ÏÓÏÂÙÍ ÏÂÒÁÚÏÍ, É ÏËÁÖÅÔÓÑ ÂÏÌØÛÅ,
             ÞÅÍ ÐÒÅÄÐÏÌÁÇÁÅÍÙÊ ÓÕÆÆÉËÓ <literal>,0</literal> ÂÏÌÅÅ ÒÁÎÎÅÇÏ
-            ÐÁËÁÄÖÁ).</para>
+            ÐÁËÅÔÁ).</para>
 
           <para>îÅËÏÒÒÅËÔÎÏÅ ÕÍÅÎØÛÅÎÉÅ ÉÌÉ ÓÂÒÏÓ <makevar>PORTEPOCH</makevar>
             ÐÒÉ×ÏÄÉÔ Ë ÐÅÞÁÌØÎÙÍ ÐÏÓÌÅÄÓÔ×ÉÑÍ; ÅÓÌÉ ×Ù ÎÅ ÐÏÎÑÌÉ, Ï Þ£Í ÛÌÁ
@@ -952,7 +987,7 @@
             ÍÌÁÄÛÉÊ ÎÏÍÅÒ ×ÅÒÓÉÉ <literal>2</literal> ÐÏ ÚÎÁÞÅÎÉÀ ÍÅÎØÛÅ, ÞÅÍ
             ÎÏÍÅÒ ÐÒÅÄÙÄÕÝÅÊ ×ÅÒÓÉÉ <literal>10</literal>, ÔÏ ÄÏÌÖÎÏ ÂÙÔØ
             Õ×ÅÌÉÞÅÎÏ ÚÎÁÞÅÎÉÅ <makevar>PORTEPOCH</makevar> ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ
-            ÚÁÓÔÁ×ÉÔØ ÒÁÓÐÏÚÎÁ×ÁÔØ ×ÎÏ×Ø ÓÏÚÄÁ×ÁÅÍÙÊ ÐÁËÁÄÖ ËÁË <quote>ÂÏÌÅÅ
+            ÚÁÓÔÁ×ÉÔØ ÒÁÓÐÏÚÎÁ×ÁÔØ ×ÎÏ×Ø ÓÏÚÄÁ×ÁÅÍÙÊ ÐÁËÅÔ ËÁË <quote>ÂÏÌÅÅ
             ÎÏ×ÙÊ</quote>.  ôÁË ËÁË ÜÔÏ ÎÏ×ÙÊ ÒÅÌÉÚ ÐÒÏÇÒÁÍÍÙ, ÔÏ
             <makevar>PORTREVISION</makevar> ÏÂÎÕÌÑÅÔÓÑ (ÉÌÉ ÕÄÁÌÑÅÔÓÑ ÉÚ
             ÆÁÊÌÁ <filename>Makefile</filename>).</para>
@@ -978,8 +1013,8 @@
           <note>
             <para>åÓÌÉ ÚÎÁÞÅÎÉÅ <makevar>PORTEPOCH</makevar> ÜÔÉÍ ÏÂÎÏ×ÌÅÎÉÅÍ
               ÂÙÌÏ ÂÙ ÓÂÒÏÛÅÎÏ × <literal>0</literal>, ÔÏ ËÔÏ-ÎÉÂÕÄØ, ÉÍÅÀÝÉÊ
-              ÕÓÔÁÎÏ×ÌÅÎÎÙÊ ÐÁËÁÄÖ <literal>gtkmumble-0.10_1</literal>, ÎÅ
-              ÓÍÏÇ ÂÙ ÏÐÏÚÎÁÔØ ÐÁËÁÄÖ <literal>gtkmumble-0.3</literal> ËÁË
+              ÕÓÔÁÎÏ×ÌÅÎÎÙÊ ÐÁËÅÔ <literal>gtkmumble-0.10_1</literal>, ÎÅ
+              ÓÍÏÇ ÂÙ ÏÐÏÚÎÁÔØ ÐÁËÅÔ <literal>gtkmumble-0.3</literal> ËÁË
               ÂÏÌÅÅ ÎÏ×ÙÊ, ÔÁË ËÁË <literal>3</literal> ÂÙÌÏ ÂÙ ÍÅÎØÛÅ, ÞÅÍ
               <literal>10</literal>.  ðÏÍÎÉÔÅ, ÞÔÏ × ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ ÜÔÏ
               ËÁÓÁÅÔÓÑ <makevar>PORTEPOCH</makevar>.</para>
@@ -999,10 +1034,10 @@
           <literal>${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}</literal>.
           äÏÂÅÊÔÅÓØ ÔÏÇÏ, ÞÔÏÂÙ ÜÔÏ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÌÏ ÎÁÛÉÍ <link
           linkend="porting-pkgname">ÒÅËÏÍÅÎÄÁÃÉÑÍ ÐÏ ÐÒÁ×ÉÌØÎÏÍÕ ×ÙÂÏÒÕ
-          ÎÁÚ×ÁÎÉÊ ÄÌÑ ÐÁËÁÄÖÅÊ</link>.  ÷ ÞÁÓÔÎÏÓÔÉ, × ÐÅÒÅÍÅÎÎÏÊ
+          ÎÁÚ×ÁÎÉÊ ÄÌÑ ÐÁËÅÔÏ×</link>.  ÷ ÞÁÓÔÎÏÓÔÉ, × ÐÅÒÅÍÅÎÎÏÊ
           <makevar>PORTVERSION</makevar> <emphasis>ÎÅ ÒÁÚÒÅÛÁÅÔÓÑ</emphasis>
           ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÄÅÆÉÓÁ (<literal>-</literal>).  ëÒÏÍÅ ÔÏÇÏ, ÅÓÌÉ ×
-          ÉÍÅÎÉ ÐÁËÁÄÖÁ ÐÒÉÓÕÔÓÔ×ÕÅÔ ÞÁÓÔØ <replaceable>language-</replaceable>
+          ÉÍÅÎÉ ÐÁËÅÔÁ ÐÒÉÓÕÔÓÔ×ÕÅÔ ÞÁÓÔØ <replaceable>language-</replaceable>
           ÉÌÉ <replaceable>-compiled.specifics</replaceable> (ÓÍÏÔÒÉÔÅ ÎÉÖÅ),
           ÔÏ ÉÓÐÏÌØÚÕÊÔÅ ÐÅÒÅÍÅÎÎÙÅ <makevar>PKGNAMEPREFIX</makevar> É
           <makevar>PKGNAMESUFFIX</makevar>, ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ.  îÅ ÄÅÌÁÊÔÅ ÉÈ
@@ -1010,18 +1045,18 @@
       </sect2>
 
       <sect2 id="porting-pkgname">
-        <title>óÏÇÌÁÛÅÎÉÑ ÐÏ ÉÍÅÎÏ×ÁÎÉÀ ÐÁËÁÄÖÅÊ</title>
+        <title>óÏÇÌÁÛÅÎÉÑ ÐÏ ÉÍÅÎÏ×ÁÎÉÀ ÐÁËÅÔÏ×</title>
 
         <para>äÁÌÅÅ ÏÐÉÓÁÎÙ ÎÅËÏÔÏÒÙÅ ÓÏÇÌÁÛÅÎÉÑ, ËÏÔÏÒÙÍ ×Ù ÄÏÌÖÎÙ ÓÌÅÄÏ×ÁÔØ
-          × ÉÍÅÎÏ×ÁÎÉÉ ×ÁÛÉÈ ÐÁËÁÄÖÅÊ.  ïÎÉ ÂÙÌÉ ÒÁÚÒÁÂÏÔÁÎÙ ÄÌÑ ÏÂÌÅÇÞÅÎÉÑ
-          ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ, ÔÁË ËÁË ÉÍÅÅÔÓÑ ÕÖÅ ÔÙÓÑÞÉ ÐÁËÁÄÖÅÊ, Á
+          × ÉÍÅÎÏ×ÁÎÉÉ ×ÁÛÉÈ ÐÁËÅÔÏ×.  ïÎÉ ÂÙÌÉ ÒÁÚÒÁÂÏÔÁÎÙ ÄÌÑ ÏÂÌÅÇÞÅÎÉÑ
+          ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ, ÔÁË ËÁË ÉÍÅÅÔÓÑ ÕÖÅ ÔÙÓÑÞÉ ÐÁËÅÔÏ×, Á
           ÐÏÌØÚÏ×ÁÔÅÌÉ ÏÔ×ÅÒÎÕÔÓÑ ÏÔ ÎÁÓ, ÅÓÌÉ ÓÐÉÓÏË ÎÅ ÐÏÎÒÁ×ÉÔÓÑ ÉÈ
           ×ÚÏÒÕ!</para>
 
-        <para>éÍÑ ÐÁËÁÄÖÁ ÄÏÌÖÎÏ ÉÍÅÔØ ×ÉÄ
+        <para>éÍÑ ÐÁËÅÔÁ ÄÏÌÖÎÏ ÉÍÅÔØ ×ÉÄ
           <filename><replaceable><optional>language<optional>_region</optional></optional>-name<optional><optional>-</optional>compiled.specifics</optional>-version.numbers</replaceable></filename>.</para>
 
-        <para>éÍÑ ÐÁËÁÄÖÁ ÏÐÒÅÄÅÌÑÅÔÓÑ ËÁË
+        <para>éÍÑ ÐÁËÅÔÁ ÏÐÒÅÄÅÌÑÅÔÓÑ ËÁË
           <literal>${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}</literal>.
           ÷Ù ÄÏÌÖÎÙ ÚÁÄÁ×ÁÔØ ÚÎÁÞÅÎÉÑ ÐÅÒÅÍÅÎÎÙÈ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÜÔÉÍ
           ÆÏÒÍÁÔÏÍ.</para>
@@ -1104,7 +1139,7 @@
 
         <para>÷ÏÔ ÎÅÓËÏÌØËÏ (ÒÅÁÌØÎÙÈ) ÐÒÉÍÅÒÏ× ÔÏÇÏ, ËÁË ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÍÑ ÉÚ
           ÏÒÉÇÉÎÁÌØÎÏÇÏ, ÐÒÉÄÕÍÁÎÎÏÇÏ Á×ÔÏÒÁÍÉ, Ë ÐÏÄÈÏÄÑÝÅÍÕ ÄÌÑ ÉÍÅÎÉ
-          ÐÁËÁÄÖÁ:</para>
+          ÐÁËÅÔÁ:</para>
 
         <informaltable frame="none">
           <tgroup cols="6">
@@ -1233,7 +1268,7 @@
         <entry>-letter</entry>
         <entry>1.13</entry>
 	<entry>òÁÚÍÅÒ ÂÕÍÁÇÉ ÚÁÄÁÅÔÓÑ ÓÔÁÔÉÞÅÓËÉ ×Ï ×ÒÅÍÑ ÐÏÓÔÒÏÅÎÉÑ
-	  ÐÁËÁÄÖÁ</entry>
+	  ÐÁËÅÔÁ</entry>
       </row>
 
       <row>
@@ -1242,7 +1277,7 @@
 	<entry>pkfonts</entry>
 	<entry>300</entry>
         <entry>1.0</entry>
-	<entry>ðÁËÁÄÖ ÄÌÑ ÛÒÉÆÔÏ× 300dpi</entry>
+	<entry>ÐÁËÅÔ ÄÌÑ ÛÒÉÆÔÏ× 300dpi</entry>
       </row>
     </tbody>
     </tgroup>
@@ -1264,13 +1299,13 @@
       <sect2>
         <title><makevar>CATEGORIES</makevar></title>
 
-        <para>÷ ÐÒÏÃÅÓÓÅ ÓÏÚÄÁÎÉÑ ÐÁËÁÄÖÁ ÏÎ ÐÏÍÅÝÁÅÔÓÑ × ËÁÔÁÌÏÇ
+        <para>÷ ÐÒÏÃÅÓÓÅ ÓÏÚÄÁÎÉÑ ÐÁËÅÔÁ ÏÎ ÐÏÍÅÝÁÅÔÓÑ × ËÁÔÁÌÏÇ
 	  <filename>/usr/ports/packages/All</filename>, Á × ÏÄÎÏÍ ÉÌÉ ÂÏÌÅÅ
 	  ÐÏÄËÁÔÁÌÏÇÏ× ÉÚ <filename>/usr/ports/packages</filename>
 	  ÓÏÚÄÁÀÔÓÑ ÎÁ ÎÅÇÏ ÓÓÙÌËÉ.  éÍÅÎÁ ÜÔÉÈ ÐÏÄËÁÔÁÌÏÇÏ× ÏÐÒÅÄÅÌÑÀÔÓÑ
 	  ÐÅÒÅÍÅÎÎÏÊ <makevar>CATEGORIES</makevar>.  ôÁËÁÑ ÓÈÅÍÁ ÎÕÖÎÁ ÄÌÑ
 	  ÏÂÌÅÇÞÅÎÉÑ ÖÉÚÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ, ËÏÇÄÁ ÏÎ ÓÔÁÌËÉ×ÁÅÔÓÑ Ó ÍÁÓÓÏÊ
-	  ÐÁËÁÄÖÅÊ ÎÁ FTP-ÓÅÒ×ÅÒÅ ÉÌÉ ËÏÍÐÁËÔ-ÄÉÓËÅ.  ðÏÖÁÌÕÊÓÔÁ, ÐÏÓÍÏÔÒÉÔÅ ÎÁ
+	  ÐÁËÅÔÏ× ÎÁ FTP-ÓÅÒ×ÅÒÅ ÉÌÉ ËÏÍÐÁËÔ-ÄÉÓËÅ.  ðÏÖÁÌÕÊÓÔÁ, ÐÏÓÍÏÔÒÉÔÅ ÎÁ
 	  ÓÐÉÓÏË ÓÕÝÅÓÔ×ÕÀÝÉÈ <link
 	  linkend="porting-categories">ËÁÔÅÇÏÒÉÊ</link> É ×ÙÂÅÒÉÔÅ ÔÅ ÉÚ ÎÉÈ,
 	  ËÏÔÏÒÙÅ ÂÏÌÅÅ ×ÓÅÇÏ ÐÏÄÈÏÄÑÔ Ë ×ÁÛÅÍÕ ÐÏÒÔÕ.</para>
@@ -3013,19 +3048,19 @@
 	url="../developers-handbook/policies.html#POLICIES-MAINTAINER">
         MAINTAINER × Makefiles</ulink>.</para>
 
-      <para>åÓÌÉ ÍÜÊÎÔÅÊÎÅÒ ÐÏÒÔÁ ÎÅ ÏÔ×ÅÔÉÌ ÎÁ ÚÁÐÒÏÓ ÐÏÌØÚÏ×ÁÔÅÌÑ ÏÂ
+      <para>åÓÌÉ ÍÅÊÎÔÅÊÎÅÒ ÐÏÒÔÁ ÎÅ ÏÔ×ÅÔÉÌ ÎÁ ÚÁÐÒÏÓ ÐÏÌØÚÏ×ÁÔÅÌÑ ÏÂ
         ÏÂÎÏ×ÌÅÎÉÉ × ÔÅÞÅÎÉÅ Ä×ÕÈ ÎÅÄÅÌØ (ÉÓËÌÀÞÁÑ ÂÏÌØÛÉÅ ÐÒÁÚÄÎÉËÉ),
-        ÔÏ ÜÔÏ ÍÏÖÎÏ ÓÞÉÔÁÔØ ÔÁÊÍ-ÁÕÔÏÍ ÏÔ ÍÜÊÎÔÅÊÎÅÒÁ, É ÏÂÎÏ×ÌÅÎÉÅ ÍÏÖÅÔ
-        ÂÙÔØ ×ÙÐÏÌÎÅÎÏ ÂÅÚ Ñ×ÎÏÇÏ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÏÔ ÍÜÊÎÔÅÊÎÅÒÁ.  åÓÌÉ
-        ÍÜÊÎÔÅÊÎÅÒ ÎÅ ÏÔ×ÅÞÁÅÔ × ÔÅÞÅÎÉÅ ÔÒ£È ÍÅÓÑÃÅ×, ÔÏ ÓÞÉÔÁÅÔÓÑ, ÞÔÏ
-        ÏÎ ÏÔÓÕÔÓÔ×ÕÅÔ, É ËÁË ÍÜÊÎÔÅÊÎÅÒ ÐÏÒÔÁ, Ï ËÏÔÏÒÏÍ ÉÄ£Ô ÒÅÞØ, ÍÏÖÅÔ
+        ÔÏ ÜÔÏ ÍÏÖÎÏ ÓÞÉÔÁÔØ ÔÁÊÍ-ÁÕÔÏÍ ÏÔ ÍÅÊÎÔÅÊÎÅÒÁ, É ÏÂÎÏ×ÌÅÎÉÅ ÍÏÖÅÔ
+        ÂÙÔØ ×ÙÐÏÌÎÅÎÏ ÂÅÚ Ñ×ÎÏÇÏ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÏÔ ÍÅÊÎÔÅÊÎÅÒÁ.  åÓÌÉ
+        ÍÅÊÎÔÅÊÎÅÒ ÎÅ ÏÔ×ÅÞÁÅÔ × ÔÅÞÅÎÉÅ ÔÒ£È ÍÅÓÑÃÅ×, ÔÏ ÓÞÉÔÁÅÔÓÑ, ÞÔÏ
+        ÏÎ ÏÔÓÕÔÓÔ×ÕÅÔ, É ËÁË ÍÅÊÎÔÅÊÎÅÒ ÐÏÒÔÁ, Ï ËÏÔÏÒÏÍ ÉÄ£Ô ÒÅÞØ, ÍÏÖÅÔ
         ÂÙÔØ ÚÁÍÅΣÎ.  éÓËÌÀÞÅÎÉÑÍÉ ÉÚ ÜÔÏÇÏ ÐÒÁ×ÉÌÁ Ñ×ÌÑÅÔÓÑ ×Ó£, ÞÔÏ
         ÓÏÐÒÏ×ÏÖÄÁÅÔ &a.portmgr; ÉÌÉ &a.security-officer;.  úÁÐÒÅÝÅÎÏ ÄÅÌÁÔØ
         ÌÀÂÙÅ ÎÅÓÁÎËÃÉÏÎÉÒÏ×ÁÎÎÙÅ ÉÚÍÅÎÅÎÉÑ × ÐÏÒÔÁÈ, ËÏÔÏÒÙÅ ×ÅÄÕÔ ÜÔÉ
         ÇÒÕÐÐÙ.</para>
 
       <para>úÁ &a.portmgr; ÏÓÔÁ×ÌÑÅÔÓÑ ÐÒÁ×Ï ÓÎÑÔØ ÉÌÉ ÎÁÚÎÁÞÉÔØ ËÏÇÏ-ÌÉÂÏ
-        ÍÜÊÎÔÅÊÎÅÒÏÍ, ÐÏ ÌÀÂÏÊ ÐÒÉÞÉÎÅ, Á ÚÁ the &a.security-officer;
+        ÍÅÊÎÔÅÊÎÅÒÏÍ, ÐÏ ÌÀÂÏÊ ÐÒÉÞÉÎÅ, Á ÚÁ the &a.security-officer;
         ÏÓÔÁ×ÌÑÅÔÓÑ ÐÒÁ×Ï ÌÉÛÁÔØ ÉÌÉ ÎÁÚÎÁÞÁÔØ ÐÒÁ×Á ÎÁ ÓÏÐÒÏ×ÏÖÄÅÎÉÅ ÐÏÒÔÁ
         ÐÏ ÓÏÏÂÒÁÖÅÎÉÑÍ ÉÎÆÏÒÍÁÃÉÏÎÎÏÊ ÂÅÚÏÐÁÓÎÏÓÔÉ.</para>
     </sect1>
@@ -3034,7 +3069,7 @@
       <title><makevar>COMMENT</makevar></title>
 
       <para>üÔÏ ÏÄÎÏÓÔÒÏÞÎÏÅ ÏÐÉÓÁÎÉÅ ÐÏÒÔÁ.  <emphasis>ðÏÖÁÌÕÊÓÔÁ</emphasis>,
-        ÎÅ ×ËÌÀÞÁÊÔÅ ÓÀÄÁ ÎÁÚ×ÁÎÉÅ ÐÁËÁÄÖÁ (ÉÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ
+        ÎÅ ×ËÌÀÞÁÊÔÅ ÓÀÄÁ ÎÁÚ×ÁÎÉÅ ÐÁËÅÔÁ (ÉÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ
         ÏÂÅÓÐÅÞÅÎÉÑ).  ëÏÍÍÅÎÔÁÒÉÊ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù É ÎÅ
         ÚÁËÁÎÞÉ×ÁÔØÓÑ ÔÏÞËÏÊ.  ÷ÏÔ ÐÒÉÍÅÒ:</para>
 
@@ -3086,7 +3121,7 @@
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ Ä×ÁÖÄÙ, ÏÄÉÎ ÒÁÚ ×ÎÕÔÒÉ ÃÅÌÉ
 	  <maketarget>extract</maketarget>, Á ÚÁÔÅÍ ÉÚ ÃÅÌÉ
 	  <maketarget>install</maketarget>.  ëÒÏÍÅ ÔÏÇÏ, ÉÍÑ ÚÁ×ÉÓÉÍÏÓÔÉ
-	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÁÄÖ, ÔÁË ÞÔÏ &man.pkg.add.1; ÂÕÄÅÔ
+	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ &man.pkg.add.1; ÂÕÄÅÔ
 	  Á×ÔÏÍÁÔÉÞÅÓËÉ ÅÇÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ ÅÇÏ ÎÅÔ ÎÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ
 	  ÓÉÓÔÅÍÅ.</para>
       </sect2>
@@ -3133,7 +3168,7 @@
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ ×ÎÕÔÒÉ ÃÅÌÉ
 	  <maketarget>install</maketarget>. ëÒÏÍÅ ÔÏÇÏ, ÉÍÑ ÚÁ×ÉÓÉÍÏÓÔÉ
-	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÁÄÖ, ÔÁË ÞÔÏ ÐÒÏÇÒÁÍÍÁ &man.pkg.add.1;
+	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ ÐÒÏÇÒÁÍÍÁ &man.pkg.add.1;
 	  ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÅÇÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ ÏÎ ÎÅ ÂÕÄÅÔ ÎÁÊÄÅÎ
 	  × ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÉÓÔÅÍÅ.  þÁÓÔØ
 	  <replaceable>target</replaceable> ÍÏÖÅÔ ÂÙÔØ ÏÐÕÝÅÎÁ, ÅÓÌÉ ÏÎÁ
@@ -3421,7 +3456,7 @@
 	  ÄÒÕÇÏÊ ÓÐÏÓÏ ÐÏÌÕÞÉÔØ ÔÒÅÂÕÅÍÙÊ ÒÅÚÕÌØÔÁÔ.  üÔÏ ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë
 	  ÔÏÍÕ, ÞÔÏ ËÁËÏÊ-ÔÏ ÄÒÕÇÏÊ ÐÏÒÔ ×ÓÅÇÄÁ ÂÕÄÅÔ ÓÔÒÏÉÔØÓÑ (É ÐÏ
 	  ÕÍÏÌÞÁÎÉÀ ÕÓÔÁÎÁ×ÌÉ×ÁÔØÓÑ). É ÔÁËÁÑ ÚÁ×ÉÓÉÍÏÓÔØ ÏÔÒÁÚÉÔÓÑ É ÎÁ
-	  ÐÁËÁÄÖÅ.  åÓÌÉ ÜÔÏ ÉÍÅÎÎÏ ÔÏ, ÞÔÏ ×ÁÍ ÎÕÖÎÏ, ÔÏ ×ÁÍ, ÎÁ×ÅÒÎÏÅ,
+	  ÐÁËÅÔÅ.  åÓÌÉ ÜÔÏ ÉÍÅÎÎÏ ÔÏ, ÞÔÏ ×ÁÍ ÎÕÖÎÏ, ÔÏ ×ÁÍ, ÎÁ×ÅÒÎÏÅ,
           ÓÌÅÄÕÅÔ ÏÐÉÓÙ×ÁÔØ ÜÔÏ ÞÅÒÅÚ <literal>BUILD_DEPENDS</literal> É
 	  <literal>RUN_DEPENDS</literal>&mdash;ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÓÍÙÓÌ
 	  ÂÕÄÅÔ ÂÏÌÅÅ ÐÏÎÑÔÅÎ.</para>
@@ -3531,14 +3566,14 @@
     <sect1 id="conflicts">
       <title><makevar>CONFLICTS</makevar></title>
 
-      <para>åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÎÅ ÍÏÖÅÔ ÓÕÝÅÓÔ×Ï×ÁÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ Ó ÄÒÕÇÉÍÉ
+      <para>åÓÌÉ ×ÁÛ ÐÁËÅÔ ÎÅ ÍÏÖÅÔ ÓÕÝÅÓÔ×Ï×ÁÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ Ó ÄÒÕÇÉÍÉ
         (ÉÚ-ÚÁ ËÏÎÆÌÉËÔÏ× ÆÁÊÌÏ×, ÎÅÓÏ×ÍÅÓÔÉÍÏÓÔÉ ×Ï ×ÒÅÍÑ ×ÙÐÏÌÎÅÎÉÑ É ÔÁË
-        ÄÁÌÅÅ), ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÁËÁÄÖÅÊ × ÐÅÒÅÍÅÎÎÏÊ
+        ÄÁÌÅÅ), ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÁËÅÔÏ× × ÐÅÒÅÍÅÎÎÏÊ
         <makevar>CONFLICTS</makevar>.  úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÛÁÂÌÏÎÙ
         ËÏÍÁÎÄÎÏÇÏ ÐÒÏÃÅÓÓÏÒÁ ÔÉÐÁ <literal>*</literal> É
-        <literal>?</literal>.  éÍÅÎÁ ÐÁËÁÄÖÅÊ ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ, ËÁË
+        <literal>?</literal>.  éÍÅÎÁ ÐÁËÅÔÏ× ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ, ËÁË
         × <filename>/var/db/pkg</filename>.  ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ, ÞÔÏ
-	<makevar>CONFLICTS</makevar> ÎÅ ÓÏÄÅÒÖÉÔ ÐÁËÁÄÖ ÓÁÍÏÇÏ ÜÔÏÇÏ ÐÏÒÔÁ
+	<makevar>CONFLICTS</makevar> ÎÅ ÓÏÄÅÒÖÉÔ ÐÁËÅÔ ÓÁÍÏÇÏ ÜÔÏÇÏ ÐÏÒÔÁ
 	ÉÌÉ ÅÝÅ, ÞÔÏ ÕÓÔÁÎÏ×ËÁ Ó ÐÏÍÏÝØÀ ÐÅÒÅÍÅÎÎÏÊ <makevar>FORCE_PKG_REGISTER</makevar>
 	ÂÏÌØÛÅ ÎÅ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ.</para>
     </sect1>
@@ -3546,10 +3581,10 @@
     <sect1 id="makefile-build">
       <title>íÅÈÁÎÉÚÍÙ ÐÏÓÔÒÏÅÎÉÑ</title>
 
-      <para>åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÉÓÐÏÌØÚÕÅÔ GNU-×ÅÒÓÉÀ ÕÔÉÌÉÔÙ
+      <para>åÓÌÉ ×ÁÛ ÐÁËÅÔ ÉÓÐÏÌØÚÕÅÔ GNU-×ÅÒÓÉÀ ÕÔÉÌÉÔÙ
 	<command>make</command>, ÚÁÄÁÊÔÅ <literal>USE_GMAKE=yes</literal>.
-	åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÉÓÐÏÌØÚÕÅÔ <command>configure</command>, ÚÁÄÁÊÔÅ
-	<literal>HAS_CONFIGURE=yes</literal>.  åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÉÓÐÏÌØÚÕÅÔ
+	åÓÌÉ ×ÁÛ ÐÁËÅÔ ÉÓÐÏÌØÚÕÅÔ <command>configure</command>, ÚÁÄÁÊÔÅ
+	<literal>HAS_CONFIGURE=yes</literal>.  åÓÌÉ ×ÁÛ ÐÁËÅÔ ÉÓÐÏÌØÚÕÅÔ
 	GNU-×ÅÒÓÉÀ <command>configure</command>, ÚÁÄÁÊÔÅ
 	<literal>GNU_CONFIGURE=yes</literal> (ÜÔÏ ÔÁËÖÅ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ
 	<literal>HAS_CONFIGURE</literal>).  åÓÌÉ ×Ù ÈÏÔÉÔÅ ÐÅÒÅÄÁÔØ
@@ -3558,7 +3593,7 @@
 	<literal>--prefix=&dollar;{PREFIX}</literal> ÄÌÑ GNU
 	<command>configure</command> É ÐÕÓÔÕÀ ÓÔÒÏËÕ ÄÌÑ ÎÅ-GNU
 	<command>configure</command>), ÕËÁÖÉÔÅ ÜÔÉ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁÒÁÍÅÔÒÙ ×
-	<makevar>CONFIGURE_ARGS</makevar>.  åÓÌÉ ×ÁÛ ÐÁËÁÄÖ ÉÓÐÏÌØÚÕÅÔ
+	<makevar>CONFIGURE_ARGS</makevar>.  åÓÌÉ ×ÁÛ ÐÁËÅÔ ÉÓÐÏÌØÚÕÅÔ
 	GNU-×ÅÒÓÉÀ <command>autoconf</command>, ÚÁÄÁÊÔÅ
 	<literal>USE_AUTOCONF_VER=213</literal>.  üÔÏ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ
 	<makevar>GNU_CONFIGURE</makevar>, É ÐÒÉ×ÅÄÅÔ Ë ×ÙÚÏ×Õ
@@ -3580,7 +3615,7 @@
         <para><literal>CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}</literal></para>
       </note>
 
-      <para>åÓÌÉ ×ÁÛ ÐÁËÁÄÖ Ñ×ÌÑÅÔÓÑ ÐÒÉÌÏÖÅÎÉÅÍ ÄÌÑ X, ËÏÔÏÒÏÅ ÓÏÚÄÁÅÔ
+      <para>åÓÌÉ ×ÁÛ ÐÁËÅÔ Ñ×ÌÑÅÔÓÑ ÐÒÉÌÏÖÅÎÉÅÍ ÄÌÑ X, ËÏÔÏÒÏÅ ÓÏÚÄÁÅÔ
 	ÆÁÊÌÙ <filename>Makefile</filename> ÉÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ ÆÁÊÌÏ×
 	<filename>Imakefile</filename> ÐÒÉ ÐÏÍÏÝÉ ÕÔÉÌÉÔÙ
 	<command>imake</command>, ÔÏ ÚÁÄÁÊÔÅ <literal>USE_IMAKE=yes</literal>.
@@ -3625,8 +3660,8 @@
         <literal>@exec /sbin/ldconfig -m</literal> É
         <literal>@unexec /sbin/ldconfig -R</literal> × ×ÁÛ ÆÁÊÌ
         <filename>pkg-plist</filename>, ÔÁË ÞÔÏ ÐÏÌØÚÏ×ÁÔÅÌØ, ÕÓÔÁÎÁ×ÌÉ×ÁÀÝÉÊ
-        ÐÁËÁÄÖ, ÓÍÏÖÅÔ ÓÒÁÚÕ ÖÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÉÎÁÍÉÞÅÓËÕÀ ÂÉÂÌÉÏÔÅËÕ, Á
-        ÕÄÁÌÅÎÉÅ ÐÁËÁÄÖÁ ÎÅ ÐÒÉ×ÅÄ£Ô Ë ÔÏÍÕ, ÞÔÏ ÓÉÓÔÅÍÁ ÂÕÄÅÔ ÐÒÅÄÐÏÌÁÇÁÔØ,
+        ÐÁËÅÔ, ÓÍÏÖÅÔ ÓÒÁÚÕ ÖÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÉÎÁÍÉÞÅÓËÕÀ ÂÉÂÌÉÏÔÅËÕ, Á
+        ÕÄÁÌÅÎÉÅ ÐÁËÅÔÁ ÎÅ ÐÒÉ×ÅÄ£Ô Ë ÔÏÍÕ, ÞÔÏ ÓÉÓÔÅÍÁ ÂÕÄÅÔ ÐÒÅÄÐÏÌÁÇÁÔØ,
         ÞÔÏ ÂÉÂÌÉÏÔÅËÁ ×Ó£ ÅÝ£ ÉÍÅÅÔÓÑ × ÎÁÌÉÞÉÉ.</para>
 
       <para>åÓÌÉ ÎÕÖÎÏ, ×Ù ÍÏÖÅÔÅ ÐÅÒÅÏÐÒÅÄÅÌÉÔØ ËÁÔÁÌÏÇ, × ËÏÔÏÒÙÊ ÐÏ
@@ -3675,7 +3710,7 @@
         <title><makevar>NO_PACKAGE</makevar></title>
 
         <para>üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÕËÁÚÙ×ÁÅÔ, ÞÔÏ ÍÙ ÎÅ ÍÏÖÅÍ ÓÏÚÄÁ×ÁÔØ ÄÌÑ
-          ÐÒÉÌÏÖÅÎÉÑ Ä×ÏÉÞÎÙÊ ÐÁËÁÄÖ.  ë ÐÒÉÍÅÒÕ, ÌÉÃÅÎÚÉÑ ÎÅ ÐÏÚ×ÏÌÑÅÔ
+          ÐÒÉÌÏÖÅÎÉÑ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ.  ë ÐÒÉÍÅÒÕ, ÌÉÃÅÎÚÉÑ ÎÅ ÐÏÚ×ÏÌÑÅÔ
 	  ÂÉÎÁÒÎÏÅ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÅ ÉÌÉ ÏÎÁ ÍÏÖÅÔ ÚÁÐÒÅÝÁÔØ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÅ
 	  ÐÁËÅÔÏ×, ÓÏÚÄÁÎÎÙÈ ÉÚ ÉÚÍÅΣÎÎÙÈ ÉÓÈÏÄÎÉËÏ×.</para>
 
@@ -3685,14 +3720,14 @@
 	  ÐÅÒÅÍÅÎÎÁÑ <makevar>NO_CDROM</makevar>.</para>
 
         <para><makevar>NO_PACKAGE</makevar> ÄÏÌÖÎÁ ÔÁËÖÅ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ, ÅÓÌÉ
-          Ä×ÏÉÞÎÙÊ ÐÁËÁÄÖ, ËÁË ÐÒÁ×ÉÌÏ, ÂÅÓÐÏÌÅÚÅÎ, Á ÐÒÉÌÏÖÅÎÉÅ ÄÏÌÖÎÏ ×ÓÅÇÄÁ
+          Ä×ÏÉÞÎÙÊ ÐÁËÅÔ, ËÁË ÐÒÁ×ÉÌÏ, ÂÅÓÐÏÌÅÚÅÎ, Á ÐÒÉÌÏÖÅÎÉÅ ÄÏÌÖÎÏ ×ÓÅÇÄÁ
           ËÏÍÐÉÌÉÒÏ×ÁÔØÓÑ ÉÚ ÉÓÈÏÄÎÏÇÏ ËÏÄÁ.  ë ÐÒÉÍÅÒÕ, ÅÓÌÉ × ÐÒÉÌÏÖÅÎÉÅ
           ×Ï ×ÒÅÍÑ ËÏÍÐÉÌÑÃÉÉ Ö£ÓÔËÏ ×ËÌÀÞÁÅÔÓÑ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÁÑ ÉÎÆÏÒÍÁÃÉÑ,
           ÐÒÉ×ÑÚÁÎÎÁÑ Ë ËÏÎËÒÅÔÎÏÊ ÓÉÓÔÅÍÅ, ÔÏ ÚÁÄÁÊÔÅ ÐÅÒÅÍÅÎÎÕÀ
           <makevar>NO_PACKAGE</makevar>.</para>
 
         <para>úÎÁÞÅÎÉÅÍ ÐÅÒÅÍÅÎÎÏÊ <makevar>NO_PACKAGE</makevar> ÄÏÌÖÎÁ ÂÙÔØ
-          ÓÔÒÏËÁ, ÏÐÉÓÙ×ÁÀÝÁÑ ÐÒÉÞÉÎÕ, ÐÏ ËÏÔÏÒÏÊ ÐÁËÁÄÖ ÎÅ ÄÏÌÖÅÎ
+          ÓÔÒÏËÁ, ÏÐÉÓÙ×ÁÀÝÁÑ ÐÒÉÞÉÎÕ, ÐÏ ËÏÔÏÒÏÊ ÐÁËÅÔ ÎÅ ÄÏÌÖÅÎ
           ÓÏÚÄÁ×ÁÔØÓÑ.</para>
       </sect2>
 
@@ -3702,7 +3737,7 @@
         <para>üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÕËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ, ÈÏÔÑ ÍÙ ÉÍÅÅÍ ÐÒÁ×Ï
           ÓÏÚÄÁ×ÁÔØ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ, ÍÙ ÎÅ ÍÏÖÅÍ ÐÏÍÅÝÁÔØ ÜÔÉ ÐÁËÅÔÙ ÉÌÉ
           ÆÁÊÌÙ <makevar>DISTFILES</makevar> ÐÏÒÔÁ ÎÁ CD-ROM (ÉÌÉ ÎÁ ÐÏÈÏÖÉÅ ÎÏÓÉÔÅÌÉ) ÄÌÑ
-          ÐÅÒÅÐÒÏÄÁÖÉ.  ïÄÎÁËÏ ÂÉÎÁÒÎÙÅ ÐÁËÁÄÖÉ É ÆÁÊÌÙ
+          ÐÅÒÅÐÒÏÄÁÖÉ.  ïÄÎÁËÏ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ É ÆÁÊÌÙ
           <makevar>DISTFILES</makevar> ÐÏÒÔÁ ÂÕÄÕÔ ÏÓÔÁ×ÁÔØÓÑ
           ÄÏÓÔÕÐÎÙÍÉ ÐÏÓÒÅÄÓÔ×ÏÍ FTP/HTTP.</para>
 
@@ -3723,7 +3758,7 @@
 
         <para>úÁÄÁÊÔÅ ÜÔÕ ÐÅÒÅÍÅÎÎÕÀ, ÅÓÌÉ ÌÉÃÅÎÚÉÑ ÎÁ ÐÒÉÌÏÖÅÎÉÅ ÎÅ ÐÏÚ×ÏÌÑÅÔ
           ÎÉ ÚÅÒËÁÌÉÒÏ×ÁÔØ ÆÁÊÌÙ <makevar>DISTFILES</makevar>, ÎÉ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ
-          ÂÉÎÁÒÎÙÊ ÐÁËÁÄÖ ÞÅÒÅÚ FTP/HTTP ÉÌÉ ÎÁ CD-ROM.</para>
+          ÂÉÎÁÒÎÙÊ ÐÁËÅÔ ÞÅÒÅÚ FTP/HTTP ÉÌÉ ÎÁ CD-ROM.</para>
 
 	<para>îÉ <makevar>NO_CDROM</makevar>, ÎÉ <makevar>NO_PACKAGE</makevar>
 	  ÎÅ ÓÔÏÉÔ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ×ÍÅÓÔÅ Ó <makevar>RESTRICTED</makevar>, ÔÁË
@@ -3861,7 +3896,7 @@
               <entry><makevar>SITE_PERL</makevar></entry>
 
               <entry>éÍÑ ËÁÔÁÌÏÇÁ, ËÕÄÁ ÐÏÍÅÝÁÀÔÓÑ ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ ÓÁÊÔÁ
-                ÐÁËÁÄÖÉ <literal>perl</literal>.  üÔÏ ÚÎÁÞÅÎÉÅ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
+                ÐÁËÅÔÙ <literal>perl</literal>.  üÔÏ ÚÎÁÞÅÎÉÅ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
                 PLIST_SUB.</entry>
             </row>
 	  </tbody>
@@ -4551,13 +4586,11 @@
           JDK, ÔÁËÉÍ ÏÂÒÁÚÏÍ ÓÔÁÎÏ×ÉÔÓÑ ÐÒÏÂÌÅÍÁÔÉÞÎÙÍ ÏÐÒÅÄÅÌÉÔØ ÓÐÉÓÏË ÆÁÊÌÏ×
           ÄÌÑ ÕÐÁËÏ×ËÉ (<filename>pkg-plist</filename>).  üÔÏ ÏÄÎÁ ÉÚ ÐÒÉÞÉÎ,
           ÐÏ ËÏÔÏÒÏÊ ÓÏÚÄÁÔÅÌÑÍ ÐÏÒÔÏ× ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ
-          ÍÁËÒÏÓ <makevar>PORTDOCS</makevar>.  üÔÁ ÆÕÎËÃÉÀ ÅÝ£ ÐÒÅÄÓÔÏÉÔ ÈÏÒÏÛÏ
-          ÄÏËÕÍÅÎÔÉÒÏ×ÁÔØ, ÐÏÜÔÏÍÕ ×Ù ÄÏÌÖÎÙ ÏÂÒÁÔÉÔØÓÑ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ Ë ÆÁÊÌÕ
-          <filename>bsd.port.mk</filename> ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÌÎÏÊ
-          ÉÎÆÏÒÍÁÃÉÉ.  âÏÌÅÅ ÔÏÇÏ, ÄÁÖÅ ÅÓÌÉ ×Ù ÓÍÏÖÅÔÅ ÕÇÁÄÁÔØ ÎÁÂÏÒ ÆÁÊÌÏ×,
-          ËÏÔÏÒÙÊ ÂÕÄÅÔ ÓÇÅÎÅÒÉÒÏ×ÁÎ ÕÔÉÌÉÔÏÊ <command>javadoc</command>,
-          ÒÁÚÍÅÒ ÐÏÌÕÞÁÀÝÅÇÏÓÑ ÆÁÊÌÁ <filename>pkg-plist</filename> ÇÏÌÏÓÕÅÔ ÚÁ
-          ÉÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>PORTDOCS</makevar>.</para>
+          ÍÁËÒÏÓ <makevar>PORTDOCS</makevar>.  âÏÌÅÅ ÔÏÇÏ, ÄÁÖÅ ÅÓÌÉ ×Ù ÓÍÏÖÅÔÅ
+          ÕÇÁÄÁÔØ ÎÁÂÏÒ ÆÁÊÌÏ×, ËÏÔÏÒÙÊ ÂÕÄÅÔ ÓÇÅÎÅÒÉÒÏ×ÁÎ ÕÔÉÌÉÔÏÊ
+          <command>javadoc</command>, ÒÁÚÍÅÒ ÐÏÌÕÞÁÀÝÅÇÏÓÑ ÆÁÊÌÁ
+          <filename>pkg-plist</filename> ÇÏÌÏÓÕÅÔ ÚÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
+          <makevar>PORTDOCS</makevar>.</para>
 
         <para>úÎÁÞÅÎÉÅÍ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÐÅÒÅÍÅÎÎÏÊ <makevar>DATADIR</makevar>
           Ñ×ÌÑÅÔÓÑ <filename>${PREFIX}/share/${PORTNAME}</filename>.  èÏÒÏÛÅÊ
@@ -4761,7 +4794,7 @@
     <sect1>
       <title>æÏÒÍÁÔ</title>
 
-      <para>ðÁËÁÄÖÉ × ÄÅÒÅ×Å ÐÏÒÔÏ× ÂÕÄÕÔ ÓÔÒÏÉÔØÓÑ × ÔÏÍ ÆÏÒÍÁÔÅ, × ËÏÔÏÒÏÍ
+      <para>ÐÁËÅÔÙ × ÄÅÒÅ×Å ÐÏÒÔÏ× ÂÕÄÕÔ ÓÔÒÏÉÔØÓÑ × ÔÏÍ ÆÏÒÍÁÔÅ, × ËÏÔÏÒÏÍ
 	ÒÁÂÏÔÁÅÔ ÍÁÛÉÎÁ.  üÔÏ ÏÚÎÁÞÁÅÔ ÆÏÒÍÁÔ a.out ÄÌÑ 2.2 É a.out ÉÌÉ ELF
 	ÄÌÑ 3.0 × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÒÅÚÕÌØÔÁÔÁ ÒÁÂÏÔÙ ËÏÍÁÎÄÙ
 	<command>`objformat`</command>.  ëÒÏÍÅ ÔÏÇÏ, ËÁË ÔÏÌØËÏ ÐÏÌØÚÏ×ÁÔÅÌØ
@@ -4902,7 +4935,7 @@
       </programlisting>
 
       <para>üÔÏ ÎÕÖÎÏ ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ ÕÔÉÌÉÔÁ <command>ldconfig</command>
-	ÂÙÌÁ ×ÙÚ×ÁÎÁ ÐÒÁ×ÉÌØÎÏ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÆÏÒÍÁÔÁ ÐÁËÁÄÖÁ, Á ÎÅ
+	ÂÙÌÁ ×ÙÚ×ÁÎÁ ÐÒÁ×ÉÌØÎÏ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÆÏÒÍÁÔÁ ÐÁËÅÔÁ, Á ÎÅ
 	ÆÏÒÍÁÔÁ, ÉÓÐÏÌØÚÕÅÍÏÇÏ × ÓÉÓÔÅÍÅ ÐÏ ÕÍÏÌÞÁÎÉÀ.</para>
     </sect1>
   </chapter>
@@ -4913,10 +4946,10 @@
     <title><makevar>MASTERDIR</makevar></title>
 
     <para>åÓÌÉ ×ÁÛÅÍÕ ÐÏÒÔÕ ÔÒÅÂÕÅÔÓÑ ÐÏÓÔÒÏÅÎÉÅ ÄÏ×ÏÌØÎÏ ÒÁÚÌÉÞÁÀÝÉÈÓÑ
-      ×ÅÒÓÉÊ ÐÁËÁÄÖÅÊ ÞÅÒÅÚ ÐÅÒÅÍÅÎÎÕÀ (ÚÁÄÁÀÝÕÀ, ÎÁÐÒÉÍÅÒ, ÒÁÚÒÅÛÅÎÉÅ,
+      ×ÅÒÓÉÊ ÐÁËÅÔÏ× ÞÅÒÅÚ ÐÅÒÅÍÅÎÎÕÀ (ÚÁÄÁÀÝÕÀ, ÎÁÐÒÉÍÅÒ, ÒÁÚÒÅÛÅÎÉÅ,
       ÉÌÉ ÒÁÚÍÅÒ ÂÕÍÁÇÉ), ËÏÔÏÒÁÑ ÐÒÉÎÉÍÁÅÔ ÒÁÚÌÉÞÎÙÅ ÚÎÁÞÅÎÉÑ, ÓÏÚÄÁÊÔÅ ÄÌÑ
-      ËÁÖÄÏÇÏ ÐÁËÁÄÖÁ ÏÔÄÅÌØÎÙÊ ÐÏÄËÁÔÁÌÏÇ, ÞÔÏÂÙ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÂÙÌÏ ÌÅÇÞÅ
-      ÏÐÒÅÄÅÌÉÔØ, ËÁËÉÍ ÐÁËÁÄÖÅÍ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ, ÎÏ ÐÏÐÒÏÂÕÊÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
+      ËÁÖÄÏÇÏ ÐÁËÅÔÁ ÏÔÄÅÌØÎÙÊ ÐÏÄËÁÔÁÌÏÇ, ÞÔÏÂÙ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÂÙÌÏ ÌÅÇÞÅ
+      ÏÐÒÅÄÅÌÉÔØ, ËÁËÉÍ ÐÁËÅÔÏÍ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ, ÎÏ ÐÏÐÒÏÂÕÊÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
       ÓÏ×ÍÅÓÔÎÏ ÍÅÖÄÕ ÐÏÒÔÁÍÉ ËÁË ÍÏÖÎÏ ÂÏÌØÛÅ ÆÁÊÌÏ×.	÷ ÔÉÐÉÞÎÏÍ ÓÌÕÞÁÅ ×ÁÍ
       ÐÏÔÒÅÂÕÀÔÓÑ ÔÏÌØËÏ ÏÞÅÎØ ËÏÒÏÔËÉÅ ÆÁÊÌÙ <filename>Makefile</filename>
       ×Ï ×ÓÅÈ ËÁÔÁÌÏÇÁÈ, ËÒÏÍÅ ÏÄÎÏÇÏ, ÅÓÌÉ ×Ù ÂÕÄÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÅÒÅÍÅÎÎÙÅ
@@ -4925,7 +4958,7 @@
       ËÁÔÁÌÏÇÁ, × ËÏÔÏÒÏÍ ÎÁÈÏÄÑÔÓÑ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÆÁÊÌÙ.  ôÁËÖÅ ÉÓÐÏÌØÚÕÊÔÅ
       ÐÅÒÅÍÅÎÎÕÀ ËÁË ÞÁÓÔØ <link
       linkend="porting-pkgname"><makevar>PKGNAMESUFFIX</makevar></link>, ÞÔÏÂÙ
-      ÐÁËÁÄÖÉ ÉÍÅÌÉ ÒÁÚÎÙÅ ÉÍÅÎÁ.</para>
+      ÐÁËÅÔÙ ÉÍÅÌÉ ÒÁÚÎÙÅ ÉÍÅÎÁ.</para>
 
     <para>ðÒÏÄÅÍÏÎÓÔÒÉÒÕÅÍ ÜÔÏ ÎÁ ÐÒÉÍÅÒÅ.  ÷ÏÔ ÞÁÓÔØ ÆÁÊÌÁ
       <filename>japanese/xdvi300/Makefile</filename>:</para>
@@ -4947,7 +4980,7 @@
     </programlisting>
 
     <para>ðÏÒÔ <filename role="package">japanese/xdvi300</filename> ÓÏÄÅÒÖÉÔ
-      ÔÁËÖÅ ×ÓÅ ÏÂÙÞÎÙÅ ÐÁÔÞÉ, ÆÁÊÌÙ ÄÌÑ ÐÁËÁÄÖÁ É ÔÁË ÄÁÌÅÅ.  åÓÌÉ ×Ù ××ÅÄÅÔÅ
+      ÔÁËÖÅ ×ÓÅ ÏÂÙÞÎÙÅ ÐÁÔÞÉ, ÆÁÊÌÙ ÄÌÑ ÐÁËÅÔÁ É ÔÁË ÄÁÌÅÅ.  åÓÌÉ ×Ù ××ÅÄÅÔÅ
       ÚÄÅÓØ ËÏÍÁÎÄÕ <command>make</command>, ÏÎÁ ×ÏÚØÍÅÔ × ËÁÞÅÓÔ×Å ÒÁÚÒÅÛÅÎÉÑ
       ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ (300) É ÐÏÓÔÒÏÉÔ ÐÏÒÔ ÏÂÙÞÎÙÍ ÏÂÒÁÚÏÍ.</para>
 
@@ -5113,7 +5146,7 @@
       ÎÁ ÒÁÂÏÔÕ Ó ÐÏÒÔÁÍÉ, ËÏÔÏÒÙÍ ÔÒÅÂÕÅÔÓÑ Motif, ÔÁË ÞÔÏÂÙ ÍÙ ÍÏÇÌÉ
       ÌÅÇËÏ ÓÏÚÄÁ×ÁÔØ ÂÉÎÁÒÎÙÅ ÆÁÊÌÙ, ÓËÏÍÐÏÎÏ×ÁÎÎÙÅ ËÁË ÄÉÎÁÍÉÞÅÓËÉ (ÄÌÑ
       ÔÅÈ, ËÔÏ ÓÔÒÏÉÔ ÐÒÉÌÏÖÅÎÉÅ ÉÚ ÐÏÒÔÁ), ÔÁË É ÓÔÁÔÉÞÅÓËÉ (ÄÌÑ ÔÅÈ, ËÔÏ
-      ÂÕÄÅÔ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÐÒÉÌÏÖÅÎÉÑ × ×ÉÄÅ ÐÁËÁÄÖÅÊ).</para>
+      ÂÕÄÅÔ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÐÒÉÌÏÖÅÎÉÑ × ×ÉÄÅ ÐÁËÅÔÏ×).</para>
 
     <sect1 id="motif-use">
       <title><makevar>USE_MOTIF</makevar></title>
@@ -5176,9 +5209,9 @@
   <chapter id="porting-info">
     <title>æÁÊÌÙ × ÆÏÒÍÁÔÅ info</title>
 
-    <para>åÓÌÉ × ×ÁÛÅÍ ÐÁËÁÄÖÅ ÎÕÖÎÁ ÕÓÔÁÎÏ×ËÁ ÆÁÊÌÏ× GNU info, ÏÎÉ ÄÏÌÖÎÙ
+    <para>åÓÌÉ × ×ÁÛÅÍ ÐÁËÅÔÅ ÎÕÖÎÁ ÕÓÔÁÎÏ×ËÁ ÆÁÊÌÏ× GNU info, ÏÎÉ ÄÏÌÖÎÙ
       ÂÙÔØ ÐÅÒÅÞÉÓÌÅÎÙ × ÐÅÒÅÍÅÎÎÏÊ <makevar>INFO</makevar> (ÂÅÚ ÏËÏÎÞÁÎÉÑ
-      <literal>.info</literal>), É ÔÏÇÄÁ ÐÅÒÅÄ ÒÅÇÉÓÔÒÁÃÉÉ ÐÁËÁÄÖÁ ×Ï
+      <literal>.info</literal>), É ÔÏÇÄÁ ÐÅÒÅÄ ÒÅÇÉÓÔÒÁÃÉÉ ÐÁËÅÔÁ ×Ï
       ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ <filename>pkg-plist</filename> ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ
       ÄÏÂÁ×ÌÅÎ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ËÏÄ ÕÓÔÁÎÏ×ËÉ/ÕÄÁÌÅÎÉÑ.</para>
   </chapter>
@@ -5203,7 +5236,7 @@
       <note>
 	<para>æÁÊÌ <filename>pkg-message</filename> ÎÅ ÎÕÖÎÏ ÄÏÂÁ×ÌÑÔØ ×
 	  <filename>pkg-plist</filename>.  é ÏÎ ÎÅ ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ
-	  ×Ù×ÏÄÉÔØÓÑ, ÅÓÌÉ ÐÏÌØÚÏ×ÁÔÅÌØ ÉÓÐÏÌØÚÕÅÔ ÐÏÒÔ, Á ÎÅ ÐÁËÁÄÖ, ÔÁË ÞÔÏ
+	  ×Ù×ÏÄÉÔØÓÑ, ÅÓÌÉ ÐÏÌØÚÏ×ÁÔÅÌØ ÉÓÐÏÌØÚÕÅÔ ÐÏÒÔ, Á ÎÅ ÐÁËÅÔ, ÔÁË ÞÔÏ
 	  ×Ù ÄÏÌÖÎÙ ÂÕÄÅÔÅ ÓÁÍÉ ×Ù×ÏÄÉÔØ ÅÇÏ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÃÅÌÉ
 	  <maketarget>post-install</maketarget>.</para>
       </note>
@@ -5212,11 +5245,11 @@
     <sect1 id="pkg-install">
       <title><filename>pkg-install</filename></title>
 
-      <para>åÓÌÉ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÂÉÎÁÒÎÏÇÏ ÐÁËÁÄÖÁ ÐÏ ËÏÍÁÎÄÅ
+      <para>åÓÌÉ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÂÉÎÁÒÎÏÇÏ ÐÁËÅÔÁ ÐÏ ËÏÍÁÎÄÅ
 	&man.pkg.add.1; ×ÁÛÅÍÕ ÐÏÒÔÕ ÎÕÖÎÏ ×ÙÐÏÌÎÉÔØ ËÁËÉÅ-ÔÏ
 	ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÄÅÊÓÔ×ÉÑ ÉÌÉ ËÏÍÁÎÄÙ, ÔÏ ×Ù ÍÏÖÅÔÅ ÓÄÅÌÁÔØ ÜÔÏ Ó
 	ÐÏÍÏÝØÀ ÓËÒÉÐÔÁ <filename>pkg-install</filename>.  üÔÏÔ ÓËÒÉÐÔ ÂÕÄÅÔ
-	Á×ÔÏÍÁÔÉÞÅÓËÉ ÄÏÂÁ×ÌÅÎ Ë ÐÁËÁÄÖÕ, É ÂÕÄÅÔ Ä×ÁÖÄÙ ÚÁÐÕÓËÁÔØÓÑ ÐÏ
+	Á×ÔÏÍÁÔÉÞÅÓËÉ ÄÏÂÁ×ÌÅÎ Ë ÐÁËÅÔÕ, É ÂÕÄÅÔ Ä×ÁÖÄÙ ÚÁÐÕÓËÁÔØÓÑ ÐÏ
 	ËÏÍÁÎÄÅ &man.pkg.add.1;: ÐÅÒ×ÙÊ ÒÁÚ × ×ÉÄÅ
 	<literal>&dollar;{SH} pkg-install &dollar;{PKGNAME}
         PRE-INSTALL</literal>, Á ×ÔÏÒÏÊ ÒÁÚ ËÁË <literal>&dollar;{SH} {PKGNAME}
@@ -5224,7 +5257,7 @@
 	äÌÑ ÒÁÓÐÏÚÎÁ×ÁÎÉÑ ÔÏÇÏ, × ËÁËÏÍ ÒÅÖÉÍÅ ÚÁÐÕÝÅÎ ÓËÒÉÐÔ, ÍÏÖÎÏ
 	ÉÓÐÏÌØÚÏ×ÁÔØ ÐÁÒÁÍÅÔÒ <literal>&dollar;2</literal>.  ðÅÒÅÍÅÎÎÁÑ
 	ÏËÒÕÖÅÎÉÑ <envar>PKG_PREFIX</envar> ÂÕÄÅÔ ÐÒÉÎÉÍÁÔØ ÚÎÁÞÅÎÉÅ,
-	ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ËÁÔÁÌÏÇÕ, × ËÏÔÏÒÙÊ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÁËÁÄÖ.
+	ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ËÁÔÁÌÏÇÕ, × ËÏÔÏÒÙÊ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÁËÅÔ.
 	äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ ÎÁ ÓÔÒÁÎÉÃÅ óÐÒÁ×ÏÞÎÉËÁ Ï
 	ËÏÍÁÎÄÅ &man.pkg.add.1;.</para>
 
@@ -5239,7 +5272,7 @@
     <sect1 id="pkg-deinstall">
       <title><filename>pkg-deinstall</filename></title>
 
-      <para>üÔÏÔ ÓËÒÉÐÔ ×ÙÚÙ×ÁÅÔÓÑ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÁÄÖÁ.</para>
+      <para>üÔÏÔ ÓËÒÉÐÔ ×ÙÚÙ×ÁÅÔÓÑ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ.</para>
 
       <para>üÔÏÔ ÓËÒÉÐÔ ÕÔÉÌÉÔÏÊ &man.pkg.delete.1; ÂÕÄÅÔ ÚÁÐÕÓËÁÔØÓÑ
         Ä×ÁÖÄÙ.  ðÅÒ×ÙÊ ÒÁÚ ËÁË <literal>&dollar;{SH} pkg-install
@@ -5316,6 +5349,24 @@
 	ÔÒÅÂÕÅÔÓÑ ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ ÐÏÌÕÞÁÀÝÉÊÓÑ ÆÁÊÌ, ÄÅÌÁÊÔÅ ÜÔÏ × ÃÅÌÉ
 	<maketarget>post-install</maketarget> ÉÚÍÅÎÅÎÉÅÍ ÆÁÊÌÁ
 	<filename><makevar>TMPPLIST</makevar></filename>.</para>
+
+      <para>äÒÕÇÏÊ ÓÐÏÓÏ ÉÚÍÅÎÅÎÉÑ ÓÐÉÓËÁ ÓÂÏÒËÉ ÐÏÒÔÁ ÏÓÎÏ×ÁÎ ÎÁ
+        ÏÐÒÅÄÅÌÅÎÉÉ ÚÎÁÞÅÎÉÊ ÐÅÒÅÍÅÎÎÙÈ <makevar>PLIST_FILES</makevar> É
+        <makevar>PLIST_DIRS</makevar>.  ëÁÖÄÏÅ ÉÚ ÎÉÈ ÒÁÓÓÍÁÔÒÉ×ÁÅÔÓÑ ËÁË
+        ÐÅÒÅÞÅÎØ ÐÕÔÅÊ ÄÌÑ ÚÁÐÉÓÉ ×
+        <filename><makevar>TMPPLIST</makevar></filename> ÓÏÄÅÒÖÉÍÏÇÏ
+        <filename><makevar>PLIST</makevar></filename>.  éÍÅÎÁ, ÐÅÒÅÞÉÓÌÅÎÎÙÅ
+        × <makevar>PLIST_FILES</makevar> É <makevar>PLIST_DIRS</makevar>,
+        ÐÏÄ×ÅÒÇÁÀÔÓÑ ÐÏÄÓÔÁÎÏ×ËÅ <literal>%%VAR%%</literal>, ËÁË ÏÐÉÓÁÎÏ
+        ×ÙÛÅ.  úÁ ÉÓËÌÀÞÅÎÉÅÍ ÜÔÏÇÏ, ÉÍÅÎÁ ÉÚ <makevar>PLIST_FILES</makevar>
+        ÂÕÄÕÔ ÐÏÑ×ÌÑÔØÓÑ × ÏËÏÎÞÁÔÅÌØÎÏÍ ×ÁÒÉÁÎÔÅ ÐÅÒÅÞÎÑ ÓÂÏÒËÉ ÂÅÚ
+        ÉÚÍÅÎÅÎÉÊ, ËÏÇÄÁ ËÁË <literal>@dirrm</literal> ÂÕÄÅÔ ÐÒÅÄÛÅÓÔ×Ï×ÁÔØ
+        ÉÍÅÎÁÍ ÉÚ <makevar>PLIST_DIRS</makevar>.  äÌÑ ÔÏÇÏ, ÞÔÏÂÙ ×ÏÚÙÍÅÔØ
+        ÄÅÊÓÔ×ÉÅ, <makevar>PLIST_FILES</makevar> É
+        <makevar>PLIST_DIRS</makevar> ÄÏÌÖÎÙ ÚÁÄÁ×ÁÔØÓÑ ÄÏ ÔÏÇÏ, ËÁË ÂÕÄÅÔ
+        ÚÁÐÉÓÙ×ÁÔØÓÑ <filename><makevar>TMPPLIST</makevar></filename>, ÔÏ
+        ÅÓÔØ × ÃÅÌÉ <maketarget>pre-install</maketarget> ÉÌÉ ÅÝ£
+        ÒÁÎØÛÅ.</para>
     </sect1>
 
     <sect1 id="pkg-names">
@@ -5495,7 +5546,7 @@
       <screen>&prompt.root; <userinput>make clean; make package PREFIX=/var/tmp/<replaceable>port-name</replaceable></userinput></screen>
 
       <para>åÓÌÉ ÞÔÏ-ÔÏ ÂÙÌÏ ÕÓÔÁÎÏ×ÌÅÎÏ ÚÁ ÐÒÅÄÅÌÁÍÉ
-        <makevar>PREFIX</makevar>, ÔÏ ÐÒÏÃÅÓÓ ÓÏÚÄÁÎÉÑ ÐÁËÁÄÖÁ ÓÏÏÂÝÉÔ ÏÂ
+        <makevar>PREFIX</makevar>, ÔÏ ÐÒÏÃÅÓÓ ÓÏÚÄÁÎÉÑ ÐÁËÅÔÁ ÓÏÏÂÝÉÔ ÏÂ
         ÏÔÓÕÔÓÔ×ÉÉ ÆÁÊÌÏ×.</para>
 
       <!-- XXX This paragraph is confusing and poorly indented. -->
@@ -5580,13 +5631,13 @@
       ÐÒÉÞÉÎÕ ÎÅ ÏÂÎÏ×ÌÑÔØ ÐÏÒÔ ÐÒÑÍÏ ÓÅÊÞÁÓ (ÎÁÐÒÉÍÅÒ, ÉÚ-ÚÁ ÐÒÏÂÌÅÍ ÓÏ
       ÓÔÁÂÉÌØÎÏÓÔØÀ ÆÕÎËÃÉÏÎÉÒÏ×ÁÎÉÑ ÎÏ×ÏÊ ×ÅÒÓÉÉ);
       ×ÁÍ ÎÅÔ ÎÕÖÄÙ ÄÕÂÌÉÒÏ×ÁÔØ ÉÈ ÒÁÂÏÔÕ.  úÁÍÅÔØÔÅ, ÞÔÏ ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ
-      ÐÏÒÔÙ ÐÅÒÅÞÉÓÌÑÀÔÓÑ Ó ÁÄÒÅÓÏÍ ÍÜÊÎÔÅÊÎÅÒÁ
+      ÐÏÒÔÙ ÐÅÒÅÞÉÓÌÑÀÔÓÑ Ó ÁÄÒÅÓÏÍ ÍÅÊÎÔÅÊÎÅÒÁ
       <literal>ports at FreeBSD.org</literal>, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ×ÓÅÇÏ ÌÉÛØ
       ÁÄÒÅÓÏÍ ÏÂÝÅÇÏ ÓÐÉÓËÁ ÒÁÓÓÙÌËÉ, ÔÁË ÞÔÏ ÏÔÐÒÁ×ËÁ ÔÕÄÁ ÓÏÏÂÝÅÎÉÊ,
       ÓËÏÒÅÅ ×ÓÅÇÏ, × ÄÁÎÎÏÍ ÓÌÕÞÁÅ ÎÅ ÐÏÍÏÖÅÔ.</para>
 
-    <para>åÓÌÉ ÍÜÊÎÔÅÊÎÅÒ ÐÒÏÓÉÔ ×ÁÓ ×ÙÐÏÌÎÉÔØ ÏÂÎÏ×ÌÅÎÉÅ, ÌÉÂÏ
-      ÉÌÉ ÍÜÊÎÔÅÊÎÅÒ ÏÔÓÕÔÓÔ×ÕÅÔ, ÔÏ Õ ×ÁÓ ÐÏÑ×ÌÑÅÔÓÑ ÛÁÎÓ ÐÏÍÏÞØ &os;,
+    <para>åÓÌÉ ÍÅÊÎÔÅÊÎÅÒ ÐÒÏÓÉÔ ×ÁÓ ×ÙÐÏÌÎÉÔØ ÏÂÎÏ×ÌÅÎÉÅ, ÌÉÂÏ
+      ÉÌÉ ÍÅÊÎÔÅÊÎÅÒ ÏÔÓÕÔÓÔ×ÕÅÔ, ÔÏ Õ ×ÁÓ ÐÏÑ×ÌÑÅÔÓÑ ÛÁÎÓ ÐÏÍÏÞØ &os;,
       ÐÒÉÇÏÔÏ×É× ÏÂÎÏ×ÌÅÎÉÅ ÓÁÍÉÍ!  ðÏÖÁÌÕÊÓÔÁ, ×ÎÅÓÉÔÅ ÉÚÍÅÎÅÎÉÑ É ÓÏÈÒÁÎÉÔÅ
       ÒÅÚÕÌØÔÁÔ ÒÅËÕÒÓÉ×ÎÏÇÏ <command>diff</command>
       ÍÅÖÄÕ ÎÏ×ÙÍ É ÓÔÁÒÙÍ ËÁÔÁÌÏÇÁÍÉ ÐÏÒÔÁ (ÎÁÐÒÉÍÅÒ, ÅÓÌÉ ËÁÔÁÌÏÇ Ó
@@ -5608,9 +5659,9 @@
 
     <para>åÓÌÉ ÐÏÒÔ ÎÉËÅÍ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ, Á ×Ù ÁËÔÉ×ÎÏ ÅÇÏ ÉÓÐÏÌØÚÕÅÔÅ,
       ÐÏÖÁÌÕÊÓÔÁ, ÐÏÄÕÍÁÊÔÅ ÎÁÄ ÔÅÍ, ÞÔÏÂÙ ÄÏÂÒÏ×ÏÌØÎÏ ÓÔÁÔØ ÅÇÏ
-      ÍÜÊÎÔÜÊÎÅÒÏÍ.  ÷Ï &os; ÉÍÅÅÔÓÑ ÂÏÌÅÅ 2000 ÐÏÒÔÏ× ÂÅÚ ÐÏÄÄÅÒÖËÉ, É ÜÔÏ
+      ÍÅÊÎÔÅÊÎÅÒÏÍ.  ÷Ï &os; ÉÍÅÅÔÓÑ ÂÏÌÅÅ 2000 ÐÏÒÔÏ× ÂÅÚ ÐÏÄÄÅÒÖËÉ, É ÜÔÏ
       ËÁË ÒÁÚ ÔÁ ÏÂÌÁÓÔØ, ÇÄÅ ×ÓÅÇÄÁ ÎÕÖÎÙ ÄÏÂÒÏ×ÏÌØÃÙ.  (äÅÔÁÌØÎÏÅ ÏÐÉÓÁÎÉÅ
-      ÏÂÑÚÁÎÎÏÓÔÅÊ ÍÜÊÎÔÜÊÎÅÒÏ× ÍÏÖÎÏ ÎÁÊÔÉ × ÒÁÚÄÅÌÅ <ulink
+      ÏÂÑÚÁÎÎÏÓÔÅÊ ÍÅÊÎÔÅÊÎÅÒÏ× ÍÏÖÎÏ ÎÁÊÔÉ × ÒÁÚÄÅÌÅ <ulink
       url="../developers-handbook/policies.html#POLICIES-MAINTAINER">
       MAINTAINER × Make-ÆÁÊÌÁÈ</ulink>.)</para>
 
@@ -5623,7 +5674,7 @@
       ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ × ÐÏÌÅ <quote>Class</quote> ×ÁÛÅÇÏ PR ÄÏÌÖÎÏ ÂÙÔØ
       ÕËÁÚÁÎÏ <literal>change-request</literal>.  âÕÄØÔÅ ÄÏÂÒÙ, × ÓÏÏÂÝÅÎÉÉ
       ÏÔÍÅÔØÔÅ ×ÓÅ ÄÏÂÁ×ÌÅÎÎÙÅ ÉÌÉ ÕÄÁÌ£ÎÎÙÅ ÆÁÊÌÙ, ÔÁË ËÁË ÏÎÉ ÂÕÄÕÔ
-      ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ ÕËÁÚÁÎÙ &man.cvs.1; ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ ËÏÍÍÉÔÔÁ.
+      ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ ÕËÁÚÁÎÙ &man.cvs.1; ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ ËÏÍÍÉÔÁ.
       åÓÌÉ diff-ÆÁÊÌ ÉÍÅÅÔ ÒÁÚÍÅÒ, ÐÒÅ×ÙÛÁÀÝÉÊ 20ëâ, ÓÏÖÍÉÔÅ ÅÇÏ É ÏÂÒÁÂÏÔÁÊÔÅ
       ÕÔÉÌÉÔÏÊ uuencode; × ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÐÒÏÓÔÏ ×ËÌÀÞÉÔÅ ÅÇÏ ËÁË ÅÓÔØ
       × PR.</para>
@@ -5638,7 +5689,7 @@
       <para>åÓÌÉ ×ÁÛÅ ÏÂÎÏ×ÌÅÎÉÅ ×ÙÚ×ÁÎÏ ÓÏÏÂÒÁÖÅÎÉÑÍÉ ÉÎÆÏÒÍÁÃÉÏÎÎÏÊ
         ÂÅÚÏÐÁÓÎÏÓÔÉ ÉÌÉ ÎÁÌÉÞÉÅÍ ÓÅÒØ£ÚÎÙÈ ÏÛÉÂÏË × ÉÍÅÀÝÅÍÓÑ ÐÏÒÔÅ,
         ÐÏÖÁÌÕÊÓÔÁ, ÏÐÏ×ÅÓÔÉÔÅ &a.portmgr; Ï ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÎÅÍÅÄÌÅÎÎÏÇÏ
-        ÐÅÒÅÐÏÓÔÒÏÅÎÉÑ É ÐÏ×ÔÏÒÎÏÇÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÐÁËÁÄÖÁ ×ÁÛÅÇÏ ÐÏÒÔÁ.
+        ÐÅÒÅÐÏÓÔÒÏÅÎÉÑ É ÐÏ×ÔÏÒÎÏÇÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÐÁËÅÔÁ ×ÁÛÅÇÏ ÐÏÒÔÁ.
         ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÎÉÞÅÇÏ ÎÅ ÐÏÄÏÚÒÅ×ÁÀÝÉÅ ÐÏÌØÚÏ×ÁÔÅÌÉ &man.pkg.add.1;
         ÂÕÄÕÔ ÐÒÏÄÏÌÖÁÔØ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ÐÏ ËÏÍÁÎÄÅ
         <command>pkg_add -r</command> × ÔÅÞÅÎÉÅ ÅÝ£ ÎÅÓËÏÌØËÉÈ ÎÅÄÅÌØ.</para>
@@ -6457,7 +6508,7 @@
 
             <row>
               <entry>4.5-STABLE ÐÏÓÌÅ ÐÅÒÅËÌÀÞÅÎÉÑ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÐÏ
-                ÕÍÏÌÞÁÎÉÀ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÐÁËÁÄÖÅÊ  XFree86 4.</entry>
+                ÕÍÏÌÞÁÎÉÀ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÐÁËÅÔÏ×  XFree86 4.</entry>
 
               <entry>450005</entry>
             </row>
@@ -6694,7 +6745,7 @@
             </row>
 
             <row>
-              <entry>5.0-CURRENT ÐÏÓÌÅ ÐÅÒ×ÏÇÏ ËÏÍÍÉÔÔÁ SMPng.</entry>
+              <entry>5.0-CURRENT ÐÏÓÌÅ ÐÅÒ×ÏÇÏ ËÏÍÍÉÔÁ SMPng.</entry>
 
               <entry>500013</entry>
             </row>
@@ -6786,7 +6837,7 @@
 
             <row>
               <entry>5.0-CURRENT ÐÏÓÌÅ ÐÅÒÅÈÏÄÁ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ
-                XFree86 4 ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÁËÁÄÖÅÊ É ÐÏÓÌÅ ÄÏÂÁ×ÌÅÎÉÑ ×
+                XFree86 4 ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÁËÅÔÏ× É ÐÏÓÌÅ ÄÏÂÁ×ÌÅÎÉÑ ×
                 ÂÉÂÌÉÏÔÅËÕ libc ÎÏ×ÏÊ ÆÕÎËÃÉÉ strnstr().</entry>
 
               <entry>500026</entry>
@@ -6887,7 +6938,7 @@
               <entry>5.0-CURRENT ÐÏÓÌÅ ÔÏÇÏ, ËÁË × ÆÁÊÌÁÈ ÚÁÇÏÌÏ×ËÏ× ÂÙÌÏ
                 ÐÒÅËÒÁÝÅÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ _BSD_FOO_T_ É ÎÁÞÁÔÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
                 _FOO_T_DECLARED.  üÔÏ ÚÎÁÞÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÔÁËÖÅ ÉÓÐÏÌØÚÏ×ÁÎÏ
-                ËÁË ÐÒÉÍÅÒÎÁÑ ÔÏÞËÁ ÎÁÞÁÌÁ ÐÏÄÄÅÒÖËÉ ÐÁËÁÄÖÅÊ × ÆÏÒÍÁÔÅ
+                ËÁË ÐÒÉÍÅÒÎÁÑ ÔÏÞËÁ ÎÁÞÁÌÁ ÐÏÄÄÅÒÖËÉ ÐÁËÅÔÏ× × ÆÏÒÍÁÔÅ
                 &man.bzip2.1;.</entry>
 
               <entry>500039</entry>
@@ -7453,26 +7504,35 @@
 	${INSTALL_MAN} ${WRKSRC}/docs/xvdocs.ps ${DOCSDIR}
  .endif</programlisting>
 
-      <para>÷ÏÔ ÎÅÓËÏÌØËÏ ÐÅÒÅÍÅÎÎÙÈ É ÔÏ, ËÁË ÏÎÉ ÐÒÅÏÂÒÁÚÕÀÔÓÑ ÐÒÉ
-        ÉÓÐÏÌØÚÏ×ÁÎÉÉ × <filename>Makefile</filename>:</para>
+      <para>÷ÏÔ ÎÅÓËÏÌØËÏ ÐÏÌÅÚÎÙÈ ÐÅÒÅÍÅÎÎÙÈ É ÔÏ, ËÁË ÏÎÉ ÐÒÅÏÂÒÁÚÕÀÔÓÑ ÐÏ
+        ÕÍÏÌÞÁÎÉÀ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ × <filename>Makefile</filename>:</para>
 
       <itemizedlist>
         <listitem>
-          <para><literal>${DATADIR}</literal> ÐÒÅÏÂÒÁÚÕÅÔÓÑ ×
-	    <filename>${PREFIX}/share/${PORTNAME}</filename>.</para>
+          <para><makevar>DATADIR</makevar> ÐÒÅÏÂÒÁÚÕÅÔÓÑ ×
+	    <filename><makevar>PREFIX</makevar>/share/<makevar>PORTNAME</makevar></filename>.</para>
 	</listitem>
 	
 	<listitem>
-	  <para><literal>${DOCSDIR}</literal>  ÐÒÅÏÂÒÁÚÕÅÔÓÑ ×
-	    <filename>${PREFIX}/share/doc/${PORTNAME}</filename>.</para>
+	  <para><makevar>DOCSDIR</makevar>  ÐÒÅÏÂÒÁÚÕÅÔÓÑ ×
+	    <filename><makevar>PREFIX</makevar>/share/doc/<makevar>PORTNAME</makevar></filename>.</para>
 	</listitem>
 
 	<listitem>
-	  <para><literal>${EXAMPLESDIR}</literal>  ÐÒÅÏÂÒÁÚÕÅÔÓÑ ×
-	    <filename>${PREFIX}/share/examples/${PORTNAME}</filename>.</para>
+	  <para><makevar>EXAMPLESDIR</makevar>  ÐÒÅÏÂÒÁÚÕÅÔÓÑ ×
+	    <filename><makevar>PREFIX</makevar>/share/examples/<makevar>PORTNAME</makevar></filename>.</para>
 	</listitem>
       </itemizedlist>
 
+      <para>üÔÉ ÐÅÒÅÍÅÎÎÙÅ ÜËÓÐÏÒÔÉÒÕÀÔÓÑ × <makevar>PLIST_SUB</makevar>.
+        éÈ ÚÎÁÞÅÎÉÑ ÐÏÑ×ÑÔÓÑ ÔÁÍ × ×ÉÄÅ ÉͣΠÐÕÔÅÊ ÏÔÎÏÓÉÔÅÌØÎÏ
+        <filename><makevar>PREFIX</makevar></filename>, ÅÓÌÉ ÜÔÏ ×ÏÚÍÏÖÎÏ.
+        ôÏ ÅÓÔØ <filename>share/doc/<makevar>PORTNAME</makevar></filename>
+        × ÓÐÉÓËÅ ÓÂÏÒËÉ ÐÏ ÕÍÏÌÞÁÎÉÀ ÂÕÄÅÔ ÚÁÍÅÎÅÎ ÎÁ
+        <literal>%%DOCSDIR%%</literal>, É ÔÁË ÄÁÌÅÅ.  (äÏÐÏÌÎÉÔÅÌØÎÕÀ
+        ÉÎÆÏÒÍÁÃÉÀ Ï ÐÏÄÓÔÁÎÏ×ËÅ × <filename>pkg-plist</filename> ÍÏÖÎÏ
+        ÎÁÊÔÉ <link linkend="porting-plist">ÚÄÅÓØ</link>.)</para>
+
       <para>÷ÓÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÙÅ ÆÁÊÌÙ Ó ÄÏËÕÍÅÎÔÁÃÉÅÊ É ËÁÔÁÌÏÇÉ ÄÏÌÖÎÙ ÂÙÔØ
         ÐÅÒÅÞÉÓÌÅÎÙ × ÆÁÊÌÅ <filename>pkg-plist</filename> Ó ÐÒÅÆÉËÓÏÍ
         <literal>%%PORTDOCS%%</literal>, ÎÁÐÒÉÍÅÒ:</para>
@@ -7491,6 +7551,27 @@
 	<para>æÁÊÌ <filename>pkg-message</filename> ÎÅ ÎÕÖÎÏ ÄÏÂÁ×ÌÑÔØ ×
 	  <filename>pkg-plist</filename>.</para>
       </note>
+
+      <para>÷ ËÁÞÅÓÔ×Å ÁÌØÔÅÒÎÁÔÉ×Ù ÐÅÒÅÞÉÓÌÅÎÉÀ ÆÁÊÌÏ× ÄÏËÕÍÅÎÔÁÃÉÉ × ÆÁÊÌÅ
+        <filename>pkg-plist</filename>, ÐÏÒÔ ÍÏÖÅÔ ÕËÁÚÁÔØ × ÐÅÒÅÍÅÎÎÏÊ
+        <makevar>PORTDOCS</makevar> ÓÐÉÓÏË ÉͣΠÆÁÊÌÏ× É ÇÌÏÂÁÌØÎÙÈ ÛÁÂÌÏÎÏ×
+        ËÏÍÁÎÄÎÏÇÏ ÐÒÏÃÅÓÓÏÒÁ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ × ÏËÏÎÞÁÔÅÌØÎÙÊ ÓÐÉÓÏË ÓÂÏÒËÉ.
+        éÍÅÎÁ ÂÕÄÕÔ ÚÁÄÁ×ÁÔØÓÑ ÏÔÎÏÓÉÔÅÌØÎÏ <makevar>DOCSDIR</makevar>.
+        ôÁËÉÍ ÏÂÒÁÚÏÍ, ÐÏÒÔ, ÉÓÐÏÌØÚÕÀÝÉÊ <makevar>PORTDOCS</makevar> É
+        ÎÅÓÔÁÎÄÁÒÔÎÏÅ ÍÅÓÔÏÐÏÌÏÖÅÎÉÅ ÄÏËÕÍÅÎÔÁÃÉÉ, ÄÏÌÖÅÎ ÚÁÄÁ×ÁÔØ
+        ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍ ÏÂÒÁÚÏÍ É <makevar>DOCSDIR</makevar>.  åÓÌÉ ËÁÔÁÌÏÇ
+        ÕËÁÚÁÎ × <makevar>PORTDOCS</makevar> ÉÌÉ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÛÁÂÌÏÎÕ ÄÌÑ
+        ÜÔÏÊ ÐÅÒÅÍÅÎÎÏÊ, ÔÏ ÐÏÌÎÏÅ ÐÏÄÄÅÒÅ×Ï Ó ×ÈÏÄÑÝÉÍÉ × ÎÅÇÏ ÆÁÊÌÁÍÉ É
+        ËÁÔÁÌÏÇÁÍÉ ÂÕÄÅÔ ÒÅÇÉÓÔÒÉÒÏ×ÁÔØÓÑ × ÏËÏÎÞÁÔÅÌØÎÏÍ ÓÐÉÓËÅ ÓÂÏÒËÉ.
+        <makevar>PORTDOCS</makevar> ÎÅ ÄÏÌÖÎÁ ÚÁÄÁ×ÁÔØÓÑ, ÅÓÌÉ ÏÐÒÅÄÅÌÅÎÁ
+        ÐÅÒÅÍÅÎÎÁÑ <makevar>NOPORTDOCS</makevar>.  õÓÔÁÎÏ×ËÁ ÄÏËÕÍÅÎÔÁÃÉÉ ×
+        <makevar>PORTDOCS</makevar>, ËÁË ÜÔÏ ÐÏËÁÚÁÎÏ ×ÙÛÅ, ÏÓÔÁ£ÔÓÑ ÚÁ
+        ÓÁÍÉÍ ÐÏÒÔÏÍ.  ôÉÐÉÞÎÙÊ ÐÒÉÍÅÒ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
+        <makevar>PORTDOCS</makevar> ×ÙÇÌÑÄÉÔ ÓÌÅÄÕÀÝÉÍ ÏÂÒÁÚÏÍ:</para>
+
+       <programlisting>.if !defined(NOPORTDOCS)
+	PORTDOCS=	*
+.endif</programlisting>
     </sect1>
 
     <sect1 id="dads-subdirs">
@@ -7556,7 +7637,7 @@
     <sect1 id="dads-uid">
       <title>éÄÅÎÔÉÆÉËÁÔÏÒÙ UID</title>
 
-      <para>åÓÌÉ ×ÁÛÅÍÕ ÐÏÒÔÙ ÔÒÅÂÕÅÔÓÑ ÎÁÌÉÞÉÅ ÎÅËÏÔÏÒÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ ×
+      <para>åÓÌÉ ×ÁÛÅÍÕ ÐÏÒÔÕ ÔÒÅÂÕÅÔÓÑ ÎÁÌÉÞÉÅ ÎÅËÏÔÏÒÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ ×
 	ÓÉÓÔÅÍÅ, ÎÁ ËÏÔÏÒÕÀ ÏÎ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ, ÐÕÓÔØ ÓËÒÉÐÔ
 	<filename>pkg-install</filename> ×ÙÚÏ×ÅÔ ËÏÍÁÎÄÕ
 	<command>pw</command> ÄÌÑ ÅÇÏ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÓÏÚÄÁÎÉÑ.  ðÏÓÍÏÔÒÉÔÅ
@@ -7564,7 +7645,7 @@
       </para>
 
       <para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÔ ÖÅ ÓÁÍÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ
-	ÐÏÌØÚÏ×ÁÔÅÌÑ ÉÌÉ ÇÒÕÐÐÙ ÐÒÉ ÕÓÔÁÎÏ×ËÅ Ä×ÏÉÞÎÏÇÏ ÐÁËÁÄÖÁ, ËÏÔÏÒÙÊ ÂÙÌ
+	ÐÏÌØÚÏ×ÁÔÅÌÑ ÉÌÉ ÇÒÕÐÐÙ ÐÒÉ ÕÓÔÁÎÏ×ËÅ Ä×ÏÉÞÎÏÇÏ ÐÁËÅÔÁ, ËÏÔÏÒÙÊ ÂÙÌ
 	ÐÒÉ ËÏÍÐÉÌÑÃÉÉ, ÔÏ ×Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ Ó×ÏÂÏÄÎÙÊ UID × ÄÉÁÐÁÚÏÎÅ ÏÔ 50
 	ÄÏ 999 É ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÅÇÏ ÎÉÖÅ.  ÷ÚÇÌÑÎÉÔÅ ÄÌÑ ÐÒÉÍÅÒÁ ÎÁ
 	<filename role="package">japanese/Wnn6</filename>.</para>
@@ -7942,7 +8023,7 @@
 #
 # &dollar;FreeBSD&dollar;
 [ ^^^^^^^^^ üÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÚÁÍÅÎÅÎÁ ÓÏ ÓÔÒÏÞËÏÊ RCS ID
-ÓÉÓÔÅÍÏÊ CVS ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ ËÏÍÍÉÔÔÁ × ÎÁÛÅ ÈÒÁÎÉÌÉÝÅ.  ðÒÉ
+ÓÉÓÔÅÍÏÊ CVS ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÐÅÒÁÃÉÉ ËÏÍÍÉÔÁ × ÎÁÛÅ ÈÒÁÎÉÌÉÝÅ.  ðÒÉ
 ÏÂÎÏ×ÌÅÎÉÉ ÐÏÒÔÁ ÎÅ ÐÒÉ×ÏÄÉÔÅ ÜÔÕ ÓÔÒÏËÕ ÏÂÒÁÔÎÏ Ë ×ÉÄÕ
 "&dollar;FreeBSD&dollar;".  CVS ÓÄÅÌÁÅÔ ×ÓÅ Á×ÔÏÍÁÔÉÞÅÓËÉ.]
 #
@@ -7971,7 +8052,7 @@
 PATCHFILES=    xdvi-18.patch1.gz xdvi-18.patch2.gz
 
 [ÓÏÐÒÏ×ÏÖÄÁÀÝÉÊ; *ÏÂÑÚÁÔÅÌØÎÏÅ ÐÏÌÅ*!  üÔÏ ÞÅÌÏ×ÅË (ÐÒÅÄÐÏÞÔÉÔÅÌØÎÏ Ó
- ÐÒÉ×ÉÌÅÇÉÑÍÉ ÎÁ ÏÐÅÒÁÃÉÀ ËÏÍÍÉÔÔÁ), Ó ËÏÔÏÒÙÍ ÍÏÖÅÔ Ó×ÑÚÁÔØÓÑ ÐÏÌØÚÏ×ÁÔÅÌØ
+ ÐÒÉ×ÉÌÅÇÉÑÍÉ ÎÁ ÏÐÅÒÁÃÉÀ ËÏÍÍÉÔÁ), Ó ËÏÔÏÒÙÍ ÍÏÖÅÔ Ó×ÑÚÁÔØÓÑ ÐÏÌØÚÏ×ÁÔÅÌØ
  ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÏÔ×ÅÔÏ× ÎÁ ×ÏÐÒÏÓÙ É ÐÏÓÙÌËÉ ÓÏÏÂÝÅÎÉÊ Ï ÏÛÉÂËÁÈ - ÜÔÏÔ
  ÞÅÌÏ×ÅË ÄÏÌÖÅÎ ÂÙÔØ ÓÏÚÄÁÔÅÌÅÍ ÐÏÒÔÁ ÉÌÉ ËÅÍ-ÔÏ, ËÔÏ ÍÏÖÅÔ ÐÅÒÅÄÁÔØ
  ×ÏÐÒÏÓÙ ÓÏÚÄÁÔÅÌÀ ÐÏÒÔÁ.  åÓÌÉ ×Ù ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÎÅ ÈÏÔÉÔÅ ÕËÁÚÙ×ÁÔØ ÚÄÅÓØ
@@ -8093,7 +8174,7 @@
       <para>óÁÍÙÍ ÐÒÏÓÔÙÍ ÓÐÏÓÏÂÏÍ ÏÔÓÌÅÖÉ×ÁÔØ ÕÖÅ ÐÒÏÉÚÏÛÅÄÛÉÅ ÏÂÎÏ×ÌÅÎÉÑ
         Ñ×ÌÑÅÔÓÑ ÐÏÄÐÉÓËÁ ÎÁ <ulink url="http://www.FreshPorts.org/">
         FreshPorts</ulink>.  äÌÑ ÍÏÎÉÔÏÒÉÎÇÁ ×Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ ÎÅÓËÏÌØËÏ
-        ÐÏÒÔÏ×.  íÜÊÎÔÜÊÎÅÒÁÍ ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÐÏÄÐÉÓÁÔØÓÑ ÚÄÅÓØ,
+        ÐÏÒÔÏ×.  íÅÊÎÔÅÊÎÅÒÁÍ ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÐÏÄÐÉÓÁÔØÓÑ ÚÄÅÓØ,
         ÐÏÔÏÍÕ ÞÔÏ ÏÎÉ ÂÕÄÕÔ ÐÏÌÕÞÁÔØ Õ×ÅÄÏÍÌÅÎÉÑ ÎÅ ÔÏÌØËÏ Ï ÓÏÂÓÔ×ÅÎÎÙÈ
         ÉÚÍÅÎÅÎÉÑÈ, ÎÏ É ÏÂ ÉÚÍÅÎÅÎÉÑÈ, ÓÄÅÌÁÎÎÙÈ ÌÀÂÙÍ ÄÒÕÇÉÍ ËÏÍÍÉÔÔÅÒÏÍ
         &os;.  (üÔÏ ÞÁÓÔÏ ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ Ó ÉÚÍÅÎÅÎÉÑÍÉ ÎÁ ÂÏÌÅÅ
@@ -8152,7 +8233,7 @@
         ÉÚ ÏÓÎÏ×ÎÙÈ ÒÅÌÉÚÏ× ïó ÄÌÑ ËÁÖÄÏÊ ÁÒÈÉÔÅËÔÕÒÙ ÕÒÏ×ÎÑ ÐÏÄÄÅÒÖËÉ
         Tier-1 ×ÙÄÅÌÅÎ ÃÅÌÙÊ ËÌÁÓÔÅÒ ÍÁÛÉÎ.  ÷Ù ÍÏÖÅÔÅ Õ×ÉÄÅÔØ ÒÅÚÕÌØÔÁÔÙ
         ÜÔÉÈ ÐÏÓÔÒÏÅÎÉÊ × <ulink url="http://pointyhat.FreeBSD.org/">ÐÒÏÔÏËÏÌÁÈ
-        ÐÏÓÔÒÏÅÎÉÑ ÐÁËÁÄÖÅÊ É ÏÂÎÁÒÕÖÅÎÎÙÈ ÏÛÉÂÏË</ulink>.</para>
+        ÐÏÓÔÒÏÅÎÉÑ ÐÁËÅÔÏ× É ÏÂÎÁÒÕÖÅÎÎÙÈ ÏÛÉÂÏË</ulink>.</para>
     </sect1>
 
     <sect1>
@@ -8166,7 +8247,7 @@
         ÉÎÓÐÅËÔÉÒÏ×ÁÎÉÑ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ× FreeBSD</ulink> ÐÙÔÁÅÔÓÑ
         ÏÐÒÏÓÉÔØ ËÁÖÄÙÊ ÉÚ ÓÁÊÔÏ×, ÄÏÓÔÕÐÎÙÊ ÄÌÑ ÓÇÒÕÚËÉ ËÁÖÄÏÇÏ ÉÚ ÐÏÒÔÏ×

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list