Seeking Minor Clarification on Patch Procedure

["Richard P. Koett" <mail-lists@telus.net>]

This may seem simply too obvious to experienced users, but I would like
someone
to confirm what I'm about to do is correct.

I have installed 3.1 from CD and extracted the source from CD 3 as
follows:
mount /dev/cd0a /mnt
cd /usr/src
tar zxvf /mnt/src.tar.gz

I now wish to install the patches contained in the file
ftp.openbsd.org/pub/OpenBSD/patches/3.1.tar.gz
and have downloaded the file to my system.

The FAQ section (10.15) on applying patches states
"Once you've obtained the proper sources, you can obtain the patch and
place it in src/"

Now when I list the contents of 3.1.tar.gz I see everything starting
from a directory
named "3.1". In /usr/src I do not have a directory named "3.1", but I do
have a directory
named "distrib" that appears to have the same contents.

So, when I untar the patches, should I be creating a new directory in
/usr/src named "3.1",
or untarring the contents of "3.1" into "distrib"?

Secondly, after correctly untarring the patches and running the patch
command for each of them,
do I then need to cd into the directory referred to in each patch and
execute the prescribed sequence
of make commands, or this there a way to compile everything, so to
speak, from /usr/src?

(The FAQ demostrates installation of a single patch as opposed to
several at once).