Merge branch 'devel' of github.com:arangodb/arangodb into devel

hkernbach · hkernbach · commit 120a4fbd3015 · 2015-10-27T13:58:59.000+01:00
diff --git a/LICENSES-OTHER-COMPONENTS.md b/LICENSES-OTHER-COMPONENTS.md
@@ -48,11 +48,18 @@
 * https://coreos.com/using-coreos/etcd/
 * [Apache 2 License](https://github.com/coreos/etcd/blob/master/LICENSE)
 
+### autotools
+
+* http://www.gnu.org/software/autoconf/autoconf.html
+* https://www.gnu.org/software/automake/
+* only used to generate code, not part of the distribution
+* parts generated are free as-is license
+
 ### Bison
 
 * https://www.gnu.org/software/bison/
 * only used to generate code, not part of the distribution
-* parts used see https://github.com/arangodb/arangodb/blob/devel/arangod/Aql/grammar.cpp#L20
+* parts generated use see https://github.com/arangodb/arangodb/blob/devel/arangod/Aql/grammar.cpp#L20
 
 ### Flex
 
