licence->license: US English is the standard for code.

      
If a Swedish-speaking Finn writes code in English, why should I complain about
a few weird spellings?

41 files changed, 50 insertions, 41 deletions

diff --git a/ccan/alignof/_info b/ccan/alignof/_info
index a7913bb5..adf36193 100644
--- a/ccan/alignof/_info
+++ b/ccan/alignof/_info
@@ -32,7 +32,7 @@
  *		}
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/alloc/_info b/ccan/alloc/_info
index 470b83e9..68e40b6d 100644
--- a/ccan/alloc/_info
+++ b/ccan/alloc/_info
@@ -92,7 +92,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/antithread/_info b/ccan/antithread/_info
index 7811c638..a32c8bc9 100644
--- a/ccan/antithread/_info
+++ b/ccan/antithread/_info
@@ -81,7 +81,7 @@
  *		return 0;
  *	}
  *
- * Licence: GPL (3 or any later version)
+ * License: GPL (3 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/array/_info b/ccan/array/_info
index 5eea42c3..65d3cfe9 100644
--- a/ccan/array/_info
+++ b/ccan/array/_info
@@ -43,7 +43,7 @@
  *
  * Author: Joey Adams
  * Version: 0.1.1
- * Licence: BSD
+ * License: BSD
  */
 int main(int argc, char *argv[])
 {
diff --git a/ccan/array_size/_info b/ccan/array_size/_info
index 1722ba29..63b6b50e 100644
--- a/ccan/array_size/_info
+++ b/ccan/array_size/_info
@@ -25,7 +25,7 @@
  *			vals[i] = random();
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/asearch/_info b/ccan/asearch/_info
index 92d330b7..feed5b58 100644
--- a/ccan/asearch/_info
+++ b/ccan/asearch/_info
@@ -10,7 +10,7 @@
  *
  * This version uses macros to be typesafe on platforms which support it.
  *
- * Licence: LGPL
+ * License: LGPL
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  *
  * Example:
diff --git a/ccan/asort/_info b/ccan/asort/_info
index c5b2a0bb..cbd698ac 100644
--- a/ccan/asort/_info
+++ b/ccan/asort/_info
@@ -11,7 +11,7 @@
  *
  * asort does both.
  *
- * Licence: LGPL
+ * License: LGPL
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  *
  * Example:
diff --git a/ccan/btree/_info b/ccan/btree/_info
index 5d72c490..f5dbd25b 100644
--- a/ccan/btree/_info
+++ b/ccan/btree/_info
@@ -225,7 +225,7 @@
  *
  * Author: Joey Adams
  * Version: 0.1.0
- * Licence: BSD
+ * License: BSD
  */
 int main(int argc, char *argv[])
 {
diff --git a/ccan/build_assert/_info b/ccan/build_assert/_info
index 16a4a94c..0906af07 100644
--- a/ccan/build_assert/_info
+++ b/ccan/build_assert/_info
@@ -33,7 +33,7 @@
  *		return (char *)foo;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/charset/_info b/ccan/charset/_info
index a7086ba1..b549acb6 100644
--- a/ccan/charset/_info
+++ b/ccan/charset/_info
@@ -41,7 +41,7 @@
  *	}
  *
  * Author: Joey Adams
- * Licence: MIT
+ * License: MIT
  */
 int main(int argc, char *argv[])
 {
diff --git a/ccan/check_type/_info b/ccan/check_type/_info
index c450ab26..4cb3ff17 100644
--- a/ccan/check_type/_info
+++ b/ccan/check_type/_info
@@ -14,7 +14,7 @@
  * since they have to use sizeof() which can only distiguish between types of
  * different size.
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/compiler/_info b/ccan/compiler/_info
index 06645b1d..31f6f0c7 100644
--- a/ccan/compiler/_info
+++ b/ccan/compiler/_info
@@ -19,7 +19,7 @@
  * - IS_COMPILE_CONSTANT
  *	For using different tradeoffs for compiletime vs runtime evaluation.
  *
- * Licence: LGPL (3 or any later version)
+ * License: LGPL (3 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  *
  * Example:
diff --git a/ccan/container_of/_info b/ccan/container_of/_info
index 8580526a..cc912320 100644
--- a/ccan/container_of/_info
+++ b/ccan/container_of/_info
@@ -46,7 +46,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/crc/_info b/ccan/crc/_info
index 7812f212..295195c4 100644
--- a/ccan/crc/_info
+++ b/ccan/crc/_info
@@ -26,7 +26,7 @@
  *		exit(0);
  *	}
  *
- * Licence: GPL (v2 or any later version)
+ * License: GPL (v2 or any later version)
  * Author: Gary S. Brown, Clay Haapala
  * Maintainer: Rusty Russell <rusty@rustcorp.com.au>
  */
diff --git a/ccan/crcsync/_info b/ccan/crcsync/_info
index 79368c1d..55d92d96 100644
--- a/ccan/crcsync/_info
+++ b/ccan/crcsync/_info
@@ -67,7 +67,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (v2 or any later version)
+ * License: LGPL (v2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/daemonize/_info b/ccan/daemonize/_info
index 2bdcaa97..64b08ed8 100644
--- a/ccan/daemonize/_info
+++ b/ccan/daemonize/_info
@@ -35,7 +35,7 @@
  *		exit(0);
  *	}
  *
- * Licence: BSD (2 clause, ie. MIT)
+ * License: BSD (2 clause, ie. MIT)
  */
 int main(int argc, char *argv[])
 {
diff --git a/ccan/endian/_info b/ccan/endian/_info
index 400f7745..d9d173c3 100644
--- a/ccan/endian/_info
+++ b/ccan/endian/_info
@@ -37,7 +37,7 @@
  *		exit(0);
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/grab_file/_info b/ccan/grab_file/_info
index 480cdab4..83d911fe 100644
--- a/ccan/grab_file/_info
+++ b/ccan/grab_file/_info
@@ -35,7 +35,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/hash/_info b/ccan/hash/_info
index 399edbe8..5aeb9121 100644
--- a/ccan/hash/_info
+++ b/ccan/hash/_info
@@ -13,7 +13,7 @@
  * The stable ones will always give the same results on any computer,
  * and on any version of this package.
  *
- * Licence: Public Domain
+ * License: Public Domain
  * Maintainer: Rusty Russell <rusty@rustcorp.com.au>
  * Author: Bob Jenkins <bob_jenkins@burtleburtle.net>
  */
diff --git a/ccan/hashtable/_info b/ccan/hashtable/_info
index 29476c4a..c3c5b985 100644
--- a/ccan/hashtable/_info
+++ b/ccan/hashtable/_info
@@ -101,7 +101,7 @@
  *		return 0;
  *	}
  *
- * Licence: GPLv2 (or later)
+ * License: GPLv2 (or later)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/idtree/_info b/ccan/idtree/_info
index c0db3632..36df6fd6 100644
--- a/ccan/idtree/_info
+++ b/ccan/idtree/_info
@@ -36,7 +36,7 @@
  *		return 0;
  *	}
  *
- * Licence: GPL (2 or any later version)
+ * License: GPL (2 or any later version)
  * Maintainer: Rusty Russell <rusty@rustcorp.com.au>
  * Author: Jim Houston <jim.houston@ccur.com>
  */
diff --git a/ccan/likely/_info b/ccan/likely/_info
index 5caed015..1e3277fd 100644
--- a/ccan/likely/_info
+++ b/ccan/likely/_info
@@ -9,7 +9,7 @@
  * help you annotate rare paths in your code for the convenience of the
  * compiler and the reader.
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  *
  * Example:
diff --git a/ccan/list/_info b/ccan/list/_info
index 5af837b5..a7daa133 100644
--- a/ccan/list/_info
+++ b/ccan/list/_info
@@ -52,7 +52,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/md4/_info b/ccan/md4/_info
index d3c2c420..1fb9d003 100644
--- a/ccan/md4/_info
+++ b/ccan/md4/_info
@@ -31,7 +31,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  */
 int main(int argc, char *argv[])
 {
diff --git a/ccan/noerr/_info b/ccan/noerr/_info
index c5d8768f..899e36c3 100644
--- a/ccan/noerr/_info
+++ b/ccan/noerr/_info
@@ -45,7 +45,7 @@
  *		return true;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/ogg_to_pcm/_info b/ccan/ogg_to_pcm/_info
index 48d4da88..e9e03d68 100644
--- a/ccan/ogg_to_pcm/_info
+++ b/ccan/ogg_to_pcm/_info
@@ -24,7 +24,7 @@
  * 		return 0;
  * 	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  *
  */
 int main(int argc, char *argv[])
diff --git a/ccan/opt/_info b/ccan/opt/_info
index 5e177a10..0e0e0a53 100644
--- a/ccan/opt/_info
+++ b/ccan/opt/_info
@@ -49,7 +49,7 @@
  * 	return 0;
  * }
  *
- * Licence: GPL (3 or any later version)
+ * License: GPL (3 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/read_write_all/_info b/ccan/read_write_all/_info
index b825c933..0f65fe59 100644
--- a/ccan/read_write_all/_info
+++ b/ccan/read_write_all/_info
@@ -28,7 +28,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/short_types/_info b/ccan/short_types/_info
index 732db113..e4f3d42c 100644
--- a/ccan/short_types/_info
+++ b/ccan/short_types/_info
@@ -65,7 +65,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/sparse_bsearch/_info b/ccan/sparse_bsearch/_info
index b0bcb2f0..4e358235 100644
--- a/ccan/sparse_bsearch/_info
+++ b/ccan/sparse_bsearch/_info
@@ -50,7 +50,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/str/_info b/ccan/str/_info
index 2c024f02..0438ccfd 100644
--- a/ccan/str/_info
+++ b/ccan/str/_info
@@ -23,7 +23,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/str_talloc/_info b/ccan/str_talloc/_info
index 4f093bc4..186075f2 100644
--- a/ccan/str_talloc/_info
+++ b/ccan/str_talloc/_info
@@ -35,7 +35,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/talloc/_info b/ccan/talloc/_info
index b2440083..cf2ea7d1 100644
--- a/ccan/talloc/_info
+++ b/ccan/talloc/_info
@@ -89,7 +89,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  */
 int main(int argc, char *argv[])
 {
diff --git a/ccan/talloc_link/_info b/ccan/talloc_link/_info
index dd25c201..9f2bb146 100644
--- a/ccan/talloc_link/_info
+++ b/ccan/talloc_link/_info
@@ -129,7 +129,7 @@
  *		return 0;
  *	}
  *
- * Licence: GPL (2 or any later version)
+ * License: GPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/tally/_info b/ccan/tally/_info
index 38252eda..1d67274f 100644
--- a/ccan/tally/_info
+++ b/ccan/tally/_info
@@ -40,7 +40,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (3 or any later version)
+ * License: LGPL (3 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/tdb/_info b/ccan/tdb/_info
index 10d02b96..27436713 100644
--- a/ccan/tdb/_info
+++ b/ccan/tdb/_info
@@ -63,7 +63,7 @@
  *
  * Author: Andrew Tridgell, Jeremy Allison, Rusty Russell
  *
- * Licence: LGPLv3 (or later)
+ * License: LGPLv3 (or later)
  *
  * Fails: valgrind-tests // valgrind breaks fcntl locks.
  */
diff --git a/ccan/tdb2/_info b/ccan/tdb2/_info
index 35e32b72..15c68d4b 100644
--- a/ccan/tdb2/_info
+++ b/ccan/tdb2/_info
@@ -62,7 +62,7 @@
  *
  * Author: Rusty Russell
  *
- * Licence: LGPLv3 (or later)
+ * License: LGPLv3 (or later)
  *
  * Fails:
  *	valgrind-tests // hash needs --partial-loads-ok=yes.
diff --git a/ccan/typesafe_cb/_info b/ccan/typesafe_cb/_info
index fea27116..7417febe 100644
--- a/ccan/typesafe_cb/_info
+++ b/ccan/typesafe_cb/_info
@@ -133,7 +133,7 @@
  *		return 0;
  *	}
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])
diff --git a/ccan/wwviaudio/_info b/ccan/wwviaudio/_info
index 84a33276..d7e9f3c5 100644
--- a/ccan/wwviaudio/_info
+++ b/ccan/wwviaudio/_info
@@ -37,7 +37,7 @@
  *      wwviaudio_cancel_all_sounds();
  *      wwviaduio_stop_portaudio();
  *
- * Licence: LGPL (2 or any later version)
+ * License: LGPL (2 or any later version)
  *
  */
 int main(int argc, char *argv[])
diff --git a/tools/doc_extract.c b/tools/doc_extract.c
index c8ecbf8e..d7617a07 100644
--- a/tools/doc_extract.c
+++ b/tools/doc_extract.c
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
 
 	if (argc < 3)
 		errx(1, "Usage: doc_extract [--function=<funcname>] TYPE <file>...\n"
-		     "Where TYPE is functions|author|licence|maintainer|summary|description|example|all");
+		     "Where TYPE is functions|author|license|maintainer|summary|description|example|all");
 
 	if (strstarts(argv[1], "--function=")) {
 		function = argv[1] + strlen("--function=");
diff --git a/web/staticmoduleinfo.php b/web/staticmoduleinfo.php
index 0d04d668..ba732656 100644
--- a/web/staticmoduleinfo.php
+++ b/web/staticmoduleinfo.php
@@ -13,6 +13,7 @@ $example=extract_field('example',$module_path);
 $dependencies=htmlspecialchars(shell_exec('tools/ccan_depends --direct '.$module_path));
 $extdepends=htmlspecialchars(shell_exec('tools/ccan_depends --compile --non-ccan '.$module_path));
 $licence=extract_field('licence',$module_path);
+$license=extract_field('license',$module_path);
 ?>
 <table align="center" bgcolor="lightblue" width="70%" border="0" cellpadding="3" cellspacing="1">
 <tr align="center" bgcolor="FFFFCC">
@@ -97,7 +98,15 @@ if ($example) {
 if ($licence) {
 ?>
 <tr align="left" bgcolor="FFFFCC"> 
-<td><h3>Licence: </h3> <?=$licence?></td>
+<td><h3>License: </h3> <?=$licence?></td>
+</tr>
+<?php
+}
+
+if ($license) {
+?>
+<tr align="left" bgcolor="FFFFCC"> 
+<td><h3>License: </h3> <?=$license?></td>
 </tr>
 <?php
 }