]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
Merge r213061 from head:
authorgavin <gavin@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 9 Oct 2010 13:03:32 +0000 (13:03 +0000)
committergavin <gavin@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 9 Oct 2010 13:03:32 +0000 (13:03 +0000)
commit9dc3b70ec033928f5012adca3479b6bb25ef0fa7
tree048cf296883873d2210337cb7d0447dd6ca4cad6
parent3f8f13e55f2861a6a1496973ff67b74529b0c2e3
Merge r213061 from head:
  Various changes from various sources:

  - Add "children" [1]
  - Add "acknowledgement", "acknowledgment", "Austria" and "haunted" [2]
  - Add "near", "antidisestablishmentarianism" and "Persephone" [2]
  - "Transvaal" should be capitalized [2]
  - Correct spelling of "structurelessness" and "Athena" [2]
  - Add missing atomic elements [3]
  - Add various words from "word of the day" lists [3]

PR: conf/149756 [1]
Submitted by: Nick Johnson <freebsd spatula.net> [1]
Obtained from: NetBSD [2], OpenBSD [3]

git-svn-id: svn://svn.freebsd.org/base/stable/8@213656 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
share/dict/web2