Skip to content

Commit 58fedd3

Browse files
Merge branch 'master' into master
2 parents 4de5e4f + 75fbf00 commit 58fedd3

File tree

333 files changed

+5887
-4418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+5887
-4418
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
language: shell
3939
cache: false
4040
install:
41-
- rvm use 2.5.3
41+
- rvm use 3.3.1 --install
4242
script:
4343
- git clone https://github.com/travis-ci/dpl.git
4444
- cd dpl

404.html

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
<!DOCTYPE HTML>
44
<html lang="en">
55
<head>
6+
<!-- PDTQ-131 -->
7+
<!-- Google Tag Manager -->
8+
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
9+
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
10+
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
11+
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
12+
})(window,document,'script','dataLayer','GTM-N3RT7TD');</script>
13+
<!-- End Google Tag Manager -->
614
<meta charset="utf-8">
715
<meta name="viewport" content="width=device-width, initial-scale=1">
816
<title>Travis CI Documentation - 404 Page not found</title>
@@ -216,6 +224,11 @@
216224
</script>
217225
</head>
218226
<body>
227+
<!-- PDTQ-131 -->
228+
<!-- Google Tag Manager (noscript) -->
229+
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N3RT7TD"
230+
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
231+
<!-- End Google Tag Manager (noscript) -->
219232
<div class="error error404">
220233
<header class="top">
221234
<div class="row topbar">
@@ -224,7 +237,7 @@ <h1 id="logo" class="logo">
224237
</h1>
225238
<nav>
226239
<ul id="navigation" class="navigation">
227-
<li><a href="https://blog.travis-ci.com">Blog</a></li>
240+
<li><a href="https://travis-ci.com/blog">Blog</a></li>
228241
<li><a href="https://docs.travis-ci.com">Docs</a></li>
229242
</ul>
230243
</nav>

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ GEM
100100
listen (~> 3.0)
101101
json (2.3.1)
102102
kramdown (1.17.0)
103-
libv8 (3.16.14.19)
103+
libv8 (3.16.14.19.1)
104104
liquid (4.0.3)
105105
listen (3.0.8)
106106
rb-fsevent (~> 0.9, >= 0.9.4)

README.md

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,104 @@
1-
# About this repository [![Build Status](https://travis-ci.com/travis-ci/docs-travis-ci-com.svg?branch=master)](https://travis-ci.com/travis-ci/docs-travis-ci-com)
1+
# About Travis CI Repository [![Build Status](https://travis-ci.com/travis-ci/docs-travis-ci-com.svg?branch=master)](https://travis-ci.com/travis-ci/docs-travis-ci-com)
22

3-
This is the documentation site for Travis CI! (<https://docs.travis-ci.com/>)
3+
This is the documentation site for [Travis CI!](https://docs.travis-ci.com/).
4+
Follow this guide to learn how to add new documentation and how to update existing documentation.
45

5-
## How to contribute
6+
## Add Documentation
67

7-
Fork the repository, read the rest of this README file and make some changes.
8-
Once you're done with your changes send a pull request. Thanks!
8+
The following are the steps to add documentation.
99

10-
## How to check your edit before sending PR
10+
1. Review the [Travis CI documentation guidelines](/STYLE.md).
11+
1. Check existing documentation. Verify that the documentation does not already exist or look for related documentation that can be enhanced.
12+
1. Determine proper placement. In the [Travis CI repository](https://github.com/travis-ci/docs-travis-ci-com/tree/master), browse to the *user* folder (or any other specific folder) and create a new branch.
13+
1. Create a new file and add the new documentation files.
14+
1. Ensure to insert the name and extension for the file.
15+
1. Commit your changes and add a short message to describe your changes.
16+
1. Test the changes locally to verify your edits.
17+
1. Submit a pull request. Include a clear title and description of the proposed changes, and click “**Create pull request**.”
1118

12-
You can inspect how your edits will be reflected by the documentation site. Either by clicking on the Netlify preview link in your Pull Request or building the docs locally.
19+
Thank you for your contribution! The Travis CI team will review the pull request and approve any necessary changes.
1320

14-
### Install dependencies
21+
## Update Existing Documentation
1522

16-
1. Make sure you have Ruby and RubyGems installed.
23+
If you see a page that needs to be updated or that can be improved, follow these steps to update Travis CI's existing documentation.
1724

18-
1. Install [bundler](http://bundler.io/):
25+
1. Review the [Travis CI documentation guidelines](/STYLE.md).
26+
1. Identify the Travis CI docs page that needs to be updated.
27+
1. Click the “**Improve this page on GitHub**” button in the top right corner.
28+
1. Once on GitHub, edit the relevant file.
29+
1. Commit your changes. Name your branch, and click the “**Propose changes**” button.
30+
1. Build the docs in a local environment to verify your edits.
31+
1. Submit a pull request. Ensure a clear title and description of the proposed changes are added, and click “**Create pull request**.”
32+
33+
Thank you for your contribution. The Travis CI team will review the pull request and approve any necessary changes.
34+
35+
36+
## Build Local Environment
37+
38+
You can inspect how the documentation site will reflect your edits. Follow the steps below to learn how to build your local environment and check all your edits before sending the pull request for approval.
39+
40+
### Install Dependencies
41+
42+
Follow the steps below to install dependencies.
43+
44+
1. Ensure you have *Ruby* and *RubyGems* installed.
45+
46+
1. Clone the [Travis CI docs](https://github.com/travis-ci/docs-travis-ci-com/tree/master) repository.
47+
48+
1. Install [bundler](http://bundler.io/) as follows:
1949

2050
```sh-session
2151
$ gem install bundler
2252
```
2353

24-
1. Install application dependencies:
54+
1. Next, install application dependencies:
2555

2656
```sh-session
2757
$ bundle install --binstubs
2858
```
2959

30-
### Generate documentation
60+
### Generate Documentation
3161

32-
Run
62+
To generate the documentation, run the following command:
3363

3464
```sh-session
3565
$ ./bin/jekyll build
3666
```
3767

68+
### Run the Application Server
3869

39-
### Run application server
40-
41-
You are now ready to start your documentation site, using Jekyll or Puma.
70+
You are ready to start your local documentation site using Jekyll or Puma.
4271
For documentation edits, Jekyll is sufficient.
4372

44-
#### Starting and inspecting edits with Jekyll
73+
#### Edit with Jekyll
74+
75+
To start and inspect your edits using Jekyll, follow the steps below:
4576

46-
1. Run Jekyll server:
77+
1. Run the *Jekyll* server:
4778

4879
```sh-session
4980
$ ./bin/jekyll serve
5081
```
5182

5283
1. Open [localhost:4000](http://localhost:4000/) in your browser.
5384

54-
#### Starting and inspecting edits with Puma
85+
#### Edit with Puma
5586

56-
For more programmatical PRs (such as handling webhooks notification
57-
via POST), Puma is necessary.
87+
For more programmatical pull requests (such as handling webhooks notifications
88+
via POST), Puma is necessary. To start and inspect your edits using Puma, follow the steps below:
5889

59-
1. Run Puma server:
90+
1. Run the *Puma* server:
6091

6192
```sh-session
6293
$ ./bin/puma
6394
```
6495

6596
1. Open [localhost:9292](http://localhost:9292/) in your browser.
6697

67-
### API V2 documentation
98+
### API Documentation
6899

69-
API V2 (and 2.1) documentation is maintained in `slate/source` and is generated at build time from source.
100+
All Travis CI API V2 (and 2.1) documentation is maintained in `slate/source` and generated from the source at build time.
70101

71102
## License
72103

73-
Distributed under the [MIT license](https://opensource.org/licenses/MIT); the same as other Travis CI projects.
104+
Distributed under the [MIT license](https://opensource.org/licenses/MIT), like other Travis CI projects.

STYLE.md

Lines changed: 91 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Travis CI documentation style guide
1+
# Travis CI Documentation Style Guide
22

3-
## Markdown and structure
3+
## Markdown and Structure
44

55
We're planning to lint the Markdown with [Coala.io][coala] and the [MarkdownBear][bear].
66

@@ -12,13 +12,13 @@ We'll be using a subset (TBD) of the full [list of checks][checks].
1212

1313
[checks]: https://github.com/coala/bear-docs/blob/master/docs/MarkdownBear.rst#settings "MarkdownBear checks"
1414

15-
We use Kramdown, with [GFM](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) codeblocks, and a few Kramdown related exceptions introduced with `{: }` such as class names for specific formatting of columns and notes.
15+
We use Kramdown, with [GFM](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) code blocks, and a few Kramdown-related exceptions introduced with `{: }` such as class names for specific formatting of columns and notes.
1616

17-
### Headings
17+
## Headings
1818

19-
For historical reasons, the top level heading in Jekyll markdown files is level 2 (##) not level 1 (#).
19+
For historical reasons, the top-level heading in Jekyll's markdown files is level 2 (##), not level 1 (#). Only the page’s title is a level 1 heading.
2020

21-
We use ATX style headings, and do not use the optional closing hashes:
21+
We use ATX-style headings and do not use the optional closing hashes:
2222

2323
```markdown
2424
## This is an H2
@@ -28,38 +28,62 @@ We use ATX style headings, and do not use the optional closing hashes:
2828
#### This is an H4
2929
```
3030

31-
We do not use underline style headings:
31+
We do not use underlined style headings:
3232

3333
```markdown
3434
Do not use this style heading
3535
=============================
3636
```
3737

38-
### Lists
38+
## Lists
3939

40-
If you have long lists you can wrap them into 2 (`.column-2`) or 3 (`.column-3`) columns using one of the follow CSS classes after your list item:
40+
If you have long lists, you can wrap them into 2 (`.column-2`) or 3 (`.column-3`) columns using one of the following CSS classes after your list item:
4141

4242
```css
4343
* long list item 1
4444
* long list item 2
4545
{: .column-2 }
4646
```
4747

48-
#### In-page table of contents
48+
## Links
4949

50-
All pages have tables of contents generated automatically from H2 and H3
50+
Make sure all links have titles:
51+
52+
```markdown
53+
The [link][example1] in the text
54+
55+
[example1]: http://www.example.com "Example URL"
56+
```
57+
58+
or
59+
60+
```markdown
61+
The [link](http://www.example.com "Example URL") in the text
62+
```
63+
64+
When linking internal pages, use absolute paths and trailing slashes: `/user/languages/c/`.
65+
You can link to headings and remember to remove special characters, for example:
66+
67+
To link to "##Node.js Page," use `#nodejs-page`.
68+
69+
70+
## In-page Options
5171

52-
To remove the TOC from a page add `no_toc: true` to the frontmatter.
72+
### Notes, warnings, and blocks
5373

54-
### Note, warnings and blocks
74+
Travis CI uses the blockquote symbol `>` for general-purpose notes and warnings.
5575

56-
We use the blockquote symbol `>` for general purpose notes and warnings.
76+
See an example below:
5777

58-
#### Beta features
78+
> Note: This feature is only available in Version 2.0.
79+
80+
### Beta features
5981

6082
Mark all beta features with a specially formatted note. Both the `> BETA` and
6183
the `{: .beta}` are required.
6284

85+
See an example below:
86+
6387
> BETA Awesome new feature that might not be enabled and is subject to change.
6488
{: .beta}
6589

@@ -68,46 +92,25 @@ the `{: .beta}` are required.
6892
Mark all alpha features with a specially formatted note. Both the `> ALPHA` and
6993
the `{: alpha}` are required.
7094

71-
> ALPHA Awesome new feature that might explode for extra fun.
95+
> ALPHA: Awesome new feature that might explode for extra fun.
7296
{: .alpha}
7397

7498
### GUI
7599

76-
Make sure all references to items in a GUI match the case of the UI, and are marked with *asterisks*.
77-
78-
### Links
79-
80-
Make sure all links have titles:
81-
82-
```markdown
83-
The [link][example1] in the text
84-
85-
[example1]: http://www.example.com "Example URL"
86-
```
87-
88-
or
89-
90-
```markdown
91-
The [link](http://www.example.com "Example URL") in the text
92-
```
93-
94-
When linking internal pages, use absolute paths and trailing slashes: `/user/languages/c/`.
95-
You can link to headings, remember to remove special characters, for example:
96-
97-
To link to "##Node.js Page" use `#nodejs-page`.
100+
Ensure all references to items in a GUI match the case of the UI and are marked with *asterisks*.
98101

99102

100103
### Code Inline
101104

102-
All function names, filenames, etc should be marked with `back-ticks`.
105+
All function names, filenames, etc., should be marked with `back-ticks`.
103106

104107
If you're talking about applications or services, only the actual command should be marked as code, not the name of the service:
105108

106109
- Start the PostgreSQL database by running `psql`.
107110

108111
### Blockquotes / Notes / Warnings
109112

110-
As we have no use for blockquotes we use `>` to indicate notes and warnings:
113+
As we have no use for blockquotes, we use `>` to indicate notes and warnings:
111114

112115
```markdown
113116
> Note this important info!
@@ -131,16 +134,62 @@ This code is in .travis.yml
131134
```
132135
{: data-file=".travis.yml"}
133136

137+
### In-page table of contents
138+
139+
All Travis CI pages have tables of contents generated automatically from H2 and H3
134140

141+
Add `no_toc: true` to the frontmatter to remove the TOC from a page.
135142

136-
### Common misspellings and words to avoid
143+
### Terminology
144+
The following are some common misspellings and words to avoid
137145

138146
- Always refer to *Travis CI* and never to Travis.
139147

140148
## Images
141149

150+
Add images inline-style with a brief description.
151+
152+
To add an image, follow these steps:
153+
1 Capture the image.
154+
2 Save the image in the `images/` path.
155+
3 Add the image to the documentation as follows:
156+
![description text](image path or URL)
157+
142158
### Screencapture gifs
143159

144160
1. Run a build (or whatever you are trying to capture),
145161
2. Capture it with [licecap](https://www.cockos.com/licecap/).
146-
3. Save the gif in `images/`
162+
3. Save the gif in the following path: `images/`
163+
164+
165+
## Documentation Template
166+
167+
A basic template for contributing to new documentation pages or sections is as follows:
168+
169+
```markdown
170+
---
171+
title: “Insert Page Title”
172+
layout: en
173+
174+
---
175+
176+
Start your introduction here. Usually, an introduction is between one and three sentences.
177+
178+
## Section Heading
179+
180+
Section introduction sentence.
181+
182+
* **Item1** - a group of *jobs* that run in sequence.
183+
* **Item2** - a group of *jobs* that run in parallel as part of a sequential *build* process composed of multiple [stages](/user/build-stages/).
184+
* **Item3** - an automated process that clones your repository into a virtual
185+
environment and then carries out a series of *phases* such as compiling your
186+
code, running tests, etc.
187+
* **Item4** - the [sequential steps](/user/job-lifecycle/)
188+
of a *job*.
189+
190+
```
191+
{: data-file=".travis.yml"}
192+
193+
The example above shows a paragraph with different formatting options.
194+
195+
Check out the [Travis CI documentation](https://docs.travis-ci.com/) for more examples.

0 commit comments

Comments
 (0)