diff --git a/clientv3/internal/endpoint/endpoint.go b/clientv3/internal/endpoint/endpoint.go
index 36d8fdb11f2e..00639dd7cdc9 100644
--- a/clientv3/internal/endpoint/endpoint.go
+++ b/clientv3/internal/endpoint/endpoint.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package endpoint provides utilities for handling and interpreting etcd
-// endpoints.
 package endpoint
 
 import (
diff --git a/clientv3/internal/resolver/resolver.go b/clientv3/internal/resolver/resolver.go
index 32205a37557e..60b7d85f1928 100644
--- a/clientv3/internal/resolver/resolver.go
+++ b/clientv3/internal/resolver/resolver.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package resolver provides a manual resolver for etcd endpoints.
 package resolver
 
 import (
diff --git a/clientv3/naming/endpoints/endpoints.go b/clientv3/naming/endpoints/endpoints.go
index f8706604683a..6621037b2847 100644
--- a/clientv3/naming/endpoints/endpoints.go
+++ b/clientv3/naming/endpoints/endpoints.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package endpoints provides structures and methods for managing endpoints in etcd,
-// including adding, deleting, and listing endpoints, as well as watching for updates.
 package endpoints
 
 import (
diff --git a/clientv3/naming/endpoints/internal/update.go b/clientv3/naming/endpoints/internal/update.go
index 42736e6967a2..bb72143ed4cd 100644
--- a/clientv3/naming/endpoints/internal/update.go
+++ b/clientv3/naming/endpoints/internal/update.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package internal provides internal structures and constants for etcd
-// endpoint operations.
 package internal
 
 // Operation describes action performed on endpoint (addition vs deletion).
diff --git a/clientv3/naming/resolver/resolver.go b/clientv3/naming/resolver/resolver.go
index b41105af371f..7fe8da8fc43a 100644
--- a/clientv3/naming/resolver/resolver.go
+++ b/clientv3/naming/resolver/resolver.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package resolver provides a gRPC resolver for etcd endpoints.
 package resolver
 
 import (
diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go
index c4dba5d8b926..b67dab2b35a3 100644
--- a/etcdserver/cluster_util.go
+++ b/etcdserver/cluster_util.go
@@ -242,7 +242,7 @@ func isCompatibleWithCluster(lg *zap.Logger, cl *membership.RaftCluster, local t
 		Minor: maxV.Minor,
 	}
 	if nextClusterVersionCompatible {
-		maxV.Minor++
+		maxV.Minor += 1
 	}
 	return isCompatibleWithVers(lg, vers, local, minV, maxV)
 }
diff --git a/etcdserver/etcdserverpb/raft_internal_stringer.go b/etcdserver/etcdserverpb/raft_internal_stringer.go
index 484bd6223bac..31e121ee0a63 100644
--- a/etcdserver/etcdserverpb/raft_internal_stringer.go
+++ b/etcdserver/etcdserverpb/raft_internal_stringer.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package etcdserverpb provides protocol buffer messages for the etcd server.
 package etcdserverpb
 
 import (
diff --git a/etcdserver/verify/doc.go b/etcdserver/verify/doc.go
index d5fcc6bd89a5..2c42bf6f1985 100644
--- a/etcdserver/verify/doc.go
+++ b/etcdserver/verify/doc.go
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package verify is analyzing persistent state of etcd to find potential
+package verify
+
+// verify package is analyzing persistent state of etcd to find potential
 // inconsistencies.
 // In particular it covers cross-checking between different aspacts of etcd
 // storage like WAL & Backend.
-package verify
diff --git a/functional/rpcpb/etcd_config.go b/functional/rpcpb/etcd_config.go
index 80d668f4b01d..639c1bc55e67 100644
--- a/functional/rpcpb/etcd_config.go
+++ b/functional/rpcpb/etcd_config.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package rpcpb defines the etcd configuration structure and related utilities.
 package rpcpb
 
 import (
diff --git a/pkg/grpc_testing/stub_server.go b/pkg/grpc_testing/stub_server.go
index 0be72f94586e..e611435585e2 100644
--- a/pkg/grpc_testing/stub_server.go
+++ b/pkg/grpc_testing/stub_server.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package grpc_testing provides utilities for testing gRPC services.
 package grpc_testing
 
 import (
diff --git a/raft/confchange/confchange.go b/raft/confchange/confchange.go
index 928c1452bc28..d8a878780408 100644
--- a/raft/confchange/confchange.go
+++ b/raft/confchange/confchange.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package confchange implements configuration changes for the Raft
-// consensus algorithm.
 package confchange
 
 import (
diff --git a/raft/quorum/bench_test.go b/raft/quorum/bench_test.go
index 7fd72ff78b15..5c7961ed6cfc 100644
--- a/raft/quorum/bench_test.go
+++ b/raft/quorum/bench_test.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package quorum implements quorum-based decision making for the Raft
-// consensus algorithm.
 package quorum
 
 import (
diff --git a/raft/raftpb/confchange.go b/raft/raftpb/confchange.go
index cff528f4495d..46a7a70212e4 100644
--- a/raft/raftpb/confchange.go
+++ b/raft/raftpb/confchange.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package raftpb defines protocol buffer messages for Raft consensus
-// algorithm in etcd.
 package raftpb
 
 import (
diff --git a/raft/tracker/inflights.go b/raft/tracker/inflights.go
index df000639b5b7..1a056341ab51 100644
--- a/raft/tracker/inflights.go
+++ b/raft/tracker/inflights.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package tracker implements tracking of inflight messages for the Raft
-// consensus algorithm.
 package tracker
 
 // Inflights limits the number of MsgApp (represented by the largest index
diff --git a/wal/walpb/record.go b/wal/walpb/record.go
index 2f5075eea510..30a05e0c139c 100644
--- a/wal/walpb/record.go
+++ b/wal/walpb/record.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package walpb defines the structures and error handling for the write-ahead
-// log protocol buffer.
 package walpb
 
 import "errors"