Remove old units

common/community/funding/community-treasury.md

@@ -7,7 +7,7 @@ description: A Decentralized Community governed Fund to support projects in the
 
 ![Community Treasury](https://github.com/iota-community/Community-Governance/raw/main/assets/iota_community_treasury.png)
 
-The IOTA community treasury will be set up as soon as the IOTA network gets upgraded with the Stardust ledger, and smart contracts can be executed on the Mainnet. The IOTA Community will be able to use a budget of 50 TI to support the ecosystem via grants. Until this is possible, the community is also deciding on setting up a [Community Treasury Grant Committee](https://govern.iota.org/t/sgp-0005-shimmer-community-treasury-grant-committee/1576) for the Shimmer network.
+The IOTA community treasury will be set up as soon as the IOTA network gets upgraded with the Stardust ledger, and smart contracts can be executed on the Mainnet. The IOTA Community will be able to use a budget of 50,000,000 IOTA to support the ecosystem via grants. Until this is possible, the community is also deciding on setting up a [Community Treasury Grant Committee](https://govern.iota.org/t/sgp-0005-shimmer-community-treasury-grant-committee/1576) for the Shimmer network.
 
 ## Initial Voting
 

docs/get-started/glossary.md

@@ -166,7 +166,7 @@ description: Glossary of all specialized names and phrases used in the IOTA and
 
 - **Tangle:** The Tangle is the underlying core data structure. In mathematical terms it is a directed acyclic graph (DAG). The Tangle is the distributed ledger that stores all transactions.
 - **Ternary system:** A trit (trinary digit) can have exactly three states (3 x 1 = 3): -1, 0 and 1. Three trits result in one tryte (33 = 27) and can thus represent 27 combinations. In IOTA, the letters A-Z (26 pieces) and the number 9 are used for this purpose.
-- **Token:** The digital currency form (cryptocurrency). It is a powerful tool for value transfer between people and machines. Total number: 2,779,530,283,277,761 IOTA. The base units are Pi, Ti, Gi, Mi, ki, i
+- **Token:** The digital currency form (cryptocurrency). It is a powerful tool for value transfer between people and machines. Total number: 2,779,530,283,277,761 IOTA. The base units are IOTA and micros.
 - **Trinity (IOTA 1.0):** Depreciated IOTA Wallet
 - **Tip:** A transaction that has not yet been approved.
 - **Tip Selection:** The process of selecting previous transactions to be referenced by a new transaction. In these references, a transaction ties into the existing data structure. IOTA and Shimmer only enforces that a transaction approves up to eight other transactions, the tip selection strategy is left to the user (with a good default provided by Shimmer).

docs/get-started/introduction/iota/staking.md

@@ -1,85 +1,46 @@
 ---
 title: Staking IOTA
-description: Learn about the various staking opportunities in the IOTA network ecosystem, including Shimmer and Assembly, and how to earn staking rewards.
-image: /img/logo/Chrysalis_logo_dark.png
+description: Everything you need to know about all the different upcoming staking opportunities in the IOTA, and Shimmer network.
 keywords:
   - staking IOTA
   - Shimmer network
-  - Assembly network
-  - ASMB token
   - staking rewards
 ---
 
-# Staking IOTA
+# Staking in the IOTA Network Ecosystem
+
+IOTA introduced a new network that will exist next to the main network: the Shimmer staging network. This marks a historical event and a vast increase of utility for the IOTA token.
+Shimmer will launch with its own native tokens: SMR. With the new tokenomics and incentive structure around this network, it is now possible to stake tokens.
 
 :::info
+
 Find the blog post introducing IOTA staking [here](https://blog.iota.org/introducing-iota-staking/).
 Find the announcement of the start of IOTA staking [here](https://blog.iota.org/iota-staking-start/).
-:::
-
-There are several ways to stake your tokens and earn staking rewards:
 
-- Shimmer and Assembly pre-launch staking: Stake IOTA tokens to receive the native tokens of Shimmer (SMR) and
-  Assembly (ASMB) networks.
-- Assembly post-launch staking: Continue staking IOTA tokens to receive ASMB tokens in the newly launched Assembly
-  network.
-- ASMB token staking: Stake ASMB tokens to secure the Assembly network and receive rewards.
-
-## IOTA Staking for SMR Rewards
-
-:::info SMR Rewards Ended
-The staking periods for SMR have ended, you can no longer stake IOTA to receive SMR.
 :::
 
-The Shimmer network, a staging network for IOTA's core technology innovations, can be bootstrapped solely from IOTA
-token stakers.
-
-- The rate for SMR distribution is set at `1 SMR per 1 MIOTA per milestone`.
-- Rewards are distributed to IOTA stakers based on their stake.
-- The Firefly wallet holds the record of rewards for IOTA token holders.
-
-![shimmer staking](/img/learn/iota-token/shimmer-staking.png)
-
-Read more about staking and calculate potential rewards [here](https://shimmer.network/claim).
-
-## IOTA Staking for ASMB Rewards
-
-During multiple 90-day staking rounds, IOTA token holders can stake their tokens in the Firefly wallet to receive ASMB
-tokens.
-
-- The rate for ASMB distribution is set at `0.000004 ASMB tokens per 1 MIOTA per milestone`.
-- For every 1 MIOTA staked, 0.000004 ASMB tokens will be rewarded every 10 seconds.
-- The Firefly wallet holds the record of rewards for IOTA token holders.
-
-![assembly staking](/img/learn/iota-token/assembly-staking.png)
+There are several ways to stake your tokens and earn staking rewards:
 
-Read more about staking and calculate potential rewards [here](https://assembly.sc/stake).
+- Shimmer pre-launch staking to create the initial token supply for SMR and distribute it to those who stake their IOTA tokens.
+- SMR token staking to help testing on the Shimmer network and to support the network.
 
-## Assembly Post-launch Staking
+## Shimmer Pre-launch Staking
 
-After the launch of the Assembly network, IOTA token holders can continue staking their tokens to receive ASMB tokens
-for 21 months.
+This staking period aims to reward IOTA token holders for their participation and distribute tokens of the two new networks to them. In the case of Shimmer, it also creates the total initial supply of the network.
 
-- A total of 20% of the Assembly supply is allocated to IOTA token stakers.
-- ASMB tokens will be distributed based on the number of tokens staked.
-- Daily fixed rate distributions will occur over the 21-month staking period.
+Starting from 28th December 2021, 3 p.m. CET, IOTA holders that possess IOTA tokens in the Firefly wallet and have chosen to participate in the staking period generated Shimmer tokens for 90 days.
 
-![assembly supply](/img/learn/iota-token/assembly-supply.png)
+The Shimmer staking period was limited to these initial 90 days.
 
-## ASMB Token Staking
+### IOTA Staking for SMR Rewards
 
-Assembly offers two mechanisms for rewarding ASMB token stakers:
+Shimmer, the staging network and battlefield for IOTA's core technology innovations, will be bootstrapped purely from IOTA token stakers. The initial token supply of the Shimmer network will only rely on the amount of IOTA tokens staked for Shimmer in the 90-day staking period, and 100% of the initial supply will be distributed to IOTA token holders.
 
-1. Inflationary token distribution: ASMB holders receive newly minted ASMB tokens.
+- The staking functionality in the Firefly Wallet will be used for Shimmer.
+- Shimmer tokens will be distributed at a fixed rate of `1 SMR per 1 MIOTA per milestone`.
 
-   - The yearly inflation rate for the Assembly supply is 8%.
-   - The specific mechanism for distribution is yet to be published.
+![shimmer staking](/img/learn/iota-token/shimmer-staking.png)
 
-2. Staking for security: ASMB token holders can stake their tokens with a validator to secure the Assembly smart
-   contract chains.
-   - Validators are required to deposit ASMB tokens as a security bond.
-   - Validators may use tokens deposited by ASMB holders.
-   - Delegated stake increases the security bond and allows validators to offer higher rewards to stakers.
+You can read how to stake and calculate the possible rewards [here](https://shimmer.network/claim).
 
-By participating in staking, IOTA token holders can earn rewards and contribute to the security and functionality of the
-IOTA network ecosystem.
+- With the launch of the Shimmer network, these generated Shimmer tokens will be distributed to the IOTA stakers. This distribution will be implemented as a functionality within the Firefly wallet. As long as the Shimmer network is not yet launched, Firefly will hold the record of rewards for the IOTA token holder.

docs/get-started/programs/touchpoint.md

@@ -1,68 +0,0 @@
----
-sidebar_label: Touchpoint
-description: 'Discover Touchpoint, an open builders program that empowers collaboration and provides tailored support,
-world-class expertise, and smart money for builders, investors, and experts. Join Touchpoint and grow alongside diverse
-projects in DeFi, gaming, NFTs, and other verticals.'
-image: /img/shimmer-wiki.png
-keywords:
-  - Touchpoint program
-  - open builders program
-  - tailored support
-  - world-class expertise
-  - smart money
----
-
-# Touchpoint: Empowering Collaboration in Web3
-
-[Touchpoint](https://assembly.sc/touchpoint) is an open builders program that leverages the power of the community to
-provide access to tailored support,
-world-class expertise, and smart money. It offers a collaborative environment for builders, investors, and experts to
-come together and grow alongside 35+ projects across DeFi, gaming, NFTs, and other verticals.
-
-## No Frills Support
-
-Touchpoint takes a modular and flexible approach by design. Instead of a set curriculum, the program encourages
-collaboration among participants and provides frequent and honest input. Whether collaborating with other program
-participants or seeking guidance from the Touchpoint team, builders can access the support they need without unnecessary
-formalities.
-
-## World-Class Expertise
-
-Collaboration with a growing community of subject matter experts is a key advantage of Touchpoint. From smart contract
-specialists to token economic experts, participants can tap into a wealth of knowledge and
-experience. This network of experts is committed to supporting DAOs and contributing to the success of projects within
-the Touchpoint ecosystem.
-
-## Leading Investors
-
-Touchpoint provides hands-on support with fundraising efforts. Participants gain access to leading investors dedicated
-to supporting ecosystem projects within the Assembly ecosystem. Whether you're looking for financial support
-or introductions to potential backers, Touchpoint can help you navigate the fundraising landscape.
-
-## Who is Touchpoint for?
-
-Touchpoint is designed to cater to builders, investors, and experts actively involved in the Assembly ecosystem.
-
-- **Builders**: Those seeking help with building on Assembly and looking for public or private funding, technical
-  support, or ecosystem strategies.
-- **Investors**: Individuals or organizations looking to actively invest in and support new projects or bring existing
-  projects from their network to build on Assembly.
-- **Experts**: Those willing to participate in the Assembly ecosystem by offering their products, services, or
-  experiences in a given domain.
-
-## How It Works
-
-1. **Application**: As a builder, investor, or
-   expert, [complete the application form](https://airtable.com/shrxW5Fs6NGDOkkBv) to introduce yourself, your
-   organization, and your potential contributions.
-2. **Screening**: A short call will follow your application to align on your objectives and ensure Touchpoint is a good
-   fit for your project.
-3. **Onboarding**: Touchpoint will help you get started, agreeing on concrete next steps based on your current
-   development stage and short-term goals. You'll be connected with the necessary talent, capital, and knowledge.
-4. **Get to Work**: Leverage the community, team, and resources for support in areas such as community building, product
-   design, feedback and beta testing, funding, public launches, and more.
-5. **Contribute to the Ecosystem's Success**: As a member, you're encouraged to contribute to the growth and success of
-   the ecosystem by sharing your learnings and knowledge, thereby enriching the collective Touchpoint knowledge base.
-
-Join Touchpoint today and benefit from tailored support, world-class expertise, and smart money to drive the success of
-your Web3 project.

docs/get-started/sidebars.ts

@@ -41,12 +41,8 @@ module.exports = {
     },
     {
       type: 'category',
-      label: 'Programs',
-      items: [
-        'programs/touchpoint',
-        'programs/EDF-grant-programme',
-        'programs/bug-bounties',
-      ],
+      label: 'Programmes',
+      items: ['programmes/EDF-grant-programme', 'programmes/bug-bounties'],
     },
     {
       type: 'category',

docs/learn/smart-contracts/validators.md

@@ -26,7 +26,7 @@ Depending on the governance model, chain owners can rotate the committee of vali
 By rotating the committee of validators, validators can be deleted, added, or replaced.
 
 ISC does not define how to select validators to form a committee: it could be a solitary choice of the chain's owner, or
-it could be a [public competition](https://wiki.assembly.sc/learn/introduction/) between candidates.
+it could be a public competition between candidates.
 ISC does not define how validators are rewarded either.
 
 ## Access Nodes

docs/maintain/goshimmer/0.9/docs/protocol_specification/components/advanced_outputs.md

@@ -199,18 +199,18 @@ aliases. This is what we call alias locking. An alias locked output specifies an
 from this output. The owner of the alias account can spend aforementioned alias locked outputs by unlocking/moving the
 alias in the very same transaction. We will use the term `ExtendedLockedOutput` for outputs that support alias locking.
 
-Let's illustrate this through a simple example. Alice wants to send 10 Mi to Bob's alias account. Bob then wants to
-spend the 10 Mi from his alias account to his address account.
+Let's illustrate this through a simple example. Alice wants to send 10 IOTA to Bob's alias account. Bob then wants to
+spend the 10 IOTA from his alias account to his address account.
 
 1. Bob creates an alias where `aliasID=BobAliasID` with Transaction A.
 
 [![Bob creates an alias](/img/protocol_specification/bob_alias.png 'Bob creates an alias')](/img/protocol_specification/bob_alias.png)
 
 2. Bob shares `BobAliasID` with Alice.
-3. Alice sends 10 Mi to Bob by sending Transaction B that creates an `ExtendedLockedOutput`, specifying the balance,
+3. Alice sends 10 IOTA to Bob by sending Transaction B that creates an `ExtendedLockedOutput`, specifying the balance,
    and `aliasID=BobAliasID`.
 
-[![Alice sends 10 Mi to Bob](/img/protocol_specification/alice_sends_10_mi.png 'Alice sends 10 Mi to Bob')](/img/protocol_specification/alice_sends_10_mi.png)
+[![Alice sends 10 IOTA to Bob](/img/protocol_specification/alice_sends_10_mi.png 'Alice sends 10 IOTA to Bob')](/img/protocol_specification/alice_sends_10_mi.png)
 
 4. Bob can spend the outputs created by Alice by creating Transaction C that moves his `BobAlias` (to the very same
    address), and including the `ExtendedLockedOutput` with `aliasID=BobAliasID`.
@@ -261,9 +261,9 @@ additional constraints also have to be met.
   transaction on the ledger.
 - The governance controller of an alias output can change the state controller, meaning that a committee rotation can
   be carried out without changing the smart contract chain account, aliasID.
-  - A smart contract chain can be self governed, if the state and governance controllers coincide.
-  - A smart contract chain can be governed by an address account, or by another smart contract chain through an
-    alias account.
+    - A smart contract chain can be self governed, if the state and governance controllers coincide.
+    - A smart contract chain can be governed by an address account, or by another smart contract chain through an
+      alias account.
 - Each Extended Output is a request which is “sent” to the alias account. The ISCP can retrieve the backlog of
   requests by retrieving all outputs for the aliasID. Consuming the Extended Output means it is atomically removed
   from the backlog. It can only be done by the state controller, i.e. the committee of the smart contract chain.
@@ -323,7 +323,7 @@ it is perfect to store metadata belonging to the NFT.
 The ID of an IOTA NFT is also a valid address, therefore the NFT itself can receive and manage funds and other NFTs as
 well. Refer to the [cli-wallet tutorial](../../tutorials/wallet_library.md) for an overview of what you can do with an NFT.
 
-Interestingly, minting an IOTA NFT costs you only the minimum required deposit balance (0.0001 MI at the moment), which
+Interestingly, minting an IOTA NFT costs you only the minimum required deposit balance (0.0001 IOTA at the moment), which
 you can take back when you destroy the NFT. This is required so that NFTs are not minted out of thin air, and there are
 some IOTAs backing the output. Otherwise, the ledger database could be easily spammed.
 Transferring NFTs is also feeless, just like any other transaction in IOTA.
@@ -334,4 +334,4 @@ If you are interested, you can find the GoShimmer implementation of the new outp
 [output.go](https://github.com/iotaledger/goshimmer/blob/develop/packages/protocol/engine/ledger/vm/devnetvm/output.go):
 
 - [AliasOutput](https://github.com/iotaledger/goshimmer/blob/develop/packages/protocol/engine/ledger/vm/devnetvm/output.go#L598) and
-- [ExtendedLockedOutput](https://github.com/iotaledger/goshimmer/blob/develop/packages/protocol/engine/ledger/vm/devnetvm/output.go#L1582)
+- [ExtendedLockedOutput](https://github.com/iotaledger/goshimmer/blob/develop/packages/protocol/engine/ledger/vm/devnetvm/output.go#L1582)

docs/maintain/goshimmer/0.9/docs/tutorials/wallet_library.md

@@ -810,7 +810,7 @@ IOTA 2.0 DevNet CLI-Wallet 0.2
 Sweeping NFT owned funds... [DONE]
 ```
 
-If you check the balance, it should be updated. So the wallet contains 1 MI more:
+If you check the balance, it should be updated. So the wallet contains 1 IOTA more:
 
 ```shell
 ./cli-wallet balance

tutorials/pages/send-shimmer-tokens-with-wallet-lib.md

@@ -199,7 +199,7 @@ This will again set up a manager, open our account and unlock it using our passw
 Next we will tell the account manager the amount of tokens we want to send to what address by defining an output. The function to send tokens accepts a list of outputs, so in this case we will provide a list with one entry.
 
 ```rust
-    // Send a transaction with 1 Mi
+    // Send a transaction with 1 IOTA
     let outputs = vec![AddressWithAmount {
         address: "rms1qpszqzadsym6wpppd6z037dvlejmjuke7s24hm95s9fg9vpua7vluaw60xu".to_string(),
         amount: 1_000_000,