Bug#753492: refcard: Typo, wording and item updates
Hi!
On Wed, 2014-07-02 at 16:03:51 +0200, Guillem Jover wrote:
> Source: refcard
> Source-Version: 5.0.9
> Severity: wishlist
> Tags: patch
> Here's a patch, which fixes a typo, makes the Debian distribution
> references system-neutral now that we have other non-GNU/Linux released
> architectures (although the ip command is Linux-specific), and switches
> the debsums item to use the new native «dpkg -V».
> (The <https://www.debian.org/doc/user-manuals> still has system
> specific references to Debian GNU/Linux.)
The typo fix got fixed independently now. The reset still applies, and
I've split it into logical patches, and added some more corrections,
namely:
* Switch URLs to new canonical addresses and https.
* Update apt frontend command usage.
> Note that I've not build-tested it, as the Build-Depends where quite big.
This still applies.
> And sorry for bundling this in a single patch, but splitting it with svn
> is rather painful, but I could do that if you wanted though.
And for this I ended up using git-svn. :)
Thanks,
Guillem
From a2862d4582af7737771d8ce46028b9fb1a1b2175 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 10 Mar 2016 01:30:42 +0100
Subject: [PATCH 1/4] Use Debian instead of kernel specific references
---
entries.dbk | 8 +++-----
refcard.dbk | 11 +++++------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/entries.dbk b/entries.dbk
index 9dc1c49..1ee125c 100644
--- a/entries.dbk
+++ b/entries.dbk
@@ -2,13 +2,11 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
<article lang="en-GB">
- <!-- This file is the translatable part of the Debian GNU/Linux
- Reference Card. -->
- <title>Debian GNU/Linux Reference Card</title>
+ <!-- This file is the translatable part of the Debian Reference Card. -->
+ <title>Debian Reference Card</title>
<!-- subtitle not on printed card, but as 'pdfsubject' in the PDF
file -->
- <subtitle>The 101 most important things when using Debian
- GNU/Linux</subtitle>
+ <subtitle>The 101 most important things when using Debian</subtitle>
<articleinfo>
<copyright>
<year>2004</year>
diff --git a/refcard.dbk b/refcard.dbk
index ec7de0b..bbf8d01 100644
--- a/refcard.dbk
+++ b/refcard.dbk
@@ -2,9 +2,8 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
<article lang="en-GB">
- <title>Debian GNU/Linux Reference Card</title>
- <subtitle>The 101 most important things when using Debian
- GNU/Linux</subtitle>
+ <title>Debian Reference Card</title>
+ <subtitle>The 101 most important things when using Debian</subtitle>
<articleinfo>
<corpauthor>
<ulink
@@ -255,10 +254,10 @@
</keywordset>
<abstract>
<para>The idea of this reference card is to provide new users of
- Debian GNU/Linux with the most important commands. Basic (or
+ Debian with the most important commands. Basic (or
better) knowledge of computers, files, directories and the
command line is required. Some acronyms related to Debian
- GNU/Linux can be found <link linkend="acronyms">here</link>.</para>
+ can be found <link linkend="acronyms">here</link>.</para>
</abstract>
</articleinfo>
<section id="availability">
@@ -985,7 +984,7 @@
</warning>
</section>
<section id="acronyms">
- <title>Acronyms related to Debian GNU/Linux</title>
+ <title>Acronyms related to Debian</title>
<simplelist>
<member><ulink
--
2.8.1
From aa570a0d43e614ace96a37e6af7f07d6fd618698 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 10 Mar 2016 01:30:52 +0100
Subject: [PATCH 2/4] List dpkg -V instead of debsums
This option appearing in dpkg 1.17.2, present in Debian jessie.
---
entries.dbk | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/entries.dbk b/entries.dbk
index 1ee125c..bbfcdde 100644
--- a/entries.dbk
+++ b/entries.dbk
@@ -502,10 +502,11 @@
<replaceable>pkg</replaceable>.deb</glossterm>
<glossdef><para>Install package files.</para></glossdef>
</glossentry>
- <glossentry id="debsums">
- <glossterm>debsums</glossterm>
- <glossdef><para>Audit check sums of installed packages, needs
- <literal>debsums</literal>.</para></glossdef>
+ <glossentry id="dpkg-verify">
+ <glossterm>dpkg -V</glossterm>
+ <optional><replaceable>names</replaceable></optional></glossterm>
+ <glossdef><para>Audit check sums of installed
+ packages.</para></glossdef>
</glossentry>
<glossentry id="dpkg-divert">
<glossterm>dpkg-divert <optional>options</optional>
--
2.8.1
From d2af06a10dbfe5e1853b145b1a631f2c1d6db112 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 10 Mar 2016 01:30:55 +0100
Subject: [PATCH 3/4] Update links
Switch http: to https:, remove dead links, and update VCS links to
canonical URLs.
---
dblatex.xsl | 2 +-
debian/control | 4 ++--
entries.dbk | 32 ++++++++++++++++----------------
refcard.dbk | 11 ++++-------
4 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/dblatex.xsl b/dblatex.xsl
index 671c41e..1d1e1c4 100644
--- a/dblatex.xsl
+++ b/dblatex.xsl
@@ -100,7 +100,7 @@
<xsl:text>{\scriptsize \DBKcopyright \\ </xsl:text>
<xsl:value-of
select="/article/articleinfo/keywordset/keyword[@role='madeby']"/>
- <xsl:text>: \url{http://www.debian.org/doc/user-manuals#refcard}} </xsl:text>
+ <xsl:text>: \url{https://www.debian.org/doc/user-manuals#refcard}} </xsl:text>
<xsl:text>\end{minipage} </xsl:text>
</xsl:template>
diff --git a/debian/control b/debian/control
index 08737e4..6835d61 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,8 @@ Build-Depends: cdbs,
xmlroff,
xsltproc
Vcs-Svn: svn://anonscm.debian.org/ddp/manuals/trunk/refcard
-Vcs-Browser: http://anonscm.debian.org/viewvc/ddp/manuals/trunk/refcard/
-Homepage: http://www.debian.org/doc/user-manuals#refcard
+Vcs-Browser: https://anonscm.debian.org/viewvc/ddp/manuals/trunk/refcard/
+Homepage: https://www.debian.org/doc/user-manuals#refcard
Package: debian-refcard
Architecture: all
diff --git a/entries.dbk b/entries.dbk
index bbfcdde..4affe22 100644
--- a/entries.dbk
+++ b/entries.dbk
@@ -25,7 +25,7 @@
<legalnotice>
<para>This document may be used under the terms of the GNU General
Public License version 3 or higher. The license text can be found at <ulink
- url="http://www.gnu.org/copyleft/gpl.html";>http://www.gnu.org/copyleft/gpl.html</ulink>
+ url="https://www.gnu.org/copyleft/gpl.html";>https://www.gnu.org/copyleft/gpl.html</ulink>
and
<filename>/usr/share/common-licenses/GPL-3</filename>.</para>
</legalnotice>
@@ -62,21 +62,21 @@
specifics.</para></glossdef>
</glossentry>
<glossentry id="www-debian-org">
- <glossterm><ulink url="http://www.debian.org/doc/";>Web
+ <glossterm><ulink url="https://www.debian.org/doc/";>Web
documentation</ulink></glossterm>
<glossdef><para>Reference, manuals, FAQs, HOWTOs, etc. at
- <literal>http://www.debian.org/doc/</literal></para></glossdef>
+ <literal>https://www.debian.org/doc/</literal></para></glossdef>
</glossentry>
<glossentry id="lists-debian-org">
- <glossterm><ulink url="http://lists.debian.org/";>Mailing
+ <glossterm><ulink url="https://lists.debian.org/";>Mailing
lists</ulink> at
- <literal>http://lists.debian.org/</literal></glossterm>
+ <literal>https://lists.debian.org/</literal></glossterm>
<glossdef><para>The community is always helpful, search for
<literal>users</literal>.</para></glossdef>
</glossentry>
<glossentry id="wiki-debian-org">
- <glossterm><ulink url="http://wiki.debian.org/";>The Wiki</ulink> at
- <literal>http://wiki.debian.org/</literal></glossterm>
+ <glossterm><ulink url="https://wiki.debian.org/";>The Wiki</ulink> at
+ <literal>https://wiki.debian.org/</literal></glossterm>
<glossdef><para>Contains all kind of useful
information.</para></glossdef>
</glossentry>
@@ -87,16 +87,16 @@
<glosslist>
<glossentry id="installer">
<glossterm><ulink
- url="http://www.debian.org/devel/debian-installer/";>Installer</ulink></glossterm>
+ url="https://www.debian.org/devel/debian-installer/";>Installer</ulink></glossterm>
<glossdef><para>All information about it at
- <literal>http://www.debian.org/devel/debian-installer/</literal></para></glossdef>
+ <literal>https://www.debian.org/devel/debian-installer/</literal></para></glossdef>
</glossentry>
<glossentry id="installer-image">
<glossterm><ulink
- url="http://www.debian.org/distrib/";>CD
+ url="https://www.debian.org/distrib/";>CD
images</ulink></glossterm>
<glossdef><para>Download from
- <literal>http://www.debian.org/distrib/</literal></para></glossdef>
+ <literal>https://www.debian.org/distrib/</literal></para></glossdef>
</glossentry>
<glossentry id="boot-expert">
<glossterm><literal>boot: expert</literal></glossterm>
@@ -109,16 +109,16 @@
<title>Bugs</title>
<glosslist>
<glossentry id="bugs-debian-org">
- <glossterm><ulink url="http://bugs.debian.org/";>Bug
+ <glossterm><ulink url="https://bugs.debian.org/";>Bug
Tracking</ulink> at
- <literal>http://bugs.debian.org/</literal></glossterm>
+ <literal>https://bugs.debian.org/</literal></glossterm>
<glossdef><para>All about existing and fixed
bugs.</para></glossdef>
</glossentry>
<glossentry id="bugs-debian-org-package">
<glossterm>Package specific</glossterm>
<glossdef><para>See
- <literal>http://bugs.debian.org/<replaceable>package-name</replaceable>/</literal>,
+ <literal>https://bugs.debian.org/<replaceable>package-name</replaceable>/</literal>,
use <literal>wnpp</literal> to ask for new
packages.</para></glossdef>
</glossentry>
@@ -128,9 +128,9 @@
</glossentry>
<glossentry id="reporting">
<glossterm><ulink
- url="http://www.debian.org/Bugs/Reporting";>Reporting</ulink></glossterm>
+ url="https://www.debian.org/Bugs/Reporting";>Reporting</ulink></glossterm>
<glossdef><para>Instructions at
- <literal>http://www.debian.org/Bugs/Reporting</literal></para></glossdef>
+ <literal>https://www.debian.org/Bugs/Reporting</literal></para></glossdef>
</glossentry>
</glosslist>
</section>
diff --git a/refcard.dbk b/refcard.dbk
index bbf8d01..4007390 100644
--- a/refcard.dbk
+++ b/refcard.dbk
@@ -7,7 +7,7 @@
<articleinfo>
<corpauthor>
<ulink
- url="http://www.debian.org/";>
+ url="https://www.debian.org/";>
<inlinemediaobject>
<imageobject>
<imagedata
@@ -54,7 +54,7 @@
<legalnotice>
<para>This document may be used under the terms of the GNU General
Public License version 3 or higher. The license text can be found at <ulink
- url="http://www.gnu.org/copyleft/gpl.html";>http://www.gnu.org/copyleft/gpl.html</ulink>
+ url="https://www.gnu.org/copyleft/gpl.html";>https://www.gnu.org/copyleft/gpl.html</ulink>
and
<filename>/usr/share/common-licenses/GPL-3</filename>.</para>
</legalnotice>
@@ -263,9 +263,9 @@
<section id="availability">
<title>Availability</title>
<para>The source code of this card is available via the <ulink
- url="http://svn.debian.org/";>Debian Subversion server</ulink> in
+ url="https://svn.debian.org/";>Debian Subversion server</ulink> in
DocBook/XML format. You may access the repository via the <ulink
- url="http://anonscm.debian.org/viewvc/ddp/manuals/trunk/refcard/";>web
+ url="https://anonscm.debian.org/viewvc/ddp/manuals/trunk/refcard/";>web
interface</ulink>. Or check out the latest version using the
commands:</para>
@@ -990,9 +990,6 @@
<member><ulink
url="http://www.riverland.net.au/~clytie/viet/netacrvn.html";>English
and Vietnamese explanations</ulink></member>
- <member><ulink url="http://women.alioth.debian.org/dicts/";>A
- dictionary by the Debian women, useful for
- everyone, in many languages</ulink></member>
<member><ulink
url="http://www.witch.westfalen.de/debian-women/about.html";>Debian
Women Dictionary, useful for everyone</ulink></member>
--
2.8.1
From cca7532ca7e6168f1049f9e42892701cece841cd Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 10 Mar 2016 01:31:02 +0100
Subject: [PATCH 4/4] Update for new apt frontend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The «apt list -a» command does not list priorities like «apt policy» does.
Remove wrong reference «apt show», and use «apt show -a» instead, which is
not the equivalent of «apt-cache showpkg» and does not list dependencies.
Use «apt build-dep» instead of «apt-get build-dep».
---
entries.dbk | 12 +++---------
refcard.dbk | 2 +-
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/entries.dbk b/entries.dbk
index 4affe22..8745cbb 100644
--- a/entries.dbk
+++ b/entries.dbk
@@ -384,20 +384,14 @@
<glossentry id="apt-list-a">
<glossterm>apt list -a
<replaceable>package-name</replaceable></glossterm>
- <glossdef><para>Show versions and priorities of available
+ <glossdef><para>Show versions and archive areas of available
packages.</para></glossdef>
</glossentry>
- <glossentry id="apt-show">
- <glossterm>apt show
- <replaceable>package-name</replaceable></glossterm>
- <glossdef><para>Show package information
- incl. description.</para></glossdef>
- </glossentry>
<glossentry id="apt-show-a">
<glossterm>apt show -a
<replaceable>package-name</replaceable></glossterm>
- <glossdef><para>Show package dependencies (needed
- packages).</para></glossdef>
+ <glossdef><para>Show package information
+ incl. description.</para></glossdef>
</glossentry>
<glossentry id="apt-install">
<glossterm>apt install
diff --git a/refcard.dbk b/refcard.dbk
index 4007390..5fb1823 100644
--- a/refcard.dbk
+++ b/refcard.dbk
@@ -919,7 +919,7 @@
<para>Of course, you may alter the reference card to your needs and
create a customised refcard. You need to install the build
- dependencies with <command>apt-get build-dep refcard</command>;
+ dependencies with <command>apt build-dep refcard</command>;
these are mostly:
<literal>docbook-xsl</literal>,
<literal>pdfjam</literal>,
--
2.8.1
Reply to: