change URLs to point to the more recent porter's handbook;

mention the use of packages first.

ok sthen@

diff --git a/distrib/notes/packages b/distrib/notes/packages
index a882694..3f72af3 100644 (file)
--- a/distrib/notes/packages
+++ b/distrib/notes/packages
@@ -1,18 +1,18 @@
-dnl    $OpenBSD: packages,v 1.44 2010/07/10 19:40:06 miod Exp $
+dnl    $OpenBSD: packages,v 1.45 2010/07/29 17:38:13 steven Exp $
 As complete as your OpenBSD system is, you may want to add any of several
 excellent third party software applications.  There are several ways to do
 this.  You can:
 
-1) Obtain the source code and build the application based
-   upon whatever installation procedures are provided with the
-   application.
+1) Use the OpenBSD ``package'' collection to grab a pre-compiled
+   and tested version of the application for your hardware.
 
 2) Use the OpenBSD ``ports'' collection to automatically get any
    needed source file, apply any required patches, create the
    application, and install it for you.
 
-3) Use the OpenBSD ``package'' collection to grab a pre-compiled
-   and tested version of the application for your hardware.
+3) Obtain the source code and build the application based
+   upon whatever installation procedures are provided with the
+   application.
 
 If you purchased the OpenBSD CD-ROM set you already have several popular
 ``packages'', and the ``ports'' collection.
@@ -100,8 +100,8 @@ Installing applications from the CD-ROM ports collection:
 
 Installing applications from the OpenBSD ports collection:
 
-       See http://www.OpenBSD.org/ports.html for current instructions
-       on obtaining and installing OpenBSD ports.
+       See http://www.OpenBSD.org/faq/ports/ports.html for current
+       instructions on obtaining and installing OpenBSD ports.
 
        You should also refer to the ports(7) manual page.
 
@@ -115,5 +115,6 @@ Installing other applications:
 
        If you can't find an existing port, try to make your own and
        feed it back to OpenBSD.  That's how our ports collection grows.
-       Some details can be found at http://www.OpenBSD.org/porting.html
+       Some details can be found in the OpenBSD Porter's Handbook at
+       http://www.openbsd.org/faq/ports/
        with more help coming from the mailing list, <ports@OpenBSD.org>.

diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 99c2b61..430f1f9 100644 (file)
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -23,10 +23,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ports.7,v 1.81 2010/06/20 07:59:53 espie Exp $
+.\" $OpenBSD: ports.7,v 1.82 2010/07/29 17:38:13 steven Exp $
 .\" $FreeBSD: ports.7,v 1.7 1998/06/23 04:38:50 hoek Exp $
 .\"
-.Dd $Mdocdate: June 20 2010 $
+.Dd $Mdocdate: July 29 2010 $
 .Dt PORTS 7
 .Os
 .Sh NAME
@@ -62,17 +62,13 @@ to install the application.
 For more information about using ports, see
 The
 .Ox
-Ports Mechanism
-.Pq Pa http://www.openbsd.org/ports.html
-and the
-.Ox
-FAQ
-.Pq Pa http://www.openbsd.org/faq/ .
+Ports System
+.Pq Pa http://www.openbsd.org/faq/ports/ports.html .
 For information about creating new ports, see
 the
 .Ox
-Porting Checklist
-.Pa http://www.openbsd.org/checklist.html .
+Porter's Handbook
+.Pa http://www.openbsd.org/faq/ports/ .
 .Pp
 For a detailed description of the build process, see
 .Xr bsd.port.mk 5 .
@@ -705,13 +701,13 @@ List of users and groups created by ports.
 .Pp
 The
 .Ox
-Ports Mechanism:
-.Pa http://www.openbsd.org/ports.html
+Ports System:
+.Pa http://www.openbsd.org/faq/ports/ports.html
 .Pp
 The
 .Ox
-Porting Checklist:
-.Pa http://www.openbsd.org/checklist.html
+Porter's Handbook:
+.Pa http://www.openbsd.org/faq/ports/
 .Sh HISTORY
 .Nm The Ports Collection
 appeared in