aux is a reserved name on windows; smh

c/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS=		lib cli stream input dsl mapping containers output parsing aux experimental . unit_test reg_test
+SUBDIRS=		lib cli stream input dsl mapping containers output parsing auxents experimental . unit_test reg_test
 
 AM_CPPFLAGS=		-I${srcdir}
 AM_CFLAGS=		-Wall -std=gnu99
@@ -18,7 +18,7 @@ mlr_LDADD=		\
 			output/liboutput.la \
 			lib/libmlr.la \
 			parsing/libdsl.la \
-			aux/libaux.la \
+			auxents/libauxents.la \
 			-lm
 
 # Other executable variants

c/Makefile.no-autoconfig

@@ -40,7 +40,7 @@ NON_DSL_SRCS = \
   cli/*.c \
   lib/*.c \
   containers/*.c \
-  aux/*.c \
+  auxents/*.c \
   stream/*.c \
   input/*.c \
   dsl/*.c \

c/auxents/Makefile.am

@@ -0,0 +1,8 @@
+noinst_LTLIBRARIES=	libauxents.la
+libauxents_la_SOURCES=	aux_entries.c \
+			aux_entries.h
+
+libauxents_la_LIBADD=	../lib/libmlr.la
+
+AM_CPPFLAGS=	-I${srcdir}/../
+AM_CFLAGS=	-std=gnu99

c/draft-release-notes.md

@@ -1,9 +1,8 @@
 This is a relatively minor release, containing feature requests and bugfixes while I've been working on the Windows port (which is nearly complete).
 
 **Features:**
-* **JSON arrays**: as described [**here**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/file-formats.html#Tabular_JSON), Miller being a tabular data processor isn't well-position to handle arbitrary JSON. (See
-[jq](tp://stedolan.github.io/jq) for that.) But as of 5.1.0, arrays are converted to maps with integer keys, which are
-then at least processable using Miller. Details are [here](http://johnkerl.org/miller-releases/miller-5.1.0/doc/file-formats.html#Arrays). The short of it is that you now have three options for the main <tt>mlr</tt> executable:
+
+* **JSON arrays**: as described [**here**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/file-formats.html#Tabular_JSON), Miller being a tabular data processor isn't well-position to handle arbitrary JSON. (See [**jq**](http://stedolan.github.io/jq) for that.) But as of 5.1.0, arrays are converted to maps with integer keys, which are then at least processable using Miller. Details are [here](http://johnkerl.org/miller-releases/miller-5.1.0/doc/file-formats.html#Arrays). The short of it is that you now have three options for the main <tt>mlr</tt> executable:
 
 ```
 --json-map-arrays-on-input    Convert JSON array indices to Miller map keys. (This is the default.)
@@ -15,39 +14,25 @@ This resolves https://github.com/johnkerl/miller/issues/133.
 
 * The new [**mlr fraction**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#fraction) verb makes possible in a few keystrokes what was only possible before using two-pass DSL logic: here you can turn numerical values down a column into their fractional/percentage contribution to column totals, optionally grouped by other key columns.
 
-* The DSL functions
-[**strptime**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#strptime) and
-[**strftime**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#strftime) now
-handle fractional seconds. For parsing, use **%S** format as always; for formatting, there are now
-**%1S** through
-**%9S** which allow you to configure a specified number of decimal places.  The return value from <tt>strptime</tt>
-is now floating-point, not integer, which is a minor backward incompatibility not worth labeling this release as 6.0.0.
-(You can work around this using <tt>int(strptime(...))</tt>.)  The DSL functions
-[**gmt2sec**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#gmt2sec) and
-[**sec2gmt**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#sec2gmt), which are
-keystroke-savers for <tt>strptime</tt> and <tt>strftime</tt>, are similarly modified, as is the
-[**sec2gmt**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#sec2gmt) verb.
-This resolves https://github.com/johnkerl/miller/issues/125.
+* The DSL functions [**strptime**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#strptime) and [**strftime**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#strftime) now handle fractional seconds. For parsing, use **%S** format as always; for formatting, there are now **%1S** through **%9S** which allow you to configure a specified number of decimal places.  The return value from <tt>strptime</tt> is now floating-point, not integer, which is a minor backward incompatibility not worth labeling this release as 6.0.0.  (You can work around this using <tt>int(strptime(...))</tt>.)  The DSL functions [**gmt2sec**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#gmt2sec) and [**sec2gmt**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#sec2gmt), which are keystroke-savers for <tt>strptime</tt> and <tt>strftime</tt>, are similarly modified, as is the [**sec2gmt**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#sec2gmt) verb.  This resolves https://github.com/johnkerl/miller/issues/125.
 
 * A few nearly-standalone programs -- which do not have anything to do with record streams -- are packaged within the Miller. (For example, hex-dump, unhex, and show-line-endings commands.) These are described [**here**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference.html#Auxiliary_commands).
 
-* The [**stats1**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#stats1)
-and [**merge-fields**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#merge-fields)
-verbs now support an **antimode** aggregator, in addition to the existing mode aggregator.
+* The [**stats1**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#stats1) and [**merge-fields**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#merge-fields) verbs now support an **antimode** aggregator, in addition to the existing mode aggregator.
 
-* The [**join**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#join) verb
-now by default does not require sorted input, which is the more common use case. (Memory-parsimonious joins which require sorted input, while no longer the default, are available using <tt>-s</tt>.) This another minor backward incompatibility not worth making a 6.0.0 over.
-This resolves https://github.com/johnkerl/miller/issues/134.
+* The [**join**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#join) verb now by default does not require sorted input, which is the more common use case. (Memory-parsimonious joins which require sorted input, while no longer the default, are available using <tt>-s</tt>.) This another minor backward incompatibility not worth making a 6.0.0 over.  This resolves https://github.com/johnkerl/miller/issues/134.
 
 * [**mlr nest**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-verbs.html#nest) has a keystroke-saving **--evar** option for a common use case, namely, exploding a field by value across records.
 
 **Documentation:**
+
 * The DSL reference now has [**per-function descriptions**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#Built-in_functions_for_filter_and_put).
+
 * There is a new [**feature-counting example**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/cookbook.html#Feature-counting) in the cookbook.
 
 **Bugfixes:**
+
 * **mlr join -j -l** was not functioning correctly. This resolves https://github.com/johnkerl/miller/issues/136.
 
-* **JSON escapes on output** (`\t` and so on) were incorrect. This resolves
-https://github.com/johnkerl/miller/issues/135.
+* **JSON escapes on output** (`\t` and so on) were incorrect. This resolves https://github.com/johnkerl/miller/issues/135.
 

c/mlrmain.c

@@ -7,7 +7,7 @@
 #include "cli/mlrcli.h"
 #include "containers/lrec.h"
 #include "containers/sllv.h"
-#include "aux/aux_entries.h"
+#include "auxents/aux_entries.h"
 #include "input/lrec_readers.h"
 #include "mapping/mappers.h"
 #include "output/lrec_writers.h"

configure.ac

@@ -31,7 +31,7 @@ AC_CONFIG_FILES([Makefile
 		c/mapping/Makefile
 		c/output/Makefile
 		c/stream/Makefile
-		c/aux/Makefile
+		c/auxents/Makefile
 		c/unit_test/Makefile
 		c/reg_test/Makefile
 		c/reg_test/expected/Makefile

doc/build.html

@@ -398,7 +398,6 @@
 
 <p/>At present I&rsquo;m the primary developer so this is just my checklist for making new releases.
 
-
 <p/>In this example I am using version 3.4.0; of course that will change for subsequent revisions.
 <ul>
 

doc/manpage.html

@@ -2192,7 +2192,7 @@
 
 
 
-				  2017-04-14			     MILLER(1)
+				  2017-04-15			     MILLER(1)
 </pre>
 </div>
 <p/>

doc/manpage.txt

@@ -1999,4 +1999,4 @@ SEE ALSO
 
 
 
-				  2017-04-14			     MILLER(1)
+				  2017-04-15			     MILLER(1)

doc/mlr.1

@@ -2,12 +2,12 @@
 .\"     Title: mlr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: ./mkman.rb
-.\"      Date: 2017-04-14
+.\"      Date: 2017-04-15
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MILLER" "1" "2017-04-14" "\ \&" "\ \&"
+.TH "MILLER" "1" "2017-04-15" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Portability definitions
 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~