diff options
| author | Bruce A. Mah <bmah@FreeBSD.org> | 2005-03-13 02:43:01 +0000 |
|---|---|---|
| committer | Bruce A. Mah <bmah@FreeBSD.org> | 2005-03-13 02:43:01 +0000 |
| commit | 40be948e7a024ae4886eab8e00d8ca8e60c8c0bf (patch) | |
| tree | 6adbd238698c4edd76fa92176917513f95c36cfe | |
| parent | 516788f9a087a8f076f7b7e7fb1299db1c846388 (diff) | |
| download | src-40be948e7a024ae4886eab8e00d8ca8e60c8c0bf.tar.gz src-40be948e7a024ae4886eab8e00d8ca8e60c8c0bf.zip | |
MFC noted: libgpib.
Updated release note: GNOME 2.10
Added trademark notices.
Notes
Notes:
svn path=/head/; revision=143483
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 17 | ||||
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 17 |
2 files changed, 26 insertions, 8 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index fd58ce87210b..b1e4a7c983e8 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -15,6 +15,15 @@ <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> + <legalnotice id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.ieee; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> + <abstract> <para>The release notes for &os; &release.current; contain a summary of the changes made to the &os; base system since &release.branch; is created. @@ -657,7 +666,7 @@ give userland access to GPIB devices (using the the pcii driver) via the <function>ib<replaceable>foo</replaceable></function> - API.</para> + API. &merged;</para> <para>The default stack sizes in <filename>libpthread</filename> and <filename>libc_r</filename> have been increased. On 32-bit @@ -975,7 +984,7 @@ moused_ums0_port="/dev/ums0"</programlisting> <para>The supported version of the <application>GNOME</application> desktop environment has been - updated from 2.6.2 to 2.8.3. &merged; + updated from 2.6.2 to 2.10. &merged; <note> <para>Users of older versions of the @@ -987,11 +996,11 @@ moused_ums0_port="/dev/ums0"</programlisting> will cause serious problems. <application>GNOME</application> desktop users should read the instructions carefully at - <ulink url="&url.base;/gnome/docs/faq28.html"></ulink> + <ulink url="&url.base;/gnome/docs/faq210.html"></ulink> and use the <ulink url="&url.base;/gnome/gnome_upgrade.sh"><filename>gnome_upgrade.sh</filename></ulink> script to properly upgrade to - <application>GNOME</application> 2.8.3.</para> + <application>GNOME</application> 2.10.</para> <para>For casual users of the various <application>GNOME</application> libraries, diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml index fd58ce87210b..b1e4a7c983e8 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -15,6 +15,15 @@ <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> + <legalnotice id="trademarks" role="trademarks"> + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.ieee; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + </legalnotice> + <abstract> <para>The release notes for &os; &release.current; contain a summary of the changes made to the &os; base system since &release.branch; is created. @@ -657,7 +666,7 @@ give userland access to GPIB devices (using the the pcii driver) via the <function>ib<replaceable>foo</replaceable></function> - API.</para> + API. &merged;</para> <para>The default stack sizes in <filename>libpthread</filename> and <filename>libc_r</filename> have been increased. On 32-bit @@ -975,7 +984,7 @@ moused_ums0_port="/dev/ums0"</programlisting> <para>The supported version of the <application>GNOME</application> desktop environment has been - updated from 2.6.2 to 2.8.3. &merged; + updated from 2.6.2 to 2.10. &merged; <note> <para>Users of older versions of the @@ -987,11 +996,11 @@ moused_ums0_port="/dev/ums0"</programlisting> will cause serious problems. <application>GNOME</application> desktop users should read the instructions carefully at - <ulink url="&url.base;/gnome/docs/faq28.html"></ulink> + <ulink url="&url.base;/gnome/docs/faq210.html"></ulink> and use the <ulink url="&url.base;/gnome/gnome_upgrade.sh"><filename>gnome_upgrade.sh</filename></ulink> script to properly upgrade to - <application>GNOME</application> 2.8.3.</para> + <application>GNOME</application> 2.10.</para> <para>For casual users of the various <application>GNOME</application> libraries, |