From 86e835de6451e83aef81f8ab79d57db87f60340c Mon Sep 17 00:00:00 2001
From: Daniel Kaplun <dan@beardtree.com>
Date: Thu, 19 Dec 2013 23:48:22 -0600
Subject: [PATCH 1/5] Sort and remove duplicates from import.nanorc

---
 import.nanorc | 156 +++++++++++++++++++-------------------------------
 1 file changed, 58 insertions(+), 98 deletions(-)

diff --git a/import.nanorc b/import.nanorc
index 70f14a1..4cc77c7 100644
--- a/import.nanorc
+++ b/import.nanorc
@@ -1,108 +1,68 @@
-include ~/.nano/yaml.nanorc
-include ~/.nano/dot.nanorc
-include ~/.nano/fish.nanorc
-include ~/.nano/keymap.nanorc
-include ~/.nano/lua.nanorc
-include ~/.nano/php.nanorc
-include ~/.nano/glsl.nanorc
-include ~/.nano/csharp.nanorc
-include ~/.nano/kickstart.nanorc
-include ~/.nano/email.nanorc
-include ~/.nano/coffeescript.nanorc
-include ~/.nano/json.nanorc
-include ~/.nano/privoxy.nanorc
-include ~/.nano/ini.nanorc
-include ~/.nano/patch.nanorc
-include ~/.nano/systemd.nanorc
-include ~/.nano/nginx.nanorc
-include ~/.nano/ledger.nanorc
+include ~/.nano/apacheconf.nanorc
+include ~/.nano/asm.nanorc
 include ~/.nano/awk.nanorc
-include ~/.nano/sh.nanorc
-include ~/.nano/ruby.nanorc
-include ~/.nano/lisp.nanorc
-include ~/.nano/cmake.nanorc
-include ~/.nano/git.nanorc
-include ~/.nano/html.nanorc
-include ~/.nano/colortest.nanorc
-include ~/.nano/xresources.nanorc
-include ~/.nano/tex.nanorc
-include ~/.nano/css.nanorc
-include ~/.nano/go.nanorc
-include ~/.nano/nanorc.nanorc
-include ~/.nano/sql.nanorc
-include ~/.nano/pkg-config.nanorc
-include ~/.nano/man.nanorc
-include ~/.nano/vala.nanorc
-include ~/.nano/java.nanorc
-include ~/.nano/yum.nanorc
-include ~/.nano/inputrc.nanorc
-include ~/.nano/pkgbuild.nanorc
-include ~/.nano/xml.nanorc
-include ~/.nano/sed.nanorc
 include ~/.nano/c.nanorc
-include ~/.nano/javascript.nanorc
+include ~/.nano/cmake.nanorc
+include ~/.nano/coffeescript.nanorc
+include ~/.nano/colortest.nanorc
+include ~/.nano/conf.nanorc
+include ~/.nano/csharp.nanorc
+include ~/.nano/css.nanorc
 include ~/.nano/cython.nanorc
+include ~/.nano/dot.nanorc
+include ~/.nano/email.nanorc
+include ~/.nano/fish.nanorc
+include ~/.nano/fortran.nanorc
+include ~/.nano/gentoo.nanorc
+include ~/.nano/git.nanorc
+include ~/.nano/gitcommit.nanorc
+include ~/.nano/glsl.nanorc
+include ~/.nano/go.nanorc
+include ~/.nano/groff.nanorc
+include ~/.nano/haml.nanorc
+include ~/.nano/html.nanorc
+include ~/.nano/import.nanorc
+include ~/.nano/ini.nanorc
+include ~/.nano/inputrc.nanorc
+include ~/.nano/java.nanorc
+include ~/.nano/javascript.nanorc
+include ~/.nano/js.nanorc
+include ~/.nano/json.nanorc
+include ~/.nano/keymap.nanorc
+include ~/.nano/kickstart.nanorc
+include ~/.nano/ledger.nanorc
+include ~/.nano/lisp.nanorc
+include ~/.nano/lua.nanorc
+include ~/.nano/main.nanorc
+include ~/.nano/makefile.nanorc
+include ~/.nano/man.nanorc
 include ~/.nano/markdown.nanorc
 include ~/.nano/mpdconf.nanorc
-include ~/.nano/peg.nanorc
-include ~/.nano/main.nanorc
-include ~/.nano/po.nanorc
-include ~/.nano/python.nanorc
-include ~/.nano/makefile.nanorc
-include ~/.nano/vi.nanorc
-include ~/.nano/rpmspec.nanorc
-include ~/.nano/yaml.nanorc
-include ~/.nano/dot.nanorc
-include ~/.nano/fish.nanorc
-include ~/.nano/keymap.nanorc
-include ~/.nano/lua.nanorc
-include ~/.nano/php.nanorc
-include ~/.nano/glsl.nanorc
-include ~/.nano/csharp.nanorc
-include ~/.nano/kickstart.nanorc
-include ~/.nano/email.nanorc
-include ~/.nano/coffeescript.nanorc
-include ~/.nano/json.nanorc
-include ~/.nano/privoxy.nanorc
-include ~/.nano/ini.nanorc
-include ~/.nano/patch.nanorc
-include ~/.nano/import.nanorc
-include ~/.nano/systemd.nanorc
-include ~/.nano/nginx.nanorc
-include ~/.nano/ledger.nanorc
-include ~/.nano/awk.nanorc
-include ~/.nano/sh.nanorc
-include ~/.nano/ruby.nanorc
-include ~/.nano/lisp.nanorc
-include ~/.nano/cmake.nanorc
-include ~/.nano/git.nanorc
-include ~/.nano/html.nanorc
-include ~/.nano/colortest.nanorc
-include ~/.nano/xresources.nanorc
-include ~/.nano/tex.nanorc
-include ~/.nano/css.nanorc
-include ~/.nano/go.nanorc
+include ~/.nano/mutt.nanorc
 include ~/.nano/nanorc.nanorc
-include ~/.nano/sql.nanorc
-include ~/.nano/pkg-config.nanorc
-include ~/.nano/man.nanorc
-include ~/.nano/vala.nanorc
-include ~/.nano/java.nanorc
-include ~/.nano/yum.nanorc
-include ~/.nano/inputrc.nanorc
-include ~/.nano/pkgbuild.nanorc
-include ~/.nano/xml.nanorc
-include ~/.nano/sed.nanorc
-include ~/.nano/c.nanorc
-include ~/.nano/javascript.nanorc
-include ~/.nano/cython.nanorc
-include ~/.nano/markdown.nanorc
-include ~/.nano/mpdconf.nanorc
+include ~/.nano/nginx.nanorc
+include ~/.nano/patch.nanorc
 include ~/.nano/peg.nanorc
-include ~/.nano/main.nanorc
+include ~/.nano/perl.nanorc
+include ~/.nano/php.nanorc
+include ~/.nano/pkg-config.nanorc
+include ~/.nano/pkgbuild.nanorc
 include ~/.nano/po.nanorc
+include ~/.nano/pov.nanorc
+include ~/.nano/privoxy.nanorc
 include ~/.nano/python.nanorc
-include ~/.nano/makefile.nanorc
-include ~/.nano/vi.nanorc
+include ~/.nano/reST.nanorc
 include ~/.nano/rpmspec.nanorc
-include ~/.nano/import.nanorc
+include ~/.nano/ruby.nanorc
+include ~/.nano/sed.nanorc
+include ~/.nano/sh.nanorc
+include ~/.nano/sql.nanorc
+include ~/.nano/systemd.nanorc
+include ~/.nano/tex.nanorc
+include ~/.nano/vala.nanorc
+include ~/.nano/vi.nanorc
+include ~/.nano/xml.nanorc
+include ~/.nano/xresources.nanorc
+include ~/.nano/yaml.nanorc
+include ~/.nano/yum.nanorc
+include ~/.nano/zshrc.nanorc

From 3aa0f4c199bc628f0e4d753c2786f5ec4581cd82 Mon Sep 17 00:00:00 2001
From: Daniel Kaplun <dan@beardtree.com>
Date: Thu, 19 Dec 2013 23:51:40 -0600
Subject: [PATCH 2/5] Removes nonexistent main.nanorc and circular
 import.nanorc import

---
 import.nanorc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/import.nanorc b/import.nanorc
index 4cc77c7..264da2d 100644
--- a/import.nanorc
+++ b/import.nanorc
@@ -21,7 +21,6 @@ include ~/.nano/go.nanorc
 include ~/.nano/groff.nanorc
 include ~/.nano/haml.nanorc
 include ~/.nano/html.nanorc
-include ~/.nano/import.nanorc
 include ~/.nano/ini.nanorc
 include ~/.nano/inputrc.nanorc
 include ~/.nano/java.nanorc
@@ -33,7 +32,6 @@ include ~/.nano/kickstart.nanorc
 include ~/.nano/ledger.nanorc
 include ~/.nano/lisp.nanorc
 include ~/.nano/lua.nanorc
-include ~/.nano/main.nanorc
 include ~/.nano/makefile.nanorc
 include ~/.nano/man.nanorc
 include ~/.nano/markdown.nanorc

From 40bffae91dce412b8727c5c673d08d9c9652b238 Mon Sep 17 00:00:00 2001
From: Daniel Kaplun <dan@beardtree.com>
Date: Thu, 19 Dec 2013 23:58:35 -0600
Subject: [PATCH 3/5] Includes instructions for import.nanorc in Readme.rst

---
 Readme.rst | 50 +++-----------------------------------------------
 1 file changed, 3 insertions(+), 47 deletions(-)

diff --git a/Readme.rst b/Readme.rst
index 85c5b21..09bdc5f 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -7,54 +7,10 @@ definitions of syntax highlighting for various languages.
 These should be placed inside of the ``~/.nano/`` directory.
 
 Once there you should add the languages you want to your
-nano configuration file ``~/.nanorc``.  For example, 
-my config file includes::
+nano configuration file ``~/.nanorc``.  For example::
 
     ## C/C++
     include "~/.nano/c.nanorc"
 
-    ## Fortran
-    include "~/.nano/fortran.nanorc"
-
-    ## HTML
-    include "~/.nano/html.nanorc"
-
-    ## Patch files
-    include "~/.nano/patch.nanorc"
-
-    ## Manpages
-    include "~/.nano/man.nanorc"
-
-    ## Perl
-    include "~/.nano/perl.nanorc"
-
-    ## Python
-    include "~/.nano/python.nanorc"
-
-    ## reST
-    include "~/.nano/reST.nanorc"
-
-    ## Ruby
-    include "~/.nano/ruby.nanorc"
-
-    ## Bourne shell scripts
-    include "~/.nano/sh.nanorc"
-
-    ## makefile .am
-    include "~/.nano/gentoo.nanorc"
-
-    ## TeX
-    include "~/.nano/tex.nanorc"
-
-    ## CSS
-    include "~/.nano/css.nanorc"
-
-    ## php
-    include "~/.nano/php.nanorc"
-
-    ## XML
-    include "~/.nano/xml.nanorc"
-
-    ## Lua
-    include "~/.nano/lua.nanorc"
-
+You can also copy the contents of ``import.nanorc`` into your
+``~/.nanorc`` to include all languages.

From 9a1aa67b2068a89311dbdce3874c5e24b77f9d5d Mon Sep 17 00:00:00 2001
From: Daniel Kaplun <dan@beardtree.com>
Date: Fri, 20 Dec 2013 00:05:51 -0600
Subject: [PATCH 4/5] Adds instructions and formatting fixes to Readme.rst

---
 Readme.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Readme.rst b/Readme.rst
index 09bdc5f..c9f257f 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -2,9 +2,12 @@
 Improved Nano Syntax Highlighting Files
 ***************************************
 
-This repository holds {lang}.nanorc files that have improved 
+This repository holds ``{lang}.nanorc`` files that have improved
 definitions of syntax highlighting for various languages.
 These should be placed inside of the ``~/.nano/`` directory.
+Alternatively::
+
+    git clone git@github.com:scopatz/nanorc.git ~/.nano
 
 Once there you should add the languages you want to your
 nano configuration file ``~/.nanorc``.  For example::
@@ -12,5 +15,7 @@ nano configuration file ``~/.nanorc``.  For example::
     ## C/C++
     include "~/.nano/c.nanorc"
 
-You can also copy the contents of ``import.nanorc`` into your
-``~/.nanorc`` to include all languages.
+You can also append the contents of ``~/.nano/nanorc`` into your
+``~/.nanorc`` to include all languages::
+
+    cat ~/.nano/nanorc >> ~/.nanorc

From 81fbb9b393ca59ae227594c146d6dc86cffad239 Mon Sep 17 00:00:00 2001
From: Daniel Kaplun <dan@beardtree.com>
Date: Fri, 20 Dec 2013 00:07:22 -0600
Subject: [PATCH 5/5] Renames import.nanorc to nanorc

---
 import.nanorc => nanorc | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename import.nanorc => nanorc (100%)

diff --git a/import.nanorc b/nanorc
similarity index 100%
rename from import.nanorc
rename to nanorc