Merge from origin/emacs-25

850ba44 Clarify lexical binding with symbol args behavior
f981b31 * lisp/net/tramp-sh.el (tramp-remote-path): Doc fix.
68fc964 * lisp/net/tramp-sh.el (tramp-remote-path): Doc fix.  (Bug#23...
21110af Avoid assertion violations when rendering some fonts
6192b6c Document more details of package activation
272ddc6 Fixup warning message regarding HOME a bit more
43206d6 * lisp/leim/quail/indian.el ("bengali-probhat"): Change indic...
d41f7ff Fix input method "probhat" for Bengali
c150a64 ; Fix typo in commit before last
ebf0472 Add to elisp-completion-at-point's docstring
fd9fad0 Give more helpful warning about setting HOME
ea6b01d ; * lisp/term.el (term-mode): FIXME comment about bidi reorde...

# Conflicts:
#	lisp/term.el

2 files changed, 14 insertions, 10 deletions

diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index 3c09983805..5662c857de 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -238,10 +238,12 @@ controlled by the value of @code{package-menu-hide-low-priority}.)
 
   Once a package is downloaded and installed, it is @dfn{loaded} into
 the current Emacs session.  Loading a package is not quite the same as
-loading a Lisp library (@pxref{Lisp Libraries}); its effect varies
-from package to package.  Most packages just make some new commands
-available, while others have more wide-ranging effects on the Emacs
-session.  For such information, consult the package's help buffer.
+loading a Lisp library (@pxref{Lisp Libraries}); loading a package
+adds its directory to @code{load-path} and loads its autoloads.  The
+effect of a package's autoloads varies from package to package.  Most
+packages just make some new commands available, while others have more
+wide-ranging effects on the Emacs session.  For such information,
+consult the package's help buffer.
 
   By default, Emacs also automatically loads all installed packages in
 subsequent Emacs sessions.  This happens at startup, after processing
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index dd3f18be4e..418a4161a7 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -974,7 +974,7 @@ itself.
 
 @cindex lexical environment
   Here is how lexical binding works.  Each binding construct defines a
-@dfn{lexical environment}, specifying the symbols that are bound
+@dfn{lexical environment}, specifying the variables that are bound
 within the construct and their local values.  When the Lisp evaluator
 wants the current value of a variable, it looks first in the lexical
 environment; if the variable is not specified in there, it looks in
@@ -1032,11 +1032,13 @@ lives on even after the @code{let} binding construct has exited.  Each
 time we evaluate the closure, it increments @code{x}, using the
 binding of @code{x} in that lexical environment.
 
-  Note that functions like @code{symbol-value}, @code{boundp}, and
-@code{set} only retrieve or modify a variable's dynamic binding
-(i.e., the contents of its symbol's value cell).  Also, the code in
-the body of a @code{defun} or @code{defmacro} cannot refer to
-surrounding lexical variables.
+  Note that unlike dynamic variables which are tied to the symbol
+object itself, the relationship between lexical variables and symbols
+is only present in the interpreter (or compiler).  Therefore,
+functions which take a symbol argument (like @code{symbol-value},
+@code{boundp}, and @code{set}) can only retrieve or modify a
+variable's dynamic binding (i.e., the contents of its symbol's value
+cell).
 
 @node Using Lexical Binding
 @subsection Using Lexical Binding