additional cleanups after merge

source/lifecycle-management/create-lifecycle-management-expiration-rule.rst

@@ -87,10 +87,10 @@ Use :mc-cmd:`mc ilm add` to expiring noncurrent object versions and object
 delete markers: 
 
 - To expire noncurrent object versions after a specific duration in days,
-  include :mc-cmd:`~mc ilm add noncurrentversion-expiration-days`.
+  include :mc-cmd:`~mc ilm add --noncurrentversion-expiration-days`.
 
 - To expire delete markers for objects with no remaining versions, 
-  include :mc-cmd:`~mc ilm add expired-object-delete-marker`.
+  include :mc-cmd:`~mc ilm add --expired-object-delete-marker`.
 
 .. code-block:: shell
    :class: copyable
@@ -106,7 +106,7 @@ delete markers:
   S3-compatible host.
 
 - Replace :mc-cmd:`NONCURRENT_DAYS 
-  <mc ilm add noncurrentversion-expiration-days>` with the number of days after
+  <mc ilm add --noncurrentversion-expiration-days>` with the number of days after
   which to expire noncurrent object versions. For example, specify ``30d`` to
   expire a version after it has been noncurrent for at least 30 days.
 

source/lifecycle-management/lifecycle-management-overview.rst

@@ -69,8 +69,8 @@ on :ref:`versioned buckets <minio-bucket-versioning>`. Specifically, MinIO by
 default applies the transition operation to the *current* object version. 
 
 To transition noncurrent object versions, specify the 
-:mc-cmd:`~mc ilm add noncurrentversion-transition-days` and
-:mc-cmd:`~mc ilm add noncurrentversion-transition-storage-class` options
+:mc-cmd:`~mc ilm add --noncurrentversion-transition-days` and
+:mc-cmd:`~mc ilm add --noncurrentversion-transition-storage-class` options
 when creating the transition rule. 
 
 .. _minio-lifecycle-management-expiration:
@@ -104,14 +104,14 @@ specific default behaviors for versioned buckets:
   creating a ``DeleteMarker`` as is normal with versioned delete.
 
   To expire noncurrent object versions, specify the 
-  :mc-cmd:`~mc ilm add noncurrentversion-expiration-days` option
+  :mc-cmd:`~mc ilm add --noncurrentversion-expiration-days` option
   when creating the expiration rule. 
 
 - MinIO does not expire ``DeleteMarkers`` *even if* no other versions of 
   that object exist.
 
   To expire delete markers when there are no remaining versions for that
-  object, specify the :mc-cmd:`~mc ilm add expired-object-delete-marker`
+  object, specify the :mc-cmd:`~mc ilm add --expired-object-delete-marker`
   option when creating the expiration rule.
 
 .. _minio-lifecycle-management-scanner:

source/lifecycle-management/transition-objects-to-azure.rst

@@ -122,7 +122,7 @@ Use the :mc-cmd:`mc admin tier add` command to add a new remote storage tier:
 .. code-block:: shell
    :class: copyable
 
-   mc admin tier add azure TARGET TIER_NAME \
+   mc admin tier add --azure TARGET TIER_NAME \
       --endpoint https://HOSTNAME
       --bucket BUCKET \
       --prefix PREFIX
@@ -150,15 +150,15 @@ The example above uses the following arguments:
        remote storage tier. Specify the name in all-caps, e.g. ``AZURE_TIER``.
        This value is required in the next step.
 
-   * - :mc-cmd:`HOSTNAME <mc admin tier add endpoint>`
+   * - :mc-cmd:`HOSTNAME <mc admin tier add --endpoint>`
      - The URL endpoint for the :abbr:`Azure (Microsoft Azure)` storage
        backend.
 
-   * - :mc-cmd:`BUCKET <mc admin tier add bucket>`
+   * - :mc-cmd:`BUCKET <mc admin tier add --bucket>`
      - The name of the bucket on the :abbr:`Azure (Microsoft Azure)` storage
        backend to which MinIO transitions objects.
 
-   * - :mc-cmd:`PREFIX <mc admin tier add prefix>`
+   * - :mc-cmd:`PREFIX <mc admin tier add --prefix>`
      - The optional bucket prefix within which MinIO transitions objects.
 
        MinIO stores all transitioned objects in the specified ``BUCKET`` under a
@@ -171,7 +171,7 @@ The example above uses the following arguments:
        source MinIO deployment to faciliate ease of operations related to
        diagnostics, maintenance, or disaster recovery.
 
-   * - :mc-cmd:`ACCOUNT <mc admin tier add account-name>`
+   * - :mc-cmd:`ACCOUNT <mc admin tier add --account-name>`
      - The account name MinIO uses to access the bucket. The account name
        *must* correspond to an :abbr:`Azure (Microsoft Azure)` user with the
        required :ref:`permissions
@@ -179,10 +179,10 @@ The example above uses the following arguments:
 
        You cannot change this account name after creating the tier.
 
-   * - :mc-cmd:`KEY <mc admin tier add account-key>`
+   * - :mc-cmd:`KEY <mc admin tier add --account-key>`
      - The corresponding key for the specified ``ACCOUNT``.
 
-   * - :mc-cmd:`REGION <mc admin tier add region>`
+   * - :mc-cmd:`REGION <mc admin tier add --region>`
      - The :abbr:`Azure (Microsoft Azure)` blob storage region of the specified
        ``BUCKET``. You can safely omit this option if the ``HOSTNAME`` includes
        the region.

source/lifecycle-management/transition-objects-to-gcs.rst

@@ -121,7 +121,7 @@ service as the remote storage tier:
 .. code-block:: shell
    :class: copyable
 
-   mc admin tier add gcs TARGET TIER_NAME \
+   mc admin tier add --gcs TARGET TIER_NAME \
       --endpoint https://HOSTNAME \
       --bucket BUCKET \
       --prefix PREFIX \
@@ -147,15 +147,15 @@ The example above uses the following arguments:
        remote storage tier. Specify the name in all-caps, e.g. ``GCS_TIER``.
        This value is required in the next step.
 
-   * - :mc-cmd:`HOSTNAME <mc admin tier add endpoint>`
+   * - :mc-cmd:`HOSTNAME <mc admin tier add --endpoint>`
      - The URL endpoint for the :abbr:`GCS (Google Cloud Storage)` storage
        backend.
 
-   * - :mc-cmd:`BUCKET <mc admin tier add bucket>`
+   * - :mc-cmd:`BUCKET <mc admin tier add --bucket>`
      - The name of the bucket on the :abbr:`GCS (Google Cloud Storage)` storage
        backend to which MinIO transitions objects.
 
-   * - :mc-cmd:`PREFIX <mc admin tier add prefix>`
+   * - :mc-cmd:`PREFIX <mc admin tier add --prefix>`
      - The optional bucket prefix within which MinIO transitions objects.
 
        MinIO stores all transitioned objects in the specified ``BUCKET`` under a
@@ -168,7 +168,7 @@ The example above uses the following arguments:
        source MinIO deployment to faciliate ease of operations related to
        diagnostics, maintenance, or disaster recovery.
 
-   * - :mc-cmd:`CREDENTIALS <mc admin tier add credentials-file>`
+   * - :mc-cmd:`CREDENTIALS <mc admin tier add --credentials-file>`
      - The `credential file
        <https://cloud.google.com/docs/authentication/getting-started>`__ for a
        user on the remote GCS tier. The specified user credentials *must*
@@ -176,7 +176,7 @@ The example above uses the following arguments:
        :ref:`permissions 
        <minio-lifecycle-management-transition-to-gcs-permissions-remote>`.
 
-   * - :mc-cmd:`REGION <mc admin tier add region>`
+   * - :mc-cmd:`REGION <mc admin tier add --region>`
      - The :abbr:`GCS (Google Cloud Storage)` region of the specified
        ``BUCKET``. You can safely omit this
        option if the ``HOSTNAME`` includes the region.

source/lifecycle-management/transition-objects-to-s3.rst

@@ -130,7 +130,7 @@ new remote storage tier:
 .. code-block:: shell
    :class: copyable
 
-   mc admin tier add s3 TARGET TIER_NAME \
+   mc admin tier add --s3 TARGET TIER_NAME \
       --endpoint https://HOSTNAME \
       --bucket BUCKET \
       --prefix PREFIX
@@ -158,14 +158,14 @@ The example above uses the following arguments:
        name in all-caps, e.g. ``S3_TIER``. This value is required in the next
        step.
 
-   * - :mc-cmd:`HOSTNAME <mc admin tier add endpoint>`
+   * - :mc-cmd:`HOSTNAME <mc admin tier add --endpoint>`
      - The URL endpoint for the S3 storage backend.
 
-   * - :mc-cmd:`BUCKET <mc admin tier add bucket>`
+   * - :mc-cmd:`BUCKET <mc admin tier add --bucket>`
      - The name of the bucket on the S3 storage backend to which MinIO
        transitions objects.
 
-   * - :mc-cmd:`PREFIX <mc admin tier add prefix>`
+   * - :mc-cmd:`PREFIX <mc admin tier add --prefix>`
      - The optional bucket prefix within which MinIO transitions objects.
 
        MinIO stores all transitioned objects in the specified ``BUCKET`` under a
@@ -178,21 +178,21 @@ The example above uses the following arguments:
        source MinIO deployment to faciliate ease of operations related to
        diagnostics, maintenance, or disaster recovery.
 
-   * - :mc-cmd:`ACCESS_KEY <mc admin tier add access-key>`
+   * - :mc-cmd:`ACCESS_KEY <mc admin tier add --access-key>`
      - The S3 access key MinIO uses to access the bucket. The
        access key *must* correspond to an IAM user with the 
        required 
        :ref:`permissions 
        <minio-lifecycle-management-transition-to-s3-permissions-remote>`.
 
-   * - :mc-cmd:`SECRET_KEY <mc admin tier add secret-key>`
+   * - :mc-cmd:`SECRET_KEY <mc admin tier add --secret-key>`
      - The corresponding secret key for the specified ``ACCESS_KEY``.
 
-   * - :mc-cmd:`REGION <mc admin tier add region>`
+   * - :mc-cmd:`REGION <mc admin tier add --region>`
      - The AWS S3 region of the specified ``BUCKET``. You can safely omit this
        option if the ``HOSTNAME`` includes the region.
 
-   * - :mc-cmd:`STORAGE_CLASS <mc admin tier add storage-class>`
+   * - :mc-cmd:`STORAGE_CLASS <mc admin tier add --storage-class>`
      - The S3 storage class to which MinIO transitions objects. Specify
        one of the following supported storage classes: