From 794aa221a8b64165fab3b72ae3384f4c36a7ecf0 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Fri, 7 Oct 2016 14:52:24 -0400 Subject: [PATCH] Fix up man page with missing options Also sort options in alphabetic order. Signed-off-by: Dan Walsh --- docs/ocid.8.md | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/docs/ocid.8.md b/docs/ocid.8.md index 77478635..f80ba030 100644 --- a/docs/ocid.8.md +++ b/docs/ocid.8.md @@ -6,16 +6,18 @@ ocid - Enable OCI Kubernetes Container Runtime daemon # SYNOPSIS **ocid** -[**--root**=[*value*]] [**--conmon**=[*value*]] -[**--sandboxdir**=[*value*]] [**--containerdir**=[*value*]] -[**--socket**=[*value*]] -[**--runtime**=[*value*]] [**--debug**] +[**--help**|**-h**] [**--log**=[*value*]] [**--log-format value**] -[**--help**|**-h**] +[**--pause**=[*value*]] +[**--root**=[*value*]] +[**--runtime**=[*value*]] +[**--sandboxdir**=[*value*]] +[**--selinux-enabled**] +[**--socket**=[*value*]] [**--version**|**-v**] # DESCRIPTION @@ -34,35 +36,41 @@ ocid is meant to provide an integration path between OCI conformant runtimes and # OPTIONS -**--root**="" - OCID root dir (default: "/var/lib/ocid") - -**--sandboxdir**="" - OCID pod sandbox dir (default: "/var/lib/ocid/sandboxes") - **--conmon**="" path to the conmon executable (default: "/usr/libexec/ocid/conmon") **--containerdir**="" OCID container dir (default: "/var/lib/ocid/containers") -**--socket**="" - Path to ocid socket (default: "/var/run/ocid.sock") - -**--runtime**="" - OCI runtime path (default: "/usr/bin/runc") - **--debug** Enable debug output for logging +**--help, -h** + Print usage statement + **--log**="" Set the log file path where internal debug information is written **--log-format**="" Set the format used by logs ('text' (default), or 'json') (default: "text") -**--help, -h** - Print usage statement +**--pause**="" + Path to the pause executable (default: "/usr/libexec/ocid/pause") + +**--root**="" + OCID root dir (default: "/var/lib/ocid") + +**--runtime**="" + OCI runtime path (default: "/usr/bin/runc") + +**--sandboxdir**="" + OCID pod sandbox dir (default: "/var/lib/ocid/sandboxes") + +**--selinux-enabled** + Enable selinux support + +**--socket**="" + Path to ocid socket (default: "/var/run/ocid.sock") **--version, -v** Print the version