This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/daffodil-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 926cfcb  Publishing from 6a0f94c2f185a6840740f21b8b3dc762a8a40d3e
926cfcb is described below

commit 926cfcbca7659a766537db3f1ff52c814e534dab
Author: Steve Lawrence <[email protected]>
AuthorDate: Fri Sep 3 14:24:01 2021 +0000

    Publishing from 6a0f94c2f185a6840740f21b8b3dc762a8a40d3e
---
 content/assets/themes/apache/jquery/jquery-2.1.1.js   |  4 ++--
 content/configuration/index.html                      |  2 +-
 content/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js |  2 +-
 content/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js |  2 +-
 content/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js |  2 +-
 content/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js |  2 +-
 content/docs/dfdl/index.html                          |  2 +-
 content/eclipse-configuration/index.html              | 14 +++++++-------
 content/releases/2.5.0/index.html                     |  2 +-
 content/releases/2.6.0/index.html                     |  2 +-
 content/releases/3.1.0/index.html                     |  2 +-
 content/tdml/index.html                               | 14 +++++++-------
 content/tutorials/DFDLTutorialStylesheet.xsl          |  3 ++-
 13 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/content/assets/themes/apache/jquery/jquery-2.1.1.js 
b/content/assets/themes/apache/jquery/jquery-2.1.1.js
index 9f7b3d3..363a8c7 100644
--- a/content/assets/themes/apache/jquery/jquery-2.1.1.js
+++ b/content/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/content/configuration/index.html b/content/configuration/index.html
index 7c7773a..c1d19e4 100644
--- a/content/configuration/index.html
+++ b/content/configuration/index.html
@@ -87,7 +87,7 @@
 
 -->
 
-<p>Daffodil has the capability to read in parameters via an external XML file, 
defined by the <a 
href="https://github.com/apache/daffodil/blob/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd";>dafext.xsd</a>
 schema. Below are the parameters that can be defined.</p>
+<p>Daffodil has the capability to read in parameters via an external XML file, 
defined by the <a 
href="https://github.com/apache/daffodil/blob/main/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd";>dafext.xsd</a>
 schema. Below are the parameters that can be defined.</p>
 
 <h3 id="external-variables">External Variables</h3>
 
diff --git a/content/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js 
b/content/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js
index 7c3be68..ea55f7f 100644
--- a/content/docs/2.2.0/scaladoc/lib/jquery.panzoom.min.js
+++ b/content/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/content/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js 
b/content/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js
index 7c3be68..ea55f7f 100644
--- a/content/docs/2.3.0/scaladoc/lib/jquery.panzoom.min.js
+++ b/content/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/content/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js 
b/content/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js
index 7c3be68..ea55f7f 100644
--- a/content/docs/2.4.0/scaladoc/lib/jquery.panzoom.min.js
+++ b/content/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/content/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js 
b/content/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js
index 7c3be68..ea55f7f 100644
--- a/content/docs/2.5.0/scaladoc/lib/jquery.panzoom.min.js
+++ b/content/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/content/docs/dfdl/index.html b/content/docs/dfdl/index.html
index 704613c..720afab 100644
--- a/content/docs/dfdl/index.html
+++ b/content/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 &#8216;box&#8217; then
+parsing of its children. If </span>the parent is such a &#8216;box&#8217; then
 the element specifying dfdl:lengthKind &#8216;endOfParent&#8217; is the last
 element in the &#8216;box&#8217; and its content extends to the end of the
 &#8216;box&#8217;.</p>
diff --git a/content/eclipse-configuration/index.html 
b/content/eclipse-configuration/index.html
index e99332a..1b7708d 100644
--- a/content/eclipse-configuration/index.html
+++ b/content/eclipse-configuration/index.html
@@ -141,13 +141,13 @@
 <p>Download the following files to a local directory. Alternatively, these 
files are included in the Daffodil source code in the <code 
class="language-plaintext 
highlighter-rouge">src/main/resources/org/apache/daffodil/xsd/</code> directory 
in either <code class="language-plaintext 
highlighter-rouge">daffodil-lib/</code> or <code class="language-plaintext 
highlighter-rouge">daffodil-propgen/</code>.</p>
 
 <ul>
-  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd";>datatypes.dtd</a></li>
-  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd";>tdml.xsd</a></li>
-  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd";>XMLSchema.dtd</a></li>
-  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd";>XMLSchema_for_DFDL.xsd</a></li>
-  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd";>DFDL_part1_simpletypes.xsd</a></li>
-  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd";>DFDL_part2_attributes.xsd</a></li>
-  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part3_model.xsd";>DFDL_part3_model.xsd</a></li>
+  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd";>datatypes.dtd</a></li>
+  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd";>tdml.xsd</a></li>
+  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd";>XMLSchema.dtd</a></li>
+  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd";>XMLSchema_for_DFDL.xsd</a></li>
+  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/main/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd";>DFDL_part1_simpletypes.xsd</a></li>
+  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/main/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd";>DFDL_part2_attributes.xsd</a></li>
+  <li><a 
href="https://raw.githubusercontent.com/apache/daffodil/main/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part3_model.xsd";>DFDL_part3_model.xsd</a></li>
 </ul>
 
 <p>Modify the Eclipse settings to reference these files:</p>
diff --git a/content/releases/2.5.0/index.html 
b/content/releases/2.5.0/index.html
index 11eb7cc..6c969f6 100644
--- a/content/releases/2.5.0/index.html
+++ b/content/releases/2.5.0/index.html
@@ -249,7 +249,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 <code class="language-plaintext 
highlighter-rouge">pre:myUserDefinedFunction(args)</code>.
-For more information on usage, see the <a 
href="https://github.com/apache/incubator-daffodil/tree/master/daffodil-udf";>User
 Defined Function</a>
+For more information on usage, see the <a 
href="https://github.com/apache/daffodil/tree/main/daffodil-udf";>User Defined 
Function</a>
 page.</p>
 
 <ul>
diff --git a/content/releases/2.6.0/index.html 
b/content/releases/2.6.0/index.html
index fb0182c..9ae5466 100644
--- a/content/releases/2.6.0/index.html
+++ b/content/releases/2.6.0/index.html
@@ -257,7 +257,7 @@ Run the folllowing command:
 
 <h4 id="sonarcloud">Sonarcloud</h4>
 
-<p>The master branch of Daffodil was configured to be scanned by Static 
Analysis tool, Sonarqube, when PRs are merged.</p>
+<p>The main branch of Daffodil was configured to be scanned by Static Analysis 
tool, Sonarqube, when PRs are merged.</p>
 
 <ul>
   <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2272";>DAFFODIL-2272</a>] 
Address Findings from Trial Sonarqube Run</li>
diff --git a/content/releases/3.1.0/index.html 
b/content/releases/3.1.0/index.html
index 7a54ced..1167f04 100644
--- a/content/releases/3.1.0/index.html
+++ b/content/releases/3.1.0/index.html
@@ -360,7 +360,7 @@ namespace/prefix properties and improved unparse 
performance.</p>
   <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2477";>DAFFODIL-2477</a>] 
–validate option requires parameter</li>
   <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2484";>DAFFODIL-2484</a>] 
Upgrade CI to Java 16</li>
   <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2491";>DAFFODIL-2491</a>] 
Allow custom Debuggers through API</li>
-  <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2495";>DAFFODIL-2495</a>] 
Need way to dry-run release candidates from repos/branches other than 
apache/daffodil@master</li>
+  <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2495";>DAFFODIL-2495</a>] 
Need way to dry-run release candidates from repos/branches other than 
apache/daffodil@main</li>
   <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2503";>DAFFODIL-2503</a>] 
Add back missing unit tests for Coroutines library</li>
   <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2506";>DAFFODIL-2506</a>] 
Remove bintray.com</li>
   <li>[<a 
href="https://issues.apache.org/jira/browse/DAFFODIL-2514";>DAFFODIL-2514</a>] 
Prepare for 3.1.0 Release</li>
diff --git a/content/tdml/index.html b/content/tdml/index.html
index da8fe24..a90d900 100644
--- a/content/tdml/index.html
+++ b/content/tdml/index.html
@@ -103,7 +103,7 @@ absolutely best way to demonstrate a problem.</p>
 <p>By convention, a TDML file uses the file extension <code 
class="language-plaintext highlighter-rouge">.tdml</code>, or <code 
class="language-plaintext highlighter-rouge">.tdml.xml</code>
 when used with the TDML "tutorial" feature.</p>
 
-<p>The schema for a TDML file is available on <a 
href="https://github.com/apache/daffodil/blob/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd";>GitHub</a>.</p>
+<p>The schema for a TDML file is available on <a 
href="https://github.com/apache/daffodil/blob/main/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd";>GitHub</a>.</p>
 
 <p>Below is an annotated TDML file for a very simple example:</p>
 
@@ -486,9 +486,9 @@ encoding is say, UTF-16 or the 7-bit encoding.</p>
 a bit clumsy as you have to do it like this where each text line gets its own
 documentPart:</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;documentPart</span> <span 
class="na">type=</span><span class="s">"text"</span> <span 
class="na">replaceDFDLEntities=</span><span class="s">"true"</span><span 
class="nt">&gt;</span><span class="cp">&lt;![CDATA[Of all the gin 
joints%CR;%LF;]]&gt;</span><span class="nt">&lt;/documentPart&gt;</span>
-<span class="nt">&lt;documentPart</span> <span class="na">type=</span><span 
class="s">"text"</span> <span class="na">replaceDFDLEntities=</span><span 
class="s">"true"</span><span class="nt">&gt;</span><span 
class="cp">&lt;![CDATA[In all the towns in the world%CR;%LF;]]&gt;</span><span 
class="nt">&lt;/documentPart&gt;</span>
-<span class="nt">&lt;documentPart</span> <span class="na">type=</span><span 
class="s">"text"</span> <span class="na">replaceDFDLEntities=</span><span 
class="s">"true"</span><span class="nt">&gt;</span><span 
class="cp">&lt;![CDATA[She walked into mine%CR;%LF;]]&gt;</span><span 
class="nt">&lt;/documentPart&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;documentPart</span> <span 
class="na">type=</span><span class="s">"text"</span> <span 
class="na">replaceDFDLEntities=</span><span class="s">"true"</span><span 
class="nt">&gt;</span><span class="cp">&lt;![CDATA[Daffodil is an open source 
implementation%CR;%LF;]]&gt;</span><span class="nt">&lt;/documentPart&gt;</span>
+<span class="nt">&lt;documentPart</span> <span class="na">type=</span><span 
class="s">"text"</span> <span class="na">replaceDFDLEntities=</span><span 
class="s">"true"</span><span class="nt">&gt;</span><span 
class="cp">&lt;![CDATA[of the DFDL specification%CR;%LF;]]&gt;</span><span 
class="nt">&lt;/documentPart&gt;</span>
+<span class="nt">&lt;documentPart</span> <span class="na">type=</span><span 
class="s">"text"</span> <span class="na">replaceDFDLEntities=</span><span 
class="s">"true"</span><span class="nt">&gt;</span><span 
class="cp">&lt;![CDATA[that uses these DFDL schemas%CR;%LF;]]&gt;</span><span 
class="nt">&lt;/documentPart&gt;</span>
 </code></pre></div></div>
 
 <p>So the general rule is that CDATA regions cannot be used to ensure that
@@ -502,9 +502,9 @@ preserve <em>some</em> line endings. If this same test 
example was instead using
 some other obscure Unicode line ending characters. In that case, the original
 documentPart XML:</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;documentPart</span> <span 
class="na">type=</span><span class="s">"text"</span><span 
class="nt">&gt;</span><span class="cp">&lt;![CDATA[Of all the gin joints
-In all the towns of the world
-She walked into mine
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;documentPart</span> <span 
class="na">type=</span><span class="s">"text"</span><span 
class="nt">&gt;</span><span class="cp">&lt;![CDATA[Daffodil is an open source 
implementation
+of the DFDL specification
+that uses these DFDL schemas
 ]]&gt;</span><span class="nt">&lt;/documentPart&gt;</span>
 </code></pre></div></div>
 
diff --git a/content/tutorials/DFDLTutorialStylesheet.xsl 
b/content/tutorials/DFDLTutorialStylesheet.xsl
index 50087e2..d1bd731 100644
--- a/content/tutorials/DFDLTutorialStylesheet.xsl
+++ b/content/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>
 

Reply via email to