Skip to content

Commit aa0e679

Browse files
authored
Merge branch 'main' into css/color-interpolation-filters
2 parents 87ab91b + 041d9aa commit aa0e679

File tree

322 files changed

+642
-1010
lines changed

Some content is hidden

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

322 files changed

+642
-1010
lines changed

.markdownlint.jsonc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,19 @@
212212
"searchPattern": "/(\\[[^\\]]*?\\]\\(([^\\)\\n]|\\([^\\)\\n]\\)|\\s[\"'])+?)(\\n|\\s|[,:][\\s\\n])/gm",
213213
"searchScope": "text",
214214
},
215+
{
216+
"name": "text-code-fence",
217+
"message": "Use 'plain' tag",
218+
"searchPattern": "/(^ *`{3,})(text|none|unix)/gm",
219+
"replace": "$1plain",
220+
"searchScope": "text",
221+
},
222+
{
223+
"name": "gfm-blockquote",
224+
"message": "Use the GFM syntax: https://developer.mozilla.org/en-US/docs/MDN/Writing_guidelines/Howto/Markdown_in_MDN#notes_warnings_and_callouts",
225+
"searchPattern": "/^ *> \\*\\*(Note|Warning|Callout):\\*\\*(?! [[{`_*])/gm",
226+
"searchScope": "text",
227+
},
215228
],
216229
},
217230
}

files/en-us/_redirects.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3603,6 +3603,7 @@
36033603
/en-US/docs/Glossary/Rendering_engine /en-US/docs/Glossary/Engine/Rendering
36043604
/en-US/docs/Glossary/Responsive_design /en-US/docs/Glossary/Responsive_web_design
36053605
/en-US/docs/Glossary/Round_Trip_Time_(RTT) /en-US/docs/Glossary/Round_Trip_Time
3606+
/en-US/docs/Glossary/Routers /en-US/docs/Glossary/Router
36063607
/en-US/docs/Glossary/SRTP /en-US/docs/Glossary/RTP
36073608
/en-US/docs/Glossary/SSL_Glossary /en-US/docs/Glossary/SSL
36083609
/en-US/docs/Glossary/Scrollport /en-US/docs/Glossary/Scroll_container
@@ -3973,7 +3974,6 @@
39733974
/en-US/docs/HTMLSpanElement /en-US/docs/Web/API/HTMLSpanElement
39743975
/en-US/docs/HTMLSpanElement_interface /en-US/docs/Web/API/HTMLSpanElement
39753976
/en-US/docs/HTML_Intro2 /en-US/docs/Learn/HTML/Introduction_to_HTML
3976-
/en-US/docs/HTML_Santizer_API /en-US/docs/Web/API/HTML_Sanitizer_API
39773977
/en-US/docs/HTML_in_XMLHttpRequest /en-US/docs/Web/API/XMLHttpRequest_API/HTML_in_XMLHttpRequest
39783978
/en-US/docs/HTML_intro /en-US/docs/Learn/HTML/Introduction_to_HTML
39793979
/en-US/docs/HTTP /en-US/docs/Web/HTTP
@@ -8628,7 +8628,6 @@
86288628
/en-US/docs/Web/API/HTMLVideoElement/onleavepictureinpicture /en-US/docs/Web/API/HTMLVideoElement/leavepictureinpicture_event
86298629
/en-US/docs/Web/API/HTMLVideoElement/requestPictureInPicture() /en-US/docs/Web/API/HTMLVideoElement/requestPictureInPicture
86308630
/en-US/docs/Web/API/HTML_DOM /en-US/docs/Web/API/HTML_DOM_API
8631-
/en-US/docs/Web/API/HTML_Santizer_API /en-US/docs/Web/API/HTML_Sanitizer_API
86328631
/en-US/docs/Web/API/HashChangeEvent/HashChangeEvent.oldURL /en-US/docs/Web/API/HashChangeEvent/oldURL
86338632
/en-US/docs/Web/API/Headers/getAll /en-US/docs/Web/API/Headers/get
86348633
/en-US/docs/Web/API/History.length /en-US/docs/Web/API/History/length
@@ -9650,7 +9649,6 @@
96509649
/en-US/docs/Web/API/SVGPathElement/pathLength /en-US/docs/Web/API/SVGGeometryElement/pathLength
96519650
/en-US/docs/Web/API/SVGStylable /en-US/docs/Web/API/SVGElement
96529651
/en-US/docs/Web/API/SVGURIReference /en-US/docs/Web/SVG/Attribute/href
9653-
/en-US/docs/Web/API/Sanitizer/sanitizeFor /en-US/docs/Web/API/Sanitizer
96549652
/en-US/docs/Web/API/Screen.availHeight /en-US/docs/Web/API/Screen/availHeight
96559653
/en-US/docs/Web/API/Screen.availLeft /en-US/docs/Web/API/ScreenDetailed/availLeft
96569654
/en-US/docs/Web/API/Screen.availTop /en-US/docs/Web/API/ScreenDetailed/availTop

files/en-us/_wikihistory.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41778,10 +41778,6 @@
4177841778
"Enn"
4177941779
]
4178041780
},
41781-
"Web/API/HTML_Sanitizer_API": {
41782-
"modified": "2020-12-13T12:18:13.088Z",
41783-
"contributors": ["Rumyra"]
41784-
},
4178541781
"Web/API/HashChangeEvent": {
4178641782
"modified": "2020-10-15T21:29:11.207Z",
4178741783
"contributors": [
@@ -57386,18 +57382,6 @@
5738657382
"Jeremie"
5738757383
]
5738857384
},
57389-
"Web/API/Sanitizer": {
57390-
"modified": "2020-12-13T12:17:05.573Z",
57391-
"contributors": ["Rumyra"]
57392-
},
57393-
"Web/API/Sanitizer/Sanitizer": {
57394-
"modified": "2020-12-13T12:21:15.482Z",
57395-
"contributors": ["Rumyra"]
57396-
},
57397-
"Web/API/Sanitizer/sanitize": {
57398-
"modified": "2020-12-13T12:25:31.511Z",
57399-
"contributors": ["Rumyra"]
57400-
},
5740157385
"Web/API/Screen": {
5740257386
"modified": "2020-10-15T21:29:41.001Z",
5740357387
"contributors": [

files/en-us/games/publishing_games/game_distribution/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ After you've covered Steam, there's plenty of buzz around initiatives like [Humb
9393

9494
## Packaging games
9595

96-
The web is the first and the best choice for HTML games, but if you want to reach a broader audience and distribute your game in a closed ecosystem, you still can do that by packaging it. The good thing is that you don't need a few separate teams working on the same game for different platforms — you can build it once and use tools like [Phonegap](https://phonegap.com/) or [CocoonIO](http://cocoon.io/) to package the game for native stores. The resulting packages are usually pretty reliable, but you should still test them and be on the lookout for small issues or bugs to fix.
96+
The web is the first and the best choice for HTML games, but if you want to reach a broader audience and distribute your game in a closed ecosystem, you still can do that by packaging it. The good thing is that you don't need a few separate teams working on the same game for different platforms — you can build it once and use tools like [Phonegap](https://phonegap.com/) to package the game for native stores. The resulting packages are usually pretty reliable, but you should still test them and be on the lookout for small issues or bugs to fix.
9797

9898
### Available tools
9999

files/en-us/games/techniques/3d_on_the_web/building_up_a_basic_demo_with_playcanvas/editor/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ slug: Games/Techniques/3D_on_the_web/Building_up_a_basic_demo_with_PlayCanvas/ed
44
page-type: guide
55
---
66

7+
{{GamesSidebar}}
8+
79
Instead of coding everything from scratch you can also use the online **PlayCanvas editor**. This can be a more pleasant working environment if you are not someone who likes to code.
810

911
## Creating an account

files/en-us/games/techniques/control_mechanisms/desktop_with_mouse_and_keyboard/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Now, when we have our mobile controls in place and the game is playable on touch
1313
It's also easier to test control-independent features like gameplay on desktop if you develop it there, so you don't have to push the files to a mobile device every time you make a change in the source code.
1414

1515
> [!NOTE]
16-
> the [Captain Rogers: Battle at Andromeda](https://rogers2.enclavegames.com/demo/) is built with Phaser and managing the controls is Phaser-based, but it could also be done in pure JavaScript. The good thing about using Phaser is that it offers helper variables and functions for easier and faster development, but it's totally up to you which approach you chose.
16+
> The [Captain Rogers: Battle at Andromeda](https://rogers2.enclavegames.com/demo/) is built with Phaser and managing the controls is Phaser-based, but it could also be done in pure JavaScript. The good thing about using Phaser is that it offers helper variables and functions for easier and faster development, but it's totally up to you which approach you chose.
1717
1818
## Pure JavaScript approach
1919

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ page-type: glossary-definition
66

77
{{GlossarySidebar}}
88

9-
`flex` is a value of the CSS {{cssxref("display")}} property. Along with `inline-flex`, it causes the element it applies to to become a {{glossary("flex container")}}, and the element's children to each become a {{glossary("flex item")}}. The items then participate in flex layout, and all of the properties defined in the [CSS flexible box layout module](/en-US/docs/Web/CSS/CSS_flexible_box_layout) may be applied.
9+
`flex` is a value of the CSS {{cssxref("display")}} property. Along with `inline-flex`, it causes the element it applies to become a {{glossary("flex container")}}, and the element's children to each become a {{glossary("flex item")}}. The items then participate in flex layout, and all of the properties defined in the [CSS flexible box layout module](/en-US/docs/Web/CSS/CSS_flexible_box_layout) may be applied.
1010

1111
There is also a {{cssxref("flex")}} property, which is a shorthand for the flexbox properties {{cssxref("flex-grow")}}, {{cssxref("flex-shrink")}} and {{cssxref("flex-basis")}}. This property is only applicable to flex containers.
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A _CSS grid_ is defined using the `grid` value of the {{cssxref("display")}} pro
1010

1111
The grid that you define using these properties is described as an _explicit grid_.
1212

13-
If you place content outside of this explicit grid, or if you are relying on auto-placement and the grid algorithm needs to create additional row or column {{glossary("grid tracks", "tracks")}} to hold {{glossary("grid item", "grid items")}}, then extra tracks will be created in the implicit grid. The _implicit grid_ is the grid created automatically due to content being added outside of the tracks defined.
13+
If you place content outside of this explicit grid, or if you are relying on auto-placement and the grid algorithm needs to create additional row or column {{glossary("grid tracks", "tracks")}} to hold {{glossary("grid cell", "grid cells")}}, then extra tracks will be created in the implicit grid. The _implicit grid_ is the grid created automatically due to content being added outside of the tracks defined.
1414

1515
In the example below I have created an _explicit grid_ of three columns and two rows. The _third_ row on the grid is an _implicit grid_ row track, formed due to their being more than the six items which fill the explicit tracks.
1616

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The inset properties include the {{cssxref("top")}}, {{cssxref("left")}}, {{cssx
1212

1313
**Physical properties** reference specific physical sides of an element. Logical properties use directional keywords relative to the block and inline axes. **Block axis** refers to the axis that defines the stacking order of elements in a block layout. The **inline axis** is perpendicular to the block axis, representing the direction along which inline content like text flows within a block. The mapping depends on the element's {{cssxref("writing-mode")}}, {{cssxref("direction")}}, and {{cssxref("text-orientation")}}.
1414

15-
The interpretation of inset properties depends on the value of the {{cssxref("position")}} property. When `position: absolute` is set, they represent insets from the [containing block](/en-US/docs/Web/CSS/Containing_block) or [anchor element](/en-US/docs/Web/CSS/CSS_anchor_positioning/Using). With `position: relative`, they represent insets from the box's default margin edge position. With `sticky`, they represent insets from the {{glossary("scrollport")}} edge. The `fixed` value is similar to `absolute`, except the element is positioned and sized relative to its fixed positioning containing block, which is often the viewport.
15+
The interpretation of inset properties depends on the value of the {{cssxref("position")}} property. When `position: absolute` is set, they represent insets from the [containing block](/en-US/docs/Web/CSS/Containing_block) or [anchor element](/en-US/docs/Web/CSS/CSS_anchor_positioning/Using). With `position: relative`, they represent insets from the box's default margin edge position. With `sticky`, they represent insets from the {{glossary("scroll container")}} edge. The `fixed` value is similar to `absolute`, except the element is positioned and sized relative to its fixed positioning containing block, which is often the viewport.
1616

1717
## See also
1818

files/en-us/glossary/routers/index.md renamed to files/en-us/glossary/router/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Routers
3-
slug: Glossary/Routers
2+
title: Router
3+
slug: Glossary/Router
44
page-type: glossary-definition
55
---
66

0 commit comments

Comments
 (0)