From 2c405b1f9a7ddfaf1eb0854789fda2f3fd3bcfab Mon Sep 17 00:00:00 2001
From: eadler <eadler@FreeBSD.org>
Date: Mon, 20 Apr 2015 20:33:22 +0000
Subject: [PATCH] phabricator related changes: 	- don't lint either contrib or
 crypto: these are both externally written 	  directories 	- add
 additional linters for spelling (check common typos like teh -> 	  the)
 	- chmod linter checks for executible bit on bad files 	-
 merge-conflict checks for merge conflict tokens then may have been 	 
 resolved incorrectly 	- filename checks for back characters in filenames 
 - json for json syntax correctness

	- remove history.immutable: it is meaningless on subversion, and causes
	  workflow problems when trying to use git.  It it set to 'true' by
	  default with hg
---
 .arcconfig |  3 +--
 .arclint   | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.arcconfig b/.arcconfig
index fa78c6db09ae..a759f47d119f 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,5 +1,4 @@
 {
 	"project.name": "S",
-	"phabricator.uri" : "https://reviews.freebsd.org/",
-	"history.immutable" : true
+	"phabricator.uri" : "https://reviews.freebsd.org/"
 }
diff --git a/.arclint b/.arclint
index e1534587c5ad..31bda09b1a83 100644
--- a/.arclint
+++ b/.arclint
@@ -1,9 +1,25 @@
 {
+  "exclude": "(contrib|crypto)",
   "linters": {
     "python": {
       "type": "pep8",
-      "exclude": "(contrib)",
       "include": "(\\.py$)"
+    },
+    "spelling": {
+      "type": "spelling"
+    },
+    "chmod": {
+      "type": "chmod"
+    },
+    "merge-conflict": {
+      "type": "merge-conflict"
+    },
+    "filename": {
+      "type": "filename"
+    },
+    "json": {
+      "type": "json",
+      "include": "(\\.arclint|\\.json$)"
     }
   }
 }