os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update article to use 3 branches diagram instead of one.

Browse source 
Also remove branches.ascii file.  This file is highly outdated, and
I was failed to understand how it was used in article at all.  All
my attempts to get it *really* included into generated html were failed.

If someone feels that it should not be remove, feel free to re-add
it back and update it to current state of the world.
This commit is contained in:
Alexey Zelkin 2004-04-08 08:31:49 +00:00
parent 32c8c3b46e
commit 31b2958c80
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20591
3 changed files with 22 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
en_US.ISO8859-1/articles/releng/Makefile
View file

@ -12,8 +12,9 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
SRCS= article.sgml
SRCS+= branches.ascii
IMAGES_EN= branches.pic
IMAGES_EN= branches-head.pic
IMAGES_EN+= branches-releng3.pic
IMAGES_EN+= branches-releng4.pic
CSS_SHEET_ADDITIONS= extra.css

25
en_US.ISO8859-1/articles/releng/article.sgml
View file

@ -3,7 +3,6 @@
-->
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
<!ENTITY branches.ascii SYSTEM "branches.ascii">
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
@ -269,17 +268,31 @@
<mediaobject>
<imageobject>
<imagedata fileref="branches" align="center">
<imagedata fileref="branches-head" align="center">
</imageobject>
<textobject>
<literallayout>
&branches.ascii;
</literallayout>
<phrase>FreeBSD Development Branch</phrase>
</textobject>
</mediaobject>
<mediaobject>
<imageobject>
<imagedata fileref="branches-releng3" align="center">
</imageobject>
<textobject>
<phrase>FreeBSD Development Branches</phrase>
<phrase>FreeBSD 3.x STABLE Branche</phrase>
</textobject>
</mediaobject>
<mediaobject>
<imageobject>
<imagedata fileref="branches-releng4" align="center">
</imageobject>
<textobject>
<phrase>FreeBSD 4.x STABLE Branche</phrase>
</textobject>
</mediaobject>

30
en_US.ISO8859-1/articles/releng/branches.ascii
View file

@ -1,30 +0,0 @@
$FreeBSD$
| FreeBSD Development Branches
+--------------+
| 3.0-RELEASE |
| |
+--------------+
| RELENG_3
H ______|____ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + - - - - - - +
E / \ | | | | | | | | | | | |
A |3.1-RELEASE|-|3.2R |-|3.3R |-|3.4R |-|3.5R |-| 3.5.1R|---| 3.X-STABLE |
D \___________/ |_ _ _| |_ _ _| |_ _ _| |_ _ _| |_ _ _ _| | |
| + - - - - - - +
|
+ - - - - - - - +
| 4.0-CURRENT |
| |
+ - - - - - - - +
| RELENG_4
_____|_____ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ + - - - - - - +
/ \ | | | | | | | | | | | |
|4.0-RELEASE|-|4.1R |-|4.1.1R |-|4.2R |-|4.3R |-|4.4R |---| 4.X-STABLE |
\___________/ |_ _ _| |_ _ _ _| |_ _ _| |_ _ _| |_ _ _| | |
| ___| |__ + - - - - - - +
| _ _ _ | _ _ _ _ _ |_ _ _ __
| | | | |
+ - - - - - - - + | RELENG_4_3 | | RELENG_4_4 |
| 5.0-CURRENT | |_ _ _ _ _ _ _| |_ _ _ _ _ _ _|
| |
+ - - - - - - - +