Combine inclusion fee and resource fee sections (stellar#389)

* combine fees documentation * delete previous fees pages * fix a myriad of links * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * diagram* * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * Update docs/learn/fundamentals/fees-resource-limits-metering.mdx Co-authored-by: Elliot Voris <[email protected]> * nginx redirects for old fee paths and pages --------- Co-authored-by: Elliot Voris <[email protected]>
philipliu · Mar 27, 2024 · 3d6ddc1 · 3d6ddc1
1 parent 927d7ef
commit 3d6ddc1
Show file tree

Hide file tree

Showing 21 changed files with 231 additions and 279 deletions.
diff --git a/docs/building-apps/example-application-tutorial/payment.mdx b/docs/building-apps/example-application-tutorial/payment.mdx
@@ -13,7 +13,7 @@ In our BasicPay application, the user will navigate to the Payments page where c
 
 The user clicks the "Confirm Transaction" button. If the destination account exists and is properly funded with XLM, this will trigger a Transaction Preview where they can view the transaction details.
 
-All Stellar transactions require a small fee to make it to the ledger. Read more in our [Fees, Surge Pricing, and Fee Strategies section](../../learn/encyclopedia/fees-surge-pricing-fee-strategies.mdx).
+All Stellar transactions require a small fee to make it to the ledger. Read more in our [Fees section](../../learn/fundamentals/fees-resource-limits-metering.mdx).
 
 In BasicPay, we’ve set it up so that the user always pays a static fee of 100,000 [stroops](../../learn/fundamentals/stellar-data-structures/assets.mdx#amount-precision) (one stroop equals 0.0000001 XLM) per operation. Alternatively, you can add a feature to your application that allows the user to set their own fee.
 

diff --git a/docs/issuing-assets/how-to-issue-an-asset.mdx b/docs/issuing-assets/how-to-issue-an-asset.mdx
@@ -16,7 +16,7 @@ If you’d like to avoid your users having to deal with transaction fees, consid
 
 Learn about the testnet and mainnet in our [Networks section](../learn/fundamentals/networks.mdx).
 
-Learn more about fees in our [Fees, Surge Pricing, and Fee Strategies section](../learn/encyclopedia/fees-surge-pricing-fee-strategies.mdx).
+Learn more about fees in our [Fees, Resource Limits, and Metering section](../learn/fundamentals/fees-resource-limits-metering.mdx).
 
 ## 1. Create issuing account and an object to represent the new asset
 

diff --git a/docs/learn/encyclopedia/error-handling.mdx b/docs/learn/encyclopedia/error-handling.mdx
@@ -154,7 +154,7 @@ Here, we will cover specific errors commonly encountered during transaction subm
 | `BAD_AUTH` | -6 | Too few valid signatures / wrong network |
 | `INSUFFICIENT_BALANCE` | -7 | Fee would bring account below minimum balance; see our section on [Lumens](../fundamentals/lumens#minimum-balance) for more info |
 | `NO_ACCOUNT` | -8 | Source account not found |
-| `INSUFFICIENT_FEE` | -9 | Fee is too small; see our section on [Fees](./fees-surge-pricing-fee-strategies) for more info |
+| `INSUFFICIENT_FEE` | -9 | Fee is too small; see our section on [Fees](../fundamentals/fees-resource-limits-metering.mdx) for more info |
 | `BAD_AUTH_EXTRA` | -10 | Unused signatures attached to transaction |
 | `INTERNAL_ERROR` | -11 | An unknown error occurred |
 | `NOT_SUPPORTED` | -12 | The transaction type is not supported |
@@ -172,11 +172,11 @@ We’ll do a deeper dive into the following errors:
 
 Horizon may send a `504 Timeout` after transaction submission. Timeouts are not errors but warnings that your request hasn’t been fulfilled yet. This can happen because of the relationship between Horizon and Stellar Core- the network may take some time (5-10 mins during congestion) to accept the transaction. At the same time, Horizon needs to provide developers with a response within 30 seconds.
 
-Receiving a 504 for your transaction submission does not mean the transaction didn’t make it to the network. Continue with retries until you get a definitive response. If you continue to face timeouts on retries, consider using a fee-bump transaction to get into the ledger (after the time bounds expire) or increasing the maximum fee you’re willing to pay. Read up on [Surge Pricing and Fee Strategies](./fees-surge-pricing-fee-strategies#surge-pricing) for more details.
+Receiving a 504 for your transaction submission does not mean the transaction didn’t make it to the network. Continue with retries until you get a definitive response. If you continue to face timeouts on retries, consider using a fee-bump transaction to get into the ledger (after the time bounds expire) or increasing the maximum fee you’re willing to pay. Read up on [Surge Pricing and Fee Strategies](../fundamentals/fees-resource-limits-metering.mdx) for more details.
 
 ### Insufficient fees and surge pricing
 
-See the [Surge Pricing and Fee Strategies Encyclopedia Entry](./fees-surge-pricing-fee-strategies)
+See the [Fees section](../fundamentals/fees-resource-limits-metering.mdx)
 
 ### Rate limiting
 

diff --git a/docs/learn/encyclopedia/fee-bump-transactions.mdx b/docs/learn/encyclopedia/fee-bump-transactions.mdx
@@ -31,7 +31,7 @@ The account that will pay the fee for the fee-bump transaction. This account wil
 
 The maximum per-operation fee you’re willing to pay for the fee-bump transaction. The fee-bump transaction is one operation. Therefore, the total number of operations is equal to the number of operations in the inner transaction plus one.
 
-Read more about transaction fees in our [Fees section](./fees-surge-pricing-fee-strategies#network-fees-on-stellar).
+Read more about transaction fees in our [Fees section](../fundamentals/fees-resource-limits-metering.mdx).
 
 ### Replace-by-fee
 

diff --git a/docs/learn/encyclopedia/fees-surge-pricing-fee-strategies.mdx b/docs/learn/encyclopedia/fees-surge-pricing-fee-strategies.mdx
diff --git a/docs/learn/encyclopedia/ledger-headers.mdx b/docs/learn/encyclopedia/ledger-headers.mdx
@@ -64,11 +64,11 @@ The last used global ID. These IDs are used for generating objects.
 
 ### Maximum number of transactions
 
-The maximum number of operations validators have agreed to process in a given ledger. If more transactions are submitted than this number, the network will enter into surge pricing mode. For more about surge pricing and fee strategies, see our [Fees, Surge Pricing, and Fee Strategies Encyclopedia Entry](./fees-surge-pricing-fee-strategies#surge-pricing).
+The maximum number of operations validators have agreed to process in a given ledger. If more transactions are submitted than this number, the network will enter into surge pricing mode. For more about surge pricing and fee strategies, see our [Fees section](../fundamentals/fees-resource-limits-metering.mdx).
 
 ### Base fee
 
-The fee the network charges per operation in a transaction. Calculated in stroops. See the [Fees section](./fees-surge-pricing-fee-strategies#network-fees-on-stellar) for more information.
+The fee the network charges per operation in a transaction. Calculated in stroops. See the [Fees section](../fundamentals/fees-resource-limits-metering.mdx) for more information.
 
 ### Base reserve
 

diff --git a/docs/learn/encyclopedia/liquidity-on-stellar-sdex-liquidity-pools.mdx b/docs/learn/encyclopedia/liquidity-on-stellar-sdex-liquidity-pools.mdx
@@ -68,7 +68,7 @@ An account can place a passive sell order via the Create Passive Sell Offer oper
 
 The order price you set is independent of the fee you pay for submitting that order in a transaction. Fees are always paid in XLM, and you specify them as a separate parameter when submitting the order to the network.
 
-To learn more about transaction fees, see our section on [Fees, Surge Pricing, and Fee Strategies](./fees-surge-pricing-fee-strategies#network-fees-on-stellar).
+To learn more about transaction fees, see our section on [Fees section](../fundamentals/fees-resource-limits-metering.mdx).
 
 ## Liquidity pools
 

diff --git a/...rn/fundamentals/transaction-lifecycle.mdx → ...rn/encyclopedia/transaction-lifecycle.mdx b/...rn/fundamentals/transaction-lifecycle.mdx → ...rn/encyclopedia/transaction-lifecycle.mdx
@@ -1,6 +1,5 @@
 ---
 title: Transaction Lifecycle
-sidebar_position: 65
 ---
 
 :::note