Selaa lähdekoodia

Merge pull request #47197 from corhere/libn/carry-typo-fixes

libnetwork: carry typo fixes from moby/libnetwork repo
Sebastiaan van Stijn 1 vuosi sitten
vanhempi
commit
314ea05f8d
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 1 1
      libnetwork/docs/design.md
  2. 1 1
      libnetwork/iptables/iptables.go

+ 1 - 1
libnetwork/docs/design.md

@@ -52,7 +52,7 @@ Networks consist of *many* endpoints.
 `Endpoint` represents a Service Endpoint. It provides the connectivity for services exposed by a container in a network with other services provided by other containers in the network. `Network` object provides APIs to create and manage an endpoint. An endpoint can be attached to only one network. `Endpoint` creation calls are made to the corresponding `Driver` which is responsible for allocating resources for the corresponding `Sandbox`. Since `Endpoint` represents a Service and not necessarily a particular container, `Endpoint` has a global scope within a cluster.
 
 **Sandbox**
-`Sandbox` object represents container's network configuration such as IP address, MAC address, routes, DNS entries. A `Sandbox` object is created when the user requests to create an endpoint on a network. The `Driver` that handles the `Network` is responsible for allocating the required network resources (such as the IP address) and passing the info called `SandboxInfo` back to libnetwork. libnetwork will make use of OS specific constructs (example: netns for Linux) to populate the network configuration into the containers that is represented by the `Sandbox`. A `Sandbox` can have multiple endpoints attached to different networks. Since `Sandbox` is associated with a particular container in a given host, it has a local scope that represents the Host that the Container belong to.
+`Sandbox` object represents container's network configuration such as IP address, MAC address, routes, DNS entries. A `Sandbox` object is created when the user requests to create an endpoint on a network. The `Driver` that handles the `Network` is responsible for allocating the required network resources (such as the IP address) and passing the info called `SandboxInfo` back to libnetwork. libnetwork will make use of OS specific constructs (example: netns for Linux) to populate the network configuration into the containers that is represented by the `Sandbox`. A `Sandbox` can have multiple endpoints attached to different networks. Since `Sandbox` is associated with a particular container in a given host, it has a local scope that represents the Host that the Container belongs to.
 
 **CNM Attributes**
 

+ 1 - 1
libnetwork/iptables/iptables.go

@@ -363,7 +363,7 @@ func (c *ChainInfo) Forward(action Action, ip net.IP, port int, proto, destAddr
 	if proto == "sctp" {
 		// Linux kernel v4.9 and below enables NETIF_F_SCTP_CRC for veth by
 		// the following commit.
-		// This introduces a problem when conbined with a physical NIC without
+		// This introduces a problem when combined with a physical NIC without
 		// NETIF_F_SCTP_CRC. As for a workaround, here we add an iptables entry
 		// to fill the checksum.
 		//