Fix merge conflicts. Fix links (#46253)

This commit is contained in:
Nate Archer 2019-09-23 09:45:49 -05:00 committed by GitHub
parent bd3420b331
commit 011e59e72e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View file

@ -1,5 +1,5 @@
[[code-getting-started]]
== Getting Started with Code
[[code-import-first-repo]]
== Import your first repo
The easiest way to get started with *Code* is to import a real-world repository.

View file

@ -7,7 +7,7 @@ image::images/code-repo-management.png[]
[float]
==== Add and delete a repo
The <<code-getting-started, Getting Started>> provides step-by-step instructions for adding a GitHub repo to *Code*. You can fine tune the hostname of the git clone URL in your `kibana.yml` file.
The <<code-import-first-repo, Import your first repository>> page provides step-by-step instructions for adding a GitHub repo to *Code*. You can fine tune the hostname of the git clone URL in your `kibana.yml` file.
For security reasons, Code allows only a few trusted hostnames, such as github.com, by default. You can add an SSH key to {kib} to clone private repos.

View file

@ -15,7 +15,7 @@ Elastic *Code* provides an easy-to-use code search solution that scales with you
* Symbol table
* Full-text search with repo and language filters
<<code-getting-started, Get Started>> with *Code* by importing your first repo.
<<code-import-first-repo, Get Started>> with *Code* by importing your first repo.
--
include::code-getting-started.asciidoc[]
include::code-import-first-repo.asciidoc[]

View file

@ -12,7 +12,7 @@ export const documentationLinks = {
codeIntelligence: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/code.html`,
gitFormat: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/code.html`,
codeInstallLangServer: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/code-install-lang-server.html`,
codeGettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/code-getting-started.html`,
codeGettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/code-import-first-repo.html`,
codeRepoManagement: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/code-repo-management.html`,
codeSearch: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/code-search.html`,
codeOtherFeatures: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/code-basic-nav.html`,