Merged revisions 115509 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r115509 | tilghman | 2008-05-07 08:49:15 -0500 (Wed, 07 May 2008) | 2 lines

Update typos in description fields
(closes issue #12598)
 Reported by: suretec
 Patches: 
       asterisk_schema_changes.patch uploaded by suretec (license 70)

........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115510 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 38 insertions, 26 deletions

diff --git a/contrib/scripts/asterisk.ldap-schema b/contrib/scripts/asterisk.ldap-schema
index c69d51a70..596f3c66f 100644
--- a/contrib/scripts/asterisk.ldap-schema
+++ b/contrib/scripts/asterisk.ldap-schema
@@ -1,5 +1,12 @@
 #
-# Copyright (c) 2007 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+# Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+#
+# Version: 3.1.5
+#
+# Changes:
+# - Fixed wrong DESC - 07/05/2008
+#
+# Author: Gavin Henry - <ghenry@suretecsystems.com>
 #
 # Asterisk LDAP Schema
 #
@@ -224,28 +231,28 @@ attributetype ( AstAccountDisallowedCodec
 
 attributetype ( AstAccountExpirationTimestamp 
         NAME 'AstAccountExpirationTimestamp'
-        DESC 'Asterisk Account Allowed Codec'
+        DESC 'Asterisk Account Expiration Timestamp'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountRegistrationContext 
         NAME 'AstAccountRegistrationContext'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account Registration Context'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountRegistrationExten 
         NAME 'AstAccountRegistrationExten'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account Registration Extension'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountNoTransfer 
         NAME 'AstAccountNoTransfer'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account No Transfer'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -327,28 +334,28 @@ attributetype ( AstAccountPort
       
 attributetype ( AstAccountRestrictCID 
         NAME 'AstAccountRestrictCID'
-        DESC 'Asterisk Restrict CallerID'
+        DESC 'Asterisk Account Restrict CallerID'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
             
 attributetype ( AstAccountRTPTimeout 
         NAME 'AstAccountRTPTimeout'
-        DESC 'Asterisk RTP Timeout'
+        DESC 'Asterisk Account RTP Timeout'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
       
 attributetype ( AstAccountRTPHoldTimeout 
         NAME 'AstAccountRTPHoldTimeout'
-        DESC 'Asterisk RTP Hold Timeout'
+        DESC 'Asterisk Account RTP Hold Timeout'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
       
 attributetype ( AstAccountRealmedPassword 
         NAME 'AstAccountRealmedPassword'
-        DESC 'Asterisk RTP Hold Timeout'
+        DESC 'Asterisk Account Realmed Password'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -362,21 +369,21 @@ attributetype ( AstAccountAllowedCodec
 
 attributetype ( AstAccountMusicOnHold 
         NAME 'AstAccountMusicOnHold'
-        DESC 'Asterisk Account Allowed Codec'
+        DESC 'Asterisk Account Music On Hold'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountCanCallForward 
         NAME 'AstAccountCanCallForward'
-        DESC 'Asterisk Can CAll Forward' 
+        DESC 'Asterisk Account Can Call Forward' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( AstAccountSecret 
         NAME 'AstAccountSecret'
-        DESC 'Asterisk Can CAll Forward' 
+        DESC 'Asterisk Account Secret' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -559,4 +566,3 @@ objectclass ( AsteriskConfig
         AstConfigCommented
     ) 
     )
-
diff --git a/contrib/scripts/asterisk.ldif b/contrib/scripts/asterisk.ldif
index 0bb6a4b9f..f65ec0219 100644
--- a/contrib/scripts/asterisk.ldif
+++ b/contrib/scripts/asterisk.ldif
@@ -1,5 +1,12 @@
 #
-# Copyright (c) 2007 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+# Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
+#
+# Version: 3.1.5
+#
+# Changes:
+# - Fixed wrong DESC - 07/05/2008
+#
+# Author: Gavin Henry - <ghenry@suretecsystems.com>
 #
 # Asterisk LDAP Schema ldif
 #
@@ -228,28 +235,28 @@ olcAttributeTypes: ( AstAccountDisallowedCodec
 #
 olcAttributeTypes: ( AstAccountExpirationTimestamp 
         NAME 'AstAccountExpirationTimestamp'
-        DESC 'Asterisk Account Allowed Codec'
+        DESC 'Asterisk Account Expiration Timestamp'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountRegistrationContext 
         NAME 'AstAccountRegistrationContext'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account Registration Context'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountRegistrationExten 
         NAME 'AstAccountRegistrationExten'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account Registration Extension'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountNoTransfer 
         NAME 'AstAccountNoTransfer'
-        DESC 'Asterisk Account AMA Flags'
+        DESC 'Asterisk Account No Transfer'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -331,28 +338,28 @@ olcAttributeTypes: ( AstAccountPort
 #      
 olcAttributeTypes: ( AstAccountRestrictCID 
         NAME 'AstAccountRestrictCID'
-        DESC 'Asterisk Restrict CallerID'
+        DESC 'Asterisk Account Restrict CallerID'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #            
 olcAttributeTypes: ( AstAccountRTPTimeout 
         NAME 'AstAccountRTPTimeout'
-        DESC 'Asterisk RTP Timeout'
+        DESC 'Asterisk Account RTP Timeout'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #      
 olcAttributeTypes: ( AstAccountRTPHoldTimeout 
         NAME 'AstAccountRTPHoldTimeout'
-        DESC 'Asterisk RTP Hold Timeout'
+        DESC 'Asterisk Account RTP Hold Timeout'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #      
 olcAttributeTypes: ( AstAccountRealmedPassword 
         NAME 'AstAccountRealmedPassword'
-        DESC 'Asterisk RTP Hold Timeout'
+        DESC 'Asterisk Account Realmed Password'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -366,21 +373,21 @@ olcAttributeTypes: ( AstAccountAllowedCodec
 #
 olcAttributeTypes: ( AstAccountMusicOnHold 
         NAME 'AstAccountMusicOnHold'
-        DESC 'Asterisk Account Allowed Codec'
+        DESC 'Asterisk Account Music On Hold'
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountCanCallForward 
         NAME 'AstAccountCanCallForward'
-        DESC 'Asterisk Can CAll Forward' 
+        DESC 'Asterisk Account Can Call Forward' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 #
 olcAttributeTypes: ( AstAccountSecret 
         NAME 'AstAccountSecret'
-        DESC 'Asterisk Can CAll Forward' 
+        DESC 'Asterisk Account Secret' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -564,4 +571,3 @@ olcObjectClasses: ( AsteriskConfig
     ) 
     )
 #
-