From 9b98c89983821f709fbea3c14c264150d8613171 Mon Sep 17 00:00:00 2001 From: Yushiro FURUKAWA Date: Thu, 29 Sep 2016 20:48:21 +0900 Subject: [PATCH] Revises 'url' to 'URL' and 'json' to 'JSON' Change-Id: I44743fbb9bcbce3a50ed6770264ba0f4b17803d7 --- doc/manpages/proxy-server.conf.5 | 6 +++--- doc/source/admin_guide.rst | 2 +- doc/source/api/large_objects.rst | 2 +- doc/source/deployment_guide.rst | 2 +- doc/source/development_middleware.rst | 2 +- doc/source/ops_runbook/troubleshooting.rst | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5 index ff61457952..62d01c5b81 100644 --- a/doc/manpages/proxy-server.conf.5 +++ b/doc/manpages/proxy-server.conf.5 @@ -140,7 +140,7 @@ This optional suffix (default is empty) that would be appended to the swift tran id allows one to easily figure out from which cluster that X-Trans-Id belongs to. This is very useful when one is managing more than one swift cluster. .IP \fBcors_allow_origin\fR -Use a comma separated list of full url (http://foo.bar:1234,https://foo.bar) +Use a comma separated list of full URL (http://foo.bar:1234,https://foo.bar) .IP \fBstrict_cors_mode\fR The default is true. .IP \fBnice_priority\fR @@ -254,7 +254,7 @@ and also \fI.admin\fR who can do anything within the account. If neither of these groups are specified, the user can only access containers that have been explicitly allowed for them by a \fI.admin\fR or \fI.reseller_admin\fR. -The trailing optional storage_url allows you to specify an alternate url to hand +The trailing optional storage_url allows you to specify an alternate URL to hand back to the user upon authentication. If not specified, this defaults to \fIhttp[s]://:/v1/_\fR where http or https depends on whether cert_file is specified in the [DEFAULT] section, and are based @@ -865,7 +865,7 @@ Note: this middleware requires python-dnspython Entry point for paste.deploy for the container_sync middleware. This is the reference to the installed python egg. This is normally \fBegg:swift#container_sync\fR. .IP \fBallow_full_urls\fR -Set this to false if you want to disallow any full url values to be set for +Set this to false if you want to disallow any full URL values to be set for any new X-Container-Sync-To headers. This will keep any new full urls from coming in, but won't change any existing values already in the cluster. Updating those will have to be done manually, as knowing what the true realm diff --git a/doc/source/admin_guide.rst b/doc/source/admin_guide.rst index e5ea68f9fb..6a6e585875 100644 --- a/doc/source/admin_guide.rst +++ b/doc/source/admin_guide.rst @@ -483,7 +483,7 @@ You can also run the report for only containers or objects:: 100.00% of object copies found (7857 of 7857) Sample represents 1.00% of the object partition space -Alternatively, the dispersion report can also be output in json format. This +Alternatively, the dispersion report can also be output in JSON format. This allows it to be more easily consumed by third party utilities:: $ swift-dispersion-report -j diff --git a/doc/source/api/large_objects.rst b/doc/source/api/large_objects.rst index a4cfb6bc7b..24bb4eeab2 100644 --- a/doc/source/api/large_objects.rst +++ b/doc/source/api/large_objects.rst @@ -107,7 +107,7 @@ json content—not the length of the segment objects. However, after the **PUT** operation completes, the ``Content-Length`` metadata is set to the total length of all the object segments. A similar situation applies to the ``ETag``. If used in the **PUT** operation, it must contain the -MD5 checksum of the json content. The ``ETag`` metadata value is then +MD5 checksum of the JSON content. The ``ETag`` metadata value is then set to be the MD5 checksum of the concatenated ``ETag`` values of the object segments. You can also set the ``Content-Type`` request header and custom object metadata. diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst index cbda8f5545..02dc569e75 100644 --- a/doc/source/deployment_guide.rst +++ b/doc/source/deployment_guide.rst @@ -1846,7 +1846,7 @@ There are special groups of:: If neither of these groups are specified, the user can only access containers that have been explicitly allowed for them by a .admin or .reseller_admin. -The trailing optional storage_url allows you to specify an alternate url to +The trailing optional storage_url allows you to specify an alternate URL to hand back to the user upon authentication. If not specified, this defaults to:: $HOST/v1/_ diff --git a/doc/source/development_middleware.rst b/doc/source/development_middleware.rst index 9612be9822..ce3bee058e 100644 --- a/doc/source/development_middleware.rst +++ b/doc/source/development_middleware.rst @@ -141,7 +141,7 @@ presented below:: return WebhookMiddleware(app) return webhook_filter -In practice this middleware will call the url stored on the container as +In practice this middleware will call the URL stored on the container as X-Webhook on all successful object uploads. If this example was at ``/swift/common/middleware/webhook.py`` - diff --git a/doc/source/ops_runbook/troubleshooting.rst b/doc/source/ops_runbook/troubleshooting.rst index 0966267ccd..cb7553fc66 100644 --- a/doc/source/ops_runbook/troubleshooting.rst +++ b/doc/source/ops_runbook/troubleshooting.rst @@ -236,7 +236,7 @@ If ``X-Static-Large-Object`` is set, you need to read the contents. Do this by: - Using swift-get-nodes to get the details of the object's location. - Change the ``-X HEAD`` to ``-X GET`` and run ``curl`` against one copy. -- This lists a json body listing containers and object names +- This lists a JSON body listing containers and object names - Delete the objects as described above for DLO segments Once the segments are deleted, you can delete the object using