Skip to content

Commit 12fe3cb

Browse files
LsnshLsnsh
committed
Merge branch 'master' of github.com:rust-lang/www.rust-lang.org into locale/zh-cn-security-reporting-description-translation
2 parents 2455fa2 + 99046e6 commit 12fe3cb

Some content is hidden

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

41 files changed

+133
-270
lines changed

‎CONTRIBUTING.md

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,108 @@ 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
3030
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.
32+
33+
## Manual testing checklist
34+
35+
Sometimes changes are made which could potentially affect any page, e.g. updating the templating library.
36+
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.
38+
Note that like all documentation, this list may become outdated over time.
39+
So stay vigilant and update it if you notice something missing.
40+
41+
<!-- index -->
42+
- https://www-staging.rust-lang.org/
43+
<!-- 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
50+
<!-- governance -->
51+
- https://www-staging.rust-lang.org/governance
52+
<!-- team -->
53+
- https://www-staging.rust-lang.org/governance/teams/leadership-council
54+
- https://www-staging.rust-lang.org/governance/wgs/wg-async
55+
<!-- get_production -->
56+
- https://www-staging.rust-lang.org/production/users
57+
<!-- subject -->
58+
- https://www-staging.rust-lang.org/learn/get-started
59+
- https://www-staging.rust-lang.org/policies/code-of-conduct
60+
- https://www-staging.rust-lang.org/policies/licenses
61+
- https://www-staging.rust-lang.org/policies/security
62+
- https://www-staging.rust-lang.org/tools/install
63+
- https://www-staging.rust-lang.org/what/cli
64+
- https://www-staging.rust-lang.org/what/embedded
65+
- https://www-staging.rust-lang.org/what/networking
66+
- https://www-staging.rust-lang.org/what/wasm
67+
<!-- files -->
68+
- https://www-staging.rust-lang.org/static/images/rust-logo-blk.png
69+
<!-- robots_txt -->
70+
- https://www-staging.rust-lang.org/robots.txt
71+
<!-- logos -->
72+
- https://www-staging.rust-lang.org/static/logos/cargo.png
73+
<!-- index_locale -->
74+
- https://www-staging.rust-lang.org/es
75+
<!-- category_locale -->
76+
- https://www-staging.rust-lang.org/es/community
77+
- https://www-staging.rust-lang.org/es/learn
78+
- https://www-staging.rust-lang.org/es/policies
79+
- https://www-staging.rust-lang.org/es/production
80+
- https://www-staging.rust-lang.org/es/tools
81+
- https://www-staging.rust-lang.org/es/what
82+
<!-- governance_locale -->
83+
- https://www-staging.rust-lang.org/es/governance
84+
<!-- team_locale -->
85+
- https://www-staging.rust-lang.org/es/governance/teams/leadership-council
86+
- https://www-staging.rust-lang.org/es/governance/wgs/wg-async
87+
<!-- production_locale -->
88+
- https://www-staging.rust-lang.org/es/production/users
89+
<!-- subject_locale -->
90+
- https://www-staging.rust-lang.org/es/learn/get-started
91+
- https://www-staging.rust-lang.org/es/policies/code-of-conduct
92+
- https://www-staging.rust-lang.org/es/policies/licenses
93+
- https://www-staging.rust-lang.org/es/policies/security
94+
- https://www-staging.rust-lang.org/es/tools/install
95+
- https://www-staging.rust-lang.org/es/what/cli
96+
- https://www-staging.rust-lang.org/es/what/embedded
97+
- https://www-staging.rust-lang.org/es/what/networking
98+
- https://www-staging.rust-lang.org/es/what/wasm
99+
<!-- redirect_bare_en_us -->
100+
- https://www-staging.rust-lang.org/en-US
101+
<!-- not_found catcher, see redirect::maybe_redirect -->
102+
<!-- static file redirects -->
103+
- https://www-staging.rust-lang.org/pdfs/Rust-npm-Whitepaper.pdf
104+
- https://www-staging.rust-lang.org/pdfs/Rust-Tilde-Whitepaper.pdf
105+
<!-- external redirects -->
106+
- https://www-staging.rust-lang.org/other-installers.html
107+
- https://www-staging.rust-lang.org/policies/privacy
108+
- https://www-staging.rust-lang.org/policies/media-guide
109+
- https://www-staging.rust-lang.org/sponsors
110+
<!-- page redirects -->
111+
- https://www-staging.rust-lang.org/community.html
112+
- https://www-staging.rust-lang.org/conduct.html
113+
- https://www-staging.rust-lang.org/contribute-bugs.html
114+
- https://www-staging.rust-lang.org/contribute-community.html
115+
- https://www-staging.rust-lang.org/contribute-compiler.html
116+
- https://www-staging.rust-lang.org/contribute-docs.html
117+
- https://www-staging.rust-lang.org/contribute-libs.html
118+
- https://www-staging.rust-lang.org/contribute-tools.html
119+
- https://www-staging.rust-lang.org/contribute.html
120+
- https://www-staging.rust-lang.org/documentation.html
121+
- https://www-staging.rust-lang.org/downloads.html
122+
- https://www-staging.rust-lang.org/friends.html
123+
- https://www-staging.rust-lang.org/index.html
124+
- https://www-staging.rust-lang.org/install.html
125+
- https://www-staging.rust-lang.org/legal.html
126+
- https://www-staging.rust-lang.org/security.html
127+
- https://www-staging.rust-lang.org/team.html
128+
- https://www-staging.rust-lang.org/user-groups.html
129+
- https://www-staging.rust-lang.org/governance/teams/release
130+
- https://www-staging.rust-lang.org/governance/teams/crates-io
131+
- https://www-staging.rust-lang.org/governance/teams
132+
- https://www-staging.rust-lang.org/governance/wgs
133+
<!-- a couple localized redirects -->
134+
- https://www-staging.rust-lang.org/es-ES
135+
- https://www-staging.rust-lang.org/es-ES/contribute-compiler.html
136+
- https://www-staging.rust-lang.org/es-ES/governance/teams

‎Cargo.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎locales/core.ftl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,3 @@
2424
<a href="mailto:[email protected]">[email protected]</a>
2525
-distros-openwall-email-anchor =
2626
<a href="https://oss-security.openwall.org/wiki/mailing-lists/distros" lang="en-US">distros@openwall</a>
27-
28-
## Security initiative links
29-
-foundation-security-initiative-href =
30-
https://foundation.rust-lang.org/tags/security%20initiative/
31-
-contact-at-rustfoundation-org-anchor = { EMAIL("[email protected]") }

‎locales/de/community.ftl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,8 @@ community-events-header = Veranstaltungen
1111
community-meetup-header = Finde ein Treffen order eine Konferenz in deiner Nähe
1212
community-meetup = Es gibt mehr als 90 Treffen und einige Konferenzen in über 35 Ländern. Rust User Groups sind regelmäßige Treffen und ein guter Weg, andere Rust-Interessierte kennen zu lernen. Typischerweise sind diese Treffen informell und für alle offen.
1313
community-calendar = Kalender ansehen
14-
community-conference-lineup = Zum Programm für 2020
1514
community-event-run-header = Stelle dein eigenes Event auf die Beine
16-
community-event-register = Trage dein Event ein
1715
community-rustfest-alt = Rustfest Teilnehmer
18-
community-rustbridge-header = RustBridge
19-
community-rustbridge-paris-alt = RustBridge Paris
20-
community-rustbridge-berlin-alt = RustBridge Berlin
2116
community-irr-header = Rusts Reichweite vergrößern
2217
community-irr-button = Besuche die Webseite
2318
community-standards-header = Community-Richtlinien

‎locales/en-US/community.ftl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ community-events-header = Events
3636
community-meetup-header = Find a local meetup or conference
3737
community-meetup = There are more than 90 Meetups and several conferences worldwide in over 35 countries. Rustaceans meet periodically in Rust User Groups. They are a great introduction to the community and a great way to learn and socialize with other people with a similar interest. Meetings are usually informal and open to everyone.
3838
community-calendar = View Calendar
39-
community-conference-lineup = Check out the 2020 Conference Lineup
4039
4140
community-event-run-header = Run your own event
4241
community-event-run =
@@ -49,20 +48,8 @@ community-event-run =
4948
Registering your event helps us to keep track of our community efforts and
5049
allows us to connect you to speakers or other members in your area.
5150
</p>
52-
community-events-repo = Check out the events team repo
53-
community-event-register = Register your event
5451
community-rustfest-alt = Rustfest participants
5552
56-
community-rustbridge-header = Rustbridge
57-
community-rustbridge = RustBridge is a workshop focused on getting underrepresented people with a background in another programming language to learn Rust and join the community.
58-
community-rustbridge-button = Check out the Rustbridge repo
59-
60-
community-rustbridge-rustconf-alt = RustBridge at RustConf
61-
community-rustbridge-paris-alt = RustBridge Paris
62-
community-rustbridge-berlin-alt = RustBridge Berlin
63-
community-rustbridge-rbr-alt = RustBridge at Rust Belt Rust
64-
65-
6653
community-irr-header = Increasing Rust’s Reach
6754
community-irr = Increasing Rust’s Reach is a program that matches Rust team members from all parts of the project with individuals who are underrepresented in Rust’s community and the tech industry for a partnership of three (3) months, from mid-May to mid-August. Each partnership agrees to a commitment of 3–5 hours per week working on a Rust Project.
6855
community-irr-button = Visit Website

‎locales/en-US/security.ftl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,4 @@ security-receiving-description =
3939
<p>The best way to receive all the security announcements is to subscribe to the <a href="{ -rust-security-announcements-mailing-list-href }">Rust security announcements mailing list</a> (alternatively by sending an email to { -rustlang-security-announcements-subscribe-anchor }). The mailing list is very low traffic, and it receives the public notifications the moment the embargo is lifted.</p>
4040
<p>We will announce vulnerabilities 72 hours before the embargo is lifted to { -distros-openwall-email-anchor }, so that Linux distributions can update their packages.</p>
4141
42-
security-crates-heading = Ecosystem security help for crate authors
43-
security-crates-description =
44-
<p>Security is a value important to the Rust ecosystem as a whole, not just to the Rust language. If you are a crate author and you have received a high impact/severity security bug report for your crate, the Rust Foundation and the Rust Project are available to help manage the situation. The Rust Project or the Rust Foundation may also be the ones reaching out to you, if they have been informed of a security issue.</p>
45-
<p>As part of its <a href="{ -foundation-security-initiative-href }">Security Initiative</a>, the Rust Foundation:</p>
46-
<ul>
47-
<li>Employs security engineers who can help assessing the problem, developing mitigations, and estimating impact.</li>
48-
<li>Has a network of member organizations that can help with testing resources and also employ security experts who can help with assessing and fixing issues.</li>
49-
<li>Employs communications staff who can manage publishing notifications and fielding inquiries.</li>
50-
<li>Has contacts with government agencies tasked with cybersecurity protections who may have information on exploitation or impact of a security problem.</li>
51-
</ul>
52-
<p>The Rust Project can coordinate actions among other parts of the ecosystem that may need to be updated to address a fix.</p>
53-
<p>Please reach out to { -contact-at-rustfoundation-org-anchor } if either the Rust Project or the Rust Foundation can help you by providing security support in the areas listed above or in another way! These are just a few examples of the kind of help available to crate authors facing security challenges.</p>
54-
5542
security-pgp-key-heading = Plaintext PGP key

‎locales/en-US/teams.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ governance-team-community-events-description = Supporting and organizing communi
2020
governance-team-community-localization-name = Localization team
2121
governance-team-community-localization-description = Working on localization of compiler, documentation and websites
2222
23-
governance-team-community-rustbridge-name = RustBridge team
24-
governance-team-community-rustbridge-description = Helping to bring underrepresented groups into Rust
25-
2623
governance-team-community-survey-name = Survey team
2724
governance-team-community-survey-description = Running, analysing, and presenting the community survey
2825

‎locales/es/community.ftl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ community-events-header = Eventos
3535
community-meetup-header = Encuentra un meetup o una conferencia local
3636
community-meetup = Hay más de 90 Meetups y numerosas conferencias repartidas en más de 35 países. Los Rustáceos se reúnen periódicamente en los Grupos de Usuarios de Rust. Esos grupos son un modo perfecto de introducirte en la comunidad y una gran forma de socializar con otras personas con intereses similares. Las reuniones son generalmente informales y abiertas a todo el mundo.
3737
community-calendar = Ver el calendario
38-
community-conference-lineup = Consultar el programa de conferencias de 2020
3938
community-event-run-header = Organizar tu propio evento
4039
community-event-run =
4140
<p>
@@ -46,16 +45,7 @@ community-event-run =
4645
Registrar tu evento nos ayuda a identificar los esfuerzos de nuestra comunidad y
4746
nos permite ponerte en contacto con expertos u otros miembros en tu zona.
4847
</p>
49-
community-events-repo = Consultar el repositorio del equipo de Eventos
50-
community-event-register = Registra tu evento
5148
community-rustfest-alt = Participantes de Rustfest
52-
community-rustbridge-header = Rustbridge
53-
community-rustbridge = RustBridge es un taller que pone el foco en atraer a grupos de gente poco representados con experiencia en otros lenguajes de programación para que aprendan Rust y se unan a su comunidad.
54-
community-rustbridge-button = Consulta el repositorio de RustBridge
55-
community-rustbridge-rustconf-alt = RustBridge en la Rustconf
56-
community-rustbridge-paris-alt = RustBridge París
57-
community-rustbridge-berlin-alt = RustBridge Berlín
58-
community-rustbridge-rbr-alt = RustBridge en Rust Belt Rust
5949
community-irr-header = Increasing Rust's Reach
6050
community-irr = Increasing Rust's Reach (Aumentando el alcance de Rust) es un programa que une a miembros de todas las áreas del equipo de Rust con individuos que están poco representados en la comunidad Rust y la industria tecnológica, para una colaboración de tres (3) meses, desde mediados de Mayo hasta mediados de Agosto. Cada miembro asociado se compromete a trabajar en un proyecto de Rust de 3 a 5 horas por semana.
6151
community-irr-button = Visita la web

‎locales/es/teams.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ governance-team-wg-gamedev-name = Grupo de trabajo de desarrollo de juegos
3737
governance-team-wg-gamedev-description = Concentrados en hacer de Rust la elección por defecto para desarrollo de videojuegos
3838
governance-team-wg-llvm-name = LLVM
3939
governance-team-wg-llvm-description = Colaborar con el desarrollo de LLVM para representar a Rust
40-
governance-team-community-rustbridge-name = Equipo de RustBridge
41-
governance-team-community-rustbridge-description = Una iniciativa educacional inclusiva con el objetivo de atraer a minorías infrarrepresentadas a Rust.
4240
governance-team-wg-grammar-name = Gramática
4341
governance-team-wg-grammar-description = Especificar la gramática formal y oficial de Rust y validar las implementaciones ya existentes.
4442
governance-team-lang-name = Equipo del lenguaje
@@ -104,7 +102,6 @@ governance-team-wg-mir-opt-description = Crear optimizaciones en la MIR y refact
104102
governance-team-rust-by-example-name = Equipo de <em>Rust by Example</em>
105103
governance-team-rust-by-example-description = mantenimiento y actualización de <em>Rust by Example</em>
106104
governance-team-community-name = Equipo de comunidad
107-
governance-team-community-description = Coordinación y soporte a eventos, creación de contenido, dirigir el programa RustBridge y llevar a cabo la encuesta.
108105
governance-team-wg-rustup-name = Grupo de trabajo de rustup
109106
governance-team-wg-rustup-description = Diseño e implementación de Rustup
110107
governance-team-wg-rustfmt-name = Grupo de trabajo de rustfmt

‎locales/fa/community.ftl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ community-teams-learn = در مورد تیم ها بیشتر بدانید
1313
community-events-header = رویداد‌ها
1414
community-calendar = مشاهده تقویم
1515
community-event-run-header = رویداد خود را برگزار کنید
16-
community-event-register = رویداد خود را ثبت کنید
1716
community-rustfest-alt = شرکت کنندگان Rustfest
18-
community-rustbridge-rustconf-alt = RustBridge در RustConf
19-
community-rustbridge-paris-alt = RustBridge پاریس
20-
community-rustbridge-berlin-alt = RustBridge برلین
2117
community-irr-button = از وب سایت بازدید کنید
2218
community-standards-header = استانداردهای جامعه

‎locales/fr/community.ftl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ community-events-header = Événements
2222
community-meetup-header = Trouver une rencontre locale ou une conférence
2323
community-meetup = Il y a plus de 90 rencontres et plusieurs conférences de part le monde sur plus de 35 pays. Les Rustacés se rencontrent périodiquement dans les groupes d’utilisateurs Rust. Ce sont d'excellents moyens d'entrer dans la communauté et un excellent moyen d'apprendre et de socialiser avec des gens avec un intérêt commun. Les rencontres sont généralement informelles et ouvertes à tous.
2424
community-calendar = Voir le calendrier
25-
community-conference-lineup = Consulter le programme des conférences 2020
2625
community-event-run-header = Organisez votre propre évènement
2726
community-event-run =
2827
<p>
@@ -32,16 +31,7 @@ community-event-run =
3231
<p>
3332
Enregistrer votre évènement nous aide à garder la trace des efforts de notre communauté et nous permet de vous mettre en contact avec des présentateurs et d'autres membres autour de vous.
3433
</p>
35-
community-events-repo = Consulter le dépôt de l’équipe événement
36-
community-event-register = Enregistrez votre événement
3734
community-rustfest-alt = Participants à la Rustfest
38-
community-rustbridge-header = Rustbridge
39-
community-rustbridge = RustBridge est un atelier de travail visant à permettre aux personnes sous-représentées, avec une expérience dans d'autres langages de programmation, d'apprendre le Rust et de rejoindre la communauté.
40-
community-rustbridge-button = Consulter le dépôt de Rustbridge
41-
community-rustbridge-rustconf-alt = RustBridge à la RustConf
42-
community-rustbridge-paris-alt = RustBridge Paris
43-
community-rustbridge-berlin-alt = RustBridge Berlin
44-
community-rustbridge-rbr-alt = RustBridge à la Rust Belt
4535
community-irr-header = Faire Connaître Rust
4636
community-irr = Increasing Rust’s Reach (Étendre la portée de Rust) est un programme qui associe les membres des équipes Rust de toutes les parties du projet avec des individus qui sont sous-représentés dans la communauté Rust et l'industrie des technologies pour un partenariat de trois (3) mois, de mi-Mai à mi-Août. Chaque partenariat s'engage pour 3 à 5 heures par semaine sur un projet Rust.
4737
community-irr-button = Visiter le site Web

0 commit comments

Comments
 (0)