Merge branch 'master' into fix-local-mode-root-files

Author: jmahlik

src/sagemaker/algorithm.py

@@ -71,9 +71,8 @@ def __init__(
                 access training data and model artifacts. After the endpoint
                 is created, the inference code might use the IAM role, if it
                 needs to access an AWS resource.
-            instance_count (int): Number of Amazon EC2 instances to
-                use for training. instance_type (str): Type of EC2
-                instance to use for training, for example, 'ml.c4.xlarge'.
+            instance_count (int): Number of Amazon EC2 instances to use for training.
+            instance_type (str): Type of EC2 instance to use for training, for example, 'ml.c4.xlarge'.
             volume_size (int): Size in GB of the EBS volume to use for
                 storing input data during training (default: 30). Must be large enough to store
                 training data if File Mode is used (which is the default).