Bug 76524

Summary: Add Compaq to the list on entities
Product: Documentation Reporter: Brad Davis <so14k>
Component: Books & ArticlesAssignee: freebsd-doc (Nobody) <doc>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Brad Davis 2005-01-21 05:20:19 UTC
	Add Compaq to the list on entities and apply it to the doc/ tree.
Comment 1 Ceri Davies 2005-01-21 08:56:57 UTC
Hi Brad,

On Thu, Jan 20, 2005 at 10:18:15PM -0700, Brad Davis wrote:
>  
> +<!-- http://www.hp.com/hpinfo/abouthp/trademarks/ -->
> +<!ENTITY tm-attrib.hp "<para>HP and Hewlett-Packard are trademarks of
> +  Hewlett-Packard Development Company, L.P.</para>">
> +<!ENTITY hp "<trademark class='registered'>Hewlett-Packard</trademark>">
> +<!ENTITY hp-ux "<trademark class='registered'>HP-UX</trademark>">
> +<!ENTITY compaq "<trademark class='registered'>Compaq</trademark>">
> +<!ENTITY tru64 "<trademark class='registered'>Tru64</trademark>">
> +

None of these are listed at the URL given - did they come from somewhere
else?

Ceri
Comment 2 Simon L. B. Nielsen freebsd_committer freebsd_triage 2005-01-21 09:15:10 UTC
On 2005.01.20 22:18:15 -0700, Brad Davis wrote:

> diff -ruN doc-ori/share/sgml/trademarks.ent doc/share/sgml/trademarks.ent
> --- doc-ori/share/sgml/trademarks.ent   Wed Jan 19 07:01:05 2005
> +++ doc/share/sgml/trademarks.ent       Thu Jan 20 22:13:22 2005
> @@ -119,6 +119,14 @@
>    trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
>    countries.</para>">
>  
> +<!-- http://www.hp.com/hpinfo/abouthp/trademarks/ -->


Ah, thats new.  They didn't use to have any trademark information on
their site.

The page explicitly state:

	HP does not use or require the use of trademark legends or
	acknowledgements unless agreed to by both parties involved in
	the development of a specific business or legal contract.

So, it does not appear to me like we have to change anything?

-- 
Simon L. Nielsen
Comment 3 Simon L. B. Nielsen freebsd_committer freebsd_triage 2005-02-19 15:03:30 UTC
State Changed
From-To: open->closed

I committed the "Intel EM64T" part, but not the UHCI part since 
"Intel" is used a company reference, not a product reference and 
therefor I don't think the trademark symbol should be used.  I didn't 
commit any of the compaq parts as per the audit-trail and general 
followup on the PR.  Thanks for the submission!