--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_auxprop_add_plugin.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_auxprop_add_plugin.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,109 +1,47 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_auxprop_add_plugin 3SASL "16 Sep 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_auxprop_add_plugin 3sasl "06 Sep 2003" SASL "SASL man pages"
 .SH NAME
 sasl_auxprop_add_plugin \- add a SASL auxiliary property plug-in
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslplug.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslplug.h>
 
-\fBint\fR \fBsasl_auxprop_add_plugin\fR(\fBconst char *\fR\fIplugname\fR,
-     \fBsasl_auxprop_plug_init_t *\fR\fIcplugfunc\fR);
-.fi
+.BI "int sasl_auxprop_add_plugin(const char *" plugname ", "
+.BI "   sasl_auxprop_plug_init_t *" cplugfunc "); "
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_auxprop_add_plugin()\fR interface to add a auxiliary property plug-in to the current list of auxiliary property plug-ins in the SASL library.
-.SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIplugname\fR\fR
-.ad
-.RS 13n
-.rt  
-The name of the auxiliary property plug-in.
-.RE
+Use the 
+.B sasl_auxprop_add_plugin()
+interface to add a auxiliary property plug-in to the current list of auxiliary property plug-ins in the SASL library.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIcplugfunc\fR\fR
-.ad
-.RS 13n
-.rt  
-The value of \fIcplugfunc\fR is filled in by the \fBsasl_auxprop_plug_init_t\fR structure.
-.RE
+.SH PARAMETERS
+.I plugname
+is the name of the auxiliary property plug-in.
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_auxprop_add_plugin()\fR returns an integer that corresponds to a SASL error code.
-.SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 16n
-.rt  
-The call to \fBsasl_client_add_plugin()\fR was successful.
-.RE
+.I cplugfunc
+is the value of cplugfunc is filled in by the sasl_auxprop_plug_init_t structure.
+
+.SH "RETURN VALUES"
+sasl_auxprop_add_plugin() returns an integer that corresponds to a SASL error code.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_BADVERS\fR\fR
-.ad
-.RS 16n
-.rt  
+.SH ERRORS
+.TP 0.8i
+.B SASL_OK
+The call to 
+.I sasl_client_add_plugin()
+was successful.
+.TP 0.8i
+.B SASL_BADVERS
 Version mismatch with plug-in.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_NOMEM\fR\fR
-.ad
-.RS 16n
-.rt  
+.TP 0.8i
+.B SASL_NOMEM
 Memory shortage failure.
-.RE
 
-.sp
-.LP
-See \fBsasl_errors\fR(3SASL) for information on other SASL error codes.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.TP 0.8i
+See sasl_errors(3SASL) for information on other SASL error codes.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)
+.SH "SEE ALSO"
+sasl_errors(3SASL)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_canonuser_add_plugin.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_canonuser_add_plugin.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,109 +1,49 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_canonuser_add_plugin 3SASL "16 Sep 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_canonuser_add_plugin 3sasl "16 Sep 2003" SASL "SASL man pages"
 .SH NAME
 sasl_canonuser_add_plugin \- add a SASL user canonicalization plug-in
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslplug.h>
+.B cc [ flag ... ] file ... -lsasl   [ library ... ]
 
-\fBint\fR \fBsasl_canonuser_add_plugin\fR(\fBconst char *\fR\fIplugname\fR,
-     \fBsasl_canonuser_plug_init_t *\fR\fIcplugfunc\fR);
+.B #include <sasl/saslplug.h>
+
+.BI "int sasl_canonuser_add_plugin(const char *" plugname ", "
+.BI "   sasl_canonuser_plug_init_t *" cplugfunc "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_canonuser_add_plugin()\fR interface to add a user canonicalization plug-in to the current list of user canonicalization plug-ins in the SASL library.
-.SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIplugname\fR\fR
-.ad
-.RS 13n
-.rt  
-The name of the user canonicalization plug-in.
-.RE
+Use the 
+.B sasl_canonuser_add_plugin()
+interface to add a user canonicalization plug-in to the current list of user canonicalization plug-ins in the SASL library.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIcplugfunc\fR\fR
-.ad
-.RS 13n
-.rt  
-The value of \fIcplugfunc\fR is filled in by the \fBsasl_canonuser_plug_init_t\fR structure.
-.RE
+.SH PARAMETERS
+.I plugname
+is the name of the user canonicalization plug-in.
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_server_add_plugin()\fR returns an integer that corresponds to a SASL error code.
-.SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 16n
-.rt  
-The call to \fBsasl_client_add_plugin()\fR was successful.
-.RE
+.I cplugfunc
+The value of cplugfunc is filled in by the sasl_canonuser_plug_init_t structure.
+
+.SH "RETURN VALUES"
+sasl_server_add_plugin() returns an integer that corresponds to a SASL error code.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_BADVERS\fR\fR
-.ad
-.RS 16n
-.rt  
+.SH ERRORS
+.TP 0.8i
+.B SASL_OK
+The call to 
+.I sasl_client_add_plugin()
+was successful.
+.TP 0.8i
+.B SASL_BADVERS
 Version mismatch with plug-in.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_NOMEM\fR\fR
-.ad
-.RS 16n
-.rt  
+.TP 0.8i
+.B SASL_NOMEM
 Memory shortage failure.
-.RE
 
-.sp
-.LP
-See \fBsasl_errors\fR(3SASL) for information on other SASL error codes.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+See sasl_errors(3SASL) for information on other SASL error codes.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
+.SH "SEE ALSO"
+sasl_errors(3SASL)
 
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_client_add_plugin.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_client_add_plugin.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,109 +1,47 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_client_add_plugin 3SASL "12 Sep 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_client_add_plugin 3sasl "12 Sep 2003" SASL "SASL man pages"
 .SH NAME
 sasl_client_add_plugin \- add a SASL client plug-in
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslplug.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslplug.h>
 
-\fBint\fR \fBsasl_client_add_plugin\fR(\fBconst char *\fR\fIplugname\fR,
-     \fBsasl_client_plug_init_t *\fR\fIcplugfunc\fR);
+.BI " int sasl_client_add_plugin(const char *" plugname ", "
+.BI "				 sasl_client_plug_init_t *" cplugfunc "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_client_add_plugin()\fR interface to add a client plug-in to the current list of client plug-ins in the SASL library.
-.SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIplugname\fR\fR
-.ad
-.RS 13n
-.rt  
-The name of the client plug-in.
-.RE
+Use the 
+.B sasl_client_add_plugin()
+interface to add a client plug-in to the current in-memory list of client plug-ins in the SASL library.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIcplugfunc\fR\fR
-.ad
-.RS 13n
-.rt  
-The value of \fIcplugfunc\fR is filled in by the \fBsasl_client_plug_init_t\fR structure.
-.RE
+.SH PARAMETERS
+.I plugname
+The name of the client plug-in.
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_client_add_plugin()\fR returns an integer that corresponds to a SASL error code.
-.SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 16n
-.rt  
-The call to \fBsasl_client_add_plugin()\fR was successful.
-.RE
+.I cplugfunc
+The value of cplugfunc is filled in by the sasl_client_plug_init_t structure.
+
+.SH "RETURN VALUES"
+sasl_client_add_plugin() returns an integer that corresponds to a SASL error code.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_BADVERS\fR\fR
-.ad
-.RS 16n
-.rt  
+.SH ERRORS
+.TP 0.8i
+.B SASL_OK
+The call to sasl_client_add_plugin() was successful.
+.TP 0.8i
+.B SASL_BADVERS
 Version mismatch with plug-in.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_NOMEM\fR\fR
-.ad
-.RS 16n
-.rt  
+.TP 0.8i
+.B SASL_NOMEM
 Memory shortage failure.
-.RE
 
-.sp
-.LP
-See \fBsasl_errors\fR(3SASL) for information on other SASL error codes.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.TP 0.8i
+See sasl_errors(3SASL) for information on other SASL error codes.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)
+.SH "SEE ALSO"
+sasl_errors(3SASL)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_client_plug_init_t.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_client_plug_init_t.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,120 +1,52 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_client_plug_init_t 3SASL "27 Oct 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_client_plug_init_t 3SASL "27 Oct 2003" SASL "SASL man pages"
 .SH NAME
 sasl_client_plug_init_t \- client plug-in entry point
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslplug.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslplug.h>
 
-\fBint\fR \fBsasl_client_plug_init_t\fR(\fBconst sasl_utils_t *\fR\fIutils\fR, \fBint\fR \fImax_version\fR,
-     \fBint *\fR\fIout_version\fR, \fBsasl_client_plug_t **\fR\fIpluglist\fR, \fBint *\fR\fIplugcount\fR);
+.BI "int sasl_client_plug_init_t(const sasl_utils_t *" utils ", "
+.BI "                                      int " max_version ", "
+.BI "                                     int *" out_version ", "
+.BI "                        sasl_client_plug_t **" pluglist ", "
+.BI "                                       int *" plugcount "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-The \fBsasl_client_plug_init_t()\fR callback function is the client plug-in entry point.
+The 
+.B sasl_client_plug_init_t()
+callback function is the client plug-in entry point.
+
 .SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIutils\fR\fR
-.ad
-.RS 15n
-.rt  
+.I utils
 The utility callback functions.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fImax_version\fR\fR
-.ad
-.RS 15n
-.rt  
+.I max_version
 The highest client plug-in version supported.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIout_version\fR\fR
-.ad
-.RS 15n
-.rt  
+.I out_version
 The client plug-in version of the result..
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fIpluglist\fR\fR
-.ad
-.RS 15n
-.rt  
-The list of client mechanism plug-ins.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIplugcount\fR\fR
-.ad
-.RS 15n
-.rt  
-The number of client mechanism plug-ins.
-.RE
+.I pluglist
+The list of client mechanism plug-ins.
 
-.SH RETURN VALUES
-.sp
-.LP
-Like other SASL callback functions, \fBsasl_client_plug_init_t()\fR returns an integer that corresponds to a SASL error code. See <\fBsasl.h\fR> for a complete list of SASL error codes.
-.SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 11n
-.rt  
-The call to \fBsasl_client_plug_init_t()\fR was successful.
-.RE
+.I plugcount
+The number of client mechanism plug-ins.
+
+.SH "RETURN VALUES"
+Like other SASL callback functions, sasl_client_plug_init_t() returns an integer that corresponds to a SASL error code. See <sasl.h> for a complete list of SASL error codes.
 
-.sp
-.LP
-See \fBsasl_errors\fR(3SASL) for information on SASL error codes.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.SH ERRORS
+.TP 0.8i
+SASL_OK
+The call to sasl_client_plug_init_t() was successful.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
+See sasl_errors(3SASL) for information on SASL error codes.
 
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)
+.SH "SEE ALSO"
+sasl_errors(3SASL)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_decode64.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_decode64.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,120 +1,53 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_decode64 3SASL "16 Sep 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_decode64 3sasl "16 Sep 2003" SASL "SASL man pages"
 .SH NAME
 sasl_decode64 \- decode base64 string
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslutil.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslutil.h>
 
-\fBint\fR \fBsasl_decode64\fR(\fBconst char *\fR\fIin\fR, \fBunsigned\fR \fIinlen\fR, \fBchar *\fR\fIout\fR,
-     \fBunsigned\fR \fIoutmax\fR,\fBunsigned *\fR\fIoutlen\fR);
+.BI "int sasl_decode64(const char *" in ", "
+.BI "                  unsigned " inlen ", "
+.BI "                  char *" out ", "
+.BI "                  unsigned " outmax ", "
+.BI "                  unsigned *" outlen "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_decode64()\fR interface to decode a base64 encoded buffer.
+Use the 
+.B sasl_decode64()
+interface to decode a base64 encoded buffer.
+
 .SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIin\fR\fR
-.ad
-.RS 10n
-.rt  
+.I in
 Input data.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIinlen\fR\fR
-.ad
-.RS 10n
-.rt  
+.I inlen
 The length of the input data.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIout\fR\fR
-.ad
-.RS 10n
-.rt  
-The output data. The value of \fIout\fR can be the same as \fIin\fR. However, there must be enough space.
-.RE
+.I out
+The output data. The value of out can be the same as in. However, there must be enough space.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIoutlen\fR\fR
-.ad
-.RS 10n
-.rt  
+.I outlen
 The length of the actual output.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIoutmax\fR\fR
-.ad
-.RS 10n
-.rt  
+.I outmax
 The maximum size of the output buffer.
-.RE
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_decode64()\fR returns an integer that corresponds to a SASL error code.
-.SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 11n
-.rt  
-The call to \fBsasl_decode64()\fR was successful.
-.RE
+.SH "RETURN VALUES"
+sasl_decode64() returns an integer that corresponds to a SASL error code.
 
-.sp
-.LP
-See \fBsasl_errors\fR(3SASL) for information on SASL error codes.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.SH ERRORS
+.TP 0.8i
+.B SASL_OK
+The call to sasl_decode64() was successful.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
+.TP 0.8i
+See sasl_errors(3SASL) for information on SASL error codes.
 
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)
+.SH "SEE ALSO"
+sasl_errors(3SASL)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_encode64.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_encode64.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,128 +1,53 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_encode64 3SASL "16 Sep 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_encode64 3sasl "16 Sep 2003" SASL "SASL man pages"
 .SH NAME
 sasl_encode64 \- encode base64 string
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslutil.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslutil.h>
 
-\fBint\fR \fBsasl_encode64\fR(\fBconst char *\fR\fIin\fR, \fBunsigned\fR \fIinlen\fR, \fBchar *\fR\fIout\fR,
-     \fBunsigned\fR \fIoutmax\fR, \fBunsigned *\fR\fIoutlen\fR);
+.BI "int sasl_encode64(const char *" in " , "
+.BI "                  unsigned " inlen ", "
+.BI "                  char *" out ", "
+.BI "                  unsigned " outmax ", "
+.BI "                  unsigned *" outlen "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_encode64()\fR interface to convert an octet string into a base64 string. This routine is useful for SASL profiles that use base64, such as the IMAP (IMAP4) and POP (POP_AUTH) profiles. The output is null-terminated. If \fIoutlen\fR is non-\fINULL\fR, the length is placed in the \fIoutlen\fR.
+Use the 
+.B sasl_encode64()
+interface to convert an octet string into a base64 string. This routine is useful for SASL profiles that use base64, such as the IMAP (IMAP4) and POP (POP_AUTH) profiles. The output is null-terminated. If outlen is non-NULL, the length is placed in the outlen.
+
 .SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIin\fR\fR
-.ad
-.RS 10n
-.rt  
+.I in
 Input data.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIinlen\fR\fR
-.ad
-.RS 10n
-.rt  
+.I inlen
 The length of the input data.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIout\fR\fR
-.ad
-.RS 10n
-.rt  
-The output data. The value of \fIout\fR can be the same as \fIin\fR. However, there must be enough space.
-.RE
+.I out
+The output data. The value of out can be the same as in. However, there must be enough space.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIoutlen\fR\fR
-.ad
-.RS 10n
-.rt  
+.I outlen
 The length of the actual output.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIoutmax\fR\fR
-.ad
-.RS 10n
-.rt  
+.I outmax
 The maximum size of the output buffer.
-.RE
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_encode64()\fR returns an integer that corresponds to a SASL error code.
-.SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 16n
-.rt  
-The call to \fBsasl_encode64()\fR was successful.
-.RE
+.SH "RETURN VALUES"
+sasl_encode64() returns an integer that corresponds to a SASL error code.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_BUFOVER\fR\fR
-.ad
-.RS 16n
-.rt  
+.SH ERRORS
+.TP 0.8i
+.B SASL_OK
+The call to sasl_encode64() was successful.
+.TP 0.8i
+.B SASL_BUFOVER
 The output buffer was too small.
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)
+.SH "SEE ALSO"
+sasl_errors(3SASL)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_erasebuffer.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_erasebuffer.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,75 +1,35 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_erasebuffer 3SASL "16 Sep 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_erasebuffer 3sasl "16 Sep 2003"  SASL "SASL man pages"
 .SH NAME
 sasl_erasebuffer \- erase buffer
+
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslutil.h>
+cc [ flag ... ] file ...  -lsasl [ library ... ]
+.B #include <sasl/saslutil.h>
 
-\fBvoid\fR \fBsasl_erasebuffer\fR(\fBchar *\fR\fIpass\fR, \fBunsigned\fR \fIlen\fR);
+.sp
+.BI "void sasl_erasebuffer(char *" pass ", "
+.BI "                      unsigned " len "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_erasebuffer()\fR interface to erase a security sensitive buffer or password. The implementation may use recovery-resistant erase logic.
+
+.B sasl_erasebuffer
+erases a security sensitive buffer or password. The implementation may use recovery-resistant erase logic.
 .SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIpass\fR\fR
-.ad
-.RS 8n
-.rt  
+.I pass
 A password
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fIlen\fR\fR
-.ad
-.RS 8n
-.rt  
-The length of the password
-.RE
 
-.SH RETURN VALUES
-.sp
-.LP
-The \fBsasl_erasebuffer()\fR interface returns no return values.
-.SH ERRORS
-.sp
-.LP
-None.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.I len
+The length of the password
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
+.SH "RETURN VALUES"
+The sasl_erasebuffer() interface returns no return values.
 
-.SH SEE ALSO
-.sp
-.LP
-\fBattributes\fR(7)
+.SH ERRORS
+None.
+

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_getcallback_t.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_getcallback_t.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,131 +1,56 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_getcallback_t 3SASL "27 Oct 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_getcallback_t 3SASL "27 Oct 2003" SASL "SASL man pages"
 .SH NAME
 sasl_getcallback_t \- callback function to lookup a sasl_callback_t for a connection
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslplug.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslplug.h>
 
-\fBint\fR \fBsasl_getcallback_t\fR(\fBsasl_conn_t *\fR\fIconn\fR, \fBunsigned long\fR \fIcallbacknum\fR,
-     \fBint\fR \fI(**proc)\fR( ), \fBvoid **\fR\fIpcontext\fR);
+.BI "int sasl_getcallback_t(sasl_conn_t *" conn ", "
+.BI "               unsigned long " callbacknum ", "
+.BI "                         int (**" proc ")( ), "
+.BI "                         void **" pcontext "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-The \fBsasl_getcallback_t()\fR function is a callback to lookup a sasl_callback_t for a connection.
+The 
+.B sasl_getcallback_t()
+function is a callback to lookup a sasl_callback_t for a connection.
+
 .SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIconn\fR\fR
-.ad
-.RS 15n
-.rt  
+.I conn
 The connection to lookup a callback for.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIcallbacknum\fR\fR
-.ad
-.RS 15n
-.rt  
+.I callbacknum
 The number of the callback.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIproc\fR\fR
-.ad
-.RS 15n
-.rt  
-Pointer to the callback function. The value of \fIproc\fR is set to \fINULL\fR upon failure.
-.RE
+.I proc
+Pointer to the callback function. The value of proc is set to NULL upon failure.
+
+.I pcontext
+Pointer to the callback context. The value of pcontext is set to NULL upon failure.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIpcontext\fR\fR
-.ad
-.RS 15n
-.rt  
-Pointer to the callback context. The value of \fIpcontext\fR is set to \fINULL\fR upon failure.
-.RE
+.SH "RETURN VALUES"
+Like other SASL callback functions, 
+.B sasl_getcallback_t()
+returns an integer that corresponds to a SASL error code. See <sasl.h> for a complete list of SASL error codes.
 
-.SH RETURN VALUES
-.sp
-.LP
-Like other SASL callback functions, \fBsasl_getcallback_t()\fR returns an integer that corresponds to a SASL error code. See <\fBsasl.h\fR> for a complete list of SASL error codes.
 .SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 17n
-.rt  
-The call to \fBsasl_getcallback_t()\fR was successful.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_FAIL\fR\fR
-.ad
-.RS 17n
-.rt  
+.TP 0.8i
+.B SASL_OK
+The call to sasl_getcallback_t() was successful.
+.TP 0.8i
+.B SASL_FAIL
 Unable to find a callback of the requested type.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_INTERACT\fR\fR
-.ad
-.RS 17n
-.rt  
+.TP 0.8i
+.B SASL_INTERACT
 The caller must use interaction to get data.
-.RE
 
-.sp
-.LP
-See \fBsasl_errors\fR(3SASL) for information on SASL error codes.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+See sasl_errors(3SASL) for information on SASL error codes.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)
+.SH "SEE ALSO"
+sasl_errors(3SASL)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_server_add_plugin.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_server_add_plugin.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,109 +1,47 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_server_add_plugin 3SASL "1 Oct 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_server_add_plugin 3sasl "1 Oct 2003" SASL "SASL man pages"
 .SH NAME
 sasl_server_add_plugin \- add a SASL server plug-in
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslplug.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslplug.h>
 
-\fBint\fR \fBsasl_server_add_plugin\fR(\fBconst char *\fR\fIplugname\fR,
-     \fBsasl_server_plug_init_t *\fR\fIcplugfunc\fR);
+.BI "int sasl_server_add_plugin(const char *" plugname ", "
+.BI "                           sasl_server_plug_init_t *" cplugfunc "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_server_add_plugin()\fR interface to add a server plug-in to the current list of client plug-ins in the SASL library.
-.SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIplugname\fR\fR
-.ad
-.RS 13n
-.rt  
-The name of the server plug-in.
-.RE
+Use the 
+.B sasl_server_add_plugin()
+interface to add a server plug-in to the current list of client plug-ins in the SASL library.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIcplugfunc\fR\fR
-.ad
-.RS 13n
-.rt  
-The value of \fIcplugfunc\fR is filled in by the \fBsasl_server_plug_init_t\fR structure.
-.RE
+.SH PARAMETERS
+.I plugname
+The name of the server plug-in.
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_server_add_plugin()\fR returns an integer that corresponds to a SASL error code.
-.SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 16n
-.rt  
-The call to \fBsasl_client_add_plugin()\fR was successful.
-.RE
+.I cplugfunc
+The value of cplugfunc is filled in by the sasl_server_plug_init_t structure.
+
+.SH "RETURN VALUES"
+sasl_server_add_plugin() returns an integer that corresponds to a SASL error code.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_BADVERS\fR\fR
-.ad
-.RS 16n
-.rt  
+.SH ERRORS
+.TP 0.8i
+.B SASL_OK
+The call to sasl_client_add_plugin() was successful.
+.TP 0.8i
+.B SASL_BADVERS
 Version mismatch with plug-in.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_NOMEM\fR\fR
-.ad
-.RS 16n
-.rt  
+.TP 0.8i
+.B SASL_NOMEM
 Memory shortage failure.
-.RE
 
-.sp
-.LP
-See \fBsasl_errors\fR(3SASL) for information on other SASL error codes.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.TP 0.8i
+See sasl_errors(3SASL) for information on other SASL error codes.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)
+.SH "SEE ALSO"
+sasl_errors(3SASL)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_server_plug_init_t.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_server_plug_init_t.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,120 +1,52 @@
 '\" te
 .\" Copyright (c) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_server_plug_init_t 3SASL "27 Oct 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_server_plug_init_t 3SASL "27 Oct 2003" SASL "SASL man pages"
 .SH NAME
 sasl_server_plug_init_t \- server plug-in entry point
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslplug.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslplug.h>
 
-\fBint\fR \fBsasl_server_plug_init_t\fR(\fBconst sasl_utils_t *\fR\fIutils\fR, \fBint\fR \fImax_version\fR,
-     \fBint *\fR\fIout_version\fR, \fBsasl_client_plug_t **\fR\fIpluglist\fR, \fBint *\fR\fIplugcount\fR);
+.BI "int sasl_server_plug_init_t(const sasl_utils_t *utils,
+.BI "                                      int " max_version ", "
+.BI "                                     int *" out_version ", "
+.BI "                        sasl_client_plug_t **" pluglist ", "
+.BI"                                        int *plugcount);
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-The \fBsasl_server_plug_init_t()\fR callback function is the server plug-in entry point.
+The 
+.B sasl_server_plug_init_t()
+callback function is the server plug-in entry point.
+
 .SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIutils\fR\fR
-.ad
-.RS 15n
-.rt  
+.I utils
 The utility callback functions.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fImax_version\fR\fR
-.ad
-.RS 15n
-.rt  
+.I max_version
 The highest server plug-in version supported.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIout_version\fR\fR
-.ad
-.RS 15n
-.rt  
+.I out_version
 The server plug-in version of the result.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fIpluglist\fR\fR
-.ad
-.RS 15n
-.rt  
-The list of server mechanism plug-ins.
-.RE
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIplugcount\fR\fR
-.ad
-.RS 15n
-.rt  
-The number of server mechanism plug-ins.
-.RE
+.I pluglist
+The list of server mechanism plug-ins.
 
-.SH RETURN VALUES
-.sp
-.LP
-Like other SASL callback functions, \fBsasl_server_plug_init_t()\fR returns an integer that corresponds to a SASL error code. See <\fBsasl.h\fR> for a complete list of SASL error codes.
-.SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 11n
-.rt  
-The call to \fBsasl_server_plug_init_t()\fR was successful.
-.RE
+.I plugcount
+The number of server mechanism plug-ins.
+
+.SH "RETURN VALUES"
+Like other SASL callback functions, sasl_server_plug_init_t() returns an integer that corresponds to a SASL error code. See <sasl.h> for a complete list of SASL error codes.
 
-.sp
-.LP
-See \fBsasl_errors\fR(3SASL) for information on SASL error codes.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.SH ERRORS
+.TP 0.8i
+.B SASL_OK
+The call to sasl_server_plug_init_t() was successful.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
+See sasl_errors(3SASL) for information on SASL error codes.
 
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errors\fR(3SASL), \fBattributes\fR(7)
+.SH "SEE ALSO"
+sasl_errors(3SASL)

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_set_alloc.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_set_alloc.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,98 +1,39 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_set_alloc 3SASL "22 Oct 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_set_alloc 3sasl "22 Oct 2003" SASL "SASL man pages"
 .SH NAME
 sasl_set_alloc \- set the memory allocation functions used by the SASL library
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/sasl.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/sasl.h>
 
-\fBvoid\fR \fBsasl_set_alloc\fR(\fBsasl_malloc_t *\fR\fIm\fR, \fBsasl_calloc_t *\fR\fIc\fR, \fBsasl_realloc_t *\fR\fIr\fR,
-     \fBsasl_free_t *\fR\fIf\fR);
+.BI "void sasl_set_alloc(sasl_malloc_t *" m ", "
+.BI "                    sasl_calloc_t *" c ", "
+.BI "                    sasl_realloc_t *" r ", "
+.BI "                    sasl_free_t *" f "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_set_alloc()\fR interface to set the memory allocation routines that the SASL library and plug-ins will use.
-.SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIc\fR\fR
-.ad
-.RS 5n
-.rt  
-A pointer to a \fBcalloc()\fR function
-.RE
+Use the 
+.B sasl_set_alloc()
+interface to set the memory allocation routines that the SASL library and plug-ins will use.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIf\fR\fR
-.ad
-.RS 5n
-.rt  
-A pointer to a \fBfree()\fR function
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fIm\fR\fR
-.ad
-.RS 5n
-.rt  
-A pointer to a\fBmalloc()\fR function
-.RE
+.SH PARAMETERS
+.I m
+A pointer to a malloc() function
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIr\fR\fR
-.ad
-.RS 5n
-.rt  
-A pointer to a \fBrealloc()\fR function
-.RE
+.I c
+A pointer to a calloc() function
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_set_alloc()\fR has no return values.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.I r
+A pointer to a realloc() function
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityObsolete
-_
-MT-LevelUnsafe
-.TE
+.I f
+A pointer to a free() function
 
-.SH SEE ALSO
-.sp
-.LP
-\fBattributes\fR(7)
-.SH NOTES
-.sp
-.LP
-While most of \fBlibsasl\fR is MT-Safe, \fBsasl_set_*\fR modifies the global state and should be considered Unsafe.
+.SH "RETURN VALUES"
+sasl_set_alloc() has no return values.
+

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_set_mutex.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_set_mutex.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,98 +1,39 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_set_mutex 3SASL "22 Oct 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_set_mutex 3sasl "22 Oct 2003" SASL "SASL man pages"
 .SH NAME
 sasl_set_mutex \- set the mutex lock functions used by the SASL library
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/sasl.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/sasl.h>
 
-\fBvoid\fR \fBsasl_set_mutex\fR(\fBsasl_mutex_alloc_t *\fR\fIa\fR, \fBsasl_mutex_lock_t *\fR\fIl\fR,
-     \fBsasl_mutex_unlock_t *\fR\fIu\fR, \fBsasl_mutex_free_t *\fR\fIf\fR);
+.BI "void sasl_set_mutex(sasl_mutex_alloc_t *" a ", "
+.BI "                    sasl_mutex_lock_t *" l ", "
+.BI "                    sasl_mutex_unlock_t *" u ", "
+.BI "                    sasl_mutex_free_t *" f "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_set_mutex()\fR interface to set the mutex lock routines that the SASL library and plug-ins will use.
-.SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIa\fR\fR
-.ad
-.RS 5n
-.rt  
-A pointer to the mutex lock allocation function
-.RE
+Use the
+.B sasl_set_mutex()
+interface to set the mutex lock routines that the SASL library and plug-ins will use.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIf\fR\fR
-.ad
-.RS 5n
-.rt  
-A pointer to the mutex free or destroy function
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fIl\fR\fR
-.ad
-.RS 5n
-.rt  
-A pointer to the mutex lock function
-.RE
+.SH PARAMETERS
+.I a
+A pointer to the mutex lock allocation function
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIu\fR\fR
-.ad
-.RS 5n
-.rt  
+.I l
+A pointer to the mutex lock function
+
+.I u
 A pointer to the mutex unlock function
-.RE
-
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_set_mutex()\fR has no return values.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityObsolete
-_
-MT-LevelUnsafe
-.TE
+.I f
+A pointer to the mutex free or destroy function
 
-.SH SEE ALSO
-.sp
-.LP
-\fBattributes\fR(7)
-.SH NOTES
-.sp
-.LP
-While most of \fBlibsasl\fR is MT-Safe, \fBsasl_set_*\fR modifies the global state and should be considered Unsafe.
+.SH "RETURN VALUES"
+sasl_set_mutex() has no return values.
+

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_seterror.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_seterror.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,95 +1,49 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_seterror 3SASL "14 Oct 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_seterror 3sasl "14 Oct 2003" SASL "SASL man pages"
 .SH NAME
 sasl_seterror \- set the error string
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/sasl.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/sasl.h>
 
-\fBvoid\fR \fBsasl_seterror\fR(\fBsasl_conn_t *\fR\fIconn\fR, \fBunsigned\fR \fIflags\fR,
-     \fBconst char *\fR\fIfmt\fR, ...);
+.BI "void sasl_seterror(sasl_conn_t *" conn ", "
+.BI "                   unsigned " flags ", "
+.BI "                   const char *" fmt ", ...); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-The \fBsasl_seterror()\fR interface sets the error string that will be returned by \fBsasl_errdetail\fR(3SASL). Use \fBsyslog\fR(3C) style formatting, that is, use \fBprintf()\fR\(emstyle with \fB%m\fR as the most recent \fBerrno\fR error.
-.sp
-.LP
-The \fBsasl_seterror()\fR interface is primarily used by server callback functions and internal plug-ins, for example, with the \fBsasl_authorize_t\fR callback. The \fBsasl_seterror()\fR interface triggers a call to the SASL logging callback, if any, with a level of \fBSASL_LOG_FAIL\fR, unless the \fBSASL_NOLOG\fR flag is set.
-.sp
-.LP
-Make the message string sensitive to the current language setting. If there is no \fBSASL_CB_LANGUAGE\fR callback, message strings must be \fBi-default\fR. Otherwise, UTF-8 is used. Use of \fIRFC 2482\fR for mixed-language text is encouraged.
-.sp
-.LP
-If the value of \fIconn\fR is \fINULL\fR, the \fBsasl_seterror()\fR interface fails.
-.SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIconn\fR\fR
-.ad
-.RS 9n
-.rt  
-The \fBsasl_conn_t\fR for which the call to \fBsasl_seterror()\fR applies.
-.RE
+The
+.B sasl_seterror()
+interface sets the error string that will be returned by sasl_errdetail(3SASL). Use syslog(3C) style formatting, that is, use printf()\(emstyle with %m as the most recent errno error.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIflags\fR\fR
-.ad
-.RS 9n
-.rt  
-If set to \fBSASL_NOLOG\fR, the call to \fBsasl_seterror()\fR is not logged.
-.RE
+The
+.B sasl_seterror()
+interface is primarily used by server callback functions and internal plug-ins, for example, with the sasl_authorize_t callback. The 
+.B sasl_seterror()
+interface triggers a call to the SASL logging callback, if any, with a level of SASL_LOG_FAIL, unless the SASL_NOLOG flag is set.
+
+Make the message string sensitive to the current language setting. If there is no SASL_CB_LANGUAGE callback, message strings must be i-default. Otherwise, UTF-8 is used. Use of RFC 2482 for mixed-language text is encouraged.
+
+If the value of conn is NULL, the 
+.B sasl_seterror()
+interface fails.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIfmt\fR\fR
-.ad
-.RS 9n
-.rt  
-A \fBsyslog\fR(3C) style format string.
-.RE
+.SH PARAMETERS
+.I conn
+The sasl_conn_t for which the call to sasl_seterror() applies.
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_seterror()\fR has no return values.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
+.I flags
+If set to SASL_NOLOG, the call to sasl_seterror() is not logged.
 
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
+.I fmt
+A syslog(3C) style format string.
 
-.SH SEE ALSO
-.sp
-.LP
-\fBsasl_errdetail\fR(3SASL), \fBsyslog\fR(3C), \fBattributes\fR(7)
-.sp
-.LP
-Whistler, K. and Adams, G. \fIRFC 2482, Language Tagging in Unicode Plain Text\fR. Network Working Group. January 1999.
+.SH "RETURN VALUES"
+sasl_seterror() has no return values.
+
+.SH "SEE ALSO"
+sasl_errdetail(3SASL), syslog(3C), Whistler, K. and Adams, G. RFC 2482, Language Tagging in Unicode Plain Text. Network Working Group. January 1999.

--- a/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_utf8verify.3	Thu Jun 09 13:47:16 2016 -0700
+++ b/components/cyrus-sasl/Solaris/usr/share/man/man3/sasl_utf8verify.3	Thu Jun 09 13:52:17 2016 -0700
@@ -1,94 +1,39 @@
 '\" te
 .\" Copyright (C) 1998-2003, Carnegie Mellon Univeristy.  All Rights Reserved.
 .\" Portions Copyright (C) 2003, Sun Microsystems, Inc. All Rights Reserved
-.TH sasl_utf8verify 3SASL "1 Oct 2003" "SunOS 5.12" "Simple Authentication Security Layer Library Functions"
+.TH sasl_utf8verify 3sasl "1 Oct 2003" SASL "SASL man pages"
 .SH NAME
 sasl_utf8verify \- encode base64 string
+
 .SH SYNOPSIS
-.LP
 .nf
-\fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsasl\fR   [ \fIlibrary\fR ... ]
-#include <sasl/saslutil.h>
+cc [ flag ... ] file ... -lsasl   [ library ... ]
+.B #include <sasl/saslutil.h>
 
-\fBint\fR \fBsasl_utf8verify\fR(\fBconst char *\fR\fIstr\fR, \fBunsigned\fR \fIlen\fR);
+.BI "int sasl_utf8verify(const char *" str ", "
+.BI "                    unsigned " len "); "
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
-Use the \fBsasl_utf8verify()\fR interface to verify that a string is valid UTF-8 and does not contain \fINULL\fR, a carriage return, or a linefeed. If \fIlen\fR ==0, \fBstrlen\fR(\fIstr\fR) will be used.
-.SH PARAMETERS
-.sp
-.ne 2
-.mk
-.na
-\fB\fIstr\fR\fR
-.ad
-.RS 7n
-.rt  
-A string
-.RE
+Use the 
+.B sasl_utf8verify()
+interface to verify that a string is valid UTF-8 and does not contain NULL, a carriage return, or a linefeed. If len == 0, strlen(str) will be used.
 
-.sp
-.ne 2
-.mk
-.na
-\fB\fIlen\fR\fR
-.ad
-.RS 7n
-.rt  
+.SH PARAMETERS
+.I str
+A string
+
+.I len
 The length of the string
-.RE
 
-.SH RETURN VALUES
-.sp
-.LP
-\fBsasl_utf8verify()\fR returns an integer that corresponds to a SASL error code.
+.SH "RETURN VALUES"
+sasl_utf8verify() returns an integer that corresponds to a SASL error code.
+
 .SH ERRORS
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_OK\fR\fR
-.ad
-.RS 16n
-.rt  
-The call to \fBsasl_utf8verify()\fR was successful.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBSASL_BADPROT\fR\fR
-.ad
-.RS 16n
-.rt  
+.TP 0.8i
+.B SASL_OK
+The call to sasl_utf8verify() was successful.
+.TP 0.8i
+.B SASL_BADPROT
 There was invalid UTF-8, or an error was found.
-.RE
 
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitysystem/library/security/libsasl
-_
-Interface StabilityCommitted
-_
-MT-LevelMT-Safe
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBattributes\fR(7)