Merge branch 'master' into hide-emojis

docs/basics.rst

@@ -203,7 +203,7 @@ To make inclusive or exclusive version comparisons you can use: ::
     $ pipenv install "requests<=2.13"  # will install a version equal or lower than 2.13.0
     $ pipenv install "requests>2.19"   # will install 2.19.1 but not 2.19.0 
 
-.. note:: The use of ``" "`` around the package and version specification is highly recommended 
+.. note:: The use of double quotes around the package and version specification (i.e. ``"requests>2.19"``) is highly recommended
     to avoid issues with `Input and output redirection <https://robots.thoughtbot.com/input-output-redirection-in-the-shell>`_
     in Unix-based operating systems. 
 

news/3522.doc.rst

@@ -0,0 +1 @@
+Clarify wording in Basic Usage example on using double quotes to escape shell redirection

peeps/PEEP-0004.md

@@ -0,0 +1,9 @@
+## PEEP-003: Subcommands
+
+NOT YET ACCEPTED
+
+Pipenv will automatically run commands like "pipenv deploy" if the "pipenv-deploy" binary is available on the path.
+
+These subcommands cannot overwrite built-in commands.
+
+These subcommands will receive environment variables with contextual information.

pipenv/cli/options.py

@@ -294,8 +294,9 @@ def code_option(f):
         if value:
             state.installstate.code = value
         return value
-    return option("--code", "-c", nargs=1, default=False, help="Import from codebase.",
-                  callback=callback, expose_value=False)(f)
+    return option("--code", "-c", nargs=1, default=False, help="Install packages "
+                  "automatically discovered from import statements.", callback=callback,
+                  expose_value=False)(f)
 
 
 def deploy_option(f):