From 51e456f1a19d57d2a81c56d7621828035508930f Mon Sep 17 00:00:00 2001
From: russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 30 Aug 2007 15:34:18 +0000
Subject: [PATCH] Merged revisions 81379 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81379 | russell | 2007-08-30 10:33:48 -0500 (Thu, 30 Aug 2007) | 3 lines

Fix a typo, update a reload command, and remove an unused configuration file.
(closes issue #10606, casper)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81380 f38db490-d61c-443f-a65b-d21fe96a405b
---
 configs/enum.conf.sample      |  2 +-
 configs/extensions.ael.sample |  4 +-
 configs/modem.conf.sample     | 92 -----------------------------------
 3 files changed, 3 insertions(+), 95 deletions(-)
 delete mode 100644 configs/modem.conf.sample

diff --git a/configs/enum.conf.sample b/configs/enum.conf.sample
index b7e02bfe5..39c723175 100644
--- a/configs/enum.conf.sample
+++ b/configs/enum.conf.sample
@@ -2,7 +2,7 @@
 ; ENUM Configuration for resolving phone numbers over DNS
 ;
 ; Sample config for Asterisk
-; This file is reloaded at "reload enum" in the CLI
+; This file is reloaded at "module reload enum" in the CLI
 ;
 [general]
 ;
diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample
index 0c09bbc62..59bd4bd34 100644
--- a/configs/extensions.ael.sample
+++ b/configs/extensions.ael.sample
@@ -3,11 +3,11 @@
 //
 //
 // Static extension configuration file, used by
-// the pbx_config module. This is where you configure all your 
+// the pbx_ael module. This is where you configure all your 
 // inbound and outbound calls in Asterisk. 
 // 
 // This configuration file is reloaded 
-// - With the "extensions reload" command in the CLI
+// - With the "ael reload" command in the CLI
 // - With the "reload" command (that reloads everything) in the CLI
 
 // The "Globals" category contains global variables that can be referenced
diff --git a/configs/modem.conf.sample b/configs/modem.conf.sample
deleted file mode 100644
index 4bcd58abb..000000000
--- a/configs/modem.conf.sample
+++ /dev/null
@@ -1,92 +0,0 @@
-;
-; isdn4linux
-;
-; Configuration file
-;
-[interfaces]
-;
-; By default, incoming calls should come in on the "remote" context
-;
-context=remote
-;
-; Modem Drivers to load
-;
-driver=aopen	; modem by AOpen
-;driver=i4l	; isdn4linux - an alternative to i4l is to use chan_capi
-;
-; Default language
-;
-;language=en
-;
-; We can optionally override the auto detection.  This is necessary
-; particularly if asterisk does not know about our kind of modem.
-;
-;type=autodetect
-;type=aopen
-;
-; We can strip a given number of digits on outgoing dialing, so, for example
-; you can have it dial "8871042" when given "98871042".
-;
-stripmsd=0
-;
-; Type of dialing
-;
-dialtype=tone
-;dialtype=pulse
-;
-; Mode selection.  "Immediate" means that as soon as you dial, you're connected
-; and the line is considered up.  "Ring" means we wait until the ring cadence
-; occurs at least once.  "Answer" means we wait until the other end picks up. 
-;
-;mode=answer
-;mode=ring
-mode=immediate
-;
-; List all devices we can use.
-;
-;device => /dev/ttyS3
-;
-; ISDN example (using i4l)
-;
-;msn=39907835
-;device => /dev/ttyI0
-
-;===============
-; More complex ISDN example
-;
-; A single device which listens to 3 MSNs
-; the wildcard '*' can be used when all MSN's should be accepted.
-; (The incoming number can be used to go directly into the extension
-; with the matching number. I.e. if MSN 33 is called, (context,33)
-; will tried first, than (context,s) and finally (default,s).
-;
-;msn=50780020
-;incomingmsn=50780020,50780021,50780022
-;device => /dev/ttyI2
-;
-; If set, only these numbers are allowed to be set as A number
-; when making an outbound call. callerid is used to set A
-; number.
-;outgoingmsn=50780023,50780024
-;
-
-; Set DTMF-detection/generation mode to:
-;  asterisk: Let Asterisk do inband detection (default)
-;  i4l:      Use the inband detection made by ISDN4Linux
-;  none:     Don't detect inband DTMF
-;  both:     Transmit using both in-band and out of band (generation only)
-;
-; You may specify either one mode, or the detection/generation mode
-; individually separated by a '/'.
-;
-;dtmfmode=asterisk			; Detect using Asterisk
-;dtmfmode=asterisk/both		; Detect using Asterisk, generate w/ both
-; two other devices, which are in group '1' and are used when an
-; outgoing dial used: exten => s,1,Dial,Modem/g1:1234|60|r
-; (we do not need more outgoing devices, since ISDN2 has only 2 channels.)
-; Lines can be in more than one group (0-63); comma separated list.
-;
-group=1		; group=1,2,3,9-12
-;msn=50780023
-;device => /dev/ttyI3
-;device => /dev/ttyI4