Start cleanup of docs part of website

Remove docs/misc.
Add simple target to makefile.

diff --git a/Makefile b/Makefile
index baeb840e66dcd56e028438ef8db01917800a02e0..e96f16c6a962a2533003b7e64e80b5d0180dff5b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,19 +13,20 @@ lock-hack: FRC.lock-hack
 FRC.lock-hack:
 
 PODSHOME=/v/openssl/checkouts/openssl/doc
+HTMLGOAL=docs
 
-all: simple docs-depend docs HOWTOs miscs
+all: simple docs-depend docs
        @wmk -I $(PODSHOME)/.. -a
        @# 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 docs/HOWTO/index.wml
-       @wmk -f source/mirror.wml
        @wmk -f news/openssl-*notes.wml
        @wmk -f news/index.wml
        @echo "[" `date` "] Done"
 
-HTMLGOAL=docs
+simple:
+       cp $(PODFSHOME)/HOWTO/*.txt docs/HOWTO/.
+       wmk -I $(PODSHOME)/.. -a about news related source support docs/HOWTO *.wml
 
 FRC.docs :
 docs : FRC.docs
@@ -38,11 +39,3 @@ docs-depend : FRC.docs-depend
        @find $(PODSHOME) -name '*.pod' -print | \
                PODSHOME=$(PODSHOME) HTMLGOAL=$(HTMLGOAL) ./make-docs-makefile.pl \
                > Makefile.docs
-
-FRC.HOWTOs :
-HOWTOs : FRC.HOWTOs
-       cp $(PODSHOME)/HOWTO/*.txt $(HTMLGOAL)/HOWTO/
-
-FRC.miscs :
-miscs : FRC.miscs
-       cp $(PODSHOME)/fingerprints.txt $(HTMLGOAL)/misc/

diff --git a/docs/.wmlsnb b/docs/.wmlsnb
index e878de09af28886ddc347207c44e2dec698f1d6b..fb1cbb43345bb37c3b518fb787d80296dcdfa274 100644 (file)
--- a/docs/.wmlsnb
+++ b/docs/.wmlsnb
@@ -10,6 +10,5 @@
   <snb_button id=HOWTO   txt="HOWTO"      url="HOWTO/">
   <snb_button id=WIKI    txt="Wiki"       url="http://wiki.openssl.org/">
   <snb_button id=FIPS140 txt="FIPS140"    url="fips/">
-  <snb_button id=misc    txt="misc"       url="misc/">
 </snb>
 

diff --git a/docs/index.wml b/docs/index.wml
index 5921e56695223baacdc02fb6fcaa8336c389470b..164a85bb3a8089984a5c4ddcbd0d49c5faffc6ba 100644 (file)
--- a/docs/index.wml
+++ b/docs/index.wml
@@ -1,13 +1,13 @@
 
 #use wml::openssl area=docs page=index
 
-<title>Documents, Misc</title>
+<title>Documentation</title>
 
 <h1>OpenSSL Documents</h1>
 
 Here you can find the three manual pages documenting the three essential parts
 of the OpenSSL toolkit: The SSL library, the Crypto library and the command
-line tool, as well as a repository of HOWTO and other miscellaneous documents.
+line tool, as well as a other miscellaneous documents.
 <br><br>
 <b>Note:</b> the documents are from the current development version of OpenSSL and
 may mention features which are not present or behave differently in previous
@@ -33,7 +33,5 @@ versions of OpenSSL.
 <li><a href="fips/"><font id=sfl>FIPS140</font></a>:<br>
     Data and documentation related to the FIPS140 validation support in OpenSSL
 <p>
-<li><a href="misc/"><font id=sfl>misc</font></a>:<br>
-    Miscellaneous documents with information that has no other logical place.  Among others, you will find a list of current PGP/GnuPG fingerprints to help you check OpenSSL distribution signatures.
 </ul>
 

diff --git a/docs/misc/.gitignore b/docs/misc/.gitignore
deleted file mode 100644 (file)
index 2211df6..0000000
--- a/docs/misc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt

diff --git a/docs/misc/index.wml b/docs/misc/index.wml
deleted file mode 100644 (file)
index ef696fb..0000000
--- a/docs/misc/index.wml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#use wml::openssl area=documents page=misc
-
-<title>Miscellaneous documents</title>
-
-<h1>Miscellaneous documents</h1>
-
-<p>Here you can find a number of miscellaneous documents.  These files are
-also part of the OpenSSL distribution, somewhere under <tt>doc/</tt>.</p>
-
-<p>
-<filelist *.txt>
-</p>
-
-<h2>Legalities</h2>
-
-<disclaimer>
-