Merge branch 'master' of https://github.com/mcandre/linguist into mcandre-master

.gitmodules

@@ -668,3 +668,6 @@
 [submodule "vendor/grammars/vue-syntax-highlight"]
 	path = vendor/grammars/vue-syntax-highlight
 	url = https://github.com/vuejs/vue-syntax-highlight
+[submodule "vendor/grammars/st2-zonefile"]
+	path = vendor/grammars/st2-zonefile
+	url = https://github.com/sixty4k/st2-zonefile

grammars.yml

@@ -26,6 +26,9 @@ vendor/grammars/Alloy.tmbundle:
 - source.alloy
 vendor/grammars/AutoHotkey/:
 - source.ahk
+vendor/grammars/st2-zonefile:
+- source.untitled
+- text.zone
 vendor/grammars/BrightScript.tmbundle/:
 - source.brightauthorproject
 - source.brightscript

lib/linguist/languages.yml

@@ -790,6 +790,13 @@ Diff:
   tm_scope: source.diff
   ace_mode: diff
 
+DNS zone:
+  type: data
+  extensions:
+  - .zone
+  tm_scope: text.zone
+  ace_mode: text
+
 Dockerfile:
   type: data
   tm_scope: source.dockerfile

samples/zone/sneaky.net.zone

@@ -0,0 +1,12 @@
+$TTL 3d
+@ IN SOA root.localhost. root.sneaky.net. (
+    2015042907 ; serial
+    3d         ; refresh
+    1h         ; retry
+    12d        ; expire
+    2h         ; negative response TTL
+  )
+  IN NS root.localhost.
+  IN NS localhost. ; secondary name server is preferably externally maintained
+
+www IN A 3.141.59.26