Sync pkgtools/pkg_install with src/usr.sbin/pkg_install from 20031121.

4 files changed, 26 insertions, 26 deletions

diff --git a/pkgtools/pkg_install/files/view/linkfarm.1 b/pkgtools/pkg_install/files/view/linkfarm.1
index a509a15da2b..93c1b1cec6f 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.1
+++ b/pkgtools/pkg_install/files/view/linkfarm.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: linkfarm.1,v 1.4 2003/09/23 07:13:55 grant Exp $
+.\"	$NetBSD: linkfarm.1,v 1.5 2003/12/08 13:50:50 grant Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -144,4 +144,4 @@ directory, and it defaults to "info/dir *[~#] *.OLD *.orig *,v".
 The
 .Nm
 utility was written by
-.An Alistair G. Crooks Aq agc@netbsd.org .
+.An Alistair G. Crooks Aq agc@NetBSD.org .
diff --git a/pkgtools/pkg_install/files/view/linkfarm.cat1 b/pkgtools/pkg_install/files/view/linkfarm.cat1
index 44f5b56ac44..61a97a08a9b 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.cat1
+++ b/pkgtools/pkg_install/files/view/linkfarm.cat1
@@ -62,6 +62,6 @@ SSEEEE AALLSSOO
      lndir(1), pkg_view(1)
 
 AAUUTTHHOORRSS
-     The lliinnkkffaarrmm utility was written by Alistair G. Crooks <agc@netbsd.org>.
+     The lliinnkkffaarrmm utility was written by Alistair G. Crooks <agc@NetBSD.org>.
 
 NetBSD 1.6                     September 2, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/view/pkg_view.1 b/pkgtools/pkg_install/files/view/pkg_view.1
index e0c06a53be8..fb0399fd62b 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.1
+++ b/pkgtools/pkg_install/files/view/pkg_view.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkg_view.1,v 1.6 2003/09/23 07:13:55 grant Exp $
+.\"	$NetBSD: pkg_view.1,v 1.7 2003/12/08 13:50:50 grant Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -268,4 +268,4 @@ directory.
 The
 .Nm
 utility was written by
-.An Alistair G. Crooks Aq agc@netbsd.org .
+.An Alistair G. Crooks Aq agc@NetBSD.org .
diff --git a/pkgtools/pkg_install/files/view/pkg_view.cat1 b/pkgtools/pkg_install/files/view/pkg_view.cat1
index 148e902f413..edae38ae310 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.cat1
+++ b/pkgtools/pkg_install/files/view/pkg_view.cat1
@@ -13,17 +13,17 @@ DDEESSCCRRIIPPTTIIOONN
 
 WWAARRNNIINNGG
      _S_i_n_c_e _t_h_e ppkkgg__vviieeww _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _p_r_o_v_i_d_e_d _b_y _a
-     _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_' _o_r _o_t_h_-
-     _e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e _f_i_l_e_s_.
+     _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_' _o_r
+     _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e _f_i_l_e_s_.
 
      _Y_o_u _a_r_e _a_d_v_i_s_e_d _t_o _v_e_r_i_f_y _t_h_e _c_o_m_p_e_t_e_n_c_e _a_n_d _i_d_e_n_t_i_t_y _o_f _t_h_o_s_e _w_h_o _p_r_o_-
      _v_i_d_e _i_n_s_t_a_l_l_a_b_l_e _p_a_c_k_a_g_e _f_i_l_e_s_.  _F_o_r _e_x_t_r_a _p_r_o_t_e_c_t_i_o_n_, _e_x_a_m_i_n_e _a_l_l _t_h_e
      _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s _i_n _t_h_e _p_a_c_k_a_g_e _d_a_t_a_b_a_s_e _d_i_r_e_c_t_o_r_y
-     _(_/_u_s_r_/_p_k_g_/_p_a_c_k_a_g_e_s_/_<_p_k_g_-_n_a_m_e_>_/_)_.  _P_a_y _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y _+_I_N_-
-     _S_T_A_L_L_, _+_D_E_I_N_S_T_A_L_L_, _+_R_E_Q_U_I_R_E _o_r _+_M_T_R_E_E___D_I_R_S _f_i_l_e_s_, _a_n_d _i_n_s_p_e_c_t _t_h_e _+_C_O_N_-
-     _T_E_N_T_S _f_i_l_e _f_o_r @@ccwwdd_, @@mmooddee _(_c_h_e_c_k _f_o_r _s_e_t_u_i_d_)_, @@ddiirrrrmm_, @@eexxeecc_, _a_n_d @@uunneexxeecc
-     _d_i_r_e_c_t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e pkg_info(_1) _c_o_m_m_a_n_d _t_o _e_x_a_m_i_n_e _t_h_e _i_n_s_t_a_l_l_e_d
-     _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s_.
+     _(_/_u_s_r_/_p_k_g_/_p_a_c_k_a_g_e_s_/_<_p_k_g_-_n_a_m_e_>_/_)_.  _P_a_y _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y
+     _+_I_N_S_T_A_L_L_, _+_D_E_I_N_S_T_A_L_L_, _+_R_E_Q_U_I_R_E _o_r _+_M_T_R_E_E___D_I_R_S _f_i_l_e_s_, _a_n_d _i_n_s_p_e_c_t _t_h_e
+     _+_C_O_N_T_E_N_T_S _f_i_l_e _f_o_r @@ccwwdd_, @@mmooddee _(_c_h_e_c_k _f_o_r _s_e_t_u_i_d_)_, @@ddiirrrrmm_, @@eexxeecc_, _a_n_d
+     @@uunneexxeecc _d_i_r_e_c_t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e pkg_info(_1) _c_o_m_m_a_n_d _t_o _e_x_a_m_i_n_e _t_h_e
+     _i_n_s_t_a_l_l_e_d _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s_.
 
 OOPPTTIIOONNSS
      The following command-line options are supported:
@@ -59,10 +59,10 @@ OOPPTTIIOONNSS
              by the LOCALBASE environment variable.
 
      --ww _v_i_e_w
-             Set _v_i_e_w as the directory in _v_i_e_w_b_a_s_e in which the package in-
-             stances should be added or deleted.  The default _v_i_e_w is the emp-
-             ty view but may be overridden by the PKG_VIEW environment vari-
-             able.
+             Set _v_i_e_w as the directory in _v_i_e_w_b_a_s_e in which the package
+             instances should be added or deleted.  The default _v_i_e_w is the
+             empty view but may be overridden by the PKG_VIEW environment
+             variable.
 
      The following commands are supported:
 
@@ -85,8 +85,8 @@ EENNVVIIRROONNMMEENNTT
 
      PKG_DBDIR
              If the --kk flag isn't given, then the value of the environment
-             variable PKG_DBDIR is the package database directory for the de-
-             fault view, otherwise it defaults to _/_v_a_r_/_d_b_/_p_k_g.
+             variable PKG_DBDIR is the package database directory for the
+             default view, otherwise it defaults to _/_v_a_r_/_d_b_/_p_k_g.
 
      PLIST_IGNORE_FILES
              This can be used to specify files in _p_a_c_k_a_g_e that should ignored
@@ -110,12 +110,12 @@ FFIILLEESS
              _p_a_c_k_a_g_e  The name of the package instance being added.
 
              VVIIEEWW--IINNSSTTAALLLL
-                      Keyword denoting that the script is to perform any ac-
-                      tions needed after the package instance is added to a
+                      Keyword denoting that the script is to perform any
+                      actions needed after the package instance is added to a
                       view.
 
-             If the _i_n_s_t_a_l_l script exits with a non-zero status code, the in-
-             stallation is terminated.
+             If the _i_n_s_t_a_l_l script exits with a non-zero status code, the
+             installation is terminated.
 
      <pkg-dbdir>/<package>/+DEINSTALL
              If the package contains an _d_e_i_n_s_t_a_l_l script (see pkg_create(1)),
@@ -125,9 +125,9 @@ FFIILLEESS
              _p_a_c_k_a_g_e  The name of the package instance being deleted.
 
              VVIIEEWW--DDEEIINNSSTTAALLLL
-                      Keyword denoting that the script is to perform any ac-
-                      tions needed before the package instance is deleted from
-                      a view.
+                      Keyword denoting that the script is to perform any
+                      actions needed before the package instance is deleted
+                      from a view.
 
              If the _d_e_i_n_s_t_a_l_l script exits with a non-zero status code, the
              de-installation is terminated.
@@ -139,6 +139,6 @@ SSEEEE AALLSSOO
      linkfarm(1), pkg_delete(1)
 
 AAUUTTHHOORRSS
-     The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@netbsd.org>.
+     The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@NetBSD.org>.
 
 NetBSD 1.6                     September 8, 2003                    NetBSD 1.6