Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
James Ma committed Jan 18, 2019
2 parents 08071b7 + d9d95f5 commit ed7f0c7
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 53 deletions.
2 changes: 1 addition & 1 deletion go/docs/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func (p Plugin) ReferenceColumn(table string, column string) booklit.Content {

func (p Plugin) Boshprop(job string, target string) booklit.Content {
return booklit.Link{
Target: fmt.Sprintf("http://bosh.io/jobs/%s?source=github.com/concourse/concourse#p=%s", job, target),
Target: fmt.Sprintf("http://bosh.io/jobs/%s?source=github.com/concourse/concourse-bosh-release#p=%s", job, target),
Content: booklit.Styled{
Style: booklit.StyleVerbatim,
Content: booklit.String(target),
Expand Down
47 changes: 0 additions & 47 deletions html/footer.tmpl

This file was deleted.

2 changes: 1 addition & 1 deletion html/release.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<tr>
<td><code>concourse</code> release:</td>
<td>
<a href="http://bosh.io/releases/github.com/concourse/concourse?version={{.Partial "Version" | render}}"
<a href="http://bosh.io/releases/github.com/concourse/concourse-bosh-release?version={{.Partial "Version" | render}}"
onclick="gtag('event', 'click', {
event_category: 'bosh-downloads',
event_label: '{{.Partial "Version" | render}}/bosh-release'});">v{{.Partial "Version" | render}}</a>
Expand Down
2 changes: 1 addition & 1 deletion lit/about.lit
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ part-time contributors.
\link{BOSH}{https://bosh.io}, we would have neither the technical
experience nor the strong opinions that led to Concourse being born.

Pivotal's sponsorship continues strong into 2018, where we have a team of
Pivotal's sponsorship continues strong into 2019, where we have a team of
full-time engineers, PMs, and designers dedicated to pushing Concourse
forward.
}
Expand Down
2 changes: 2 additions & 0 deletions lit/reference/resource-types/community-resources.lit
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ before using it!
\table-row{\link{Github Webhook Resource}{https://github.com/homedepot/github-webhook-resource}}{by \ghuser{homedepot}}
}{
\table-row{\link{Ofcourse Resource Generator}{https://github.com/cloudboss/ofcourse}}{by \ghuser{cloudboss}}
}{
\table-row{\link{HTTP PUT Resource}{https://github.com/lorands/http-put-resource}}{by \ghuser{lorands}}
}

\section{
Expand Down
5 changes: 5 additions & 0 deletions lit/setup-and-operations/install.lit
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ page.
--worker-work-dir /opt/concourse/worker
}}}

\italic{
Note: on Linux and OSX, you'll need to run this as root or using
\code{sudo} because the \reference{worker-node} needs elevated privileges.
}

This command is shorthand for running a single \reference{web-node} and
\reference{worker-node} on the same machine, auto-wired to trust each other.
We've also configured some local auth for the \reference{main-team} -
Expand Down
2 changes: 1 addition & 1 deletion lit/setup-and-operations/operation/metrics.lit
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metrics pipeline.
This reference section lists of all of the metrics that Concourse emits. We
don't include the warning and critical levels as they will keep changing as
we optimise the system. To find those, please refer to the source of truth:
\link{the code}{https://github.com/concourse/atc/blob/master/metric/metrics.go}.
\link{the code}{https://github.com/concourse/concourse/blob/master/atc/metric/metrics.go}.

\define-metric{scheduling: full duration (ms)}{
This is the time taken (in milliseconds) to schedule an entire pipeline
Expand Down
2 changes: 1 addition & 1 deletion lit/setup-and-operations/release-notes/v2.4.0.lit
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
to the cluster.

Consult \code{web --help} for CLI docs or
\link{bosh.io}{http://bosh.io/jobs/tsa?source=github.com/concourse/concourse}
\link{bosh.io}{http://bosh.io/jobs/tsa?source=github.com/concourse/concourse-bosh-release}
for BOSH docs.
}

Expand Down
2 changes: 1 addition & 1 deletion lit/setup-and-operations/release-notes/v2.7.2.lit
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
The BOSH release has always been configured via discrete properties, rather
than a single DataSource, and now has a \code{postgresql.ca_cert} property
among others. Consult
\link{bosh.io}{http://bosh.io/jobs/atc?source=github.com/concourse/concourse&version=2.7.1#p=postgresql}
\link{bosh.io}{http://bosh.io/jobs/atc?source=github.com/concourse/concourse-bosh-release&version=2.7.1#p=postgresql}
for more information.
}

Expand Down

0 comments on commit ed7f0c7

Please sign in to comment.