Please stop me before I tweak it again!

Add <p> elements to make linebreaks look better.
Also remove cvstrac file.
Remove contrib directory
Remove .cvsignore files.

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644 (file)
index b765018..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.html
-Makefile.docs
-pod2html-*cache
-index.cache

diff --git a/Makefile b/Makefile
index 6c50bcee1b0f115913fb54deb218e41b431b2ab8..bd243f8820f6a759ee587d3ab8d433d9cd124cf1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ all: docs-depend docs HOWTOs miscs
        @# Because there's a conflict and wmk skips this one...
        @wmk docs/apps/openssl.wml
        @# Because we're dependent of other files
-       @wmk -f source/index.wml contrib/index.wml docs/HOWTO/index.wml
+       @wmk -f source/index.wml docs/HOWTO/index.wml
        @wmk -f source/mirror.wml
        @wmk -f news/openssl-*notes.wml
        @wmk -f news/index.wml

diff --git a/about/.cvsignore b/about/.cvsignore
deleted file mode 100644 (file)
index 088830c..0000000
--- a/about/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-index.cache

diff --git a/contrib/.cvsignore b/contrib/.cvsignore
deleted file mode 100644 (file)
index 088830c..0000000
--- a/contrib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-index.cache

diff --git a/contrib/.wmlrc b/contrib/.wmlrc
deleted file mode 100644 (file)
index ab44064..0000000
--- a/contrib/.wmlrc
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-##  .wmlrc -- Local RC file for WML
-##
-
-#   define where the URL root of the Sub Navigation Bar (SNB) 
-#   is located [SNB_ROOT] and where it's buttons are defined [SNB_RC]
--DSNB_ROOT~.
--DSNB_RC=.wmlsnb
--I.
-

diff --git a/contrib/.wmlsnb b/contrib/.wmlsnb
deleted file mode 100644 (file)
index f089f84..0000000
--- a/contrib/.wmlsnb
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-##  .wmlsnb -- Sub Navigation Bar Specification for WML
-##
-
-<snb>
-  <snb_button id=misc    txt="Misc"     url="">
-</snb>
-

diff --git a/contrib/ERACopenssl-engine-0.9.6b.patch.gz b/contrib/ERACopenssl-engine-0.9.6b.patch.gz
deleted file mode 100644 (file)
index e721985..0000000
Binary files a/contrib/ERACopenssl-engine-0.9.6b.patch.gz and /dev/null differ

diff --git a/contrib/cross_mingw32.sh.gz b/contrib/cross_mingw32.sh.gz
deleted file mode 100644 (file)
index 81bb174..0000000
Binary files a/contrib/cross_mingw32.sh.gz and /dev/null differ

diff --git a/contrib/hw_pkcs11-0.9.6j.patch.gz b/contrib/hw_pkcs11-0.9.6j.patch.gz
deleted file mode 100644 (file)
index 60f8a47..0000000
Binary files a/contrib/hw_pkcs11-0.9.6j.patch.gz and /dev/null differ

diff --git a/contrib/hw_pkcs11-0.9.7b.patch.gz b/contrib/hw_pkcs11-0.9.7b.patch.gz
deleted file mode 100644 (file)
index 9aa6dcf..0000000
Binary files a/contrib/hw_pkcs11-0.9.7b.patch.gz and /dev/null differ

diff --git a/contrib/ibmca-patch-9.7beta3.gz b/contrib/ibmca-patch-9.7beta3.gz
deleted file mode 100644 (file)
index a435570..0000000
Binary files a/contrib/ibmca-patch-9.7beta3.gz and /dev/null differ

diff --git a/contrib/ibmca.patch-0.96e.gz b/contrib/ibmca.patch-0.96e.gz
deleted file mode 100644 (file)
index cec689c..0000000
Binary files a/contrib/ibmca.patch-0.96e.gz and /dev/null differ

diff --git a/contrib/ibmca.patch-096c.gz b/contrib/ibmca.patch-096c.gz
deleted file mode 100644 (file)
index 8899c7d..0000000
Binary files a/contrib/ibmca.patch-096c.gz and /dev/null differ

diff --git a/contrib/index.wml b/contrib/index.wml
deleted file mode 100644 (file)
index 3ee1008..0000000
--- a/contrib/index.wml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#use wml::openssl area=contrib page=misc 
-
-<title>Contributions, Misc</title>
-
-<h1>Miscellaneous OpenSSL Contributions</h1>
-
-Welcome to the User Contribution Area of OpenSSL.  This area contains files
-maintained by the OpenSSL users and placed here by the OpenSSL team.  They
-are provided AS IS without any kind of support or guaranty.
-
-<p>
-<font face="Arial,Helvetica" size=-1>
-THIS AREA IS PROVIDED BY THE OPENSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OPENSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-</font>
-
-<p>
-<filelist *.gz>

diff --git a/contrib/intel-accel-1.4.tar.gz b/contrib/intel-accel-1.4.tar.gz
deleted file mode 100644 (file)
index 84f0897..0000000
Binary files a/contrib/intel-accel-1.4.tar.gz and /dev/null differ

diff --git a/contrib/intel-accel-1.5.tar.gz b/contrib/intel-accel-1.5.tar.gz
deleted file mode 100644 (file)
index fd48dbc..0000000
Binary files a/contrib/intel-accel-1.5.tar.gz and /dev/null differ

diff --git a/contrib/netwarepatch-0.9.6m.diff.gz b/contrib/netwarepatch-0.9.6m.diff.gz
deleted file mode 100644 (file)
index 2865eac..0000000
Binary files a/contrib/netwarepatch-0.9.6m.diff.gz and /dev/null differ

diff --git a/contrib/netwarepatch-0.9.7c.patch.gz b/contrib/netwarepatch-0.9.7c.patch.gz
deleted file mode 100644 (file)
index a552dae..0000000
Binary files a/contrib/netwarepatch-0.9.7c.patch.gz and /dev/null differ

diff --git a/contrib/netwarepatch-0.9.7d.diff.gz b/contrib/netwarepatch-0.9.7d.diff.gz
deleted file mode 100644 (file)
index 09bf99b..0000000
Binary files a/contrib/netwarepatch-0.9.7d.diff.gz and /dev/null differ

diff --git a/contrib/netwarepatch-0.9.7g.diff.gz b/contrib/netwarepatch-0.9.7g.diff.gz
deleted file mode 100644 (file)
index 9db361b..0000000
Binary files a/contrib/netwarepatch-0.9.7g.diff.gz and /dev/null differ

diff --git a/contrib/newcert-ca.sh.gz b/contrib/newcert-ca.sh.gz
deleted file mode 100644 (file)
index 80ef912..0000000
Binary files a/contrib/newcert-ca.sh.gz and /dev/null differ

diff --git a/contrib/openssl-0.9.7b-crlnumberpatch.tar.gz b/contrib/openssl-0.9.7b-crlnumberpatch.tar.gz
deleted file mode 100644 (file)
index 2152314..0000000
Binary files a/contrib/openssl-0.9.7b-crlnumberpatch.tar.gz and /dev/null differ

diff --git a/contrib/openssl-engine-0.9.6c-tw.patch.gz b/contrib/openssl-engine-0.9.6c-tw.patch.gz
deleted file mode 100644 (file)
index f47f1f9..0000000
Binary files a/contrib/openssl-engine-0.9.6c-tw.patch.gz and /dev/null differ

diff --git a/contrib/openssl_cluster-labs-0.9.7-beta3.patch.gz b/contrib/openssl_cluster-labs-0.9.7-beta3.patch.gz
deleted file mode 100644 (file)
index 3a767c1..0000000
Binary files a/contrib/openssl_cluster-labs-0.9.7-beta3.patch.gz and /dev/null differ

diff --git a/contrib/pkcs11-adnovum-20011212.tar.gz b/contrib/pkcs11-adnovum-20011212.tar.gz
deleted file mode 100644 (file)
index 574ffc2..0000000
Binary files a/contrib/pkcs11-adnovum-20011212.tar.gz and /dev/null differ

diff --git a/contrib/pkcs11_engine-0.9.7d.patch.2006-04-17.gz b/contrib/pkcs11_engine-0.9.7d.patch.2006-04-17.gz
deleted file mode 100644 (file)
index ebdec83..0000000
Binary files a/contrib/pkcs11_engine-0.9.7d.patch.2006-04-17.gz and /dev/null differ

diff --git a/contrib/pkcs11_engine-0.9.7d.patch.2006-09-12.gz b/contrib/pkcs11_engine-0.9.7d.patch.2006-09-12.gz
deleted file mode 100644 (file)
index 403fe94..0000000
Binary files a/contrib/pkcs11_engine-0.9.7d.patch.2006-09-12.gz and /dev/null differ

diff --git a/contrib/pkcs11_engine-0.9.7l.patch.2006-10-13.gz b/contrib/pkcs11_engine-0.9.7l.patch.2006-10-13.gz
deleted file mode 100644 (file)
index 9a24287..0000000
Binary files a/contrib/pkcs11_engine-0.9.7l.patch.2006-10-13.gz and /dev/null differ

diff --git a/contrib/pkcs11_engine-0.9.8j.2009-03-11.tar.gz b/contrib/pkcs11_engine-0.9.8j.2009-03-11.tar.gz
deleted file mode 100644 (file)
index 0f42bc4..0000000
Binary files a/contrib/pkcs11_engine-0.9.8j.2009-03-11.tar.gz and /dev/null differ

diff --git a/contrib/ssl.ca-0.1.tar.gz b/contrib/ssl.ca-0.1.tar.gz
deleted file mode 100644 (file)
index 611084e..0000000
Binary files a/contrib/ssl.ca-0.1.tar.gz and /dev/null differ

diff --git a/contrib/vos_patches.txt.gz b/contrib/vos_patches.txt.gz
deleted file mode 100644 (file)
index 14dc090..0000000
Binary files a/contrib/vos_patches.txt.gz and /dev/null differ

diff --git a/contrib/zencod-engine-0.9.6x.tar.gz b/contrib/zencod-engine-0.9.6x.tar.gz
deleted file mode 100644 (file)
index 35614e3..0000000
Binary files a/contrib/zencod-engine-0.9.6x.tar.gz and /dev/null differ

diff --git a/contrib/zencod-engine-0.9.7.tar.gz b/contrib/zencod-engine-0.9.7.tar.gz
deleted file mode 100644 (file)
index 0f8e650..0000000
Binary files a/contrib/zencod-engine-0.9.7.tar.gz and /dev/null differ

diff --git a/docs/.cvsignore b/docs/.cvsignore
deleted file mode 100644 (file)
index a80f04d..0000000
--- a/docs/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.html
-crypto
-ssl
-apps
-index.cache

diff --git a/docs/HOWTO/.cvsignore b/docs/HOWTO/.cvsignore
deleted file mode 100644 (file)
index eececad..0000000
--- a/docs/HOWTO/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-*.txt

diff --git a/docs/Pod/.cvsignore b/docs/Pod/.cvsignore
deleted file mode 100644 (file)
index ceaf1e4..0000000
--- a/docs/Pod/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-index.cache

diff --git a/docs/fips/.cvsignore b/docs/fips/.cvsignore
deleted file mode 100644 (file)
index a1cfd00..0000000
--- a/docs/fips/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.html
-*.pdf
-*.gz
-*.zip

diff --git a/docs/misc/.cvsignore b/docs/misc/.cvsignore
deleted file mode 100644 (file)
index 4dc9e88..0000000
--- a/docs/misc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.txt
-*.html

diff --git a/images/.cvsignore b/images/.cvsignore
deleted file mode 100644 (file)
index 088830c..0000000
--- a/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-index.cache

diff --git a/images/page-navbar-co-n.jpg b/images/page-navbar-co-n.jpg
deleted file mode 100644 (file)
index 6cba022..0000000
Binary files a/images/page-navbar-co-n.jpg and /dev/null differ

diff --git a/images/page-navbar-co-s.jpg b/images/page-navbar-co-s.jpg
deleted file mode 100644 (file)
index 9c495ad..0000000
Binary files a/images/page-navbar-co-s.jpg and /dev/null differ

diff --git a/news/.cvsignore b/news/.cvsignore
deleted file mode 100644 (file)
index 088830c..0000000
--- a/news/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-index.cache

diff --git a/openssl-macros.wml b/openssl-macros.wml
index d935c899c7d23cd139af0a300c327a5152660534..a23cbd95267615e0faf800b10a45114ba5c35a37 100644 (file)
--- a/openssl-macros.wml
+++ b/openssl-macros.wml
@@ -134,7 +134,6 @@ H3    { font-weight: bold; font-size: 12pt; line-height: 12pt; \
   <navbar:button id=news     url=news/    txt="News"         img=page-navbar-ne-*.jpg>
   <navbar:button id=docs     url=docs/    txt="Documents"    img=page-navbar-do-*.jpg>
   <navbar:button id=source   url=source/  txt="Source"       img=page-navbar-so-*.jpg>
-  <navbar:button id=contrib  url=contrib/ txt="Contribution" img=page-navbar-co-*.jpg>
   <navbar:button id=support  url=support/ txt="Support"      img=page-navbar-su-*.jpg>
   <navbar:button id=related  url=related/ txt="Related"      img=page-navbar-re-*.jpg>
   #   button epilog

diff --git a/related/.cvsignore b/related/.cvsignore
deleted file mode 100644 (file)
index 088830c..0000000
--- a/related/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-index.cache

diff --git a/source/.cvsignore b/source/.cvsignore
deleted file mode 100644 (file)
index 929eb79..0000000
--- a/source/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.html
-*.gz
-*.gz.asc
-*.gz.md5
-*.gz.sha1
-*.tar.gz.sig
-*.patch
-index.cache

diff --git a/source/.wmlsnb b/source/.wmlsnb
index 7f495400cc470b2e7de105acad9737ce536de0a0..d9a93860ab83388968918906542de8b974d65942 100644 (file)
--- a/source/.wmlsnb
+++ b/source/.wmlsnb
@@ -5,7 +5,6 @@
 <snb>
   <snb_button id=tarballs txt="Tarballs"     url=".">
   <snb_button id=license  txt="License"      url="license.html">
-  <snb_button id=contrib txt="Contribution"  url="../contrib/">
   <snb_button id=repos    txt="Repository"   url="repos.html">
   <snb_button id=mirror   txt="Mirror"       url="mirror.html">
   <snb_button id=gitweb   txt="GitWeb"       url="http://git.openssl.org/">

diff --git a/source/cvstrac.wml b/source/cvstrac.wml
deleted file mode 100644 (file)
index 84d80a2..0000000
--- a/source/cvstrac.wml
+++ /dev/null
@@ -1,20 +0,0 @@
-#!wml -oPAGE_HEADuPAGE_BODY-PAGE_FOOT2:cvstrac.head.html \
-      -oPAGE_FOOTuPAGE_FOOT2:cvstrac.foot.html \
-      -DROOT=http://www.openssl.org/ \
-      -DSNB_ROOT=http://www.openssl.org/source \
-      -DIMG=http://www.openssl.org/images
-
-#use wml::openssl area=source page=cvstrac
-
-<title>CVS Web Interface</title>
-
-<h1>CVS Web Interface</h1>
-
-[PAGE_FOOT2:
-<font color="#c0c0c0" size=-1 face="Arial,Helvetica">
-<b>____<br>
-Web Interface for the OpenSSL CVS Repository<br>
-Based on <a href="http://www.cvstrac.org/">CVSTrac</a>.
-</font>
-:PAGE_FOOT2]
-

diff --git a/source/cvsweb.icons/.cvsignore b/source/cvsweb.icons/.cvsignore
deleted file mode 100644 (file)
index ceaf1e4..0000000
--- a/source/cvsweb.icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-index.cache

diff --git a/source/index.wml b/source/index.wml
index 465ea51914fe08b9c7c34828944f3e32e06165a1..501c7d98866114fc3cd5ba90e4f41af3283700b2 100644 (file)
--- a/source/index.wml
+++ b/source/index.wml
@@ -13,11 +13,13 @@ Old releases can be found <a href="old">here</a>.
 <p>
 Alternatively, you can find all distribution tarballs in our FTP area,
 <a href="ftp://ftp.openssl.org/source/">ftp://ftp.openssl.org/source/</a>.
-Development snapshots can be found at
-<a href="ftp://ftp.openssl.org/snapshot/">ftp://ftp.openssl.org/snapshot/</a>.
 A list of FTP mirror sites can be found <a href="mirror.html">here</a>.
 </p>
 
+<p>
+Development snapshots can be found at
+<a href="ftp://ftp.openssl.org/snapshot/">ftp://ftp.openssl.org/snapshot/</a>.
+
 <p>
 We also maintain a clone at GitHub,
 <a href="https://github.com/openssl/openssl">https://github.com/openssl/openssl</a>.

diff --git a/support/.cvsignore b/support/.cvsignore
deleted file mode 100644 (file)
index 088830c..0000000
--- a/support/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-index.cache

diff --git a/support/funding/.cvsignore b/support/funding/.cvsignore
deleted file mode 100644 (file)
index 088830c..0000000
--- a/support/funding/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-index.cache