master back to dev (#991)

* Update loops-in-progress.md

* Update loops-in-progress.md

Adding my name to the list of people who have loops in progress.

* Update ifttt-integration.md

Searching for "maker" no longer yields the correct action service. Must now search for "webhooks," icon is now blue instead of green. With apologies, didn't know how to update screen shots.

* Fix some typos

* Update loops-in-progress.md

* Update useful-mobile-apps.md

"uname -a" no longer reports the version of jubilinux you're running but rather the version of the Linux kernel you're running.

* Note that kernel version is useful for determining jubilinux version

* Update how-openaps-works-overview.md

nits

* Update index.rst (#963)

Conforming in same paragraph "internet" to "Internet" (capital "I").

* Update overview-of-build-process.md (#965)

missing word
added "usually" to code snippet because they're not always code snippets, sometimes buttons, and other screen references

* Update hardware.md (#967)

Conform to manufacturers' name styles/conventions (OmniPod, t:slim)
Remove ' because not possessive but rather plural
Lower rather than lesser

* Update nightscout-setup.md

Provided information for users who use mmol instead of mgdl on how to set BG targets in Heroku so don't end up with "urgent high" alerts when they are in range.

* Update loops-in-progress.md (#970)

* Update understanding-your-Explorer-Board-rig.md (#972)

Just a few edits to clarify this step. It took me a while to realize I needed two sets of screws!

* Adding my name to Loops in Progress

* Add meetup group URLs

* adding emphasis to max-iob and maxSafeBasal (#977)

* adding emphasis to max-iob and maxSafeBasal

* screenshot of maxSafeBasal

* typo fix

* word smithing

* Add a linkable header

* combine people from both copies of loops-in-progress.md so we can delete one

* fix broken images for token based authentications after doc update (#981)

* fix broken images after doc update

* add line to explain API_SECRET is also in crontab

* Update collect-data-and-prepare.md (#978)

Nits
Typos
Name styles
Conform periods in lists

* Update understanding-your-Explorer-Board-rig.md (#982)

Conform to "LiPo"
Conform to "Explorer"
"and hold"
nits
simplified language, deleted excess words
embedded link for video
replaced ellipsis with comma

* Update loops-in-progress.md (#984)

Added my name.  Trying to build the loop for my son.

* Update loops-in-progress.md (#985)

* Specify version 0.1.1 (or earlier) of Jubilinux (#986)

* Specify version 0.1.1 (or earlier) of Jubilinux

Current oref0 master doesn't work with 0.2.0.

* Remove "or earlier"

There are some fixes in 0.1.1 that are useful for easier setup and increased reliability of OpenAPS rigs

* Adding my name to the list (#987)

Adding myself to the list .

* image link fixes (#983)

* Delete old loopers file that's now in a different place

* Update usability-considerations.md (#959)

* Update edison.md (#974)

"Jubilinux" is styled with initial lower case "jubilinux"
Remove double-preposition (on and to)
Replace "ones" with "Edisons"
Replace "more" with "additional"
Removed unnecessary /
Spelled out LiPo
Replace and/or with or
Change LIPO to LiPo
Inserted link for battery URL
Added missing .) at end of Amazon link.
Inserted link for other battery URL
Corrected type easilly
internet to Internet (style)
Style preference on extended sentence with a hyphen followed by "however"
Replace exacto with X-ACTO
Initial cap "Explorer"
Added . to end sentence
Replace "screw" with "attach"
Typo harware
Added . to end sentence
Conform mah to mAh with a space after the #
Added (as well as some 2500 mAh options)

* Update edison.md (#954)

* Update edison.md

The original text said to use M2 as spacers, which means you have to screws these spacers between the boards onto the M2 screw, which is kind of  difficult and impossible to tighten.  If you use slightly larger nuts as spacers, you can just push the screws through the board then through the spacers then the other board and then put a nut on. This is way more secure  and you won't have to tighten them every day!

* Clarify

* Update CGM.md (#969)

* Update CGM.md

nits

* Lowercase openaps toolkit

* Update offline-looping-and-monitoring.md (#973)

Did the best I could to say that offline looping is possible with iPhone via modified Loop app, but don't really know enough to explain it well. Hope this is helpful.

* Update nightscout-setup.md (#980)

* Update nightscout-setup.md

nits
formatted links
typos
clarification
These graphics are not showing on this page: AddRole, AddSubject
Dana/Scott/others: please see notes in brackets above.

* Remove NOTEs and clarify using token auth roles

* Fix image links

* Redirected urls (#990)



* add quotes

* update links to reflect https://readthedocs.org/dashboard/openaps/redirects/

* Update update-your-rig.md

* Update edison.md

README.md

@@ -31,7 +31,7 @@ This documentation is organized into a series of phases that progressively build
 ----------
 **You may be looking for:**
 
-* [Live help with your implementation](http://openaps.readthedocs.io/en/latest/docs/introduction/communication-support-channels.html) (Hint: [Check out this Gitter channel](https://gitter.im/nightscout/intend-to-bolus))
+* [Live help with your implementation](http://openaps.readthedocs.io/en/latest/docs/Understanding OpenAPS-Overview/communication-support-channels.html) (Hint: [Check out this Gitter channel](https://gitter.im/nightscout/intend-to-bolus))
 
 *  [OpenAPS Reference Design](https://openaps.org/reference-design/)
 

docs/docs/Customize-Iterate/autosens.md

@@ -24,7 +24,7 @@ If you have papertrail setup (or are watching similarly through your rig itself)
 
 ![Autosens adjustments logged in papertrail](../Images/customize-iterate/autosens-adjust.png)
 
-As you can see, there are several types of adjustments that have occured during the day.  
+As you can see, there are several types of adjustments that have occurred during the day.  
 * In the morning, autosens was detecting some excess insulin sensitivity...so basals, targets, and ISF were adjusted down (by multiplier of 0.94).  
 * Later in the day (the blue boxed section), another adjustment was made to her BG targets because of a persistent high.  While not an adjustment by autosens itself, this is similar and can be set in preferences.json by setting the "adv_target_adjustments" to true.  Basically this preference will automatically lower BG targets (to as low as "eating soon" mode target of 80 mg/dl) for persistent high BGs.  
 * Later in the day, a couple brief periods of insulin sensitivity were short-lived.

docs/docs/Customize-Iterate/autotune.md

@@ -82,7 +82,7 @@ If you are not running autotune as part of a closed loop, you can still run it a
 
 **Step 1b: Prep your Mac**
 * MAC USERS: Follow these steps instead of 1a above if you want to run autotune on your Mac. (Mac users can instead do the above instructions if they prefer to create a Linux virtual machine to run it on):
-* To run AutoTune using a Mac you will use the Terminal application. Open the Terminal application on your Mac (it is located in the Utilities application folder on your Mac). For more information about using Terminal see: http://openaps.readthedocs.io/en/latest/docs/introduction/understand-this-guide.html#before-you-get-started
+* To run AutoTune using a Mac you will use the Terminal application. Open the Terminal application on your Mac (it is located in the Utilities application folder on your Mac). For more information about using Terminal see: http://openaps.readthedocs.io/en/latest/docs/Understanding OpenAPS-Overview/overview-of-build-process.html#before-you-get-started
 * After you open a Terminal window, copy and paste the command for each of the Mac install command steps below, and then hit the return key after you paste each command, which will execute it. If you are asked for a password, enter the password for your Mac.
 * Tip for New Mac Users: If you typically use a Windows machine and you keep trying to do a control-c (copy) and control-v (paste), remember, on a Mac use command-c (copy) and command-v (paste) instead.
 * For example, the first step is to install Homebrew on your Mac. To do this you need to copy and paste the following command from step 1.) of the Mac install commands below and then hit the return key:  `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`

docs/docs/Customize-Iterate/bluetooth-tethering-edison.md

@@ -188,7 +188,7 @@ bnep0     Link encap:Ethernet  HWaddr 98:4f:ee:03:a6:91
 
 * About a minute after wifi comes back on (terminal session restores), your Edison should automatically disconnect the Bluetooth connection.
 
-Finally, it's time to take a walk.  About a minute after walking out of range of your home wifi, you should see that a device is connected to your phone via Bluetooth. Shortly after that you should see things update on Nightscout.  About a minute afer you come home, it should reconnect to wifi and automatically disconnect Bluetooth.
+Finally, it's time to take a walk.  About a minute after walking out of range of your home wifi, you should see that a device is connected to your phone via Bluetooth. Shortly after that you should see things update on Nightscout.  About a minute after you come home, it should reconnect to wifi and automatically disconnect Bluetooth.
 
 ### Additional App requirement on Android to enable automatic BT Tethering reconnects
 

docs/docs/Customize-Iterate/ifttt-integration.md

@@ -41,15 +41,15 @@ Want to be able to set or cancel temp targets from your phone, Pebble, Alexa, or
 
 ![IFTTT then](../Images/IFTTT_that.png)
 
-* Enter "maker" in the search field and click on the Maker Webhooks app
+* Enter "webhooks" in the search field and click on the Webhooks app
 
 ![IFTTT maker](../Images/IFTTT_maker.png)
 
-* Connect the Maker app
+* Connect the Webhooks app
 
 ![IFTTT maker connect](../Images/IFTTT_connect2.png)
 
-* Select the green "Make a Web Request" box
+* Select the blue "Make a Web Request" box
 
 ![IFTTT web request](../Images/IFTTT_webrequest.png)
 
@@ -67,7 +67,7 @@ Content Type: application/json
 
 Body:  The content of the body will depend on the action that you would like this particular button press to perform.  You can only do ONE of the actions per button.  Some sample content:
 
-### Example IFTTT trigger conent
+### Example IFTTT trigger content
 
 Eating soon
 ```
@@ -140,7 +140,7 @@ CGM Sensor Start
 
 * Download the IFTTT app on your phone and log in.
 
-* You can add homescreen quick buttons.  Click on your IFTTT app and login, click on My Applets in the bottom right corner, and then click on the applet that you'd like to work with.  From the the middle of the applet, click on the Widget Settings, and then click on the Add button for the Homescreen Icon.
+* You can add homescreen quick buttons.  Click on your IFTTT app and login, click on My Applets in the bottom right corner, and then click on the applet that you'd like to work with.  From the middle of the applet, click on the Widget Settings, and then click on the Add button for the Homescreen Icon.
 
 ![IFTTT homescreen](../Images/IFTTT_homescreen.png)
 

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

@@ -25,7 +25,7 @@ Dexcom CGM users have a few different alternatives to retrieve blood glucose val
    * xDrip: [http://stephenblackwasalreadytaken.github.io/xDrip/](http://stephenblackwasalreadytaken.github.io/xDrip/)
    * xDrip+: [https://jamorham.github.io/#xdrip-plus](https://jamorham.github.io/#xdrip-plus) 
 
-2. For iPhone users, you can set up a modified Loop app to bring data in locally.  The directions for this configuration are provided in the section below for local, offline BGs using Loop app.  
+2. For iPhone users, it is possible to setup a modified Loop app to bring data in locally such as the one you will find here: https://github.com/thebookins/Loop. This solution requires a build of an iOS app on a Mac and the use of a free Dev licenses (which will give you an app to test, but will only stay deployed for 7 days) or a full Dev license ($99/year). The modified Loop app will "listen in" for Dexcom data on iPhone, upload it to a scaled down version of Nightscout on your rig where xDrip is running. This solution requires some Mac OS and iOS savvy, and exploration.
 
 3. **EASIEST:** For either Android or iPhone users, you can plug the CGM receiver directly into your rig via USB. This will pull BGs into the rig directly from the receiver and be used for looping.  If you are a G4 user, this will also bring RAW BG data into the rig during sensor restarts or ??? times.  The rig will loop using RAW BGs so long as the BG value is under 150 mg/dl.  A few notes about how to make the direct-receiver configuration work:
 
@@ -143,7 +143,7 @@ http://<nightscout_api_secret>@<rig_ip_address1>:5000/api/v1/ http://<nightscout
   e.g. -
   `@reboot         python /home/root/.xDripAPS/xDripAPS.py`
 
-6. Cofigure the xDrip Android app -
+6. Configure the xDrip Android app -
   `xDrip > Settings > REST API Upload > Set Enabled and enter Base URL: http://[API_SECRET]@[Pi/Edison_IP_address]:5000/api/v1/`
 
   (Note: Enter your plain-text API_SECRET in the Android app, not the hashed version of it).

docs/docs/Customize-Iterate/oref1.md

@@ -3,7 +3,7 @@
 NOTE OF CAUTION:
 * oref1 is different than oref0, the baseline "traditional" OpenAPS implementation that only uses temporary basal rates.
 * You should have run oref0 (basic OpenAPS looping) for more than two weeks, and be very aware of all the types of situations in which your rig might fail, before you enable oref1-related features.
-* If running more then one rig, you will want to make sure all rigs are running an SMB-aware oref0 version (release 0.5.1 or higher) before enabling SMB on any of them (even if SMB is not enacted on all rigs, all rigs need to know about it).
+* If running more than one rig, you will want to make sure all rigs are running an SMB-aware oref0 version (release 0.5.1 or higher) before enabling SMB on any of them (even if SMB is not enacted on all rigs, all rigs need to know about it).
 
 ## Only run oref1 with the following caveats in mind: 
 
@@ -72,7 +72,7 @@ If Pushover API token and User key were added during the setup script and you ha
 
 ![Pushover example of carbs needed](../Images/Pushover_carbs_needed.PNG)
 
-* When SMB is active and hitting maxBolus.  This is intended to alert you when SMB is going "all out", and will tell you the total amount of insulin OpenAPS thinks you require (insulinReq) if current BG trends continue. **DO NOT just blindly bolus for the amount of insulinReq.** You will also see that the pushover alert lists the amount it is attempting to SMB. You should use this notification as a reminder to tell the rig about anything you know it doesn't (like "oh yea, I want to enter my carbs for this meal", or "oh, hold on, I need an activity mode, becuase I'm gonna go for a walk in a few minutes").  You can also decide if a manual meal bolus is appropriate, or if you'd like to manually bolus part of the insulinReq. **If you're just using insulinReq and not doing a normal meal bolus, you should NOT do the full insulinReq as a manual bolus**, as oref1 is already attempting to deliver part of it as a SMB.  SMB is designed to administer the insulinReq a little at a time, in order to be able to safely react if the BG rise slows or stops, so in cases where you might otherwise consider a correction bolus, it'll often be best to not do anything at all and let SMB safely handle the increased need for insulin.  If you do choose to do a small manual correction bolus for a portion of the insulinReq, be sure to subtract out the SMB oref1 is already delivering, and round down for safety.
+* When SMB is active and hitting maxBolus.  This is intended to alert you when SMB is going "all out", and will tell you the total amount of insulin OpenAPS thinks you require (insulinReq) if current BG trends continue. **DO NOT just blindly bolus for the amount of insulinReq.** You will also see that the pushover alert lists the amount it is attempting to SMB. You should use this notification as a reminder to tell the rig about anything you know it doesn't (like "oh yea, I want to enter my carbs for this meal", or "oh, hold on, I need an activity mode, because I'm gonna go for a walk in a few minutes").  You can also decide if a manual meal bolus is appropriate, or if you'd like to manually bolus part of the insulinReq. **If you're just using insulinReq and not doing a normal meal bolus, you should NOT do the full insulinReq as a manual bolus**, as oref1 is already attempting to deliver part of it as a SMB.  SMB is designed to administer the insulinReq a little at a time, in order to be able to safely react if the BG rise slows or stops, so in cases where you might otherwise consider a correction bolus, it'll often be best to not do anything at all and let SMB safely handle the increased need for insulin.  If you do choose to do a small manual correction bolus for a portion of the insulinReq, be sure to subtract out the SMB oref1 is already delivering, and round down for safety.
 
 ![(Pushover example of insulinReq](../Images/Pushover_insulinReq_SMB.PNG)
 

docs/docs/Customize-Iterate/update-your-rig.md

@@ -1,6 +1,6 @@
 # How to update your OpenAPS rig in the future
 
-You've probably heard about all kinds of cool new features that you want to try. If they're part of the master branch already, you just need to go enable them (usually by [re-running the oref0-setup script](http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-2/oref0-setup.html#re-running-the-setup-script)).
+You've probably heard about all kinds of cool new features that you want to try. If they're part of the master branch already, you just need to go enable them (usually by [re-running the oref0-setup script](http://openaps.readthedocs.io/en/latest/docs/Customize-Iterate/oref0-runagain.html)).
 
 However, if it's a brand-new feature that's being tested or is recently added to master, you'll need to install the new version of `oref0` first.  By the way, if you want to check which version of oref0 you are currently running, `npm list -g oref0` and if you want to check which branch `cd ~/src/oref0` and then `git branch`. 
 

docs/docs/Customize-Iterate/usability-considerations.md

@@ -2,6 +2,9 @@
 
 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:
 
+## **How do I enter carbs and boluses so OpenAPS can use them?**
+<br>Boluses always have to be set on the pump for OpenAPS to take them into consideration. Carbs cans 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>
+
 ## **What do you do with the loop in airport security when you travel**
 <br>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.)
 

docs/docs/Customize-Iterate/useful-mobile-apps.md

@@ -12,7 +12,7 @@ In order to connect to your rig wirelessly, sometimes you'll need it's IP addres
 
 ### iNet or NetAnalyzer (iPhone)
 
-There are many scanning apps for iPhone.  iNet or NetAnalyzer (lite version...don't need to pay for this to work) will scan the network that the phone is using for other connected devices and their IP addresses on that same network.  So, if you run the scan while your phone is on a wifi network, the scan will be for the wifi netowrk and range will likely be `192.168.1.1` to `192.168.1.254`.  If you have your rig connected via mobile hotspot, then the scan will be for devices in the mobile hotspot range of `172.10.20.1` to `172.10.20.20`. (IP address ranges depend on the type of network being scanned.)  Some people have had more success with the NetAnalyzer app over the iNet app, depending on their router settings.
+There are many scanning apps for iPhone.  iNet or NetAnalyzer (lite version...don't need to pay for this to work) will scan the network that the phone is using for other connected devices and their IP addresses on that same network.  So, if you run the scan while your phone is on a wifi network, the scan will be for the wifi network and range will likely be `192.168.1.1` to `192.168.1.254`.  If you have your rig connected via mobile hotspot, then the scan will be for devices in the mobile hotspot range of `172.10.20.1` to `172.10.20.20`. (IP address ranges depend on the type of network being scanned.)  Some people have had more success with the NetAnalyzer app over the iNet app, depending on their router settings.
 
 * Open the iNet app and click on the big `NETWORK SCANNER`.  If using NetAnalyzer app, click on the `LAN` button on bottom bar and then `scan` button in top right corner of app.
 
@@ -85,7 +85,7 @@ Some useful/fun commands from the Script Library that I've added to my Commands
 
 **Hardware Information**
 * **Show Disk Status** will run `df -h` which shows available memory on your rig.  If you ever have memory errors, this would be a helpful tool to see where your memory has been going.
-* **Show Current Version** will run the equivalent of `uname -a` and tell your which jubilinux version your rig is running.
+* **Show Current Version** will run the equivalent of `uname -a` and show which version of the Linux kernel your rig is running.  This can be useful in determining your Jubilinux version.
 * **Show USB Devices** will run `lsusb` and can help confirm your dexcom receiver is being properly recognized when plugged in.
 * **Show External IP address** will run `ifconfig` and show your rig's wifi (wlan0) IP address or hotspot (bnep0) IP address.
 
@@ -109,7 +109,7 @@ These are some of my favorite Commands:
 
 **Show known wifi networks** - If I'm headed to a friend's house or traveling, I may want to double check if I have their wifi network already saved to my rig.  This gives me a simple list of the wifi networks I have saved in the rig already, and helps me know if I want to add a new one before I travel.  For this command, simply enter `cat-wifi` in the command script body.  (note: if I actually want to add a wifi network, I would switch to Termius app or login on my computer to add a wifi network...SimpleSSH just isn't a robust editor)
 
-**git lock fix** - Probably the most common error in a rig is the `.git lock` error that happens on occassion and by deleting the .git directory, you can get back to looping quickly.  For this command, enter `rm -rf /root/myopenaps/.git` in the command script body.
+**git lock fix** - Probably the most common error in a rig is the `.git lock` error that happens on occasion and by deleting the .git directory, you can get back to looping quickly.  For this command, enter `rm -rf /root/myopenaps/.git` in the command script body.
 
 **mmtune** - If you want to check how well your pump tune strength is you can use this command script to test it `cd ~/myopenaps && sudo service cron stop && killall -g oref0-pump-loop && openaps mmtune && sudo service cron start`