From 398de2d4a2f5cd2618a4e3002bd5c2f51cd3c1ff Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Tue, 5 Jun 2018 17:27:33 -0700 Subject: [PATCH] user-manual: Suggest https, [arch=amd64]. Fix typos. --- doc/user-manual/user.texinfo | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo index ac176bab2..47dfd534b 100644 --- a/doc/user-manual/user.texinfo +++ b/doc/user-manual/user.texinfo @@ -24,7 +24,7 @@ @copying This manual documents the use of MIT/GNU Scheme Pucked @value{SCMVERS}. -Copyright @copyright{} 2016, 2017, 2018 Matthew Birkholz +Copyright @copyright{} 2016, 2017, 2018 Matthew Birkholz Copyright @copyright{} 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -110,7 +110,7 @@ list of user-visible changes is provided in @ref{Release Notes}. The primary distribution site for this software is @example -@uref{http://birchwood-abbey.net/~puck/Scheme/} +@uref{https://birchwood-abbey.net/~puck/Scheme/} @end example @cindex bugs, reporting @@ -4002,7 +4002,7 @@ only for your stable worlds. MIT/GNU Scheme Pucked and its plugins are now available as packages for recent versions of Ubuntu on Intel@registeredsymbol{}64 and IA-32 architecture machines. If -@uref{http://birchwood-abbey.net/~puck/Scheme/} has links to packages +@uref{https://birchwood-abbey.net/~puck/Scheme/} has links to packages for your Ubuntu, you can use your Ubuntu package manager to add, remove and update Scheme and its plugins. @xref{Ubuntu Installation}. @@ -4033,22 +4033,27 @@ It is available at this URL: @url{https://birchwood-abbey.net/codemaster.txt} @end example -You should save the page, e.g. as @file{puck.txt} in your downloads -folder, then install the key with the @code{apt-key} command. +You should save the page, e.g. as @file{codemaster.txt} in your +downloads folder, then install the key with the @code{apt-key} +command. @example -sudo apt-key add ~/Downloads/puck.txt +sudo apt-key add ~/Downloads/codemaster.txt @end example -Next add the repository to your list of package sources. -On Ubuntu 17.10 (Artful Aardvark) you would use this command: +Next add the repository to your list of package sources. On Ubuntu +18.04 you would use this command: @example sudo add-apt-repository \ - "deb http://birchwood-abbey.net/ubuntu/17.10/ artful main" + "deb http://birchwood-abbey.net/ubuntu/18.04/ birchwood main" @end example -or by editing files in @file{/etc/apt/}. +or by editing files in @file{/etc/apt/}. Note that if you are +installing to an amd64 machine with ``multiarch'' enabled (such that +the command @code{dpkg --print-foreign-architectures} prints +@code{i386}) you will want to add @code{[arch=amd64]} after @code{deb} +in the repository description to avoid spurious warnings. Finally, use your package manager to update its list of available packages and choose the Scheme plugins you would like to install. @@ -4072,8 +4077,8 @@ be @emph{three} packages named @code{mit-scheme-pucked} with the @emph{same} version, each compiled for Ubuntu 16.04, 17.10 or 18.04. When you upgrade to a new version of Ubuntu you should first remove -the @code{mit-scheme-pucked} package (and all of its plugins), then -re-install them after changing the source URL (e.g. to +the @code{mit-scheme-pucked} package (which will remove all of its +plugins), then re-install them after changing the source URL (e.g. to @url{http://birchwood-abbey.net/ubuntu/18.04/}). You can also download the package files and install them by hand. @@ -4081,7 +4086,7 @@ Links to the available package files are listed on the project home page. @example -@uref{http://birchwood-abbey.net/~puck/Scheme/} +@uref{https://birchwood-abbey.net/~puck/Scheme/} @end example You will need to know your Ubuntu version (e.g. 16.10) and Debian -- 2.25.1