From 883b0119da15660e324b3cb1976126cc7c8d2fd1 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sun, 28 Oct 2012 22:56:38 +0000
Subject: [PATCH] OK, enough is enough.  So many people persist in the practice
 of editing this file, even years after the rc.conf / rc.conf.local split
 happened. One way to improve upon this is to put a big fat comment at the top
 of the file.  (Other ways to improve this is by renaming files, but that will
 just create more confusion). ok aja robert

---
 src/etc/rc.conf | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 8a0a3fd1..713a1b09 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,16 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.171 2012/09/20 12:51:43 yasuoka Exp $
+#	$OpenBSD: rc.conf,v 1.172 2012/10/28 22:56:38 deraadt Exp $
+
+# DO NOT EDIT THIS FILE!!
+#
+# This file defines the default service selection as shipped in a
+# release.  Upgrades of your system will modify this file.
+#
+# To select the service options you desire, please override these
+# options in the file /etc/rc.conf.local
+#
+# DO NOT EDIT THIS FILE!!
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""