Skip to content

Commit

Permalink
Fix merge conflicts. Fix links (#46253)
Browse files Browse the repository at this point in the history
  • Loading branch information
narcher7 authored Sep 23, 2019
1 parent bd3420b commit 011e59e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/code/code-repo-management.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions docs/code/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
2 changes: 1 addition & 1 deletion x-pack/plugins/code/public/lib/documentation_links.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Expand Down

0 comments on commit 011e59e

Please sign in to comment.