Merge branch 'master' into patch-1

docs/build/build-parachains.md

@@ -66,7 +66,7 @@ validators to participate in your network security are reduced.
 decentralised application projects wishing to benefit from this security would want to become a
 parachain to share in that pooled security.
 
-#### [On-Chain Governance](../learn/learn-governance.md) (Thought-through Governance)
+#### [On-Chain Governance](../learn/learn-polkadot-opengov.md) (Thought-through Governance)
 
 Most governance systems in blockchains use an off-chain governance mechanism.
 {{ polkadot: Polkadot :polkadot }}{{ kusama: Kusama :kusama }}'s on-chain governance encourages

docs/build/build-protocol-info.md

@@ -33,7 +33,7 @@ decided to redenominate the DOT token. The redenomination does not change the nu
 
 The redenomination took effect 72 hours after transfers were enabled, at block 1_248_326, which
 occurred at approximately 16:50 UTC on 21 Aug 2020. You can find more information about the
-redenomination [here](../learn/learn-redenomination.md).
+redenomination [here](../learn/archive/learn-redenomination.md).
 
 ## Addresses
 

docs/general/faq.md

@@ -189,7 +189,7 @@ to consider precisely how benchmarking was performed for Polkadot.
 The DOT (old) unit on Polkadot was at twelve decimal places, otherwise known as 1e12 Plancks. On 21
 August, 2020, Denomination Day, the DOT (old) value was redenominated to 1e10 (10_000_000_000, or
 ten billion) Plancks, meaning that the new DOT was valued at ten decimal places. Following the
-[redenomination](../learn/learn-redenomination.md), the new DOT is called DOT.
+[redenomination](../learn/archive/learn-redenomination.md), the new DOT is called DOT.
 
 ### What is the inflation rate of the DOT?
 
@@ -247,7 +247,7 @@ determined minority to overrule the vote of an apathetic majority in certain sit
 mechanism is known as Adaptive Quorum Biasing. This makes proposals have a varying threshold for
 approval or rejection based on what part of the governance protocol the proposal originated in. For
 details on the subtleties of Polkadot's governance system, please see the
-[governance page](../learn/learn-governance.md).
+[governance page](../learn/learn-polkadot-opengov.md).
 
 ## Parachains
 

docs/general/getting-started.md

@@ -29,23 +29,23 @@ The Wiki has three main sections:
 <div className="row">
   <div className="col text--center">
     <a href="../docs/learn-accounts">
-      <img src="/img/polkadot-guide/Account.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Creating an account.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/learn-accounts">Accounts</a>
     </p>
   </div>
   <div className="col text--center">
     <a href="../docs/learn-transactions">
-      <img src="/img/polkadot-guide/Transfer.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Balance Transfers.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/learn-transactions">Transactions</a>
     </p>
   </div>
   <div className="col text--center">
     <a href="../docs/learn-staking">
-      <img src="/img/polkadot-guide/Stake.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Staking.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/learn-staking">Staking</a>
@@ -56,23 +56,23 @@ The Wiki has three main sections:
 <div className="row">
   <div className="col text--center">
     <a href="../docs/learn-polkadot-opengov">
-      <img src="/img/polkadot-guide/Council.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Polkadot OpenGov.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/learn-polkadot-opengov">Polkadot OpenGov</a>
     </p>
   </div>
   <div className="col text--center">
     <a href="../docs/learn-proxies">
-      <img src="/img/polkadot-guide/Proxy.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Proxy Accounts.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/learn-proxies">Proxy Accounts</a>
     </p>
   </div>
   <div className="col text--center">
     <a href="../docs/learn-identity">
-      <img src="/img/polkadot-guide/Identity.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Set an Identity.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/learn-identity">Account Identity</a>
@@ -83,23 +83,23 @@ The Wiki has three main sections:
 <div className="row">
   <div className="col text--center">
     <a href="../docs/learn-parachains">
-      <img src="/img/polkadot-guide/Parachain.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Parachains.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/learn-parachains">Parachains</a>
     </p>
   </div>
   <div className="col text--center">
     <a href="../docs/learn-bridges">
-      <img src="/img/polkadot-guide/Bridges.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Bridges.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/learn-bridges">Bridges</a>
     </p>
   </div>
   <div className="col text--center">
     <a href="../docs/ambassadors">
-      <img src="/img/polkadot-guide/Ambassadors.jpg" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
+      <img src="/img/polkadot-guide/Become an Ambassador.png" width="350" style={{ borderRadius: 10, border: '1px solid slategrey' }} />
     </a>
     <p>
       <a href="../docs/ambassadors">Become an Ambassador</a>
@@ -194,18 +194,18 @@ Explore Polkadot with a secure and user-friendly wallets listed on the
 - {{ polkadot: __<RPC network="polkadot" path="query.nominationPools.minCreateBond" defaultValue={5000000000000} filter="humanReadable"/>:__ :polkadot }}
   you can create your own [nomination pool](../learn/learn-nomination-pools.md).
 
-DOT has utility in [Polkadot's democracy](../maintain/maintain-guides-democracy.md). Bonding DOT is
-a requirement to create proposals, to endorse them and to vote on them when they become referendums.
+DOT has utility in [Polkadot's OpenGov](../learn/learn-polkadot-opengov.md). Bonding DOT is a
+requirement to create proposals, to endorse them and to vote on them when they become referendums.
 Bonding
 {{ polkadot: <RPC network="polkadot" path="consts.treasury.proposalBondMinimum" defaultValue={1000000000000} filter="humanReadable"/> :polkadot }}
 or 5% of requested funding is a requirement to make a
-[treasury proposal](../learn/learn-treasury.md#creating-a-treasury-proposal). DOT can also enable
-you to participate in programs like the
+[treasury proposal](../learn/learn-polkadot-opengov-treasury.md). DOT can also enable you to
+participate in programs like the
 [Thousand Validators Program](../general/thousand-validators.md#polkadot).
 
 ## Polkadot Gifts
 
-<img align="right" src="/img/polkadot-gift.png" width="210" height="200"/>
+<img align="right" src="/img/polkadot-guide/Gift.png" width="210" height="200"/>
 
 Polkadot Gifts provide an easy way to:
 

docs/general/grants.md

@@ -43,7 +43,7 @@ The Polkadot Treasury is a pot of on-chain funds collected through transaction f
 staking inefficiencies, etc. The funds held in the treasury can be spent on spending proposals. Both
 Polkadot and Kusama offer everyone the opportunity to apply for funding via the treasury. See:
 
-- [Treasury Wiki](../learn/learn-treasury.md)
+- [Treasury Wiki](../learn/learn-polkadot-opengov-treasury.md)
 - [Polkadot Treasury Guide](https://docs.google.com/document/d/1IZykdp2cyQavcRyZd_dgNj5DcgxgZR6kAqGdcNARu1w)
 - [Kusama Treasury Guide](https://docs.google.com/document/d/1p3UQUjph5t8TVaWnTkfrI5mE-BABnM9Xvtuhdlhl6JE)
 
@@ -53,8 +53,9 @@ Due to high demand and spamming issues, the Kusama faucet is no longer in operat
 Foundation has considered new ways to distribute KSM for people who need KSM to build.
 
 If you are interested in obtaining KSM for building or research, you can apply through the
-[Treasury](../learn/learn-treasury.md#creating-a-treasury-proposal) or receive a
-[tip](../learn/learn-treasury.md#tipping) for doing something cool in the community.
+[Treasury](../learn/learn-polkadot-opengov-treasury.md) or receive a
+[tip](../learn/learn-polkadot-opengov-treasury.md#treasury-tracks) for doing something cool in the
+community.
 
 :::
 

docs/general/kusama/kusama-claims.md

@@ -260,7 +260,7 @@ Polkadot-JS UI and click "Confirm Claim."
 
 At this point, you will see a success message if everything went right and your KSM will now be in
 the account that you claimed to. Congratulations you can now participate in aspects of the Kusama
-network such as [governance](../../learn/learn-governance.md) and
+network such as [governance](../../learn/learn-polkadot-opengov.md) and
 [staking](../../learn/learn-staking.md). During the soft launch period balance transfers will not be
 enabled.