merge from upstream branch
diff --git a/doc/README b/doc/README
index 63af700..0ceff15 100644
--- a/doc/README
+++ b/doc/README
@@ -8,10 +8,11 @@
To build the documentation you will need to have
-latex2html and lynx installed. On fedora both can
-be obtained with...
+latex2html and lynx installed. On Fedora both can
+be obtained with ...
sudo yum install latex2html lynx
+Or on Debian or Ubuntu ...
-
+ sudo apt-get install latex2html lynx
diff --git a/doc/pyOpenSSL.tex b/doc/pyOpenSSL.tex
index 133e4f7..5e16ee1 100644
--- a/doc/pyOpenSSL.tex
+++ b/doc/pyOpenSSL.tex
@@ -594,11 +594,15 @@
\end{funcdesc}
\begin{funcdesc}{bytes}{num_bytes}
-From PRNG get some random bytes as a string. It's a wrapper of the C function \function{RAND_bytes}.
+Get some random bytes from the PRNG as a string.
+
+This is a wrapper for the C function \function{RAND_bytes}.
\end{funcdesc}
\begin{funcdesc}{cleanup}{}
-Erase the memory used by the PRNG. It's a wrapper of the C function \function{RAND_cleanup}.
+Erase the memory used by the PRNG.
+
+This is a wrapper for the C function \function{RAND_cleanup}.
\end{funcdesc}
\begin{funcdesc}{egd}{path\optional{, bytes}}
@@ -613,6 +617,12 @@
the file \var{path} to seed the PRNG. The default value of \var{bytes} is -1.
\end{funcdesc}
+\begin{funcdesc}{bytes}{num_bytes}
+Get some random bytes as a string.
+
+This is a wrapper for the C function \function{RAND_bytes}.
+\end{funcdesc}
+
\begin{funcdesc}{screen}{}
Add the current contents of the screen to the PRNG state.
Availability: Windows.