Update minio.py and mc references for simplified structure

source/includes/common-installation.rst

@@ -70,7 +70,7 @@ for creating this user with a home directory ``/home/minio-user``.
 
 If the ``minio.service`` file specifies a different user account, use the
 ``$HOME`` directory for that account. Alternatively, specify a custom
-certificate directory using the :mc-cmd-option:`minio server certs-dir`
+certificate directory using the :mc-cmd:`minio server certs-dir`
 commandline argument. Modify the ``MINIO_OPTS`` variable in
 ``/etc/defaults/minio`` to set this option. The ``systemd`` user which runs the
 MinIO server process *must* have read and listing permissions for the specified

source/includes/common-minio-external-auth.rst

@@ -96,7 +96,7 @@ more information.
 
    The embedded MinIO Console by default uses a random port number selected at
    server startup. Start the MinIO server process with the
-   :mc-cmd-option:`~minio server console-address` option to specify a static
+   :mc-cmd:`~minio server --console-address` option to specify a static
    port number.
 
 .. end-minio-openid-redirect-uri

source/includes/common-minio-mc.rst

@@ -1,8 +1,8 @@
 .. start-minio-mc-globals
 
-.. mc-cmd:: debug
-   :option:
-
+.. mc-cmd:: --debug
+   :optional:
+   
    Enables verbose output to the console.
 
    For example:
@@ -12,8 +12,8 @@
 
       mc --debug COMMAND
 
-.. mc-cmd:: config-dir
-   :option:
+.. mc-cmd:: --config-dir
+   :optional:
 
    The path to a ``JSON`` formatted configuration file that
    :program:`mc` uses for storing data. See :ref:`mc-configuration` for
@@ -21,8 +21,8 @@
 
 .. start-minio-mc-json-globals
 
-.. mc-cmd:: JSON
-   :option:
+.. mc-cmd:: --JSON
+   :optional:
 
    Enables `JSON lines <http://jsonlines.org/>`_ formatted output to the
    console.
@@ -36,31 +36,31 @@
 
 .. end-minio-mc-json-globals
 
-.. mc-cmd:: no-color
-   :option:
+.. mc-cmd:: --no-color
+   :optional:
 
    Disables the built-in color theme for console output. Useful for dumb
    terminals.
 
-.. mc-cmd:: quiet
-   :option:
+.. mc-cmd:: --quiet
+   :optional:
 
    Suppresses console output. 
 
-.. mc-cmd:: insecure
-   :option:
+.. mc-cmd:: --insecure
+   :optional:
 
    Disables TLS/SSL certificate verification. Allows TLS connectivity to 
    servers with invalid certificates. Exercise caution when using this
    option against untrusted S3 hosts.
 
-.. mc-cmd:: version
-   :option:
+.. mc-cmd:: --version
+   :optional:   
 
    Displays the current version of :mc-cmd:`mc`. 
 
-.. mc-cmd:: help
-   :option:
+.. mc-cmd:: --help
+   :optional:
 
    Displays a summary of command usage on the terminal.
 

source/includes/common-minio-tiering.rst

@@ -31,15 +31,15 @@ The example above specifies the following arguments:
      - Specify the full path to the bucket for which you are
        creating the lifecycle management rule.
 
-   * - :mc-cmd:`TIERNAME <mc ilm add storage-class>`
+   * - :mc-cmd:`TIERNAME <mc ilm add --storage-class>`
      - The remote storage tier to which MinIO transitions objects. 
        Specify the remote storage tier name created in the previous step.
 
        If you want to transition noncurrent object versions to a distinct
        remote tier, specify a different tier name for 
-       :mc-cmd-option:`~mc ilm add noncurrentversion-transition-storage-class`.
+       :mc-cmd:`~mc ilm add noncurrentversion-transition-storage-class`.
 
-   * - :mc-cmd:`DAYS <mc ilm add transition-days>`
+   * - :mc-cmd:`DAYS <mc ilm add --transition-days>`
      - The number of calendar days after which MinIO marks an object as 
        eligible for transition. Specify the number of days as an integer,
        e.g. ``30`` for 30 days.

source/includes/facts-locking.rst

@@ -2,7 +2,7 @@
 
    The bucket *must* have object locking enabled to use this command. 
    You can only enable object locking when creating a bucket. See
-   :mc-cmd-option:`mc mb with-lock` for more information on creating buckets
+   :mc-cmd:`mc mb with-lock` for more information on creating buckets
    with object locking enabled.
 
 .. end-command-requires-locking-desc