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?

diff --git a/ccan/alignof/_info b/ccan/alignof/_info
index a7913bb50d680643ea3991e0e339e065d18cafc5..adf36193f212ec064850a2ff2387e732c0e8fb8c 100644 (file)
--- 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 470b83e94e87132846d4b0e1711ed6282534b4f8..68e40b6d4346db3c10bc4cb4b57b2ec03bcfa559 100644 (file)
--- 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 7811c638297df948fb102c0a883be44df4cfed59..a32c8bc99652df485ea313dc093d79f9f7175b65 100644 (file)
--- 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 5eea42c3f329cc86023f6a3c70248bcb14f4f3da..65d3cfe9fc893de4077bf1828279d06a00fa479f 100644 (file)
--- 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 1722ba2933f1906479f6da5263eb8bf0b7930c48..63b6b50e40f85bf7217c0dd39e29d0f9cb821905 100644 (file)
--- 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 92d330b73ab58dc3616d275be584ef4a15a21c7b..feed5b587fb02b48f555d8b44926e7e58a7b6a07 100644 (file)
--- 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 c5b2a0bb23706f50b6646b8310ee21eeed4a8893..cbd698acc3b0de68205ca61cdd10f5af099c4d81 100644 (file)
--- 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 5d72c490f0de31d9c0f7b1208bc5519974d14eb9..f5dbd25bffd610f81879e0e1b0df38bb5ded2194 100644 (file)
--- 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 16a4a94c8f292c27665120023f503cfd33c61974..0906af07e60625fa95895e9cf8e6d31661d9159a 100644 (file)
--- 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 a7086ba12e99cd36e2c35cb9e06e43ebdb209b16..b549acb6eb67cde5c2e3602dff1740f9e5710e5f 100644 (file)
--- 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 c450ab267f1ed6b77f9c2cac978bdcd08837f902..4cb3ff17bcd4fbdc9e084f1d4bcf22ed5e069a86 100644 (file)
--- 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 06645b1d8c9d8e26ea2d554553351f53795e8bd7..31f6f0c7ce482cadbc6644e0f60af742da23bd37 100644 (file)
--- 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 8580526a40040913736b449d458fe1dd35580efb..cc912320c1ac04fc5b67b19881027db685240085 100644 (file)
--- 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 7812f212d445a1683dd042c632091209d64f3682..295195c4ef0d82b8afcc791bc36c318ef8248361 100644 (file)
--- 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 79368c1d60b3dd091d4a1bd256e04fd7d5f83456..55d92d96ff59db41faa6d3bdd5fe9f03317580a7 100644 (file)
--- 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 2bdcaa97efa69556feb6bbfe60754d145ba6ef5e..64b08ed8e9646251383059aa361eb1beeb201b78 100644 (file)
--- 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 400f7745569a2f0ba2c78a26ac410631c93e4c41..d9d173c32d74fd10bf4b2d2ae1470c0d4c1aee1d 100644 (file)
--- 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 480cdab45ed5a780d1800291f4037f5be4234a92..83d911fe7fb27d984e659ea4f7d38bcbfc592c13 100644 (file)
--- 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 399edbe896e2692ed47bb200a0425e81e02f4f39..5aeb91213694d4e1605249e3bdee75ca73464b32 100644 (file)
--- 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 29476c4a800896386876b1cbb4ab725514bbb249..c3c5b9855536829d56cb64713e3d6621b3e3781b 100644 (file)
--- 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 c0db3632e2c62731b4aed090473c3ef21b6c7cee..36df6fd6dc5c8d44f40188a378d1cfefcca49060 100644 (file)
--- 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 5caed015d25d2bc92a6e69400bad6cf6b0ae7223..1e3277fd7f04e6a842439193a4fb2b78462c7b38 100644 (file)
--- 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 5af837b53f78c0081fea85f3f877613b38cf0463..a7daa1335762a33320a2b10f9f5b941f319d930b 100644 (file)
--- 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 d3c2c420c1130982f17d7792b5a93b31b126e6b4..1fb9d0035bff7b296ee87ed97d0515df69260a4e 100644 (file)
--- 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 c5d8768f61e666154947df29d9b2344ba842f5b8..899e36c35cee0772feca69871c2d94416c588f6d 100644 (file)
--- 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 48d4da88beb8148ab2d8129a9fe7c7d8285b43c1..e9e03d688775ce15d351544ea94f7f3b97ef4b95 100644 (file)
--- 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 5e177a10e296766219dc8b36564e714a740ab030..0e0e0a538bac42ca4efa175e31c911d2c41c6b1a 100644 (file)
--- 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 b825c933ec42a096341616f2a8d21e58ee792ba5..0f65fe5965d345b374a8261ce73ac53e43df0a69 100644 (file)
--- 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 732db113a58cd8bc167a2ae81db416e6b07c4801..e4f3d42ca0eed7d5bc886505e1b9b337cc3fe8b3 100644 (file)
--- 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 b0bcb2f075edbf875f05e1a92a3986aa6c2f3ab0..4e358235ebe63e7b6d472b540ca573a9c17d86ac 100644 (file)
--- 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 2c024f0297b57261f30f1e0bde0452422c4d1236..0438ccfdbcd2bbff8bd2a87b82baa7fc3a36cead 100644 (file)
--- 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 4f093bc4c06af175337bad7b0f367c94958ba5fe..186075f27b7176ff5c8623b028b22725b8f94772 100644 (file)
--- 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 b2440083780a39de357e98aaad973645aab2ea5c..cf2ea7d18b8983d0aaa62417307fd4737d981bc6 100644 (file)
--- 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 dd25c201bc9c080b609cee168c89f808c55f9875..9f2bb146f85bb3a411fe7dca04735858a550f16a 100644 (file)
--- 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 38252edac8a384d56d92d6ddfa852f20d601873b..1d67274f5c276eb2934c3256f16237f6e0a9b763 100644 (file)
--- 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 10d02b9657ad90bc16a7da0957c48367ee66c441..27436713e2a8ae6c8fca629133622a22ace1c0c6 100644 (file)
--- 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 35e32b729116cfd199ae3d87c83ab947bd5f931e..15c68d4bbc005017a93dee97011acc4844638e66 100644 (file)
--- 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 fea27116263c1a6ba52fbc5175a4c65c56772777..7417febe601e7bc3d1f7b1cb2ddb32ff14625103 100644 (file)
--- 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 84a33276cc4419336fafd0e9ceded732a1e253a0..d7e9f3c5ba99d679469349d1ed94b8ef892afd72 100644 (file)
--- 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 c8ecbf8e6965240c02630884bc64b9af44ccfdf6..d7617a076a752e23c858d1ab75b74a504960c9c7 100644 (file)
--- 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 0d04d6686a9ab86373f451e02a24f86b878bd9bb..ba73265696383d7b7898bf38b79b1f6dabf4a5ea 100644 (file)
--- 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
 }