Tweak the installation notes regarding references to FTP.

'Sure' deraadt@

6 files changed, 34 insertions, 40 deletions

diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index a54bdc2c46c..b5fbaa7256a 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: INSTALL,v 1.49 2014/08/06 02:34:23 doug Exp $
+dnl	$OpenBSD: INSTALL,v 1.50 2016/01/01 15:58:28 rpe Exp $
 include(INCLUDE/../m4.common)dnl
 includeit(features)dnl
 INSTALLATION NOTES for OpenBSD/MACHINE OSREV
@@ -40,7 +40,7 @@ Because OpenBSD is from Canada, the export of Cryptography pieces
 
 (NOTE: OpenBSD can not be re-exported from the US once it has entered
 the US.  Because of this, take care NOT to get the distribution from
-an FTP server in the US if you are outside of Canada and the US.)
+a mirror server in the US if you are outside of Canada and the US.)
 
 A comprehensive list of the improvements brought by the OSREV release
 is available on the web at http://www.OpenBSD.org/OSrev.html.
@@ -124,7 +124,7 @@ access to source code so that you can recompile pieces of the system.
 
 A few methods are provided.  If you have an OpenBSD CD-ROM, the source
 code is provided.  Otherwise, you can get the pieces over the Internet
-using anonymous CVS, CVSync or FTP.  For more information, see
+using anonymous CVS, CVSync, FTP or HTTP.  For more information, see
 
 	http://www.OpenBSD.org/anoncvs.html
 	http://www.OpenBSD.org/cvsync.html
diff --git a/distrib/notes/landisk/xfer b/distrib/notes/landisk/xfer
index 5a6858f4531..6e871d6ff44 100644
--- a/distrib/notes/landisk/xfer
+++ b/distrib/notes/landisk/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.6 2015/06/10 06:38:39 jasper Exp $
+dnl	$OpenBSD: xfer,v 1.7 2016/01/01 15:58:28 rpe Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -8,8 +8,8 @@ Installation is supported from several media types, including:
 	HTTP
 
 Although you can access the distribution sets directly from the CD-ROM or
-from one of the FTP mirrors over the internet, you may wish to transfer
-the sets to a local FTP server, or copy them to a partition on the target
+from one of the OpenBSD mirrors over the internet, you may wish to transfer
+the sets to a local HTTP server, or copy them to a partition on the target
 system's disk (for upgrades only).
 
 OpenBSDXferShortPrelude
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index a7038a5873b..1b86c3693a0 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.115 2015/08/24 10:41:11 ajacoutot Exp $
+dnl	$OpenBSD: m4.common,v 1.116 2016/01/01 15:58:28 rpe Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -327,9 +327,9 @@ dnl install.sub (install) hostname
 dnl install.sub (install) donetconfig
 	You will now be given an opportunity to configure the network.
 	The network configuration you enter (if any) can then be used to
-	do the install from another system using HTTP or FTP, and will
-	also be the configuration used by the system after the installation
-	is complete.
+	do the install from another system using HTTP, and will also be
+	the configuration used by the system after the installation is
+	complete.
 
 dnl XXX add a MDVLAN feature and document vlan setup
 	The install program will give you a list of network interfaces you
@@ -544,21 +544,21 @@ define({:-OpenBSDInstallPart6-:},
 	After these preparatory steps have been completed, you will be
         able to extract the distribution sets onto your system.  There
         are several install methods supported:
-	FTP, HTTP, $1or a local disk partition.-:})dnl
+	HTTP, $1or a local disk partition.-:})dnl
 dnl
 dnl Notes for various installation methods.
 dnl
 define({:-OpenBSDURLInstall-:},
-{:-	To install via FTP or HTTP:
-		To begin an FTP or HTTP install you will need the following
+{:-	To install via HTTP:
+		To begin an HTTP install you will need the following
 		pieces of information:
-		1) Proxy server URL if you are using a URL-based FTP or
-		   HTTP proxy (squid, CERN FTP, Apache 1.2 or higher).
+		1) Proxy server URL if you are using a URL-based HTTP
+		   proxy (squid, CERN FTP, Apache 1.2 or higher).
 		   You need to {:-define-:} a proxy if you are behind a
-		   firewall that blocks outgoing FTP or HTTP connections
+		   firewall that blocks outgoing HTTP connections
 		   (assuming you have a proxy available to use).
 		2) The IP address (or hostname if you configured
-		   DNS servers earlier in the install) of an FTP or HTTP
+		   DNS servers earlier in the install) of an HTTP
 		   server carrying the OpenBSD OSREV distribution.
 		   The installation program will try to fetch a list
 		   of such servers; depending on your network settings,
@@ -567,12 +567,6 @@ define({:-OpenBSDURLInstall-:},
 		   the list (the first entries are expected to be the
 		   closest mirrors to your location).
 		3) The directory holding the distribution sets.
-		   The default value of pub/OpenBSD/OSREV/MACHINE
-		   is almost always correct on FTP servers; for HTTP
-		   servers there is no standard location for this.
-		4) For FTP installs only, the login and password for the
-		   FTP account.  You will only be asked for a password for
-		   non-anonymous FTP.
 
 		Then refer to the section named "installation set selection"
 		below.-:})dnl
@@ -686,8 +680,8 @@ define({:-OpenBSDInstallWrapup-:},
 	Also, if the installation program complains that the distribution
 	sets you have been using do not match their recorded checksums, you
 	might want to check your installation source (although this can
-	happen between releases, if a snapshot is being updated on an FTP
-	or HTTP server with newer files while you are installing).
+	happen between releases, if a snapshot is being updated on a mirror
+	server with newer files while you are installing).
 
 ifelse(MDTZ,,dnl
 {:-	The last thing you'll need to configure is the time zone your system
@@ -860,7 +854,7 @@ define({:-OpenBSDXferShortPrelude-:},
 depend on which method of installation you choose.  Some methods
 require a bit of setup first that is explained below.
 
-The installation allows installing OpenBSD directly from FTP mirror
+The installation allows installing OpenBSD directly from HTTP mirror
 sites over the internet, however you must consider the speed and
 reliability of your internet connection for this option.  It may save
 much time and frustration to use ftp get/reget to transfer the
@@ -879,7 +873,7 @@ define({:-OpenBSDXferCDROM-:},
 {:-Creating a bootable CD-ROM:
 
 	First you need to get access to the OpenBSD bootable CD-ROM (ISO)
-	images. They can be found on one of the FTP or HTTP mirrors. Two
+	images. They can be found on one of the OpenBSD mirror servers. Two
 	files are available, install{:--:}OSrev.iso which contains all of
 	the sets needed for installation, and a smaller cd{:--:}OSrev.iso
 	which contains just the installer, for a network install.
@@ -900,8 +894,8 @@ define({:-OpenBSDXferFloppyFromDOS-:},
 	images.  If you can access the distribution from the CD-ROM under
 	DOS, you will find the bootable disks in the OSREV/MACHINE
 	directory.  Otherwise, you will have to download them from one of
-	the OpenBSD FTP or HTTP mirror sites, using an FTP client or a web
-	browser.  In either case, take care to do "binary" transfers, since
+	the OpenBSD mirror sites, using an FTP client or a web browser.
+	In either case, take care to do "binary" transfers, since
 	these are images files and any DOS cr/lf translations or Control-z
 	EOF interpretations will result in corrupted transfers.
 
diff --git a/distrib/notes/packages b/distrib/notes/packages
index fc8cd10ba13..76fbb0f48f7 100644
--- a/distrib/notes/packages
+++ b/distrib/notes/packages
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: packages,v 1.46 2013/07/26 20:07:29 miod Exp $
+dnl	$OpenBSD: packages,v 1.47 2016/01/01 15:58:28 rpe 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:
@@ -56,23 +56,23 @@ Installing applications from the ftp.OpenBSD.org package collection:
 	All available packages for your architecture have been placed on
 	ftp.OpenBSD.org in the directory pub/OpenBSD/OSREV/packages/MACHINE_ARCH/
 	You may want to peruse this to see what packages are available.  The
-	packages are also on the OpenBSD FTP mirror sites.  See
+	packages are also on the OpenBSD mirror sites.  See
 
 		http://www.OpenBSD.org/ftp.html
 
-	for a list of current FTP mirror sites.
+	for a list of current mirror sites.
 
 	Installation of a package is very easy.
 	1) become the superuser (root)
 	2) use the ``pkg_add'' command to install the software
 
 	``pkg_add'' is smart enough to know how to download the software
-	from the OpenBSD FTP server.  Example:
+	from the OpenBSD HTTP server.  Example:
 
     $ su
     Password: <enter your root password>
     # pkg_add \
-      ftp://ftp.OpenBSD.org/pub/OpenBSD/{:--:}OSREV/packages/MACHINE_ARCH/emacs-21.4p23.tgz
+      http://ftp.OpenBSD.org/pub/OpenBSD/{:--:}OSREV/packages/MACHINE_ARCH/emacs-21.4p23.tgz
 
 Installing applications from the CD-ROM ports collection:
 
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index d02177b2bc6..994b45004ba 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.48 2015/06/10 06:38:40 jasper Exp $
+dnl	$OpenBSD: xfer,v 1.49 2016/01/01 15:58:28 rpe Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -21,8 +21,8 @@ In addition to the bootable image, you also need to consider how to
 access the binary distribution sets to actually install the system.
 
 Although you can access the distribution sets directly from the CD-ROM or
-from one of the FTP mirrors over the internet, you may wish to transfer
-the sets to a local FTP server, or copy them to a partition on the target
+from one of the OpenBSD mirrors over the internet, you may wish to transfer
+the sets to a local HTTP server, or copy them to a partition on the target
 system's disk.
 
 OpenBSDXferCDROM
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index c6ebb43009b..b8008745f90 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.31 2015/06/10 06:38:40 jasper Exp $
+dnl	$OpenBSD: xfer,v 1.32 2016/01/01 15:58:28 rpe Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM (NOT supported if booting from floppy)
@@ -16,8 +16,8 @@ In addition to the bootable image, you also need to consider how to
 access the binary distribution sets to actually install the system.
 
 Although you can access the distribution sets directly from the CD-ROM or
-from one of the FTP mirrors over the internet, you may wish to transfer
-the sets to a local FTP server, or copy them to a partition on the target
+from one of the OpenBSD mirrors over the internet, you may wish to transfer
+the sets to a local HTTP server, or copy them to a partition on the target
 system's disk.
 
 OpenBSDXferCDROM