Merge branch 'master' of git://git.indexdata.com/id-docbook-common

Conflicts:
	common.ent

diff --git a/common.ent b/common.ent
index 8af5d33..909ac85 100644 (file)
--- a/common.ent
+++ b/common.ent
@@ -188,14 +188,15 @@
 <!ENTITY url.tcpwrapper "http://ftp.porcupine.org/pub/security/index.html">
 
 <!-- Operating Systems -->
-<!ENTITY url.linux.kernel "http://www.kernel.org">
-<!ENTITY url.debian "http://www.debian.org">
-<!ENTITY url.redhat "http://www.redhat.com">
-<!ENTITY url.gentoo "http://www.gentoo.org">
+<!ENTITY url.linux.kernel "http://www.kernel.org/">
+<!ENTITY url.debian "http://www.debian.org/">
+<!ENTITY url.redhat "http://www.redhat.com/">
+<!ENTITY url.centos "http://www.centos.org/">
+<!ENTITY url.gentoo "http://www.gentoo.org/">
 <!ENTITY url.freebsd "http://www.freebsd.org/">
 <!ENTITY url.suse "http://www.suse.com">
 <!ENTITY url.macosx "http://www.apple.com/macosx/">
-<!ENTITY url.solaris "http://www.oracle.com/us/products/servers-storage/solaris/overview/index.html">
+<!ENTITY url.solaris "http://www.oracle.com/us/products/servers-storage/solaris/overview/">
 <!ENTITY url.ubuntu "http://www.ubuntu.com">
 <!ENTITY url.windows2000 "http://www.microsoft.com/windows2000/">
 <!ENTITY url.windows2003server "http://www.microsoft.com/windowsserver2003/default.mspx">