Merge the following from the English version:
1.4 -> 1.6 relnotes/alpha/article.sgml 1.2 -> 1.4 relnotes/amd64/article.sgml 1.6 -> 1.7 relnotes/i386/Makefile 1.5 -> 1.7 relnotes/i386/article.sgml 1.2 -> 1.4 relnotes/ia64/article.sgml 1.2 -> 1.4 relnotes/pc98/article.sgml 1.4 -> 1.6 relnotes/sparc64/article.sgml
This commit is contained in:
parent
c7fb3edb5b
commit
abfbd73c1c
@ -3,25 +3,17 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
Original revision: 1.4
|
||||
Original revision: 1.6
|
||||
-->
|
||||
|
||||
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
|
||||
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
|
||||
%man;
|
||||
<!ENTITY % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
|
||||
%ja-authors;
|
||||
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
|
||||
%authors;
|
||||
<!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
|
||||
%ja-mlists;
|
||||
<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
|
||||
%ja-trademarks;
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
|
||||
%articles.ent;
|
||||
|
||||
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
|
||||
%release;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent">
|
||||
%sections;
|
||||
|
||||
<!-- Architecture-specific customization -->
|
||||
|
||||
|
@ -1,24 +1,16 @@
|
||||
<!--
|
||||
$FreeBSD$
|
||||
Original revision: 1.2
|
||||
Original revision: 1.4
|
||||
-->
|
||||
|
||||
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
|
||||
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
|
||||
%man;
|
||||
<!ENTITY % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
|
||||
%ja-authors;
|
||||
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
|
||||
%authors;
|
||||
<!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
|
||||
%ja-mlists;
|
||||
<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
|
||||
%ja-trademarks;
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
|
||||
%articles.ent;
|
||||
|
||||
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
|
||||
%release;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent">
|
||||
%sections;
|
||||
|
||||
<!-- Architecture-specific customization -->
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
# $FreeBSD$
|
||||
# Original revision: 1.6
|
||||
# Original revision: 1.7
|
||||
|
||||
RELN_ROOT?= ${.CURDIR}/../../..
|
||||
|
||||
@ -15,5 +15,7 @@ SRCS+= article.sgml
|
||||
SRCS+= ../common/relnotes.ent
|
||||
SRCS+= ../common/new.sgml
|
||||
|
||||
URL_RELPREFIX?= ../../../..
|
||||
|
||||
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
|
||||
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
|
||||
|
@ -3,25 +3,17 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
Original revision: 1.5
|
||||
Original revision: 1.7
|
||||
-->
|
||||
|
||||
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
|
||||
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
|
||||
%man;
|
||||
<!ENTITY % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
|
||||
%ja-authors;
|
||||
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
|
||||
%authors;
|
||||
<!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
|
||||
%ja-mlists;
|
||||
<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
|
||||
%ja-trademarks;
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
|
||||
%articles.ent;
|
||||
|
||||
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
|
||||
%release;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent">
|
||||
%sections;
|
||||
|
||||
<!-- Architecture-specific customization -->
|
||||
|
||||
|
@ -3,25 +3,17 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
Original revision: 1.2
|
||||
Original revision: 1.4
|
||||
-->
|
||||
|
||||
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
|
||||
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
|
||||
%man;
|
||||
<!ENTITY % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
|
||||
%ja-authors;
|
||||
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
|
||||
%authors;
|
||||
<!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
|
||||
%ja-mlists;
|
||||
<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
|
||||
%ja-trademarks;
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
|
||||
%articles.ent;
|
||||
|
||||
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
|
||||
%release;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent">
|
||||
%sections;
|
||||
|
||||
<!-- Architecture-specific customization -->
|
||||
|
||||
|
@ -1,20 +1,14 @@
|
||||
<!-- $FreeBSD$ -->
|
||||
<!-- Original revision: 1.2 -->
|
||||
<!-- Original revision: 1.4 -->
|
||||
|
||||
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
|
||||
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
|
||||
%man;
|
||||
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
|
||||
%authors;
|
||||
<!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
|
||||
%ja-mlists;
|
||||
<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
|
||||
%ja-trademarks;
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
|
||||
%articles.ent;
|
||||
|
||||
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
|
||||
%release;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent">
|
||||
%sections;
|
||||
|
||||
<!-- Architecture-specific customization -->
|
||||
|
||||
|
@ -3,33 +3,23 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
Original revision: 1.4
|
||||
Original revision: 1.6
|
||||
-->
|
||||
|
||||
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
|
||||
<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
|
||||
%articles.ent;
|
||||
|
||||
<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
|
||||
|
||||
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
|
||||
%man;
|
||||
<!ENTITY % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
|
||||
%ja-authors;
|
||||
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
|
||||
%authors;
|
||||
<!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
|
||||
%ja-mlists;
|
||||
<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
|
||||
%ja-trademarks;
|
||||
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
|
||||
%trademarks;
|
||||
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
|
||||
%release;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
|
||||
<!ENTITY % sections SYSTEM "../common/relnotes.ent">
|
||||
%sections;
|
||||
|
||||
<!-- Architecture-specific customization -->
|
||||
|
||||
<!ENTITY arch "sparc64">
|
||||
<!ENTITY arch.print "UltraSPARC">
|
||||
<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
|
||||
|
||||
]>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user