Merge branch 'javascript-tutorial:master' into update-symbol

Author: odsantos

1-js/02-first-steps/01-hello-world/2-hello-alert-ext/task.md

@@ -1,9 +1,9 @@
-importância: 5
+importance: 5
 
 ---
 
 # Mostrar um alerta com um script externo
 
 Tome a solução da tarefa anterior <info:task/hello-alert>. Modifique-o extraindo o conteúdo do script para um arquivo externo `alert.js`, residindo na mesma pasta.
 
-Abra a página, verifique se o alerta funciona.
+Abra a página, verifique se o alerta funciona.

1-js/02-first-steps/04-variables/1-hello-variables/task.md

@@ -1,4 +1,4 @@
-importância: 2
+importance: 2
 
 ---
 

1-js/02-first-steps/04-variables/2-declare-variables/task.md

@@ -1,8 +1,8 @@
-importância: 3
+importance: 3
 
 ---
 
 # Dando o nome certo
 
 1. Criar uma variável com o nome do nosso planeta. Como você nomearia tal variável?
-2. Crie uma variável para armazenar o nome de um visitante atual em um site. Como você nomearia essa variável?
+2. Crie uma variável para armazenar o nome de um visitante atual em um site. Como você nomearia essa variável?

1-js/02-first-steps/04-variables/3-uppercast-constant/task.md

@@ -1,4 +1,4 @@
-importância: 4
+importance: 4
 
 ---
 

1-js/02-first-steps/05-types/1-string-quotes/task.md

@@ -1,4 +1,4 @@
-importância: 5
+importance: 5
 
 ---
 
@@ -14,4 +14,4 @@ alert( `olá ${1}` ); // ?
 alert( `olá ${"name"}` ); // ?
 
 alert( `olá ${name}` ); // ?
-```
+```

1-js/02-first-steps/07-type-conversions/1-primitive-conversions-questions/task.md

@@ -1,4 +1,4 @@
-importância: 5
+importance: 5
 
 ---
 
@@ -23,4 +23,4 @@ null + 1
 undefined + 1
 ```
 
-Pense bem, escreva e depois compare com a resposta.
+Pense bem, escreva e depois compare com a resposta.

1-js/02-first-steps/08-operators/3-primitive-conversions-questions/solution.md

@@ -22,4 +22,4 @@ undefined + 1 = NaN // (6)
 4. The subtraction always converts to numbers, so it makes `"  -9  "` a number `-9` (ignoring spaces around it).
 5. `null` becomes `0` after the numeric conversion.
 6. `undefined` becomes `NaN` after the numeric conversion.
-7. Space characters, are trimmed off string start and end when a string is converted to a number. Here the whole string consists of space characters, such as `\t`, `\n` and a "regular" space between them. So, similarly to an empty string, it becomes `0`.
+7. Space characters are trimmed off string start and end when a string is converted to a number. Here the whole string consists of space characters, such as `\t`, `\n` and a "regular" space between them. So, similarly to an empty string, it becomes `0`.

1-js/02-first-steps/08-operators/article.md

@@ -50,8 +50,9 @@ The result of `a % b` is the [remainder](https://en.wikipedia.org/wiki/Remainder
 For instance:
 
 ```js run
-alert( 5 % 2 ); // 1, a remainder of 5 divided by 2
-alert( 8 % 3 ); // 2, a remainder of 8 divided by 3
+alert( 5 % 2 ); // 1, the remainder of 5 divided by 2
+alert( 8 % 3 ); // 2, the remainder of 8 divided by 3
+alert( 8 % 4 ); // 0, the remainder of 8 divided by 4
 ```
 
 ### Exponentiation **
@@ -68,7 +69,7 @@ alert( 2 ** 3 ); // 2³ = 8
 alert( 2 ** 4 ); // 2⁴ = 16
 ```
 
-Just like in maths, the exponentiation operator is defined for non-integer numbers as well. 
+Just like in maths, the exponentiation operator is defined for non-integer numbers as well.
 
 For example, a square root is an exponentiation by ½:
 
@@ -80,7 +81,7 @@ alert( 8 ** (1/3) ); // 2 (power of 1/3 is the same as a cubic root)
 
 ## String concatenation with binary +
 
-Let's meet features of JavaScript operators that are beyond school arithmetics.
+Let's meet the features of JavaScript operators that are beyond school arithmetics.
 
 Usually, the plus operator `+` sums numbers.
 
@@ -194,18 +195,18 @@ Here's an extract from the [precedence table](https://developer.mozilla.org/en-U
 | Precedence | Name | Sign |
 |------------|------|------|
 | ... | ... | ... |
-| 15 | unary plus | `+` |
-| 15 | unary negation | `-` |
-| 14 | exponentiation | `**` |
-| 13 | multiplication | `*` |
-| 13 | division | `/` |
-| 12 | addition | `+` |
-| 12 | subtraction | `-` |
+| 14 | unary plus | `+` |
+| 14 | unary negation | `-` |
+| 13 | exponentiation | `**` |
+| 12 | multiplication | `*` |
+| 12 | division | `/` |
+| 11 | addition | `+` |
+| 11 | subtraction | `-` |
 | ... | ... | ... |
 | 2 | assignment | `=` |
 | ... | ... | ... |
 
-As we can see, the "unary plus" has a priority of `15` which is higher than the `12` of "addition" (binary plus). That's why, in the expression `"+apples + +oranges"`, unary pluses work before the addition.
+As we can see, the "unary plus" has a priority of `14` which is higher than the `11` of "addition" (binary plus). That's why, in the expression `"+apples + +oranges"`, unary pluses work before the addition.
 
 ## Assignment
 
@@ -303,9 +304,9 @@ Such operators have the same precedence as a normal assignment, so they run afte
 ```js run
 let n = 2;
 
-n *= 3 + 5;
+n *= 3 + 5; // right part evaluated first, same as n *= 8
 
-alert( n ); // 16  (right part evaluated first, same as n *= 8)
+alert( n ); // 16
 ```
 
 ## Increment/decrement
@@ -437,7 +438,7 @@ The list of operators:
 - RIGHT SHIFT ( `>>` )
 - ZERO-FILL RIGHT SHIFT ( `>>>` )
 
-These operators are used very rarely, when we need to fiddle with numbers on the very lowest (bitwise) level. We won't need these operators any time soon, as web development has little use of them, but in some special areas, such as cryptography, they are useful. You can read the [Bitwise Operators](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators#Bitwise) chapter on MDN when a need arises.
+These operators are used very rarely, when we need to fiddle with numbers on the very lowest (bitwise) level. We won't need these operators any time soon, as web development has little use of them, but in some special areas, such as cryptography, they are useful. You can read the [Bitwise Operators](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators#bitwise_operators) chapter on MDN when a need arises.
 
 ## Comma
 

1-js/02-first-steps/10-ifelse/5-rewrite-if-question/solution.md

@@ -1,6 +1,6 @@
 
 
 ```js
-result = (a + b < 4) ? 'Below' : 'Over';
+let result = (a + b < 4) ? 'Below' : 'Over';
 ```
 

1-js/02-first-steps/10-ifelse/5-rewrite-if-question/task.md

@@ -4,13 +4,14 @@ importance: 5
 
 # Rewrite 'if' into '?'
 
-Rewrite this `if` using the ternary operator `'?'`:
+Rewrite this `if` using the conditional operator `'?'`:
 
 ```js
+let result;
+
 if (a + b < 4) {
   result = 'Below';
 } else {
   result = 'Over';
 }
 ```
-