From 2c9c96fda37226d9c2d4b93c9d0a24d109ec769f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Wed, 13 Apr 2011 10:42:50 +0300 Subject: Standalone A-entry should not be called 'Alias'. 'Alias' is generally used for CNAME records so that would be confusing. --- tinydns-edit-html.lsp | 4 ++-- tinydns-model.lua | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tinydns-edit-html.lsp b/tinydns-edit-html.lsp index 33169d5..6d83da6 100644 --- a/tinydns-edit-html.lsp +++ b/tinydns-edit-html.lsp @@ -25,7 +25,7 @@ entryTypes[1]=new Entry(".","Name server",6,"Domain","IP address","Name server","Time to live","Timestamp","Location"); entryTypes[2]=new Entry("&","Delegate subdomain",6,"Domain","IP address","Name server","Time to live","Timestamp","Location"); entryTypes[3]=new Entry("=","Host",5,"Host","IP address","Time to live","Timestamp","Location"); - entryTypes[4]=new Entry("+","Alias",5,"Alias","IP address","Time to live","Timestamp","Location"); + entryTypes[4]=new Entry("+","Host",5,"Host","IP address","Time to live","Timestamp","Location"); entryTypes[5]=new Entry("@","Mail exchanger",7,"Domain","IP address","Mail exchanger","Distance","Time to live","Timestamp","Location"); entryTypes[6]=new Entry("'","Text record",5,"Domain","Text Record","Time to live","Timestamp","Location"); entryTypes[7]=new Entry("^","Reverse record",5,"PTR","Domain name","Time to live","Timestamp","Location"); @@ -104,7 +104,7 @@ name = "dontconvertme" else { value = value.replace(/\\\d{3}/g, octal_to_char); - if (entryType.descriptions[i] == "Domain" || entryType.descriptions[i] == "Alias" || entryType.descriptions[i] == "Host" || entryType.descriptions[i] == "Domain Service" ) { + if (entryType.descriptions[i] == "Domain" || entryType.descriptions[i] == "Host" || entryType.descriptions[i] == "Domain Service" ) { name = "fixme"; value = value.replace(/\.?<%= string.gsub(html.html_escape(domain), "[\\%[%]%.%*%?%+%{%^%$]", "\\%1") %>$/i, "") extra = " . <%= html.html_escape(domain) %>" diff --git a/tinydns-model.lua b/tinydns-model.lua index 8c6faaa..a9d27a1 100644 --- a/tinydns-model.lua +++ b/tinydns-model.lua @@ -20,8 +20,8 @@ local descr = { prefix={ ['.']="Name server for your domain (NS + A + SOA)", ['&']="Delegate subdomain (NS + A)", - ['=']="Host (A + PTR)", - ['+']="Alias (A, no PTR)", + ['=']="Host and reverse record (A + PTR)", + ['+']="Host record (A, no PTR)", ['@']="Mail exchanger (MX)", ["'"]="Text record (TXT)", ['^']="Reverse record (PTR)", @@ -35,8 +35,8 @@ local descr = { fieldlabels={ ['.']={"Domain", "IP address", "Name server", "Time to live", "Timestamp", "Location", }, ['&']={"Domain", "IP address", "Name server", "Time to live", "Timestamp", "Location", }, - ['=']={"Host", "IP address", "Time to live", "Timestamp", "Location", }, - ['+']={"Alias", "IP address", "Time to live", "Timestamp", "Location", }, + ['=']={"Host", "IP address", "Time to live", "Timestamp", "Location", }, + ['+']={"Host", "IP address", "Time to live", "Timestamp", "Location", }, ['@']={"Domain", "IP address", "Mail exchanger", "Distance", "Time to live", "Timestamp", "Location", }, ['\'']={"Domain", "Text Record", "Time to live", "Timestamp", "Location", }, ['^']={"PTR", "Domain name", "Time to live", "Timestamp", "Location", }, -- cgit v1.2.3