diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 929b387..35b2631 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -22,16 +22,16 @@ ~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -What Is Apache Whisker? +What Is Apache Whisker™? Apache Whisker assists assembled applications maintain correct legal documentation. - Apache Whisker is part of the {{{http://creadur.apache.org}Apache Creadur}} + Apache Whisker is part of the {{{https://creadur.apache.org}Apache Creadur}} language- and build-agnostic suite of tools for auditing and comprehending software distributions. Our community develops - {{{http://www.opensource.org/} open source software}} the - {{{http://www.apache.org/foundation/how-it-works.html} Apache Way}}. + {{{https://www.opensource.org/} open source software}} the + {{{https://www.apache.org/foundation/how-it-works.html} Apache Way}}. Whisker just helps to maintain information more efficiently, and is {{{./faq.html#what-whisker-is-not}no substitute}} @@ -123,7 +123,7 @@ What Is Apache Whisker? * {{{./examples/license-family.html}Parameterising a template}} for a {{{./faq.html#what-is-license-family}license family}}, featuring the - {{{http://opensource.org/licenses/BSD-2-Clause}BSD (2 Clause) license}} + {{{https://opensource.org/licenses/BSD-2-Clause}BSD (2 Clause) license}} * All about {{{./examples/copyright-notices.html}copyright notices}} diff --git a/src/site/apt/meta-data.apt b/src/site/apt/meta-data.apt index 1bbe53f..8443b20 100644 --- a/src/site/apt/meta-data.apt +++ b/src/site/apt/meta-data.apt @@ -53,7 +53,7 @@ Apache Whisker Meta-Data Model * use the domain name as the <<>> for an organisation; - * use the {{{http://www.opensource.org} Open Source Initiative}} code as the <<>> + * use the {{{https://www.opensource.org} Open Source Initiative}} code as the <<>> for an open source license Note that <<>> includes any entity attributed as creator. Including (for example) @@ -195,9 +195,9 @@ Apache Whisker Meta-Data Model ** Public Domain Some contemporary laws make it surprisingly difficult for an author to place a work in the public domain. - See <<<{{{http://creativecommons.org} creativecommons.org}}>>> - for {{{http://creativecommons.org/about/cc0} more}} - {{{http://creativecommons.org/weblog/entry/23830} explanation}}. + See <<<{{{https://creativecommons.org} creativecommons.org}}>>> + for {{{https://creativecommons.org/about/cc0} more}} + {{{https://creativecommons.org/weblog/entry/23830} explanation}}. Whisker supports works in the public domain through <<>> blocks <<>> a directory. A <<>> in the public domain should be grouped <<>> within the <<>> @@ -277,7 +277,7 @@ Apache Whisker Meta-Data Model (for example ) as well as a copyright notice. - Many license definitions (for example, The {{{http://www.opensource.org/licenses/mit-license.php} MIT License}}) + Many license definitions (for example, The {{{https://www.opensource.org/licenses/mit-license.php} MIT License}}) conventionally include a copyright notice. The contents of these copyright notices vary widely. Whisker separates <<>> from <<>> to reduce duplication. @@ -300,7 +300,7 @@ All rights reserved. *** An Example Separation Into License and Notice Here is an example instance of the - {{{http://www.opensource.org/licenses/mit-license.php} MIT License}} + {{{https://www.opensource.org/licenses/mit-license.php} MIT License}} +------------------------------------------------------------------------+ Copyright (c) YEAR-YEAR A.N.AUTHOR @@ -334,7 +334,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + url='https://www.opensource.org/licenses/mit-license.php'> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -376,7 +376,7 @@ All rights reserved. ** Templates For License Families Some familiar open source licenses (for example, - the {{{http://www.opensource.org/licenses/BSD-3-Clause}BSD 3-Clause License}}) are better understood + the {{{https://www.opensource.org/licenses/BSD-3-Clause}BSD 3-Clause License}}) are better understood as families of licenses. Each family is based on a parameterised template. When the license is used, an appropriate value is substituted for each parameter. @@ -469,7 +469,7 @@ All rights reserved. Some {{{./faq.html#what-weak-copyleft}weak copyleft}} licenses contain a {{{./faq.html#what-source-clause}source clause}} - (for example, the {{{http://www.opensource.org/licenses/CDDL-1.0} CDDL 1.0}}). + (for example, the {{{https://www.opensource.org/licenses/CDDL-1.0} CDDL 1.0}}). A good way to satisfy a source clause is to include the source within the distribution. An alternative approach (which is advantageous when size is important) @@ -498,8 +498,8 @@ All rights reserved. * A Sample - Describes components assembled into the {{{http://james.apache.org}Apache James}} - {{{http://james.apache.org/server}mail server}}. + Describes components assembled into the {{{https://james.apache.org}Apache James}} + {{{https://james.apache.org/server}mail server}}. Find the source {{{./examples/james.xml}here}}. +------------------------------------------------------------------------+ @@ -646,7 +646,7 @@ and use a Compliant Implementation. + url='https://www.opensource.org/licenses/CDDL-1.0' requires-source='yes'> COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -1031,7 +1031,7 @@ of liability. + url='https://www.opensource.org/licenses/mit-license.php'> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -1107,7 +1107,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + url='https://www.opensource.org/licenses/BSD-3-Clause'> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -1136,7 +1136,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + url='https://www.opensource.org/licenses/BSD-3-Clause'> @@ -1165,7 +1165,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, @@ -1372,13 +1372,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ====================================================================== This product includes software developed by -the Apache Software Foundation (http://www.apache.org). +the Apache Software Foundation (https://www.apache.org). The end-user documentation included with a redistribution, if any, must include the following acknowledgement: "This product includes software developed by the Spring Framework - Project (http://www.springframework.org)." + Project (https://www.springframework.org)." Alternately, this acknowledgement may appear in the software itself, if and wherever such third-party acknowledgements normally appear. @@ -1395,7 +1395,7 @@ possession, use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to -see if this is permitted. See http://www.wassenaar.org/ for more +see if this is permitted. See https://www.wassenaar.org/ for more information. The U.S. Government Department of Commerce, Bureau of Industry and @@ -1412,12 +1412,12 @@ The following provides more details on the cryptographic software used (note that this software is not included in the distribution): * The PBE Encryption facilities require the Java Cryptography - extensions: http://java.sun.com/javase/technologies/security/. + extensions: https://java.sun.com/javase/technologies/security/. --------------------------------- Distributions of this software may include software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). --------------------------------- @@ -1465,11 +1465,11 @@ without prior written authorization of the copyright holder. + url='https://www.springframework.org'/> + url='https://github.com/kohlschutter/boilerpipe'/> + url='https://serp.sourceforge.net/'/> @@ -1496,32 +1496,32 @@ without prior written authorization of the copyright holder. + url='https://aopalliance.sourceforge.net/'/> + url='https://www.apache.org/'/> + url='https://www.tanukisoftware.com/'/> + url='https://www.ow2.org/'/> + url='https://www.qos.ch'/>