Skip to content

Commit 484481f

Browse files
authored
Merge pull request #2193 from Kobzol/fix-docs
Remove Heroku/Rocket config and update docs
2 parents fc526b5 + a9d0eab commit 484481f

File tree

4 files changed

+86
-98
lines changed

4 files changed

+86
-98
lines changed

CONTRIBUTING.md

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -27,106 +27,106 @@ we figure out a better process for it.
2727

2828
Before filing a PR to the site, please file an issue. This way we can ensure
2929
that the work you are doing meets the requirements of the site and will be very
30-
likely merged. If you file a PR before an issue, you will likely be asked to
30+
likely merged. If you file a PR before an issue, you will likely be asked to
3131
file an issue, or your PR may be closed outright.
3232

3333
## Manual testing checklist
3434

3535
Sometimes changes are made which could potentially affect any page, e.g. updating the templating library.
3636
In that case it's necessary to manually check (almost) every page for obvious regressions before deploying the update.
37-
To facilitate that, here's a list of links to the staging deployment.
37+
To facilitate that, here's a list of links.
3838
Note that like all documentation, this list may become outdated over time.
3939
So stay vigilant and update it if you notice something missing.
4040

4141
<!-- index -->
42-
- https://www-staging.rust-lang.org/
42+
- https://www.rust-lang.org/
4343
<!-- category_en -->
44-
- https://www-staging.rust-lang.org/community
45-
- https://www-staging.rust-lang.org/learn
46-
- https://www-staging.rust-lang.org/policies
47-
- https://www-staging.rust-lang.org/production
48-
- https://www-staging.rust-lang.org/tools
49-
- https://www-staging.rust-lang.org/what
44+
- https://www.rust-lang.org/community
45+
- https://www.rust-lang.org/learn
46+
- https://www.rust-lang.org/policies
47+
- https://www.rust-lang.org/production
48+
- https://www.rust-lang.org/tools
49+
- https://www.rust-lang.org/what
5050
<!-- governance -->
51-
- https://www-staging.rust-lang.org/governance
51+
- https://www.rust-lang.org/governance
5252
<!-- team -->
53-
- https://www-staging.rust-lang.org/governance/teams/leadership-council
54-
- https://www-staging.rust-lang.org/governance/wgs/wg-async
53+
- https://www.rust-lang.org/governance/teams/leadership-council
54+
- https://www.rust-lang.org/governance/wgs/wg-async
5555
<!-- subject -->
56-
- https://www-staging.rust-lang.org/learn/get-started
57-
- https://www-staging.rust-lang.org/policies/code-of-conduct
58-
- https://www-staging.rust-lang.org/policies/licenses
59-
- https://www-staging.rust-lang.org/policies/security
60-
- https://www-staging.rust-lang.org/tools/install
61-
- https://www-staging.rust-lang.org/what/cli
62-
- https://www-staging.rust-lang.org/what/embedded
63-
- https://www-staging.rust-lang.org/what/networking
64-
- https://www-staging.rust-lang.org/what/wasm
56+
- https://www.rust-lang.org/learn/get-started
57+
- https://www.rust-lang.org/policies/code-of-conduct
58+
- https://www.rust-lang.org/policies/licenses
59+
- https://www.rust-lang.org/policies/security
60+
- https://www.rust-lang.org/tools/install
61+
- https://www.rust-lang.org/what/cli
62+
- https://www.rust-lang.org/what/embedded
63+
- https://www.rust-lang.org/what/networking
64+
- https://www.rust-lang.org/what/wasm
6565
<!-- files -->
66-
- https://www-staging.rust-lang.org/static/images/rust-logo-blk.png
66+
- https://www.rust-lang.org/static/images/rust-logo-blk.png
6767
<!-- robots_txt -->
68-
- https://www-staging.rust-lang.org/robots.txt
68+
- https://www.rust-lang.org/robots.txt
6969
<!-- logos -->
70-
- https://www-staging.rust-lang.org/static/logos/cargo.png
70+
- https://www.rust-lang.org/static/logos/cargo.png
7171
<!-- index_locale -->
72-
- https://www-staging.rust-lang.org/es
72+
- https://www.rust-lang.org/es
7373
<!-- category_locale -->
74-
- https://www-staging.rust-lang.org/es/community
75-
- https://www-staging.rust-lang.org/es/learn
76-
- https://www-staging.rust-lang.org/es/policies
77-
- https://www-staging.rust-lang.org/es/production
78-
- https://www-staging.rust-lang.org/es/tools
79-
- https://www-staging.rust-lang.org/es/what
74+
- https://www.rust-lang.org/es/community
75+
- https://www.rust-lang.org/es/learn
76+
- https://www.rust-lang.org/es/policies
77+
- https://www.rust-lang.org/es/production
78+
- https://www.rust-lang.org/es/tools
79+
- https://www.rust-lang.org/es/what
8080
<!-- governance_locale -->
81-
- https://www-staging.rust-lang.org/es/governance
81+
- https://www.rust-lang.org/es/governance
8282
<!-- team_locale -->
83-
- https://www-staging.rust-lang.org/es/governance/teams/leadership-council
84-
- https://www-staging.rust-lang.org/es/governance/wgs/wg-async
83+
- https://www.rust-lang.org/es/governance/teams/leadership-council
84+
- https://www.rust-lang.org/es/governance/wgs/wg-async
8585
<!-- subject_locale -->
86-
- https://www-staging.rust-lang.org/es/learn/get-started
87-
- https://www-staging.rust-lang.org/es/policies/code-of-conduct
88-
- https://www-staging.rust-lang.org/es/policies/licenses
89-
- https://www-staging.rust-lang.org/es/policies/security
90-
- https://www-staging.rust-lang.org/es/tools/install
91-
- https://www-staging.rust-lang.org/es/what/cli
92-
- https://www-staging.rust-lang.org/es/what/embedded
93-
- https://www-staging.rust-lang.org/es/what/networking
94-
- https://www-staging.rust-lang.org/es/what/wasm
86+
- https://www.rust-lang.org/es/learn/get-started
87+
- https://www.rust-lang.org/es/policies/code-of-conduct
88+
- https://www.rust-lang.org/es/policies/licenses
89+
- https://www.rust-lang.org/es/policies/security
90+
- https://www.rust-lang.org/es/tools/install
91+
- https://www.rust-lang.org/es/what/cli
92+
- https://www.rust-lang.org/es/what/embedded
93+
- https://www.rust-lang.org/es/what/networking
94+
- https://www.rust-lang.org/es/what/wasm
9595
<!-- redirect_bare_en_us -->
96-
- https://www-staging.rust-lang.org/en-US
96+
- https://www.rust-lang.org/en-US
9797
<!-- not_found catcher, see redirect::maybe_redirect -->
9898
<!-- static file redirects -->
99-
- https://www-staging.rust-lang.org/pdfs/Rust-npm-Whitepaper.pdf
100-
- https://www-staging.rust-lang.org/pdfs/Rust-Tilde-Whitepaper.pdf
99+
- https://www.rust-lang.org/pdfs/Rust-npm-Whitepaper.pdf
100+
- https://www.rust-lang.org/pdfs/Rust-Tilde-Whitepaper.pdf
101101
<!-- external redirects -->
102-
- https://www-staging.rust-lang.org/other-installers.html
103-
- https://www-staging.rust-lang.org/policies/privacy
104-
- https://www-staging.rust-lang.org/policies/media-guide
105-
- https://www-staging.rust-lang.org/sponsors
102+
- https://www.rust-lang.org/other-installers.html
103+
- https://www.rust-lang.org/policies/privacy
104+
- https://www.rust-lang.org/policies/media-guide
105+
- https://www.rust-lang.org/sponsors
106106
<!-- page redirects -->
107-
- https://www-staging.rust-lang.org/community.html
108-
- https://www-staging.rust-lang.org/conduct.html
109-
- https://www-staging.rust-lang.org/contribute-bugs.html
110-
- https://www-staging.rust-lang.org/contribute-community.html
111-
- https://www-staging.rust-lang.org/contribute-compiler.html
112-
- https://www-staging.rust-lang.org/contribute-docs.html
113-
- https://www-staging.rust-lang.org/contribute-libs.html
114-
- https://www-staging.rust-lang.org/contribute-tools.html
115-
- https://www-staging.rust-lang.org/contribute.html
116-
- https://www-staging.rust-lang.org/documentation.html
117-
- https://www-staging.rust-lang.org/downloads.html
118-
- https://www-staging.rust-lang.org/friends.html
119-
- https://www-staging.rust-lang.org/index.html
120-
- https://www-staging.rust-lang.org/install.html
121-
- https://www-staging.rust-lang.org/legal.html
122-
- https://www-staging.rust-lang.org/security.html
123-
- https://www-staging.rust-lang.org/team.html
124-
- https://www-staging.rust-lang.org/user-groups.html
125-
- https://www-staging.rust-lang.org/governance/teams/release
126-
- https://www-staging.rust-lang.org/governance/teams/crates-io
127-
- https://www-staging.rust-lang.org/governance/teams
128-
- https://www-staging.rust-lang.org/governance/wgs
107+
- https://www.rust-lang.org/community.html
108+
- https://www.rust-lang.org/conduct.html
109+
- https://www.rust-lang.org/contribute-bugs.html
110+
- https://www.rust-lang.org/contribute-community.html
111+
- https://www.rust-lang.org/contribute-compiler.html
112+
- https://www.rust-lang.org/contribute-docs.html
113+
- https://www.rust-lang.org/contribute-libs.html
114+
- https://www.rust-lang.org/contribute-tools.html
115+
- https://www.rust-lang.org/contribute.html
116+
- https://www.rust-lang.org/documentation.html
117+
- https://www.rust-lang.org/downloads.html
118+
- https://www.rust-lang.org/friends.html
119+
- https://www.rust-lang.org/index.html
120+
- https://www.rust-lang.org/install.html
121+
- https://www.rust-lang.org/legal.html
122+
- https://www.rust-lang.org/security.html
123+
- https://www.rust-lang.org/team.html
124+
- https://www.rust-lang.org/user-groups.html
125+
- https://www.rust-lang.org/governance/teams/release
126+
- https://www.rust-lang.org/governance/teams/crates-io
127+
- https://www.rust-lang.org/governance/teams
128+
- https://www.rust-lang.org/governance/wgs
129129
<!-- a couple localized redirects -->
130-
- https://www-staging.rust-lang.org/es-ES
131-
- https://www-staging.rust-lang.org/es-ES/contribute-compiler.html
132-
- https://www-staging.rust-lang.org/es-ES/governance/teams
130+
- https://www.rust-lang.org/es-ES
131+
- https://www.rust-lang.org/es-ES/contribute-compiler.html
132+
- https://www.rust-lang.org/es-ES/governance/teams

Procfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,27 @@
33
44
![CI](https://github.com/rust-lang/www.rust-lang.org/workflows/CI/badge.svg)
55

6-
* [**View Staging (master)**](http://www-staging.rust-lang.org)
7-
86
> [!NOTE]
97
> There are currently no reviewers for the translations available.
108
> If you have a suggestion to improve the translations, you may still open an issue for future reference.
119
> However, it likely won't be acted upon for the time being.
1210
1311
## Development
1412

15-
### Running the app locally
13+
### Building the web locally
1614

17-
1. Install `cargo watch` by running `cargo install cargo-watch` in your terminal.
15+
Execute `cargo run`. The web will be compiled into the `build` directory, from which you can serve it using a web server of your choice. For example, with Python it could be:
1816

19-
2. To build the app and run the server, run `cargo watch -x run` in your terminal.
17+
```console
18+
$ cargo run
19+
$ python3 -m http.server -d build
20+
```
2021

21-
3. Navigate to http://localhost:7878 in your browser. If you make any updates to
22-
the styles, or any other project files, `cargo watch` will automatically
23-
restart the server for you, all you have to do is refresh your browser to see
24-
your changes.
22+
You can use `cargo watch -x run` to automatically rebuild the web once you make changes to it.
2523

2624
### Where to edit
2725

28-
- If you would like to edit styles, you should edit [`src/styles/app.scss`](src/styles/app.scss).
29-
- If you would like to update group data, you should edit the `yml` files in [`src/data/`](src/data/).
26+
- If you would like to edit styles, you should edit [`src/styles/app.scss`](src/styles/app.scss).
3027
- If you would like to edit page content, you should edit the `hbs` files in [`templates`](templates).
3128

3229
### Contributing
@@ -35,7 +32,6 @@ Please read our [`CONTRIBUTING.md`](CONTRIBUTING.md) before submitting a PR!
3532

3633
### Deployment
3734

38-
www.rust-lang.org is currently hosted on Heroku. The `master` branch is
39-
automatically deployed to [www-staging.rust-lang.org](https://www-staging.rust-lang.org)
40-
and the `deploy` branch is a snapshot of `master` that is manually updated and
41-
automatically deployed to www.rust-lang.org .
35+
www.rust-lang.org is currently hosted on GitHub Pages. The `master` branch is
36+
automatically deployed to [www.rust-lang.org](https://www.rust-lang.org) after
37+
each push.

Rocket.toml

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

0 commit comments

Comments
 (0)