Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Docs] Fix inconsistencies in snapshot/restore doc #30480

Merged
merged 1 commit into from
May 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/plugins/repository-azure.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ When `proxy.type` is set to `http` or `socks`, `proxy.host` and `proxy.port` mus


[[repository-azure-repository-settings]]
===== Repository settings
==== Repository settings

The Azure repository supports following settings:

Expand Down Expand Up @@ -178,7 +178,7 @@ client.admin().cluster().preparePutRepository("my_backup_java1")
----

[[repository-azure-validation]]
===== Repository validation rules
==== Repository validation rules

According to the http://msdn.microsoft.com/en-us/library/dd135715.aspx[containers naming guide], a container name must
be a valid DNS name, conforming to the following naming rules:
Expand Down
8 changes: 4 additions & 4 deletions docs/reference/modules/snapshots.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ the shared file system repository it is necessary to mount the same shared files
master and data nodes. This location (or one of its parent directories) must be registered in the `path.repo`
setting on all master and data nodes.

Assuming that the shared filesystem is mounted to `/mount/backups/my_backup`, the following setting should be added to
`elasticsearch.yml` file:
Assuming that the shared filesystem is mounted to `/mount/backups/my_fs_backup_location`, the following setting should
be added to `elasticsearch.yml` file:

[source,yaml]
--------------
Expand All @@ -141,7 +141,7 @@ path.repo: ["\\\\MY_SERVER\\Snapshots"]
--------------

After all nodes are restarted, the following command can be used to register the shared file system repository with
the name `my_backup`:
the name `my_fs_backup`:

[source,js]
-----------------------------------
Expand Down Expand Up @@ -419,7 +419,7 @@ A repository can be unregistered using the following command:

[source,sh]
-----------------------------------
DELETE /_snapshot/my_fs_backup
DELETE /_snapshot/my_backup
-----------------------------------
// CONSOLE
// TEST[continued]
Expand Down