summaryrefslogtreecommitdiff
path: root/XServer.mdwn
diff options
context:
space:
mode:
authorAlanCoopersmith <AlanCoopersmith@web>2013-08-25 17:44:36 -0700
committerxorg <iki-xorg@freedesktop.org>2013-08-25 17:44:36 -0700
commit129f15abb5f1f2088a17a7bdcf5085f2e29dad53 (patch)
treefeba270193d291c4c5d2d7416f23671847f91f7e /XServer.mdwn
parent35e21e8516e27aee48071196d9a4c935221853a4 (diff)
fix formatting after moin->iki conversion
Diffstat (limited to 'XServer.mdwn')
-rw-r--r--XServer.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/XServer.mdwn b/XServer.mdwn
index fbbf66fd..94b11a24 100644
--- a/XServer.mdwn
+++ b/XServer.mdwn
@@ -1,5 +1,3 @@
-
-
# X Server Module
Here's a list of other X server related wiki pages
@@ -17,7 +15,8 @@ Here's a list of other X server related wiki pages
* [[Server18Branch|Server18Branch]]
* [[Server19Branch|Server19Branch]]
* [[Server110Branch|Server110Branch]]
-* [[Server113Branch|Server113Branch]]
+* [[Server113Branch|Server113Branch]]
+
A guideline for what stable branch maintainers need to do is [[here|Development/Documentation/XServerStableBranchManagement]]
@@ -30,6 +29,7 @@ The development process is split into three stages:
* feature merge window: Starts after the release of the previous version. Features ready will be merged, the server may be unstable during this time.
* bugfix window: No new features may be merged, only bugfixes and stabilization work is permitted.
* release freeze: Only bug fixes to go into the pending release may be merged.
+
The relevant dates are noted on each server branch page and in the [[X.Org Calendar|http://www.google.com/calendar/embed?src=nl1n1fmvu091eqh35ldqspar80%40group.calendar.google.com&ctz=Australia/Brisbane]].