From 7f63d84eb712c54c57c3d4e9a92ffefe2f1b2ade Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sun, 17 Oct 2010 16:03:02 +1030 Subject: [PATCH] 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? --- ccan/alignof/_info | 2 +- ccan/alloc/_info | 2 +- ccan/antithread/_info | 2 +- ccan/array/_info | 2 +- ccan/array_size/_info | 2 +- ccan/asearch/_info | 2 +- ccan/asort/_info | 2 +- ccan/btree/_info | 2 +- ccan/build_assert/_info | 2 +- ccan/charset/_info | 2 +- ccan/check_type/_info | 2 +- ccan/compiler/_info | 2 +- ccan/container_of/_info | 2 +- ccan/crc/_info | 2 +- ccan/crcsync/_info | 2 +- ccan/daemonize/_info | 2 +- ccan/endian/_info | 2 +- ccan/grab_file/_info | 2 +- ccan/hash/_info | 2 +- ccan/hashtable/_info | 2 +- ccan/idtree/_info | 2 +- ccan/likely/_info | 2 +- ccan/list/_info | 2 +- ccan/md4/_info | 2 +- ccan/noerr/_info | 2 +- ccan/ogg_to_pcm/_info | 2 +- ccan/opt/_info | 2 +- ccan/read_write_all/_info | 2 +- ccan/short_types/_info | 2 +- ccan/sparse_bsearch/_info | 2 +- ccan/str/_info | 2 +- ccan/str_talloc/_info | 2 +- ccan/talloc/_info | 2 +- ccan/talloc_link/_info | 2 +- ccan/tally/_info | 2 +- ccan/tdb/_info | 2 +- ccan/tdb2/_info | 2 +- ccan/typesafe_cb/_info | 2 +- ccan/wwviaudio/_info | 2 +- tools/doc_extract.c | 2 +- web/staticmoduleinfo.php | 11 ++++++++++- 41 files changed, 50 insertions(+), 41 deletions(-) diff --git a/ccan/alignof/_info b/ccan/alignof/_info index a7913bb..adf3619 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 */ int main(int argc, char *argv[]) diff --git a/ccan/alloc/_info b/ccan/alloc/_info index 470b83e..68e40b6 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 */ int main(int argc, char *argv[]) diff --git a/ccan/antithread/_info b/ccan/antithread/_info index 7811c63..a32c8bc 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 */ int main(int argc, char *argv[]) diff --git a/ccan/array/_info b/ccan/array/_info index 5eea42c..65d3cfe 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 1722ba2..63b6b50 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 */ int main(int argc, char *argv[]) diff --git a/ccan/asearch/_info b/ccan/asearch/_info index 92d330b..feed5b5 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 * * Example: diff --git a/ccan/asort/_info b/ccan/asort/_info index c5b2a0b..cbd698a 100644 --- a/ccan/asort/_info +++ b/ccan/asort/_info @@ -11,7 +11,7 @@ * * asort does both. * - * Licence: LGPL + * License: LGPL * Author: Rusty Russell * * Example: diff --git a/ccan/btree/_info b/ccan/btree/_info index 5d72c49..f5dbd25 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 16a4a94..0906af0 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 */ int main(int argc, char *argv[]) diff --git a/ccan/charset/_info b/ccan/charset/_info index a7086ba..b549acb 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 c450ab2..4cb3ff1 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 */ int main(int argc, char *argv[]) diff --git a/ccan/compiler/_info b/ccan/compiler/_info index 06645b1..31f6f0c 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 * * Example: diff --git a/ccan/container_of/_info b/ccan/container_of/_info index 8580526..cc91232 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 */ int main(int argc, char *argv[]) diff --git a/ccan/crc/_info b/ccan/crc/_info index 7812f21..295195c 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 */ diff --git a/ccan/crcsync/_info b/ccan/crcsync/_info index 79368c1..55d92d9 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 */ int main(int argc, char *argv[]) diff --git a/ccan/daemonize/_info b/ccan/daemonize/_info index 2bdcaa9..64b08ed 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 400f774..d9d173c 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 */ int main(int argc, char *argv[]) diff --git a/ccan/grab_file/_info b/ccan/grab_file/_info index 480cdab..83d911f 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 */ int main(int argc, char *argv[]) diff --git a/ccan/hash/_info b/ccan/hash/_info index 399edbe..5aeb912 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 * Author: Bob Jenkins */ diff --git a/ccan/hashtable/_info b/ccan/hashtable/_info index 29476c4..c3c5b98 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 */ int main(int argc, char *argv[]) diff --git a/ccan/idtree/_info b/ccan/idtree/_info index c0db363..36df6fd 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 * Author: Jim Houston */ diff --git a/ccan/likely/_info b/ccan/likely/_info index 5caed01..1e3277f 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 * * Example: diff --git a/ccan/list/_info b/ccan/list/_info index 5af837b..a7daa13 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 */ int main(int argc, char *argv[]) diff --git a/ccan/md4/_info b/ccan/md4/_info index d3c2c42..1fb9d00 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 c5d8768..899e36c 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 */ int main(int argc, char *argv[]) diff --git a/ccan/ogg_to_pcm/_info b/ccan/ogg_to_pcm/_info index 48d4da8..e9e03d6 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 5e177a1..0e0e0a5 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 */ int main(int argc, char *argv[]) diff --git a/ccan/read_write_all/_info b/ccan/read_write_all/_info index b825c93..0f65fe5 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 */ int main(int argc, char *argv[]) diff --git a/ccan/short_types/_info b/ccan/short_types/_info index 732db11..e4f3d42 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 */ int main(int argc, char *argv[]) diff --git a/ccan/sparse_bsearch/_info b/ccan/sparse_bsearch/_info index b0bcb2f..4e35823 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 */ int main(int argc, char *argv[]) diff --git a/ccan/str/_info b/ccan/str/_info index 2c024f0..0438ccf 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 */ int main(int argc, char *argv[]) diff --git a/ccan/str_talloc/_info b/ccan/str_talloc/_info index 4f093bc..186075f 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 */ int main(int argc, char *argv[]) diff --git a/ccan/talloc/_info b/ccan/talloc/_info index b244008..cf2ea7d 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 dd25c20..9f2bb14 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 */ int main(int argc, char *argv[]) diff --git a/ccan/tally/_info b/ccan/tally/_info index 38252ed..1d67274 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 */ int main(int argc, char *argv[]) diff --git a/ccan/tdb/_info b/ccan/tdb/_info index 10d02b9..2743671 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 35e32b7..15c68d4 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 fea2711..7417feb 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 */ int main(int argc, char *argv[]) diff --git a/ccan/wwviaudio/_info b/ccan/wwviaudio/_info index 84a3327..d7e9f3c 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 c8ecbf8..d7617a0 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=] TYPE ...\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 0d04d66..ba73265 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); ?> @@ -97,7 +98,15 @@ if ($example) { if ($licence) { ?> - + + + + +

Licence:

License:

License: