Attachment #71853 for bug #104558

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

Lines 484-489 Link Here

(-)en_US.ISO8859-1/books/handbook/eresources/chapter.sgml (+17 lines)
484	</row>	484	</row>
485		485
486	<row>	486	<row>
		487	<entry>&a.sun4v.name;</entry>
		488	<entry>Porting FreeBSD to &sun4v; based systems</entry>
		489	</row>
		490
		491	<row>
487	<entry>&a.threads.name;</entry>	492	<entry>&a.threads.name;</entry>
488	<entry>Threading in FreeBSD</entry>	493	<entry>Threading in FreeBSD</entry>
489	</row>	494	</row>
Lines 972-977 Link Here
972	<para><emphasis>Using FreeBSD in embedded	977	<para><emphasis>Using FreeBSD in embedded
973	applications</emphasis></para>	978	applications</emphasis></para>
974		979
		980	<<<<<<< chapter.sgml
		981	<para>This list discusses topics related to using FreeBSD in embedded
		982	systems. This is a technical mailing list for which strictly
		983	technical content is expected. For the purpose of this list we define
		984	embedded systems as those computing devices which are not desktops and
		985	which usually serve a single purpose as opposed to being general
		986	computing environments. Examples include, but are not limited to,
		987	all kinds of phone handsets, network equipment such as routers,
		988	switches and PBXs, remote measuring equipment, PDAs, point of sale
		989	systems etc.</para>
		990	=======
975	<para>This list discusses topics related to using FreeBSD in	991	<para>This list discusses topics related to using FreeBSD in
976	embedded systems. This is a technical mailing list for which	992	embedded systems. This is a technical mailing list for which
977	strictly technical content is expected. For the purpose of	993	strictly technical content is expected. For the purpose of
Lines 982-987 Link Here
982	all kinds of phone handsets, network equipment such as	998	all kinds of phone handsets, network equipment such as
983	routers, switches and PBXs, remote measuring equipment,	999	routers, switches and PBXs, remote measuring equipment,
984	PDAs, Point Of Sale systems, and so on.</para>	1000	PDAs, Point Of Sale systems, and so on.</para>
		1001	>>>>>>> 1.178
985	</listitem>	1002	</listitem>
986	</varlistentry>	1003	</varlistentry>
987		1004

Lines 379-384 Link Here

(-)en_US.ISO8859-1/share/sgml/mailing-lists.ent (+4 lines)
379	<!ENTITY a.standards "<ulink url='&a.standards.url;'>FreeBSD C99 and POSIX compliance mailing list</ulink>">	379	<!ENTITY a.standards "<ulink url='&a.standards.url;'>FreeBSD C99 and POSIX compliance mailing list</ulink>">
380	<!ENTITY a.standards.name "<ulink url='&a.standards.url;'>freebsd-standards</ulink>">	380	<!ENTITY a.standards.name "<ulink url='&a.standards.url;'>freebsd-standards</ulink>">
381		381
		382	<!ENTITY a.sun4v.url "&a.mailman.listinfo;/freebsd-sun4v">
		383	<!ENTITY a.sun4v "<ulink url='&a.sun4v.url;'>FreeBSD sun4v porting mailing list</ulink>">
		384	<!ENTITY a.sun4v.name "<ulink url='&a.sun4v.url;'>freebsd-sun4v</ulink>">
		385
382	<!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">	386	<!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
383	<!ENTITY a.test "<ulink url='&a.test.url;'>FreeBSD test mailing list</ulink>">	387	<!ENTITY a.test "<ulink url='&a.test.url;'>FreeBSD test mailing list</ulink>">
384	<!ENTITY a.test.name "<ulink url='&a.test.url;'>freebsd-test</ulink>">	388	<!ENTITY a.test.name "<ulink url='&a.test.url;'>freebsd-test</ulink>">

Return to bug 104558