Merge branch 'alpha-8' into alpha-8-orgs-move

assets/styles/tools/_icomoon.scss

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icomoon';
-  src:  url('fonts/icomoon.eot?s76ef');
-  src:  url('fonts/icomoon.eot?s76ef#iefix') format('embedded-opentype'),
-    url('fonts/icomoon.ttf?s76ef') format('truetype'),
-    url('fonts/icomoon.woff?s76ef') format('woff'),
-    url('fonts/icomoon.svg?s76ef#icomoon') format('svg');
+  src:  url('fonts/icomoon.eot?972u0y');
+  src:  url('fonts/icomoon.eot?972u0y#iefix') format('embedded-opentype'),
+    url('fonts/icomoon.ttf?972u0y') format('truetype'),
+    url('fonts/icomoon.woff?972u0y') format('woff'),
+    url('fonts/icomoon.svg?972u0y#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -24,6 +24,15 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-ui-chat:before {
+  content: "\e93a";
+}
+.icon-ui-cloud:before {
+  content: "\e93f";
+}
+.icon-ui-nav-chat:before {
+  content: "\e941";
+}
 .icon-ui-add-cell:before {
   content: "\e91f";
 }

content/v2.0/reference/flux/language/expressions.md

@@ -169,7 +169,8 @@ Operators with a lower number have higher precedence.
 |          | `>` `>=` |                           |
 |          |`=~` `!~` |                           |
 |     5    |  `not`   | Unary logical expression  |
-|     6    |`and` `or`|    Logical AND and OR     |
+|     6    |  `and`   |        Logical AND        |
+|     7    |  `or`    |        Logical OR         |
 
 The operator precedence is encoded directly into the grammar as the following.
 

content/v2.0/reference/flux/language/operators.md

@@ -20,6 +20,10 @@ Flux includes the following types of operators:
 - [Literal constructors](#literal-constructors)
 - [Miscellaneous operators](#miscellaneous-operators)
 
+_Also see:_
+
+- [Operator precedence](#operator-precedence)
+
 ## Arithmetic operators
 Arithmetic operators take two numerical values (either literals or variables) and
 perform a calculation that returns a single numerical value.
@@ -114,9 +118,28 @@ Literal constructors define fixed values.
 | `""`     | String       |
 
 ## Miscellaneous operators
-| Operator | Description         | Example                     |
-|:--------:|:-----------         | -------                     |
-| `( )`    | Logical grouping    | `r._value / (r._value * 2)` |
-| `,`      | Sequence delimiter  | `item1, item2, item3`       |
-| `:`      | Key-value separator | `{name: "Bob"}`             |
-| `.`      | Dot reference       | `r._measurement`            |
+| Operator | Description                   | Example                     |
+|:--------:|:-----------                   | -------                     |
+| `( )`    | Logical grouping              | `r._value / (r._value * 2)` |
+| `,`      | Sequence delimiter            | `item1, item2, item3`       |
+| `:`      | Key-value separator           | `{name: "Bob"}`             |
+| `.`      | Member access / dot reference | `r._measurement`            |
+
+## Operator precedence
+The table below outlines operator precedence.
+Operators with a lower number have higher precedence.
+
+|Precedence | Operator  | Description                |
+|:--------- |:--------: |:-----------                |
+| 1         | `a()`     | Function call              |
+|           | `a[]`     | Member or index access     |
+|           | `.`       | Member access              |
+| 2         | `*` `/`   | Multiplication and division|
+| 3         | `+` `-`   | Addition and subtraction   |
+| 4         | `==` `!=` | Comparison operators       |
+|           | `<` `<=`  |                            |
+|           | `>` `>=`  |                            |
+|           | `=~` `!~` |                            |
+| 5         | `not`     | Unary logical expression   |
+| 6         | `and`     | Logical AND                |
+| 7         | `or`      | Logical OR                 |

content/v2.0/reference/flux/release-notes.md

@@ -9,10 +9,22 @@ menu:
 ---
 
 {{% note %}}
-_The latest release of InfluxDB v2.0 alpha includes **Flux v0.24.0**.
-Any newer versions of Flux will not be available until the next InfluxDB release._
+_The latest release of InfluxDB v2.0 alpha includes **Flux v0.25.0**.
+Though newer versions of Flux may be available, they will not be included with
+InfluxDB until the next InfluxDB v2.0 release._
 {{% /note %}}
 
+## v0.25.0 [2019-04-08]
+
+## Breaking changes
+- Fix logical operators (`and`, `or`) precedence.
+
+## Bug fixes
+- Omit space between unary operator and operand.
+- Format AST preserving operator precedence.
+
+---
+
 ## v0.24.0 [2019-04-01]
 
 ### Breaking changes
@@ -22,6 +34,8 @@ Any newer versions of Flux will not be available until the next InfluxDB release
 - Handle when a non-call expression is parsed as the pipe destination.
 - Add error message to Compile methods for empty Spec.
 
+---
+
 ## v0.23.0 [2019-03-26]
 
 ### Breaking changes

layouts/partials/article/_alpha-feedback.html

@@ -4,6 +4,10 @@
   <p>
     Thank you for being willing to help test InfluxDB v2.0 alpha!
     Feedback and bug reports are welcome and encouraged both for InfluxDB and this documentation.
+    Submit feedback using one of the following methods:
   </p>
-  <p><a href="https://community.influxdata.com/c/influxdb2" target="_blank">Submit feedback in the InfluxData Community</a></p>
+  <ul>
+    <li><a href="https://community.influxdata.com/c/influxdb2" target="_blank">Post in the InfluxData Community</a></li>
+    <li>In the <strong>InfluxDB UI</strong>, click <strong><span class="icon-ui-chat" style="vertical-align:text-top;font-size:1.15rem;margin:0 .25rem 0;"></span> Feedback</strong> in the left navigation bar.</li>
+  </ul>
 </div>

layouts/shortcodes/icon.html

@@ -11,7 +11,7 @@
 {{ else if or (eq $icon "nav-organizations") (eq $icon "nav-orgs") (eq $icon "orgs") (eq $icon "org") }}
 <span class="inline icon-ui-organizations middle"></span>
 {{ else if or (eq $icon "nav-configuration") (eq $icon "nav-config") (eq $icon "wrench") }}
-<span class="inline icon-ui-wrench middle large"></span>
+<span class="inline icon-ui-wrench-2 middle large"></span>
 {{ else if eq $icon "add-cell" }}
 <span class="inline icon-ui-add-cell small"></span>
 {{ else if eq $icon "alert" }}
@@ -48,6 +48,10 @@
 <span class="inline icon-ui-trash small"></span>
 {{ else if eq $icon "triangle" }}
 <span class="inline icon-ui-triangle middle"></span>
+{{ else if eq $icon "cloud" }}
+<span class="inline icon-ui-cloud large"></span>
+{{ else if or (eq $icon "feedback") (eq $icon "chat") (eq $icon "bubble") }}
+<span class="inline icon-ui-chat large"></span>
 {{ else if eq $icon "add-label" }}
 <span class="inline add-btn-round">&#59696;</span>
 {{ end }}

layouts/shortcodes/nav-icon.html

@@ -14,9 +14,15 @@
 {{ else if or (eq $navIcon "organizations") (eq $navIcon "orgs") }}
   {{ .Scratch.Set "icon" "organizations" }}
   {{ .Scratch.Set "title" "Organizations" }}
-{{ else if or (eq $navIcon "configuration") (eq $navIcon "config") }}
-  {{ .Scratch.Set "icon" "wrench" }}
-  {{ .Scratch.Set "title" "Configuration" }}
+{{ else if eq $navIcon "settings" }}
+  {{ .Scratch.Set "icon" "wrench-2" }}
+  {{ .Scratch.Set "title" "Settings" }}
+{{ else if or (eq $navIcon "feedback") }}
+  {{ .Scratch.Set "icon" "chat" }}
+  {{ .Scratch.Set "title" "Feedback" }}
+{{ else if or (eq $navIcon "cloud") }}
+  {{ .Scratch.Set "icon" "cloud" }}
+  {{ .Scratch.Set "title" "Cloud" }}
 {{ end }}
 
 {{ $icon := .Scratch.Get "icon" }}