diff --git a/general.ent b/general.ent
index dc9dd2018a..14cfe103a9 100644
--- a/general.ent
+++ b/general.ent
@@ -149,7 +149,7 @@ export -f as_root
-
+
diff --git a/general/genlib/libgcrypt.xml b/general/genlib/libgcrypt.xml
index a8900733e3..9d6653f850 100644
--- a/general/genlib/libgcrypt.xml
+++ b/general/genlib/libgcrypt.xml
@@ -82,7 +82,7 @@
Optional
- and
+ and
diff --git a/general/genutils/pinentry.xml b/general/genutils/pinentry.xml
index b593d854d4..85255227bd 100644
--- a/general/genutils/pinentry.xml
+++ b/general/genutils/pinentry.xml
@@ -70,7 +70,7 @@
Optional
,
- and
+ and
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 3f99bc3256..9f3620875a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,10 @@
October 21st, 2013
+
+ [bdubbs] - Rename all references of libcap2 to
+ libcap.
+
[fernando] - Update to gtksourceview-3.10.1. Fixes
#4196.
diff --git a/multimedia/libdriv/pulseaudio.xml b/multimedia/libdriv/pulseaudio.xml
index 9f4df708b8..9ee9c79c00 100644
--- a/multimedia/libdriv/pulseaudio.xml
+++ b/multimedia/libdriv/pulseaudio.xml
@@ -89,7 +89,7 @@
,
,
- ,
+ ,
,
and
diff --git a/networking/netprogs/cifsutils.xml b/networking/netprogs/cifsutils.xml
index df9fcf1deb..2996e5f8e2 100644
--- a/networking/netprogs/cifsutils.xml
+++ b/networking/netprogs/cifsutils.xml
@@ -65,7 +65,7 @@
,
, and
libcap-ng or
-
+
User Notes:
diff --git a/networking/netprogs/ntp.xml b/networking/netprogs/ntp.xml
index f11e7338fc..0f5a422641 100644
--- a/networking/netprogs/ntp.xml
+++ b/networking/netprogs/ntp.xml
@@ -71,7 +71,7 @@
Required
-
+
Optional
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index 771ddaaac9..968e1a093d 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -81,7 +81,7 @@
(used only for documentation),
tdb,
ctdb,
- ,
+ ,
libunwind,
,
OpenAFS, and
diff --git a/networking/netutils/bind-utils.xml b/networking/netutils/bind-utils.xml
index fd32feeea9..aa7de70e96 100644
--- a/networking/netutils/bind-utils.xml
+++ b/networking/netutils/bind-utils.xml
@@ -66,7 +66,7 @@
Optional
- ,
+ ,
, and
diff --git a/postlfs/security/libcap2.xml b/postlfs/security/libcap.xml
similarity index 69%
rename from postlfs/security/libcap2.xml
rename to postlfs/security/libcap.xml
index 9da5e7ec27..43cdb30922 100644
--- a/postlfs/security/libcap2.xml
+++ b/postlfs/security/libcap.xml
@@ -5,32 +5,32 @@
%general-entities;
-
-
-
-
-
-
+
+
+
+
+
+
]>
-
-
+
+
$LastChangedBy$
$Date$
- libcap2-&libcap2-version;
+ libcap-&libcap-version;
-
- libcap2
+
+ libcap
- Introduction to libcap2
+ Introduction to libcap
- The libcap2 package implements the
+ The libcap package implements the
user-space interfaces to the POSIX 1003.1e capabilities available in Linux
kernels. These capabilities are a partitioning of the all powerful root
privilege into a set of distinct privileges.
@@ -40,26 +40,26 @@
Package Information
- Download (HTTP):
+ Download (HTTP):
- Download (FTP):
+ Download (FTP):
- Download MD5 sum: &libcap2-md5sum;
+ Download MD5 sum: &libcap-md5sum;
- Download size: &libcap2-size;
+ Download size: &libcap-size;
- Estimated disk space required: &libcap2-buildsize;
+ Estimated disk space required: &libcap-buildsize;
- Estimated build time: &libcap2-time;
+ Estimated build time: &libcap-time;
- libcap2 Dependencies
+ libcap Dependencies
Required
@@ -68,14 +68,14 @@
User Notes:
-
+
- Installation of libcap2
+ Installation of libcap
- Install libcap2 by running the following
+ Install libcap by running the following
commands:
make
@@ -127,7 +127,7 @@
capsh
is a shell wrapper to explore and constrain capability support.
-
+
capsh
@@ -137,7 +137,7 @@
getcap
examines file capabilities.
-
+
getcap
@@ -147,7 +147,7 @@
getpcaps
displays the capabilities on the queried process(es).
-
+
getpcaps
@@ -157,18 +157,18 @@
setcap
sets file file capabilities.
-
+
setcap
-
+
libcap.{so,a}
- contains the libcap2 API functions.
-
- libcap.{so,a}
+ contains the libcap API functions.
+
+ libcap.{so,a}
diff --git a/postlfs/security/security.xml b/postlfs/security/security.xml
index 1c97e53663..2f7c38a1f3 100644
--- a/postlfs/security/security.xml
+++ b/postlfs/security/security.xml
@@ -53,7 +53,7 @@ $Date$
-
+
diff --git a/postlfs/shells/zsh.xml b/postlfs/shells/zsh.xml
index bc4efd1049..1c986edb2e 100644
--- a/postlfs/shells/zsh.xml
+++ b/postlfs/shells/zsh.xml
@@ -81,7 +81,7 @@
Optional
and
-
+
User Notes:
diff --git a/server/major/bind.xml b/server/major/bind.xml
index 47f2eb1e7c..5704274d82 100644
--- a/server/major/bind.xml
+++ b/server/major/bind.xml
@@ -72,7 +72,7 @@
Optional
- ,
+ ,
,
, and
diff --git a/server/major/vsftpd.xml b/server/major/vsftpd.xml
index c50d21710d..10fddfaf78 100644
--- a/server/major/vsftpd.xml
+++ b/server/major/vsftpd.xml
@@ -63,7 +63,7 @@
,
, and
-
+
User Notes: