This documentation change addresses merge conflicts.

PiperOrigin-RevId: 663425236
Change-Id: Idb326bb419539b15e55cafec1d279bad8a7e45d1

Author: Protocol Buffer Team

.github/workflows/gh-pages.yml

@@ -14,17 +14,13 @@ jobs:
       contents: write
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: true  # Fetch Hugo themes (true OR recursive)
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3
+        uses: peaceiris/actions-hugo@v2
         with:
           hugo-version: 0.121.2
           extended: true
@@ -36,7 +32,7 @@ jobs:
         run: hugo --minify
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@v3
         if: github.ref == 'refs/heads/main'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

content/programming-guides/enum.md

@@ -114,26 +114,14 @@ Under editions, this behavior is represented by the deprecated field feature
 [`features.(pb.cpp).legacy_closed_enum`](/editions/features#legacy_closed_enum).
 There are two options for moving to conformant behavior:
 
-*   Remove the field feature. This is the recommended approach, but may cause
-    runtime behavior changes. Without the feature, unrecognized integers will
-    end up stored in the field cast to the enum type instead of being put into
-    the unknown field set.
-*   Change the enum to closed. This is discouraged, and can cause runtime
-    behavior if *anybody else* is using the enum. Unrecognized integers will end
-    up in the unknown field set instead of those fields.
-
-Under editions, this behavior is represented by the deprecated field feature
-[`features.(pb.cpp).legacy_closed_enum`](/editions/features#legacy_closed_enum).
-There are two options for moving to conformant behavior:
-
 *   Remove the field feature. This is the recommended approach, but may cause
     runtime behavior changes. Without the feature, unrecognized integers will
     end up stored in the field cast to the enum type instead of being put into
     the unknown field set.
 *   Change the enum to closed. This is discouraged, and can cause runtime
     behavior changes if *anybody else* is using the enum. Unrecognized integers
     will end up in the unknown field set instead of those fields.
-    
+
 ### C# {#csharp}
 
 All known C# releases are out of conformance. C# treats all enums as **open**.