Skip to content

Commit 5aeb165

Browse files
committed
contibutors guides update first pass
1 parent 0c6eb4d commit 5aeb165

File tree

3 files changed

+89
-134
lines changed

3 files changed

+89
-134
lines changed

CONTENT_AUTHORING.md

Lines changed: 54 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CircleCI Docs Static Site: Content Authoring Guide
1+
# CircleCI docs content authoring guide
22

33
This guide provides comprehensive information for authors contributing content to the CircleCI Docs Static Site.
44

@@ -47,14 +47,13 @@ component/
4747

4848
## AsciiDoc Essentials
4949

50-
The CircleCI Docs Static Site uses [AsciiDoc](https://asciidoc.org/) for content authoring. Here's how to use it effectively:
50+
The CircleCI docs site uses [AsciiDoc](https://asciidoc.org/) for content authoring. Here's how to use it effectively:
5151

5252
### Basic Syntax
5353

5454
```asciidoc
5555
= Page Title
56-
:description: A brief description of the page content
57-
:page-toclevels: 3
56+
:page-description: A brief description of the page content
5857

5958
== Section Heading
6059
This is a paragraph of text.
@@ -71,22 +70,27 @@ Another paragraph with *bold text* and _italic text_.
7170
.. Nested numbered item
7271
```
7372

73+
For a more complete example, see the [template pages](https://github.com/circleci/circleci-docs/tree/main/docs/contributors/modules/templates/pages).
74+
7475
### Document Attributes
7576

7677
Document attributes control various aspects of rendering:
7778

7879
```asciidoc
7980
= Page Title
80-
:description: Used for SEO and meta description
81-
:page-toclevels: 3 # Controls table of contents depth
82-
:page-layout: default # Page layout template
83-
:experimental: # Enables experimental features
84-
:icons: font # Uses font icons
81+
:page-platform: Cloud, Server # Displays platform badges in the page info bar
82+
:page-description: Used for SEO and meta description
83+
:experimental: # Enables macro features for menu and button macros
84+
:page-aliases: some-old-page.adoc # redirects archived pages
85+
8586
```
8687

8788
### Page Title Badges
8889

89-
Add visual badges next to page titles to indicate content status (e.g., Preview, Beta, Deprecated):
90+
Add visual badges next to page titles to indicate content status. Currently we are using a `Preview` badge to indicate when a page is for a feature in open or closed preview.
91+
92+
A page is closed preview will display the `Preview` badge and **will not be** listed in the navigation.
93+
A page in open preview will display the `Preview` badge and **will be** listed in the navigation.
9094

9195
#### Basic Usage
9296

@@ -117,23 +121,12 @@ This displays a simple badge with default styling (black text, border, no backgr
117121

118122
#### Common Badge Styles
119123

120-
**Preview (Orange):**
124+
**Preview:**
121125
```asciidoc
122126
:page-badge: Preview
123-
:page-badge-classes: text-white bg-orange-500 border border-orange-600
124127
```
125128

126-
**New (Green):**
127-
```asciidoc
128-
:page-badge: New
129-
:page-badge-classes: text-white bg-green-500 border border-green-600
130-
```
131-
132-
**Deprecated (Red):**
133-
```asciidoc
134-
:page-badge: Deprecated
135-
:page-badge-classes: text-white bg-red-500 border border-red-600
136-
```
129+
Currently we are not adding styling to these badges but this may change in future.
137130

138131
#### Badge Attributes Reference
139132

@@ -162,31 +155,8 @@ CAUTION: This requires special attention.
162155

163156
### Page Structure Template
164157

165-
Use this template as a starting point for new pages:
166-
167-
```asciidoc
168-
= Page Title
169-
:description: Concise description of the page content
170-
:page-toclevels: 3
171-
172-
[abstract]
173-
--
174-
A brief introduction to what this page covers and why it's important.
175-
--
158+
Use the [template pages](https://github.com/circleci/circleci-docs/tree/main/docs/contributors/modules/templates/pages) as a starting point for new content.
176159

177-
== First Major Section
178-
Introduction to this section.
179-
180-
=== Subsection
181-
Content for the subsection.
182-
183-
== Second Major Section
184-
Content for the second major section.
185-
186-
== Related Information
187-
* xref:related-page.adoc[Related Page]
188-
* xref:another-related-page.adoc[Another Related Page]
189-
```
190160

191161
### Headings
192162

@@ -197,7 +167,6 @@ Use hierarchical headings to structure your content:
197167
== Level 1
198168
=== Level 2
199169
==== Level 3
200-
===== Level 4
201170
```
202171

203172
Avoid skipping levels, and don't go deeper than level 4 unless absolutely necessary.
@@ -209,6 +178,7 @@ Avoid skipping levels, and don't go deeper than level 4 unless absolutely necess
209178
For code blocks with syntax highlighting:
210179

211180
```asciidoc
181+
.Title for code block, explain what it is and what it does
212182
[source,yaml]
213183
----
214184
version: 2.1
@@ -225,9 +195,11 @@ jobs:
225195

226196
### Tables
227197

228-
Create formatted tables:
198+
Create formatted tables that can scroll horizontally as needed:
229199

230200
```asciidoc
201+
[.table-scroll]
202+
--
231203
.Table Title
232204
[cols="1,1,2", options="header"]
233205
|===
@@ -241,6 +213,7 @@ Create formatted tables:
241213
|Row 2, Cell 2
242214
|Row 2, Cell 3
243215
|===
216+
--
244217
```
245218

246219
### Tabs
@@ -265,6 +238,8 @@ Content for Tab B
265238

266239
### Collapsible Sections
267240

241+
**We do not currently use collapsible sections.**
242+
268243
For long content that might be hidden initially:
269244

270245
```asciidoc
@@ -285,10 +260,16 @@ Link to other pages within the documentation:
285260
xref:page-name.adoc[Link Text]
286261
```
287262

263+
To link to a page in another module in the same component:
264+
265+
```asciidoc
266+
xref:module-name:page-name.adoc[Link Text]
267+
```
268+
288269
To link to another component:
289270

290271
```asciidoc
291-
xref:component-name:page-name.adoc[Link Text]
272+
xref:component-name:module-name:page-name.adoc[Link Text]
292273
```
293274

294275
To link to a specific section:
@@ -305,6 +286,8 @@ Link to external resources:
305286
link:https://circleci.com[CircleCI Website]
306287
```
307288

289+
The `link:` is not strictly necessary but makes it easier to find when editing or making bulk changes.
290+
308291
### Navigation Files
309292

310293
The `nav.adoc` file defines the sidebar navigation structure:
@@ -324,6 +307,7 @@ The `nav.adoc` file defines the sidebar navigation structure:
324307
Include images with optional attributes:
325308
326309
```asciidoc
310+
.Image title
327311
image::filename.png[Alt Text,width=500,role=center]
328312
```
329313
@@ -340,9 +324,19 @@ video::video-id[youtube,width=640,height=360]
340324
341325
### Diagrams
342326
343-
For complex diagrams, use image files created with diagramming software.
327+
You can add mermaid diagrams to a page, as follows:
344328
345-
For simple diagrams, you can use AsciiDoc's built-in diagramming through extensions like Asciidoctor Diagram.
329+
```asciidoc
330+
.Example of a mermaid diagram
331+
[mermaid]
332+
....
333+
sequenceDiagram
334+
participant Alice
335+
participant Bob
336+
Alice->>Bob: Hello Bob, how are you?
337+
Bob-->>Alice: Great!
338+
....
339+
```
346340
347341
## Semantic Guidelines
348342
@@ -365,11 +359,11 @@ Structure your content based on its purpose:
365359

366360
### Versioning Content
367361

368-
For version-specific content, use conditional statements:
362+
For version-specific content, use negative conditional statements ([ifndef directive](https://docs.asciidoctor.org/asciidoc/latest/directives/ifdef-ifndef/)) :
369363

370364
```asciidoc
371-
ifeval::["{serverversion}" == "4.0"]
372-
This content is only visible for server version 4.0.
365+
ifndef::aws
366+
This content is only visible for non-AWS pages and sections
373367
endif::[]
374368
```
375369

@@ -391,18 +385,8 @@ Before submitting content for review, check that:
391385

392386
All content should go through peer review:
393387

394-
1. Create a pull request with your changes
395-
2. Request review from subject matter experts
396-
3. Address any feedback or suggestions
397-
4. Update based on technical accuracy review
398-
5. Final editorial review for consistency and style
399-
400-
### Common Feedback Points
401-
402-
- Technical accuracy and completeness
403-
- Structure and organization
404-
- Language clarity
405-
- Cross-referencing correctness
406-
- Code sample functionality
407-
- Image quality and relevance
408-
- Navigation placement
388+
1. Create a pull request with your changes. Code ownders will be pinged for review automatically (docs team and PM team).
389+
2. Request review from subject matter experts, for most changes we will want a review from an engineer in the relevant team or the PM for the feature. The docs team can manage this process for you.
390+
3. Address any feedback or suggestions.
391+
4. Update based on technical accuracy review.
392+
5. Final editorial review for consistency and style.

CONTRIBUTING.md

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CircleCI Docs Static Site: Contributing Guide
22

3-
This guide provides comprehensive information for contributors to the CircleCI Docs Static Site project.
3+
This guide provides comprehensive information for contributors to the CircleCI docs project.
44

55
## Table of Contents
66
- [Ways to Contribute](#ways-to-contribute)
@@ -14,19 +14,18 @@ This guide provides comprehensive information for contributors to the CircleCI D
1414

1515
## Ways to Contribute
1616

17-
There are several ways to contribute to the CircleCI Docs Static Site:
17+
There are several ways to contribute to the CircleCI docs project:
1818

1919
1. **Documentation content**: Add or improve documentation pages
2020
2. **Technical improvements**: Enhance the site's functionality
2121
3. **UI improvements**: Improve the user interface and experience
2222
4. **Bug fixes**: Fix issues with the site or content
23-
5. **Feature requests**: Suggest new features or improvements
23+
5. **Feature requests**: Suggest new features or improvements. You can do this by submitting a [GitHub issue](https://github.com/circleci/circleci-docs/issues) or using the feedback form on the docs site itself.
2424

2525
### Types of Contributions Needed
2626

2727
- Writing tutorials and how-to guides
2828
- Improving API and reference documentation
29-
- Translating content
3029
- Fixing typos and clarifying explanations
3130
- Developing new UI components
3231
- Improving build performance
@@ -45,7 +44,7 @@ There are several ways to contribute to the CircleCI Docs Static Site:
4544

4645
1. **Fork the repository**:
4746
- Visit [https://github.com/circleci/circleci-docs](https://github.com/circleci/circleci-docs)
48-
- Click the "Fork" button to create your own copy
47+
- Click the "Fork" button to create your own copy. If you are a CircleCI employee you can simply clone the repo rather than creating a fork.
4948

5049
2. **Clone your fork**:
5150
```bash
@@ -109,12 +108,12 @@ Example: `docs/add-kubernetes-guide` or `fix/broken-navigation`
109108
git commit -m "Your commit message"
110109
```
111110

112-
Commit message format:
111+
Commit message format:
113112
```
114113
type(scope): Brief description
115-
114+
116115
Longer description if needed
117-
116+
118117
Fixes #123
119118
```
120119

@@ -194,9 +193,10 @@ function performTask(input) {
194193

195194
### Types of Tests
196195

197-
- **Content validation**: Ensuring documentation is accurate
198-
- **Link checking**: Verifying all links work correctly
199-
- **UI testing**: Checking for visual and interactive issues
196+
- **Content validation**: This is a manual text. As far as reasonably possible all docs changes and additions should be manually tested. A member of the CircleCI docs team (or other team) should run through the documented task following any steps outlined in the doc closely to check they are both correct and complete, no missing steps where users could get stuck. Changes to technical content should be reviewed by a member of the engineering team that owns the feature.
197+
- **Content style checking**: We use [Vale](https://vale.sh/) for content linting. We have vale rules set up to enforce style. You can take a look at these rules in the `/styles` folder. Vale runs in our CI/CD pipeline so you can check for error and warnings when pushing your changes to GitHub. You can also install vale locally on your machine and run vale on the file you are editing or even using an [extension in your IDE](https://marketplace.visualstudio.com/items?itemName=chrischinchilla.vale-vscode).
198+
- **Link checking**: Verifying all links work correctly. Links are checked as part of our CI build
199+
- **UI testing**: Checking for visual and interactive issues (we do not currently have any UI testing set up)
200200
- **Build testing**: Ensuring the site builds correctly
201201

202202
### Running Tests
@@ -208,7 +208,7 @@ function performTask(input) {
208208
Review the site locally for content issues.
209209

210210
- **Link checking**:
211-
The CI pipeline includes automatic link checking.
211+
The CI pipeline includes automatic link checking. Check the outcome of the `Validate` job for issues.
212212

213213
## Documentation Guidelines
214214

@@ -251,13 +251,13 @@ All contributions go through a review process:
251251
- Are there adequate tests?
252252
- Does it follow project conventions?
253253

254-
### After Approval
254+
During the review process further discussion might be needed. This will happen in comments in the PR. The docs team review might push changes to your branch to fix style and formatting issues but larger issues will be discussed first.
255+
256+
The speed at which we can process changes will depend on the scope of the change and the existing workload that the docs team has at that time. We would try to respond to contributions within two days of submission.
255257

256-
Once your PR is approved:
258+
### After Approval
257259

258-
1. It will be merged by a maintainer
259-
2. Your contribution will be included in the next release
260-
3. You'll be credited as a contributor
260+
Once your PR is approved it will be merged by a maintainer. Your contribution will be published immediately (well, around 4 minutes for the pipeline to build!)
261261

262262
## Release Process
263263

@@ -266,16 +266,14 @@ Once your PR is approved:
266266
The CircleCI Docs Static Site follows a continuous delivery model:
267267

268268
- Documentation changes: Released as soon as they're approved
269-
- Technical changes: Released on a scheduled basis
269+
- Technical changes: Released as and when ready
270270
- Emergency fixes: Released as needed
271271

272272
### Release Process
273273

274274
1. Changes are merged to `main`
275275
2. CI pipeline builds and tests the site
276-
3. Automatic deployment to staging environment
277-
4. Review and testing in staging
278-
5. Deployment to production
276+
3. Deployment to production
279277

280278
### Versioning
281279

@@ -295,12 +293,4 @@ If you need help with your contribution:
295293
- **Discussions**: Use GitHub Discussions for questions
296294
- **Documentation**: Refer to the technical docs
297295

298-
## Recognition
299-
300-
Contributors are recognized in several ways:
301-
302-
- Attribution in commit history
303-
- Inclusion in the contributors list
304-
- Recognition in release notes for significant contributions
305-
306296
Thank you for contributing to the CircleCI Docs Static Site!

0 commit comments

Comments
 (0)