From: Ted Zlatanov <tzz@lifelogs.com>
Date: Fri, 1 Jul 2011 10:12:47 +0000 (-0500)
Subject: * progmodes/cfengine.el: Minor update to docs.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0da3f8bcf500844c46a6b12b0920776714db8624;p=emacs.git

* progmodes/cfengine.el: Minor update to docs.
---

diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index c436d2ff06e..7989c60f80c 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -29,6 +29,12 @@
 ;; Possible customization for auto-mode selection:
 ;; (push '(("^cfagent.conf\\'" . cfengine-mode)) auto-mode-alist)
 ;; (push '(("^cf\\." . cfengine-mode)) auto-mode-alist)
+;; (push '(("\\.cf\\'" . cfengine-mode)) auto-mode-alist)
+
+;; Or, if you want to use the CFEngine 3.x support:
+
+;; (push '(("^cfagent.conf\\'" . cfengine3-mode)) auto-mode-alist)
+;; (push '(("^cf\\." . cfengine3-mode)) auto-mode-alist)
 ;; (push '(("\\.cf\\'" . cfengine3-mode)) auto-mode-alist)
 
 ;; This is not the same as the mode written by Rolf Ebert