Skip to content

Commit 95dc356

Browse files
committed
docs: more language refresh
Signed-off-by: Mathias Bogaert <[email protected]>
1 parent 8281b91 commit 95dc356

15 files changed

+176
-174
lines changed

lit/docs/auth.lit

+15-16
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
\use-plugin{concourse-docs}
44
\split-sections
55

6-
A single Concourse installation can accomodate many projects and users.
6+
A single Concourse installation can accommodate many projects and users.
77

88
Pipelines, builds, and all other user data are owned by \italic{teams}. A team
9-
is just a conceptual owner and a separate namespace, tied to an authorization
10-
config. For example, a team may authorize all members of the \code{concourse}
9+
is simply a conceptual owner and separate namespace, tied to an authorization
10+
configuration. For example, a team may authorize all members of the \code{concourse}
1111
GitHub organization to be a \reference{team-member-role}{member}.
1212

1313
When a user authenticates, each team's authorization config is checked against
@@ -29,37 +29,36 @@ access control for future requests.
2929
users, see \reference{fly-expose-pipeline}.
3030

3131
Even with a pipeline exposed, all build logs are hidden by default. This is
32-
because CI jobs are prone to leaking credentials and other...unsavory
33-
information. After you've determined that a job's builds should be safe for
34-
public consumption, you can set \reference{schema.job.public}{\code{public: true}}
35-
on the job in your pipeline.
32+
because CI jobs may leak credentials and other sensitive information.
33+
After you've determined that a job's builds are safe for public consumption,
34+
you can set \reference{schema.job.public}{\code{public: true}} on the job
35+
in your pipeline.
3636
}
3737

3838
\section{
3939
\title{Security Caveats}{teams-caveats}
4040

41-
At present, teams only provide \italic{trusted multi-tenancy}. This means it
41+
At present, teams only provide \italic{trusted multi-tenancy}. This means they
4242
should be used for cases where you know and trust who you're allowing access
4343
into your Concourse cluster.
4444

45-
There are a few reasons it'd be a bad idea to do otherwise:
45+
There are a few reasons it would be a bad idea to do otherwise:
4646

4747
\list{
48-
Any team can run builds with \reference{schema.task.privileged} tasks. A bad
49-
actor in the mix could easily use this to harm your workers and your
48+
Any team can run builds with \reference{schema.task.privileged} tasks. A malicious
49+
actor could easily use this to harm your workers and your
5050
cluster.
5151

52-
In the future, we'll probably have this as a flag on a team, indicating
52+
In the future, we'll likely add this as a flag on a team, indicating
5353
whether they're permitted to run privileged builds.
5454
}{
5555
There are no networking restrictions in place, and traffic to and from the
5656
workers is currently unencrypted and unauthorized. Anyone could run a task
57-
that does horrible things to your worker's containers, possibly stealing
57+
that does harmful things to your worker's containers, potentially stealing
5858
sensitive information.
5959

6060
This can be remedied with configuration specified on Garden to restrict
6161
access to the internal network, but this is not detailed in our docs, and
62-
we'll probably want to find a better answer than configuration in the
63-
future.
62+
we'll likely want to find a better solution in the future.
6463
}
65-
}
64+
}

lit/docs/builds.lit

+43-41
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
\use-plugin{concourse-docs}
44

5-
A build is an execution of a \italic{build plan}, which is either
5+
A build is an execution of a \italic{build plan}, which is either:
66

77
\list{
88
configured as a sequence of \reference{steps}{steps} in a \reference{jobs}{job}
@@ -14,37 +14,37 @@ A build is an execution of a \italic{build plan}, which is either
1414

1515
Containers and volumes are created as \reference{get-step}s,
1616
\reference{put-step}s, and \reference{task-step}s run. When a build completes
17-
successfully, these containers go away.
17+
successfully, these containers are removed.
1818

19-
A failed build's containers and volumes are kept around so that you can debug
20-
the build via \reference{fly-intercept}. If the build belongs to a
21-
\reference{jobs}{job}, the containers will go away when the next build starts.
22-
If the build is a one-off, its containers will be removed immediately, so make
23-
sure you intercept while it's running, if you want to debug.
19+
For failed builds, containers and volumes are preserved to allow debugging
20+
via \reference{fly-intercept}. If the build belongs to a
21+
\reference{jobs}{job}, the containers will be removed when the next build starts.
22+
If the build is a one-off, its containers will be removed immediately, so make sure
23+
you intercept while it's running if you want to debug.
2424

2525
\table-of-contents
2626

2727
\section{
2828
\title{Rerunning a Build}{build-rerunning}
2929

30-
Concourse supports build rerunning, which means to run a new build using the
30+
Concourse supports build rerunning, which means running a new build using the
3131
exact same set of input versions as the original build. There are two ways to
3232
rerun a build: through the web UI on the builds page and through the
33-
\reference{fly-rerun-build}.
33+
\reference{fly-rerun-build} command.
3434

35-
When a build is rerun, it will create a new build using the name of the
35+
When a build is rerun, it creates a new build using the name of the
3636
original build with the rerun number appended to it, e.g. \code{3.1} for the
3737
first rerun of build \code{3}.
3838

3939
Rerun builds are ordered chronologically after the original build, rather
4040
than becoming a new "latest" build. Similarly, when the scheduler is
4141
resolving \reference{schema.get.passed}{\code{passed}} constraints
4242
that reference a job with rerun builds, those rerun builds are
43-
processed in this same order. This ensures that the versions, which made it
44-
through a rerun build, do not become the new "latest versions". Instead, they
43+
processed in this same order. This ensures that versions which made it
44+
through a rerun build do not become the new "latest versions". Instead, they
4545
act as if the original build had succeeded at its point in the build history.
4646

47-
This may sound a little confusing, but the summary is that reruns should
47+
This may sound a little confusing, but the key point is that reruns should
4848
behave as if they replace the original failed build.
4949

5050
\section{
@@ -56,11 +56,11 @@ sure you intercept while it's running, if you want to debug.
5656
with.
5757

5858
This means that if the \reference{schema.job.plan} has changed in a way
59-
that is backwards-incompatible, the rerun build may error. For example, if
59+
that is backwards-incompatible, the rerun build may fail. For example, if
6060
a new input is added, its version will not be available as the original
6161
build did not use it.
6262

63-
There are future plans to have reruns execute the exact build plan from the
63+
There are plans to have reruns execute the exact build plan from the
6464
original build. If you are interested in tracking the progress for the
6565
second pass at rerunning builds - or contributing yourself! - the project
6666
epic is called \link{Build Lifecycle
@@ -86,7 +86,7 @@ sure you intercept while it's running, if you want to debug.
8686
This can be useful for periodically monitoring the state of a job. The output
8787
also works well with tools like \code{awk} and \code{grep}.
8888

89-
By default the most recent 50 builds are shown. To see more builds, use
89+
By default, the most recent 50 builds are shown. To see more builds, use
9090
the \code{-c} flag, like so:
9191

9292
\codeblock{bash}{{
@@ -97,16 +97,16 @@ sure you intercept while it's running, if you want to debug.
9797
\section{
9898
\title{\code{fly intercept}}{fly-intercept}
9999

100-
Sometimes it's helpful to connect to the machine where tasks run. This way you
101-
can either profile or inspect tasks, or see the state of the machine at the
102-
end of a run. Due to Concourse running tasks in containers on remote
103-
machines this would typically be hard to access.
100+
Sometimes it's helpful to connect to the machine where tasks run. This allows you
101+
to profile or inspect tasks, or see the state of the machine at the
102+
end of a run. Since Concourse runs tasks in containers on remote
103+
machines, these would typically be difficult to access.
104104

105-
To this end, there is a \code{fly intercept} command that will give you an
105+
The \code{fly intercept} command gives you an
106106
interactive shell inside the specified container. Containers are identified
107-
by a few things, so you may need to specify a few flags to hone down the
108-
results. If there are multiple containers that the flags could refer to, an
109-
interactive prompt will show up allowing you to disambiguate.
107+
by several attributes, so you may need to specify multiple flags to narrow down the
108+
results. If there are multiple matching containers, an
109+
interactive prompt will appear allowing you to select one.
110110

111111
For example, running the following will run a task and then enter the
112112
finished task's container:
@@ -118,15 +118,15 @@ sure you intercept while it's running, if you want to debug.
118118

119119
\aside{
120120
When intercepting a task running on a Windows worker, you will need to
121-
specifically tell fly to to run \code{powershell}:
121+
specifically tell fly to run \code{powershell}:
122122

123123
\codeblock{bash}{{
124124
$ fly -t example intercept powershell
125125
}}
126126
}
127127

128-
Containers are around for a short time after a build finishes in order to
129-
allow people to intercept them.
128+
Containers remain available for a short time after a build finishes to
129+
allow for interception.
130130

131131
You can also intercept builds that were run in your pipeline. By using
132132
\code{--job}, \code{--build}, and \code{--step} you can intercept a specific
@@ -138,11 +138,11 @@ sure you intercept while it's running, if you want to debug.
138138
}}
139139

140140
Note that \code{--build} can be omitted, and will default to the most recent
141-
build of the job. One-off builds can be reached by passing in their build ID
142-
to \code{--build} which can be found on the build list page.
141+
build of the job. One-off builds can be reached by passing their build ID
142+
to \code{--build}, which can be found on the build list page.
143143

144-
The \code{--step} flag can also be omitted; this will let you pick the step
145-
interactively, if you don't know the exact name.
144+
The \code{--step} flag can also be omitted; this will let you select the step
145+
interactively if you don't know the exact name.
146146

147147
Resource checking containers can also be intercepted with \code{--check} or
148148
\code{-c}:
@@ -157,7 +157,7 @@ sure you intercept while it's running, if you want to debug.
157157
current build's task, even as the "current build" changes.
158158

159159
The working directory and any relevant environment variables (e.g. those
160-
having come from \reference{schema.task.params}) used by the original process will
160+
from \reference{schema.task.params}) used by the original process will
161161
also be used for the process run by intercept.
162162
}
163163

@@ -178,26 +178,26 @@ sure you intercept while it's running, if you want to debug.
178178
\title{\code{fly watch}}{fly-watch}
179179

180180
Concourse emits streaming colored logs on the website, but it can be helpful
181-
to have the logs available to the command line (e.g. so that they can be
181+
to have the logs available in the command line (e.g. so they can be
182182
processed by other commands).
183183

184-
The \code{watch} command can be used to do just this. You can also view
184+
The \code{watch} command can be used for this purpose. You can view
185185
builds that are running in your pipeline, or builds that have already
186186
finished.
187187

188188
Note that unlike \reference{fly-execute}, killing \code{fly watch} via
189189
\code{SIGINT} or \code{SIGTERM} will \italic{not} abort the build.
190190

191-
To watch the most recent one-off build, just run \code{fly watch} with no
192-
arguments. To watch a specific build (one-off or no), pass \code{--build}
191+
To watch the most recent one-off build, run \code{fly watch} with no
192+
arguments. To watch a specific build (one-off or not), pass \code{--build}
193193
with the ID of the build to watch. This ID is available at the start of
194194
\reference{fly-execute}'s output or by browsing to the builds list in the web
195195
UI.
196196

197-
By using the \code{--job} and \code{--build} flags you can pick out a
197+
By using the \code{--job} and \code{--build} flags, you can select a
198198
specific build of a job to watch. For example, the following command will
199-
either show the archived logs for an old build, if it has finished running, or
200-
it will stream the current logs, if the build is still in progress.
199+
either show the archived logs for an old build if it has finished running, or
200+
it will stream the current logs if the build is still in progress.
201201

202202
\codeblock{bash}{{
203203
$ fly -t example watch --job my-pipeline/tests --build 52
@@ -206,5 +206,7 @@ sure you intercept while it's running, if you want to debug.
206206
If the \code{--job} flag is specified and \code{--build} is omitted, the most
207207
recent build of the specified job will be selected.
208208

209-
If there is a mismatch between the \code{fly} and \code{web} versions, it is possible to run into \code{failed to parse next event: unknown event type} error. The \code{--ignore-event-parsing-errors} flag can be passed to ignore such errors.
210-
}
209+
If there is a mismatch between the \code{fly} and \code{web} versions, you may encounter
210+
a \code{failed to parse next event: unknown event type} error. The \code{--ignore-event-parsing-errors}
211+
flag can be passed to ignore such errors.
212+
}

lit/docs/config.lit

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
\use-plugin{concourse-docs}
44

5-
Concourse configuration for things like \reference{pipelines} and
6-
\reference{tasks} is done through declarative
5+
Concourse configuration for features like \reference{pipelines} and
6+
\reference{tasks} is managed through declarative
77
\link{YAML}{https://en.wikipedia.org/wiki/YAML} files.
88

9-
Concourse configuration supports basic variable substitution by way of
9+
Concourse configuration supports basic variable substitution using
1010
\reference{vars}{\code{((vars))}}. There is no built-in support for
11-
fancier templating constructs, e.g. loops and conditionals; users are free to
12-
use whatever templating system they like.
11+
more advanced templating constructs such as loops and conditionals; users are free to
12+
use whatever templating system they prefer.
1313

1414
\table-of-contents
1515

1616
\include-section{config/yaml.lit}
17-
\include-section{config/basic-schemas.lit}
17+
\include-section{config/basic-schemas.lit}

lit/docs/getting-started.lit

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
\title{Getting Started}
22

3-
This tutorial will guide you through the basics of creating Concourse
3+
This tutorial guides you through the basics of creating Concourse
44
pipelines. You will use a local instance of Concourse running on your machine to
55
run pipelines.
66

7-
Before getting started you should have the following installed:
7+
Before getting started, ensure you have the following installed:
88

99
\list{
1010
\link{Docker}{https://docs.docker.com/get-docker/}
@@ -13,17 +13,17 @@ Before getting started you should have the following installed:
1313
}
1414

1515
This tutorial assumes you understand what Linux containers are and how to work
16-
with them. If you know what a Dockerfile is and how to make your own then you're
17-
probably good to jump into this tutorial. If you're not familiar with Linux
18-
containers then you may want to \link{get started with
19-
Docker}{https://docs.docker.com/get-started/} first before diving into this
16+
with them. If you know what a Dockerfile is and how to create one, you're
17+
probably ready for this tutorial. If you're not familiar with Linux
18+
containers, we recommend \link{getting started with
19+
Docker}{https://docs.docker.com/get-started/} before diving into this
2020
tutorial.
2121

2222
It will also help if you know how to read YAML. We have a quick
2323
\reference{intro-to-yaml} if you're not familiar with the syntax.
2424

2525
\aside{
26-
If you have any feedback for this tutorial please share it in \link{this
26+
If you have any feedback for this tutorial, please share it in \link{this
2727
GitHub discussion}{https://github.com/concourse/concourse/discussions/7353}
2828
}
2929

@@ -34,4 +34,4 @@ It will also help if you know how to read YAML. We have a quick
3434
\include-section{getting-started/quickstart.lit}
3535
\include-section{getting-started/hello-world.lit}
3636
\include-section{getting-started/inputs-outputs.lit}
37-
\include-section{getting-started/resources.lit}
37+
\include-section{getting-started/resources.lit}

lit/docs/how-to-guides.lit

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
\title{How-To Guides}
22

3-
The following pages are guides that show how to accomplish certain workflows
4-
within Concourse. Most of the guides will use specific images but you are in no
5-
way limited to or forced to use these images to accomplish the same task. There
6-
are many ways to accomplish the same thing in Concourse, so don't let these
7-
guides limit you in what you think is possible with Concourse.
3+
The following pages provide guides that show how to accomplish specific workflows
4+
within Concourse. Most guides use specific images, but you are not limited to
5+
or required to use these images to accomplish the same tasks. There are many ways
6+
to accomplish the same goal in Concourse, so don't let these guides limit your
7+
understanding of what's possible with Concourse.
88

99
\split-sections
1010
\table-of-contents
1111

1212
\include-section{./guides/pipeline-guides.lit}
1313
\include-section{./guides/git.lit}
14-
\include-section{./guides/container-images.lit}
14+
\include-section{./guides/container-images.lit}

0 commit comments

Comments
 (0)