Skip to content

Commit b0228a1

Browse files
authored
Merge branch 'main' into ff142_doc_urlpattern
2 parents d46a777 + 405633a commit b0228a1

File tree

246 files changed

+1739
-976
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+1739
-976
lines changed

.github/PULL_REQUEST_TEMPLATE

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<!-- 🙌 Thanks for contributing to MDN Web Docs. 🙌
1+
<!-- 🙌 Thanks for contributing to MDN Web Docs. 🙌 -->
22

3+
<!--
34
Add details below to help us review your pull request (PR).
45
Explain your changes and link to a related issue or pull request.
5-
Your PR may be delayed or closed if you don't provide enough information. -->
6+
Your PR may be delayed or closed if you don't provide enough information.
7+
-->
68

79
### Description
810

.github/workflows/pr-check-lint_content.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
echo "${EOF}" >> "$GITHUB_OUTPUT"
4848
4949
# Also set a simple flag for whether we have files
50-
if [ -n "${FILTERED_MD_FILES// /}" ]; then # Remove all spaces and check if anything remains
50+
if [ -n "${FILTERED_FILES// /}" ]; then # Remove all spaces and check if anything remains
5151
echo "HAS_FILES=true" >> "$GITHUB_OUTPUT"
5252
else
5353
echo "HAS_FILES=false" >> "$GITHUB_OUTPUT"

files/en-us/glossary/callback_function/index.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,24 @@ doSomething(() => {
2020
value = 2;
2121
});
2222

23-
console.log(value);
23+
console.log(value); // 1 or 2?
2424
```
2525

2626
If `doSomething` calls the callback synchronously, then the last statement would log `2` because `value = 2` is synchronously executed; otherwise, if the callback is asynchronous, the last statement would log `1` because `value = 2` is only executed after the `console.log` statement.
2727

28-
Examples of synchronous callbacks include the callbacks passed to {{jsxref("Array.prototype.map()")}}, {{jsxref("Array.prototype.forEach()")}}, etc. Examples of asynchronous callbacks include the callbacks passed to {{domxref("Window.setTimeout", "setTimeout()")}} and {{jsxref("Promise.prototype.then()")}}.
28+
Examples of synchronous callbacks include the callbacks passed to {{jsxref("Array.prototype.map()")}}, {{jsxref("Array.prototype.forEach()")}}, etc. Examples of asynchronous callbacks include the callbacks passed to {{domxref("Window.setTimeout", "setTimeout()")}} and {{jsxref("Promise.prototype.then()")}}. Here are example implementations of `doSomething` that call the callback synchronously and asynchronously:
29+
30+
```js
31+
// Synchronous
32+
function doSomething(callback) {
33+
callback();
34+
}
35+
36+
// Asynchronous
37+
function doSomething(callback) {
38+
setTimeout(callback, 0);
39+
}
40+
```
2941

3042
The [Using promises](/en-US/docs/Web/JavaScript/Guide/Using_promises#timing) guide has more information on the timing of asynchronous callbacks.
3143

files/en-us/learn_web_development/changelog/index.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ page-type: landing-page
55
sidebar: learnsidebar
66
---
77

8+
## August 2025
9+
10+
In the summer of 2025, we completed work on significant changes to the structure and positioning of our "Test your skills" articles and other reader exercises:
11+
12+
- The "Test your skills" article content has been updated so that the language and approach in each one is consistent. For example, all of the old interactive editors have been replaced with live sample exercises that make use of the [MDN Playground](/en-US/play), and most of the repetitive boilerplate has been consolidated into a single [Test your skills help section](/en-US/docs/Learn_web_development#test_your_skills).
13+
- The position of the "Test your skills" articles in the navigation has been updated. Instead of being available from "Test your skills" submenus and linked to from the end of associated tutorials, the articles now appear in the sidebar and in the previous/next links. They are now mandatory articles in the flow, rather than optional resources.
14+
- The reader exercises in the tutorials have also been modernized, to replace old code editors and make language consistent.
15+
816
## December 2024
917

1018
A major update to the Learn web development section was started in November 2024 and finally published in December 2024. To summarize, the MDN Curriculum has been merged into Learn web development.
@@ -15,6 +23,6 @@ Specifically:
1523
- Specific learning outcomes have been added to the top of most of the articles, to match the learning outcomes detailed in the Curriculum.
1624
- Other features from the Curriculum have been migrated across to the Learn Web Development section, such as the [About](/en-US/docs/Learn_web_development/About) page and [Resources for educators](/en-US/docs/Learn_web_development/Educators).
1725

18-
The Curriculum is being kept for the moment, but can be considered deprecated and will be removed when it is felt the time is right.
26+
The [original curriculum pages](/en-US/curriculum/) are being kept as a summary of the Learn web development content that is useful for educators when planning curricula.
1927

2028
Moving forward, we will continue to update the content and design to make Learn web development even more useful to learners and educators.

files/en-us/learn_web_development/core/css_layout/multiple-column_layout/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ body {
386386
background-color: rgb(207 232 220);
387387
border: 2px solid rgb(79 185 227);
388388
padding: 10px;
389-
margin: 0 0 1em 0;
389+
margin-bottom: 1em;
390390
}
391391
```
392392

@@ -402,7 +402,7 @@ To control this behavior, we can use properties from the [CSS Fragmentation](/en
402402
background-color: rgb(207 232 220);
403403
border: 2px solid rgb(79 185 227);
404404
padding: 10px;
405-
margin: 0 0 1em 0;
405+
margin-bottom: 1em;
406406
}
407407
```
408408

files/en-us/learn_web_development/core/css_layout/practical_positioning_examples/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Next, we'll style the buttons to look like tabs. Add the following CSS:
162162

163163
```css
164164
.info-box [role="tab"] {
165-
padding: 0 1rem 0 1rem;
165+
padding: 0 1rem;
166166
line-height: 3rem;
167167
background: white;
168168
color: #b60000;

files/en-us/learn_web_development/core/scripting/return_values/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ There's one last essential concept about functions for us to discuss — return
1919
<th scope="row">Learning outcomes:</th>
2020
<td>
2121
<ul>
22-
<li>What returns values are.</li>
22+
<li>What return values are.</li>
2323
<li>How to use the return values of existing functions.</li>
2424
<li>Adding return values to your own functions.</li>
2525
</ul>

files/en-us/learn_web_development/core/structuring_content/advanced_text_features/index.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ page-type: tutorial-chapter
55
sidebar: learnsidebar
66
---
77

8-
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Structuring_documents", "Learn_web_development/Core/Structuring_content/Creating_links", "Learn_web_development/Core/Structuring_content")}}
8+
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Structuring_documents", "Learn_web_development/Core/Structuring_content/Test_your_skills/Advanced_HTML_text", "Learn_web_development/Core/Structuring_content")}}
99

1010
There are many other elements in HTML for defining text semantics, which we didn't get to in the [Emphasis and importance](/en-US/docs/Learn_web_development/Core/Structuring_content/Emphasis_and_importance) article. The elements described in this article are less known, but still useful to know about (and this is still not a complete list by any means). Here you'll learn about marking up quotations, computer code and other related text, subscript and superscript, contact information, and more.
1111

@@ -395,12 +395,10 @@ The basic example above just provides a simple machine readable date, but there
395395
<time datetime="2016-W04">The fourth week of 2016</time>
396396
```
397397

398-
## Test your skills!
399-
400-
You've reached the end of this article, but can you remember the most important information? You can find some further tests to verify that you've retained this information before you move on — see [Test your skills: Advanced HTML text](/en-US/docs/Learn_web_development/Core/Structuring_content/Test_your_skills/Advanced_HTML_text).
401-
402398
## Summary
403399

404-
That marks the end of our study of less-common HTML text semantics. What you have seen during this course is not an exhaustive list of HTML text elements — we wanted to try to cover the essentials, and some of the more common ones you will see in the wild. Next up, we'll look at links, one of the most important features of the web.
400+
That marks the end of our study of less-common HTML text semantics. What you have seen during this course is not an exhaustive list of HTML text elements — we wanted to try to cover the essentials, and some of the more common ones you will see in the wild.
401+
402+
Next up, we'll give you some tests that you can use to check how well you've understood and retained the information we've provided on less-common HTML text features.
405403

406-
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Structuring_documents", "Learn_web_development/Core/Structuring_content/Creating_links", "Learn_web_development/Core/Structuring_content")}}
404+
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Structuring_documents", "Learn_web_development/Core/Structuring_content/Test_your_skills/Advanced_HTML_text", "Learn_web_development/Core/Structuring_content")}}

files/en-us/learn_web_development/core/structuring_content/creating_links/index.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ page-type: tutorial-chapter
55
sidebar: learnsidebar
66
---
77

8-
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Advanced_text_features", "Learn_web_development/Core/Structuring_content/Marking_up_a_letter", "Learn_web_development/Core/Structuring_content")}}
8+
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Test_your_skills/Advanced_HTML_text", "Learn_web_development/Core/Structuring_content/Test_your_skills/Links", "Learn_web_development/Core/Structuring_content")}}
99

1010
Links (also known as hyperlinks) are really important — they are what makes the Web _a web_.
1111
This article shows the syntax required to make a link, and discusses link best practices.
@@ -466,12 +466,8 @@ Here are a few other sample `mailto` URLs:
466466
467467
- <mailto:[email protected][email protected]&subject=This%20is%20the%20subject>
468468

469-
## Test your skills!
470-
471-
You've reached the end of this article, but can you remember the most important information? You can find some further tests to verify that you've retained this information before you move on — see [Test your skills: Links](/en-US/docs/Learn_web_development/Core/Structuring_content/Test_your_skills/Links).
472-
473469
## Summary
474470

475-
That's it for links, for now anyway! You'll return to links later on in the course when you start to look at styling them. Next up for HTML, you're going to work through a couple of challenges that will test your comprehension of the topics you've covered so far.
471+
That's it for links, for now anyway! You'll return to links later on in the course when you start to look at styling them. Next up, we'll give you some tests that you can use to check how well you've understood and retained the information we've provided on links.
476472

477-
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Advanced_text_features", "Learn_web_development/Core/Structuring_content/Marking_up_a_letter", "Learn_web_development/Core/Structuring_content")}}
473+
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Test_your_skills/Advanced_HTML_text", "Learn_web_development/Core/Structuring_content/Test_your_skills/Links", "Learn_web_development/Core/Structuring_content")}}

files/en-us/learn_web_development/core/structuring_content/debugging_html/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ page-type: learn-module-chapter
55
sidebar: learnsidebar
66
---
77

8-
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/HTML_forms", "Learn_web_development/Core/Styling_basics", "Learn_web_development/Core/Structuring_content")}}
8+
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Test_your_skills/Forms_and_buttons", "Learn_web_development/Core/Styling_basics", "Learn_web_development/Core/Structuring_content")}}
99

1010
Writing HTML is fine, but what if something goes wrong, and you can't work out where the error in the code is? This article will introduce you to some tools that can help you find and fix errors in HTML.
1111

@@ -229,4 +229,4 @@ You will know when all your errors are fixed when you see a nice little green ba
229229

230230
So there we have it, an introduction to debugging HTML, which should give you some useful skills to count on when debugging HTML, but also CSS and JavaScript code later on in the course. This also marks the end of the _Structuring content with HTML_ module.
231231

232-
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/HTML_forms", "Learn_web_development/Core/Styling_basics", "Learn_web_development/Core/Structuring_content")}}
232+
{{PreviousMenuNext("Learn_web_development/Core/Structuring_content/Test_your_skills/Forms_and_buttons", "Learn_web_development/Core/Styling_basics", "Learn_web_development/Core/Structuring_content")}}

0 commit comments

Comments
 (0)