Merge branch 'master' into dev

Author: sandwwraith

docs/basic-serialization.md

@@ -182,7 +182,7 @@ fun main() {
 
 > You can get the full code [here](../guide/example/example-classes-01.kt).
 
-We can clearly see that only `owner` and `stars` properties are present in the JSON output.
+We can clearly see that only `name` and `stars` properties are present in the JSON output.
 
 ```text 
 {"name":"kotlinx.serialization","stars":9000}
@@ -409,7 +409,7 @@ fun main() {
 
 > You can get the full code [here](../guide/example/example-classes-08.kt).
 
-Attempt to explicitly specify its value in the serial format, even if the specified
+Attempts to explicitly specify its value in the serial format, even if the specified
 value is equal to the default one, produces the following exception.
 
 ```text

docs/json.md

@@ -335,7 +335,7 @@ unstructured data that it does not readily fit into the typesafe world of Kotlin
 
 ### Parsing to Json element
 
-A string can _parsed_ into an instance of [JsonElement] with the [Json.parseToJsonElement] function.
+A string can be _parsed_ into an instance of [JsonElement] with the [Json.parseToJsonElement] function.
 It is called neither decoding nor deserialization, because none of that happens in the process. 
 Only JSON parser is being used here.  
 

docs/polymorphism.md

@@ -326,7 +326,7 @@ the [Sealed classes](#sealed-classes) section, but here subclasses can be spread
 
 We can update the previous example and turn `Project` superclass into an interface. However, we cannot
 mark an interface itself as `@Serializable`. No problem. Interfaces cannot have instances by themselves.
-Interfaces can only be represented by instances of their derived classes. Interfaces are used in the Kolin language to enable polymorphism, 
+Interfaces can only be represented by instances of their derived classes. Interfaces are used in the Kotlin language to enable polymorphism, 
 so all interfaces are considered to be implicitly serializable with the [PolymorphicSerializer]
 strategy. We just need to mark thier implementing classes as `@Serializable` and register them. 
 

docs/serializers.md

@@ -502,7 +502,7 @@ element using [decodeIntElement][CompositeDecoder.decodeIntElement] in our examp
             var r = -1
             var g = -1
             var b = -1
-            while(true) {
+            while (true) {
                 when (val index = decodeElementIndex(descriptor)) {
                     0 -> r = decodeIntElement(descriptor, 0)
                     1 -> g = decodeIntElement(descriptor, 1)
@@ -580,7 +580,7 @@ object ColorAsObjectSerializer : KSerializer<Color> {
                 r = decodeIntElement(descriptor, 0)           
                 g = decodeIntElement(descriptor, 1)  
                 b = decodeIntElement(descriptor, 2)
-            } else while(true) {
+            } else while (true) {
                 when (val index = decodeElementIndex(descriptor)) {
                     0 -> r = decodeIntElement(descriptor, 0)
                     1 -> g = decodeIntElement(descriptor, 1)

formats/README.md

@@ -76,3 +76,11 @@ not be available in other formats such as JSON.
 * Platform: JVM only
 
 Allows serialization and deserialization of objects to and from [YAML](http://yaml.org).
+
+### CBOR
+
+* GitHub repo: [L-Briand/obor](https://github.com/L-Briand/obor)
+* Artifact ID: `net.orandja.obor:obor`
+* Platform: JVM, Android
+
+Allow serialization and deserialization of objects to and from [CBOR](https://cbor.io/). This codec can be used to read and write from Java InputStream and OutputStream.

guide/example/example-serializer-11.kt

@@ -27,7 +27,7 @@ object ColorAsObjectSerializer : KSerializer<Color> {
             var r = -1
             var g = -1
             var b = -1
-            while(true) {
+            while (true) {
                 when (val index = decodeElementIndex(descriptor)) {
                     0 -> r = decodeIntElement(descriptor, 0)
                     1 -> g = decodeIntElement(descriptor, 1)

guide/example/example-serializer-12.kt

@@ -31,7 +31,7 @@ object ColorAsObjectSerializer : KSerializer<Color> {
                 r = decodeIntElement(descriptor, 0)           
                 g = decodeIntElement(descriptor, 1)  
                 b = decodeIntElement(descriptor, 2)
-            } else while(true) {
+            } else while (true) {
                 when (val index = decodeElementIndex(descriptor)) {
                     0 -> r = decodeIntElement(descriptor, 0)
                     1 -> g = decodeIntElement(descriptor, 1)