Merge remote branch 'upstream/master' into lasso

Conflicts:
	lib/linguist/languages.yml

lib/linguist/languages.yml

@@ -2,21 +2,20 @@
 #
 # All languages have an associated lexer for syntax highlighting. It
 # defaults to name.downcase, which covers most cases. Make sure the
-# lexer exists in lexers.yml. This is a list of available lexers in
-# our version of pygments.
+# lexer exists in lexers.yml. This is a list of available in our
+# version of pygments.
 #
 # type              - Either data, programming, markup, or nil
 # lexer             - An explicit lexer String (defaults to name.downcase)
 # aliases           - An Array of additional aliases (implicitly
 #                     includes name.downcase)
 # ace_mode          - A String name of Ace Mode (if available)
-# extension         - An Array of associated extensions. If file samples
-#                     are included in 'samples/<Language Name>/', then
-#                     its extension does not need to be listed.
+# wrap              - Boolean wrap to enable line wrapping (default: false)
+# extension         - An Array of associated extensions
 # primary_extension - A String for the main extension associated with
-#                     the language. Must be unique. Used when a Language
-#                     is picked from a dropdown and we need to
-#                     automatically choose an extension.
+#                     the language. Must be unique. Used when a Language is picked
+#                     from a dropdown and we need to automatically choose an
+#                     extension.
 # searchable        - Boolean flag to enable searching (defaults to true)
 # search_term       - Deprecated: Some languages maybe indexed under a
 #                     different alias. Avoid defining new exceptions.
@@ -742,6 +741,7 @@ Markdown:
   type: markup
   lexer: Text only
   ace_mode: markdown
+  wrap: true
   primary_extension: .md
   extensions:
   - .markdown
@@ -1189,6 +1189,7 @@ Textile:
   type: markup
   lexer: Text only
   ace_mode: textile
+  wrap: true
   primary_extension: .textile
   extensions:
   - .textile
@@ -1333,6 +1334,7 @@ ooc:
 
 reStructuredText:
   type: markup
+  wrap: true
   search_term: rst
   aliases:
   - rst