Skip to content

Commit dc142c6

Browse files
committed
Sarah final review
1 parent 653a661 commit dc142c6

11 files changed

+25
-27
lines changed

docs/kr.tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<toc-element hidden="true" topic="kotlin-tour-null-safety.md"/>
1414
<toc-element hidden="true" topic="kotlin-tour-intermediate-extension-functions.md"/>
1515
<toc-element hidden="true" topic="kotlin-tour-intermediate-scope-functions.md"/>
16-
<toc-element hidden="true" topic="kotlin-tour-intermediate-functions-lambdas-receiver.md"/>
16+
<toc-element hidden="true" topic="kotlin-tour-intermediate-lambdas-receiver.md"/>
1717
<toc-element hidden="true" topic="kotlin-tour-intermediate-classes-interfaces.md"/>
1818
<toc-element hidden="true" topic="kotlin-tour-intermediate-classes-objects.md"/>
1919
<toc-element hidden="true" topic="kotlin-tour-intermediate-classes-open-special-classes.md"/>

docs/topics/tour/kotlin-tour-intermediate-classes-interfaces.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<tldr>
44
<p><img src="icon-1-done.svg" width="20" alt="First step" /> <a href="kotlin-tour-intermediate-extension-functions.md">Extension functions</a><br />
55
<img src="icon-2-done.svg" width="20" alt="Second step" /> <a href="kotlin-tour-intermediate-scope-functions.md">Scope functions</a><br />
6-
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a><br />
6+
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a><br />
77
<img src="icon-4.svg" width="20" alt="Fourth step" /> <strong>Classes and interfaces</strong><br />
88
<img src="icon-5-todo.svg" width="20" alt="Fifth step" /> <a href="kotlin-tour-intermediate-classes-objects.md">Objects</a><br />
99
<img src="icon-6-todo.svg" width="20" alt="Sixth step" /> <a href="kotlin-tour-intermediate-classes-open-special-classes.md">Open and special classes</a><br />
@@ -14,15 +14,15 @@
1414

1515
In the beginner tour, you learned how to use classes and data classes to store data and maintain a collection of characteristics
1616
that can be shared in your code. Eventually, you will want to create a hierarchy to efficiently share code within your
17-
projects. This chapter explains the options Kotlin provides for this and how they can make your code safer and easier to maintain.
17+
projects. This chapter explains the options Kotlin provides for sharing code and how they can make your code safer and easier to maintain.
1818

1919
## Class inheritance
2020

21-
In the previous chapter, we covered how you can use extension functions to extend classes without modifying the original source code.
21+
In a previous chapter, we covered how you can use extension functions to extend classes without modifying the original source code.
2222
But what if you are working on something complex where sharing code **between** classes would be useful? In such cases,
2323
you can use class inheritance.
2424

25-
By default, classes in Kotlin can't be inherited. This is designed to prevent unintended inheritance and make
25+
By default, classes in Kotlin can't be inherited. Kotlin is designed this way to prevent unintended inheritance and make
2626
your classes easier to maintain.
2727

2828
Kotlin classes only support **single inheritance**, meaning it is only possible to inherit from **one class at a time**.
@@ -33,7 +33,7 @@ hierarchy is the common parent class: `Any`. All classes ultimately inherit from
3333

3434
![An example of the class hierarchy with Any type](any-type-class.png){width="200"}
3535

36-
The `Any` class provides the `.toString()` function as a member function automatically. Therefore, you can
36+
The `Any` class provides the `toString()` function as a member function automatically. Therefore, you can
3737
use this inherited function in any of your classes. For example:
3838

3939
```kotlin
@@ -148,8 +148,6 @@ fun main() {
148148
Although abstract classes are great for sharing code in this way, they are restricted because classes in Kotlin
149149
only support single inheritance. If you need to inherit from multiple sources, consider using interfaces.
150150

151-
For more information, see [Abstract classes](classes.md#abstract-classes).
152-
153151
## Interfaces
154152

155153
Interfaces are similar to classes, but they have some differences:

docs/topics/tour/kotlin-tour-intermediate-classes-objects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<tldr>
44
<p><img src="icon-1-done.svg" width="20" alt="First step" /> <a href="kotlin-tour-intermediate-extension-functions.md">Extension functions</a><br />
55
<img src="icon-2-done.svg" width="20" alt="Second step" /> <a href="kotlin-tour-intermediate-scope-functions.md">Scope functions</a><br />
6-
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a><br />
6+
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a><br />
77
<img src="icon-4-done.svg" width="20" alt="Fourth step" /> <a href="kotlin-tour-intermediate-classes-interfaces.md">Classes and interfaces</a><br />
88
<img src="icon-5.svg" width="20" alt="Fourth step" /> <strong>Objects</strong><br />
99
<img src="icon-6-todo.svg" width="20" alt="Sixth step" /> <a href="kotlin-tour-intermediate-classes-open-special-classes.md">Open and special classes</a><br />

docs/topics/tour/kotlin-tour-intermediate-classes-open-special-classes.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<tldr>
44
<p><img src="icon-1-done.svg" width="20" alt="First step" /> <a href="kotlin-tour-intermediate-extension-functions.md">Extension functions</a><br />
55
<img src="icon-2-done.svg" width="20" alt="Second step" /> <a href="kotlin-tour-intermediate-scope-functions.md">Scope functions</a><br />
6-
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a><br />
6+
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a><br />
77
<img src="icon-4-done.svg" width="20" alt="Fourth step" /> <a href="kotlin-tour-intermediate-classes-interfaces.md">Classes and interfaces</a><br />
88
<img src="icon-5-done.svg" width="20" alt="Fifth step" /> <a href="kotlin-tour-intermediate-classes-objects.md">Objects</a><br />
99
<img src="icon-6.svg" width="20" alt="Fourth step" /> <strong>Open and special classes</strong><br />
@@ -12,7 +12,7 @@
1212
<img src="icon-9-todo.svg" width="20" alt="Ninth step" /> <a href="kotlin-tour-intermediate-libraries-and-apis.md">Libraries and APIs</a></p>
1313
</tldr>
1414

15-
In this chapter, you'll learn about open classes, how they work with interfaces, and the special
15+
In this chapter, you'll learn about open classes, how they work with interfaces, and other special
1616
types of classes available in Kotlin.
1717

1818
## Open classes
@@ -366,12 +366,12 @@ An inline value class **must** have a single property initialized in the class h
366366
Let's say that you want to create a class that collects an email address:
367367

368368
```kotlin
369-
// The value property is initialized in the class header.
369+
// The address property is initialized in the class header.
370370
@JvmInline
371-
value class Email(val value: String)
371+
value class Email(val address: String)
372372

373373
fun sendEmail(email: Email) {
374-
println("Sending email to ${email.value}")
374+
println("Sending email to ${email.address}")
375375
}
376376

377377
fun main() {
@@ -384,7 +384,7 @@ fun main() {
384384

385385
In the example:
386386

387-
* `Email` is an inline value class that has one property in the class header: `value`.
387+
* `Email` is an inline value class that has one property in the class header: `address`.
388388
* The `sendEmail()` function accepts objects with type `Email` and prints a string to the standard output.
389389
* The `main()` function:
390390
* Creates an instance of the `Email` class called `email`.

docs/topics/tour/kotlin-tour-intermediate-extension-functions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<tldr>
44
<p><img src="icon-1.svg" width="20" alt="First step" /> <strong>Extension functions</strong><br />
55
<img src="icon-2-todo.svg" width="20" alt="Second step" /> <a href="kotlin-tour-intermediate-scope-functions.md">Scope functions</a><br />
6-
<img src="icon-3-todo.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a><br />
6+
<img src="icon-3-todo.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a><br />
77
<img src="icon-4-todo.svg" width="20" alt="Fourth step" /> <a href="kotlin-tour-intermediate-classes-interfaces.md">Classes and interfaces</a><br />
88
<img src="icon-5-todo.svg" width="20" alt="Fifth step" /> <a href="kotlin-tour-intermediate-classes-objects.md">Objects</a><br />
99
<img src="icon-6-todo.svg" width="20" alt="Sixth step" /> <a href="kotlin-tour-intermediate-classes-open-special-classes.md">Open and special classes</a><br />
@@ -12,8 +12,8 @@
1212
<img src="icon-9-todo.svg" width="20" alt="Ninth step" /> <a href="kotlin-tour-intermediate-libraries-and-apis.md">Libraries and APIs</a></p>
1313
</tldr>
1414

15-
In this chapter, you'll explore special Kotlin functions that make your code more concise and readable,
16-
and learn how they can help you use efficient design patterns to take your projects to the next level.
15+
In this chapter, you'll explore special Kotlin functions that make your code more concise and readable. Learn how they
16+
can help you use efficient design patterns to take your projects to the next level.
1717

1818
## Extension functions
1919

docs/topics/tour/kotlin-tour-intermediate-functions-lambdas-receiver.md renamed to docs/topics/tour/kotlin-tour-intermediate-lambdas-receiver.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</tldr>
1414

1515
In this chapter, you'll learn how to use receiver objects with another type of function, lambda expressions, and how they
16-
can make your code more concise and readable.
16+
can help you create a domain-specific language.
1717

1818
## Lambda expressions with receiver
1919

@@ -154,7 +154,7 @@ standard library.
154154
> Lambda expressions with receivers can be combined with **type-safe builders** in Kotlin to make DSLs that detect any problems
155155
> with types at compile time rather than at runtime. To learn more, see [Type-safe builders](type-safe-builders.md).
156156
>
157-
{style="note"}
157+
{style="tip"}
158158

159159
## Practice
160160

docs/topics/tour/kotlin-tour-intermediate-libraries-and-apis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<tldr>
44
<p><img src="icon-1-done.svg" width="20" alt="First step" /> <a href="kotlin-tour-intermediate-extension-functions.md">Extension functions</a><br />
55
<img src="icon-2-done.svg" width="20" alt="Second step" /> <a href="kotlin-tour-intermediate-scope-functions.md">Scope functions</a><br />
6-
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a><br />
6+
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a><br />
77
<img src="icon-4-done.svg" width="20" alt="Fourth step" /> <a href="kotlin-tour-intermediate-classes-interfaces.md">Classes and interfaces</a><br />
88
<img src="icon-5-done.svg" width="20" alt="Fifth step" /> <a href="kotlin-tour-intermediate-classes-objects.md">Objects</a><br />
99
<img src="icon-6-done.svg" width="20" alt="Sixth step" /> <a href="kotlin-tour-intermediate-classes-open-special-classes.md">Open and special classes</a><br />
@@ -298,7 +298,7 @@ What should the opt-in look like in your code?
298298

299299
## What's next?
300300

301-
Congratulations! Now that you have completed the intermediate tour, check out our tutorials for popular Kotlin applications:
301+
Congratulations! You've completed the intermediate tour! As a next step, check out our tutorials for popular Kotlin applications:
302302

303303
* [Create a backend application with Spring Boot and Kotlin](jvm-create-project-with-spring-boot.md)
304304
* Create a cross-platform application for Android and iOS from scratch and:

docs/topics/tour/kotlin-tour-intermediate-null-safety.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<tldr>
44
<p><img src="icon-1-done.svg" width="20" alt="First step" /> <a href="kotlin-tour-intermediate-extension-functions.md">Extension functions</a><br />
55
<img src="icon-2-done.svg" width="20" alt="Second step" /> <a href="kotlin-tour-intermediate-scope-functions.md">Scope functions</a><br />
6-
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a><br />
6+
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a><br />
77
<img src="icon-4-done.svg" width="20" alt="Fourth step" /> <a href="kotlin-tour-intermediate-classes-interfaces.md">Classes and interfaces</a><br />
88
<img src="icon-5-done.svg" width="20" alt="Fifth step" /> <a href="kotlin-tour-intermediate-classes-objects.md">Objects</a><br />
99
<img src="icon-6-done.svg" width="20" alt="Sixth step" /> <a href="kotlin-tour-intermediate-classes-open-special-classes.md">Open and special classes</a><br />

docs/topics/tour/kotlin-tour-intermediate-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<tldr>
44
<p><img src="icon-1-done.svg" width="20" alt="First step" /> <a href="kotlin-tour-intermediate-extension-functions.md">Extension functions</a><br />
55
<img src="icon-2-done.svg" width="20" alt="Second step" /> <a href="kotlin-tour-intermediate-scope-functions.md">Scope functions</a><br />
6-
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a><br />
6+
<img src="icon-3-done.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a><br />
77
<img src="icon-4-done.svg" width="20" alt="Fourth step" /> <a href="kotlin-tour-intermediate-classes-interfaces.md">Classes and interfaces</a><br />
88
<img src="icon-5-done.svg" width="20" alt="Fifth step" /> <a href="kotlin-tour-intermediate-classes-objects.md">Objects</a><br />
99
<img src="icon-6-done.svg" width="20" alt="Sixth step" /> <a href="kotlin-tour-intermediate-classes-open-special-classes.md">Open and special classes</a><br />

docs/topics/tour/kotlin-tour-intermediate-scope-functions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<tldr>
44
<p><img src="icon-1-done.svg" width="20" alt="First step" /> <a href="kotlin-tour-intermediate-extension-functions.md">Extension functions</a><br />
55
<img src="icon-2.svg" width="20" alt="Second step" /> <strong>Scope functions</strong><br />
6-
<img src="icon-3-todo.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a><br />
6+
<img src="icon-3-todo.svg" width="20" alt="Third step" /> <a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a><br />
77
<img src="icon-4-todo.svg" width="20" alt="Fourth step" /> <a href="kotlin-tour-intermediate-classes-interfaces.md">Classes and interfaces</a><br />
88
<img src="icon-5-todo.svg" width="20" alt="Fifth step" /> <a href="kotlin-tour-intermediate-classes-objects.md">Objects</a><br />
99
<img src="icon-6-todo.svg" width="20" alt="Sixth step" /> <a href="kotlin-tour-intermediate-classes-open-special-classes.md">Open and special classes</a><br />
@@ -535,4 +535,4 @@ fun main() {
535535

536536
## Next step
537537

538-
[Intermediate: Lambda expressions with receiver](kotlin-tour-intermediate-functions-lambdas-receiver.md)
538+
[Intermediate: Lambda expressions with receiver](kotlin-tour-intermediate-lambdas-receiver.md)

docs/topics/tour/kotlin-tour-welcome.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you're ready to take your understanding of Kotlin to the next level, take our
3838
<ul>
3939
<li><a href="kotlin-tour-intermediate-extension-functions.md">Extension functions</a></li>
4040
<li><a href="kotlin-tour-intermediate-scope-functions.md">Scope functions</a></li>
41-
<li><a href="kotlin-tour-intermediate-functions-lambdas-receiver.md">Lambda expressions with receiver</a></li>
41+
<li><a href="kotlin-tour-intermediate-lambdas-receiver.md">Lambda expressions with receiver</a></li>
4242
<li><a href="kotlin-tour-intermediate-classes-interfaces.md">Classes and interfaces</a></li>
4343
<li><a href="kotlin-tour-intermediate-classes-objects.md">Objects</a></li>
4444
<li><a href="kotlin-tour-intermediate-classes-open-special-classes.md">Open and special classes</a></li>

0 commit comments

Comments
 (0)