View | Details | Raw Unified | Return to bug 55526
Collapse All | Expand All

(-)en_US.ISO8859-1/articles/releng/branches.ascii (-9 / +18 lines)
Lines 17-30 Link Here
17
    |               |
17
    |               |
18
    + - - - - - - - +
18
    + - - - - - - - +
19
          |                                    RELENG_4 
19
          |                                    RELENG_4 
20
     _____|_____   _ _ _   _ _ _ _   _ _ _   _ _ _   _ _ _    + - - - - - - +
20
     _____|_____   ____   ______   ____   ____   ____   ____   ____   ____   ____    + - - - - - - +
21
    /           \ |     | |       | |     | |     | |     |   |             |
21
    /           \ |    | |      | |    | |    | |    | |    | |    | |    | |    |   |             |
22
    |4.0-RELEASE|-|4.1R |-|4.1.1R |-|4.2R |-|4.3R |-|4.4R |---| 4.X-STABLE  |
22
    |4.0-RELEASE|-|4.1R|-|4.1.1R|-|4.2R|-|4.3R|-|4.4R|-+4.5R+-+4.6R+-+4.7R+-+4.8R+---| 4.X-STABLE  |
23
    \___________/ |_ _ _| |_ _ _ _| |_ _ _| |_ _ _| |_ _ _|   |             |
23
    \___________/ |____| |______| |____| |____| |____| |____| |____| |____| |____|   |             |
24
          |                                 ___|      |__     + - - - - - - +
24
          |                      __________| _____|     _|       |_     |__    |____ + - - - - - - +
25
          |                          _ _ _ | _ _ _   _ _ |_ _ _ __
25
          |               _ _ _ |_ _   _ _ _| _ _   _ _| _ _ _   _ |_ _    |_       |_____
26
          |                         |             | |             |
26
     _____|_____         |          | |          | |          | |      |  _ _| _ _ _   _ _| _ _ _ 
27
    + - - - - - - - +               | RELENG_4_3  | | RELENG_4_4  |
27
    /           \        |RELENG_4_3| |RELENG_4_4| |RELENG_4_5| |4.6.2R| |          | |          |
28
    |  5.0-CURRENT  |               |_ _ _ _ _ _ _| |_ _ _ _ _ _ _|
28
    |5.0-RELEASE|------+ |_ _ _ _ _ | |_ _ _ _ _ | |_ _ _ _ _ | |_ _ _ | |RELENG_4_7| |RELENG_4_8|
29
    \__________ /   _ _| _ _ _                                   __|     |_ _ _ _ _ | |_ _ _ _ _ |
30
          |        |          |                              _ _| _ _ _ 
31
     _____|_____   |RELENG_5_0|    _ _ _ _ _                |          |
32
    /           \  |_ _ _ _ _ |   |          |              |RELENG_4_6|
33
    |5.1-RELEASE|-----------------|RELENG_5_1|              |_ _ _ _ _ |
34
    \__________ /                 |_ _ _ _ _ |
35
          |
36
    + - - - - - - - +
37
    |  5.1-CURRENT  |
29
    |               |
38
    |               |
30
    + - - - - - - - +
39
    + - - - - - - - +
(-)share/images/articles/releng/branches.pic (-26 / +44 lines)
Lines 4-29 Link Here
4
.PS 6
4
.PS 6
5
5
6
HEAD_3:
6
HEAD_3:
7
	box width .9 "\s-23.0-CURRENT\s+2" dashed
7
	box width 1.4 "\s-23.0-CURRENT\s+2" dashed
8
8
9
	line -> down from HEAD_3.s
9
	line -> down from HEAD_3.s
10
RELENG_3_0_0_RELEASE:
10
RELENG_3_0_0_RELEASE:
11
	box width .9 "\s-23.0-RELEASE\s+2"
11
	box width 1.3 "\s-23.0-RELEASE\s+2"
12
	move right 3
12
	move right 3
13
	"\s-2RELENG_3\s+2"
13
	"\s-2RELENG_3\s+2"
14
14
15
	line -> down from RELENG_3_0_0_RELEASE.s
15
	line -> down from RELENG_3_0_0_RELEASE.s
16
RELENG_3_1_0_RELEASE:
16
RELENG_3_1_0_RELEASE:
17
	ellipse width .9 "\s-23.1-RELEASE\s+2"
17
	ellipse width 1.4 "\s-23.1-RELEASE\s+2"
18
	move left .75
19
	"\s-2H\s+2"
20
	move down .15
21
	"\s-2E\s+2"
22
	move down .15
23
	"\s-2A\s+2"
24
	move down .15
25
	"\s-2D\s+2"
26
27
	line -> right from RELENG_3_1_0_RELEASE.e
18
	line -> right from RELENG_3_1_0_RELEASE.e
28
RELENG_3_2_0_RELEASE:
19
RELENG_3_2_0_RELEASE:
29
	box width .5 "\s-23.2R\s+2"
20
	box width .5 "\s-23.2R\s+2"
Lines 46-62 Link Here
46
37
47
	line -> right from RELENG_3_5_1_RELEASE.e
38
	line -> right from RELENG_3_5_1_RELEASE.e
48
RELENG_3:
39
RELENG_3:
49
	box "\s-23-STABLE\s+2"
40
	box width 1.1 "\s-23-STABLE\s+2"
50
41
51
	line -> down from RELENG_3_1_0_RELEASE.s
42
	line -> down from RELENG_3_1_0_RELEASE.s
52
HEAD_4:
43
HEAD_4:
53
	box width .9 "\s-24.0-CURRENT\s+2" dashed
44
	box width 1.4 "\s-24.0-CURRENT\s+2" dashed
45
54
	move right 3
46
	move right 3
55
	"\s-2RELENG_4\s+2"
47
	"\s-2RELENG_4\s+2"
56
48
49
	move left 3.75
50
	move down .15
51
	"\s-2H\s+2"
52
	move down .15
53
	"\s-2E\s+2"
54
	move down .15
55
	"\s-2A\s+2"
56
	move down .15
57
	"\s-2D\s+2"
58
57
	line -> down from HEAD_4.s
59
	line -> down from HEAD_4.s
58
RELENG_4_0_0_RELEASE:
60
RELENG_4_0_0_RELEASE:
59
	ellipse width .9 "\s-24.0-RELEASE\s+2"
61
	ellipse width 1.4 "\s-24.0-RELEASE\s+2"
60
62
61
	line -> right from RELENG_4_0_0_RELEASE.e
63
	line -> right from RELENG_4_0_0_RELEASE.e
62
RELENG_4_1_0_RELEASE:
64
RELENG_4_1_0_RELEASE:
Lines 64-70 Link Here
64
66
65
	line -> right from RELENG_4_1_0_RELEASE.e
67
	line -> right from RELENG_4_1_0_RELEASE.e
66
RELENG_4_1_1_RELEASE:
68
RELENG_4_1_1_RELEASE:
67
	box width .5 "\s-24.1.1R\s+2"
69
	box width .6 "\s-24.1.1R\s+2"
68
70
69
	line -> right from RELENG_4_1_1_RELEASE.e
71
	line -> right from RELENG_4_1_1_RELEASE.e
70
RELENG_4_2_0_RELEASE:
72
RELENG_4_2_0_RELEASE:
Lines 76-82 Link Here
76
78
77
	line -> down from RELENG_4_3_0_RELEASE.s
79
	line -> down from RELENG_4_3_0_RELEASE.s
78
RELENG_4_3:
80
RELENG_4_3:
79
	box width .9 "\s-3RELENG_4_3\s+3" dashed
81
	box width .95 "\s-4RELENG_4_3\s+4" dashed
80
82
81
	line -> right from RELENG_4_3_0_RELEASE.e
83
	line -> right from RELENG_4_3_0_RELEASE.e
82
RELENG_4_4_0_RELEASE:
84
RELENG_4_4_0_RELEASE:
Lines 84-90 Link Here
84
86
85
	line -> down from RELENG_4_4_0_RELEASE.s
87
	line -> down from RELENG_4_4_0_RELEASE.s
86
RELENG_4_4:
88
RELENG_4_4:
87
	box width .9 "\s-3RELENG_4_4\s+3" dashed
89
	box width .95 "\s-4RELENG_4_4\s+4" dashed
88
90
89
	line -> right from RELENG_4_4_0_RELEASE.e
91
	line -> right from RELENG_4_4_0_RELEASE.e
90
RELENG_4_5_0_RELEASE:
92
RELENG_4_5_0_RELEASE:
Lines 92-98 Link Here
92
94
93
	line -> down from RELENG_4_5_0_RELEASE.s
95
	line -> down from RELENG_4_5_0_RELEASE.s
94
RELENG_4_5:
96
RELENG_4_5:
95
	box width .9 "\s-3RELENG_4_5\s+3" dashed
97
	box width .95 "\s-4RELENG_4_5\s+4" dashed
96
98
97
	line -> right from RELENG_4_5_0_RELEASE.e
99
	line -> right from RELENG_4_5_0_RELEASE.e
98
RELENG_4_6_0_RELEASE:
100
RELENG_4_6_0_RELEASE:
Lines 100-110 Link Here
100
102
101
	line -> down from RELENG_4_6_0_RELEASE.s
103
	line -> down from RELENG_4_6_0_RELEASE.s
102
RELENG_4_6_2_RELEASE:
104
RELENG_4_6_2_RELEASE:
103
	ellipse width .5 "\s-24.6.2R\s+2"
105
	ellipse width .6 "\s-24.6.2R\s+2"
104
	line -> down from RELENG_4_6_2_RELEASE.s
106
	line -> down from RELENG_4_6_2_RELEASE.s
105
107
106
RELENG_4_6:
108
RELENG_4_6:
107
	box width .9 "\s-3RELENG_4_6\s+3" dashed
109
	box width .95 "\s-4RELENG_4_6\s+4" dashed
108
110
109
	line -> right from RELENG_4_6_0_RELEASE.e
111
	line -> right from RELENG_4_6_0_RELEASE.e
110
112
Lines 113-135 Link Here
113
	line -> down from RELENG_4_7_0_RELEASE.s
115
	line -> down from RELENG_4_7_0_RELEASE.s
114
116
115
RELENG_4_7:
117
RELENG_4_7:
116
	box width .9 "\s-3RELENG_4_7\s+3" dashed
118
	box width .95 "\s-4RELENG_4_7\s+4" dashed
117
	line -> right from RELENG_4_7_0_RELEASE.e
119
	line -> right from RELENG_4_7_0_RELEASE.e
118
120
119
RELENG_4:box "\s-24-STABLE\s+2"
121
RELENG_4_8_0_RELEASE:
122
	ellipse width .5 "\s-24.8R\s+2"
123
	line -> down from RELENG_4_8_0_RELEASE.s
124
125
RELENG_4_8:
126
	box width .95 "\s-4RELENG_4_8\s+4" dashed
127
	line -> right from RELENG_4_8_0_RELEASE.e
128
129
RELENG_4:box width 1.2 "\s-24-STABLE\s+2"
120
130
121
	line -> down from RELENG_4_0_0_RELEASE.s
131
	line -> down from RELENG_4_0_0_RELEASE.s
122
132
123
133
124
RELENG_5_0_0_RELEASE:
134
RELENG_5_0_0_RELEASE:
125
	ellipse width .9 "\s-25.0-RELEASE\s+2"
135
	ellipse width 1.4 "\s-25.0-RELEASE\s+2"
126
	line -> right from RELENG_5_0_0_RELEASE.e
136
	line -> right from RELENG_5_0_0_RELEASE.e
127
137
128
RELENG_5_0:
138
RELENG_5_0:
129
	box width .9 "\s-3RELENG_5_0\s+3" dashed
139
	box width 1.4 "\s-2RELENG_5_0\s+2" dashed
130
	line -> down from RELENG_5_0_0_RELEASE.s
140
	line -> down from RELENG_5_0_0_RELEASE.s
131
141
142
RELENG_5_1_0_RELEASE:
143
	ellipse width 1.4 "\s-25.1-RELEASE\s+2"
144
	line -> right from RELENG_5_1_0_RELEASE.e
145
146
RELENG_5_1:
147
	box width 1.4 "\s-2RELENG_5_1\s+2" dashed
148
	line -> down from RELENG_5_1_0_RELEASE.s
149
132
HEAD_5:
150
HEAD_5:
133
	box width .9 "\s-25.0-CURRENT\s+2" dashed
151
	box width 1.4 "\s-25.1-CURRENT\s+2" dashed
134
152
135
.PE
153
.PE

Return to bug 55526