javascript-tutorial · UyCode · Apr 14, 2025 · Mar 29, 2025 · Apr 2, 2025 · Apr 2, 2025
diff --git a/1-js/01-getting-started/4-devtools/article.md b/1-js/01-getting-started/4-devtools/article.md
@@ -19,7 +19,7 @@
 ئاچقۇچىلار قوراللىرى سۈكۈتتىكى ھالەتتە كونسول بېتىدە ئېچىلىدۇ.
 نەتىجىدە ئۈستىدىكى مەزمۇن قارىماققا مۇنداق كۆرۈنىدۇ:
 
-![chrome](chrome.png)
+![chrome](chrome.webp)
 
 ئاچقۇچىلار قوراللىرىنىڭ كونكرېت قىياپىتى سىزنىڭ Chrome تور كۆرگۈچىڭىزنىڭ نۇسخىسىغا باغلىق. ئۇ پات-پات ئۆزگىرىدۇ، ئەمما ئاساسىي شەكلى ئوخشاش بولىدۇ.
 - ؜بۇ يەردە قىزىل رەڭلىك خاتالىق ئۇچۇرىنى كۆرىۋالالايمىز. بۇنداق ئەھۋالدا Script دا نامەلۇم «lalala» دىگەن بۇيرۇق بار.
@@ -42,10 +42,14 @@
 
 ئۇلارنىڭ چىرايى ۋە بىزگە بىردىغان تەسىراتى خېلىلا ئوخشىشىپ كېتىدۇ. بۇ قوراللاردىن بىرىنى قانداق ئىشلىتىشنى بىلسىڭىز (Chrome دىن باشلىسىڭىز بولىدۇ)، باشقىلىرىنىڭ ئاچقۇچىلار قوراللىرىغا ئاسانلا ئالماشتۇرۇپ ئىشلىتىپ كىتەلەيسىز.
 
+<<<<<<< HEAD
 ## سافارى تور كۆرگۈچ (Safari)
 
 ؜Safari (Windows/Linux لار قوللىمايدىغان Mac تور كۆرگۈچى) بۇ يەردە سەل ئالاھىدە. بىز ئاۋۋال «ئاچقۇچى تىزىملىكى» (Developer menu) نى قوزغىتىشىمىز كېرەك.
 تەڭشەكنى ئاچىمىز ۋە «ئىلغار» (Advanced) نى چىكىمىز. ئاستى تەرەپتە بىر توغرا بەلگىسى قويىدىغان تاللاش تەڭشىكى بار:
+=======
+Open Settings and go to the "Advanced" pane. There's a checkbox at the bottom:
+>>>>>>> 540d753e90789205fc6e75c502f68382c87dea9b
 
 ![safari](safari.png)
 

diff --git a/1-js/01-getting-started/4-devtools/chrome.png b/1-js/01-getting-started/4-devtools/chrome.png
diff --git a/1-js/01-getting-started/4-devtools/chrome.webp b/1-js/01-getting-started/4-devtools/chrome.webp
diff --git a/1-js/01-getting-started/4-devtools/chrome@2.webp b/1-js/01-getting-started/4-devtools/chrome@2.webp
diff --git a/1-js/01-getting-started/4-devtools/chrome@2x.png b/1-js/01-getting-started/4-devtools/chrome@2x.png
diff --git a/1-js/01-getting-started/4-devtools/safari.png b/1-js/01-getting-started/4-devtools/safari.png
diff --git a/1-js/01-getting-started/4-devtools/safari@2x.png b/1-js/01-getting-started/4-devtools/safari@2x.png
diff --git a/1-js/06-advanced-functions/06-function-object/article.md b/1-js/06-advanced-functions/06-function-object/article.md
@@ -326,7 +326,7 @@ welcome(); // Hello, Guest (nested call works)
 
 Now it works, because the name `"func"` is function-local. It is not taken from outside (and not visible there). The specification guarantees that it will always reference the current function.
 
-The outer code still has its variable `sayHi` or `welcome`. And `func` is an "internal function name", the way for the function to can call itself reliably.
+The outer code still has its variable `sayHi` or `welcome`. And `func` is an "internal function name", the way for the function to call itself reliably.
 
 ```smart header="There's no such thing for Function Declaration"
 The "internal name" feature described here is only available for Function Expressions, not for Function Declarations. For Function Declarations, there is no syntax for adding an "internal" name.

diff --git a/1-js/06-advanced-functions/10-bind/article.md b/1-js/06-advanced-functions/10-bind/article.md
@@ -125,7 +125,7 @@ funcUser(); // John
 */!*
 ```
 
-Here `func.bind(user)` as a "bound variant" of `func`, with fixed `this=user`.
+Here `func.bind(user)` is a "bound variant" of `func`, with fixed `this=user`.
 
 All arguments are passed to the original `func` "as is", for instance:
 

diff --git a/1-js/10-error-handling/1-try-catch/article.md b/1-js/10-error-handling/1-try-catch/article.md
@@ -632,7 +632,7 @@ For instance:
 
 The role of the global handler `window.onerror` is usually not to recover the script execution -- that's probably impossible in case of programming errors, but to send the error message to developers.
 
-There are also web-services that provide error-logging for such cases, like <https://errorception.com> or <https://www.muscula.com>.
+There are also web-services that provide error-logging for such cases, like <https://muscula.com> or <https://www.sentry.io>.
 
 They work like this:
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,7 +125,7 @@ funcUser(); // John @@
     */!*
     ```
-    Here `func.bind(user)` as a "bound variant" of `func`, with fixed `this=user`.
+    Here `func.bind(user)` is a "bound variant" of `func`, with fixed `this=user`.
     All arguments are passed to the original `func` "as is", for instance:
@@ Expand Down @@