Skip to content

Commit 3eb17e1

Browse files
authored
Merge branch 'main' into patch-2
2 parents ac2d645 + c75cc23 commit 3eb17e1

File tree

55 files changed

+257
-419
lines changed

Some content is hidden

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

55 files changed

+257
-419
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ Default localhost port configuration:
8686
```env
8787
GATSBY_WEBSITE_URL=http://localhost:8100
8888
GATSBY_DOCS_URL=http://localhost:8200
89-
GATSBY_MARKETPLACE_URL=http://localhost:8300
90-
GATSBY_CAREERS_URL=https://careers.substrate.io
9189
```
9290

9391
**Start development server**

config/menus.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { MARKETPLACE_URL, WEBSITE_URL, CAREERS_URL } = require('./webConsts.js');
1+
const { WEBSITE_URL } = require('./webConsts.js');
22

33
/* the main menu, ids of items must match
44
the submenu's key of this js object */
@@ -58,14 +58,6 @@ const developers = [
5858
url: 'https://paritytech.github.io/substrate/master/sc_service/',
5959
id: 'developers.rustdocs',
6060
},
61-
{
62-
url: MARKETPLACE_URL,
63-
id: 'developers.marketplace',
64-
},
65-
{
66-
url: WEBSITE_URL + '/developers/playground/',
67-
id: 'developers.playground',
68-
},
6961
{
7062
url: WEBSITE_URL + '/developers/smart-contracts/',
7163
id: 'developers.smart-contracts',
@@ -132,10 +124,6 @@ const opportunities = [
132124
url: WEBSITE_URL + '/ecosystem/opportunities/grants',
133125
id: 'ecosystem.opportunities.grants',
134126
},
135-
{
136-
url: CAREERS_URL,
137-
id: 'ecosystem.opportunities.careers',
138-
},
139127
];
140128

141129
const resources = [

config/siteMetadata.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const menus = require('./menus.js');
2-
const { WEBSITE_URL, DOCS_URL, MARKETPLACE_URL, CAREERS_URL } = require('./webConsts.js');
2+
const { WEBSITE_URL, DOCS_URL } = require('./webConsts.js');
33

44
module.exports = {
55
menus,
@@ -10,8 +10,6 @@ module.exports = {
1010
siteUrl: DOCS_URL,
1111
websiteUrl: WEBSITE_URL,
1212
docsUrl: DOCS_URL,
13-
marketplaceUrl: MARKETPLACE_URL,
14-
careersUrl: CAREERS_URL,
1513
author: 'Parity WebDev/W3F WebOps',
1614
pressEmail: '[email protected]',
1715

config/webConsts.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
const WEBSITE_URL = process.env.GATSBY_WEBSITE_URL;
22
const DOCS_URL = process.env.GATSBY_DOCS_URL;
3-
const MARKETPLACE_URL = process.env.GATSBY_MARKETPLACE_URL;
4-
const CAREERS_URL = process.env.GATSBY_CAREERS_URL;
53

64
module.exports = {
75
WEBSITE_URL,
86
DOCS_URL,
9-
MARKETPLACE_URL,
10-
CAREERS_URL,
117
};

content/locales/en/menus.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
"developers.home": "Home",
1515
"developers.docs": "Docs",
1616
"developers.rustdocs": "Rust Docs",
17-
"developers.marketplace": "Marketplace",
18-
"developers.playground": "Playground",
1917
"developers.smart-contracts": "Smart Contracts",
2018
"developers.substrate-connect": "Substrate Connect",
2119
"developers.rococo-network": "Rococo Network",
@@ -32,7 +30,6 @@
3230

3331
"ecosystem.opportunities.hackathons": "Hackathons",
3432
"ecosystem.opportunities.grants": "Grants",
35-
"ecosystem.opportunities.careers": "Careers",
3633

3734
"ecosystem.resources.seminar": "Substrate Seminar",
3835
"ecosystem.resources.past-seminars": "Past Seminars",

content/md/en/docs/build/build-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,6 @@ This option is primarily used for faster compile time when you don't need to upd
138138

139139
## Where to go next
140140

141-
- [Wasm-builder README](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/utils/wasm-builder/README.md)
141+
- [Wasm-builder source](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/utils/wasm-builder/src/lib.rs)
142142
- [Rust compilation options](https://doc.rust-lang.org/cargo/commands/cargo-build.html#compilation-options)
143143
- [Discussion: Removing the native runtime](https://github.com/paritytech/substrate/issues/10579)

content/md/en/docs/build/genesis-configuration.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ description:
44
keywords:
55
---
66

7+
<div class="warning">
8+
<strong>⚠️ WARNING:</strong> This page contains outdated information. Please refer to the <a href="https://paritytech.github.io/polkadot-sdk/master/frame_support/pallet_macros/attr.genesis_build.html">Rust docs</a> for the most up-to-date documentation on this topic.
9+
</div>
10+
11+
712
The first block produced by any blockchain is referred to as the genesis block.
813
The hash associated with this block is the top-level parent of all blocks produced after that first block.
914

content/md/en/docs/build/origins.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ keywords:
55
- origins
66
---
77

8+
<div class="warning">
9+
<strong>⚠️ WARNING:</strong> This page contains outdated information. Please refer to the <a href="https://paritytech.github.io/polkadot-sdk/master/polkadot_sdk_docs/reference_docs/frame_origin/index.html">Rust docs</a> for the most up-to-date documentation on this topic.
10+
</div>
11+
812
The runtime origin is used by dispatchable functions to check where a call has come from.
913

1014
## Raw origins

content/md/en/docs/build/pallet-coupling.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ keywords:
66
- pallet design
77
---
88

9+
<div class="warning">
10+
<p>
11+
<strong>⚠️ WARNING:</strong> This page contains potentially outdated information. Reading it might still be useful, yet we suggest taking it with a grain of salt.
12+
</p>
13+
<p>
14+
Please refer to the <a href="https://paritytech.github.io/polkadot-sdk/master/polkadot_sdk_docs/reference_docs/frame_pallet_coupling/index.html">`polkadot-sdk-docs` crate</a> for the most up-to-date documentation on this topic.
15+
</p>
16+
</div>
17+
918
The term **coupling** is often used to describe the degree to which two software modules depend on each other.
1019
For example, in object-oriented programming tight coupling and loose coupling are used to describe the relationship between objects classes:
1120

content/md/en/docs/build/randomness.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Substrate includes two examples of how to implement the `Randomness` trait in pa
4141
You should only use this pallet in applications with low security requirements or when testing randomness-consuming applications.
4242
You shouldn't use this pallet in a production environment.
4343

44-
= The [BABE pallet](https://paritytech.github.io/substrate/master/pallet_babe/index.html) provides randomness by using verifiable random functions.
44+
- The [BABE pallet](https://paritytech.github.io/substrate/master/pallet_babe/index.html) provides randomness by using verifiable random functions.
4545

4646
This pallet provides production-grade randomness, and is used in Polkadot.
4747
If you select this pallet as the source of randomness your blockchain must use the blind assignment of blockchain extension ([BABE](/reference/glossary/#blind-assignment-of-blockchain-extension-babe)) slot-based consensus for producing blocks.

0 commit comments

Comments
 (0)