Repository :
http://git.fedorahosted.org/cgit/
On branch : master
---------------------------------------------------------------
commit e3c92d3fd026d41cd68b166383a82c9afbb73948
Author: Matt Domsch <matt(a)domsch.com>
Date: Thu Dec 12 14:31:32 2013 -0600
remove Fedora-isms from the CentOS templates
---------------------------------------------------------------
server/mirrormanager/templates/centos/help.kid | 4 +-
server/mirrormanager/templates/centos/host.kid | 2 +-
server/mirrormanager/templates/centos/master.kid | 12 +-------
.../mirrormanager/templates/centos/publiclist.kid | 2 +-
server/mirrormanager/templates/centos/site.kid | 29 --------------------
5 files changed, 5 insertions(+), 44 deletions(-)
diff --git a/server/mirrormanager/templates/centos/help.kid
b/server/mirrormanager/templates/centos/help.kid
index 94d37e2..87417d9 100644
--- a/server/mirrormanager/templates/centos/help.kid
+++ b/server/mirrormanager/templates/centos/help.kid
@@ -47,8 +47,8 @@ Control List. As such, each Host should create one or more
<strong>ACL
IPs</strong>. Hosts can also be temporarily marked inactive.
</p>
<p>
-Hosts carry content by <strong>Category</strong>. Fedora's categories
include
-Fedora Linux (Fedora 7 and newer). Hosts expose a Category via one or
+Hosts carry content by <strong>Category</strong>. CentOS has a single
Category, "CentOS".
+Hosts expose a Category via one or
more <strong>URLs</strong> (public URLs for anonymous http/ftp/rsync, or
private URLs
for use by other mirrors only).
</p>
diff --git a/server/mirrormanager/templates/centos/host.kid
b/server/mirrormanager/templates/centos/host.kid
index 80e4c78..3a2d3cb 100644
--- a/server/mirrormanager/templates/centos/host.kid
+++ b/server/mirrormanager/templates/centos/host.kid
@@ -115,7 +115,7 @@ privileges.
<a href="${tg.url('/host_category/0/new?hostid=' +
str(values.id))}">[Add Category]</a>
</div>
<p>
-Hosts carry categories of software. Example Fedora categories include Fedora and Fedora
Archive.
+Hosts carry categories of software. CentOS has only category "CentOS".
</p>
<div py:if="values.categories is not None">
<ul>
diff --git a/server/mirrormanager/templates/centos/master.kid
b/server/mirrormanager/templates/centos/master.kid
index 275e3a2..d4d1b60 100644
--- a/server/mirrormanager/templates/centos/master.kid
+++ b/server/mirrormanager/templates/centos/master.kid
@@ -84,18 +84,8 @@ if admin_group in tg.identity.groups:
<div id="bottom">
<div py:if="tg.config('mirrormanager.copyright', 'fedora')
== 'fedora'" id="footer">
<p class="copy">Copyright © 2007 Red Hat, Inc. and
others. All Rights Reserved.
- Please send any comments or corrections to the <a
href="mailto:webmaster@fedoraproject.org">websites team</a>.
+ Please send any comments or corrections to the <a
href="http://lists.centos.org/mailman/listinfo/CentOS-mirror"&g...
team</a>.
</p>
- <p class="disclaimer">
- The Fedora Project is maintained and driven by the community and sponsored by Red
Hat. This is a community maintained site. Red Hat is not responsible for content.
- </p>
- <ul>
- <li class="first"><a
href="http://fedoraproject.org/wiki/Legal">Legal</a>&l...
- <li><a
href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&...
Guidelines</a></li>
- </ul>
- </div>
- <div py:if="tg.config('mirrormanager.copyright', 'fedora')
!= 'fedora'" id="footer">
- Some other copyright???
</div>
</div>
</div>
diff --git a/server/mirrormanager/templates/centos/publiclist.kid
b/server/mirrormanager/templates/centos/publiclist.kid
index 8b1279d..d2d1f53 100644
--- a/server/mirrormanager/templates/centos/publiclist.kid
+++ b/server/mirrormanager/templates/centos/publiclist.kid
@@ -46,7 +46,7 @@ donations.
<p>
To become a public ${tg.config('mirrormanager.projectname','Fedora')}
mirror, please see <a
py:attrs="{'href': tg.config('mirrormanager.mirrorwiki',
'http://fedoraproject.org/wiki/Infrastructure/Mirroring')}">
-our wiki page on Mirroring</a>.
+our page on Mirroring</a>.
</p>
<p>
diff --git a/server/mirrormanager/templates/centos/site.kid
b/server/mirrormanager/templates/centos/site.kid
index 4aafe56..3917ed2 100644
--- a/server/mirrormanager/templates/centos/site.kid
+++ b/server/mirrormanager/templates/centos/site.kid
@@ -24,35 +24,6 @@ Created At: ${values.createdAt}<br></br>
Created By: ${values.createdBy}<br></br>
</div>
-<p>
-Mirror server administrators are not required to sign the Fedora
-<a
href="http://fedoraproject.org/wiki/Legal/Licenses/CLA">Cont...
-License Agreement</a>.
-</p>
-<h2>Export Compliance</h2>
-<p>
-By downloading Fedora software, you acknowledge that you understand
-all of the following: Fedora software and technical information may be
-subject to the U.S. Export Administration Regulations (the “EAR”) and
-other U.S. and foreign laws and may not be exported, re-exported or
-transferred (a) to any country listed in Country Group E:1 in
-Supplement No. 1 to part 740 of the EAR (currently, Cuba, Iran, North
-Korea, Sudan and Syria); (b) to any prohibited destination or to any end
-user who has been prohibited from participating in U.S. export
-transactions by any federal agency of the U.S. government; or (c) for
-use in connection with the design, development or production of
-nuclear, chemical or biological weapons, or rocket systems, space
-launch vehicles, or sounding rockets, or unmanned air vehicle
-systems. You may not download Fedora software or technical information
-if you are located in one of these countries or otherwise subject to
-these restrictions. You may not provide Fedora software or technical
-information to individuals or entities located in one of these
-countries or otherwise subject to these restrictions. You are also
-responsible for compliance with foreign law requirements applicable to
-the import, export and use of Fedora software and technical
-information.
-</p>
-
${form(value=values, action=tg.url(action), disabled_fields=disabled_fields)}
<div py:if="values is not None">