organize by general topic instead of pushing information into "while …

…you wait for gear"; preserve instruction to learn these things before installing openAPS by adding a (placeholder) 'reading list' section to the prep section

docs/docs/Build Your Rig/step-2-wifi-dependencies.md

@@ -77,7 +77,7 @@ Now that step 2 is done, the bootstrap script will then continue to run awhile l
 
 At the completion, you will be prompted to press `enter` if you want to continue the setup script (oref0-setup).  If you don't have time to run the setup script (a fresh install of setup script can take about an hour to run), then you can cancel and come back to it later.  Regardless of your answer, you should now return to [the Setup Script section](<../Build Your Rig/step-3-setup-script>) for finishing step 3.
 
-Now that you have a wifi connection to your rig, you have the option of [logging into it using SSH](<../While You Wait For Gear/monitoring-OpenAPS#accessing-your-online-rig-via-ssh>) from a computer on the same network, rather than using a cable. 
+Now that you have a wifi connection to your rig, you have the option of [logging into it using SSH](<../Usage and maintenance/monitoring-openaps#accessing-your-online-rig-via-ssh>) from a computer on the same network, rather than using a cable. 
 
 ### Manual instructions for Intel Edison
 
@@ -152,7 +152,7 @@ network={
 }
 ```
 
-The networks you enter here are the wifi networks that your rig will be able to use to stay connected to internet. After getting your initial wireless connection set up, you can return to [the instructions for adding additional wireless connections ](<../Customize-Iterate/on-the-go-wifi-adding>) to add more options to your rig at any point.
+The networks you enter here are the wifi networks that your rig will be able to use to stay connected to internet. After getting your initial wireless connection set up, you can return to [the instructions for adding additional wireless connections ](<../Usage and maintenance/Wifi/on-the-go-wifi-adding>) to add more options to your rig at any point.
 
 ![Wifi edit screen](../Images/Edison/Wifi_add.png)
 

docs/docs/Build Your Rig/step-3-setup-script.md

@@ -25,7 +25,7 @@ The screenshot below shows an example of the questions you'll be prompted to rep
    * Note: G4-upload will allow you to have raw data when the G4 receiver is plugged directly into the rig.
 * Nightscout URL and API secret (or NS authentication token, if you use that option)
 * BT MAC address of your phone, if you want to pair for BT tethering to personal hotspot (letters should be in all caps)
-  * Note, you'll still need to do finish the BT tethering as outlined [here](<../Customize-Iterate/bluetooth-tethering-edison>) after setup.
+  * Note, you'll still need to do finish the BT tethering as outlined [here](<../Usage and maintenance/Wifi/bluetooth-tethering-edison>) after setup.
 * Your desired max-iob
 * whether you want Autosensitivity and/or Autotune enabled
 * whether you want any carbs-required Pushover notifications (and if you do, you'll need your Pushover API token and User Key)

docs/docs/Build Your Rig/step-4-watching-log.md

@@ -75,7 +75,7 @@ Finally, you should eventually see colorful indications of successful looping, w
 
 ![Successful pump-loop](../Images/build-your-rig/loop-success.png)
 
-Reading these should give you an idea for what OpenAPS knows: current BG, changes in BG, information about netIOB (taking into account any temp basals it has set along with any boluses you have done), carbs on board, etc. Plus, it will give you information about the predictions and show you the data points it is using to draw the "purple prediction lines" in Nightscout. It also will tell you what, if anything, is limiting it's ability to give more insulin - i.e. if you have maxIOB at 0, or it is capped by one of the safety settings, etc. This information is a longer version of the information that will show in the "OpenAPS pill" on Nightscout. And - this is where it will tell you what insulin it thinks you need (more/less and how much) and what temporary basal rate (temp basal) it will try to set next to adjust and bring your eventualBG prediction into your target range. ([For more details on how to interpret the OpenAPS math and information, see this page for understanding OpenAPS determine-basal](<../While You Wait For Gear/understand-determine-basal#summary-of-outputs>).)
+Reading these should give you an idea for what OpenAPS knows: current BG, changes in BG, information about netIOB (taking into account any temp basals it has set along with any boluses you have done), carbs on board, etc. Plus, it will give you information about the predictions and show you the data points it is using to draw the "purple prediction lines" in Nightscout. It also will tell you what, if anything, is limiting it's ability to give more insulin - i.e. if you have maxIOB at 0, or it is capped by one of the safety settings, etc. This information is a longer version of the information that will show in the "OpenAPS pill" on Nightscout. And - this is where it will tell you what insulin it thinks you need (more/less and how much) and what temporary basal rate (temp basal) it will try to set next to adjust and bring your eventualBG prediction into your target range. ([For more details on how to interpret the OpenAPS math and information, see this page for understanding OpenAPS determine-basal](<../How it works/understand-determine-basal#summary-of-outputs>).)
 
 If after 20 minutes, you still have some errors showing instead of the above successful looping information, it may be time to head over to the [Troubleshooting oref0-setup tips page](<../Troubleshooting/oref0-setup-troubleshooting>) for ideas on your error messages and how to resolve them.  IF you aren't able to resolve your errors, please make sure that you have captured the error messages before heading over to Gitter or Facebook to get help.  Troubleshooting is far more successful when you come prepared with the error messages.
 

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

@@ -3,7 +3,7 @@
 You're looping? Congrats! However, you're not done quite done yet. 
 
 ****************
-**Shortly after you confirm your loop is running, you should [set your preferences](<../While You Wait For Gear/preferences-and-safety-settings>).  Don't forget, your preferences are reset to defaults after each run of a setup script, so please remember to check preferences after confirming a loop is successfully run/rerun.**
+**Shortly after you confirm your loop is running, you should [set your preferences](<../Usage and maintenance/preferences-and-safety-settings>).  Don't forget, your preferences are reset to defaults after each run of a setup script, so please remember to check preferences after confirming a loop is successfully run/rerun.**
 *******************
 
 ## So you think you're looping? Now keep up to date!
@@ -24,10 +24,10 @@ So that we can notify you if necessary, [please fill out this form if you have b
 
 As your time permits, there's still more useful and cool things you can do to make looping more efficient and automated.
 
-* [Add more wifi networks to your rig](<../Customize-Iterate/on-the-go-wifi-adding>) so that when you are away from home, the rig has access to trusted wifi networks
-* [Set up Papertrail](<../While You Wait For Gear/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.
+* [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
-* [Finish Bluetooth tethering your phone](<../Customize-Iterate/bluetooth-tethering-edison>) so that when you are away from trusted wifi networks, your rig can automatically access your phone's mobile hotspot for continued online looping. 
+* [Finish Bluetooth tethering your phone](<../Usage and maintenance/Wifi/bluetooth-tethering-edison>) so that when you are away from trusted wifi networks, your rig can automatically access your phone's mobile hotspot for continued online looping. 
 * [Learn about offline looping](<../Customize-Iterate/offline-looping-and-monitoring>) for times when your rig is not able to access internet (no wifi, no hotspot).
 * [Additional access to your rig via other types of mobile apps.](<../Customize-Iterate/useful-mobile-apps>) Grab some of these other apps, based on your preference, for accessing your rig in different ways. 
 

docs/docs/Customize-Iterate/index.rst

@@ -6,16 +6,8 @@ Customize - Iterate
    :glob:
    :hidden:
 
-   Optimizing Your Settings <optimize-your-settings>
-   Offline Looping <offline-looping-and-monitoring>
-   Enable Bluetooth tethering <bluetooth-tethering-edison>
-   Add more wifi to your rig <on-the-go-wifi-adding>
+
+   oref1: SMB and UAM <oref1>
    Useful apps for accessing your rig <useful-mobile-apps>
    IFTTT and Pebble buttons <ifttt-integration>
-   Autosens <autosens>
-   Autotune <autotune>
-   Understanding Autotune <understanding-autotune>
-   oref1: SMB and UAM <oref1>
-   Tips & tricks <usability-considerations>
-   Update your rig in the future <update-your-rig>
-   How to run oref0-setup.sh again <oref0-runagain>
+   Offline Looping <offline-looping-and-monitoring>

docs/docs/Customize-Iterate/offline-looping-and-monitoring.md

@@ -1,6 +1,6 @@
 # Offline looping - aka, running OpenAPS without internet connectivity
 
-There are a number of ways to have an "offline" OpenAPS rig, and numerous ways to monitor offline ([see the monitoring section for information about monitoring offline](<../While You Wait For Gear/monitoring-OpenAPS#the-main-ways-of-monitoring-your-rig-offline-include>)).  Offline refers to situations where your rig moves into an area where it does not have internet access (i.e., the rig does not have a known WiFi network available and the cell phone used with the rig does not have cell coverage/hotspot available).  By setting up one of these offline solutions, your rig can still loop while in an offline area.  Depending on the setup, the opportunities to visualize or monitor the loop actions (e.g., check what temp basal is actually being set) may vary until you can get back into an online area.
+There are a number of ways to have an "offline" OpenAPS rig, and numerous ways to monitor offline ([see the monitoring section for information about monitoring offline](<../Usage and maintenance/monitoring-openaps#the-main-ways-of-monitoring-your-rig-offline-include>)).  Offline refers to situations where your rig moves into an area where it does not have internet access (i.e., the rig does not have a known WiFi network available and the cell phone used with the rig does not have cell coverage/hotspot available).  By setting up one of these offline solutions, your rig can still loop while in an offline area.  Depending on the setup, the opportunities to visualize or monitor the loop actions (e.g., check what temp basal is actually being set) may vary until you can get back into an online area.
 
 ## Medtronic CGM users
 Medtronic CGM users can, by default, automatically loop offline because the rig will read CGM data directly from the pump.
@@ -181,7 +181,7 @@ On your OpenAPS rig, the xdrip-js library can read directly from the Dexcom tran
      * Logger: [https://github.com/xdrip-js/Logger/blob/dev/README.md](https://github.com/xdrip-js/Logger/blob/dev/README.md)
 
 ### Entering carbs while offline
-While offline you will not be able to enter carbs and set temporary targets using Nightscout. You have two options to enter carbs while offline. You can use the Medtronic pump's Bolus Wizard. When using the Bolus Wizard, be careful to avoid an A52 error if you have enabled SMB. By default, use of the Bolus Wizard disables SMB for 6 hours ([learn more here](<../While You Wait For Gear/preferences-and-safety-settings#a52-risk-enable-a52-risk-mitigation>)). The second option, which as far as we know avoids the A52 risk, is to use the Medtronic pump's Capture Event feature. To turn on the Capture Event feature, do these steps:
+While offline you will not be able to enter carbs and set temporary targets using Nightscout. You have two options to enter carbs while offline. You can use the Medtronic pump's Bolus Wizard. When using the Bolus Wizard, be careful to avoid an A52 error if you have enabled SMB. By default, use of the Bolus Wizard disables SMB for 6 hours ([learn more here](<../Usage and maintenance/preferences-and-safety-settings#a52-risk-enable-a52-risk-mitigation>)). The second option, which as far as we know avoids the A52 risk, is to use the Medtronic pump's Capture Event feature. To turn on the Capture Event feature, do these steps:
 
 1. Go to the CAPTURE EVENT ON/OFF screen: Main > Utilities > Capture Option
 2. Select On, then press ACT.

docs/docs/Customize-Iterate/oref1.md

@@ -8,7 +8,7 @@ NOTE OF CAUTION:
    * Take steps one by one to turn on Super Micro Boluses; validate that Super Micro Boluses are working and understand if it is working for you; and only then should you approach changing behaviors related to meal-time boluses.
    * Do not combine turning on Super Micro Bolus (SMB) and trying to do no-bolus or partial-bolus meals at the same time. 
 * Make sure you have your easy bolus button on ([details here](<../While You Wait For Gear/collect-data-and-prepare#easy-bolus-button>)) and know how to deliver boluses without using the bolus wizard.
-* See this page on [optimizing settings](<../Customize-Iterate/optimize-your-settings#optimizing-your-settings>) for reminders and tips on changing one thing at a time.
+* See this page on [optimizing settings](<../Usage and maintenance/optimize-your-settings#optimizing-your-settings>) for reminders and tips on changing one thing at a time.
 
 ## Only run oref1 with the following caveats in mind: 
 
@@ -54,7 +54,7 @@ In addition, as of 0.6.0-master, using Bolus Wizard to input boluses and meal ca
 
 * In oref0 0.6.0 and later, you will enable Super Micro Bolus (SMB)s by adding the related preferences to your preferences.json. You may want to experiment with turning only one enableSMB option on at a time so you can closely observe the behavior (via both Nightscout and pump-loop.log) in the enabled situation. In addition to testing oref1 in "normal" situations, pay special attention to how it behaves in more extreme situations, such as with rescue carbs (announced or not), post-meal activity, etc. 
 
-There are multiple preference toggles for Super Micro Bolus (SMB). Check out the [preferences page](<../While You Wait For Gear/preferences-and-safety-settings#advanced-oref1-preferences>) for more details on all the settings, but the short version is:
+There are multiple preference toggles for Super Micro Bolus (SMB). Check out the [preferences page](<../Usage and maintenance/preferences-and-safety-settings#advanced-oref1-preferences>) for more details on all the settings, but the short version is:
 
 ```
  * enableSMB_with_COB means Super Micro Bolus (SMB) will be enabled as long as COB is above zero

docs/docs/Gear Up/pi-based-rigs.md

@@ -23,7 +23,7 @@ Lipo batteries are typically used to power the rig on the go because they charge
 
 If you will need to run longer than that while unplugged from wall power, consider a portable charger.  These are in widespread use for cell phones and commonly available in a large number of sizes.  Here is an example [portable charger from Amazon](https://www.amazon.com/Anker-PowerCore-Ultra-Compact-High-speed-Technology/dp/B0194WDVHI/ref=sr_1_6?ie=UTF8&qid=1532089932&sr=8-6&keywords=backup+battery&dpID=31B5rBNP%252B8L&preST=_SY300_QL70_&dpSrc=srch).  Using a USB to micro-USB adapter you can power the rig from the portable charger by plugging the charger into the Power port, which is the micro-USB port nearest the corner of the Pi0.
 
-**Note**: You will probably want to underclock your Raspberry Pi to get a longer battery life. [See this for details](<../Customize-Iterate/usability-considerations#improving-the-battery-life-of-your-raspberry-pi>).
+**Note**: You will probably want to underclock your Raspberry Pi to get a longer battery life. [See this for details](<../Usage and maintenance/usability-considerations#improving-the-battery-life-of-your-raspberry-pi>).
 
 ### SD card
 An 8 GB SD card should provide plenty of space for the linux operating system, OpenAPS code and storage for log files.  The ability to use larger and removable storage is one of the advantages of the Raspberry Pi.  You can get a [MicroSD card and adapter from Adafruit](https://www.adafruit.com/product/2692) when you order your Pi and Hat.  Or you can get an equivalent [8 GB SD card from Amazon](https://www.amazon.com/Kingston-microSDHC-Class-Memory-SDC4/dp/B00200K1TS/ref=sr_1_8?s=wireless&ie=UTF8&qid=1532090813&sr=1-8&keywords=8gb+micro+sd) or other sellers.