Merge branch 'master' into dev

README.md

@@ -27,7 +27,7 @@ This community of contributors believes in "paying it forward," and individuals
 
 ## OpenAPS System Development Phases
 
-This documenation is organized into a series of phases that progressively build upon the openaps development tools towards a working OpenAPS system. [Click here for a visualization and breakdown of the phases](./OpenAPS_phase_visualization_Nov152015.png). The phases are as follows: 
+This documentation is organized into a series of phases that progressively build upon the openaps development tools towards a working OpenAPS system. [Click here for a visualization and breakdown of the phases](./OpenAPS_phase_visualization_Nov152015.png). The phases are as follows: 
 
 * [Phase 0: General Setup](docs/Overview/initial-setup.md)<br>
 Record baseline data, acquire and configure hardware, install software, and become familiar with the openaps environment

docs/Build-manual-system/Using-oref0-tools.md

@@ -55,7 +55,7 @@ The purpose of the `get-profile` process is to consolidate information from mult
   $ openaps report add settings/basal_profile.json JSON pump read_basal_profile_std
   ```
 
-* `max_iob` is an exception: in contrast to the other settings above, `max_iob` is not the result of an openaps report. It's a JSON file that should contain a single line, such as: `{"max_iob": 2}`. You can create this file by hand, or use the [oref0-mint-max-iob](https://github.com/openaps/oref0/blob/master/bin/basal_profile.json.sh) tool to generate the file. The max_iob variable represents an upper limit to how much insulin on board oref0 is allowed to contribute by enacting temp basals over a period of time. In the example above, `max_iob` equals 2 units of insulin.  
+* `max_iob` is an exception: in contrast to the other settings above, `max_iob` is not the result of an openaps report. It's a JSON file that should contain a single line, such as: `{"max_iob": 2}`. You can create this file by hand, or use the [oref0-mint-max-iob](https://github.com/openaps/oref0/blob/master/bin/oref0-mint-max-iob.sh) tool to generate the file. The max_iob variable represents an upper limit to how much insulin on board oref0 is allowed to contribute by enacting temp basals over a period of time. In the example above, `max_iob` equals 2 units of insulin.  
 
 Make sure you test invoking each of these reports as you set them up, and review the corresponding JSON files using `cat`. Once you have a report for each argument required by `get-profile`, you can add a `profile` report:
 

docs/Iterate-improve/improvement-projects.md

@@ -4,7 +4,7 @@ At this point, you're probably familiar enough to understand some of the limitat
 
 ### Using other pumps
 
-There's a group trying to figure out the Omnipod communication. There is an [omnidocs repository](https://github.com/openaps/omnidocs) that they may use to share their work, but they're more frequently chatting in a Slack channel. Email dana@openaps.org if you'd like to join that channel and check in on their progress.
+There's a group trying to figure out the Omnipod communication as well as Animas communication. There is an [omnidocs repository](https://github.com/openaps/omnidocs) that they may use to share their work, but they're more frequently chatting in a Slack channel. [Click here](http://bit.ly/1nTtccH) to join that collaboration channel and check in on their progress.
 
 ### Using other devices instead of a raspberry pi
 

docs/getting-started/hardware.md

@@ -2,7 +2,7 @@
 # Hardware
 This section describes the hardware components required for a 'typical' OpenAPS implementation. There are numerous variations and substitutions that can be made but the following items are recommended for getting started. If you come across something that doesn't seem to work, is no longer available, or if you have a notable alternative, feel free to edit this document with your suggestions.
 
-If you're interested in working on communication for another pump (Omnipod, Animas, etc), email Dana (dana@OpenAPS.org) to be added to the collaboration group focusing on alternative pump communication.
+If you're interested in working on communication for another pump (Omnipod, Animas, etc), [click here](http://bit.ly/1nTtccH) to join the collaboration group focusing on alternative pump communication.
 
 
 ## Required  Hardware
@@ -50,7 +50,7 @@ Due to changes in the firmware, the openaps tools are only able to function in f
 
 If you need to acquire an appropriate pump check CraigsList or other sites like Medwow or talk to friends in your local community to see if there are any old pumps lying around in their closets gathering dust. [MedWow](http://www.medwow.com) is an eBay-like source for used pumps. Note: If you're buying a pump online, we recommended you ask the seller to confirm the firmware version of the pump. (You may also want to consider asking for a video of the pump with working functionality before purchasing.)
 
-There are several #OpenAPS participants working on ways to use other pumps (including non-Medtronic models). If you would like to get more information on the progress in these areas, email dana@OpenAPS.org to be added to the Slack communication channel.
+There are several #OpenAPS participants working on ways to use other pumps (including non-Medtronic models). If you would like to get more information on the progress in these areas, take a look at the [#OpenAPS Google Group](https://groups.google.com/d/forum/openaps-dev) or [click here to join the Slack channel](http://bit.ly/1nTtccH). 
 
 
 ### CareLink USB Stick

docs/getting-started/rpi.md

@@ -206,6 +206,8 @@ to expand filesystem, change user password and set timezone (in internationaliza
 
 ## Setup Password-less Login [optional]
 
+We will now setup a public/private key identity, and configure your local computer and the Raspberry Pi to automatically use it, in order to allow convenient future ssh access to the Pi without requiring a password.
+
 ### Windows
 
 If you don't already have an SSH key, follow [this guide](https://help.github.com/articles/generating-ssh-keys/) from GitHub to create one.
@@ -222,13 +224,19 @@ Now you should be able to log in without a password. Try to SSH into the RPi2 ag
 
 
 ### Mac and Linux
-If you don't already have an ssh key, then on your local computer ( *not* on the Pi ), by running `ssh-keygen` (keep hitting enter to accept all the defaults)
+If you don't already have an ssh key, then on your local computer (*not* on the Pi), run `ssh-keygen` (keep hitting enter to accept all the defaults).
+
+If you created a new key identity and accepted all of the defaults, then the name of the newly generated identity will be `id_rsa`. However, if you set a custom name for the new identity (e.g. `id_mypi`), then you will need to add it to your local ssh keyring, via `ssh-add ~/.ssh/id_mypi`.
+
+Next create a .ssh directory on the Pi: `ssh pi@raspberrypi.local`, enter the password for the `pi` user on the Pi, and run `mkdir .ssh`.
+
+Next, add your new identity to the list of identities for which the Pi's `pi` user grants access via ssh:
 
-Next create a .ssh directory on the Pi: `ssh pi@raspberrypi.local`, enter your password, and run `mkdir .ssh`
+`cat ~/.ssh/<id_name>.pub | ssh pi@raspberrypi.local 'cat >> .ssh/authorized_keys'`
 
-Next copy your public key to the Pi: `scp ~/.ssh/id_rsa.pub pi@raspberrypi.local:~/.ssh/authorized_keys`
+Instead of appending it to the list of authorized keys, you may simply copy your public key to the Pi, **overwriting its existing list of authorized keys**: `scp ~/.ssh/<id_name>.pub pi@raspberrypi.local:~/.ssh/authorized_keys`
 
-Finally `ssh pi@raspberrypi.local` to make sure you can log in without a password.
+Finally, `ssh pi@raspberrypi.local` to make sure you can log in without a password.
 
 ### Disabling password login [optional]
 To secure the Pi, you should either set a password (using `sudo raspi-config` above, or with `sudo passwd`), or disable password login completely. If you want to disable password login (so you can only log in with your ssh key), open the `sshd_config` file in nano text editor on the Pi as follows