Document package name requirements in one section.

2 files changed, 32 insertions, 5 deletions

diff --git a/specs/spf-2.0/metadata.mdwn b/specs/spf-2.0/metadata.mdwn
index 67f99be..5125596 100644
--- a/specs/spf-2.0/metadata.mdwn
+++ b/specs/spf-2.0/metadata.mdwn
@@ -21,10 +21,8 @@ format:
     [zero or more blank lines]
      -- maintainer  date
 
-`package` is the source package name.  Source package names may only consist of
-lowercase Latin letters, digits, plus and minus signs, and periods.  Names must
-be at least two characters long and must start with either a letter or a digit.
-(A regular expression for this is `[a-z0-9][a-z0-9+.-]+`.)
+`package` is the source package name.  See $[sectlink][src-name] for the
+requirements on source package names.
 
 `version` is the source package version.  See $[sectlink][src-ver] for the
 syntax of source package version identifiers.
@@ -90,6 +88,34 @@ building work area.  For a file used at run time, it is an absolute path in the
 user's filesystem hierarchy.
 
 
+Package Names [name]
+====================
+
+Source Packages [src-name]
+--------------------------
+
+Source package names may only consist of lowercase Latin letters, digits, plus
+and minus signs, and periods.  Names must be at least two characters long and
+must start with either a letter or a digit.  (A regular expression for this is
+`[a-z0-9][a-z0-9+.-]+`.)
+
+Source package names may not begin with the reserved string "src-".
+
+Binary Package Names [bin-name]
+-------------------------------
+
+Binary package names may only consist of lowercase Latin letters, digits, plus
+and minus signs, and periods.  Names must be at least two characters long and
+must start with either a letter or a digit.  (A regular expression for this is
+`[a-z0-9][a-z0-9+.-]+`.)
+
+Binary package names may not begin with the reserved string "src-".
+
+A binary package clean name is a binary package name with all plus and minus
+signs and periods removed.  No two binary packages built from the same source
+package may have the same clean name.
+
+
 Source Package Version Identifier [src-ver]
 ===========================================
 
diff --git a/specs/spf-2.0/overview.mdwn b/specs/spf-2.0/overview.mdwn
index de45ff0..4fb3cc7 100644
--- a/specs/spf-2.0/overview.mdwn
+++ b/specs/spf-2.0/overview.mdwn
@@ -75,7 +75,8 @@ naming requirements are made for this directory.
 ----------------------------------
 
 For each binary package there must exist a directory named `<binpkg>.pkg`, where
-`<binpkg>` is the name of the binary package.
+`<binpkg>` is the name of the binary package.  See $[sectlink][bin-name] for the
+requirements on binary package names.
 
 Binary package names may only consist of lowercase Latin letters, digits, plus
 and minus signs, and periods.  Names must be at least two characters long and