@@ -151,8 +151,8 @@ Due to the inherent safety risks, this parameter is not enabled by default. To a
 To create an insulin with another concentration, first open Insulin Manager.
 
 - Click the "+" icon at the bottom of the screen.
-- Select the new expected concentration from the dropdown menu (U10, U50, U100, U200 are available).
-  - diluted concentrations like U10 or U50 are for children with very low basal rates.
+- Select the new expected concentration from the dropdown menu (U10, U20, U50, U100, U200 are available).
+  - diluted concentrations like U10, U20 or U50 are for children with very low basal rates.
   - U200 is more for adults with high insulin needs.
 - Adjust peak time, Duration of Insulin Action (DIA), and customize the Insulin Nickname (optional).
 - Use the save button at the top right of the screen.
@@ -172,13 +172,15 @@ When you start from U100 insulin, all your profile, historical data and reports
 - For a tube pump, click the Prime/Fill button (for Insulin Change) within the Overview (expanded status bar view), then click the "Change" button.
 
 1. Select the target concentration in the dropdown menu (e.g. `U200`).
-1. Then select the right insulin below.
+1. Then select the right insulin below. Until you confirm, the caption above its name says **Will be activated** (instead of **Currently active**).
 1. **Important:** the concentration switch is only recorded within AAPS after the Profile Switch is applied to the pump.
    - This step is mandatory for all Patch/Pod pumps.
    - For tube pumps, wait for the Profile Switch to be applied to the pump, or within Profile Manager or **Insulin settings**.
 
 That's all!
 
+If a temporary **Profile Switch** (one with a duration) is running when you change the insulin, the new insulin is also given to the profile that comes back when the temporary switch ends. The old insulin does not come back.
+
 ### Switch concentration for users with U200 insulin associated with a 50% profile (AAPS 4)
 
 When you start from U200 already used in your pump, but associated with a 50% profile, you have to do additional steps compared to the standard switch from U100 insulin.
 
@@ -36,6 +36,8 @@ Be aware of the following limitations:
 
 * Extended bolus and multiwave bolus are currently not supported (you can use [Extended Carbs](../DailyLifeWithAaps/ExtendedCarbs.md) instead).
 * Only one basal profile (the first one) is supported.
+* The lowest basal rate in your **Profile** is 0.05 U/h. **AAPS** refuses a **Profile** with a lower rate. The Combo rounds basal rates to its own steps (0.01 U/h below 1 U/h, 0.05 U/h up to 10 U/h, 0.1 U/h above). **AAPS** uses the rates the pump really gives.
+* Temporary basal rates are limited to 500% of the current basal rate. **AAPS** takes this limit into account.
 * The loop is disabled if the currently active profile on the pump isn't profile no. 1. This continues until profile no. 1 is made the active one; when that is done, the next time AAPS connects (either on its own after a while or because you tap **Refresh** on the Accu-Chek Combo pump screen), it will notice that profile no. 1 is the current one, and enable the loop again.
 * If the loop requests a running TBR to be cancelled, the Combo will set a TBR of 90% or 110% for 15 minutes instead. This is because actually cancelling a TBR causes an alert on the pump which causes a lot of vibrations, and these vibrations cannot be disabled.
 * Bluetooth connection stability varies with different phones, causing "pump unreachable" alerts, where no connection to the pump is established anymore. If that error occurs, make sure Bluetooth is enabled, tap **Refresh** on the pump screen (**Manage** > **Pump**) to see if this was caused by an intermitted issue and if still no connection is established, reboot the phone which should usually fix this.
 
@@ -7,7 +7,7 @@ The CareLevo is a tubeless patch pump made by CareMedi. Each patch holds up to 3
 The CareLevo driver is new in **AAPS**. Read this whole page before you activate your first patch, and keep the pump's own instructions for use at hand.
 ```
 
-The smallest dose the patch can deliver is 0.05 U. Set your basal rates in the **Profile** to a minimum of 0.05 U/h in steps of 0.05 U/h, otherwise the insulin the **Profile** expects and the insulin the patch delivers differ slightly.
+The smallest dose the patch can deliver is 0.05 U. Set your basal rates in the **Profile** to a minimum of 0.05 U/h in steps of 0.05 U/h, otherwise the insulin the **Profile** expects and the insulin the patch delivers differ slightly. **AAPS** uses the basal rates the patch accepted.
 
 ```{contents} Table of contents
 :depth: 1
@@ -105,6 +105,12 @@ If the insertion fails, **AAPS** tells you how many attempts are left. When no a
 
 Insulin delivery starts as soon as the insertion is confirmed.
 
+## Bolus messages
+
+If the patch refuses a bolus, **AAPS** tells you why. For example *Bolus can't be delivered. Bolus available: 2.8 U* means the patch can deliver only that amount now.
+
+If you stop a bolus and the patch does not confirm the stop, **AAPS** waits for the bolus to end and records the amount the patch reports. If a bolus was not recorded (for example because it was stopped while it was running), **AAPS** adds it from the patch total and asks you to check IOB before you try again.
+
 ## Suspending and resuming insulin delivery
 
 Press **Suspend Infusion** on the pump screen and select how long delivery should pause: from 30 minutes to 4 hours in 30-minute steps. Delivery does not resume by itself: when the pause is over, the patch raises a **Start Insulin** alert. Press **Resume Infusion** on the pump screen, or **Start Insulin** on the alert, and confirm.
 
@@ -24,13 +24,13 @@ _These instructions are for configuring the app and your pump if you have a Dana
 * Open the pump screen: tap **Open plugin** on the DanaR card (or go to **Manage** > **Pump**).
 * Tap **Pairing**. On the pairing screen:
   * Enter your pump password under **Pump password** (default password is 1234).
-  * Under **Select paired device**, tap your DanaR serial number. If the list is empty, tap **Open Bluetooth settings** and pair the pump with your phone first (see the step above), then tap the refresh icon.
+  * Under **Select paired device**, tap your DanaR serial number. If the list is empty, tap **Open Bluetooth settings** and pair the pump with your phone first (see the step above). When you come back to **AAPS**, the pump appears in the list. If it does not, tap the refresh icon.
   * Tap **Pairing**. **AAPS** connects to the pump and checks the password.
 * To change the driver settings, tap **Settings** on the DanaR card in **Configuration** > **Pump**:
   * **Bolus speed** (DanaR and DanaRv2): change the default bolus speed (12 s/U, 30 s/U or 60 s/U).
   * **Use extended boluses for >200%** (DanaR and DanaR Korean): enable this if you want **AAPS** to allow a basal rate above 200%. Note this means you cannot loop with high TBRs while using extended boluses for food.
 * Set basal step on pump to 0.01 U/h
-* Set bolus step on pump to 0.1 U/h
+* Set bolus step on pump to 0.1 U. **AAPS** reads the bolus step from the pump and uses it for every bolus.
 * Enable extended boluses on pump
 
 ## Timezone traveling with Dana R pump
 
@@ -1,12 +1,14 @@
-# DanaRS and Dana-i
+# DanaRS, Dana-i and Dana-i2
 
-_These instructions are for configuring the app and your pump if you have a DanaRS from 2017 onwards or the newer Dana-i. Visit [DanaR Insulin Pump](./DanaR-Insulin-Pump.md) if you have the original DanaR instead._
+_These instructions are for configuring the app and your pump if you have a DanaRS from 2017 onwards, a Dana-i or a Dana-i2. Visit [DanaR Insulin Pump](./DanaR-Insulin-Pump.md) if you have the original DanaR instead._
 
 **New Dana RS firmware v3 can be used from AAPS version 2.7 onwards.**
 
 **New Dana-i can be used from AAPS version 3.0 onwards.**
 
-* In DanaRS/i pump "BASAL A" is used by the app. Existing data gets overwritten.
+**Dana-i2 can be used from AAPS version 4.0 onwards.** It uses the same **Dana-i/RS** driver as the Dana-i.
+
+* In DanaRS/i/i2 pump "BASAL A" is used by the app. Existing data gets overwritten.
 
 ```{contents} Table of contents
 :depth: 1
@@ -51,7 +53,7 @@ _These instructions are for configuring the app and your pump if you have a Dana
 
    * For DanaRS v1, **AAPS** asks for the **Pump password (v1 only)**. Enter your pump password (see [Default password](#DanaRS-Insulin-Pump-default-password)).
    * For DanaRS v3, **AAPS** asks you to press OK on the pump and type the 2 sequences of numbers and letters shown on the pump. Keep the pump display on by pressing the minus button until you have finished. Then tap **Done**.
-   * For Dana-i, the standard Android pairing dialog appears. Enter the 6-digit number shown on the pump.
+   * For Dana-i and Dana-i2, the standard Android pairing dialog appears. Enter the 6-digit number shown on the pump.
 
 * When **Pairing successful!** is shown, tap **Done**.
 
@@ -62,9 +64,15 @@ _These instructions are for configuring the app and your pump if you have a Dana
   ![Dana-i/RS pump screen after pairing](../images/v4/Pumps/dana_i_rs_pump_screen_paired.png)
 * In **Settings**, select **Bolus speed** to change the default bolus speed (12 s/U, 30 s/U or 60 s/U).
 * Set basal step on pump to 0.01 U/h using Doctors menu (see pump user guide).
-* Set bolus step on pump to 0.05 U/h using Doctors menu (see pump user guide).
+* Set bolus step on pump to 0.05 U using Doctors menu (see pump user guide). **AAPS** reads the basal and bolus steps from the pump and uses them for every bolus, so a bolus always matches the step set on the pump. The pump screen shows them in the **Basal/Bolus step** row.
 * Enable extended boluses on pump
 
+### Options shown only for some models
+
+* **Auto lock**: on a Dana-i2, the **User options** screen (on the pump screen, **Manage** > **Pump**) has an **Auto lock** switch for the pump's auto lock setting. Press **Save options to pump** after changing it.
+* **Easy mode**: on pump models that have an easy menu mode, the pump screen shows an **Easy mode** row with **On** or **Off**.
+* If a Dana-i2 refuses a bolus, **AAPS** shows the reason, for example *Pump is not primed*, *Not enough insulin in the reservoir* or *Easy sleep mode is on in the pump*.
+
 (DanaRS-Insulin-Pump-default-password)=
 
 ### Default password
@@ -137,17 +145,17 @@ When switching to a new phone the following steps are necessary:
 * Install AAPS on the new phone.
 * [Import settings](../Maintenance/ExportImportSettings.md) on your new phone
 
-### DanaRS v3, Dana-i
+### DanaRS v3, Dana-i, Dana-i2
 * Start pairing procedure as described [above](#DanaRS-Insulin-Pump-pairing-pump).
 * Sometimes you may need to clear the pairing information in **AAPS** first. On the pump screen (**Manage** > **Pump**), tap **Unpair** and confirm **Reset pairing information?**. Then tap **Pairing** again.
 
-## Timezone traveling with DanaRS and Dana-i pumps
+## Timezone traveling with DanaRS, Dana-i and Dana-i2 pumps
 
 For information on traveling across time zones see section [Timezone traveling with pumps](#timezone-traveling-danarv2-danars).
 
 ## Where to get help
 
-Development of the DanaRS/Dana-i driver is done by the community on a **volunteer** basis. Before requesting help, please:
+Development of the DanaRS/Dana-i/Dana-i2 driver is done by the community on a **volunteer** basis. Before requesting help, please:
 
 1. **Read** the relevant section of this documentation to confirm how the feature is meant to work.
 2. **Ask** on the *#AAPS* channel on [Discord](https://discord.gg/4fQUWHZ4Mw), or in one of the other [community channels](../GettingHelp/WhereCanIGetHelp.md).
 
@@ -2,7 +2,7 @@
 
 The patch needs rapid-acting U-100 insulin, such as NovoRapid or Humalog. Use the rapid-acting insulin your doctor has prescribed for you.
 
-The smallest dose the patch can deliver is 0.05 U. Set every basal rate in your **Profile** to at least 0.05 U/hr, in steps of 0.05 U/hr. Otherwise the total insulin your **Profile** expects and the insulin the patch actually delivers may not match. In the same way, boluses must be at least 0.05 U.
+The smallest dose the patch can deliver is 0.05 U. Set every basal rate in your **Profile** to at least 0.05 U/hr, in steps of 0.05 U/hr. Otherwise **AAPS** rounds each rate to the nearest 0.05 U/hr (never down to 0) and uses the rates the patch really gives, so the total insulin per day differs slightly from your **Profile**. In the same way, boluses must be at least 0.05 U.
 
 ```{contents} Table of contents
 :depth: 1
@@ -167,6 +167,8 @@ Replace the patch when it is low on insulin, when it expires, or if it is faulty
 
 After that, the wizard continues straight on to activating a new patch (see above). Press the back arrow if you want to stop here.
 
+While no patch is active, **AAPS** shows the pump as suspended and records a 0 U/hr temporary basal, so no basal insulin is counted in IOB until the next patch is activated.
+
 ![The EOPatch2 pump screen with the DISCARD/CHANGE PATCH button](../images/EOPatch/Bild13.png)
 ![Discard Patch page](../images/EOPatch/Bild14.png)
 ![Discard Patch confirmation dialog](../images/EOPatch/Bild15.png)
 
@@ -10,6 +10,8 @@ These instructions are for configuring the Equil insulin pump.
 ## Pump capabilities with AAPS
 
 * Tubeless patch pump that communicates with **AAPS** over your phone's native Bluetooth, without an additional communication device.
+* **AAPS** treats the Equil as a patch pump with a 200 U reservoir: the main screen shows the patch pump status lights, and **Prime/Fill** and **Pump battery change** are not offered. Filling, priming and changing the battery are done in the pump wizards.
+* While the pump is suspended or stopped, **AAPS** records a 0 U/h temporary basal, so no basal insulin is counted in IOB.
 * DST and timezone changes must be handled manually.
 
 ## Hardware and software requirements
@@ -42,6 +44,7 @@ Open the Equil settings with **Settings** on the **Equil** card, or with the gea
 * **Low battery alarm**: warns you when the pump battery is low.
 * **Low drug storage alarm**: warns you when the insulin in the reservoir is low.
 * **Alert tone**: how the pump alerts you: **Mute**, **Vibrate only**, **Tone only** or **Vibrate and tone**.
+* **Bolus speed**: how fast a bolus is given: **1.5 U/min (standard)**, **3 U/min**, **6 U/min** or **12 U/min**. A faster bolus may give more occlusion alarms.
 
 ```{admonition} Max basal and max bolus on the patch
 :class: note
@@ -96,11 +99,22 @@ If you set your own pairing password (recommended for your safety), store it som
 
 Once the pump is paired, the pump screen shows these buttons:
 
+* **Refresh**: reads the state and the history of the pump now.
 * **Suspend** / **Resume delivery**: stop or restart insulin delivery.
-* **Change reservoir**: guides you through detaching the pump, fitting a new reservoir, priming and attaching it again.
+* **Change reservoir**: guides you through detaching the pump, fitting a new reservoir (and, if needed, a new battery), priming and attaching it again. The first step asks *Will you also put on a new infusion set (base plate and cannula)?*
+  * **Yes, new infusion set**: you choose the site, the cannula is primed, and **AAPS** records an insulin change and a cannula change.
+  * **No, only reservoir or battery**: the cannula is not primed and **AAPS** records only an insulin change.
+
+  After a reservoir change the battery level shows **-** until **AAPS** reads it again from the pump.
 * **History**: shows the events recorded by the pump.
 * **Unpair device**: guides you through detaching the pump and unpairing it from **AAPS**. This stops insulin delivery, moves the pump plunger back to the bottom, and deletes the pairing.
 
+### Alarms
+
+* The low insulin alarm sounds once at each level (10 U, 5 U and 2 U) and when the reservoir is empty. The low battery alarm sounds once at 10% and once at 5%. Each level alarms only once until the next reservoir change.
+* Pump alarms and stops are also recorded as announcements in the treatments, at the time the pump logged them, so you can see later when and why the pump stopped.
+* If the reservoir runs empty during a bolus, **AAPS** records only the insulin given until then and tells you both amounts.
+
 ## Where to get help
 
 Development of the Equil driver is done by the community on a **volunteer** basis. Before requesting help, please:
 
@@ -140,7 +140,7 @@ The RL Status dialog has two tabs:
 (medtronic-actions)=
 ## Actions
 When the Medtronic driver is used, two additional actions are available on the pump screen (**Manage** > **Pump**):
-- **Wake and Tune Up** - In the event that AAPS hasn't connected to your pump for a sustained period (it should connect every 5 minutes), you can force a Tune Up. This will try to contact your pump, by searching all of the possible radio frequencies used by your pump. In the event a successful connection is made the successful frequency will be set as the default.
+- **Wake and Tune Up** - In the event that AAPS hasn't connected to your pump for a sustained period (it should connect every 5 minutes), you can force a Tune Up. This will try to contact your pump, by searching all of the possible radio frequencies used by your pump. In the event a successful connection is made the successful frequency will be set as the default. While the tune-up runs, the RileyLink status on the pump screen shows it. If a tune-up fails (for example because the pump was out of range), **AAPS** tries again by itself about every 10 minutes.
 - **Reset RileyLink** - If you reset your RileyLink compatible device you may need to use this action so that device can be reconfigured (frequency set, frequency type set, encoding configured).