From 9e65eb35e7d0768d78119f2271ae32627e2be81c Mon Sep 17 00:00:00 2001
From: Garen Torikian <gjtorikian@gmail.com>
Date: Tue, 24 Sep 2013 21:36:23 -0700
Subject: [PATCH] :lipstick:

---
 lib/linguist/language.rb   |  2 +-
 lib/linguist/languages.yml | 52 +++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index f31d3fd6..453a5d21 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -25,7 +25,7 @@ module Linguist
     #
     # Returns an array
     def self.detectable_markup
-      ["AsciiDoc", "CSS", "Creole", "Less", "Markdown", "Mediawiki", "Org", "RDoc", "Sass", "Textile", "reStructuredText"]
+      ["AsciiDoc", "CSS", "Creole", "Less", "Markdown", "MediaWiki", "Org", "RDoc", "Sass", "Textile", "reStructuredText"]
     end
 
     # Internal: Create a new Language object
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 1076efca..72255d25 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -22,13 +22,30 @@
 # Any additions or modifications (even trivial) should have corresponding
 # test change in `test/test_blob.rb`.
 #
-# Please keep this list alphabetized.
+# Please keep this list alphabetized. Capitalization comes before lower case.
 
 ABAP:
   type: programming
   lexer: ABAP
   primary_extension: .abap
 
+ASP:
+  type: programming
+  color: "#6a40fd"
+  lexer: aspx-vb
+  search_term: aspx-vb
+  aliases:
+  - aspx
+  - aspx-vb
+  primary_extension: .asp
+  extensions:
+  - .asax
+  - .ascx
+  - .ashx
+  - .asmx
+  - .aspx
+  - .axd
+
 ActionScript:
   type: programming
   lexer: ActionScript 3
@@ -84,23 +101,6 @@ AsciiDoc:
   - .adoc
   - .asc
 
-ASP:
-  type: programming
-  color: "#6a40fd"
-  lexer: aspx-vb
-  search_term: aspx-vb
-  aliases:
-  - aspx
-  - aspx-vb
-  primary_extension: .asp
-  extensions:
-  - .asax
-  - .ascx
-  - .ashx
-  - .asmx
-  - .aspx
-  - .axd
-
 Assembly:
   type: programming
   lexer: NASM
@@ -851,7 +851,7 @@ Max:
   - .maxhelp
   - .maxpat
 
-Mediawiki:
+MediaWiki:
   type: markup
   lexer: Text only
   wrap: true
@@ -1129,6 +1129,13 @@ R:
   lexer: S
   primary_extension: .r
 
+RDoc:
+  type: markup
+  lexer: Text only
+  ace_mode: rdoc
+  wrap: true
+  primary_extension: .rdoc
+
 RHTML:
   type: markup
   group: HTML
@@ -1167,13 +1174,6 @@ Rebol:
 Redcode:
   primary_extension: .cw
 
-RDoc:
-  type: markup
-  lexer: Text only
-  ace_mode: rdoc
-  wrap: true
-  primary_extension: .rdoc
-
 Rouge:
   type: programming
   lexer: Clojure