From 184aed020d66f079624704fa1516785422c2e29b Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 12 Jun 2007 21:25:41 +0000 Subject: [PATCH] Resolve Mirror conflict git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6529 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- web/shorewall_mirrors.htm | 184 +++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 94 deletions(-) diff --git a/web/shorewall_mirrors.htm b/web/shorewall_mirrors.htm index fb8ae280f..03453a663 100644 --- a/web/shorewall_mirrors.htm +++ b/web/shorewall_mirrors.htm @@ -1,117 +1,113 @@ - + Shorewall Mirrors - +

Shorewall Mirrors

+

Tom Eastep

-Copyright © 2001-2006 Thomas M . -Eastep

-

Permission is granted to copy, distribute and/or modify this -document under the terms of the GNU Free Documentation License, -Version 1.2 or any later version published by the Free Software -Foundation; with no Invariant Sections, with no Front-Cover, and with -no Back-Cover Texts. A copy of the license is included in the section -entitled “GNU Free -Documentation License”.

-

2006-10-13

+Copyright © 2001-2007 Thomas M . Eastep

+ +

Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.2 or any +later version published by the Free Software Foundation; with no Invariant +Sections, with no Front-Cover, and with no Back-Cover Texts. A copy of the +license is included in the section entitled “GNU Free Documentation License”.

+ +

2007-06-12

-

Remember that updates to the mirrors are often -delayed for 6-12 hours after an update to the primary site. -

-

The primary site has a very low bandwidth so I -encourage you to use a mirror site whenever possible.

+ +

Remember that updates to the mirrors are often delayed for +6-12 hours after an update to the primary site.

+ +

The primary site has a very low bandwidth so I encourage +you to use a mirror site whenever possible.

+

The primary web site is http://www1.shorewall.net -(Shoreline, Washington, USA). It is mirrored via rsync at:

+target="_top">http://www1.shorewall.net (Shoreline, Washington, USA). It +is mirrored via rsync at:

-

The primary FTP site is -ftp://ftp1.shorewall.net/pub/shorewall/  -(Shoreline, Washington, USA). It is mirrored via rsync at:

- + +

The primary FTP site is ftp://ftp1.shorewall.net/pub/shorewall/  (Shoreline, +Washington, USA). It is mirrored via rsync at:

+