Merge branch 'master' into newsfeed/api-version-format

docs/developer/contributing/development-github.asciidoc

@@ -1,5 +1,5 @@
 [[development-github]]
-== How we use git and github
+== How we use Git and GitHub
 
 [discrete]
 === Forking
@@ -12,17 +12,21 @@ repo, which we'll refer to in later code snippets.
 [discrete]
 === Branching
 
-* All work on the next major release goes into master.
-* Past major release branches are named `{majorVersion}.x`. They contain
-work that will go into the next minor release. For example, if the next
-minor release is `5.2.0`, work for it should go into the `5.x` branch.
-* Past minor release branches are named `{majorVersion}.{minorVersion}`.
-They contain work that will go into the next patch release. For example,
-if the next patch release is `5.3.1`, work for it should go into the
-`5.3` branch.
-* All work is done on feature branches and merged into one of these
-branches.
-* Where appropriate, we'll backport changes into older release branches.
+At Elastic, all products in the stack, including Kibana, are released at the same time with the same version number. Most of these projects have the following branching strategy:
+
+* `master` is the next major version.
+* `<major>.x` is the next minor version.
+* `<major>.<minor>` is the next release of a minor version, including patch releases.
+
+As an example, let's assume that the `7.x` branch is currently a not-yet-released `7.6.0`. Once `7.6.0` has reached feature freeze, it will be branched to `7.6` and `7.x` will be updated to reflect `7.7.0`. The release of `7.6.0` and subsequent patch releases will be cut from the `7.6` branch. At any time, you can verify the current version of a branch by inspecting the `version` attribute in the `package.json` file within the Kibana source.
+
+Pull requests are made into the `master` branch and then backported when it is safe and appropriate.
+
+* Breaking changes do not get backported and only go into `master`.
+* All non-breaking changes can be backported to the `<major>.x` branch.
+* Features should not be backported to a `<major>.<minor>` branch.
+* Bugs can be backported to a `<major>.<minor>` branch if the changes are safe and appropriate. Safety is a judgment call you make based on factors like the bug's severity, test coverage, confidence in the changes, etc. Your reasoning should be included in the pull request description.
+* Documentation changes can be backported to any branch at any time.
 
 [discrete]
 === Commits and Merging
@@ -109,4 +113,4 @@ Assuming you've successfully rebased and you're happy with the code, you should
 [discrete]
 === Creating a pull request
 
-See <<development-pull-request>> for the next steps on getting your code changes merged into {kib}.
+See <<development-pull-request>> for the next steps on getting your code changes merged into {kib}.

x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js

@@ -47,7 +47,7 @@ export class DeleteRuleModal extends Component {
             title={
               <FormattedMessage
                 id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle"
-                defaultMessage="Delete rule"
+                defaultMessage="Delete rule?"
               />
             }
             onCancel={this.closeModal}
@@ -66,14 +66,7 @@ export class DeleteRuleModal extends Component {
               />
             }
             defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
-          >
-            <p>
-              <FormattedMessage
-                id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription"
-                defaultMessage="Are you sure you want to delete this rule?"
-              />
-            </p>
-          </EuiConfirmModal>
+          />
         </EuiOverlayMask>
       );
     }

x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js

@@ -98,7 +98,7 @@ export class DeleteJobModal extends Component {
       const title = (
         <FormattedMessage
           id="xpack.ml.jobsList.deleteJobModal.deleteJobsTitle"
-          defaultMessage="Delete {jobsCount, plural, one {{jobId}} other {# jobs}}"
+          defaultMessage="Delete {jobsCount, plural, one {{jobId}} other {# jobs}}?"
           values={{
             jobsCount: this.state.jobs.length,
             jobId: this.state.jobs[0].id,
@@ -144,21 +144,12 @@ export class DeleteJobModal extends Component {
 
             {this.state.deleting === false && (
               <React.Fragment>
-                <p>
-                  <FormattedMessage
-                    id="xpack.ml.jobsList.deleteJobModal.deleteJobsDescription"
-                    defaultMessage="Are you sure you want to delete {jobsCount, plural, one {this job} other {these jobs}}?"
-                    values={{
-                      jobsCount: this.state.jobs.length,
-                    }}
-                  />
-                </p>
                 <p>
                   <FormattedMessage
                     id="xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription"
                     defaultMessage="Deleting {jobsCount, plural, one {a job} other {multiple jobs}} can be time consuming.
                     {jobsCount, plural, one {It} other {They}} will be deleted in the background
-                    and may not disappear from the jobs list instantly"
+                    and may not disappear from the jobs list instantly."
                     values={{
                       jobsCount: this.state.jobs.length,
                     }}

x-pack/plugins/translations/translations/ja-JP.json

@@ -11608,7 +11608,6 @@
     "xpack.ml.jobsList.deleteJobModal.cancelButtonLabel": "キャンセル",
     "xpack.ml.jobsList.deleteJobModal.closeButtonLabel": "閉じる",
     "xpack.ml.jobsList.deleteJobModal.deleteButtonLabel": "削除",
-    "xpack.ml.jobsList.deleteJobModal.deleteJobsDescription": "{jobsCount, plural, one {このジョブ} other {これらのジョブ}}を削除してよろしいですか？",
     "xpack.ml.jobsList.deleteJobModal.deleteJobsTitle": "{jobsCount, plural, one {{jobId}} other {# 件のジョブ}}を削除",
     "xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription": "{jobsCount, plural, one {ジョブ} other {複数ジョブ}}の削除には時間がかかる場合があります。{jobsCount, plural, one {} other {}}バックグラウンドで削除され、ジョブリストからすぐに消えない場合があります",
     "xpack.ml.jobsList.deleteJobModal.deletingJobsStatusLabel": "ジョブを削除中",
@@ -12277,7 +12276,6 @@
     "xpack.ml.ruleEditor.deleteJobRule.ruleNoLongerExistsErrorMessage": "ジョブ {jobId} の検知器インデックス {detectorIndex} のルールが現在存在しません",
     "xpack.ml.ruleEditor.deleteRuleModal.cancelButtonLabel": "キャンセル",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteButtonLabel": "削除",
-    "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription": "このルールを削除してよろしいですか？",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleLinkText": "ルールを削除",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle": "ルールの削除",
     "xpack.ml.ruleEditor.detectorDescriptionList.detectorTitle": "検知器",

x-pack/plugins/translations/translations/zh-CN.json

@@ -11612,7 +11612,6 @@
     "xpack.ml.jobsList.deleteJobModal.cancelButtonLabel": "取消",
     "xpack.ml.jobsList.deleteJobModal.closeButtonLabel": "关闭",
     "xpack.ml.jobsList.deleteJobModal.deleteButtonLabel": "删除",
-    "xpack.ml.jobsList.deleteJobModal.deleteJobsDescription": "是否确定要删除{jobsCount, plural, one {此作业} other {这些作业}}？",
     "xpack.ml.jobsList.deleteJobModal.deleteJobsTitle": "删除 {jobsCount, plural, one {{jobId}} other {# 个作业}}",
     "xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription": "删除{jobsCount, plural, one {一个作业} other {多个作业}}会非常耗时。将在后台删除{jobsCount, plural, one {该作业} other {这些作业}}，但删除的作业可能不会立即从作业列表中消失",
     "xpack.ml.jobsList.deleteJobModal.deletingJobsStatusLabel": "正在删除作业",
@@ -12281,7 +12280,6 @@
     "xpack.ml.ruleEditor.deleteJobRule.ruleNoLongerExistsErrorMessage": "作业 {jobId} 中不再存在检测工具索引 {detectorIndex} 的规则",
     "xpack.ml.ruleEditor.deleteRuleModal.cancelButtonLabel": "取消",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteButtonLabel": "删除",
-    "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription": "是否确定要删除此规则？",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleLinkText": "删除规则",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle": "删除规则",
     "xpack.ml.ruleEditor.detectorDescriptionList.detectorTitle": "检测工具",