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

DHFPROD-1604 - Broken link fixes to 4x tut. #1814

Merged
merged 36 commits into from
Jan 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0c9ff79
Merge branch 'docs' of https://github.com/marklogic/marklogic-data-hu…
eltesoro-ml Dec 18, 2018
7d0cab9
DHFPROD-1652 fixed broken links and other tweaks
eltesoro-ml Dec 20, 2018
88a9663
DHFPROD-1657, DHFPROD-1656, DHFPROD-1655, DHFPROD-1654
eltesoro-ml Dec 21, 2018
427a052
DHFPROD-1629 Fixes on tutorial
eltesoro-ml Dec 21, 2018
9ec7731
DHFPROD-1604 (4xtut) [wip], DHFPROD-835 (prev-next nav) [partial]
eltesoro-ml Jan 5, 2019
2cc09b8
DHFPROD-1689 Fixed capitalization in gradle command parameter.
eltesoro-ml Jan 9, 2019
d0aaa10
DHFPROD-1656 404 on Create Project page.
eltesoro-ml Jan 9, 2019
d8475f4
DHFPROD-1525 Added missing class tag for table styling.
eltesoro-ml Jan 9, 2019
86bb57d
DHFPROD-1633 Updates to "Deploy to DHS"
eltesoro-ml Jan 9, 2019
b7e1106
DHFPROD-1633 More updates per comments in the JIRA issue.
eltesoro-ml Jan 10, 2019
cc872bb
DHFPROD-1633 Deploy to DHS - incorped feedback
eltesoro-ml Jan 11, 2019
0a33dc2
DHFPROD-1633 Deploy to DHS - formatting fixes
eltesoro-ml Jan 11, 2019
a017e5b
DHFPROD-1633 - more fixes based on Srikanth's explanation of load bal…
eltesoro-ml Jan 12, 2019
bc9bc87
DHFPROD-1633 Deploy to DHS - Hopefuly the last update for this JIRA i…
eltesoro-ml Jan 12, 2019
bb34f1c
DHFPROD-1633 - Added comments with addl info.
eltesoro-ml Jan 14, 2019
6a21163
DHFPROD-1604 Tutorial 4x - work in progress
eltesoro-ml Jan 15, 2019
7754488
Merge branch 'docs' into docs-develop
eltesoro-ml Jan 15, 2019
87bc654
DHFPROD-1604 4x tutorial formatting fixes
eltesoro-ml Jan 16, 2019
7f88ab7
Merge branch 'docs-develop' of https://github.com/marklogic/marklogic…
eltesoro-ml Jan 16, 2019
fe852a2
adding javadoc for 4.1.1
Jan 16, 2019
5ae8685
Merge branch 'docs' into docs-develop
eltesoro-ml Jan 16, 2019
78e68ec
DHFPROD-1633 Deploy to DHS – More changes regarding port numbers and …
eltesoro-ml Jan 19, 2019
0f6f8ed
DHFPROD-1604 - work in progress
eltesoro-ml Jan 19, 2019
881859c
DHFPROD-1633 - Replaced the staging example port with port 8006 and r…
eltesoro-ml Jan 21, 2019
e82ef2e
DHFPROD-1604 - More changes in tutorial
eltesoro-ml Jan 21, 2019
277da26
Merge branch 'docs' into docs-develop
eltesoro-ml Jan 21, 2019
bb6731a
Merge branch 'docs' of https://github.com/marklogic/marklogic-data-hu…
eltesoro-ml Jan 21, 2019
0e6879c
Merge branch 'docs' into docs-develop
eltesoro-ml Jan 21, 2019
e859cb4
DHFPROD-1604 QuickStart tutorial for 4.x - Content complete.
eltesoro-ml Jan 28, 2019
3bd1e88
Merge branch 'docs' of https://github.com/marklogic/marklogic-data-hu…
eltesoro-ml Jan 28, 2019
3ec82b5
Merge branch 'docs-develop' into docs
eltesoro-ml Jan 28, 2019
7f07f2a
DHFPROD-1604 File lost during merge.
eltesoro-ml Jan 28, 2019
dcd21e8
DHFPROD-1604 - Deleting files that were incorrectly reintroduced duri…
eltesoro-ml Jan 28, 2019
d5cef83
DHFPROD-1604 - Exposing the 4x tut in the main tut page.
eltesoro-ml Jan 28, 2019
be859b9
DHFPROD-1604 - Link fixes and minor tweaks to tut4x.
eltesoro-ml Jan 29, 2019
fdeca59
Merge branch 'docs' into docs-develop
eltesoro-ml Jan 29, 2019
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
2 changes: 1 addition & 1 deletion _includes/conrefs/conref-qs-4x-download.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[Download the `quick-start-{{ include.warver }}.war` file](https://github.com/marklogic/marklogic-data-hub/releases/download/{{ include.warver }}/quick-start-{{ include.warver }}.war) and place it your project root directory.
[Download the `quick-start-{{ include.warver }}.war` file](https://github.com/marklogic/marklogic-data-hub/releases/download/{{ include.v }}{{ include.warver }}/quick-start-{{ include.warver }}.war) and place it your project root directory.
7 changes: 5 additions & 2 deletions _pages/maintain/jobs-traces.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ title: Jobs and Traces
permalink: /maintain/jobs-traces/
---

{% assign var-imgpath = site.baseurl | append: "/images/4x/" %}


# Jobs and Traces

MarkLogic tracks:
Expand All @@ -14,11 +17,11 @@ These **Jobs**{:.uilabel} and **Traces**{:.uilabel} logs can help troubleshoot e


## View Job Results
{% include conrefs/conref-qs-4x-jobs.md imgpath=var-imgpath entityname="" jobname=var-jobname %}
{% include conrefs/conref-qs-4x-jobs.md imgpath=var-imgpath pickitem="any job" fullsteps=true %}


## View Traces
{% include conrefs/conref-qs-4x-traces.md imgpath=var-imgpath entityname="" %}
{% include conrefs/conref-qs-4x-traces.md imgpath=var-imgpath %}


<!--
Expand Down
4 changes: 2 additions & 2 deletions _pages/tutorial/4x/4x.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
layout: inner
title: Getting Started Tutorial for DHF 4.x
title: QuickStart Tutorial for DHF 4.x
permalink: /tutorial/4x/
---

{% assign var-imgpath = site.baseurl | append: "/images/4x/" %}


# Getting Started Tutorial for DHF 4.x
# QuickStart Tutorial for DHF 4.x


## Overview
Expand Down
2 changes: 1 addition & 1 deletion _pages/tutorial/4x/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permalink: /tutorial/4x/install/
## 1 - Set Up the Project Directory and Sample Data

1. Create a directory called `data-hub`. This directory will be referred to as "your project root" or simply "root".
1. {% include conrefs/conref-qs-4x-download.md warver=site.data.global.hub_version_4x %}
1. {% include conrefs/conref-qs-4x-download.md warver=site.data.global.hub_version_4x v="v" %}
1. Under your project root, create a directory called `input`.
1. Download the [sample data .zip file]({{site.baseurl}}/data/store-data.zip){:target="_blank"}. Expand it, as needed.
1. Copy the subdirectories (e.g., `campaigns`, `customers`, `orders`) inside the sample data .zip file into the `input` directory.
Expand Down
2 changes: 1 addition & 1 deletion _pages/tutorial/4x/takeaways.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ To delete one or more databases created by this tutorial,

To delete the entire data hub created by this tutorial and to uninstall DHF,
1. In QuickStart's navigation bar, click **Settings**{:.uimenuitem}.
1. Select **Uninstall Hub**{.uilabel}.
1. Select **Uninstall Hub**{:.uilabel}.
{:.ol-steps}


Expand Down
Binary file added _source-images/qs-4x/qs-4x-browse-data-FINAL.snag
Binary file not shown.
Binary file not shown.
Binary file added images/4x/qs-4x-browse-data-FINAL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/4x/qs-4x-browse-data-STAGING.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.