From 40364dcdd1dcba9649f55eb7d02bcb02c2711f97 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pehjota>
Date: Wed, 25 Jul 2012 01:48:54 -0400
Subject: Switch back to using a two-number version string.

---
(limited to 'dev')

diff --git a/dev/multiarch/design.mdwn b/dev/multiarch/design.mdwn
index 236dde4..c0f0e89 100644
--- a/dev/multiarch/design.mdwn
+++ b/dev/multiarch/design.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="Multiarch Design"]]
 
-This is a [[release_goal|dev/releases/1/multiarch]] for release 1.0.0.
+This is a [[release_goal|dev/releases/1/multiarch]] for release 1.0.
 
 There are three high-level design aspects to this multiarch implementation: the
 filesystem hierarchy that primarily enables package coinstallability, control
diff --git a/dev/releases.mdwn b/dev/releases.mdwn
index e776be2..164e214 100644
--- a/dev/releases.mdwn
+++ b/dev/releases.mdwn
@@ -9,7 +9,7 @@ There were no official releases in this series.
 [[Release_Series_1|dev/releases/1]]
 ===================================
 
-  * 1.0.0
+  * 1.0
     - Released: TBD
     - Supported until: TBD
     - Architectures: 4
diff --git a/dev/releases/0.mdwn b/dev/releases/0.mdwn
index b4887f6..2279319 100644
--- a/dev/releases/0.mdwn
+++ b/dev/releases/0.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="Release Series 0"]]
 
-This page documents the 0.x.x release series.
+This page documents the 0.x release series.
 
 There was no official release in this series, except for a public demonstration
 of the system and the publication of source and binary packages.
@@ -9,7 +9,7 @@ Development in this series ended on 2012-04-30.
 
 No official support will be provided for this release series.
 
-This release series is succeeded by the [[1.x.x_series|dev/releases/1]].
+This release series is succeeded by the [[1.x_series|dev/releases/1]].
 
 
 Life Cycle
diff --git a/dev/releases/1.mdwn b/dev/releases/1.mdwn
index ba11988..e1b8c0d 100644
--- a/dev/releases/1.mdwn
+++ b/dev/releases/1.mdwn
@@ -1,8 +1,8 @@
 [[!meta title="Release Series 1"]]
 
-This page documents the 1.x.x release series, which succeeds the
-[[0.x.x_series|dev/releases/0]] and will eventually be succeeded by the
-[[2.x.x_series|dev/releases/2]].
+This page documents the 1.x release series, which succeeds the
+[[0.x_series|dev/releases/0]] and will eventually be succeeded by the
+[[2.x_series|dev/releases/2]].
 
 Life Cycle
 ==========
@@ -11,7 +11,7 @@ Life Cycle
     specification
   * 2012-06-27: [Initial draft][spf-2.0-draft] of Source Package Format 2.0
     specification
-  * 2012/2013: Projected release of version 1.0.0
+  * 2012/2013: Projected release of version 1.0
 
 
 Release Goals
diff --git a/dev/releases/1/multiarch.mdwn b/dev/releases/1/multiarch.mdwn
index 866e4b3..6fefd3a 100644
--- a/dev/releases/1/multiarch.mdwn
+++ b/dev/releases/1/multiarch.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="Release Series 1 Goal: Multiarch"]]
 
-A goal for [[release_1.0.0|dev/releases/1]] is partial multiarch support.
+A goal for [[release_1.0|dev/releases/1]] is partial multiarch support.
 
 See also the [[multiarch_design_details|dev/multiarch/design]].
 
diff --git a/dev/releases/1/opkbootstrap.mdwn b/dev/releases/1/opkbootstrap.mdwn
index 83bb6c0..71c2eed 100644
--- a/dev/releases/1/opkbootstrap.mdwn
+++ b/dev/releases/1/opkbootstrap.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="Release Series 1 Goal: Installation Bootstrap Tool"]]
 
-A goal for [[release_1.0.0|dev/releases/1]] is an installation bootstrap tool.
+A goal for [[release_1.0|dev/releases/1]] is an installation bootstrap tool.
 
 
 Overview
diff --git a/dev/releases/1/toolchains.mdwn b/dev/releases/1/toolchains.mdwn
index 933ca74..a907c54 100644
--- a/dev/releases/1/toolchains.mdwn
+++ b/dev/releases/1/toolchains.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="Release Series 1 Goal: Toolchain Packages"]]
 
-A goal for [[release_1.0.0|dev/releases/1]] is toolchain packages.
+A goal for [[release_1.0|dev/releases/1]] is toolchain packages.
 
 See also the [[packaging_task|dev/todo/packaging]].
 
diff --git a/dev/releases/2.mdwn b/dev/releases/2.mdwn
index 3df98c0..9cade38 100644
--- a/dev/releases/2.mdwn
+++ b/dev/releases/2.mdwn
@@ -1,7 +1,7 @@
 [[!meta title="Release Series 2"]]
 
-This page documents the 2.x.x release series, which will succeed the
-[[1.x.x_series|dev/releases/1]].
+This page documents the 2.x release series, which will succeed the
+[[1.x_series|dev/releases/1]].
 
 Life Cycle
 ==========
diff --git a/dev/todo/multiarch.mdwn b/dev/todo/multiarch.mdwn
index 2f34940..4158b79 100644
--- a/dev/todo/multiarch.mdwn
+++ b/dev/todo/multiarch.mdwn
@@ -24,7 +24,7 @@ Goals
 =====
 
 The design and implementation of the filesystem hierarchy is
-[[a_goal_for_release_1.0.0|dev/releases/1]].  Package coinstallability is not a
+[[a_goal_for_release_1.0|dev/releases/1]].  Package coinstallability is not a
 goal for this release.
 
 
--
cgit v0.9.1