From 7574587587eb865f6beabf27d67e867a0fb5a4b5 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 18 Feb 1997 21:53:53 +0000
Subject: Document the new join() semantics.

---
 Doc/lib/libppath.tex | 22 ++++++----------------
 Doc/libppath.tex     | 22 ++++++----------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/Doc/lib/libppath.tex b/Doc/lib/libppath.tex
index d43d3e1..7aec4b8 100644
--- a/Doc/lib/libppath.tex
+++ b/Doc/lib/libppath.tex
@@ -79,22 +79,12 @@ different device than \var{p}, or whether \file{\var{p}/..} and
 detect mount points for all \UNIX{} and POSIX variants.
 \end{funcdesc}
 
-\begin{funcdesc}{join}{p\, q}
-Join the paths
-\var{p}
-and
-\var{q} intelligently:
-If
-\var{q}
-is an absolute path, the return value is
-\var{q}.
-Otherwise, the concatenation of
-\var{p}
-and
-\var{q}
-is returned, with a slash (\code{'/'}) inserted unless
-\var{p}
-is empty or ends in a slash.
+\begin{funcdesc}{join}{p\optional{\, q\optional{\, ...}}}
+Joins one or more path components intelligently.  If any component is
+an absolute path, all previous components are thrown away, and joining
+continues.  The return value is the concatenation of \var{p}, and
+optionally \var{q}, etc., with exactly one slash (\code{'/'}) inserted
+between components, unless \var{p} is empty.
 \end{funcdesc}
 
 \begin{funcdesc}{normcase}{p}
diff --git a/Doc/libppath.tex b/Doc/libppath.tex
index d43d3e1..7aec4b8 100644
--- a/Doc/libppath.tex
+++ b/Doc/libppath.tex
@@ -79,22 +79,12 @@ different device than \var{p}, or whether \file{\var{p}/..} and
 detect mount points for all \UNIX{} and POSIX variants.
 \end{funcdesc}
 
-\begin{funcdesc}{join}{p\, q}
-Join the paths
-\var{p}
-and
-\var{q} intelligently:
-If
-\var{q}
-is an absolute path, the return value is
-\var{q}.
-Otherwise, the concatenation of
-\var{p}
-and
-\var{q}
-is returned, with a slash (\code{'/'}) inserted unless
-\var{p}
-is empty or ends in a slash.
+\begin{funcdesc}{join}{p\optional{\, q\optional{\, ...}}}
+Joins one or more path components intelligently.  If any component is
+an absolute path, all previous components are thrown away, and joining
+continues.  The return value is the concatenation of \var{p}, and
+optionally \var{q}, etc., with exactly one slash (\code{'/'}) inserted
+between components, unless \var{p} is empty.
 \end{funcdesc}
 
 \begin{funcdesc}{normcase}{p}
-- 
cgit v0.12