This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-site.git
The following commit(s) were added to refs/heads/main by this push:
new ede2e85 Resolve Apache Conscious Language Checker findings
ede2e85 is described below
commit ede2e85bf542c0b2a98fc14b831571b0f68cc2c8
Author: Steve Lawrence <[email protected]>
AuthorDate: Mon Aug 30 09:31:07 2021 -0400
Resolve Apache Conscious Language Checker findings
DAFFODIL-2557
---
README.md | 2 +-
site/_releases/2.5.0.md | 2 +-
site/_releases/2.6.0.md | 2 +-
site/_releases/3.1.0.md | 2 +-
site/assets/themes/apache/jquery/jquery-2.1.1.js | 4 ++--
site/configuration.md | 2 +-
site/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js | 2 +-
site/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js | 2 +-
site/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js | 2 +-
site/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js | 2 +-
site/docs/dfdl/index.html | 2 +-
site/eclipse-configuration.md | 14 +++++++-------
site/tdml.md | 14 +++++++-------
site/tutorials/DFDLTutorialStylesheet.xsl | 3 ++-
14 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index d184c8b..aa2bf06 100644
--- a/README.md
+++ b/README.md
@@ -76,5 +76,5 @@ but using the website repo instead of the code repo.
Daffodil uses [gitpubsub](https://www.apache.org/dev/gitpubsub.html) for
publishing to the website. The static content served via apache must be served
in the ``content`` directory on the ``asf-site`` orphan branch. When the
changes
-are merged into the master branch on GitHub, a GitHub action will automatically
+are merged into the main branch on GitHub, a GitHub action will automatically
be triggered and it will perform the necessary steps to publish the site.
diff --git a/site/_releases/2.5.0.md b/site/_releases/2.5.0.md
index 90e8d3f..e5f4236 100644
--- a/site/_releases/2.5.0.md
+++ b/site/_releases/2.5.0.md
@@ -32,7 +32,7 @@ Java or Scala. To add new functions, the
UserDefinedFunctionProvider and
UserDefinedFunction interfaces must be implemented, compiled into a jar, and
added to the classpath. Once defined, the function can then be called just like
a normal DFDL expression function, such as ``pre:myUserDefinedFunction(args)``.
-For more information on usage, see the [User Defined
Function](https://github.com/apache/incubator-daffodil/tree/master/daffodil-udf)
+For more information on usage, see the [User Defined
Function](https://github.com/apache/daffodil/tree/main/daffodil-udf)
page.
* {% jira 2186 %} User defined functions for DPath expressions
diff --git a/site/_releases/2.6.0.md b/site/_releases/2.6.0.md
index 949ea8d..78b8b83 100644
--- a/site/_releases/2.6.0.md
+++ b/site/_releases/2.6.0.md
@@ -37,7 +37,7 @@ Multiple performance updates focused on schema compilation,
hidden group referen
#### Sonarcloud
-The master branch of Daffodil was configured to be scanned by Static Analysis
tool, Sonarqube, when PRs are merged.
+The main branch of Daffodil was configured to be scanned by Static Analysis
tool, Sonarqube, when PRs are merged.
* {% jira 2272 %} Address Findings from Trial Sonarqube Run
* {% jira 2300 %} SonarCloud action is triggered on forks and fails
diff --git a/site/_releases/3.1.0.md b/site/_releases/3.1.0.md
index 37e6839..742f6e8 100644
--- a/site/_releases/3.1.0.md
+++ b/site/_releases/3.1.0.md
@@ -133,7 +133,7 @@ namespace/prefix properties and improved unparse
performance.
* {% jira 2477 %} --validate option requires parameter
* {% jira 2484 %} Upgrade CI to Java 16
* {% jira 2491 %} Allow custom Debuggers through API
-* {% jira 2495 %} Need way to dry-run release candidates from repos/branches
other than apache/daffodil@master
+* {% jira 2495 %} Need way to dry-run release candidates from repos/branches
other than apache/daffodil@main
* {% jira 2503 %} Add back missing unit tests for Coroutines library
* {% jira 2506 %} Remove bintray.com
* {% jira 2514 %} Prepare for 3.1.0 Release
diff --git a/site/assets/themes/apache/jquery/jquery-2.1.1.js
b/site/assets/themes/apache/jquery/jquery-2.1.1.js
index 9f7b3d3..363a8c7 100644
--- a/site/assets/themes/apache/jquery/jquery-2.1.1.js
+++ b/site/assets/themes/apache/jquery/jquery-2.1.1.js
@@ -3299,7 +3299,7 @@ jQuery.extend({
// the count of uncompleted subordinates
remaining = length !== 1 || ( subordinate &&
jQuery.isFunction( subordinate.promise ) ) ? length : 0,
- // the master Deferred. If resolveValues consist of
only a single Deferred, just use that.
+ // the main Deferred. If resolveValues consist of only
a single Deferred, just use that.
deferred = remaining === 1 ? subordinate :
jQuery.Deferred(),
// Update function for both resolve and progress values
@@ -3334,7 +3334,7 @@ jQuery.extend({
}
}
- // if we're not waiting on anything, resolve the master
+ // if we're not waiting on anything, resolve the main
if ( !remaining ) {
deferred.resolveWith( resolveContexts, resolveValues );
}
diff --git a/site/configuration.md b/site/configuration.md
index c8a8f98..d68aa05 100644
--- a/site/configuration.md
+++ b/site/configuration.md
@@ -22,7 +22,7 @@ limitations under the License.
{% endcomment %}
-->
-Daffodil has the capability to read in parameters via an external XML file,
defined by the
[dafext.xsd](https://github.com/apache/daffodil/blob/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd)
schema. Below are the parameters that can be defined.
+Daffodil has the capability to read in parameters via an external XML file,
defined by the
[dafext.xsd](https://github.com/apache/daffodil/blob/main/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd)
schema. Below are the parameters that can be defined.
### External Variables
diff --git a/site/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js
b/site/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js
index 7c3be68..ea55f7f 100644
--- a/site/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js
+++ b/site/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js
@@ -4,6 +4,6 @@
* Add pan and zoom functionality to any element
* Copyright (c) 2014 timmy willison
* Released under the MIT license
- * https://github.com/timmywil/jquery.panzoom/blob/master/MIT-License.txt
+ * https://github.com/timmywil/jquery.panzoom/blob/main/MIT-License.txt
*/
!function(a,b){"function"==typeof
define&&define.amd?define(["jquery"],function(c){return
b(a,c)}):"object"==typeof
exports?b(a,require("jquery")):b(a,a.jQuery)}("undefined"!=typeof
window?window:this,function(a,b){"use strict";function c(a,b){for(var
c=a.length;--c;)if(+a[c]!==+b[c])return!1;return!0}function d(a){var
c={range:!0,animate:!0};return"boolean"==typeof
a?c.animate=a:b.extend(c,a),c}function
e(a,c,d,e,f,g,h,i,j){this.elements="array"===b.type(a)?[+a[0],+a[2],+a[4],+a[1],+a[3
[...]
\ No newline at end of file
diff --git a/site/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js
b/site/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js
index 7c3be68..ea55f7f 100644
--- a/site/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js
+++ b/site/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js
@@ -4,6 +4,6 @@
* Add pan and zoom functionality to any element
* Copyright (c) 2014 timmy willison
* Released under the MIT license
- * https://github.com/timmywil/jquery.panzoom/blob/master/MIT-License.txt
+ * https://github.com/timmywil/jquery.panzoom/blob/main/MIT-License.txt
*/
!function(a,b){"function"==typeof
define&&define.amd?define(["jquery"],function(c){return
b(a,c)}):"object"==typeof
exports?b(a,require("jquery")):b(a,a.jQuery)}("undefined"!=typeof
window?window:this,function(a,b){"use strict";function c(a,b){for(var
c=a.length;--c;)if(+a[c]!==+b[c])return!1;return!0}function d(a){var
c={range:!0,animate:!0};return"boolean"==typeof
a?c.animate=a:b.extend(c,a),c}function
e(a,c,d,e,f,g,h,i,j){this.elements="array"===b.type(a)?[+a[0],+a[2],+a[4],+a[1],+a[3
[...]
\ No newline at end of file
diff --git a/site/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js
b/site/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js
index 7c3be68..ea55f7f 100644
--- a/site/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js
+++ b/site/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js
@@ -4,6 +4,6 @@
* Add pan and zoom functionality to any element
* Copyright (c) 2014 timmy willison
* Released under the MIT license
- * https://github.com/timmywil/jquery.panzoom/blob/master/MIT-License.txt
+ * https://github.com/timmywil/jquery.panzoom/blob/main/MIT-License.txt
*/
!function(a,b){"function"==typeof
define&&define.amd?define(["jquery"],function(c){return
b(a,c)}):"object"==typeof
exports?b(a,require("jquery")):b(a,a.jQuery)}("undefined"!=typeof
window?window:this,function(a,b){"use strict";function c(a,b){for(var
c=a.length;--c;)if(+a[c]!==+b[c])return!1;return!0}function d(a){var
c={range:!0,animate:!0};return"boolean"==typeof
a?c.animate=a:b.extend(c,a),c}function
e(a,c,d,e,f,g,h,i,j){this.elements="array"===b.type(a)?[+a[0],+a[2],+a[4],+a[1],+a[3
[...]
\ No newline at end of file
diff --git a/site/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js
b/site/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js
index 7c3be68..ea55f7f 100644
--- a/site/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js
+++ b/site/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js
@@ -4,6 +4,6 @@
* Add pan and zoom functionality to any element
* Copyright (c) 2014 timmy willison
* Released under the MIT license
- * https://github.com/timmywil/jquery.panzoom/blob/master/MIT-License.txt
+ * https://github.com/timmywil/jquery.panzoom/blob/main/MIT-License.txt
*/
!function(a,b){"function"==typeof
define&&define.amd?define(["jquery"],function(c){return
b(a,c)}):"object"==typeof
exports?b(a,require("jquery")):b(a,a.jQuery)}("undefined"!=typeof
window?window:this,function(a,b){"use strict";function c(a,b){for(var
c=a.length;--c;)if(+a[c]!==+b[c])return!1;return!0}function d(a){var
c={range:!0,animate:!0};return"boolean"==typeof
a?c.animate=a:b.extend(c,a),c}function
e(a,c,d,e,f,g,h,i,j){this.elements="array"===b.type(a)?[+a[0],+a[2],+a[4],+a[1],+a[3
[...]
\ No newline at end of file
diff --git a/site/docs/dfdl/index.html b/site/docs/dfdl/index.html
index 704613c..720afab 100644
--- a/site/docs/dfdl/index.html
+++ b/site/docs/dfdl/index.html
@@ -16822,7 +16822,7 @@ dfdl:lengthKind 'endOfParent' and the end of the
parent. </p>
<p class=MsoNormal style='text-autospace:none'><span style='color:black'>A
convenient way of describing the parent is as a 'box', being defined as a
portion of the data stream that has an established content length prior to the
-parsing of its children. If t</span>he parent is such a ‘box’ then
+parsing of its children. If </span>the parent is such a ‘box’ then
the element specifying dfdl:lengthKind ‘endOfParent’ is the last
element in the ‘box’ and its content extends to the end of the
‘box’.</p>
diff --git a/site/eclipse-configuration.md b/site/eclipse-configuration.md
index 4b5f32a..556187a 100644
--- a/site/eclipse-configuration.md
+++ b/site/eclipse-configuration.md
@@ -61,13 +61,13 @@ If also editing TDML file in Eclipse, repeat the above
steps, replacing all inst
Download the following files to a local directory. Alternatively, these files
are included in the Daffodil source code in the
``src/main/resources/org/apache/daffodil/xsd/`` directory in either
``daffodil-lib/`` or ``daffodil-propgen/``.
-*
[datatypes.dtd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd)
-*
[tdml.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd)
-*
[XMLSchema.dtd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd)
-*
[XMLSchema_for_DFDL.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd)
-*
[DFDL_part1_simpletypes.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd)
-*
[DFDL_part2_attributes.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd)
-*
[DFDL_part3_model.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part3_model.xsd)
+*
[datatypes.dtd](https://raw.githubusercontent.com/apache/daffodil/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd)
+*
[tdml.xsd](https://raw.githubusercontent.com/apache/daffodil/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd)
+*
[XMLSchema.dtd](https://raw.githubusercontent.com/apache/daffodil/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd)
+*
[XMLSchema_for_DFDL.xsd](https://raw.githubusercontent.com/apache/daffodil/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd)
+*
[DFDL_part1_simpletypes.xsd](https://raw.githubusercontent.com/apache/daffodil/main/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd)
+*
[DFDL_part2_attributes.xsd](https://raw.githubusercontent.com/apache/daffodil/main/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd)
+*
[DFDL_part3_model.xsd](https://raw.githubusercontent.com/apache/daffodil/main/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part3_model.xsd)
Modify the Eclipse settings to reference these files:
diff --git a/site/tdml.md b/site/tdml.md
index 45946d5..e87e565 100644
--- a/site/tdml.md
+++ b/site/tdml.md
@@ -40,7 +40,7 @@ absolutely best way to demonstrate a problem.
By convention, a TDML file uses the file extension ``.tdml``, or ``.tdml.xml``
when used with the TDML "tutorial" feature.
-The schema for a TDML file is available on
[GitHub](https://github.com/apache/daffodil/blob/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd).
+The schema for a TDML file is available on
[GitHub](https://github.com/apache/daffodil/blob/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd).
Below is an annotated TDML file for a very simple example:
@@ -440,9 +440,9 @@ a bit clumsy as you have to do it like this where each text
line gets its own
documentPart:
```xml
-<documentPart type="text" replaceDFDLEntities="true"><![CDATA[Of all the gin
joints%CR;%LF;]]></documentPart>
-<documentPart type="text" replaceDFDLEntities="true"><![CDATA[In all the towns
in the world%CR;%LF;]]></documentPart>
-<documentPart type="text" replaceDFDLEntities="true"><![CDATA[She walked into
mine%CR;%LF;]]></documentPart>
+<documentPart type="text" replaceDFDLEntities="true"><![CDATA[Daffodil is an
open source implementation%CR;%LF;]]></documentPart>
+<documentPart type="text" replaceDFDLEntities="true"><![CDATA[of the DFDL
specification%CR;%LF;]]></documentPart>
+<documentPart type="text" replaceDFDLEntities="true"><![CDATA[that uses these
DFDL schemas%CR;%LF;]]></documentPart>
```
So the general rule is that CDATA regions cannot be used to ensure that
@@ -457,9 +457,9 @@ some other obscure Unicode line ending characters. In that
case, the original
documentPart XML:
```xml
-<documentPart type="text"><![CDATA[Of all the gin joints
-In all the towns of the world
-She walked into mine
+<documentPart type="text"><![CDATA[Daffodil is an open source implementation
+of the DFDL specification
+that uses these DFDL schemas
]]></documentPart>
```
diff --git a/site/tutorials/DFDLTutorialStylesheet.xsl
b/site/tutorials/DFDLTutorialStylesheet.xsl
index 50087e2..d1bd731 100644
--- a/site/tutorials/DFDLTutorialStylesheet.xsl
+++ b/site/tutorials/DFDLTutorialStylesheet.xsl
@@ -259,7 +259,8 @@
<script
src="https://daffodil.apache.org/assets/themes/apache/jquery/jquery-2.1.1.min.js";></script>
<script
src="https://daffodil.apache.org/assets/themes/apache/bootstrap/js/bootstrap.min.js";></script>
</body>
- <script
src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js";></script>
+ <script
src="https://cdn.jsdelivr.net/gh/google/code-prettify@e006587b4a893f0281e9dc9a53001c7ed584d4e7/loader/run_prettify.js";></script>
+
</html>
</xsl:template>
