[pacman-dev] [PATCH] Changed documentation to use 'the default' instead of 'a typical default'

Allan McRae allan at archlinux.org
Mon Mar 28 06:38:23 UTC 2016


From: Alastair Hughes <hobbitalastair at gmail.com>

---

Forwarding patch from FS#48696.

 doc/pacman.8.txt      | 10 +++++-----
 doc/pacman.conf.5.txt | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 9e69685..4c0a30a 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -127,7 +127,7 @@ greater than `1:3.6-1`.
 Options
 -------
 *-b, \--dbpath* <path>::
-	Specify an alternative database location (a typical default is
+	Specify an alternative database location (the default is
 	+{localstatedir}/lib/pacman+). This should not be used unless you know what
 	you are doing.
 	*NOTE*: If specified, this is an absolute path, and the root path is
@@ -149,7 +149,7 @@ Options
 	Specify an alternate architecture.
 
 *\--cachedir* <dir>::
-	Specify an alternative package cache location (a typical default is
+	Specify an alternative package cache location (the default is
 	+{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be
 	specified, and they are tried in the order they are passed to pacman.
 	*NOTE*: This is an absolute path, and the root path is not automatically
@@ -168,15 +168,15 @@ Options
 	to be used.
 
 *\--gpgdir* <dir>::
-	Specify a directory of files used by GnuPG to verify package signatures (a
-	typical default is +{sysconfdir}/pacman.d/gnupg+). This directory should contain
+	Specify a directory of files used by GnuPG to verify package signatures
+	(the default is +{sysconfdir}/pacman.d/gnupg+). This directory should contain
 	two files: `pubring.gpg` and `trustdb.gpg`. `pubring.gpg` holds the public keys
 	of all packagers. `trustdb.gpg` contains a so-called trust database, which
 	specifies that the keys are authentic and trusted. *NOTE*: This is an absolute
 	path, and the root path is not automatically prepended.
 
 *\--hookdir* <dir>::
-	Specify a alternative directory containing hook files (a typical default is
+	Specify a alternative directory containing hook files (the default is
 	+{sysconfdir}/pacman.d/hooks+). Multiple hook directories can be specified
 	with hooks in later directories taking precedence over hooks in earlier
 	directories. *NOTE*: This is an absolute path, and the root path is not
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 022585c..c665870 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -57,13 +57,13 @@ Options
 	be inside this root path.
 
 *DBPath =* path/to/db/dir::
-	Overrides the default location of the toplevel database directory.  A
-	typical default is +{localstatedir}/lib/pacman/+. Most users will not need to set
+	Overrides the default location of the toplevel database directory. The
+	default is +{localstatedir}/lib/pacman/+. Most users will not need to set
 	this option. *NOTE*: if specified, this is an absolute path and the root
 	path is not automatically prepended.
 
 *CacheDir =* path/to/cache/dir::
-	Overrides the default location of the package cache directory. A typical
+	Overrides the default location of the package cache directory. The
 	default is +{localstatedir}/cache/pacman/pkg/+. Multiple cache directories can be
 	specified, and they are tried in the order they are listed in the config
 	file. If a file is not found in any cache directory, it will be downloaded
@@ -72,7 +72,7 @@ Options
 
 *HookDir =* path/to/hook/dir::
 	Add directories to search for alpm hooks in addition to the system hook
-	directory (+{datarootdir}/libalpm/hooks/+).  A typical default is
+	directory (+{datarootdir}/libalpm/hooks/+).  The default is
 	+{sysconfdir}/pacman.d/hooks+.  Multiple directories can be specified with
 	hooks in later directories taking precedence over hooks in earlier
 	directories.  *NOTE*: this is an absolute path, the root path is not
@@ -81,7 +81,7 @@ Options
 
 *GPGDir =* path/to/gpg/dir::
 	Overrides the default location of the directory containing configuration
-	files for GnuPG. A typical default is +{sysconfdir}/pacman.d/gnupg/+.
+	files for GnuPG. The default is +{sysconfdir}/pacman.d/gnupg/+.
 	This directory should contain two files: `pubring.gpg` and `trustdb.gpg`.
 	`pubring.gpg` holds the public keys of all packagers. `trustdb.gpg`
 	contains a so-called trust database, which specifies that the keys are
@@ -90,7 +90,7 @@ Options
 	prepended.
 
 *LogFile =* /path/to/file::
-	Overrides the default location of the pacman log file. A typical default
+	Overrides the default location of the pacman log file. The default
 	is +{localstatedir}/log/pacman.log+. This is an absolute path and the root directory
 	is not prepended.
 
-- 
2.7.4


More information about the pacman-dev mailing list