Merge branch 'main' into patch-1

Author: Logofile

content/_index.md

@@ -93,7 +93,7 @@ Dart, Go, Ruby, PHP, and C#, with more languages to come.
 <ol>
 
   <li>
-    <a href="https://github.com/protocolbuffers/protobuf#protocol-compiler-installation">Download
+    <a href="https://github.com/protocolbuffers/protobuf#protobuf-compiler-installation">Download
     and install</a> the protocol buffer compiler.
   </li>
 

content/editions/overview.md

@@ -224,7 +224,7 @@ message Person {
   string name = 1;
   int32 id = 2 [features.presence = IMPLICIT];
 
-  enum Pay_Type
+  enum Pay_Type {
     PAY_TYPE_UNSPECIFIED = 1,
     PAY_TYPE_SALARY = 2,
     PAY_TYPE_HOURLY = 3

content/getting-started/cpptutorial.md

@@ -96,7 +96,7 @@ message Person {
 
   message PhoneNumber {
     optional string number = 1;
-    optional PhoneType type = 2 [default = HOME];
+    optional PhoneType type = 2 [default = PHONE_TYPE_HOME];
   }
 
   repeated PhoneNumber phones = 4;
@@ -276,9 +276,9 @@ any particular field definition, see the
 
 The generated code includes a `PhoneType` enum that corresponds to your `.proto`
 enum. You can refer to this type as `Person::PhoneType` and its values as
-`Person::MOBILE`, `Person::HOME`, and `Person::WORK` (the implementation details
-are a little more complicated, but you don't need to understand them to use the
-enum).
+`Person::PHONE_TYPE_MOBILE`, `Person::PHONE_TYPE_HOME`, and
+`Person::PHONE_TYPE_WORK` (the implementation details are a little more
+complicated, but you don't need to understand them to use the enum).
 
 The compiler has also generated a nested class for you called
 `Person::PhoneNumber`. If you look at the code, you can see that the "real"
@@ -394,11 +394,11 @@ void PromptForAddress(tutorial::Person* person) {
     string type;
     getline(cin, type);
     if (type == "mobile") {
-      phone_number->set_type(tutorial::Person::MOBILE);
+      phone_number->set_type(tutorial::Person::PHONE_TYPE_MOBILE);
     } else if (type == "home") {
-      phone_number->set_type(tutorial::Person::HOME);
+      phone_number->set_type(tutorial::Person::PHONE_TYPE_HOME);
     } else if (type == "work") {
-      phone_number->set_type(tutorial::Person::WORK);
+      phone_number->set_type(tutorial::Person::PHONE_TYPE_WORK);
     } else {
       cout << "Unknown phone type.  Using default." << endl;
     }
@@ -494,13 +494,13 @@ void ListPeople(const tutorial::AddressBook& address_book) {
       const tutorial::Person::PhoneNumber& phone_number = person.phones(j);
 
       switch (phone_number.type()) {
-        case tutorial::Person::MOBILE:
+        case tutorial::Person::PHONE_TYPE_MOBILE:
           cout << "  Mobile phone #: ";
           break;
-        case tutorial::Person::HOME:
+        case tutorial::Person::PHONE_TYPE_HOME:
           cout << "  Home phone #: ";
           break;
-        case tutorial::Person::WORK:
+        case tutorial::Person::PHONE_TYPE_WORK:
           cout << "  Work phone #: ";
           break;
       }

content/getting-started/darttutorial.md

@@ -251,13 +251,13 @@ Person promptForAddress() {
     String type = stdin.readLineSync();
     switch (type) {
       case 'mobile':
-        phoneNumber.type = Person_PhoneType.MOBILE;
+        phoneNumber.type = Person_PhoneType.PHONE_TYPE_MOBILE;
         break;
       case 'home':
-        phoneNumber.type = Person_PhoneType.HOME;
+        phoneNumber.type = Person_PhoneType.PHONE_TYPE_HOME;
         break;
       case 'work':
-        phoneNumber.type = Person_PhoneType.WORK;
+        phoneNumber.type = Person_PhoneType.PHONE_TYPE_WORK;
         break;
       default:
         print('Unknown phone type.  Using default.');
@@ -312,13 +312,13 @@ void printAddressBook(AddressBook addressBook) {
 
     for (Person_PhoneNumber phoneNumber in person.phones) {
       switch (phoneNumber.type) {
-        case Person_PhoneType.MOBILE:
+        case Person_PhoneType.PHONE_TYPE_MOBILE:
           print('   Mobile phone #: ');
           break;
-        case Person_PhoneType.HOME:
+        case Person_PhoneType.PHONE_TYPE_HOME:
           print('   Home phone #: ');
           break;
-        case Person_PhoneType.WORK:
+        case Person_PhoneType.PHONE_TYPE_WORK:
           print('   Work phone #: ');
           break;
         default:

content/getting-started/gotutorial.md

@@ -232,7 +232,7 @@ p := pb.Person{
     Name:  "John Doe",
     Email: "[email protected]",
     Phones: []*pb.Person_PhoneNumber{
-        {Number: "555-4321", Type: pb.Person_HOME},
+        {Number: "555-4321", Type: pb.Person_PHONE_TYPE_HOME},
     },
 }
 ```

content/getting-started/javatutorial.md

@@ -100,7 +100,7 @@ message Person {
 
   message PhoneNumber {
     optional string number = 1;
-    optional PhoneType type = 2 [default = HOME];
+    optional PhoneType type = 2 [default = PHONE_TYPE_HOME];
   }
 
   repeated PhoneNumber phones = 4;
@@ -350,7 +350,7 @@ Person john =
     .addPhones(
       Person.PhoneNumber.newBuilder()
         .setNumber("555-4321")
-        .setType(Person.PhoneType.HOME))
+        .setType(Person.PhoneType.PHONE_TYPE_HOME))
     .build();
 ```
 
@@ -460,11 +460,11 @@ class AddPerson {
       stdout.print("Is this a mobile, home, or work phone? ");
       String type = stdin.readLine();
       if (type.equals("mobile")) {
-        phoneNumber.setType(Person.PhoneType.MOBILE);
+        phoneNumber.setType(Person.PhoneType.PHONE_TYPE_MOBILE);
       } else if (type.equals("home")) {
-        phoneNumber.setType(Person.PhoneType.HOME);
+        phoneNumber.setType(Person.PhoneType.PHONE_TYPE_HOME);
       } else if (type.equals("work")) {
-        phoneNumber.setType(Person.PhoneType.WORK);
+        phoneNumber.setType(Person.PhoneType.PHONE_TYPE_WORK);
       } else {
         stdout.println("Unknown phone type.  Using default.");
       }
@@ -531,13 +531,13 @@ class ListPeople {
 
       for (Person.PhoneNumber phoneNumber : person.getPhonesList()) {
         switch (phoneNumber.getType()) {
-          case MOBILE:
+          case PHONE_TYPE_MOBILE:
             System.out.print("  Mobile phone #: ");
             break;
-          case HOME:
+          case PHONE_TYPE_HOME:
             System.out.print("  Home phone #: ");
             break;
-          case WORK:
+          case PHONE_TYPE_WORK:
             System.out.print("  Work phone #: ");
             break;
         }

content/getting-started/kotlintutorial.md

@@ -262,12 +262,12 @@ fun promptPerson(): Person = person {
 
     print("Is this a mobile, home, or work phone? ")
     val type = when (readLine()) {
-      "mobile" -> Person.PhoneType.MOBILE
-      "home" -> Person.PhoneType.HOME
-      "work" -> Person.PhoneType.WORK
+      "mobile" -> Person.PhoneType.PHONE_TYPE_MOBILE
+      "home" -> Person.PhoneType.PHONE_TYPE_HOME
+      "work" -> Person.PhoneType.PHONE_TYPE_WORK
       else -> {
         println("Unknown phone type.  Using home.")
-        Person.PhoneType.HOME
+        Person.PhoneType.PHONE_TYPE_HOME
       }
     }
     phones += phoneNumber {
@@ -319,9 +319,9 @@ fun print(addressBook: AddressBook) {
     }
     for (phoneNumber in person.phonesList) {
       val modifier = when (phoneNumber.type) {
-        Person.PhoneType.MOBILE -> "Mobile"
-        Person.PhoneType.HOME -> "Home"
-        Person.PhoneType.WORK -> "Work"
+        Person.PhoneType.PHONE_TYPE_MOBILE -> "Mobile"
+        Person.PhoneType.PHONE_TYPE_HOME -> "Home"
+        Person.PhoneType.PHONE_TYPE_WORK -> "Work"
         else -> "Unknown"
       }
       println("  $modifier phone #: ${phoneNumber.number}")

content/getting-started/pythontutorial.md

@@ -94,7 +94,7 @@ message Person {
 
   message PhoneNumber {
     optional string number = 1;
-    optional PhoneType type = 2 [default = HOME];
+    optional PhoneType type = 2 [default = PHONE_TYPE_HOME];
   }
 
   repeated PhoneNumber phones = 4;
@@ -125,7 +125,7 @@ even define message types nested inside other messages -- as you can see, the
 `PhoneNumber` type is defined inside `Person`. You can also define `enum` types
 if you want one of your fields to have one of a predefined list of values --
 here you want to specify that a phone number can be one of the following phone
-types: `MOBILE`, `HOME`, or `WORK`.
+types: `PHONE_TYPE_MOBILE`, `PHONE_TYPE_HOME`, or `PHONE_TYPE_WORK`.
 
 The " = 1", " = 2" markers on each element identify the unique "tag" that field
 uses in the binary encoding. Tag numbers 1-15 require one less byte to encode
@@ -240,7 +240,7 @@ person.name = "John Doe"
 person.email = "[email protected]"
 phone = person.phones.add()
 phone.number = "555-4321"
-phone.type = addressbook_pb2.Person.HOME
+phone.type = addressbook_pb2.Person.PHONE_TYPE_HOME
 ```
 
 Note that these assignments are not just adding arbitrary new fields to a
@@ -262,7 +262,7 @@ any particular field definition, see the
 
 Enums are expanded by the metaclass into a set of symbolic constants with
 integer values. So, for example, the constant
-`addressbook_pb2.Person.PhoneType.WORK` has the value 2.
+`addressbook_pb2.Person.PhoneType.PHONE_TYPE_WORK` has the value 2.
 
 ### Standard Message Methods {#standard-message-methods}
 
@@ -348,11 +348,11 @@ def PromptForAddress(person):
 
     phone_type = input("Is this a mobile, home, or work phone? ")
     if phone_type == "mobile":
-      phone_number.type = addressbook_pb2.Person.PhoneType.MOBILE
+      phone_number.type = addressbook_pb2.Person.PhoneType.PHONE_TYPE_MOBILE
     elif phone_type == "home":
-      phone_number.type = addressbook_pb2.Person.PhoneType.HOME
+      phone_number.type = addressbook_pb2.Person.PhoneType.PHONE_TYPE_HOME
     elif phone_type == "work":
-      phone_number.type = addressbook_pb2.Person.PhoneType.WORK
+      phone_number.type = addressbook_pb2.Person.PhoneType.PHONE_TYPE_WORK
     else:
       print("Unknown phone type; leaving as default value.")
 
@@ -401,11 +401,11 @@ def ListPeople(address_book):
       print("  E-mail address:", person.email)
 
     for phone_number in person.phones:
-      if phone_number.type == addressbook_pb2.Person.PhoneType.MOBILE:
+      if phone_number.type == addressbook_pb2.Person.PhoneType.PHONE_TYPE_MOBILE:
         print("  Mobile phone #: ", end="")
-      elif phone_number.type == addressbook_pb2.Person.PhoneType.HOME:
+      elif phone_number.type == addressbook_pb2.Person.PhoneType.PHONE_TYPE_HOME:
         print("  Home phone #: ", end="")
-      elif phone_number.type == addressbook_pb2.Person.PhoneType.WORK:
+      elif phone_number.type == addressbook_pb2.Person.PhoneType.PHONE_TYPE_WORK:
         print("  Work phone #: ", end="")
       print(phone_number.number)
 

content/news/2022-05-06.md

@@ -1,6 +1,5 @@
 +++
 title = "Changes announced May 6, 2022"
-weight = 27
 linkTitle = "May 6, 2022"
 toc_hide = "true"
 description = "Changes announced for Protocol Buffers on May 6, 2022."

content/news/2022-07-06.md

@@ -1,6 +1,5 @@
 +++
 title = "Changes announced July 6, 2022"
-weight = 26
 linkTitle = "July 6, 2022"
 toc_hide = "true"
 description = "Changes announced for Protocol Buffers on July 6, 2022."