diff --git a/server.go b/server.go
index 0d9a5915..700e4563 100644
--- a/server.go
+++ b/server.go
@@ -93,19 +93,22 @@ type options struct {
 // A ServerOption sets options.
 type ServerOption func(*options)
 
+// Handshaker returns a ServerOption that specifies a function to perform user-specified
+// handshaking on the connection before it becomes usable for gRPC.
 func Handshaker(f func(net.Conn) error) ServerOption {
 	return func(o *options) {
 		o.handshaker = f
 	}
 }
 
+// CustomeCodec returns a ServerOption that sets a codec for message marshaling and unmarshaling.
 func CustomCodec(codec Codec) ServerOption {
 	return func(o *options) {
 		o.codec = codec
 	}
 }
 
-// MaxConcurrentStreams returns an Option that will apply a limit on the number
+// MaxConcurrentStreams returns a ServerOption that will apply a limit on the number
 // of concurrent streams to each ServerTransport.
 func MaxConcurrentStreams(n uint32) ServerOption {
 	return func(o *options) {