Various updates for 5.6:

- remove the discussion about aperture driver on i386/amd64; it is
  handled by the installer
- change references to rc.conf to rc.conf.local(8)

7 files changed, 23 insertions, 47 deletions

diff --git a/distrib/notes/README.amd64 b/distrib/notes/README.amd64
index 8e6b4aa17..7657f04b8 100644
--- a/distrib/notes/README.amd64
+++ b/distrib/notes/README.amd64
@@ -6,26 +6,15 @@ Conventions used in this document:
     manual page available in section 1 of the manual pages for further
     reading, viewed by typing "man 1 somename".
 
-1. Make sure your system has support for X enabled:
-
-   You must have "option APERTURE" in your kernel configuration and
-   uncomment the line that says:
-
-	machdep.allowaperture=2
-
-   in /etc/sysctl.conf.  See xf86(4) for more details about security
-   issues related to this.  After changing this variable in sysctl.conf,
-   you will need to reboot for the change to take effect.
-
-2. Start either xdm(1) or startx(1).
+1. Start either xdm(1) or startx(1).
 
    a. Start xdm(1), the X display manager by activating the xdm_flags option
-      in /etc/rc.conf(8) or /etc/rc.conf.local(8).
+      in /etc/rc.conf.local(8).
 
    b. Start startx(1) from a console shell.  It is the X script that starts
       the X server and a few X applications, including a window manager.
 
-3. If needed, Create the configuration file for your server.
+2. If needed, Create the configuration file for your server.
 
    For many users of X.Org's servers, an xorg.conf file is not needed,
    X, will automatically detect and use your hardware.
@@ -38,9 +27,9 @@ Conventions used in this document:
 
    See also Xorg(1), xorg.conf(5).
 
-4. With X.Org XOrgVersion, you can use anti-aliased fonts in many applications.
+3. With X.Org XOrgVersion, you can use anti-aliased fonts in many applications.
    visit http://www.openbsd.org/faq/truetype.html for more information.
 
 problem_blurb
 
-$OpenBSD: README.amd64,v 1.7 2013/12/30 09:16:41 jsg Exp $
+$OpenBSD: README.amd64,v 1.8 2014/07/30 20:06:30 matthieu Exp $
diff --git a/distrib/notes/README.i386 b/distrib/notes/README.i386
index f79d0234e..18fa47a4a 100644
--- a/distrib/notes/README.i386
+++ b/distrib/notes/README.i386
@@ -6,26 +6,15 @@ Conventions used in this document:
     manual page available in section 1 of the manual pages for further
     reading, viewed by typing "man 1 somename".
 
-1. Make sure your system has support for X enabled:
-
-   You must have "option APERTURE" in your kernel configuration and
-   uncomment the line that says:
-
-	machdep.allowaperture=2
-
-   in /etc/sysctl.conf.  See xf86(4) for more details about security
-   issues related to this.  After changing this variable in sysctl.conf,
-   you will need to reboot for the change to take effect.
-
-2. Start either xdm(1) or startx(1).
+1. Start either xdm(1) or startx(1).
 
    a. Start xdm(1), the X display manager by activating the xdm_flags option
-      in /etc/rc.conf(8) or /etc/rc.conf.local(8).
+      in /etc/rc.conf.local(8).
 
    b. Start startx(1) from a console shell.  It is the X script that starts
       the X server and a few X applications, including a window manager.
 
-3. If needed, Create the configuration file for your server.
+2. If needed, Create the configuration file for your server.
 
    For many users of X.Org's servers, an xorg.conf file is not needed,
    X, will automatically detect and use your hardware.
@@ -38,9 +27,9 @@ Conventions used in this document:
 
    See also Xorg(1), xorg.conf(5).
 
-4. With X.Org XOrgVersion, you can use anti-aliased fonts in many applications.
+3. With X.Org XOrgVersion, you can use anti-aliased fonts in many applications.
    visit http://www.openbsd.org/faq/truetype.html for more information.
 
 problem_blurb
 
-$OpenBSD: README.i386,v 1.7 2013/12/30 09:16:41 jsg Exp $
+$OpenBSD: README.i386,v 1.8 2014/07/30 20:06:30 matthieu Exp $
diff --git a/distrib/notes/README.loongson b/distrib/notes/README.loongson
index 9d69a797c..373dac8d9 100644
--- a/distrib/notes/README.loongson
+++ b/distrib/notes/README.loongson
@@ -11,10 +11,10 @@ No xorg.conf is needed in this configuration, unless you want to
 change default options.
 
 To start xdm, the X display manager, activate the xdm_flags option in
-/etc/rc.conf. You will need to disable the console getty in /etc/ttys.
+/etc/rc.conf.local(8). You will need to disable the console getty in /etc/ttys.
 
 Alternatively, you can log in at the console and run `startx'.
 
 problem_blurb
 
-$OpenBSD: README.loongson,v 1.3 2010/08/05 06:34:19 matthieu Exp $
+$OpenBSD: README.loongson,v 1.4 2014/07/30 20:06:30 matthieu Exp $
diff --git a/distrib/notes/README.luna88k b/distrib/notes/README.luna88k
index 336ec28f0..55de645e5 100644
--- a/distrib/notes/README.luna88k
+++ b/distrib/notes/README.luna88k
@@ -10,10 +10,10 @@ No xorg.conf is needed in this configuration, unless you want to
 change default options.
 
 To start xdm, the X display manager, activate the xdm_flags option in
-/etc/rc.conf. You will need to disable the console getty in /etc/ttys.
+/etc/rc.conf.local(8). You will need to disable the console getty in /etc/ttys.
 
 Alternatively, you can log in on console and use `startx'.
 
 problem_blurb
 
-$OpenBSD: README.luna88k,v 1.2 2013/07/16 20:43:50 aoyama Exp $
+$OpenBSD: README.luna88k,v 1.3 2014/07/30 20:06:30 matthieu Exp $
diff --git a/distrib/notes/README.sgi b/distrib/notes/README.sgi
index 5bd38c663..64b9f383d 100644
--- a/distrib/notes/README.sgi
+++ b/distrib/notes/README.sgi
@@ -11,10 +11,10 @@ No xorg.conf is needed in this configuration, unless you want to
 change default options.
 
 To start xdm, the X display manager, activate the xdm_flags option in
-/etc/rc.conf. You will need to disable the console getty in /etc/ttys.
+/etc/rc.conf.local(8). You will need to disable the console getty in /etc/ttys.
 
 Alternatively, you can log in at the console and run `startx'.
 
 problem_blurb
 
-$OpenBSD: README.sgi,v 1.5 2010/08/05 06:34:19 matthieu Exp $
+$OpenBSD: README.sgi,v 1.6 2014/07/30 20:06:30 matthieu Exp $
diff --git a/distrib/notes/README.sparc b/distrib/notes/README.sparc
index ee50daf95..06d208dbd 100644
--- a/distrib/notes/README.sparc
+++ b/distrib/notes/README.sparc
@@ -37,9 +37,10 @@ Post-installation instructions for X.Org on OpenBSD/sparc
 
 2. Start either xdm(1) or startx(1).
 
-   a. Start xdm(1), the X display manager by activating the xdm_flags option
-      in /etc/rc.conf(8) or /etc/rc.conf.local(8).  It is necessary to disable
-      /dev/console in /etc/ttys, change the 'status' of /dev/console to 'off'.
+   a. Start xdm(1), the X display manager by activating the xdm_flags
+      option in /etc/rc.conf.local(8).  It is necessary to disable
+      /dev/console in /etc/ttys, change the 'status' of /dev/console
+      to 'off'.
 
    b. Start startx(1) from a console shell.  It is the X script that starts
       the X server and a few X applications, including a window manager.
@@ -47,4 +48,4 @@ Post-installation instructions for X.Org on OpenBSD/sparc
 
 problem_blurb
 
-$OpenBSD: README.sparc,v 1.3 2009/05/20 18:26:35 miod Exp $
+$OpenBSD: README.sparc,v 1.4 2014/07/30 20:06:30 matthieu Exp $
diff --git a/distrib/notes/README.sparc64 b/distrib/notes/README.sparc64
index d66ae825a..581bcfc73 100644
--- a/distrib/notes/README.sparc64
+++ b/distrib/notes/README.sparc64
@@ -58,9 +58,6 @@ your monitor.
 For UPA Creator framebuffers, the device will be automatically detected
 and you don't need to have an xorg.conf file.
 
-To use xdm from rc.conf, it is necessary to disable /dev/console in
-/etc/ttys, change the 'status' of /dev/console to 'off'.
-
 Dual, unaccelerated display
 ---------------------------
 Dual-headed displays are only supported on machines with SBus framebuffers.
@@ -93,9 +90,9 @@ displays and their location relative to the first, as in:
 
 See xorg.conf(5) for more options.
 
-To use xdm from rc.conf, it is necessary to disable /dev/console in
+To use xdm from rc.conf.local(8), it is necessary to disable /dev/console in
 /etc/ttys, change the 'status' of /dev/console to 'off'.
 
 problem_blurb
 
-$OpenBSD: README.sparc64,v 1.10 2011/02/21 18:13:18 miod Exp $
+$OpenBSD: README.sparc64,v 1.11 2014/07/30 20:06:30 matthieu Exp $