Skip to content

Commit

Permalink
Merge branch 'main' into issue-545-diagrams
Browse files Browse the repository at this point in the history
  • Loading branch information
bocchino committed Dec 4, 2024
2 parents 37d0b2b + 3286d87 commit f86f72e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
11 changes: 5 additions & 6 deletions docs/fpp-spec.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="generator" content="Asciidoctor 2.0.20">
<title>The F Prime Prime (FPP) Language Specification, Unreleased, after v2.2.0</title>
<title>The F Prime Prime (FPP) Language Specification, Unreleased, after v2.2.1</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
<style>
/*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
Expand Down Expand Up @@ -436,7 +436,7 @@
</head>
<body class="article toc2 toc-left">
<div id="header">
<h1>The F Prime Prime (FPP) Language Specification, Unreleased, after v2.2.0</h1>
<h1>The F Prime Prime (FPP) Language Specification, Unreleased, after v2.2.1</h1>
<div id="toc" class="toc2">
<div id="toctitle">Table of Contents</div>
<ul class="sectlevel1">
Expand Down Expand Up @@ -2798,7 +2798,7 @@ <h3 id="Definitions_State-Machine-Definitions">5.10. State Machine Definitions</
</div>
<div class="paragraph">
<p><strong>Implementation note:</strong>
As of FPP v2.2.0, only external state machine definitions are implemented.</p>
As of FPP v2.2.1, only external state machine definitions are implemented.</p>
</div>
<div class="sect3">
<h4 id="Definitions_State-Machine-Definitions_Syntax">5.10.1. Syntax</h4>
Expand Down Expand Up @@ -3902,8 +3902,7 @@ <h2 id="State-Machine-Behavior-Elements">6. State Machine Behavior Elements</h2>
</div>
<div class="paragraph">
<p><strong>Implementation note:</strong>
State machine behavior elements will not be implemented until Phase 2
of state machine support in FPP.</p>
As of FPP v2.2.1, state machine behavior elements are not implemented.</p>
</div>
<div class="sect2">
<h3 id="State-Machine-Behavior-Elements_Action-Definitions">6.1. Action Definitions</h3>
Expand Down Expand Up @@ -10580,7 +10579,7 @@ <h3 id="Analysis-and-Translation_Translation-Tools">22.4. Translation Tools</h3>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2024-12-04 15:22:19 -0800
Last updated 2024-12-04 15:30:17 -0800
</div>
</div>
<script src="code-prettify/run_prettify.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions docs/fpp-users-guide.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="generator" content="Asciidoctor 2.0.20">
<title>The F Prime Prime (FPP) User&#8217;s Guide, Unreleased, after v2.2.0</title>
<title>The F Prime Prime (FPP) User&#8217;s Guide, Unreleased, after v2.2.1</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
<style>
/*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
Expand Down Expand Up @@ -436,7 +436,7 @@
</head>
<body class="article toc2 toc-left">
<div id="header">
<h1>The F Prime Prime (FPP) User&#8217;s Guide, Unreleased, after v2.2.0</h1>
<h1>The F Prime Prime (FPP) User&#8217;s Guide, Unreleased, after v2.2.1</h1>
<div id="toc" class="toc2">
<div id="toctitle">Table of Contents</div>
<ul class="sectlevel1">
Expand Down Expand Up @@ -14754,7 +14754,7 @@ <h4 id="Writing-C-Plus-Plus-Implementations_Implementing-Deployments_Public-Symb
</div>
<div id="footer">
<div id="footer-text">
Last updated 2024-12-04 15:23:03 -0800
Last updated 2024-12-04 15:31:01 -0800
</div>
</div>
<script src="code-prettify/run_prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/spec/Definitions/State-Machine-Definitions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ specifies the behavior of a state machine and
causes an implementation to be generated.

*Implementation note:*
As of FPP v2.2.0, only external state machine definitions are implemented.
As of FPP v2.2.1, only external state machine definitions are implemented.

==== Syntax

Expand Down
3 changes: 1 addition & 2 deletions docs/spec/State-Machine-Behavior-Elements/Introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ associated with a
<<Definitions_State-Machine-Definitions,state machine definition>>.

*Implementation note:*
State machine behavior elements will not be implemented until Phase 2
of state machine support in FPP.
As of FPP v2.2.1, state machine behavior elements are not implemented.
2 changes: 1 addition & 1 deletion version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# The FPP version
# ----------------------------------------------------------------------

export VERSION="Unreleased, after v2.2.0"
export VERSION="Unreleased, after v2.2.1"

0 comments on commit f86f72e

Please sign in to comment.