Skip to content

Commit

Permalink
Merge pull request #1027 from untergeek/doc/1015_1
Browse files Browse the repository at this point in the history
Update examples again
  • Loading branch information
untergeek committed Aug 7, 2017
2 parents 8afb90a + ef53fad commit 7f6afff
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
13 changes: 4 additions & 9 deletions docs/asciidoc/actions.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ and put it after `restored_index`. For example, if I was restoring
=== Extra settings

The <<option_extra_settings,extra_settings>> option allows the addition of extra
settings, such as index settings and mappings. An example of how these settings
settings, such as index settings. An example of how these settings
can be used to change settings for an index being restored might be:

[source,yaml]
Expand All @@ -863,12 +863,6 @@ actions:
extra_settings:
index_settings:
number_of_replicas: 0
mappings:
type1:
properties:
field1:
type: string
index: not_analyzed
wait_for_completion: True
max_wait: 3600
wait_interval: 10
Expand All @@ -879,8 +873,9 @@ actions:
- filtertype: ...
-------------

In this case, the number of shards and replicas, and the mapping will be applied
to restored indices.
In this case, the number of replicas will be applied to the restored indices.

For more information see the {ref}/modules-snapshots.html#_changing_index_settings_during_restore[official Elasticsearch Documentation].

=== Required settings

Expand Down
8 changes: 1 addition & 7 deletions docs/asciidoc/options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ options:

=== <<restore,restore>>

{ref}/current/modules-snapshots.html#_changing_index_settings_during_restore[Elasticsearch Documentation]
See the {ref}/modules-snapshots.html#_changing_index_settings_during_restore[official Elasticsearch Documentation].

[source,yaml]
-------------
Expand All @@ -280,12 +280,6 @@ actions:
extra_settings:
index_settings:
number_of_replicas: 0
mappings:
type1:
properties:
field1:
type: string
index: not_analyzed
wait_for_completion: True
max_wait: 3600
wait_interval: 10
Expand Down

0 comments on commit 7f6afff

Please sign in to comment.