From b89b19ce41120a76ffb53e05ec69cc2c79b2e6c4 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Thu, 11 Jan 2018 20:42:12 -0700 Subject: [PATCH] doc: Change signing key location in user.texinfo. Update style.css. --- doc/style.css | 50 ++++++++++++++++-------------------- doc/user-manual/user.texinfo | 24 ++++++++--------- 2 files changed, 34 insertions(+), 40 deletions(-) diff --git a/doc/style.css b/doc/style.css index d7be3326a..7571dfde7 100644 --- a/doc/style.css +++ b/doc/style.css @@ -1,7 +1,12 @@ +/**** The Emacs manual at www.gnu.org uses a nice, Info-friendly + style. This is a copy of the manual's style sheet + (/software/emacs/manual.css) and its imports (/style.css and + /reset.css) with some adjustment of the colors toward Water. ****/ -/**** www.gnu.org/reset.css ****/ +/**** /reset.css ****/ + /* Copyright (c) 2009, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: @@ -27,7 +32,8 @@ input,button,textarea,select{*font-size:100%;} -/**** www.gnu.org/style.css ****/ +/**** /style.css ****/ + /* This stylesheet is used by manuals and a few older resources. */ /**** @import url('/reset.css'); ****/ @@ -169,7 +175,7 @@ img { max-width: 100%} /* For navigation links */ .node a, .header a { display: inline-block; line-height: 2em; } -.node a:hover, .header a:hover { background: #f2efe4; } +.node a:hover, .header a:hover { background: #eef; } /* Inserts */ table.cartouche td { padding: 1.5em; } @@ -184,8 +190,8 @@ div.example, pre.example { -webkit-border-radius: .3em; -moz-border-radius: .3em; border-radius: .3em; - border: 1px solid #d4cbb6; - background-color: #f2efe4; + border: 1px solid #dde; + background-color: #eef; } div.example > pre.example { padding: 0 0 .4em; @@ -205,8 +211,17 @@ pre.menu-comment { padding-top: 1.3em; margin: 0; } -/**** www.gnu.org/software/gnulib/manual.css ****/ -/* Style-sheet to use for manuals (copied from Emacs) */ +/**** /software/emacs/manual.css ****/ + +/* Style-sheet to use for Emacs manuals */ + +/* Copyright (C) 2013-2014 Free Software Foundation, Inc. + +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without any warranty. +*/ /**** @import url('/style.css'); ****/ @@ -222,24 +237,3 @@ pre.menu-comment { padding-top: 1.3em; margin: 0; } blockquote { font-style: normal; } var { font-style: italic; } - -/* ----- coreutils specific styling ----- */ - -/* layout.css indents "body p" when it should probably only indent "body > p"? - In any case, disable indenting of p in these sub elements. */ -dd p,li p { - margin-left: 0; - margin-right: 0; -} - -/* underlined links are distracting, especially within outlined tables. */ -a { /*add :link for external links*/ - text-decoration: none; /* don't underline links by default */ - outline-style: none; /* don't put dotted box around clicked links */ -} -a:hover { - text-decoration: underline; -} - -/* The shadow around the body is distracting. */ -body { box-shadow: 0 0 0 0; } diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo index 55fb3ea56..15573de83 100644 --- a/doc/user-manual/user.texinfo +++ b/doc/user-manual/user.texinfo @@ -4027,17 +4027,17 @@ list of package sources and install or update Scheme and its plugins just like other packages. You should begin by installing the GPG key used to sign the packages. -It is available from this web page: +It is available at this URL: @example -@url{https://savannah.gnu.org/users/mhb} +@url{https://birchwood-abbey.net/codemaster.txt} @end example -Click the ``Download GPG Key'' link on that page and save the -@file{mhb-key.gpg} file. You might install it with this command: +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. @example -sudo apt-key add ~/Downloads/mhb-key.gpg +sudo apt-key add ~/Downloads/puck.txt @end example Next add the repository to your list of package sources. @@ -4045,7 +4045,7 @@ On Ubuntu 17.10 (Artful Aardvark) you would use this command: @example sudo add-apt-repository \ - "deb http://birchwood-abbey.net/~puck/ubuntu/17.10/" + "deb http://birchwood-abbey.net/ubuntu/17.10/ xenial main" @end example or by editing files in @file{/etc/apt/}. @@ -4074,7 +4074,7 @@ be @emph{three} packages named @code{mit-scheme-pucked} with the 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 -@url{http://birchwood-abbey.net/~puck/ubuntu/18.04/}). +@url{http://birchwood-abbey.net/ubuntu/18.04/}). You can also download the package files and install them by hand. Links to the available package files are listed on the project home @@ -4094,16 +4094,16 @@ 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. +and all of its required plugins. If you would like to verify that the downloaded files are authentic you will need the corresponding @file{.changes} files. Each contains -checksums for the package files and is signed. If you saved the GPG -key in @file{~/Downloads/mhb-key.gpg}, you can add it to your keyring +checksums for the package files and is signed. If you saved Puck's +GPG key in @file{~/Downloads/puck.txt}, you can add it to your keyring like this: @example -gpg --import ~/Downloads/mhb-key.gpg +gpg --import ~/Downloads/puck.txt @end example Then verify the signature on the @file{.changes} file like this: @@ -4112,7 +4112,7 @@ Then verify the signature on the @file{.changes} file like this: gpg --verify ~/Downloads/mit-scheme-pucked_9.2.7-1_amd64.changes @end example -Finally compare the checksum in the @file{.changes} file with one +And compare the checksum in the @file{.changes} file to one computed from your downloaded file. @example -- 2.25.1