Merge pull request #695 from github/detect-prose

Detect prose documents

lib/linguist/language.rb

@@ -25,7 +25,7 @@ module Linguist
     #
     # Returns an array
     def self.detectable_markup
-      ["CSS", "Less", "Sass"]
+      ["AsciiDoc", "CSS", "Creole", "Less", "Markdown", "MediaWiki", "Org", "RDoc", "Sass", "Textile", "reStructuredText"]
     end
 
     # Internal: Create a new Language object

lib/linguist/languages.yml

@@ -22,7 +22,7 @@
 # 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
@@ -91,6 +91,16 @@ Arduino:
   lexer: C++
   primary_extension: .ino
 
+AsciiDoc:
+  type: markup
+  lexer: Text only
+  ace_mode: asciidoc
+  wrap: true
+  primary_extension: .asciidoc
+  extensions:
+  - .adoc
+  - .asc
+
 Assembly:
   type: programming
   lexer: NASM
@@ -297,6 +307,12 @@ Cpp-ObjDump:
   - .c++objdump
   - .cxx-objdump
 
+Creole:
+  type: markup
+  lexer: Text only
+  wrap: true
+  primary_extension: .creole
+
 Cucumber:
   lexer: Gherkin
   primary_extension: .feature
@@ -840,6 +856,12 @@ Max:
   - .maxhelp
   - .maxpat
 
+MediaWiki:
+  type: markup
+  lexer: Text only
+  wrap: true
+  primary_extension: .mediawiki
+
 MiniD: # Legacy
   searchable: false
   primary_extension: .minid # Dummy extension
@@ -969,6 +991,12 @@ OpenEdge ABL:
   - abl
   primary_extension: .p
 
+Org:
+  type: markup
+  lexer: Text only
+  wrap: true
+  primary_extension: .org
+
 PHP:
   type: programming
   ace_mode: php
@@ -1108,6 +1136,13 @@ R:
   filenames:
   - .Rprofile
 
+RDoc:
+  type: markup
+  lexer: Text only
+  ace_mode: rdoc
+  wrap: true
+  primary_extension: .rdoc
+
 RHTML:
   type: markup
   group: HTML