updated documentation (and generation of tex)

2 files changed, 14 insertions, 10 deletions

diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index fc62f29001..6680d92fcb 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -314,16 +314,20 @@ sub output_tex {
     print "\\begin{itemize}\n";
     $check=0;
     foreach $parameter (@{$args{'parameterlist'}}) {
-        $param = $args{'parametertypes'}{$parameter};
-        $param =~ s/_/\\_/g;
+        $param1 = $args{'parametertypes'}{$parameter};
+        $param1 =~ s/_/\\_/g;
         $param2 = $parameter;
 	$param2 =~ s/_/\\_/g;
 
 	$check = 1;
-	print "\\item {\\it ".$param."} {\\bf ".$param2."}\n";
+	print "\\item {\\it ".$param1."} {\\bf ".$param2."}\n";
 	print "\n";
 
-	output_highlight($param{$parameter});
+	$param3 = $args{'parameters'}{$parameter};
+	$param3 =~ s/_/\\_/g;
+	$param3 =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
+
+	output_highlight($param3);
     }
     if ($check==0) {
 	print "\\item void\n";
@@ -333,14 +337,14 @@ sub output_tex {
     foreach $section (@{$args{'sectionlist'}}) {
 	$sec = $section;
 	$sec =~ s/_/\\_/g;
-	$sec =~ s/&/\\&/g;
+	$sec =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
 
 	print "\n\\par{\\large{$sec}}\\par\n";
 	print "\\begin{rmfamily}\n";
 
 	$sec = $args{'sections'}{$section};
 	$sec =~ s/_/\\_/g;
-	$sec =~ s/&/\\&/g;
+	$sec =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
 	$sec =~ s/->/\$\\rightarrow\$/g;
 	$sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
 
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index 19392ce863..046d028e9c 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -195,8 +195,8 @@ X509PKI_AUTH_INFO info;
   * gnutls_x509pki_get_peer_certificate_activation_time - This function returns the peer's certificate activation time
   * @state: is a gnutls state
   *
-  * This function will return the peer's certificate activation time in UNIX time (ie seconds since
-  * 00:00:00 UTC January 1, 1970).
+  * This function will return the peer's certificate activation time in UNIX time 
+  * (ie seconds since 00:00:00 UTC January 1, 1970).
   * Returns a (time_t) -1 in case of an error.
   *
   **/
@@ -214,8 +214,8 @@ X509PKI_AUTH_INFO info;
   * gnutls_x509pki_get_peer_certificate_expiration_time - This function returns the peer's certificate expiration time
   * @state: is a gnutls state
   *
-  * This function will return the peer's certificate expiration time in UNIX time (ie seconds since
-  * 00:00:00 UTC January 1, 1970).
+  * This function will return the peer's certificate expiration time in UNIX time 
+  * (ie seconds since 00:00:00 UTC January 1, 1970).
   * Returns a (time_t) -1 in case of an error.
   *
   **/