Skip to content

Commit 6d11e67

Browse files
authored
website: (Re)Move markdown documentation (#37417)
* website: (Re)Move markdown documentation * make: remove website targets * gitignore: remove website paths * CODEOWNERS: remove website paths * gh/ISSUE_TEMPLATE: Direct folks to unified repo for docs * Readme: Update link to docs * Update refs to website folder * Re-add Readme.md with a warning and link to the unified repo
1 parent cfe0464 commit 6d11e67

File tree

353 files changed

+8
-70469
lines changed

Some content is hidden

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

353 files changed

+8
-70469
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ contact_links:
2121
- name: Terraform Usage, Language, or Workflow Questions
2222
url: https://discuss.hashicorp.com/c/terraform-core
2323
about: Please ask and answer language or workflow related questions through the Terraform Core Community Forum.
24+
- name: Documentation Issue
25+
url: https://github.com/hashicorp/web-unified-docs
26+
about: Documentation has its own repository for all HashiCorp products and related issues or questions should be directed there.

.github/ISSUE_TEMPLATE/documentation_issue.yml

Lines changed: 0 additions & 76 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
bin/
55
modules-dev/
66
/pkg/
7-
website/.vagrant
8-
website/.bundle
9-
website/build
10-
website/node_modules
117
.vagrant/
128
*.backup
139
*.bak
@@ -22,7 +18,6 @@ go.work*
2218

2319
/terraform
2420

25-
website/vendor
2621
vendor/
2722

2823
# Coverage

CODEOWNERS

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,3 @@
3232
builtin/provisioners/file @hashicorp/terraform-core
3333
builtin/provisioners/local-exec @hashicorp/terraform-core
3434
builtin/provisioners/remote-exec @hashicorp/terraform-core
35-
36-
# engineering and web presence get notified of, and can approve changes to web tooling, but not content at developer.hashicorp.com/terraform/docs
37-
38-
/website/ @hashicorp/web-presence @hashicorp/terraform-core
39-
/website/data/
40-
/website/public/
41-
/website/content/
42-
43-
# education and engineering get notified of, and can approve changes to web content at developer.hashicorp.com/terraform/docs
44-
45-
/website/data/ @hashicorp/terraform-education @hashicorp/terraform-core
46-
/website/docs/ @hashicorp/terraform-education @hashicorp/terraform-core
47-
/website/img/ @hashicorp/terraform-education @hashicorp/terraform-core
48-
/website/README.md @hashicorp/terraform-education @hashicorp/terraform-core
49-
/website/public/ @hashicorp/terraform-education @hashicorp/terraform-core
50-
/website/content/ @hashicorp/terraform-education @hashicorp/terraform-core
51-
52-
# Backend maintainers also get co-ownership of their backend docs pages
53-
/website/docs/language/backend/azurerm.mdx @hashicorp/terraform-education @hashicorp/terraform-core @hashicorp/terraform-azure
54-
/website/docs/language/backend/gcs.mdx @hashicorp/terraform-education @hashicorp/terraform-core @hashicorp/tf-eco-hybrid-cloud
55-
/website/docs/language/backend/kubernetes.mdx @hashicorp/terraform-education @hashicorp/terraform-core @hashicorp/tf-eco-hybrid-cloud
56-
/website/docs/language/backend/s3.mdx @hashicorp/terraform-education @hashicorp/terraform-core @hashicorp/terraform-aws

Makefile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,9 @@ copyrightfix:
3939
syncdeps:
4040
"$(CURDIR)/scripts/syncdeps.sh"
4141

42-
# Run this if working on the website locally to run in watch mode.
43-
website:
44-
$(MAKE) -C website website
45-
46-
# Use this if you have run `website/build-local` to use the locally built image.
47-
website/local:
48-
$(MAKE) -C website website/local
49-
50-
# Run this to generate a new local Docker image.
51-
website/build-local:
52-
$(MAKE) -C website website/build-local
53-
5442
# disallow any parallelism (-j) for Make. This is necessary since some
5543
# commands during the build process create temporary files that collide
5644
# under parallel conditions.
5745
.NOTPARALLEL:
5846

59-
.PHONY: fmtcheck importscheck vetcheck generate protobuf staticcheck syncdeps website website/local website/build-local
47+
.PHONY: fmtcheck importscheck vetcheck generate protobuf staticcheck syncdeps

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This repository contains only Terraform core, which includes the command line in
4141

4242
- To learn more about how we handle bug reports, refer to the [bug triage guide](./BUGPROCESS.md).
4343

44-
- To learn how to contribute to the Terraform documentation in this repository, refer to the [Terraform Documentation README](/website/README.md).
44+
- To learn how to contribute to the Terraform documentation, refer to the [Web Unified Docs repository](https://github.com/hashicorp/web-unified-docs).
4545

4646
## License
4747

commands.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func initCommands(
115115

116116
// The command list is included in the terraform -help
117117
// output, which is in turn included in the docs at
118-
// website/docs/cli/commands/index.html.markdown; if you
118+
// .../docs/cli/commands/index.mdx (in web-unified-docs); if you
119119
// add, remove or reclassify commands then consider updating
120120
// that to match.
121121

help.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func helpFunc(commands map[string]cli.CommandFactory) string {
4444
sort.Strings(otherCommands)
4545

4646
// The output produced by this is included in the docs at
47-
// website/source/docs/cli/commands/index.html.markdown; if you
47+
// .../docs/cli/commands/index.mdx (in web-unified-docs); if you
4848
// change this then consider updating that to match.
4949
helpText := fmt.Sprintf(`
5050
Usage: terraform [global options] <subcommand> [args]

website/Makefile

Lines changed: 0 additions & 60 deletions
This file was deleted.

website/README.md

Lines changed: 1 addition & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -2,90 +2,5 @@
22

33
⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️
44
> [!IMPORTANT]
5-
> **Documentation Update:** Product documentation previously located in `/website` has moved to the [`hashicorp/web-unified-docs`](https://github.com/hashicorp/web-unified-docs) repository, where all product documentation is now centralized. Please make contributions directly to `web-unified-docs`, since changes to `/website` in this repository will not appear on developer.hashicorp.com.
5+
> **Documentation Update:** Product documentation previously located in `/website` has moved to the [`hashicorp/web-unified-docs`](https://github.com/hashicorp/web-unified-docs) repository, where all product documentation is now centralized. Please make contributions directly to `web-unified-docs`.
66
⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️
7-
8-
This directory contains the portions of [the Terraform website](https://www.terraform.io/) that pertain to the core functionality, excluding providers and the overall configuration.
9-
10-
The website uses the files in this directory in conjunction with
11-
[the `terraform-website` repository](https://github.com/hashicorp/terraform-website). The `terraform-website` repository brings all of the documentation together and contains the scripts for testing and building the entire site.
12-
13-
## Suggesting Changes
14-
15-
You can [submit an issue](https://github.com/hashicorp/terraform/issues/new/choose) with documentation requests or submit a pull request with suggested changes.
16-
17-
Click **Edit this page** at the bottom of any Terraform website page to go directly to the associated markdown file in GitHub.
18-
19-
## Validating Content
20-
21-
Content changes are automatically validated against a set of rules as part of the pull request process. If you want to run these checks locally to validate your content before committing your changes, you can run the following command:
22-
23-
```
24-
npm run content-check
25-
```
26-
27-
If the validation fails, actionable error messages will be displayed to help you address detected issues.
28-
29-
## Modifying Sidebar Navigation
30-
31-
You must update the sidebar navigation when you add or delete documentation .mdx files. If you do not update the navigation, the website deploy preview fails.
32-
33-
To update the sidebar navigation, you must edit the appropriate `nav-data.json` file. This repository contains the sidebar navigation files for the following documentation sets:
34-
35-
- Terraform Language: [`language-nav-data.json`](https://github.com/hashicorp/terraform/blob/main/website/data/language-nav-data.json)
36-
- Terraform CLI: [`cli-nav-data.json`](https://github.com/hashicorp/terraform/blob/main/website/data/cli-nav-data.json)
37-
- Introduction to Terraform: [`intro-nav-data.json`](https://github.com/hashicorp/terraform/blob/update-readme/website/data/intro-nav-data.json)
38-
39-
For more details about how to update the sidebar navigation, refer to [Editing Navigation Sidebars](https://github.com/hashicorp/terraform-website#editing-navigation-sidebars) in the `terraform-website` repository.
40-
41-
## Adding Redirects
42-
43-
You must add a redirect when you move, rename, or delete documentation pages. Refer to https://github.com/hashicorp/terraform-docs-common#redirects for details.
44-
45-
## Previewing Changes
46-
47-
You should preview all of your changes locally before creating a pull request. The build includes content from this repository and the [`terraform-website`](https://github.com/hashicorp/terraform-website/) repository, allowing you to preview the entire Terraform documentation site.
48-
49-
**Set Up Local Environment**
50-
51-
1. [Install Docker](https://docs.docker.com/get-docker/).
52-
2. [Install Go](https://golang.org/doc/install) or create a `~/go` directory manually.
53-
3. Open terminal and set `GOPATH` as an environment variable:
54-
55-
Bash: `export $GOPATH=~/go`(bash)
56-
57-
Zsh: `echo -n 'export GOPATH=~/go' >> ~/.zshrc`
58-
59-
4. Restart your terminal or command line session.
60-
61-
**Launch Site Locally**
62-
63-
1. Navigate into your local `terraform` top-level directory and run `make website`.
64-
1. Open `http://localhost:3000` in your web browser. While the preview is running, you can edit pages and Next.js automatically rebuilds them.
65-
1. Press `ctrl-C` in your terminal to stop the server and end the preview.
66-
67-
## Deploying Changes
68-
69-
Merging a PR to `main` queues up documentation changes for the next minor product release. Your changes are not immediately available on the website.
70-
71-
The website generates versioned documentation by pointing to the HEAD of the release branch for that version. For example, the `v1.2.x` documentation on the website points to the HEAD of the `v1.2` release branch in the `terraform` repository. To update existing documentation versions, you must also backport your changes to that release branch. Backported changes become live on the site within one hour.
72-
73-
### Backporting
74-
75-
**Important:** Editing old versions (not latest) should be rare. We backport to old versions when there is an egregious error. Egregious errors include inaccuracies that could cause security vulnerabilities or extreme inconvenience for users.
76-
77-
Backporting involves cherry-picking commits to one or more release branches within a docs repository. You can backport (cherry-pick) commits to a version branch by adding the associated backport label to your pull request. For example, if you need to add a security warning to the v1.1 documentation, you must add the `1.1-backport` label. When you merge a pull request with one or more backport labels, GitHub Actions opens a backport PR to cherry-pick your changes to the associated release branches. You must manually merge the backport PR to finish backporting the changes.
78-
79-
To make your changes available on the latest docs version:
80-
81-
1. Add the backport label for the latest version.
82-
83-
<img width="317" alt="Screen Shot 2022-08-09 at 11 06 17 AM" src="https://user-images.githubusercontent.com/83350965/183686586-f94e58f3-fd62-48cf-88bd-fa886fe4724f.png">
84-
85-
1. Merge the pull request. GitHub Actions autogenerates a backport pull request, linked to the original.
86-
87-
<img width="726" alt="Screen Shot 2022-08-09 at 11 08 52 AM" src="https://user-images.githubusercontent.com/83350965/183687165-350b0e9b-a888-409e-91e2-81d82eac0a4e.png">
88-
89-
1. Merge the auto-generated backport pull request.
90-
91-
You can review and merge your own backport pull request without waiting for another review if the changes in the backport pull request are effectively equivalent to the original. You can make minor adjustments to resolve merge conflicts, but you should not merge a backport PR that contains major content or functionality changes from the original, approved pull request. If you are not sure whether it is okay to merge a backport pull request, post a comment on the original pull request to discuss with the team.

0 commit comments

Comments
 (0)