Commit 3ea4404f authored by Bodo Möller's avatar Bodo Möller
Browse files

Unify doc/openssl.pod and doc/man/openssl.pod, which were almost the 

same and now are identical.
The next step will be to delete doc/openssl.pod, this is just
to see the individual CVS deltas.
parent 7328b0a8

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ install: all 
		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \

	done

	@echo installing man 1

	@for i in doc/openssl.pod doc/man/*.pod ; \

	@for i in doc/man/*.pod ; \

	do pod2man --section=1 --date=`date +%Y-%m-%d` --center=OpenSSL \

		 --release=$(VERSION) $$i > $(INSTALL_PREFIX)$(INSTALLTOP)/man/man1/`basename $$i .pod`.1; \

	done

doc/man/openssl.pod

+75 −1
Original line number Diff line number Diff line
@@ -224,13 +224,87 @@ RC5 Cipher 


=back



=head1 DETAILED COMMAND DESCRIPTION



The following is a detailed description of every B<openssl> I<command>.

(No, it isn't; this is here temporarily and should be in separate

files for s_client and for s_server.)



=over 4



=item B<openssl> B<s_client>

[B<-connect> I<host>B<:>I<port>]

[B<-verify> I<arg>]

[B<-cert> I<arg>]

[B<-key> I<arg>]

[B<-CApath> I<arg>]

[B<-CAfile> I<arg>]

[B<-reconnect>]

[B<-pause>]

[B<-debug>]

[B<-nbio_test>]

[B<-state>]

[B<-nbio>]

[B<-quiet>]

[B<-ssl2>]

[B<-ssl3>]

[B<-tls1>]

[B<-no_ssl2>]

[B<-no_ssl3>]

[B<-no_tls1>]

[B<-bugs>]

[B<-cipher>]



The B<s_client> command implements a generic SSL/TLS client which can

establish a transparent connection to a remote I<host> and I<port> speaking

SSL/TLS. 



=item B<openssl> B<s_server>

[B<-accept> I<port>]

[B<-verify> I<arg>]

[B<-Verify> I<arg>]

[B<-cert> I<arg>]

[B<-key> I<arg>]

[B<-dcert> I<arg>]

[B<-dkey> I<arg>]

[B<-nbio>]

[B<-nbio_test>]

[B<-debug>]

[B<-state>]

[B<-CApath> I<arg>]

[B<-CAfile> I<arg>]

[B<-nocert>]

[B<-cipher> I<arg>]

[B<-quiet>]

[B<-no_tmp_rsa>]

[B<-ssl2>]

[B<-ssl3>]

[B<-tls1>]

[B<-no_ssl2>]

[B<-no_ssl3>]

[B<-no_tls1>]

[B<-bugs>]

[B<-www>]

[B<-WWW>]



The B<s_server> command implements a generic SSL/TLS server which accepts

connections from remote clients on I<port> speaking SSL/TLS.



=back



...



=head1 SEE ALSO



asn1parse(1), ca(1), config(1), crl(1), crl2pkcs7(1), dgst(1), dh(1),

dsa(1), dsaparam(1), enc(1), gendh(1), gendsa(1), genrsa(1), nseq(1),

openssl(1), pkcs12(1), pkcs7(1), pkcs8(1), req(1), rsa(1), smime(1),

spkac(1), verify(1), version(1), x509(1),

crypto(3), ssl(3)



=head1 HISTORY



The openssl(3) document appeared in OpenSSL 0.9.2

The openssl(1) document appeared in OpenSSL 0.9.2



=cut

doc/openssl.pod

+8 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ Certificate Revocation List (CRL) Management. 


=item B<crl2pkcs7>      



CRL2 to PKCS#7 Conversion.

CRL to PKCS#7 Conversion.



=item B<dgst>
@@ -227,6 +227,8 @@ RC5 Cipher 
=head1 DETAILED COMMAND DESCRIPTION



The following is a detailed description of every B<openssl> I<command>.

(No, it isn't; this is here temporarily and should be in separate

files for s_client and for s_server.)



=over 4
@@ -294,11 +296,15 @@ connections from remote clients on I<port> speaking SSL/TLS. 


=head1 SEE ALSO



asn1parse(1), ca(1), config(1), crl(1), crl2pkcs7(1), dgst(1), dh(1),

dsa(1), dsaparam(1), enc(1), gendh(1), gendsa(1), genrsa(1), nseq(1),

openssl(1), pkcs12(1), pkcs7(1), pkcs8(1), req(1), rsa(1), smime(1),

spkac(1), verify(1), version(1), x509(1),

crypto(3), ssl(3)



=head1 HISTORY



The openssl(3) document appeared in OpenSSL 0.9.2

The openssl(1) document appeared in OpenSSL 0.9.2



=cut