poptoshell - Tweak pop-up-windows mention

and experiment with rebasing to get stuff from master branch. I don't
quite have the knack - I had to cherry-pick.

diff --git a/poptoshell.el b/poptoshell.el
index c5a1ed728ee66c676a08c2856e52d8894b8b5ae6..63b74ab696bb28190297afab9ebdb62a4473677d 100644 (file)
--- a/poptoshell.el
+++ b/poptoshell.el
@@ -124,8 +124,8 @@ Emacs tramp syntax to launch a remote shell.
  - If not in a shell buffer (or with universal argument), go to a
    window that is already showing the (a) shell buffer, if any.
 
-   We use `pop-up-windows', so you can adjust/customize that
-   to control the other-buffer/same-buffer behavior.
+   We use `pop-up-windows', so you can adjust/customize it
+   to set the other-buffer/same-buffer behavior.
 
    In this case, the cursor is left in its prior position in the
    shell buffer. Repeating the command will then go to the