updates.

diff --git a/CREDITS b/CREDITS
index 13b078d6df7cc77bb41a87b312cee2ef33f2c6a6..63ec9f6af6d0d2371c902b285477444fe4e77057 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -28,7 +28,7 @@ E: bostik@lut.fi
 W: http://www.lut.fi/~bostik
 D: Server runs as a daemon on dedicated account
 D: Fixed inconsistencies in server side code routine names
-D: Transition to new configuration file format
+D: Man-pages
 S: Skinnarilankatu 28 E 2
 S: 53850 Lappeenranta
 S: Finland

diff --git a/TODO b/TODO
index d1c34b1eb3bdbcd2a6322d0c5d93ae08d920916d..5842ba8918598d1e7315168152c3eaa9d6827ea5 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,8 +5,6 @@ TODO for Irssi SILC Client 1.0
 
  o UTF-8 decode WHOIS userinfos, topic, etc.
 
- o Manaul file for silc(1) and silc.conf.
-
  o c0ffee's MIME signal
 
  o SILC protocol version 1.2 integration
@@ -26,8 +24,6 @@ TODO for SILC Server 1.0
        o Add special handling in router and server for "connection
          timed out" error.  Be optimistic.
 
- o Manual file for silcd(8) and silcd.conf.
-
  o SILC protocol version 1.2 integration
 
  o Testing

diff --git a/doc/Makefile.am.pre b/doc/Makefile.am.pre
index 6fb9bf0f4bdc39ce823c9d7f56b473c7862e38e6..e1047f731f9ef83653a9bff1b803f3b33a3bf869 100644 (file)
--- a/doc/Makefile.am.pre
+++ b/doc/Makefile.am.pre
@@ -91,12 +91,12 @@ dist-hook:
 endif
 
 if SILC_DIST_TOOLKIT
-SILC_EXTRA_DIST = toolkit examples
+SILC_EXTRA_DIST = toolkit examples silc.1 silcd.8 silcd.conf.5
 else
 if SILC_DIST_SERVER
-SILC_EXTRA_DIST = examples
+SILC_EXTRA_DIST = examples silcd.8 silcd.conf.5
 else
-SILC_EXTRA_DIST =
+SILC_EXTRA_DIST = silc.1
 endif
 endif
 

diff --git a/doc/silc.yo b/doc/silc.yo
index a848af339b6f6586ed8af8c92677329500efbcb0..c46ee2a62e41d26250e7efbd7cac258c9a6f6d5f 100644 (file)
--- a/doc/silc.yo
+++ b/doc/silc.yo
@@ -22,12 +22,13 @@ key and private messages with session keys.  It is also possible to use
 private channel keys and private message keys in addition of server
 generated keys.
 
-bf(Silc) supports em(passphrase) and public key authentication based on
-em(digital signatures), when connecting to SILC server.  bf(Silc) also supports
-key exchange (key agreement) between other bf(Silc) users in the SILC
-network to negotiate secret key material.  This key material then can be
-used to secure for example private messages.  It is also possible to exchange
-public keys and certificates in the SILC network between clients and servers.
+bf(Silc) supports em(passphrase) authentication and public key authentication
+based on em(digital signatures), when connecting to SILC server.  bf(Silc)
+also supports key exchange (key agreement) between other bf(Silc) users in
+the SILC network to negotiate secret key material.  This key material then
+can be used to secure for example private messages.  It is also possible to
+exchange public keys and certificates in the SILC network between clients
+and servers.
 
 The bf(silc) also supports em(detaching) from the SILC network by closing
 the connection to the server but without quitting from the network.  Next
@@ -135,6 +136,29 @@ bf(--pkcs)=em(PKCS)       Set the public key algorithm of key pair.  For example
 bf(--bits)=em(VALUE)       Set the length of public key pair, in bits.
 
 
+manpagesection(CONFIGURATION FILE)
+The bf(silc) configuration file is bf(~/.silc/silc.conf) and can be used
+to configure the behavriou of the client.  The configuration file format
+is equivalent to Irssi IRC client's configuration file.  See the 
+documentation for the configuration file at bf(http://irssi.org).
+
+There are a few bf(silc) configuration settings in em(silc.conf) which
+can be configured in em(settings) section under em("server") block.
+They can be set also with the bf(/SET) command in the bf(silc) client.
+
+bf(crypto_default_cipher)
+quote(The default cipher to use to secure the session to the server.
+Values can be for example bf(aes-256-cbc), bf(aes-192-cbc), bf(aes-128-cbc),
+bf(twofish-256-cbc), bf(twofish-192-cbc), bf(twofish-128-cbc).)
+
+bf(crypto_default_hash)
+quote(The default hash function to use in session with the server. Values
+can be bf(sha1) or bf(md5).)
+
+bf(crypto_default_hmac)
+quote(The default HMAC to be use in session with the server.  Value can
+be bf(hmac-sha1-96), bf(hmac-md5-96), bf(hmac-sha1) or bf(hmac-md5).)
+
 
 manpagefiles()
 bf(~/.silc/silc.conf)
@@ -163,7 +187,7 @@ other information.)
 
 
 manpageseealso()
-bf(silcd(8)) bf(silc(1))
+bf(silcd(8)) bf(silcd.conf(5))
 
 
 manpagesection(NETWORK RESOURCES)