Merge branch 'master' of github.com:javascript-tutorial/en.javascript.info into sync-fb38a139

Author: iliakan

.gitattributes

@@ -1 +1,2 @@
 * text=auto eol=lf
+*.svg       binary

1-js/01-getting-started/2-manuals-specifications/article.md

@@ -24,7 +24,7 @@ Also, if you're in developing for the browser, then there are other specs covere
     Although, it's often best to use an internet search instead. Just use "MDN [term]" in the query, e.g. <https://google.com/search?q=MDN+parseInt> to search for `parseInt` function.
 
 
-- **MSDN** – Microsoft manual with a lot of information, including JavaScript (often referrerd to as JScript). If one needs something specific to Internet Explorer, better go there: <http://msdn.microsoft.com/>.
+- **MSDN** – Microsoft manual with a lot of information, including JavaScript (often referred to as JScript). If one needs something specific to Internet Explorer, better go there: <http://msdn.microsoft.com/>.
 
     Also, we can use an internet search with phrases such as "RegExp MSDN" or "RegExp MSDN jscript".
 

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';
 }
 ```
-

1-js/02-first-steps/13-switch/1-rewrite-switch-if-else/solution.md

@@ -4,14 +4,14 @@ For given strings though, a simple `'=='` works too.
 
 ```js no-beautify
 if(browser == 'Edge') {
-  alert("У вас браузер Edge!");
+  alert("You've got the Edge!");
 } else if (browser == 'Chrome'
  || browser == 'Firefox'
  || browser == 'Safari'
  || browser == 'Opera') {
-  alert( 'Мы поддерживаем и эти браузерыo' );
+  alert( 'Okay we support these browsers too' );
 } else {
-  alert( 'Надеемся, что эта страница выглядит хорошо!' );
+  alert( 'We hope that this page looks ok!' );
 }
 ```
 

1-js/02-first-steps/13-switch/1-rewrite-switch-if-else/task.md

@@ -9,17 +9,18 @@ Write the code using `if..else` which would correspond to the following `switch`
 ```js
 switch (browser) {
   case 'Edge':
-    alert( "У вас браузер Edge!" );
+    alert( "You've got the Edge!" );
     break;
 
   case 'Chrome':
   case 'Firefox':
   case 'Safari':
   case 'Opera':
-    alert( 'Мы поддерживаем и эти браузеры' );
+    alert( 'Okay we support these browsers too' );
     break;
 
   default:
-    alert( 'Надеемся, что эта страница выглядит хорошо!' );
+    alert( 'We hope that this page looks ok!' );
 }
 ```
+

1-js/02-first-steps/14-function-basics/4-pow/solution.md

@@ -14,7 +14,7 @@ let x = prompt("x?", '');
 let n = prompt("n?", '');
 
 if (n < 1) {
-  alert(`Степень ${n} не поддерживается, только целая, большая 0`);
+  alert(`Power ${n} is not supported, use a positive integer`);
 } else {
   alert( pow(x, n) );
 }

1-js/02-first-steps/14-function-basics/article.md

@@ -338,7 +338,19 @@ That doesn't work, because JavaScript assumes a semicolon after `return`. That'l
 return*!*;*/!*
  (some + long + expression + or + whatever * f(a) + f(b))
 ```
-So, it effectively becomes an empty return. We should put the value on the same line instead.
+
+So, it effectively becomes an empty return.
+
+If we want the returned expression to wrap across multiple lines, we should start it at the same line as `return`. Or at least put the opening parentheses there as follows:
+
+```js
+return (
+  some + long + expression
+  + or +
+  whatever * f(a) + f(b)
+  )
+```
+And it will work just as we expect it to.
 ````
 
 ## Naming a function [#function-naming]

1-js/02-first-steps/15-function-expressions-arrows/article.md

@@ -91,7 +91,7 @@ let sayHi = function() {
 
 The answer is simple:
 - There's no need for `;` at the end of code blocks and syntax structures that use them like `if { ... }`, `for {  }`, `function f { }` etc.
-- A Function Expression is used inside the statement: `let sayHi = ...;`, as a value. It's not a code block, but rather an assignment. The semicolon `;` is recommended at the end of statements, no matter what is the value. So the semicolon here is not related to the Function Expression itself, it just terminates the statement.
+- A Function Expression is used inside the statement: `let sayHi = ...;`, as a value. It's not a code block, but rather an assignment. The semicolon `;` is recommended at the end of statements, no matter what the value is. So the semicolon here is not related to the Function Expression itself, it just terminates the statement.
 ````
 
 ## Callback functions
@@ -133,7 +133,7 @@ ask("Do you agree?", showOk, showCancel);
 
 Before we explore how we can write it in a much shorter way, let's note that in the browser (and on the server-side in some cases) such functions are quite popular. The major difference between a real-life implementation and the example above is that real-life functions use more complex ways to interact with the user than a simple `confirm`. In the browser, such a function usually draws a nice-looking question window. But that's another story.
 
-**The arguments of `ask` are called *callback functions* or just *callbacks*.**
+**The arguments `showOk` and `showCancel` of `ask` are called *callback functions* or just *callbacks*.**
 
 The idea is that we pass a function and expect it to be "called back" later if necessary. In our case, `showOk` becomes the callback for the "yes" answer, and `showCancel` for the "no" answer.
 

1-js/04-object-basics/01-object/article.md

@@ -236,7 +236,7 @@ In that case the visitor may choose `__proto__` as the key, and the assignment l
 
 There is a way to make objects treat `__proto__` as a regular property, which we'll cover later, but first we need to know more about objects.
 
-There's also another data structure [Map](info:map-set-weakmap-weakset), that we'll learn in the chapter <info:map-set-weakmap-weakset>, which supports arbitrary keys.
+There's also another data structure [Map](info:map-set), that we'll learn in the chapter <info:map-set>, which supports arbitrary keys.
 ````
 
 

1-js/05-data-types/03-string/article.md

@@ -86,7 +86,7 @@ Here's the full list:
 |`\\`|Backslash|
 |`\t`|Tab|
 |`\b`, `\f`, `\v`| Backspace, Form Feed, Vertical Tab -- kept for compatibility, not used nowadays. |
-|`\xXX`|Unicode character with the given hexadimal unicode `XX`, e.g. `'\x7A'` is the same as `'z'`.|
+|`\xXX`|Unicode character with the given hexadecimal unicode `XX`, e.g. `'\x7A'` is the same as `'z'`.|
 |`\uXXXX`|A unicode symbol with the hex code `XXXX` in UTF-16 encoding, for instance `\u00A9` -- is a unicode for the copyright symbol `©`. It must be exactly 4 hex digits. |
 |`\u{X…XXXXXX}` (1 to 6 hex characters)|A unicode symbol with the given UTF-32 encoding. Some rare characters are encoded with two unicode symbols, taking 4 bytes. This way we can insert long codes. |