user.texinfo: Punt more multiarch. Change distribution. Edits.

diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo
index eef1a00710d2c3a96aac256f4f62d9a5a28aea76..81f3a5567e6cba60d3f6750859dc772a7cca7e95 100644 (file)
--- a/doc/user-manual/user.texinfo
+++ b/doc/user-manual/user.texinfo
@@ -415,7 +415,9 @@ list of directories that is searched to find various library files, such
 as bands.  If this option is not given, the value of the environment
 variable @env{MITSCHEME_LIBRARY_PATH} is used; if that isn't defined,
 the default is used.  The elements of the list are separated by colons.
-The default value is @file{/usr/local/lib/mit-scheme-pucked-@var{ARCH}}.
+The default value is @file{/usr/local/lib/mit-scheme-pucked} (unless
+you configured Scheme to install in a different @code{--prefix},
+@pxref{Build Configuration}).
 
 @item --fasl @var{filename}
 @opindex --fasl
@@ -594,7 +596,8 @@ The initial band to be loaded.  The default value is @file{all.com}.
 A list of directories.  These directories are searched,
 left to right, to find bands and various other files.
 The list is colon-separated, with the default
-@file{/usr/local/lib/mit-scheme-pucked-@var{ARCH}}.
+@file{/usr/local/lib/mit-scheme-pucked} (unless you configured Scheme
+to install in a different @code{--prefix}, @pxref{Build Configuration}).
 
 @item MITSCHEME_CONSTANT
 @nvindex MITSCHEME_CONSTANT
@@ -4024,7 +4027,7 @@ Next add the repository to your list of package sources.
 On Ubuntu 16.10 (Yakkety Yak) you would use this command:
 @example
 sudo add-apt-repository \
-        -s "deb http://birchwood-abbey.net/ubuntu/ yakkety main"
+        -s "deb http://birchwood-abbey.net/ubuntu/ birchwood yakkety"
 @end example
 or by editing files in @file{/etc/apt/}.
 
@@ -4041,7 +4044,7 @@ sudo apt-get update
 sudo apt-get install mit-scheme-pucked-x11-screen
 @end example
 
-You can download the package files and install them by hand.  Links to
+You can also download the package files and install them by hand.  Links to
 the available package files are listed on the project home page.
 @example
 @uref{http://birchwood-abbey.net/~matt/Scheme/}
@@ -4052,9 +4055,9 @@ link.  You will need to do this for your chosen plugin, all of the
 plugins it requires, and Scheme itself (the @code{mit-scheme-pucked}
 package).
 
-For example if you want Edwin to display in an X11 window, you will
-want to install the @code{x11-screen} plugin, which requires the
-@code{edwin} plugin, which requires several more.  Each entry on the
+For example if you want Edwin to display in an X11 window you will
+want to install the @code{x11-screen} plugin which requires the
+@code{edwin} plugin which requires several more.  Each entry on the
 project home page lists the package files available for a plugin
 @emph{and} all of its required plugins.
 
@@ -4079,7 +4082,7 @@ sha256sum mit-scheme-pucked_9.2.7-1_amd64.deb
 @end example
 
 After you have downloaded and verified all of the required files, you
-can install them, required packages first, starting with
+can install them, required packages first, e.g.@: starting with
 @code{mit-scheme-pucked} and finishing with
 @code{mit-scheme-pucked-x11-screen}.
 @verbatim
@@ -4120,7 +4123,7 @@ slower than the native machine.
 
 Click on the name of your Scheme machine architecture in the list of
 binaries for the core system.  Save the file, which should be named
-something like @file{mit-scheme-pucked-9.2.7-amd64.tar.gz}.
+something like @file{mit-scheme-pucked-9.2.7-i386.tar.gz}.
 
 Compile the Scheme interpreter using the following steps:
 @enumerate
@@ -4137,6 +4140,7 @@ Move into the @file{src} subdirectory of the new directory:
 cd mit-scheme-pucked-9.2.7/src
 @end example
 @item
+@anchor{Build Configuration}
 Configure the software:
 @example
 ./configure
@@ -4144,16 +4148,16 @@ Configure the software:
 
 By default, the software will be installed in @file{/usr/local}, in
 the subdirectories @file{bin} and @file{lib}.  If you want it
-installed somewhere else, for example @file{/opt/mit-scheme-pucked}, pass the
+installed somewhere else, for example @file{/opt}, pass the
 @option{--prefix} option to the configure script, as in the
 command line below.
 @example
-./configure --prefix=/opt/mit-scheme-pucked
+./configure --prefix=/opt
 @end example
 
-The configure script accepts all the normal arguments for such
+The configure script accepts all of the normal arguments for such
 scripts, and additionally accepts some that are specific to MIT/GNU
-Scheme.  To see all the possible arguments and their meanings, run the
+Scheme.  To see the possible arguments and their meanings, run the
 command @code{./configure --help}.
 
 @item
@@ -4183,7 +4187,7 @@ download the source for any plugins your desired plugins require.  You
 will need to build and install each required plugin before the plugins
 that require it.
 
-If you are looking for the same functionality as in the stable MIT/GNU
+If you are looking for the same functionality you found in MIT/GNU
 Scheme you will want all of the plugins listed in the ``Former
 Microcode Modules'' section of the home page.  Your desired plugins
 are: blowfish, edwin, gdbm, imail, mcrypt, md5, mhash, x11, and
@@ -4216,12 +4220,12 @@ You can put a writable directory at the front of your host Scheme's
 library path by setting the @code{MITSCHEME_LIBRARY_PATH} environment
 variable
 @example
-export MITSCHEME_LIBRARY_PATH=~/pucked:/opt/mit-scheme-pucked
+export MITSCHEME_LIBRARY_PATH=~/pucked:/opt/lib/mit-scheme-pucked
 @end example
 @noindent
 or including the @code{--library} option on the command line.
 @example
-mit-scheme-pucked --library ~/pucked:/opt/mit-scheme-pucked
+mit-scheme-pucked --library ~/pucked:/opt/lib/mit-scheme-pucked
 @end example
 
 The build will fail if the required plugins (Cairo, Pango and GLib)