jup-ag · 0xYankee-Raccoons · Nov 19, 2024 · Nov 4, 2024 · Nov 4, 2024 · Nov 5, 2024
diff --git a/Moved/1-comparator.md b/Moved/1-comparator.md
@@ -1,48 +0,0 @@
----
-sidebar_label: "How to Use the Bridge Comparator"
-description: Learn to use Jupiter’s Bridge Comparator effectively. Compare routes, transfer tokens, and optimize efficiency.
-title: How to Use the Bridge Comparator
----
-
-<head>
-    <title>How to use the Bridge Comparator on Jupiter</title>
-    <meta name="twitter:card" content="summary" />
-</head>
-
-The Jupiter Bridge Comparator is a tool that allows users to seamlessly compare and select the most efficient bridge for transferring tokens from other chains to Solana. This bolsters the Jupiter product line by offering an intuitive experience to help bring more capital to Solana in the most capital efficient way possible.
-
-## Basic Bridge Comparator User Flow
-
-1. Starting on the [Bridge Comparator page](https://jup.ag/bridge-compare). 
-2. Select the blockchain and token that you want to bridge from. Enter the token amount you wish to bridge.
-3. Select the blockchain and token that you want to bridge to.
-4. The Available Bridge Route Quotes will populate underneath the Selector section.
-5. Evaluate & choose the bridge application that best suits your needs, based on exchange rate and confirmation time.
-6. Proceed to that bridge application and complete the bridge process.
-
-**Let's take a look at the Comparator UI below**
-
----
-
-## Bridge Comparator UI
-
-![Bridge Comparator UI](../img/bridge/bridge-1.png)
-
-1. **Bridge Comparator Selector:** Application selector to navigate to the Comparator.
-2. **Source Chain and Token Selector:** Dropdown selectors to choose the blockchain, the token, and the token amount you are wanting to swap from.
-3. **Destination Chain and Token Output Selectors:** Dropdown selectors to choose the blockchain and the token you  would like to swap to.
-4. **Available Quotes:** All available quotes for the bridge route you have selected will populate here after you set your selections.
-
-
-### Available Quotes
-
-![Available Quotes](../img/bridge/bridge-2.png)
-
-1. **Bridging App:** The bridging app that is providing the quote.
-2. **Expected Receive:** The expected amount to be received based on the bridging transaction simulation.
-3. **Min Receive:** The minimum amount to be received based on the bridging transaction simulation and acceptable price fluctuations.
-4. **Additional Fee:** This section outlines the bridging fees that apply to this bridge route.
-5. **Src. Gas Fee:** This identifies the source chain fee level, based on that network's current transaction activity levels.
-6. **Bridging App Selector:** This selector will take you to the bridging application to complete the transaction.
-
-

diff --git a/...s/2-jupiter-spot/2-jupiter-swap/1-swap.md → Moved/1-swap.md b/...s/2-jupiter-spot/2-jupiter-swap/1-swap.md → Moved/1-swap.md
diff --git a/...ot/2-jupiter-swap/2-how-referral-works.md → Moved/2-how-referral-works.md b/...ot/2-jupiter-swap/2-how-referral-works.md → Moved/2-how-referral-works.md
diff --git a/...2-how-swap-works/1-metropolis-features.md → ...2-how-swap-works/1-metropolis-features.md b/...2-how-swap-works/1-metropolis-features.md → ...2-how-swap-works/1-metropolis-features.md
diff --git a/...swap/2-how-swap-works/2-how-swap-works.md → Moved/2-how-swap-works/2-how-swap-works.md b/...swap/2-how-swap-works/2-how-swap-works.md → Moved/2-how-swap-works/2-how-swap-works.md
diff --git a/...-swap/2-how-swap-works/3-metis-routing.md → Moved/2-how-swap-works/3-metis-routing.md b/...-swap/2-how-swap-works/3-metis-routing.md → Moved/2-how-swap-works/3-metis-routing.md
diff --git a/...ter-swap/2-how-swap-works/_category_.json → Moved/2-how-swap-works/_category_.json b/...ter-swap/2-how-swap-works/_category_.json → Moved/2-how-swap-works/_category_.json
diff --git a/Moved/blog-v1/2023-11-02-green-paper/index.md b/Moved/blog-v1/2023-11-02-green-paper/index.md
@@ -22,7 +22,7 @@ Our commitment was met with prolific shipping throughout 2023, as we successfull
 
 
 * Our routing improvements include the launch of Metis – a novel routing algorithm that was customised for Solana’s fast blocktimes.  We also launched instant staked SOL to SOL swaps that gives you the best price across all trade sizes. 
-* Our product portfolio expanded to include Dollar Cost Averaging(DCA), Limit Orders and a Bridge Comparator. 
+* Our product portfolio expanded to include Dollar Cost Averaging(DCA), Limit Orders and a Bridge tool. 
 * Our developer tooling improved with 2 major API Upgrades, Jup for Payments & Games, and the Jupiter Terminal. 
 
 A full list of our products and product announcements can be found on our [documentation website](https://station.jup.ag/docs) and [blog](https://station.jup.ag/blog).  
@@ -47,7 +47,7 @@ These anchors have been instrumental in the development and launch of various pr
 
 It guided us to prioritise the integration of Sanctum,[ facilitating instant staked SOL to SOL conversions at the most favorable rates](https://station.jup.ag/blog/jup-lst-with-sanctum), irrespective of the trade size. This helps to accelerate the adoption of liquid staking tokens (LSTs) within the ecosystem, and paves the way for new composable innovations.
 
-Furthermore, we introduced the bridge comparator, a tool that allows users to seamlessly compare and select the most efficient bridge for transferring tokens from other chains to Solana, so that we can help to bring more capital to Solana.
+Furthermore, we introduced the bridge tool, a tool that allows users to seamlessly compare and select the most efficient bridge for transferring tokens from other chains to Solana, so that we can help to bring more capital to Solana.
 
 Most recently, during the [Jupiter Planetary Developer Week](https://station.jup.ag/blog/jup-plantary-dev-update), we unveiled a plethora of new features, including the V6 Swap API, Jup for Payments, and the upgraded Jupiter Terminal V2.
 

diff --git a/Moved/blog-v2/2023-11-02-green-paper/index.md b/Moved/blog-v2/2023-11-02-green-paper/index.md
@@ -22,7 +22,7 @@ Our commitment was met with prolific shipping throughout 2023, as we successfull
 
 
 * Our routing improvements include the launch of Metis – a novel routing algorithm that was customised for Solana’s fast blocktimes.  We also launched instant staked SOL to SOL swaps that gives you the best price across all trade sizes. 
-* Our product portfolio expanded to include Dollar Cost Averaging(DCA), Limit Orders and a Bridge Comparator. 
+* Our product portfolio expanded to include Dollar Cost Averaging(DCA), Limit Orders and a Bridge tool. 
 * Our developer tooling improved with 2 major API Upgrades, Jup for Payments & Games, and the Jupiter Terminal. 
 
 A full list of our products and product announcements can be found on our [documentation website](https://station.jup.ag/docs) and [blog](https://station.jup.ag/blog).  
@@ -47,7 +47,7 @@ These anchors have been instrumental in the development and launch of various pr
 
 It guided us to prioritise the integration of Sanctum,[ facilitating instant staked SOL to SOL conversions at the most favorable rates](https://station.jup.ag/blog/jup-lst-with-sanctum), irrespective of the trade size. This helps to accelerate the adoption of liquid staking tokens (LSTs) within the ecosystem, and paves the way for new composable innovations.
 
-Furthermore, we introduced the bridge comparator, a tool that allows users to seamlessly compare and select the most efficient bridge for transferring tokens from other chains to Solana, so that we can help to bring more capital to Solana.
+Furthermore, we introduced the bridge tool, a tool that allows users to seamlessly compare and select the most efficient bridge for transferring tokens from other chains to Solana, so that we can help to bring more capital to Solana.
 
 Most recently, during the [Jupiter Planetary Developer Week](https://station.jup.ag/blog/jup-plantary-dev-update), we unveiled a plethora of new features, including the V6 Swap API, Jup for Payments, and the upgraded Jupiter Terminal V2.
 

diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -122,6 +122,30 @@ const config = {
       "@docusaurus/plugin-client-redirects",
       {
         redirects: [
+          {
+            to: "/guides/swap/how-swap-works",
+            from: "/guides/jupiter-swap/how-swap-works/metropolis-features",
+          },
+          {
+            to: "/guides/swap/how-swap-works",
+            from: "/guides/jupiter-swap/how-swap-works/how-swap-works",
+          },
+          {
+            to: "/guides/swap/how-swap-works",
+            from: "/guides/jupiter-swap/how-swap-works/metis-routing",
+          },
+          {
+            to: "/guides/swap/how-swap-works",
+            from: "/guides/jupiter-swap/swap",
+          },
+          {
+            to: "/guides/swap/tutorials/earn-referral-fees",
+            from: "/guides/jupiter-swap/how-referral-works",
+          },
+          {
+            to: "/guides/swap/how-swap-works",
+            from: "/guides/jupiter-swap/how-swap-works/metropolis",
+          },
           {
             to: "/guides/perpetual-exchange/overview",
             from: "/labs/perpetual-exchange/overview",
@@ -130,10 +154,6 @@ const config = {
             to: "/guides/perpetual-exchange/how-it-works",
             from: "/guides/perpetual-exchange/trading",
           },
-          {
-            to: "/guides/jupiter-swap/how-swap-works/metropolis-features",
-            from: "/guides/jupiter-swap/how-swap-works/metropolis",
-          },
           {
             to: "/guides/perpetual-exchange/overview",
             from: "/labs",
@@ -158,10 +178,6 @@ const config = {
             to: "/guides/general/get-your-token-on-jupiter",
             from: "/docs/get-your-token-onto-jup",
           },
-          {
-            to: "/docs/limit-order",
-            from: "/docs/limit-order/limit-order-api",
-          },
           {
             to: "/docs/limit-order",
             from: "/docs/limit-order/limit-order-with-sdk",

diff --git a/guides/10-onboard/2-bridging.md → guides/10-onboard/1-bridging.md b/guides/10-onboard/2-bridging.md → guides/10-onboard/1-bridging.md
diff --git a/guides/10-onboard/3-onramp.md → guides/10-onboard/2-onramp.md b/guides/10-onboard/3-onramp.md → guides/10-onboard/2-onramp.md
@@ -1,6 +1,6 @@
 ---
 sidebar_label: "Onramp and CEX Transfers"
-description: Learn to convert Fiat to Solana easily with top services like Stripe & Banxa for optimal rates and smooth transfers.
+description: Learn to convert Fiat to Solana easily with top aggregated services.
 title: Fiat On-ramps to Solana
 slug: ./onramp
 ---

diff --git a/guides/12-general/6-faq.md b/guides/12-general/6-faq.md
@@ -25,7 +25,7 @@ description: "Discover FAQs on Jupiter Swap, DCA, and more. Get quick answers an
 - Slippage occurs because of changing market conditions between the moment the transaction is submitted and its verification.
 - Your slippage rate is an important setting, it works as a protection. If the price falls below your slippage rate, then the transaction will fail in order to prevent you from getting less tokens than you want.
 - You can adjust your slippage. By default, slippage is set to 0.5%, meaning if the price slips more than 0.5% of your quote, the trade will not be completed.
-- Learn more about [slippage and price impact](/guides/2-jupiter-spot/2-jupiter-swap/2-how-swap-works/2-how-swap-works.md)
+- Learn more about [slippage and price impact](/guides/2-spot/1-swap/3-how-swap-works.md)
 
 ### What does it mean when I get the 'some routes failed to load...'
 
@@ -52,7 +52,7 @@ Protocols / Projects are free to integrate Jupiter swap with [Swap API](/docs/ap
 A few scenarios or cases where the order is not being fulfill
 - If the order size is too large *(and there is insufficient liquidity on-chain)* - in this case, Jupiter keeper will attempt to execute your order in a smaller chunk to partially fill your orders and will continue to do so until order is fully executed
 - The price wick happen for a very short period of time, and the liquidity have all been taken up at that price.
-- For more information on how Jupiter Limit Order works - [How Limit Order Works](/guides/2-jupiter-spot/3-limit-order/2-how-lo-work.md)
+- For more information on how Jupiter Limit Order works - [How Limit Order Works](/guides/2-spot/3-limit-order/2-how-lo-work.md)
 
 <!-- ### What happened if I close my order that has partially filled? Do I get the balance of my original input token and also filled output token? -->
 ### In the Wallet transaction history, of using the Limit order, I see many failed transactions, did I pay for that transaction fees?

diff --git a/guides/2-jupiter-spot/1-overview.md b/guides/2-jupiter-spot/1-overview.md
diff --git a/guides/2-spot/0-spot.mdx b/guides/2-spot/0-spot.mdx
@@ -0,0 +1,60 @@
+---
+title: Spot Overview
+description: Learn about Jupiter Spot, the most powerful way to trade tokens on Solana.
+slug: /spot
+pagination_prev: index
+sidebar_class_name: "hidden"
+---
+
+![spot-overview](../../guides/img/jupiter-spot.png)
+
+Welcome to **Jupiter Spot**, the most powerful way to trade tokens on Solana. 
+
+Jupiter Spot relies on **Jupiter Routing**, a universal routing algorithm with over **22 AMMs** on Solana, intelligently finding the best prices for your trades, and across all the tokens on Solana.
+
+Jupiter Spot is made up of 4 trading methods to help you buy and sell spot assets on Solana:
+1. **Swap**
+2. **Limit Order (LO)**
+3. **Dollar-Cost Averaging (DCA)**
+4. **Value Averaging (VA)**
+
+Let's go through them in this overview!
+
+---
+
+![spot-swap](../../static/img/spot/spot-swap.png)
+
+**Swap between any token on Solana, with the best prices and 0 fees with a single click.**
+
+- Jupiter also automatically minimizes [slippage](https://station.jup.ag/guides/jupiter-swap/how-swap-works/metropolis-features#dynamic-slippage) and set [priority fees](https://station.jup.ag/guides/jupiter-swap/swap#transaction-priority-fees) for you, while [flagging potential concerns](https://station.jup.ag/guides/jupiter-swap/how-swap-works/#safety-notifications).
+- All you have to do is to set the max slippage & priority fees you are willing to pay, before swapping without worry.
+- Detailed walkthrough on how to swap on Jupiter & UI features: [How to Swap](https://station.jup.ag/guides/jupiter-swap/swap)
+
+---
+
+![spot-lo](../../static/img/spot/spot-lo.png)
+
+  **Specify a set price to execute your trade, across most tokens on Solana.**
+
+  - When your desired price is hit, Jupiter’s Keepers attempt to fill the order for you.
+  - Note: You will get filled at exactly the rate you specified. Use our UI to help guide you in setting the right orders!
+  - Detailed walkthrough on how to set limit orders & UI features: [How to use Limit Order](https://station.jup.ag/guides/limit-order/limit-order)
+
+---
+
+![spot-dca](../../static/img/spot/spot-dca.png)
+
+  **Automate regular investments with DCA, with a 0.1% fee per order.**
+
+  - Based on your Interval (Weekly, Monthly, etc) and Number of Orders, DCA will swap on your behalf.
+  - Automatically retry and minimize priority fees + slippage for DCA orders, without you needing to.
+  - Detailed walkthrough on how to set DCA orders & UI features: [How to use DCA](https://station.jup.ag/guides/dca/how-to-dca)
+
+---
+
+![spot-va](../../static/img/spot/spot-va.png)
+
+  **DCA, but price weighted. Buy more when prices are low, and buy less when prices are up.**
+
+  - VA maintains a “target portfolio increase”, where it will buy more tokens when prices fall, and less when prices are high, instead of a fixed purchase quantity at every interval.
+  - Detailed walkthrough on how to set VA orders & UI features: [How to use VA](https://station.jup.ag/guides/va/how-to-va)
diff --git a/guides/2-spot/1-swap/1-features.md b/guides/2-spot/1-swap/1-features.md
@@ -0,0 +1,41 @@
+---
+sidebar_label: "Features"
+description: Learn about the latest features on Jupiter Swap.
+title: Swap Features
+slug: /swap/features
+---
+
+<head>
+    <title>Jupiter Swap | Quickstart</title>
+    <meta name="twitter:card" content="summary" />
+</head>
+
+Solana was built with trading in mind with its blazing speed and affordable transaction fees, resulting in thousands of new tokens and markets being spawned and new use cases and concepts being birthed. 
+
+Our goal at Jupiter is to provide a seamless experience as your Everyday Exchange. As the Everyday Exchange, you can:
+
+### Access best-priced tokens, quickly.
+
+You can find newly launched tokens with our Instant Routing feature. New tokens & markets are automatically added to Jupiter Routing.
+
+Access these tokens at best prices with our performant routing engine, [Metis](./3-how-swap-works.md). We perform the math and give you best prices at Solana speed, at 0 protocol fees.
+
+Read: [How to Swap](./2-tutorials/1-how-to-swap.md)
+
+### Access the right tokens, safely. 
+
+You see all important token information (metadata, authorities, verification) and trade conditions such as price impact to help you make an informed swap decision.
+
+Within Search, we also filter out imposter tokens and duplicates, utilise [community verification](https://catdetlist.jup.ag/) of tokens, and intelligent search using real-time info (liquidity, volume).
+
+Read: [How to Trade Safely](./2-tutorials/3-how-to-trade-safely.md)
+
+### Trade frictionlessly, knowing it just works.
+
+You get an abstracted swap experience with Auto mode by setting your Max Slippage and MEV protection. Jupiter will do the rest by configuring the best transaction fees and slippage based on your trade, heuristics, and market conditions. 
+
+For folks who wants more fine-tuned control e.g. choosing Fixed Slippage to [Dynamic Slippage](https://www.jupresear.ch/t/dynamic-slippage/21946), we have Manual mode for you.
+
+Read: [How to Configure Settings](./2-tutorials/2-how-to-configure-settings.md)
+
+*Last Updated: 4 November 2024*