-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathyum-manpage-files.patch
123 lines (111 loc) · 4.16 KB
/
yum-manpage-files.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
commit 6f0569459dfcbbc6cda233564b76c6cb0fad23eb
Author: James Antill <[email protected]>
Date: Mon Jun 14 01:17:10 2010 -0400
Add protected.d and vars to the yum.conf man page FILES section
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index ee7ea4f..ca36103 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -815,6 +815,8 @@ data in any value.
/etc/yum/yum.conf
/etc/yum/repos.d/
/etc/yum/pluginconf.d/
+/etc/yum/protected.d
+/etc/yum/vars
.SH "SEE ALSO"
.LP
commit ae9c555ef993ed717c7dcc58da8ae64cd01348ff
Author: James Antill <[email protected]>
Date: Mon Jun 14 01:09:10 2010 -0400
Fix the tsflags documentation
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 37ab23e..ee7ea4f 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -214,7 +214,9 @@ diskspace before a RPM transaction is run. Default is `1' (perform the check).
.IP
\fBtsflags\fR
Comma or space separated list of transaction flags to pass to the rpm
-transaction set. These include 'noscripts', 'notriggers', 'nodocs', 'test', and 'repackage'.
+transaction set. These include 'noscripts', 'notriggers', 'nodocs', 'test',
+'justdb' and 'nocontexts'. 'repackage' is also available but that does nothing
+with newer rpm versions.
You can set all/any of them. However, if you don't know what these do in the
context of an rpm transaction set you're best leaving it alone. Default is
an empty list.
commit 102915d4d402493c48d434ae1d1756225c4468e0
Author: James Antill <[email protected]>
Date: Mon Jun 14 01:15:21 2010 -0400
Port manpage files path fixups.
diff --git a/docs/yum.8 b/docs/yum.8
index d5ede0a..3bdb408 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -568,7 +568,7 @@ option in yum.conf. For a plugin to work, the following conditions must be met:
1. The plugin module file must be installed in the plugin path as just
described.
.LP
-2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'.
+2. The global \fBplugins\fP option in /etc/yum.conf must be set to `1'.
.LP
3. A configuration file for the plugin must exist in
/etc/yum/pluginconf.d/<plugin_name>.conf and the \fBenabled\fR setting in this
@@ -584,9 +584,9 @@ configuration options.
.PP
.SH "FILES"
.nf
-/etc/yum/yum.conf
+/etc/yum.conf
/etc/yum/version-groups.conf
-/etc/yum/repos.d/
+/etc/yum.repos.d/
/etc/yum/pluginconf.d/
/var/cache/yum/
.fi
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index ca36103..42815b9 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -4,10 +4,10 @@
\fByum.conf\fR \- Configuration file for \fByum(8)\fR.
.SH "DESCRIPTION"
.LP
-Yum uses a configuration file at \fB/etc/yum/yum.conf\fR.
+Yum uses a configuration file at \fB/etc/yum.conf\fR.
.LP
Additional configuration files are also read from the directories set by the
-\fBreposdir\fR option (default is `/etc/yum/repos.d').
+\fBreposdir\fR option (default is `/etc/yum.repos.d').
See the \fBreposdir\fR option below for further details.
.SH "PARAMETERS"
@@ -42,10 +42,10 @@ of headers and packages after successful installation. Default is '1'
.IP
\fBreposdir\fR
A list of directories where yum should look for .repo files which define
-repositories to use. Default is `/etc/yum/repos.d'. Each
+repositories to use. Default is `/etc/yum.repos.d'. Each
file in this directory should contain one or more repository sections as
documented in \fB[repository] options\fR below. These will be merged with the
-repositories defined in /etc/yum/yum.conf to form the complete set of
+repositories defined in /etc/yum.conf to form the complete set of
repositories that yum will use.
.IP
@@ -745,8 +745,8 @@ for any given command. Defaults to False.
.SH "URL INCLUDE SYNTAX"
.LP
-The inclusion of external configuration files is supported for /etc/yum/yum.conf
-and the .repo files in the /etc/yum/repos.d directory. To include a URL, use a
+The inclusion of external configuration files is supported for /etc/yum.conf
+and the .repo files in the /etc/yum.repos.d directory. To include a URL, use a
line of the following format:
include=url://to/some/location
@@ -812,8 +812,8 @@ data in any value.
.SH "FILES"
.nf
-/etc/yum/yum.conf
-/etc/yum/repos.d/
+/etc/yum.conf
+/etc/yum.repos.d/
/etc/yum/pluginconf.d/
/etc/yum/protected.d
/etc/yum/vars