@@ -2,45 +2,37 @@ package runconfig

 import (

 	"fmt"

-

-	"github.com/docker/docker/api/errors"

 )

 var (

 	// ErrConflictContainerNetworkAndLinks conflict between --net=container and links

-	ErrConflictContainerNetworkAndLinks = fmt.Errorf("Conflicting options: container type network can't be used with links. This would result in undefined behavior")

-	// ErrConflictUserDefinedNetworkAndLinks conflict between --net=<NETWORK> and links

-	ErrConflictUserDefinedNetworkAndLinks = fmt.Errorf("Conflicting options: networking can't be used with links. This would result in undefined behavior")

+	ErrConflictContainerNetworkAndLinks = fmt.Errorf("conflicting options: container type network can't be used with links. This would result in undefined behavior")

 	// ErrConflictSharedNetwork conflict between private and other networks

-	ErrConflictSharedNetwork = fmt.Errorf("Container sharing network namespace with another container or host cannot be connected to any other network")

+	ErrConflictSharedNetwork = fmt.Errorf("container sharing network namespace with another container or host cannot be connected to any other network")

 	// ErrConflictHostNetwork conflict from being disconnected from host network or connected to host network.

-	ErrConflictHostNetwork = fmt.Errorf("Container cannot be disconnected from host network or connected to host network")

+	ErrConflictHostNetwork = fmt.Errorf("container cannot be disconnected from host network or connected to host network")

 	// ErrConflictNoNetwork conflict between private and other networks

-	ErrConflictNoNetwork = fmt.Errorf("Container cannot be connected to multiple networks with one of the networks in private (none) mode")

+	ErrConflictNoNetwork = fmt.Errorf("container cannot be connected to multiple networks with one of the networks in private (none) mode")

 	// ErrConflictNetworkAndDNS conflict between --dns and the network mode

-	ErrConflictNetworkAndDNS = fmt.Errorf("Conflicting options: dns and the network mode")

+	ErrConflictNetworkAndDNS = fmt.Errorf("conflicting options: dns and the network mode")

 	// ErrConflictNetworkHostname conflict between the hostname and the network mode

-	ErrConflictNetworkHostname = fmt.Errorf("Conflicting options: hostname and the network mode")

+	ErrConflictNetworkHostname = fmt.Errorf("conflicting options: hostname and the network mode")

 	// ErrConflictHostNetworkAndLinks conflict between --net=host and links

-	ErrConflictHostNetworkAndLinks = fmt.Errorf("Conflicting options: host type networking can't be used with links. This would result in undefined behavior")

+	ErrConflictHostNetworkAndLinks = fmt.Errorf("conflicting options: host type networking can't be used with links. This would result in undefined behavior")

 	// ErrConflictContainerNetworkAndMac conflict between the mac address and the network mode

-	ErrConflictContainerNetworkAndMac = fmt.Errorf("Conflicting options: mac-address and the network mode")

+	ErrConflictContainerNetworkAndMac = fmt.Errorf("conflicting options: mac-address and the network mode")

 	// ErrConflictNetworkHosts conflict between add-host and the network mode

-	ErrConflictNetworkHosts = fmt.Errorf("Conflicting options: custom host-to-IP mapping and the network mode")

+	ErrConflictNetworkHosts = fmt.Errorf("conflicting options: custom host-to-IP mapping and the network mode")

 	// ErrConflictNetworkPublishPorts conflict between the publish options and the network mode

-	ErrConflictNetworkPublishPorts = fmt.Errorf("Conflicting options: port publishing and the container type network mode")

+	ErrConflictNetworkPublishPorts = fmt.Errorf("conflicting options: port publishing and the container type network mode")

 	// ErrConflictNetworkExposePorts conflict between the expose option and the network mode

-	ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: port exposing and the container type network mode")

+	ErrConflictNetworkExposePorts = fmt.Errorf("conflicting options: port exposing and the container type network mode")

 	// ErrUnsupportedNetworkAndIP conflict between network mode and requested ip address

-	ErrUnsupportedNetworkAndIP = fmt.Errorf("User specified IP address is supported on user defined networks only")

+	ErrUnsupportedNetworkAndIP = fmt.Errorf("user specified IP address is supported on user defined networks only")

 	// ErrUnsupportedNetworkNoSubnetAndIP conflict between network with no configured subnet and requested ip address

-	ErrUnsupportedNetworkNoSubnetAndIP = fmt.Errorf("User specified IP address is supported only when connecting to networks with user configured subnets")

+	ErrUnsupportedNetworkNoSubnetAndIP = fmt.Errorf("user specified IP address is supported only when connecting to networks with user configured subnets")

 	// ErrUnsupportedNetworkAndAlias conflict between network mode and alias

-	ErrUnsupportedNetworkAndAlias = fmt.Errorf("Network-scoped alias is supported only for containers in user defined networks")

+	ErrUnsupportedNetworkAndAlias = fmt.Errorf("network-scoped alias is supported only for containers in user defined networks")

 	// ErrConflictUTSHostname conflict between the hostname and the UTS mode

-	ErrConflictUTSHostname = fmt.Errorf("Conflicting options: hostname and the UTS mode")

+	ErrConflictUTSHostname = fmt.Errorf("conflicting options: hostname and the UTS mode")

 )

-

-func conflictError(err error) error {

-	return errors.NewRequestConflictError(err)

-}