This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-whisker.git
The following commit(s) were added to refs/heads/master by this push:
new 6da95f2 Fix typos and use https in some URIs
6da95f2 is described below
commit 6da95f2de014fd91d4a91bb24bf6b4cafc50164b
Author: P. Ottlinger <[email protected]>
AuthorDate: Thu Jul 18 00:03:45 2024 +0200
Fix typos and use https in some URIs
---
src/site/apt/index.apt | 10 +++----
src/site/apt/meta-data.apt | 66 +++++++++++++++++++++++-----------------------
2 files changed, 38 insertions(+), 38 deletions(-)
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 <<<id>>> for an organisation;
- * use the {{{http://www.opensource.org} Open Source Initiative}} code as the
<<<id>>>
+ * use the {{{https://www.opensource.org} Open Source Initiative}} code as
the <<<id>>>
for an open source license
Note that <<<organisation>>> 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 <<<public-domain>>>
blocks <<<within>>> a directory.
A <<<resource>>> in the public domain should be grouped <<<by-organisation>>>
within the <<<public-domain>>>
@@ -277,7 +277,7 @@ Apache Whisker Meta-Data Model
(for example <This products contains software developed by the Apache
Software Foundation>)
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 <<<copyright-notice>>> from <<<license>>> 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.
<license
name='MIT License'
id='MIT'
- url='http://www.opensource.org/licenses/mit-license.php'>
+ url='https://www.opensource.org/licenses/mit-license.php'>
<text>
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.
</text>
</license>
<license name='COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
Version 1.0' id='CDDL'
- url='http://www.opensource.org/licenses/CDDL-1.0'
requires-source='yes'>
+ url='https://www.opensource.org/licenses/CDDL-1.0'
requires-source='yes'>
<text>
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
@@ -1031,7 +1031,7 @@ of liability.
</text>
</license>
<license name='MIT License' id='MIT'
- url='http://www.opensource.org/licenses/mit-license.php'>
+ url='https://www.opensource.org/licenses/mit-license.php'>
<text>
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.
</text>
</license>
<license name='BSD (3-clause)' id='BSD3ClauseGeneric'
- url='http://www.opensource.org/licenses/BSD-3-Clause'>
+ url='https://www.opensource.org/licenses/BSD-3-Clause'>
<text>
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.
</license>
<license name='BSD (3-clause)' id ='BSD3Clause'
- url='http://www.opensource.org/licenses/BSD-3-Clause'>
+ url='https://www.opensource.org/licenses/BSD-3-Clause'>
<template>
<parameter-name>organisation</parameter-name>
</template>
@@ -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.
</text>
</license>
- <license name='Bouncy Castle Licence' id='BouncyCastleLicense'
url='http://www.bouncycastle.org/licence.html'>
+ <license name='Bouncy Castle Licence' id='BouncyCastleLicense'
url='https://www.bouncycastle.org/licence.html'>
<text>
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.
<organisation
id='SpringFramework'
name='The Spring Framework Project'
- url='http://www.springframework.org'/>
+ url='https://www.springframework.org'/>
<organisation
id='Boilerpipe'
name='Boilerpipe'
- url='http://code.google.com/p/boilerpipe/'/>
+ url='https://github.com/kohlschutter/boilerpipe'/>
<organisation
id='person:John.Cowan'
name='John Cowan'
@@ -1477,7 +1477,7 @@ without prior written authorization of the copyright
holder.
/>
<organisation
id='TheLegionoftheBouncyCastle'
- url='http://www.bouncycastle.org/'
+ url='https://www.bouncycastle.org/'
name='The Legion of the Bouncy Castle'
/>
<organisation
@@ -1486,7 +1486,7 @@ without prior written authorization of the copyright
holder.
<organisation
id='serp.sourceforge.net'
name = "The Serp Project"
- url='http://serp.sourceforge.net/'/>
+ url='https://serp.sourceforge.net/'/>
<organisation
id='person:Drew.Noakes'
name='Drew Noakes'/>
@@ -1496,32 +1496,32 @@ without prior written authorization of the copyright
holder.
<organisation
id='TheAOPAlliance'
name='The AOP Alliance'
- url='http://aopalliance.sourceforge.net/'/>
+ url='https://aopalliance.sourceforge.net/'/>
<organisation
id='apache.org'
name='The Apache Software Foundation'
- url='http://www.apache.org/'/>
+ url='https://www.apache.org/'/>
<organisation
id='TanukiSoftware'
name='Tanuki Software'
- url='http://www.tanukisoftware.com/'/>
+ url='https://www.tanukisoftware.com/'/>
<organisation
id='OW2'
name='OW2'
- url='http://www.ow2.org/'/>
+ url='https://www.ow2.org/'/>
<organisation
id='qos.ch'
name='QOS.ch'
- url='http://www.qos.ch'/>
+ url='https://www.qos.ch'/>
<organisation
id='jboss.org'
name='JBoss, a division of Red Hat, Inc.'
- url='http://www.jboss.org'
+ url='https://www.jboss.org'
/>
<organisation
id='oracle.com'
name='Oracle'
- url='http://www.oracle.com'
+ url='https://www.oracle.com'
/>
<organisation
id='fusesource.org'
@@ -1547,7 +1547,7 @@ Apache JAMES Server
Copyright 1999-${year} The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
</primary-notice>
<primary-organisation id='apache.org'/>
