move a few "tips and tricks" to other appropriate locations so they'r…

…e easier to find; rename section, recommend reading when done with installation process

docs/docs/Build Your Rig/step-5-finishing-setup.md

@@ -20,10 +20,36 @@ So that we can notify you if necessary, [please fill out this form if you have b
 
 **Note**: you only ever need to fill this form out once. If you're building multiple rigs, or switching between DIY systems, no need to fill this out multiple times. We're just counting - and wanting to connect with in terms of safety announcements - humans. :) 
 
-## 
+## Optional step: improving the battery life of your Raspberry Pi
+
+!! Important for Enlite users: If you are using Enlite as CGM source, your rig will not work when it's underclocked, since the loop will not run fast enough! (You will always see the "BG too old" error). We are aware of that issue and try to find a solution...
+
+Version - CPU Clock - Battery Life @ 2500mAh (Li-Po)
+___
+* 0.6.2 - 1000 MHz - **8 hours**
+* 0.7.0-dev - 1000 MHz - **9 hours**
+* 0.7.0-dev - 500 MHz  - **14.5 hours**
+___
+
+As you can see, 0.7.0 made some battery life improvements, but under-clocking the CPU makes an even more significant improvement.
+
+To accomplish this, log into your rig via SSH and modify the file `/boot/config.txt`.
+
+Scroll down to find the line
+
+`#arm_freq=1000`
+
+and change it to
+
+`arm_freq=500`
+
+Note the removal of the `#` at the beginning of the line. Save your change and reboot your rig!
+
+## Customizing your closed loop
 
 As your time permits, there's still more useful and cool things you can do to make looping more efficient and automated.
 
+* First, review some [common situations you may encounter and practical advice for using your loop.](<../Usage and maintenance/usability-considerations>)
 * [Add more wifi networks to your rig](<../Usage and maintenance/Wifi/on-the-go-wifi-adding>) so that when you are away from home, the rig has access to trusted wifi networks
 * [Set up Papertrail](<../Usage and maintenance/monitoring-openaps#papertrail-remote-monitoring-of-openaps-logs-recommended>) Papertrail will even allow you to remotely track your logs when you are not logged into your rig. Setting up Papertrail and watching your logs will dramatically help you understand your rig and help troubleshoot if you run into problems.
 * [Set up IFTTT for your phone or watch](<../Customize-Iterate/ifttt-integration>) to allow you to use Nightscout's temp targets, carb entries, and similar for single button interactions with your rig

docs/docs/Understanding OpenAPS-Overview/communication-support-channels.md

@@ -7,7 +7,7 @@ There are several ways to communicate with other participants and contributors i
 **Note:** It's best practice not to share your pump's serial number, so make sure not to include it in pictures or pasted text output when seeking help on pump communication. Ditto for Nightscout URL and API secret and other private information that could enable someone to access your setup.
 
 ### Google Group 
-A google group focused on #OpenAPS development work can be found [here](https://groups.google.com/d/forum/openaps-dev) - everyone is recommended and welcome to join! You can add yourself directly to the group. It's worth setting your preferences to receive all email from the group; there's not a huge volume, and this is one of the ways we share updates about hardware or release announcements if you're not hanging out on Gitter or Facebook or Twitter.
+A google group focused on #OpenAPS development work can be found [here](https://groups.google.com/d/forum/openaps-dev) - everyone is encouraged and welcome to join! You can add yourself directly to the group. It's worth setting your preferences to receive all email from the group; there's not a huge volume, and this is one of the ways we share updates about hardware or release announcements if you're not hanging out on Gitter or Facebook or Twitter.
 
 ### Gitter
 [Gitter](https://gitter.im/) is a messaging/chat service similar to IRC. It provides integration with GitHub and several other services. It's the best place to get real-time support with anything related to OpenAPS. (Here's [why we often recommend asking questions on Gitter](https://diyps.org/2016/08/17/why-you-should-post-questions-in-gitter/).)

docs/docs/Usage and maintenance/entering-carbs-bolus.md

@@ -4,6 +4,8 @@ How do you enter carbs & do boluses with OpenAPS? You have a variety of ways to
 
 ## Doing boluses
 
+Boluses always have to be set on the pump for OpenAPS to take them into consideration. For safety reasons, insulin added to Nightscout NOT via the pump - for instance, logging an event when using an insulin pen - will not be taken into account. (If you are briefly away from your pump and using injections, the simplest solution to keep OpenAPS up to date is to bolus into air!)
+
 * **Easy bolus button**: Previously before OpenAPS, you probably used the [easy bolus button](<../While You Wait For Gear/collect-data-and-prepare#easy-bolus-button>) to add up a bolus in increments. (E.g. if your pump had increments of 0.5u, you could quickly dial up to a bolus by pressing the up button as many times as needed; hitting enter to confirm it; hitting enter again to deliver the bolus.)
 
 * **Bolus wizard**: Or, you may have used the bolus wizard, sometimes with BG or carb entry, or just as a bolus.
@@ -12,7 +14,10 @@ How do you enter carbs & do boluses with OpenAPS? You have a variety of ways to
 
 ## Entering carbs into OpenAPS
 
-Before OpenAPS, you may or may not have entered carbs into your pump. With OpenAPS, most people *do* want the rig to know about carbs. You have a variety of ways to enter them, depending on whether your rig is **online** or **offline**.
+Before OpenAPS, you may or may not have entered carbs into your pump. With OpenAPS, most people *do* want the rig to know about carbs. 
+
+Carbs can be either entered on the pump (for example, using Bolus Wizard) or into Nightscout (carb entries in Nightscout can either be made directly using the Care Portal) or via IFTTT or XDrip.
+You have a variety of ways to enter them, depending on whether your rig is **online** or **offline**.
 
 Look at this image for the big picture:
 
@@ -24,6 +29,8 @@ Look at this image for the big picture:
 * Some pumps can use the ['meal marker' feature](<../Customize-Iterate/offline-looping-and-monitoring#entering-carbs-while-offline>).
 * See section on [extended and dual wave substitutes](<../While You Wait For Gear/collect-data-and-prepare#extended-and-dual-wave-substitute>) for information on how extended boluses are handled in OpenAPS.
 
+**SAFETY WARNING ABOUT BOLUS WIZARD:** If the pump has a target range high end set lower than the BG input into the Bolus Wizard, the Bolus Wizard will add insulin to cover the carbs as well as bring BG down to the high end. I.e. if your high end is 110 and you enter a 160 BG and 45g of carbs in the Bolus Wizard, the Bolus Wizard will dose 1U to bring BG to 110 and 3U for carbs (assuming 50 (mg/dL)/U and 15g/U factors). The rig will likely have already dosed insulin to bring your BG to your low target, and you are potentially "double dosing". In these scenarios, you will have too much insulin onboard and can experience a severe low. If you use the Bolus Wizard, ensure the high end of the BG target range is a high number such as 250 mg/dL. OpenAPS default behavior (`wide_bg_target_range` preference) is to only use the target range lower end. Setting the high end does not impact the OpenAPS algorithms.
+
 ### Online carb entry
 
 If your rig is online, you have a variety of ways to enter carbs online.

docs/docs/Usage and maintenance/index.rst

@@ -9,8 +9,8 @@ Usage and maintenance
    How to enter carbs and boluses <entering-carbs-bolus>
    Preferences and safety settings <preferences-and-safety-settings>
    Monitoring OpenAPS <monitoring-OpenAPS>
-   Optimizing Your Settings <optimize-your-settings>
-   Tips & tricks <usability-considerations>
-   Update your rig in the future <update-your-rig>
+   Using your loop: common situations <usability-considerations>
+   Optimizing your settings <optimize-your-settings>
    How to run oref0-setup.sh again <oref0-runagain>
+   Update your rig in the future <update-your-rig>
    Wifi options <Wifi/index>

docs/docs/Usage and maintenance/usability-considerations.md

@@ -1,11 +1,8 @@
-# Usability Considerations
+# Using your loop: practical advice for common situations
 
-Now that you've closed the loop, you probably have a lot of new "first" experiences to deal with. Like much of this looping experience, you'll figure it out as you go along, and figure out what's right for you. But here are some ideas or tips to consider:
+Now that you've closed the loop, you probably have a lot of new "first" experiences to deal with. Like much of this looping experience, you'll figure it out as you go along, and figure out what's right for you. But here are some common situations and questions you may encounter:
 
-<details>
-        <summary><b>Click here to expand a clickable list to see all tips on this page:</b></summary>
-
-- [How do I enter carbs and boluses so OpenAPS can use them?](#how-do-i-enter-carbs-and-boluses-so-openaps-can-use-them-)
+- [How can you make adjustments to insulin delivery while on the go? - Optimizing with Temporary Targets](#how-can-you-make-adjustments-to-insulin-delivery-while-on-the-go----optimizing-with-temporary-targets-)
 - [What do you do with the loop in airport security when you travel](#what-do-you-do-with-the-loop-in-airport-security-when-you-travel)
 - [What do you do with your loop when you travel across timezones? How do you update devices for a time zone change?](#what-do-you-do-with-your-loop-when-you-travel-across-timezones--how-do-you-update-devices-for-a-time-zone-change-)
 - [What do you do with the loop when you shower?](#what-do-you-do-with-the-loop-when-you-shower-)
@@ -14,17 +11,14 @@ Now that you've closed the loop, you probably have a lot of new "first" experien
 - [What do you do if you want to be off the pump for long periods during a day when you're really active?  Like for the beach or water park or sporting activity or similar?](#what-do-you-do-if-you-want-to-be-off-the-pump-for-long-periods-during-a-day-when-you-re-really-active---like-for-the-beach-or-water-park-or-sporting-activity-or-similar-)
 - [What if I want to turn off the loop for a while?](#what-if-i-want-to-turn-off-the-loop-for-a-while-)
 - [How do I open loop?](#how-do-i-open-loop-)
-- [How can you make adjustments to insulin delivery while on the go? - Optimizing with Temporary Targets:](#how-can-you-make-adjustments-to-insulin-delivery-while-on-the-go----optimizing-with-temporary-targets-)
-- [How do I improve the range of my Edison/Explorer Board?](#how-do-i-improve-the-range-of-my-edison-explorer-board-)
 - [How do I switch between insulin types, or switch to Fiasp? What should I change?](#how-do-i-switch-between-insulin-types--or-switch-to-fiasp--what-should-i-change-)
-- [Improving the battery life of your Raspberry Pi](#improving-the-battery-life-of-your-raspberry-pi)
 
-</details>
 
-## How do I enter carbs and boluses so OpenAPS can use them?
-Boluses always have to be set on the pump for OpenAPS to take them into consideration. Carbs can be either entered on the pump (for example, using Bolus Wizard) or into Nightscout (carb entries in Nightscout can either be made directly using the Care Portal) or via IFTTT or XDrip.</br>
+## How can you make adjustments to insulin delivery while on the go? - Optimizing with Temporary Targets
+
+The use of Temporary Targets can provide additional fine tuning of insulin control on the go, or remotely for parents monitoring children when they are at school or away from home. As described elsewhere in this documentation, an Eating Soon-type (lower than normal) Temporary Target can be used in advance of a meal or activity. Lower Temporary Targets can also be used to force the OpenAPS system to be somewhat more aggressive in correcting a rising blood sugar. Similarly, a higher temporary target can soften a blood sugar drop and help avoid a low, or help limit stacking of insulin that is likely to peak during activity. Temp targets can be set by entering them in Nightscout Care Portal; you can also set up IFTTT buttons to set common temp targets from your watch or phone with a single button.
 
-**SAFETY WARNING:** If the pump has a target range high end set lower than the BG input into the Bolus Wizard, the Bolus Wizard will add insulin to cover the carbs as well as bring BG down to the high end. I.e. if your high end is 110 and you enter a 160 BG and 45g of carbs in the Bolus Wizard, the Bolus Wizard will dose 1U to bring BG to 110 and 3U for carbs (assuming 50 (mg/dL)/U and 15g/U factors). The rig will likely have already dosed insulin to bring your BG to your low target, and you are potentially "double dosing". In these scenarios, you will have too much insulin onboard and can experience a severe low. If you use the Boluz Wizard, ensure the high end of the BG target range is a high number such as 250 mg/dL. OpenAPS default behavior (`wide_bg_target_range` preference) is to only use the target range lower end. Setting the high end does not impact the OpenAPS algorithms.
+Temporary Targets can be set in advance by setting a future date/time stamp in Nightscout when you set them.  For example, a parent may wish to set a week's worth of Eating Soon or Activity Modes in advance of a regular school week.  This may be particularly helpful for meals or activity (i.e. gym class) which are regularly scheduled but for which you may have difficulty remembering to trigger the Temporary Target at the right time.  Scheduled or remotely activated Temporary Targets can also be very useful in supporting children in optimal management at school or other locations where there may not be an adult who is in a position to set the Temporary Target each time it is needed. It's also helpful even for adult PWDs when traveling; a loved one at home in a different time zone can set temp targets as needed to help direct the rig's activity while the PWD might be asleep or otherwise occupied.<br>
 
 ## What do you do with the loop in airport security when you travel
 The loop is off the shelf hardware - it's no different than your phone or other small gadgets, so leave it in your carry-on bag when going through security. (Dana note: I have traveled [well](https://twitter.com/danamlewis/status/811682733445496833) over 100 times with my loop, and in some cases with 3-4 Pis and batteries and related accessories, and have never had issues going through security because of my loop.)
@@ -89,40 +83,10 @@ The easiest way to "open loop" is to set the temp basal type on your pump to be
 
 You can then watch the OpenAPS pill in Nightscout, or your logs (`l`) on the rig to see what OpenAPS would be doing.
 
-## How can you make adjustments to insulin delivery while on the go? - Optimizing with Temporary Targets:
-The use of Temporary Targets can provide additional fine tuning of insulin control on the go, or remotely for parents monitoring children when they are at school or away from home. As described elsewhere in this documentation, an Eating Soon-type (lower than normal) Temporary Target can be used in advance of a meal or activity. Lower Temporary Targets can also be used to force the OpenAPS system to be somewhat more aggressive in correcting a rising blood sugar. Similarly, a higher temporary target can soften a blood sugar drop and help avoid a low, or help limit stacking of insulin that is likely to peak during activity. Temp targets can be set a number of ways, from using IFTTT so you can set them easily from your watch or phone; or by entering them in Nightscout Care Portal.
-
-Temporary Targets can be set in advance by setting a future date/time stamp in Nightscout when you set them.  For example, a parent may wish to set a week's worth of Eating Soon or Activity Modes in advance of a regular school week.  This may be particularly helpful for meals or activity (i.e. gym class) which are regularly scheduled but for which you may have difficulty remembering to trigger the Temporary Target at the right time.  Scheduled or remotely activated Temporary Targets can also be very useful in supporting children in optimal management at school or other locations where there may not be an adult who is in a position to set the Temporary Target each time it is needed. It's also helpful even for adult PWDs when traveling; a loved one at home in a different time zone can set temp targets as needed to help direct the rig's activity while the PWD might be asleep or otherwise occupied.<br>
-
 ## How do I switch between insulin types, or switch to Fiasp? What should I change?
 
 The most important setting for switching between insulin types in an OpenAPS rig is the "curve" type for duration of insulin activity. In oref0 0.6.0, most users will use the rapid-acting curve if they are using Humalog, Novolog, or similar. Fiasp users should use the "ultra-rapid" curve type. [See the preferences page here for more details on how to change your curve](<../Usage and maintenance/preferences-and-safety-settings#curve-rapid-acting>) in your `preferences.json` file (which you can edit with `edit-pref`). 
 
 Additionally, because Fiasp has a slightly faster peak time, you may need to adjust your behavior around meal-time dosing. If you pre-bolus, you may want to consider *not* pre-bolusing for the first few meals with Fiasp until you understand the differences, to avoid lows during or after the meal.
 
 Some users who switch to Fiasp find that they need to adjust settings. Others do not need to change settings that much, and autosens and/or autotune can help adjust to any variances over time as your body's needs change related to the difference insulin type. YDMV, as always!
-
-## Improving the battery life of your Raspberry Pi
-
-!! Important for Enlite users: If you are using Enlite as CGM source, your rig will not work when it's underclocked, since the loop will not run fast enough! (You will always see the "BG too old" error). We are aware of that issue and try to find a solution...
-
-Version - CPU Clock - Battery Life @ 2500mAh (Li-Po)
-___
-* 0.6.2 - 1000 MHz - **8 hours**
-* 0.7.0-dev - 1000 MHz - **9 hours**
-* 0.7.0-dev - 500 MHz  - **14.5 hours**
-___
-
-As you can see, 0.7.0 made some battery life improvements, but under-clocking the CPU makes an even more significant improvement.
-
-To accomplish this, log into your rig via SSH and modify the file `/boot/config.txt`.
-
-Scroll down to find the line
-
-`#arm_freq=1000`
-
-and change it to
-
-`arm_freq=500`
-
-Note the removal of the `#` at the beginning of the line. Save your change and reboot your rig!