Skip to content

Commit d884cbc

Browse files
Fix random typos (#13540)
1 parent 8d0ecb5 commit d884cbc

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TODO.
5656
* [Duration] Add a new `Duration` data type
5757
* [Kernel] Add `Kernel.get_in/1` with safe nil-handling for access and structs
5858
* [Kernel] Emit warnings for undefined functions from modules defined within the same context as the caller code
59-
* [Macro] Add `Macro.Env.define_alias/4`, `Macro.Env.define_import/4`, `Macro.Env.define_require/4`, `Macro.Env.expand_alias/4`, `Macro.Env.expand_import/5`, and `Macro.Env.expand_require/6` to aid the implementation of language servers and embeddeed languages
59+
* [Macro] Add `Macro.Env.define_alias/4`, `Macro.Env.define_import/4`, `Macro.Env.define_require/4`, `Macro.Env.expand_alias/4`, `Macro.Env.expand_import/5`, and `Macro.Env.expand_require/6` to aid the implementation of language servers and embedded languages
6060
* [NaiveDateTime] Add `NaiveDateTime.shift/2` to shift naive datetimes with duration and calendar-specific semantics
6161
* [Process] Add `Process.set_label/1`
6262
* [String] Add `String.byte_slice/3` to slice a string to a maximum number of bytes while keeping it UTF-8 encoded

lib/elixir/pages/anti-patterns/code-anti-patterns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ When you use `map[:key]` to access a key that always exists in the map, you are
321321

322322
#### Example
323323

324-
The function `plot/1` tries to draw a graphic to represent the position of a point in a cartesian plane. This function receives a parameter of `Map` type with the point attributes, which can be a point of a 2D or 3D cartesian coordinate system. This function uses dynamic access to retrieve values for the map keys:
324+
The function `plot/1` tries to draw a graphic to represent the position of a point in a Cartesian plane. This function receives a parameter of `Map` type with the point attributes, which can be a point of a 2D or 3D Cartesian coordinate system. This function uses dynamic access to retrieve values for the map keys:
325325

326326
```elixir
327327
defmodule Graphics do

lib/elixir/pages/getting-started/comprehensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ for dir <- dirs,
5050
end
5151
```
5252

53-
Multiple generators can also be used to calculate the cartesian product of two lists:
53+
Multiple generators can also be used to calculate the Cartesian product of two lists:
5454

5555
```elixir
5656
iex> for i <- [:a, :b, :c], j <- [1, 2], do: {i, j}

lib/elixir/pages/references/patterns-and-guards.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ You can find the built-in list of guards [in the `Kernel` module](`Kernel#guards
283283
* arithmetic binary operators ([`+`](`+/2`), [`-`](`-/2`), [`*`](`*/2`), [`/`](`//2`))
284284
* [`in`](`in/2`) and [`not in`](`in/2`) operators (as long as the right-hand side is a list or a range)
285285
* "type-check" functions (`is_list/1`, `is_number/1`, and the like)
286-
* functions that work on built-in datatypes (`abs/1`, `hd/1`, `map_size/1`, and others)
286+
* functions that work on built-in data types (`abs/1`, `hd/1`, `map_size/1`, and others)
287287
* the `map.field` syntax
288288

289289
The module `Bitwise` also includes a handful of [Erlang bitwise operations as guards](Bitwise.html#guards).

lib/elixir/pages/references/unicode-syntax.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ Elixir will not warn on confusability for identifiers made up exclusively of cha
136136

137137
### C3. Mixed Script Detection
138138

139-
Elixir will not allow tokenization of mixed-script identifiers unless the mixings is one of the exceptions defined in UTS 39 5.2, 'Highly Restrictive'. We use the means described in Section 5.1, Mixed-Script Detection, to determine if script mixing is occurring, with the modification documented in the section 'Additional Normalizations', below.
139+
Elixir will not allow tokenization of mixed-script identifiers unless the mixing is one of the exceptions defined in UTS 39 5.2, 'Highly Restrictive'. We use the means described in Section 5.1, Mixed-Script Detection, to determine if script mixing is occurring, with the modification documented in the section 'Additional Normalizations', below.
140140

141-
Examples: Elixir allows an identifiers like `幻ㄒㄧㄤ`, even though it includes characters from multiple 'scripts', because those scripts all 'resolve' to Japanese when applying the resolution rules from UTS 39 5.1. It also allows an atom like `:Tシャツ`, the Japanese word for 't-shirt', which incorporates a Latin capital T, because {Latn, Jpan} is one of the allowed script mixings in the definition of 'Highly Restrictive' in UTS 39 5.2, and it 'covers' the string.
141+
Examples: Elixir allows an identifiers like `幻ㄒㄧㄤ`, even though it includes characters from multiple 'scripts', because those scripts all 'resolve' to Japanese when applying the resolution rules from UTS 39 5.1. It also allows an atom like `:Tシャツ`, the Japanese word for 't-shirt', which incorporates a Latin capital T, because {Latn, Jpan} is one of the allowed script mixing in the definition of 'Highly Restrictive' in UTS 39 5.2, and it 'covers' the string.
142142

143143
However, Elixir would prevent tokenization in code like `if аdmin, do: :ok, else: :err`, where the scriptset for the 'a' character is {Cyrillic} but all other characters have scriptsets of {Latin}. The scriptsets fail to resolve, and the scriptsets from the definition of 'Highly Restrictive' in UTS 39 5.2 do not cover the string either, so a descriptive error is shown.
144144

0 commit comments

Comments
 (0)