Merge pull request #102 from Logofile/sync

This change includes the following:

Author: Logofile

content/editions/features.md

@@ -1,6 +1,6 @@
 +++
 title = "Feature Settings for Editions"
-weight = 42
+weight = 43
 description = "Protobuf Editions features and how they affect protobuf behavior."
 type = "docs"
 +++

content/programming-guides/style.md

@@ -98,11 +98,14 @@ enum FooBar {
 ```
 
 Each enum value should end with a semicolon, not a comma. Prefer prefixing enum
-values instead of surrounding them in an enclosing message. The zero value enum
-should have the suffix `UNSPECIFIED`, because a server or application that gets
-an unexpected enum value will mark the field as unset in the proto instance. The
-field accessor will then return the default value, which for enum fields is the
-first enum value.
+values instead of surrounding them in an enclosing message.
+
+The zero value enum should have the suffix `UNSPECIFIED`, because a server or
+application that gets an unexpected enum value will mark the field as unset in
+the proto instance. The field accessor will then return the default value, which
+for enum fields is the first enum value. For more information on the unspecified
+enum value, see
+[the Proto Best Practices page](/programming-guides/dos-donts#unspecified-enum).
 
 ## Services {#services}