Merge pull request opencontainers#196 from runcom/fix-typo-namespaces

Mrunal Patel · Mrunal Patel · commit 8e00c3f76ce4 · 2015-09-17T10:56:19.000-07:00
runtime: config: linux: Remove trailing comma in namespaces json example
diff --git a/runtime-config-linux.md b/runtime-config-linux.md
@@ -20,17 +20,17 @@ Also, when a path is specified, a runtime MUST assume that the setup for that pa
             "path": "/var/run/netns/neta"
         },
         {
-            "type": "mount",
+            "type": "mount"
         },
         {
-            "type": "ipc",
+            "type": "ipc"
         },
         {
-            "type": "uts",
+            "type": "uts"
         },
         {
-            "type": "user",
-        },
+            "type": "user"
+        }
     ]
 ```
 
@@ -132,7 +132,7 @@ Also known as cgroups, they are used to restrict resource usage for a container
 cgroups provide controls to restrict cpu, memory, IO, pids and network for the container.
 For more information, see the [kernel cgroups documentation](https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt).
 
-The path to the cgroups can to be specified in the Spec via `cgroupsPath`.
+The path to the cgroups can be specified in the Spec via `cgroupsPath`.
 `cgroupsPath` is expected to be relative to the cgroups mount point.
 If not specified, cgroups will be created under '/'.
 Implementations of the Spec can choose to name cgroups in any manner.

Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,17 @@ Also, when a path is specified, a runtime MUST assume that the setup for that pa`
`20`	`20`	`"path": "/var/run/netns/neta"`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		`- "type": "mount",`
	`23`	`+ "type": "mount"`
`24`	`24`	`},`
`25`	`25`	`{`
`26`		`- "type": "ipc",`
	`26`	`+ "type": "ipc"`
`27`	`27`	`},`
`28`	`28`	`{`
`29`		`- "type": "uts",`
	`29`	`+ "type": "uts"`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- "type": "user",`
`33`		`- },`
	`32`	`+ "type": "user"`
	`33`	`+ }`
`34`	`34`	`]`
`35`	`35`	```
`36`	`36`
`@@ -132,7 +132,7 @@ Also known as cgroups, they are used to restrict resource usage for a container`
`132`	`132`	`cgroups provide controls to restrict cpu, memory, IO, pids and network for the container.`
`133`	`133`	`For more information, see the [kernel cgroups documentation](https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt).`
`134`	`134`
`135`		-The path to the cgroups can to be specified in the Spec via `cgroupsPath`.
	`135`	+The path to the cgroups can be specified in the Spec via `cgroupsPath`.
`136`	`136`	`cgroupsPath` is expected to be relative to the cgroups mount point.
`137`	`137`	`If not specified, cgroups will be created under '/'.`
`138`	`138`	`Implementations of the Spec can choose to name cgroups in any manner.`