Merge branch 'main' into remotessh

Author: awdeorio

docs/cli.md

@@ -480,7 +480,7 @@ This section contains some more useful commands.
 
 For example, download the starter files for EECS 280 project 1:
 ```console
-$ wget https://eecs280staff.github.io/p1-stats/starter-files.tar.gz
+$ wget https://eecs280staff.github.io/stats/starter-files.tar.gz
 $ ls
 starter-files.tar.gz
 ```
@@ -500,8 +500,8 @@ $ tree
 │   ├── main_test.in
 │   ├── main_test.out.correct
 │   ├── main_test_data.tsv
-│   ├── p1_library.cpp
-│   ├── p1_library.hpp
+│   ├── library.cpp
+│   ├── library.hpp
 │   ├── stats.hpp
 │   ├── stats_public_test.cpp
 │   └── stats_tests.cpp.starter
@@ -511,7 +511,7 @@ $ tree
 ### `diff`
 `diff` compares two files.
 
-Here's an example from EECS 280 project 1 ([full example](https://eecs280staff.github.io/p1-stats/#testing-1)).  No output means the files are identical.
+Here's an example from EECS 280 project 1 ([full example](https://eecs280staff.github.io/stats/#testing-1)).  No output means the files are identical.
 ```console
 $ diff main_test.out main_test.out.correct
 ```

docs/setup_caen.md

@@ -36,11 +36,11 @@ To access CAEN Linux from off campus, you'll first need to connect to the UM VPN
 Test an SSH connection.  Be sure to change `awdeorio` to your own uniqname.
 
 ```console
-$ ssh -T [email protected]
-The authenticity of host 'login.engin.umich.edu (141.213.74.65)' can't be established.
+$ ssh -T awdeorio@login-course.engin.umich.edu
+The authenticity of host 'login-course.engin.umich.edu (141.213.74.65)' can't be established.
 ECDSA key fingerprint is SHA256:LL0GPTtaVGa6gvv2kVpGq4ZULA1l5pw2wXC4dK3ymIk.
 Are you sure you want to continue connecting (yes/no)? yes
-Warning: Permanently added 'login.engin.umich.edu,141.213.74.65' (ECDSA) to the list of known hosts.
+Warning: Permanently added 'login-course.engin.umich.edu,141.213.74.65' (ECDSA) to the list of known hosts.
 Password: 
 Duo two-factor login for awdeorio
 
@@ -56,10 +56,20 @@ Success. Logging you in...
 -bash-4.2$ 
 ```
 
+If you are prompted with
+
+```console
+The host key is known by the following other names/addresses:
+    ~/.ssh/known_hosts:1: login.engin.umich.edu
+Are you sure you want to continue connected (yes/no/[fingerprint])?
+````
+
+Enter **yes**. This is due to CAEN's Linux Remote Login Service changing URLs.
+
 Exit as soon as your test is successful.
 ```console
 $ exit
-Connection to login.engin.umich.edu closed.
+Connection to login-course.engin.umich.edu closed.
 ```
 
 <div class="primer-spec-callout warning" markdown="1">
@@ -84,17 +94,17 @@ $ make clean
 
 Next, copy files using `rsync`.  Remember to change `awdeorio` to your username.
 ```console
-$ rsync -rtv --exclude '.git*' ../p1-stats/ [email protected]:p1-stats-copy/
+$ rsync -rtv --exclude '.git*' ../stats/ awdeorio@login-course.engin.umich.edu:stats-copy/
 building file list ... done
-created directory p1-stats-copy
+created directory stats-copy
 ./
 Makefile
 main.cpp
 main_test.in
 main_test.out.correct
 main_test_data.tsv
-p1_library.cpp
-p1_library.hpp
+library.cpp
+library.hpp
 stats.cpp
 stats.hpp
 stats_public_test.cpp
@@ -111,7 +121,7 @@ total size is 8818  speedup is 0.90
 ## Login with `ssh`
 Now log in to CAEN Linux.  Your terminal is now a shell on a *different computer*, `caen-vnc-vm16` in this example.  Yours may be different.  Don't forget to change `awdeorio` to your own uniqname.
 ```console
-$ ssh [email protected]
+$ ssh awdeorio@login-course.engin.umich.edu
 $ hostname
 caen-vnc-vm16.engin.umich.edu
 ```
@@ -123,12 +133,12 @@ caen-vnc-vm16.engin.umich.edu
 Notice that the folder copied earlier.
 ```console
 $ ls
-p1-stats-copy
+stats-copy
 ```
 
 Change directory into the copied folder and double-check that all binary files are cleaned up.
 ```console
-$ cd p1-stats-copy
+$ cd stats-copy
 $ make clean
 ```
 
@@ -174,7 +184,7 @@ Host *
 
 SSH into CAEN Linux.
 ```console
-$ ssh [email protected]
+$ ssh awdeorio@login-course.engin.umich.edu
 Password:
 Duo two-factor login for awdeorio
 
@@ -192,7 +202,7 @@ $
 
 Open a second terminal and run an `rsync` command, which uses the new configuration.  No authentication is required!
 ```console
-$ rsync -rtv --exclude '.git*' ../p1-stats/ [email protected]:p1-stats-copy/
+$ rsync -rtv --exclude '.git*' ../stats/ awdeorio@login-course.engin.umich.edu:stats-copy/
 building file list ... done
 
 sent 273 bytes  received 20 bytes  586.00 bytes/sec
@@ -217,39 +227,39 @@ An alternative to copying code to CAEN Linux is checking out a your code from Gi
 
 SSH to a CAEN Linux machine and see the copy we made earlier using `rsync`.
 ```console
-$ ssh [email protected]
+$ ssh awdeorio@login-course.engin.umich.edu
 $ ls
-p1-stats-copy  # this is from our rsync'ed copy earlier
+stats-copy  # this is from our rsync'ed copy earlier
 ```
 
 Notice that the copy is *not* under version control.
 ```console
-$ cd p1-stats-copy
+$ cd stats-copy
 $ git status
 fatal: Not a git repository (or any of the parent directories): .git
 ```
 
 Change directory and `git clone` your repo.
 ```console
 $ cd ~  # This will move to your home directory
-$ git clone https://github.com/awdeorio/p1-stats.git
+$ git clone https://github.com/awdeorio/stats.git
 $ ls
-p1-stats p1-stats-copy
+stats stats-copy
 ```
 
 ## Pro-tips
 
 ### Synchronizing deleted files
 Tell `rsync` to synchronize deleted files.  In other words, if it's gone on your laptop, delete it on CAEN.
 ```console
-$ rsync -rtv --delete --exclude '.git*' ../p1-stats/ [email protected]:p1-stats-copy/
+$ rsync -rtv --delete --exclude '.git*' ../stats/ awdeorio@login-course.engin.umich.edu:stats-copy/
 ```
 {: data-variant="no-line-numbers" }
 
 ### Don't synchronize Git-ignored files
 Tell `rsync` not to synchronize files ignored by Git.  You can also combine this option with `--delete`.
 ```console
-$ rsync -rtv --exclude '.git*' --filter=':- .gitignore' ../p1-stats/ [email protected]:p1-stats-copy/
+$ rsync -rtv --exclude '.git*' --filter=':- .gitignore' ../stats/ awdeorio@login-course.engin.umich.edu:stats-copy/
 ```
 {: data-variant="no-line-numbers" }
 
@@ -263,8 +273,8 @@ sync :
   --delete \
   --exclude '.git*' \
   --filter=':- .gitignore' \
-  ../p1-stats/ \
-  [email protected]:p1-stats-copy/
+  ../stats/ \
+  awdeorio@login-course.engin.umich.edu:stats-copy/
 ```
 
 Now you can type `make sync` as a short cut.
@@ -275,8 +285,8 @@ rsync \
   --delete \
   --exclude '.git*' \
   --filter=':- .gitignore' \
-  ../p1-stats/ \
-  [email protected]:p1-stats-copy/
+  ../stats/ \
+  awdeorio@login-course.engin.umich.edu:stats-copy/
 building file list ... done
 ./
 Makefile

docs/setup_eecs281.md

@@ -12,14 +12,14 @@ This tutorial walks through EECS 281 project setup using EECS 280 tutorials.
 VS Code works great for EECS 281 projects.  Just ask one of the IAs or GSIs who use VS Code if you need help.
 
 ## Visual debugger
-Set up your project in your visual debugger.  We'll use the project name `p1-stats` in this example, but your project name may be different.  If your project has starter files, you'll need the link from the project spec.
+Set up your project in your visual debugger.  We'll use the project name `stats` in this example, but your project name may be different.  If your project has starter files, you'll need the link from the project spec.
 
 | [VS Code Tutorial](https://eecs280staff.github.io/tutorials/setup_vscode.html)| [Visual Studio Tutorial](https://eecs280staff.github.io/tutorials/setup_visualstudio.html) | [Xcode Tutorial](https://eecs280staff.github.io/tutorials/setup_xcode.html) |
 
 After you're done, you should have a folder with a main file.  Your files may be different.
 ```console
-$ tree p1-stats/
-p1-stats/
+$ tree stats/
+stats/
 ├── main.cpp
     ...
 ```
@@ -175,7 +175,7 @@ When you're working alone version control is optional, but it provides benefits:
 - Code backup
 - Easy to try and revert ideas
 
-Set up version control using the [Version control tutorial](https://eecs280staff.github.io/p1-stats/setup_git.html).  If you've used version control before on your computer, you'll probably want to start with the [Create a local repository](https://eecs280staff.github.io/p1-stats/setup_git.html#create-a-local-repository) section.
+Set up version control using the [Version control tutorial](https://eecs280staff.github.io/stats/setup_git.html).  If you've used version control before on your computer, you'll probably want to start with the [Create a local repository](https://eecs280staff.github.io/stats/setup_git.html#create-a-local-repository) section.
 
 After you're done, you should have a local repository with a "clean" status and your local repository should be connected to a remote GitHub repository.
 ```console
@@ -185,11 +185,11 @@ Your branch is up-to-date with 'origin/main'.
 
 nothing to commit, working tree clean
 $ git remote -v
-origin	https://github.com/awdeorio/p1-stats.git (fetch)
-origin	https://github.com/awdeorio/p1-stats.git (push)
+origin	https://github.com/awdeorio/stats.git (fetch)
+origin	https://github.com/awdeorio/stats.git (push)
 ```
 
-You should have a `.gitignore` file ([instructions](https://eecs280staff.github.io/p1-stats/setup_git.html#create-a-local-repository)).
+You should have a `.gitignore` file ([instructions](https://eecs280staff.github.io/stats/setup_git.html#create-a-local-repository)).
 ```console
 $ head .gitignore
 This is a sample .gitignore file that's useful for C++ projects.

docs/setup_emacs.md

@@ -199,19 +199,19 @@ Here are a few basic customizations that you might like.  Paste with `C-y`.
 Set up [`use-package`](https://github.com/jwiegley/use-package), which automates package installation and configuration.
 
 ```elisp
-;; Configure built in package manager
+;; Configure built-in package manager
 (require 'package)
-(package-initialize)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
 (add-to-list 'package-archives '("gnu" . "https://elpa.gnu.org/packages/"))
+(package-initialize)
 
-;; Install use-package
-;; https://github.com/jwiegley/use-package
-(when (not (package-installed-p 'use-package))
+;; Install and configure use-package
+(unless (package-installed-p 'use-package)
   (package-refresh-contents)
   (package-install 'use-package))
 (eval-when-compile
   (require 'use-package))
+(setq use-package-always-defer t)  ; Globally defer package loading
 ```
 
 ### Undo/redo
@@ -281,8 +281,8 @@ Emacs doesn't require any special setup for a project.
 Create a new directory, then move into the new directory. Your folder location might be different.
 
 ```console
-$ mkdir ~/eecs280/p1-stats
-$ cd ~/eecs280/p1-stats
+$ mkdir ~/eecs280/stats
+$ cd ~/eecs280/stats
 ```
 
 ### Add new files
@@ -310,11 +310,11 @@ int main() {
 ### Add existing files
 Emacs doesn't require any special steps for adding existing files.
 
-If you have starter files, add them to your project directory.  This example is from [EECS 280 Project 1](https://eecs280staff.github.io/p1-stats/), but this tutorial doesn't require understanding the files.  Your URL or files might be different.
+If you have starter files, add them to your project directory.  This example is from [EECS 280 Project 1](https://eecs280staff.github.io/stats/), but this tutorial doesn't require understanding the files.  Your URL or files might be different.
 
 Download, unpack, and move the starter files into the directory that already contains `main.cpp`.  Your URL or folder might be different.
 ```console
-$ wget https://eecs280staff.github.io/p1-stats/starter-files.tar.gz
+$ wget https://eecs280staff.github.io/stats/starter-files.tar.gz
 $ tar -xvzf starter-files.tar.gz
 $ mv starter-files/* .
 $ rm -rf starter-files starter-files.tar.gz
@@ -328,8 +328,8 @@ $ tree
 ├── cats.csv
 ├── cats.out.correct
 ├── main.cpp
-├── p1_library.cpp
-├── p1_library.hpp
+├── library.cpp
+├── library.hpp
 ├── stats.hpp
 ├── stats_public_tests.cpp
 ├── stats_tests.cpp.starter
@@ -490,21 +490,21 @@ $ emacs
 
 SSH into your remote server, CAEN Linux in this example.  This will set up an SSH multiplexing connection.
 ```console
-$ ssh login.engin.umich.edu
+$ ssh login-course.engin.umich.edu
 ...
 ```
 
-In Emacs, open the file `/ssh:login.engin.umich.edu:main.cpp`.  Recall `C-x C-f` is `find-file`.  Tab completion works in the minibuffer.  You're now editing a file `main.cpp` on a remote server.
+In Emacs, open the file `/ssh:login-course.engin.umich.edu:main.cpp`.  Recall `C-x C-f` is `find-file`.  Tab completion works in the minibuffer.  You're now editing a file `main.cpp` on a remote server.
 
 ### Pair programming with tmux
 Pair program on a remote machine with two people inside the same Emacs instance.  We'll use tmux, which is a terminal multiplexer.
 
 Alice connects to a remote server containing her code.  She starts a tmux session named `shared`.  Then, she starts Emacs inside that tmux session.
 ```console
-$ ssh login.engin.umich.edu
+$ ssh login-course.engin.umich.edu
 $ hostname
 caen-vnc-vm05.engin.umich.edu
-$ cd p1-stats
+$ cd stats
 $ tmux new -s shared
 $ emacs -nw main.cpp
 ```