@@ -527,9 +527,9 @@ func validateEndpointSettings(nw *libnetwork.Network, nwName string, epConfig *n

 	//  serviceDiscoveryOnDefaultNetwork are removed.

 	if !containertypes.NetworkMode(nwName).IsUserDefined() {

 		hasStaticAddresses := ipamConfig.IPv4Address.IsValid() || ipamConfig.IPv6Address.IsValid()

-		// On Linux, user specified IP address is accepted only by networks with user specified subnets.

+		// On Linux, user-specified IP address is accepted only by networks with user-specified subnets.

 		if hasStaticAddresses && !enableIPOnPredefinedNetwork() {

-			errs = append(errs, cerrdefs.ErrInvalidArgument.WithMessage("user specified IP address is supported on user defined networks only"))

+			errs = append(errs, cerrdefs.ErrInvalidArgument.WithMessage("user-specified IP address is supported on user-defined networks only"))

 		}

 		if len(epConfig.Aliases) > 0 && !serviceDiscoveryOnDefaultNetwork() {

 			errs = append(errs, cerrdefs.ErrInvalidArgument.WithMessage("network-scoped aliases are only supported for user-defined networks"))

@@ -637,7 +637,7 @@ func cleanOperationalData(es *network.EndpointSettings) {

 }

 func (daemon *Daemon) updateNetworkConfig(ctr *container.Container, n *libnetwork.Network, endpointConfig *networktypes.EndpointSettings) error {

-	// Set up DNS names for a user defined network, and for the default 'nat'

+	// Set up DNS names for a user-defined network, and for the default 'nat'

 	// network on Windows (IsBridge() returns true for nat).

 	if containertypes.NetworkMode(n.Name()).IsUserDefined() ||

 		(serviceDiscoveryOnDefaultNetwork() && containertypes.NetworkMode(n.Name()).IsBridge()) {

@@ -1128,7 +1128,7 @@ func (daemon *Daemon) DeactivateContainerServiceBinding(containerName string) er

 }

 func getNetworkID(name string, endpointSettings *networktypes.EndpointSettings) string {

-	// We only want to prefer NetworkID for user defined networks.

+	// We only want to prefer NetworkID for user-defined networks.

 	// For systems like bridge, none, etc. the name is preferred (otherwise restart may cause issues)

 	if containertypes.NetworkMode(name).IsUserDefined() && endpointSettings != nil && endpointSettings.NetworkID != "" {

 		return endpointSettings.NetworkID

@@ -149,7 +149,7 @@ func setExitCodeFromError(setExitCode func(exitStatus), err error) error {

 		return startInvalidConfigError(errDesc)

 	}

-	// attempted to mount a file onto a directory, or a directory onto a file, maybe from user specified bind mounts

+	// attempted to mount a file onto a directory, or a directory onto a file, maybe from user-specified bind mounts

 	if contains(errDesc, syscall.ENOTDIR.Error()) {

 		errDesc += ": Are you trying to mount a directory onto a file (or vice-versa)? Check if the specified host path exists and is the expected type"

 		setExitCode(exitCmdNotFound)

@@ -867,7 +867,7 @@ func (na *cnmNetworkAllocator) allocatePools(n *api.Network) (map[netip.Prefix]s

 		return nil, err

 	}

-	// We don't support user defined address spaces yet so just

+	// We don't support user-defined address spaces yet so just

 	// retrieve default address space names for the driver.

 	_, asName, err := ipam.GetDefaultAddressSpaces()

 	if err != nil {

@@ -117,13 +117,13 @@ const (

 	ifaceCreatedByUser

 )

-// containerConfiguration represents the user specified configuration for a container

+// containerConfiguration represents the user-specified configuration for a container

 type containerConfiguration struct {

 	ParentEndpoints []string

 	ChildEndpoints  []string

 }

-// connectivityConfiguration represents the user specified configuration regarding the external connectivity

+// connectivityConfiguration represents the user-specified configuration regarding the external connectivity

 type connectivityConfiguration struct {

 	PortBindings []portmapperapi.PortBindingReq

 	ExposedPorts []types.TransportPort

@@ -153,7 +153,7 @@ func delVlanLink(linkName string) error {

 		log.G(context.TODO()).Debugf("Deleted a vlan tagged netlink subinterface: %s", linkName)

 	}

 	// if the subinterface doesn't parse to iface.vlan_id leave the interface in

-	// place since it could be a user specified name not created by the driver.

+	// place since it could be a user-specified name not created by the driver.

 	return nil

 }

@@ -133,7 +133,7 @@ func delVlanLink(linkName string) error {

 		log.G(context.TODO()).Debugf("Deleted a vlan tagged netlink subinterface: %s", linkName)

 	}

 	// if the subinterface doesn't parse to iface.vlan_id leave the interface in

-	// place since it could be a user specified name not created by the driver.

+	// place since it could be a user-specified name not created by the driver.

 	return nil

 }

@@ -56,7 +56,7 @@ type networkConfiguration struct {

 	OutboundNatExceptions []string

 }

-// endpointConfiguration represents the user specified configuration for the sandbox endpoint

+// endpointConfiguration represents the user-specified configuration for the sandbox endpoint

 type endpointOption struct {

 	MacAddress  net.HardwareAddr

 	QosPolicies []types.QosPolicy

@@ -84,8 +84,8 @@ type hnsEndpoint struct {

 	// when windows properly supports a sandboxID.

 	sandboxID      string

 	macAddress     net.HardwareAddr

-	epOption       *endpointOption       // User specified parameters

-	epConnectivity *EndpointConnectivity // User specified parameters

+	epOption       *endpointOption       // User-specified parameters

+	epConnectivity *EndpointConnectivity // User-specified parameters

 	portMapping    []types.PortBinding   // Operation port bindings

 	addr           *net.IPNet

 	gateway        net.IP

@@ -304,8 +304,8 @@ func TestNetworkConfig(t *testing.T) {

 			//nolint:dupword // ignore "Duplicate words (network) found (dupword)"

 			// Doing a partial match here omn the error-string here, as this produces either;

 			//

-			// 	user specified configurations are not supported if the network depends on a configuration network

-			// 	network driver options are not supported if the network depends on a configuration network

+			// - user-specified configurations are not supported if the network depends on a configuration network.

+			// - network driver options are not supported if the network depends on a configuration network.

 			//

 			// We can  consider changing this to a proper test-table.

 			assert.Check(t, is.ErrorContains(err, `not supported if the network depends on a configuration network`))

@@ -415,7 +415,7 @@ func (n *Network) validateConfiguration() error {

 			!n.enableIPv4 || n.enableIPv6 ||

 			len(n.labels) > 0 || len(n.ipamOptions) > 0 ||

 			len(n.ipamV4Config) > 0 || len(n.ipamV6Config) > 0 {

-			return types.ForbiddenErrorf("user specified configurations are not supported if the network depends on a configuration network")

+			return types.ForbiddenErrorf("user-specified configurations are not supported if the network depends on a configuration network")

 		}

 		if len(n.generic) > 0 {

 			if data, ok := n.generic[netlabel.GenericData]; ok {

@@ -1319,7 +1319,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIP(c *testing.T) {

 	// Still it should fail to connect to the default network with a specified IP (whatever ip)

 	out, _, err := dockerCmdWithError("network", "connect", "--ip", "172.21.55.44", "bridge", "c0")

 	assert.Assert(c, err != nil, "out: %s", out)

-	assert.Assert(c, is.Contains(out, "user specified IP address is supported on user defined networks only"))

+	assert.Assert(c, is.Contains(out, "user-specified IP address is supported on user-defined networks only"))

 }

 func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIPStoppedContainer(c *testing.T) {

@@ -1351,7 +1351,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkUnsupportedRequiredIP(c *testing.T

 		checkUnsupportedNetworkAndIP(c, mode)

 	}

-	// requested IP is not supported on networks with no user defined subnets

+	// requested IP is not supported on networks with no user-defined subnets

 	cli.DockerCmd(c, "network", "create", "n0")

 	assertNwIsAvailable(c, "n0")

@@ -1368,7 +1368,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkUnsupportedRequiredIP(c *testing.T

 func checkUnsupportedNetworkAndIP(t *testing.T, nwMode string) {

 	out, _, err := dockerCmdWithError("run", "-d", "--net", nwMode, "--ip", "172.28.99.88", "--ip6", "2001:db8:1234::9988", "busybox", "top")

 	assert.Assert(t, err != nil, "out: %s", out)

-	assert.Assert(t, is.Contains(out, "user specified IP address is supported on user defined networks only"))

+	assert.Assert(t, is.Contains(out, "user-specified IP address is supported on user-defined networks only"))

 }

 func verifyIPAddressConfig(t *testing.T, cName, nwname, ipv4, ipv6 string) {

@@ -3459,7 +3459,7 @@ func (s *DockerCLIRunSuite) TestContainerWithConflictingHostNetworks(c *testing.

 	// Create a network using bridge driver

 	cli.DockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")

-	// Connecting to the user defined network must fail

+	// Connecting to the user-defined network must fail

 	_, _, err := dockerCmdWithError("network", "connect", "testnetwork1", "first")

 	assert.ErrorContains(c, err, "")

 }

@@ -3475,7 +3475,7 @@ func (s *DockerCLIRunSuite) TestContainerWithConflictingSharedNetwork(c *testing

 	// Create a network using bridge driver

 	cli.DockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")

-	// Connecting to the user defined network must fail

+	// Connecting to the user-defined network must fail

 	out, _, err := dockerCmdWithError("network", "connect", "testnetwork1", "second")

 	assert.ErrorContains(c, err, "")

 	assert.Assert(c, is.Contains(out, "container sharing network namespace with another container or host cannot be connected to any other network"))

@@ -3489,7 +3489,7 @@ func (s *DockerCLIRunSuite) TestContainerWithConflictingNoneNetwork(c *testing.T

 	// Create a network using bridge driver

 	cli.DockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")

-	// Connecting to the user defined network must fail

+	// Connecting to the user-defined network must fail

 	out, _, err := dockerCmdWithError("network", "connect", "testnetwork1", "first")

 	assert.ErrorContains(c, err, "")

 	assert.Assert(c, is.Contains(out, "container cannot be connected to multiple networks with one of the networks in private (none) mode"))

@@ -82,7 +82,7 @@ func TestHostnameDnsResolution(t *testing.T) {

 		hostname = "foobar"

 	)

-	// using user defined network as we want to use internal DNS

+	// using user-defined network as we want to use internal DNS

 	netName := "foobar-net"

 	net.CreateNoError(ctx, t, apiClient, netName, net.WithDriver("bridge"))

@@ -280,7 +280,7 @@ func WithCgroupnsMode(mode string) func(*TestContainerConfig) {

 	}

 }

-// WithExtraHost sets the user defined IP:Host mappings in the container's

+// WithExtraHost sets the user-defined IP:Host mappings in the container's

 // /etc/hosts file

 func WithExtraHost(extraHost string) func(*TestContainerConfig) {

 	return func(c *TestContainerConfig) {

@@ -257,7 +257,7 @@ func testIpvlanL2MultiSubnet(t *testing.T, ctx context.Context, apiClient client

 	)

 	assert.Check(t, n.IsNetworkAvailable(ctx, apiClient, netName))

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64

+	// start dual stack containers and verify the user-specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64

 	id1 := container.Run(ctx, t, apiClient,

 		container.WithNetworkMode(netName),

 		container.WithIPv4(netName, "172.28.200.20"),

@@ -282,7 +282,7 @@ func testIpvlanL2MultiSubnet(t *testing.T, ctx context.Context, apiClient client

 	_, err = container.Exec(ctx, apiClient, id2, []string{"ping6", "-c", "1", c1.Container.NetworkSettings.Networks[netName].GlobalIPv6Address.String()})

 	assert.NilError(t, err)

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64

+	// start dual stack containers and verify the user-specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64

 	id3 := container.Run(ctx, t, apiClient,

 		container.WithNetworkMode(netName),

 		container.WithIPv4(netName, "172.28.202.20"),

@@ -327,7 +327,7 @@ func testIpvlanL3MultiSubnet(t *testing.T, ctx context.Context, apiClient client

 	)

 	assert.Check(t, n.IsNetworkAvailable(ctx, apiClient, netName))

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64

+	// start dual stack containers and verify the user-specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64

 	id1 := container.Run(ctx, t, apiClient,

 		container.WithNetworkMode(netName),

 		container.WithIPv4(netName, "172.28.10.20"),

@@ -348,7 +348,7 @@ func testIpvlanL3MultiSubnet(t *testing.T, ctx context.Context, apiClient client

 	_, err = container.Exec(ctx, apiClient, id2, []string{"ping6", "-c", "1", c1.Container.NetworkSettings.Networks[netName].GlobalIPv6Address.String()})

 	assert.NilError(t, err)

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64

+	// start dual stack containers and verify the user-specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64

 	id3 := container.Run(ctx, t, apiClient,

 		container.WithNetworkMode(netName),

 		container.WithIPv4(netName, "172.28.12.20"),

@@ -345,7 +345,7 @@ func testMacvlanMultiSubnet(t *testing.T, ctx context.Context, apiClient client.

 	assert.Check(t, n.IsNetworkAvailable(ctx, apiClient, netName))

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64

+	// start dual stack containers and verify the user-specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64

 	id1 := container.Run(ctx, t, apiClient,

 		container.WithNetworkMode("dualstackbridge"),

 		container.WithIPv4("dualstackbridge", "172.28.100.20"),

@@ -370,7 +370,7 @@ func testMacvlanMultiSubnet(t *testing.T, ctx context.Context, apiClient client.

 	_, err = container.Exec(ctx, apiClient, id2, []string{"ping6", "-c", "1", c1.Container.NetworkSettings.Networks["dualstackbridge"].GlobalIPv6Address.String()})

 	assert.NilError(t, err)

-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64

+	// start dual stack containers and verify the user-specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64

 	id3 := container.Run(ctx, t, apiClient,

 		container.WithNetworkMode("dualstackbridge"),

 		container.WithIPv4("dualstackbridge", "172.28.102.20"),

@@ -428,7 +428,7 @@ func testMacvlanAddressing(t *testing.T, ctx context.Context, client client.APIC

 	assert.NilError(t, err)

 	assert.Check(t, !strings.Contains(result.Combined(), "default via"),

 		"result: %s", result.Combined())

-	// Validate macvlan bridge mode sets the v6 gateway to the user specified default gateway/next-hop

+	// Validate macvlan bridge mode sets the v6 gateway to the user-specified default gateway/next-hop

 	result, err = container.Exec(ctx, client, id1, []string{"ip", "-6", "route"})

 	assert.NilError(t, err)

 	assert.Check(t, is.Contains(result.Combined(), "default via 2001:db8:abca::254 dev eth0"))

@@ -1049,7 +1049,7 @@ func TestDisableIPv6OnInterface(t *testing.T) {

 			netName: "bridge",

 		},

 		{

-			name:    "user defined bridge",

+			name:    "user-defined bridge",

 			netName: "testnet",

 		},

 	}

@@ -28,11 +28,11 @@ func TestNatNetworkICC(t *testing.T) {

 		netName string

 	}{

 		{

-			name:    "Default nat network",

+			name:    "default nat network",

 			netName: "nat",

 		},

 		{

-			name:    "User defined nat network",

+			name:    "user-defined nat network",

 			netName: "mynat",

 		},

 	}