Skip to content

Commit 4139518

Browse files
authored
chore: update Kotlin branding (#4121)
* chore: update the Kotlin and JetBrains info * chore: update the faq.md
1 parent b9ab2a6 commit 4139518

File tree

3 files changed

+36
-30
lines changed

3 files changed

+36
-30
lines changed

docs/topics/contribute.md

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,58 @@
11
[//]: # (title: Contribution)
22

3-
Kotlin is an open-source project under the [Apache 2.0 License](https://github.com/JetBrains/kotlin/blob/master/license/LICENSE.txt). The source code, tooling, documentation, and even this web site are maintained on [GitHub](https://github.com/jetbrains/kotlin).
4-
While Kotlin is mostly developed by JetBrains, there are hundreds of external contributors to the Kotlin project and we are always on the lookout for more people to help us.
3+
Kotlin is an open-source project under the [Apache 2.0 License](https://github.com/JetBrains/kotlin/blob/master/license/LICENSE.txt).
4+
The source code, tooling, documentation, and even this website are maintained on [GitHub](https://github.com/jetbrains/kotlin).
5+
Kotlin is developed by JetBrains, but we are always on the lookout for more people to help us.
56

67
## Participate in Early Access Preview
78

89
You can help us improve Kotlin by [participating in Kotlin Early Access Preview (EAP)](eap.md) and providing us with your valuable feedback.
910

10-
For every release, Kotlin ships a few preview builds where you can try out the latest features before they go to production. You can report any bugs you find to our issue tracker [YouTrack](https://kotl.in/issue)
11+
For every release, Kotlin ships a few preview builds where you can try out the latest features before they go to production.
12+
You can report any bugs you find to our issue tracker [YouTrack](https://kotl.in/issue)
1113
and we will try to fix them before a final release. This way, you can get bug fixes earlier than the standard Kotlin release cycle.
1214

1315
## Contribute to the compiler and standard library
1416

15-
If you want to contribute to the Kotlin compiler and standard library, go to [JetBrains/Kotlin GitHub](https://github.com/jetbrains/kotlin), check out the latest Kotlin version,
16-
and follow [the instructions on how to contribute](https://github.com/JetBrains/kotlin/blob/master/docs/contributing.md).
17+
If you want to contribute to the Kotlin compiler and standard library, go to [JetBrains/Kotlin GitHub](https://github.com/jetbrains/kotlin),
18+
check out the latest Kotlin version, and follow [the instructions on how to contribute](https://github.com/JetBrains/kotlin/blob/master/docs/contributing.md).
1719

1820
You can help us by completing [open tasks](https://youtrack.jetbrains.com/issues/KT?q=tag:%20%7BUp%20For%20Grabs%7D%20and%20State:%20Open).
19-
Please keep an open line of communication with us because we may have questions and comments on your changes. Otherwise, we won't be able to incorporate your contributions.
21+
Please keep an open line of communication with us because we may have questions and comments on your changes.
22+
Otherwise, we won't be able to incorporate your contributions.
2023

2124
## Contribute to the Kotlin IDE plugin
2225

2326
Kotlin IDE plugin is a part of the [IntelliJ IDEA repository](https://github.com/JetBrains/intellij-community/tree/master/plugins/kotlin).
2427

25-
To contribute to the Kotlin IDE plugin, clone the [IntelliJ IDEA repository](https://github.com/JetBrains/intellij-community/) and follow the [instructions on how to contribute](https://github.com/JetBrains/intellij-community/blob/master/plugins/kotlin/CONTRIBUTING.md).
28+
To contribute to the Kotlin IDE plugin, clone the [IntelliJ IDEA repository](https://github.com/JetBrains/intellij-community/)
29+
and follow the [instructions on how to contribute](https://github.com/JetBrains/intellij-community/blob/master/plugins/kotlin/CONTRIBUTING.md).
2630

2731
## Contribute to other Kotlin libraries and tools
2832

2933
Besides the standard library that provides core capabilities, Kotlin has a number of additional (kotlinx) libraries that extend its functionality.
3034
Each kotlinx library is developed in a separate repository, has its own versioning and release cycle.
3135

3236
If you want to contribute to a kotlinx library (such as [kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines) or
33-
[kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization)) and tools, go to [Kotlin GitHub](https://github.com/Kotlin), choose the repository you are interested in and clone it.
37+
[kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization)) and tools, go to [Kotlin GitHub](https://github.com/Kotlin),
38+
choose the repository you are interested in and clone it.
3439

3540
Follow the contribution process described for each library and tool, such as
36-
[kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization/blob/master/CONTRIBUTING.md), [ktor](https://github.com/ktorio/ktor/blob/master/CONTRIBUTING.md) and others.
41+
[kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization/blob/master/CONTRIBUTING.md),
42+
[ktor](https://github.com/ktorio/ktor/blob/master/CONTRIBUTING.md) and others.
3743

3844
If you have a library that could be useful to other Kotlin developers, let us know via <feedback@kotlinlang.org>.
3945

4046
## Contribute to the documentation
4147

4248
If you've found an issue in the Kotlin documentation,
4349
feel free to check out [the documentation source code on GitHub](https://github.com/JetBrains/kotlin-web-site/tree/master/docs/topics)
44-
and send us a pull request. Follow [these guidelines on style and formatting](https://docs.google.com/document/d/1mUuxK4xwzs3jtDGoJ5_zwYLaSEl13g_SuhODdFuh2Dc/edit?usp=sharing).
50+
and send us a pull request.
51+
Follow [these guidelines on style and formatting](https://docs.google.com/document/d/1mUuxK4xwzs3jtDGoJ5_zwYLaSEl13g_SuhODdFuh2Dc/edit?usp=sharing).
4552

4653
Please keep an open line of communication with us because we may have questions and comments on your changes.
4754
Otherwise, we won't be able to incorporate your contributions.
4855

49-
## Create tutorials or videos
50-
51-
If you've created tutorials or videos for Kotlin, please share them with us via <feedback@kotlinlang.org>.
52-
5356
## Translate documentation to other languages
5457

5558
You are welcome to translate the Kotlin documentation into your own language and publish the translation on your website.
@@ -60,4 +63,5 @@ is correct and up to date. Unfortunately, we won't be able to review documentati
6063

6164
## Hold events and presentations
6265

63-
If you've given or just plan to give presentations or hold events on Kotlin, please fill out [the form](https://surveys.jetbrains.com/s3/Submit-a-Kotlin-Talk). We'll feature them on [the event list](https://kotlinlang.org/docs/events.html).
66+
If you've given or just plan to give presentations or hold events on Kotlin, please fill out [the form](https://surveys.jetbrains.com/s3/Submit-a-Kotlin-Talk).
67+
We'll feature them on [the event list](https://kotlinlang.org/docs/events.html).

docs/topics/faq.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[//]: # (title: FAQ)
2+
[//]: # (description: Kotlin is a concise multiplatform programming language developed by JetBrains.)
23

34
### What is Kotlin?
45

@@ -13,34 +14,35 @@ You can find more information [on GitHub](https://github.com/jetbrains/kotlin).
1314

1415
### Is Kotlin free?
1516

16-
Yes. Kotlin is free, has been free and will remain free. It is developed under the Apache 2.0 license and the source code
17+
Yes. Kotlin is free, has been free and will remain free. It is developed under the Apache 2.0 license, and the source code
1718
is available [on GitHub](https://github.com/jetbrains/kotlin).
1819

1920
### Is Kotlin an object-oriented language or a functional one?
2021

2122
Kotlin has both object-oriented and functional constructs. You can use it in both OO and FP styles, or mix elements of the two.
22-
With first-class support for features such as higher-order functions, function types and lambdas, Kotlin is a great choice
23+
With first-class support for features such as higher-order functions, function types, and lambdas, Kotlin is a great choice
2324
if you're doing or exploring functional programming.
2425

2526
### What advantages does Kotlin give me over the Java programming language?
2627

2728
Kotlin is more concise. Rough estimates indicate approximately a 40% cut in the number of lines of code.
28-
It's also more type-safe, for example, support for non-nullable types makes applications less prone to NPE's.
29-
Other features including smart casting, higher-order functions, extension functions and lambdas with receivers provide
29+
It's also more type-safe for example, support for non-nullable types makes applications less prone to NPE's.
30+
Other features including smart casting, higher-order functions, extension functions, and lambdas with receivers provide
3031
the ability to write expressive code as well as facilitating creation of DSL.
3132

3233
### Is Kotlin compatible with the Java programming language?
3334

34-
Yes. Kotlin is 100% interoperable with the Java programming language and major emphasis has been placed on making sure
35+
Yes. Kotlin is 100% interoperable with the Java programming language, and major emphasis has been placed on making sure
3536
that your existing codebase can interact properly with Kotlin. You can easily [call Kotlin code from Java](java-to-kotlin-interop.md) and [Java code
3637
from Kotlin](java-interop.md). This makes adoption much easier and lower-risk. There's also an automated [Java-to-Kotlin converter built
3738
into the IDE](mixing-java-kotlin-intellij.md#converting-an-existing-java-file-to-kotlin-with-j2k) that simplifies migration of existing code.
3839

3940
### What can I use Kotlin for?
4041

41-
Kotlin can be used for any kind of development, be it server-side, client-side web, Android. With Kotlin/Native currently
42-
in the works, support for other platforms such as embedded systems, macOS and iOS is coming. People are using Kotlin for mobile
43-
and server-side applications, client-side with JavaScript or JavaFX, and data science, just to name a few possibilities.
42+
Kotlin can be used for any kind of development, be it server-side, client-side web, Android, or multiplatform library.
43+
With Kotlin/Native currently in the works, support for other platforms such as embedded systems, macOS, and iOS.
44+
People are using Kotlin for mobile and server-side applications, client-side with JavaScript or JavaFX, and data science,
45+
just to name a few possibilities.
4446

4547
### Can I use Kotlin for Android development?
4648

@@ -49,8 +51,8 @@ for Android, such as Basecamp, Pinterest and more. For more information, check o
4951

5052
### Can I use Kotlin for server-side development?
5153

52-
Yes. Kotlin is 100% compatible with the JVM and as such you can use any existing frameworks such as Spring Boot,
53-
vert.x or JSF. In addition, there are specific frameworks written in Kotlin such as [Ktor](https://github.com/kotlin/ktor).
54+
Yes. Kotlin is 100% compatible with the JVM, and as such you can use any existing frameworks such as Spring Boot,
55+
vert.x or JSF. In addition, there are specific frameworks written in Kotlin, such as [Ktor](https://github.com/kotlin/ktor).
5456
For more information, check out [the resource on server-side development](server-overview.md).
5557

5658
### Can I use Kotlin for web development?
@@ -120,13 +122,13 @@ Kotlin, be this via blog posts, GitHub repositories or talks include
120122

121123
### Who develops Kotlin?
122124

123-
Kotlin is primarily developed by a team of engineers at [JetBrains (current team size is 100+)](https://www.jetbrains.com/).
125+
Kotlin is developed by a team of engineers at [JetBrains (current team size is 100+)](https://www.jetbrains.com/).
124126
The lead language designer is Michail Zarečenskij. In addition to the core team, there are also over 250 external contributors on GitHub.
125127

126128
### Where can I learn more about Kotlin?
127129

128-
The best place to start is [our website](https://kotlinlang.org). From there you can [download the compiler](command-line.md),
129-
[try it online](https://play.kotlinlang.org) as well as get access to resources.
130+
The best place to start is [our website](https://kotlinlang.org).
131+
To start with Kotlin, you can install one of the [official IDEs](kotlin-ide.md) or [try it online](https://play.kotlinlang.org).
130132

131133
### Are there any books on Kotlin?
132134

@@ -182,4 +184,4 @@ a [newsletter](http://kotlinweekly.net), a [podcast](https://talkingkotlin.com)
182184
Logos can be downloaded [here](https://resources.jetbrains.com/storage/products/kotlin/docs/kotlin_logos.zip).
183185
When using the logos, please follow simple rules in the `guidelines.pdf` inside the archive and [Kotlin brand usage guidelines](https://kotlinfoundation.org/guidelines/).
184186

185-
For more information, check out the page about [Kotlin brand assets](kotlin-brand-assets.md).
187+
For more information, check out the page about [Kotlin brand assets](kotlin-brand-assets.md).

docs/topics/roadmap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</tr>
1212
</table>
1313

14-
Welcome to the Kotlin roadmap! Get a sneak peek into the priorities of the Kotlin Team.
14+
Welcome to the Kotlin roadmap! Get a sneak peek into the priorities of the JetBrains Team.
1515

1616
## Key priorities
1717

0 commit comments

Comments
 (0)