Sync with upstream @ 246c600f

.gitignore

@@ -21,3 +21,4 @@ sftp-config.json
 Thumbs.db
 
 
+/svgs

1-js/01-getting-started/1-intro/article.md

@@ -39,17 +39,25 @@ Brauzerlar o'z JavaScript interpretatorlariga ega, ular gohida "JavaScript virtu
 
 Har bir intetptretatorni o'z nomi mavjud. Masalan:
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 - [V8](https://en.wikipedia.org/wiki/V8_(JavaScript_engine)) -- Chrome va Opera brauzerlarida qo'llanadi.
 - [SpiderMonkey](https://en.wikipedia.org/wiki/SpiderMonkey) -- Firefox brauzerida.
 - ...net Explorer brauerning turli xil versiyalari uchun "Trident" va "Chakra", Microsoft Edge uchun "ChakraCore", Safari uchun "Nitro" va "SquirrelFish" va boshqalar kabi boshqa kod nomlari mavjud.
 =======
 - [V8](https://en.wikipedia.org/wiki/V8_(JavaScript_engine)) -- in Chrome and Opera.
+=======
+- [V8](https://en.wikipedia.org/wiki/V8_(JavaScript_engine)) -- in Chrome, Opera and Edge.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 - [SpiderMonkey](https://en.wikipedia.org/wiki/SpiderMonkey) -- in Firefox.
 - ...There are other codenames like "Chakra" for IE, "JavaScriptCore", "Nitro" and "SquirrelFish" for Safari, etc.
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
 
+<<<<<<< HEAD
 Yuqoridagi atamalarni eslab qolish yaxshi, chunki ular netdagi ishlab chiquvchilar maqolalarida qo'llaniladi. Biz ulardan ham foydalanamiz. Masalan, agar "X funktsiyasini V8 qo'llab-quvvatlasa", ehtimol u Chrome va Opera-da ishlaydi.
+=======
+The terms above are good to remember because they are used in developer articles on the internet. We'll use them too. For instance, if "a feature X is supported by V8", then it probably works in Chrome, Opera and Edge.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 ```smart header="Intetptretatorlar ishni qanday bajarishadi?"
 
@@ -84,7 +92,11 @@ Masalan:
 
 ## JavaScript-da brauzerda nima qila olmaysiz?
 
+<<<<<<< HEAD
 JavaScript-ning brauzerdagi imkoniyatlari foydalanuvchi xavfsizligi uchun cheklangan. Maqsad yomon veb-sahifaning shaxsiy ma'lumotlarga kirishini yoki foydalanuvchi ma'lumotlariga zarar etkazishini oldini olishdir.
+=======
+JavaScript's abilities in the browser are limited for the sake of a user's safety. The aim is to prevent an evil webpage from accessing private information or harming the user's data.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 Bunday cheklovlarga quyidagilar kiradi:
 
@@ -117,10 +129,17 @@ Agar JavaScript brauzerdan tashqarida, masalan serverda ishlatilsa, bunday chekl
 
 JavaScript hech bo'lmaganda *uchta* ajoyib xususiyatga ega:
 
+<<<<<<< HEAD
 ```solishtiring
 + HTML va CSS bilan to'liq integratsiyasi.
 + Oson ishlar osongina amalga oshiriladi.
 + Barcha asosiy brauzerlar tomonidan qo'llab-quvvatlanadi va ularda standart sifatida yoqilgan.
+=======
+```compare
++ Full integration with HTML/CSS.
++ Simple things are done simply.
++ Supported by all major browsers and enabled by default.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 ```
 JavaScript - bu uchta narsani birlashtirgan yagona brauzer texnologiyasidir.
 
@@ -169,6 +188,6 @@ There are more. Of course, even if we use one of transpiled languages, we should
 ## Summary
 
 - JavaScript was initially created as a browser-only language, but it is now used in many other environments as well.
-- Today, JavaScript has a unique position as the most widely-adopted browser language with full integration in HTML/CSS.
+- Today, JavaScript has a unique position as the most widely-adopted browser language, fully integrated with HTML/CSS.
 - There are many languages that get "transpiled" to JavaScript and provide certain features. It is recommended to take a look at them, at least briefly, after mastering JavaScript.
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c

1-js/01-getting-started/3-code-editors/article.md

@@ -55,7 +55,6 @@ Bizning katta dunyoda boshqa buyuk muharrirlar ham bor. Iltimos, o'zingizga eng
 Muharriri tanlash, boshqa har qanday vositasi kabi, individual va loyihalar bog'liq, odatlar, va shaxsiy imtiyozlar.
 =======
 - [Atom](https://atom.io/) (cross-platform, free).
-- [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free).
 - [Sublime Text](http://www.sublimetext.com) (cross-platform, shareware).
 - [Notepad++](https://notepad-plus-plus.org/) (Windows, free).
 - [Vim](http://www.vim.org/) and [Emacs](https://www.gnu.org/software/emacs/) are also cool if you know how to use them.

1-js/02-first-steps/01-hello-world/article.md

@@ -91,13 +91,17 @@ Skript fayllari HTML-ga `src` atributi bilan biriktirilgan:
 <script src="/path/to/script.js"></script>
 ```
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 Bu erda, `/path/to/script.js` - bu skript fayliga (sayt ildizidan) mutlaq yo'l.
 
 Joriy sahifadan nisbiy yo'lni ham taqdim etishingiz mumkin. Masalan, `src="script.js"` joriy papkada `"script.js"` faylini bildiradi.
 =======
 Here, `/path/to/script.js` is an absolute path to the script from the site root. One can also provide a relative path from the current page. For instance, `src="script.js"` would mean a file `"script.js"` in the current folder.
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
+=======
+Here, `/path/to/script.js` is an absolute path to the script from the site root. One can also provide a relative path from the current page. For instance, `src="script.js"`, just like `src="./script.js"`, would mean a file `"script.js"` in the current folder.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 Biz to'liq URL manzilini ham berishimiz mumkin. Masalan:
 

1-js/02-first-steps/04-variables/article.md

@@ -28,7 +28,11 @@ Endi `=` tayinlash operatori yordamida unga ba'zi ma'lumotlarni kiritishimiz mum
 let message;
 
 *!*
+<<<<<<< HEAD
 message = 'Hello'; // matni saqlash
+=======
+message = 'Hello'; // store the string 'Hello' in the variable named message
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 */!*
 ```
 

1-js/02-first-steps/05-types/article.md

@@ -270,6 +270,7 @@ The `symbol` type is used to create unique identifiers for objects. We have to m
 
 `Typeof` operatori argument turini qaytaradi. Bu biz har xil turdagi qiymatlarni boshqacha ishlov berishni xohlaganimizda yoki tezkor tekshirishni xohlaganimizda foydalidir.
 
+<<<<<<< HEAD
 Ikkita shakili sintaksisning  qo'llab-quvvatlaydi:
 
 1. Operator sifatida: `typeof x`.
@@ -278,6 +279,9 @@ Ikkita shakili sintaksisning  qo'llab-quvvatlaydi:
 Boshqacha qilib aytganda, bu qavs bilan yoki ularsiz ishlaydi. Natija bir xil.
 
 `Typeof x`ning qo'ngiroq qilganda u matni argument turi bilan qaytaradi 
+=======
+A call to `typeof x` returns a string with the type name:
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 ```js
 typeof undefined // "undefined"
@@ -314,14 +318,28 @@ Oxirgi uchta satr qo'shimcha tushuntirishga muhtoj bo'lishi mumkin:
 
 =======
 1. `Math` is a built-in object that provides mathematical operations. We will learn it in the chapter <info:number>. Here, it serves just as an example of an object.
-2. The result of `typeof null` is `"object"`. That's an officially recognized error in `typeof` behavior, coming from the early days of JavaScript and kept for compatibility. Definitely, `null` is not an object. It is a special value with a separate type of its own.
+2. The result of `typeof null` is `"object"`. That's an officially recognized error in `typeof`, coming from very early days of JavaScript and kept for compatibility. Definitely, `null` is not an object. It is a special value with a separate type of its own. The behavior of `typeof` is wrong here.
 3. The result of `typeof alert` is `"function"`, because `alert` is a function. We'll study functions in the next chapters where we'll also see that there's no special "function" type in JavaScript. Functions belong to the object type. But `typeof` treats them differently, returning `"function"`. That also comes from the early days of JavaScript. Technically, such behavior isn't correct, but can be convenient in practice.
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
 
 ## Xulosa
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 JavaScript-da 7 ta asosiy ma'lumotlar turi mavjud.
+=======
+```smart header="The `typeof(x)` syntax"
+You may also come across another syntax: `typeof(x)`. It's the same as `typeof x`.
+
+To put it clear: `typeof` is an operator, not a function. The parentheses here aren't a part of `typeof`. It's the kind of parentheses used for mathematical grouping.
+
+Usually, such parentheses contain a mathematical expression, such as `(2 + 2)`, but here they contain only one argument `(x)`. Syntactically, they allow to avoid a space between the `typeof` operator and its argument, and some people like it.
+
+Some people prefer `typeof(x)`, although the `typeof x` syntax is much more common.
+```
+
+## Summary
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 - `number` har qanday turdagi raqamlar uchun: butun son yoki suzuvchi nuqta.
 - `string` matnlar uchun. Matnda bir yoki bir nechta belgi bo'lishi mumkin, alohida bitta belgi turi yo'q.
@@ -345,8 +363,14 @@ There are 8 basic data types in JavaScript.
 
 `Typeof` operatori bizga qaysi tur o'zgaruvchida saqlanganligini ko'rish imkonini beradi.
 
+<<<<<<< HEAD
 - Ikki shakl: `typeof x` yoki `typeof(x)`.
 - `"String"` kabi turdagi nomi bilan matni qaytaradi.
 - `Null` uchun `"object"` qaytaradi -- bu tilda xato, aslida bu ob'yekt emas.
+=======
+- Usually used as `typeof x`, but `typeof(x)` is also possible.
+- Returns a string with the name of the type, like `"string"`.
+- For `null` returns `"object"` -- this is an error in the language, it's not actually an object.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 Keyingi boblarda biz ibtidoiy qadriyatlarga e'tibor qaratamiz va ular bilan tanishib bo'lgach, ob'yektlarga o'tamiz.

1-js/02-first-steps/09-comparison/article.md

@@ -15,7 +15,7 @@ In JavaScript they are written like this:
 - Greater/less than: <code>a &gt; b</code>, <code>a &lt; b</code>.
 - Greater/less than or equals: <code>a &gt;= b</code>, <code>a &lt;= b</code>.
 - Equals: `a == b`, please note the double equality sign `==` means the equality test, while a single one `a = b` means an assignment.
-- Not equals. In maths the notation is <code>&ne;</code>, but in JavaScript it's written as <code>a != b</code>.
+- Not equals: In maths the notation is <code>&ne;</code>, but in JavaScript it's written as <code>a != b</code>.
 
 In this article we'll learn more about different types of comparisons, how JavaScript makes them, including important peculiarities.
 

1-js/02-first-steps/11-logical-operators/article.md

@@ -166,7 +166,7 @@ Bu "toza, mumtoz, faqat mantiqiy YOKI" bilan taqqoslaganda ba'zi qiziqarli foyda
 
     It means that `||` processes its arguments until the first truthy value is reached, and then the value is returned immediately, without even touching the other argument.
 
-    That importance of this feature becomes obvious if an operand isn't just a value, but an expression with a side effect, such as a variable assignment or a function call.
+    The importance of this feature becomes obvious if an operand isn't just a value, but an expression with a side effect, such as a variable assignment or a function call.
 
 <<<<<<< HEAD
     alert(x); // undefined, chunki (x = 1) baholanmagan

1-js/02-first-steps/13-while-for/article.md

@@ -119,6 +119,7 @@ Keling, `for` ifodani qisma ko'rib chiqamiz:
 
 | qism  |          |                                                                            |
 |-------|----------|----------------------------------------------------------------------------|
+<<<<<<< HEAD
 <<<<<<< HEAD:1-js/02-first-steps/12-while-for/article.md
 | boshlanishi | `i = 0`    | Tsikldan e'lon qilingandan keyin bir marta bajariladi.                                    |
 | shart | `i < 3`| Har bir tsikl takrorlashdan oldin tekshiriladi. Agar yolg'on bo'lsa, tsikl to'xtaydi.  |
@@ -129,6 +130,9 @@ Keling, `for` ifodani qisma ko'rib chiqamiz:
 Umumiy tsikl algoritmi quyidagicha ishlaydi:
 =======
 | begin | `i = 0`    | Executes once upon entering the loop.                                      |
+=======
+| begin | `let i = 0`    | Executes once upon entering the loop.                                      |
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 | condition | `i < 3`| Checked before every loop iteration. If false, the loop stops.              |
 | body | `alert(i)`| Runs again and again while the condition is truthy.                         |
 | step| `i++`      | Executes after the body on each iteration. |
@@ -438,7 +442,7 @@ label: {
 }
 ```
 
-...Although, 99.9% of the time `break` used is inside loops, as we've seen in the examples above.
+...Although, 99.9% of the time `break` is used inside loops, as we've seen in the examples above.
 
 A `continue` is only possible from inside a loop.
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c:1-js/02-first-steps/13-while-for/article.md

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

@@ -213,7 +213,7 @@ In other words, to put these terms straight:
 
 We declare functions listing their parameters, then call them passing arguments.
 
-In the example above, one might say: "the function `sayMessage` is declared with two parameters, then called with two arguments: `from` and `"Hello"`".
+In the example above, one might say: "the function `showMessage` is declared with two parameters, then called with two arguments: `from` and `"Hello"`".
 
 
 ## Default values
@@ -304,6 +304,7 @@ function showMessage(text) {
 showMessage(); // empty message
 ```
 
+<<<<<<< HEAD
 <<<<<<< HEAD:1-js/02-first-steps/14-function-basics/article.md
 ...Yoki `||` operatori:
 
@@ -313,6 +314,9 @@ function showMessage(from, text) {
   text = text || 'matn berilmagan';
 =======
 ...Or we could use the `??` operator:
+=======
+...Or we could use the `||` operator:
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 ```js
 function showMessage(text) {

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

@@ -16,14 +16,21 @@ function sayHi() {
 
 Funktsiyani yaratish uchun yana bir sintaksis mavjud, u *funktsiya ifodasi* deb nomlanadi.
 
+<<<<<<< HEAD
 Bu shunday ko'rinishga ega:
+=======
+It allows to create a new function in the middle of any expression.
+
+For example:
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 ```js
 let sayHi = function() {
   alert( "Salom" );
 };
 ```
 
+<<<<<<< HEAD
 Bu yerda funktsiya boshqa qiymatlar singari aniq ravishda yaratiladi va o'zgaruvchanga tayinlanadi. Funktsiya qanday aniqlangan bo'lishidan qat'iy nazar, bu faqat `sayHi` o'zgaruvchanida saqlanadigan qiymat.
 
 <<<<<<< HEAD:1-js/02-first-steps/15-function-expressions-arrows/article.md
@@ -32,6 +39,21 @@ Ushbu kod namunalarining ma'nosi bir xil: "funktsiyani yarating va uni `sayHi`"
 Hatto `alert` yordamida ushbu qiymatni chiqarishimiz mumkin:
 =======
 The meaning of these code samples is the same: "create a function and put it into the variable `sayHi`".
+=======
+Here we can see a variable `sayHi` getting a value, the new function, created as `function() { alert("Hello"); }`.
+
+As the function creation happens in the context of the assignment expression (to the right side of `=`), this is a *Function Expression*.
+
+Please note, there's no name after the `function` keyword. Omitting a name is allowed for Function Expressions.
+
+Here we immediately assign it to the variable, so the meaning of these code samples is the same: "create a function and put it into the variable `sayHi`".
+
+In more advanced situations, that we'll come across later, a function may be created and immediately called or scheduled for a later execution, not stored anywhere, thus remaining anonymous.
+
+## Function is a value
+
+Let's reiterate: no matter how the function is created, a function is a value. Both examples above store a function in the `sayHi` variable.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 We can even print out that value using `alert`:
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c:1-js/02-first-steps/16-function-expressions/article.md
@@ -85,10 +107,14 @@ Yuqorida nima batafsil sodir bo'lganligi:
 3. Now the function can be called as both `sayHi()` and `func()`.
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c:1-js/02-first-steps/16-function-expressions/article.md
 
+<<<<<<< HEAD
 E'tibor bering, biz birinchi satrda `sayHi` ni e'lon qilish uchun funktsiya ifodasidan foydalinishimiz mumkin edi:
+=======
+We could also have used a Function Expression to declare `sayHi`, in the first line:
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 ```js
-let sayHi = function() {
+let sayHi = function() { // (1) create
   alert( "Hello" );
 };
 
@@ -116,6 +142,7 @@ let sayHi = function() {
 }*!*;*/!*
 ```
 
+<<<<<<< HEAD
 <<<<<<< HEAD:1-js/02-first-steps/15-function-expressions-arrows/article.md
 Javob oddiy:
 - Kod bloklari va ularni ishlatadigan `if {...}`, `for {}`, `function f {}` va hokazo kabi sintaksis tuzilmalarining oxirida nuqta-vergul `;` qo'yish kerak emas.
@@ -125,6 +152,11 @@ 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 the value is. So the semicolon here is not related to the Function Expression itself, it just terminates the statement.
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c:1-js/02-first-steps/16-function-expressions/article.md
+=======
+The answer is simple: a Function Expression is created here as `function(…) {…}` inside the assignment statement: `let sayHi = …;`. The semicolon `;` is recommended at the end of the statement, it's not a part of the function syntax.
+
+The semicolon would be there for a simpler assignment, such as `let sayHi = 5;`, and it's also there for a function assignment.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 ````
 
 ## Qayta chaqirish funktsiyalari

1-js/02-first-steps/17-arrow-functions-basics/article.md

@@ -5,10 +5,10 @@ There's another very simple and concise syntax for creating functions, that's of
 It's called "arrow functions", because it looks like this:
 
 ```js
-let func = (arg1, arg2, ..., argN) => expression
+let func = (arg1, arg2, ..., argN) => expression;
 ```
 
-...This creates a function `func` that accepts arguments `arg1..argN`, then evaluates the `expression` on the right side with their use and returns its result.
+This creates a function `func` that accepts arguments `arg1..argN`, then evaluates the `expression` on the right side with their use and returns its result.
 
 In other words, it's the shorter version of:
 

1-js/03-code-quality/02-coding-style/article.md

@@ -398,11 +398,19 @@ The great thing about them is that style-checking can also find some bugs, like
 Here are some well-known linting tools:
 >>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
 
+<<<<<<< HEAD
 - [JSLint](http://www.jslint.com/) -- birinchi lintlardan biri.
 - [JSHint](http://www.jshint.com/) -- JSLint-dan ko'proq sozlamalar.
 - [ESLint](http://eslint.org/) -- ehtimol eng yangi.
 
 Ularning barchasi ishni bajarishi mumkin. Muallif [ESLint](http://eslint.org/) dan foydalanadi.
+=======
+- [JSLint](https://www.jslint.com/) -- one of the first linters.
+- [JSHint](https://jshint.com/) -- more settings than JSLint.
+- [ESLint](https://eslint.org/) -- probably the newest one.
+
+All of them can do the job. The author uses [ESLint](https://eslint.org/).
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 Aksariyat linterslar ko'plab taniqli muharrirlar bilan birlashtirilgan: muharriridagi plaginni yoqing va uslubni sozlang.
 
@@ -434,7 +442,11 @@ Bu erda `"extends"` direktivasi "eslint:recommended" sozlamalar to'plamiga asosl
 
 Shuningdek, uslublar qoidalari to'plamlarini Internetdan yuklab olish va oldingilarni o'rniga ularni kengaytirish mumkin. O'rnatish haqida batafsil ma'lumot uchun <http://eslint.org/docs/user-guide/getting-started> ga qarang.
 
+<<<<<<< HEAD
 Shuningdek, ba'zi bir IDE-larda ichki linting mavjud, bu qulay, ammo ESLint kabi moslashtirilmaydi.
+=======
+It is also possible to download style rule sets from the web and extend them instead. See <https://eslint.org/docs/user-guide/getting-started> for more details about installation.
+>>>>>>> 246c600f11b4e6c52b4ae14f83e65319671f998f
 
 ## Xulosa