Doesn't refer to the sound itself.

@@ -42,3 +42 @@
-<gloss>maru mark</gloss>
-<gloss>semivoiced sound</gloss>
-<gloss>p-sound</gloss>
+<gloss>handakuten (diacritic)</gloss>

https://en.wiktionary.org/wiki/○#Symbol_2

For sense 3, it's used as a symbol, not a noun. Sense 2 can be a noun (e.g. テストで〇をもらう).

@@ -16 +16,2 @@
-<gloss>circle (sometimes used for zero)</gloss>
+<s_inf>sometimes used for zero</s_inf>
+<gloss>circle</gloss>
@@ -20,2 +21,4 @@
-<xref type="see" seq="1944660">二重丸・にじゅうまる</xref>
-<gloss>correct (when marking)</gloss>
+<xref type="see" seq="1944660">二重丸</xref>
+<s_inf>when marking a test, homework, etc.</s_inf>
+<gloss>"correct"</gloss>
+<gloss>"good"</gloss>
@@ -24,3 +27,5 @@
-<pos>&n;</pos>
-<xref type="see" seq="2146000">〇〇・まるまる・1</xref>
-<gloss>symbol used as a placeholder (either because a number of other words could be used in that position, or because of censorship)</gloss>
+<pos>&unc;</pos>
+<xref type="see" seq="2146000">〇〇・1</xref>
+<s_inf>placeholder used to censor individual characters or indicate a space to be filled in</s_inf>
+<gloss>*</gloss>
+<gloss>_</gloss>

Should it use double quotes instead of single quotes, though?

gg5
G n-grams:
ぎゅって	9330
ギュッて	11177
ギュって	12876

More forms.

@@ -14,0 +15,6 @@
+<reb>ギュって</reb>
+</r_ele>
+<r_ele>
+<reb>ギュッて</reb>
+</r_ele>
+<r_ele>
@@ -21 +27 @@
-<gloss>tightly (squeezing)</gloss>
+<gloss>tightly (hold, squeeze, etc.)</gloss>
@@ -22,0 +29 @@
+<gloss>forcefully (e.g. push)</gloss>

Google n-grams:
ぎゅっと	387583
ぎゅって	9330
ギュッと	363788
ギュっと	47929

I'm tempted to mark ぎゅって "ik".

@@ -9,3 +8,0 @@
-<reb>ぎゅって</reb>
-</r_ele>
-<r_ele>
@@ -15,0 +13,3 @@
+</r_ele>
+<r_ele>
+<reb>ぎゅって</reb>

Katakana spelling might be more common based on unscientific Google Search
"ぎゅっと抱く" 1560 hits
"ギュッと抱く" 2040 hits
"ギュっと抱く" 300 hits

@@ -9,0 +10,6 @@
+</r_ele>
+<r_ele>
+<reb>ギュッと</reb>
+</r_ele>
+<r_ele>
+<reb>ギュっと</reb>

Not sure they are the same POS, but I'll let it go for now.

No response - I'll reject it.

None.

Any references for the kanji form? It is in no dictionary I can access, and gets 0 WWW hits.

@@ -4,0 +4,3 @@
+<k_ele>
+<keb>怪立たましい</keb>
+</k_ele>
@@ -14,1 +17,1 @@
-<gloss>wild</gloss>
+<gloss>wild 飼鳥類は極めて物凄く驚き易く、且つ驚けば怪立たましくなるもの。 Yard birds are easily startles and moreover once spooked raise quite a racket.</gloss>

daij, gg5, prog

Not a noun.

@@ -12,2 +12 @@
-<pos>&n;</pos>
-<pos>&vs;</pos>
+<pos>&adv-to;</pos>
@@ -15 +14 @@
-<gloss>in trickles (e.g. water flowing)</gloss>
+<gloss>trickling (of water)</gloss>
@@ -19 +18,7 @@
-<pos>&n;</pos>
+<pos>&adv-to;</pos>
+<misc>&on-mim;</misc>
+<gloss>flickering (of fire)</gloss>
+</sense>
+<sense>
+<pos>&adv;</pos>
+<pos>&adv-to;</pos>
@@ -22,0 +28 @@
+<gloss>scampering about</gloss>

@@ -13,0 +14 @@
+<misc>&on-mim;</misc>
@@ -19,0 +21 @@
+<misc>&on-mim;</misc>

mk

@@ -15,0 +16 @@
+<pos>&vi;</pos>
@@ -22 +23,2 @@
-<gloss>changing quarters (geisha, prostitute, etc.)</gloss>
+<pos>&vi;</pos>
+<gloss>changing quarters (of a geisha, prostitute, etc.)</gloss>

Additional parenthesized details are best after the main part.

@@ -22 +22 @@
-<gloss>(of a geisha, prostitute, etc.) changing quarters</gloss>
+<gloss>changing quarters (geisha, prostitute, etc.)</gloss>

daijr/s

I think this is neater.
The second sense is quite specific.

@@ -16,4 +16,2 @@
-<gloss>changing one's stance</gloss>
-<gloss>changing loyalties</gloss>
-<gloss>changing jobs</gloss>
-<gloss>switching horses</gloss>
+<gloss>changing (one's job, loyalties, stance, etc.)</gloss>
+<gloss>switching over</gloss>
@@ -24,3 +22 @@
-<gloss>changing business location</gloss>
-<gloss>changing houses</gloss>
-<gloss>changing quarters</gloss>
+<gloss>(of a geisha, prostitute, etc.) changing quarters</gloss>

Daijr, GG5, etc.

Things like "changing loyalties" are really self-explanatory.

@@ -16,0 +16,3 @@
+<gloss>changing one's stance</gloss>
+<gloss>changing loyalties</gloss>
+<gloss>changing jobs</gloss>
@@ -17,2 +20,0 @@
-<gloss>changing loyalties (e.g. political party, romantic partner)</gloss>
-<gloss>changing jobs</gloss>
@@ -23,1 +24,2 @@
-<gloss>changing houses (e.g. geisha, prostitutes)</gloss>
+<gloss>changing business location</gloss>
+<gloss>changing houses</gloss>

GG5 daijr koj
研究社中 「くら替え」 in example sentences
1,450,000 鞍替え
  219,000 くら替え

Alt spelling くら替え (saw as such in newspaper, re: switching franchise network).
Expand glosses – “switch horses” idiomatic in English, loyalties, etc.
Split off geisha sense – daijr and koj split it off, rather specialized.

@@ -6,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>くら替え</keb>
@@ -13,0 +16,2 @@
+<gloss>switching horses</gloss>
+<gloss>changing loyalties (e.g. political party, romantic partner)</gloss>
@@ -14,1 +19,6 @@
-<gloss>changing quarters (geisha, etc.)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<gloss>changing houses (e.g. geisha, prostitutes)</gloss>
+<gloss>changing quarters</gloss>

GG5 daijr koj

Split into senses, elab “tranquil” a bit
Actually saw (as shop name) written as 欒, which is a legit reading, but I suspect this rather irregular as a spelling of this word. Will update if I see it used as such in running text.

@@ -14,0 +14,4 @@
+</sense>
+<sense>
+<pos>&adj-na;</pos>
+<pos>&n;</pos>
@@ -15,0 +19,1 @@
+<gloss>contentedly at ease</gloss>

@@ -13,0 +14 @@
+<pos>&exp;</pos>

我が方 leads 11:1.
Use "lr=lang_ja" in your Google search URL, or add a の.

GG5 daijr koj

Add spelling 我が方 – all dicts give this
(Can’t easily tell frequency online, since also used in Chinese AFAICT; place this first, due to dicts.)
(Heard on TV today, subtitled as 我が方)

@@ -4,0 +4,3 @@
+<k_ele>
+<keb>我が方</keb>
+</k_ele>

All the JEs lead with "helper". "unwell" and "ill" are synonyms.

@@ -27,2 +27,2 @@
-<gloss>assistant (esp. of someone unwell or ill)</gloss>
-<gloss>helper</gloss>
+<gloss>helper (e.g. for a sick person)</gloss>
+<gloss>assistant</gloss>

It's only 介 that is ateji, but I'm not sure that needs a special mention.
Half of my kokugos have the okurigana-less version. I think it's okay to drop the [io] tag.

〈介／かい／カイ〉〈添（え）／副（え）／ぞえ／ゾエ〉

Google N-gram Corpus Counts
╭─ーーーー─┬────────┬───────╮
│ 介添え　 │ 23,863 │ 66.2% │
│ 介添　　 │ 11,091 │ 30.8% │
│ 介副　　 │    489 │  1.4% │
│ かい副　 │    247 │  0.7% │
│ かいぞえ │    330 │  0.9% │
╰─ーーーー─┴────────┴───────╯

@@ -12 +12 @@
-<ke_inf>&io;</ke_inf>
+<ke_inf>&ateji;</ke_inf>

Hits in order: 286k, 125k, 51k

@@ -7,0 +7,6 @@
+<k_ele>
+<keb>三羽ガラス</keb>
+</k_ele>
+<k_ele>
+<keb>三羽がらす</keb>
+</k_ele>
@@ -9,0 +15,6 @@
+<re_restr>三羽烏</re_restr>
+<re_restr>三羽がらす</re_restr>
+</r_ele>
+<r_ele>
+<reb>さんばガラス</reb>
+<re_restr>三羽ガラス</re_restr>

Fork

@@ -26 +26 @@
-<gloss>young (non- adult) person</gloss>
+<gloss>young (non-adult) person</gloss>

Most of the 300+ sentences index for sense 1 are actually for the non-offspring sense. I'm flipping the first two senses. I'll approve, then reopen to remind me to index a few for the (new) sense 2.

@@ -22,6 +21,0 @@
-<gloss>(one's) child</gloss>
-<gloss>offspring</gloss>
-</sense>
-<sense>
-<pos>&n;</pos>
-<pos>&n-suf;</pos>
@@ -32,0 +27,6 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&n-suf;</pos>
+<gloss>(one's) child</gloss>
+<gloss>offspring</gloss>

OK, I've split that geisha sense out. I'll renumber the sentences.....

@@ -45 +44,0 @@
-<gloss>young geisha</gloss>
@@ -75,0 +75,5 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<s_inf>also 姑</s_inf>
+<gloss>young geisha</gloss>

daijs distinguishes between "offspring" and 
child (=youngster) in general.

I don't think all senses should be n-suf (but 
not sure which should be)

could we take "young geisha" out of the 
"young woman" sense? maybe make its own 
sense? daijs mentions "姑" s ateji for thqt 
meaning alone

@@ -21,0 +22,6 @@
+<gloss>(one's) child</gloss>
+<gloss>offspring</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&n-suf;</pos>
@@ -22,0 +29,4 @@
+<gloss>kid</gloss>
+<gloss>teenager</gloss>
+<gloss>youngster</gloss>
+<gloss>young (non- adult) person</gloss>
@@ -39 +48,0 @@
-<pos>&n-suf;</pos>
@@ -44 +52,0 @@
-<pos>&n-suf;</pos>
@@ -50 +57,0 @@
-<pos>&n-suf;</pos>
@@ -62 +68,0 @@
-<pos>&n-suf;</pos>

Yes. I've added a new English version and made that the one in the examples. It will be active next week.

sentence for sense [11]:
  彼はきっすいのロンドン子です。
  He was born within the sound of the Bow bells.

The indirect language here isn't doing any favors for the intelligibility of this sense, which I think is already difficult to understand at a glance.

Is there any way to update the sentence meanings? E.g. to "He is a genuine Londoner." or "He's a Londoner, born and raised."

@@ -64,2 +64,4 @@
-<xref type="see" seq="1365040">親・おや・2</xref>
-<gloss>player who is not a dealer (in cards, mahjong, etc.)</gloss>
+<xref type="see" seq="1365040">親・2</xref>
+<field>&cards;</field>
+<field>&mahj;</field>
+<gloss>player who is not a dealer</gloss>

@@ -57,0 +58 @@
+<field>&finc;</field>
@@ -59 +60 @@
-<gloss>new shares</gloss>
+<gloss>new share</gloss>

Done.

Quiet. Closing.

I'll lock in Robin's note, approve to shorten the queue, and reopen for a while in case there's more discussion.

@@ -20 +20 @@
-<s_inf>blunt outside of compounds; 女性 or 女の人 are preferable</s_inf>
+<s_inf>less polite than 女性 or 女の人</s_inf>

The entry is not just for standalone 女 as the first sense has the n-pref PoS as well.

I don't think so. Some おんな compounds do sound "blunt", and it goes without saying that the note doesn't apply to terms like 女坂.
This entry is for the standalone word 女/おんな. I don't think we need to complicate things by mentioning compounds.

gg5, prog

More glosses.
I think 食べ尽くす is a better example.
We're no longer using aux-v for "動詞の連用形に付いて" senses as they're not strictly auxiliary verbs.

@@ -24,0 +25,2 @@
+<pos>&vt;</pos>
+<gloss>to use up</gloss>
@@ -26 +28 @@
-<gloss>to run out</gloss>
+<gloss>to run out of</gloss>
@@ -30,3 +32,5 @@
-<gloss>to devote</gloss>
-<gloss>to serve (a person)</gloss>
-<gloss>to befriend</gloss>
+<pos>&vi;</pos>
+<gloss>to devote oneself (to)</gloss>
+<gloss>to do one's utmost (for)</gloss>
+<gloss>to serve</gloss>
+<gloss>to work (for a cause)</gloss>
@@ -35,2 +39,4 @@
-<pos>&aux-v;</pos>
-<xref type="see" seq="1157280">し尽くす</xref>
+<pos>&suf;</pos>
+<pos>&v5s;</pos>
+<xref type="see" seq="1891870">食べ尽くす</xref>
+<s_inf>after masu stem of verb</s_inf>
@@ -37,0 +44,2 @@
+<gloss>to do completely</gloss>
+<gloss>to do fully</gloss>

し尽くす too.

@@ -35,0 +36 @@
+<xref type="see" seq="1157280">し尽くす</xref>

やり尽くす is an example

Are there any examples of this verb being used as an auxiliary? I feel that the first and third definition could potentially be merged, judging 
from the example sentences in GG5.

gg5, prog, daij, koj

@@ -25 +24,0 @@
-<gloss>beach</gloss>
@@ -26,0 +26,2 @@
+<gloss>waterside</gloss>
+<gloss>shore</gloss>
@@ -28,0 +30 @@
+<stagr>みずぎわ</stagr>
@@ -30,2 +32 @@
-<gloss>coastline</gloss>
-<gloss>national border</gloss>
+<gloss>before coming ashore</gloss>
@@ -32,0 +34 @@
+<gloss>(at the) border</gloss>

水際	107505	97.4%
水ぎわ	2814	2.6%
Koj, Daijr/s. Not in JEs.

From 2856513 submission.

@@ -11,0 +12 @@
+<ke_inf>&sK;</ke_inf>
@@ -17,0 +19,3 @@
+</r_ele>
+<r_ele>
+<reb>すいさい</reb>

Koj

My "kanwa alert" came on, but I see Koj has it.

nikk

@@ -14,0 +14,3 @@
+<r_ele>
+<reb>せい</reb>
+</r_ele>

"small goods" is OK for this too.

@@ -18,0 +18,1 @@
+<gloss>small goods</gloss>

daijs, daijr, nikk, eij

@@ -16,1 +16,1 @@
-<gloss>small goods</gloss>
+<gloss>(good quality) meat</gloss>
@@ -18,1 +18,0 @@
-<gloss>good quality meat</gloss>

daijr: 俗に，陰茎。
息子	14,317,174	98.0%	
むす子	702	        0.0%	
むすこ	86,378	        0.6%	
ムスコ	204,564	        1.4%

Splitting out そく into a separate entry.
I don't think sense 2 is vulgar. Possibly [joc].

@@ -9,3 +8,0 @@
-</k_ele>
-<k_ele>
-<keb>むす子</keb>
@@ -24,6 +21 @@
-<re_nokanji/>
-</r_ele>
-<r_ele>
-<reb>そく</reb>
-<re_restr>息</re_restr>
-<re_inf>&ok;</re_inf>
+<re_inf>&sk;</re_inf>
@@ -36 +27,0 @@
-<stagr>むすこ</stagr>
@@ -38 +29 @@
-<misc>&vulg;</misc>
+<misc>&col;</misc>

ムスコ	204564

@@ -20,0 +21,4 @@
+</r_ele>
+<r_ele>
+<reb>ムスコ</reb>
+<re_nokanji/>

G n-grams:
息子	14317174
むす子	     702
息	 4062211
むすこ	   86378
そく	  400140

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>むす子</keb>

@@ -23,1 +23,0 @@
-<xref type="see" seq="1344930">女・おんな</xref>
@@ -26,0 +25,1 @@
+<xref type="see" seq="1344930">女・おんな</xref>

prog, nc, gg5

おっこ may only apply to sense 1

@@ -22,0 +22,3 @@
+<pos>&n-pref;</pos>
+<xref type="see" seq="1344930">女・おんな</xref>
+<xref type="see" seq="1344930">女・おんな</xref>
@@ -23,1 +26,21 @@
-<gloss>boy</gloss>
+<gloss>male</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>fellow</gloss>
+<gloss>guy</gloss>
+<gloss>chap</gloss>
+<gloss>bloke</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>male lover</gloss>
+<gloss>boyfriend</gloss>
+<gloss>man</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>manliness</gloss>
+<gloss>manly honor</gloss>
+<gloss>manly honour</gloss>
+<gloss>manly reputation</gloss>

nikk

like 女, this has a lot of meanings in daijs/daijr, 9-12 
glosses

@@ -16,0 +16,4 @@
+<r_ele>
+<reb>おっこ</reb>
+<re_inf>&ok;</re_inf>
+</r_ele>
@@ -19,0 +23,1 @@
+<gloss>boy</gloss>

GG5 example
640,000 朝もや
402,000 朝靄

Add spelling 朝もや – saw as such in poem, a bit more common (esp. given 靄 being a hard kanji)

@@ -4,0 +4,3 @@
+<k_ele>
+<keb>朝もや</keb>
+</k_ele>

meikyo

@@ -18,0 +19 @@
+<pos>&vi;</pos>

@@ -18,0 +19 @@
+<xref type="ant" seq="1600020">値上がり</xref>

@@ -20,1 +20,1 @@
-<gloss>a fall in price</gloss>
+<gloss>fall in price</gloss>

GG5 daijr koj

[vs]
(Saw used as する today)

@@ -18,0 +18,1 @@
+<pos>&vs;</pos>

google

@@ -8,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>目かくし</keb>

Try again.

@@ -35 +35 @@
-<gloss>forcing (sonething, e.g. kindnezz) on someone</gloss>
+<gloss>forcing on someone (e.g. kindness)</gloss>

@@ -35 +35 @@
-<gloss>forcing on someone (e.g. kindness)</gloss>
+<gloss>forcing (sonething, e.g. kindnezz) on someone</gloss>

gg5, prog, daij
押し売り	120177
押売	8261
押売り	5359
押し売	164

Added sense.
Dropping 押し売.

@@ -12 +11,0 @@
-<ke_pri>ichi1</ke_pri>
@@ -16,4 +14,0 @@
-<ke_pri>ichi1</ke_pri>
-</k_ele>
-<k_ele>
-<keb>押し売</keb>
@@ -31 +26,2 @@
-<gloss>high-pressure salesmanship</gloss>
+<gloss>high-pressure selling</gloss>
+<gloss>aggressive peddling</gloss>
@@ -33 +29,7 @@
-<gloss>aggressive peddling</gloss>
+<gloss>high-pressure salesman</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<pos>&vs;</pos>
+<pos>&vt;</pos>
+<gloss>forcing on someone (e.g. kindness)</gloss>

mk (2 senses)

@@ -28,0 +29,2 @@
+<pos>&vs;</pos>
+<pos>&vt;</pos>

GG5, etc.

@@ -29,0 +30 @@
+<gloss>the hard sell</gloss>

Glosses to noun form. Could possibly have a 手放しで entry.

@@ -19,2 +19,2 @@
-<gloss>without holding on</gloss>
-<gloss>without using the hands</gloss>
+<gloss>not holding on</gloss>
+<gloss>not using the hands</gloss>
@@ -25 +25 @@
-<gloss>lack of reserve</gloss>
+<gloss>lack of reserve (in expressing one's emotions)</gloss>
@@ -27 +27 @@
-<gloss>openly</gloss>
+<gloss>openly (saying)</gloss>

KM n-grams:
手放し	20039
手離し	565
てばなし	38

Yes, 手離す is in GG5 as an alternative surface form for 手放す.

@@ -7,0 +8,3 @@
+</k_ele>
+<k_ele>
+<keb>手離し</keb>

I've seen this spelled "手離し", and in fact treated as a 
verb 手離す.

gg5, prog, daij

Doesn't appear to be adverbial.

@@ -5,0 +6,2 @@
+<ke_pri>news2</ke_pri>
+<ke_pri>nf38</ke_pri>
@@ -9,2 +10,0 @@
-<ke_pri>news2</ke_pri>
-<ke_pri>nf38</ke_pri>
@@ -35,3 +35,3 @@
-<pos>&adv;</pos>
-<gloss>in passing another (esp. colliding with oncoming traffic, bumping into a person)</gloss>
-<gloss>the moment two persons or objects meet</gloss>
+<gloss>the moment of meeting (of two people, vehicles, etc.)</gloss>
+<gloss>the moment of running into each other</gloss>
+<gloss>the moment of crossing paths</gloss>

GG5 has both, in this order.

Meikyo and smk lead with the 会 version, which also gets the most counts below

〈出／で〉〈会（い）／合（い）／あい〉〈頭／がしら／ガシラ〉

Google N-gram Corpus Counts
╭─ーーーーーー─┬────────┬───────╮
│ 出会い頭　　 │ 42,253 │ 73.9% │
│ 出合い頭　　 │  6,129 │ 10.7% │
│ 出会いがしら │  5,593 │  9.8% │ - add, sK
│ 出合頭　　　 │  1,579 │  2.8% │ - [io] to [sK]
│ 出会頭　　　 │    340 │  0.6% │ - [io] to [sK]
│ 出合いがしら │    300 │  0.5% │ - add, sK
│ で会頭　　　 │    269 │  0.5% │
│ 出会いガシラ │     93 │  0.2% │
│ 出あいがしら │     80 │  0.1% │
│ 出あい頭　　 │     38 │  0.1% │
│ 出合がしら　 │     31 │  0.1% │
│ であいがしら │    498 │  0.9% │
╰─ーーーーーー─┴────────┴───────╯

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>出会い頭</keb>
+</k_ele>
@@ -10 +13,2 @@
-<keb>出会い頭</keb>
+<keb>出会いがしら</keb>
+<ke_inf>&sK;</ke_inf>
@@ -14 +18 @@
-<ke_inf>&io;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -18 +22,5 @@
-<ke_inf>&io;</ke_inf>
+<ke_inf>&sK;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>出合いがしら</keb>
+<ke_inf>&sK;</ke_inf>

Bulk update n-adv to n,adv
-*- via bulkupd.py -*-

@@ -26 +26,2 @@
-<pos>&n-adv;</pos>
+<pos>&n;</pos>
+<pos>&adv;</pos>

@@ -13,0 +14 @@
+<gloss>book club</gloss>

@@ -12,1 +12,2 @@
-<gloss>a reading circle</gloss>
+<gloss>reading circle</gloss>
+<gloss>reading group</gloss>

薄め	860096	91.8%
薄目	74939	8.0%
うす目	1701	0.2%

@@ -9,0 +10,4 @@
+</k_ele>
+<k_ele>
+<keb>うす目</keb>
+<ke_inf>&sK;</ke_inf>

gg5, luminous, wisdom

@@ -19 +19,2 @@
-<gloss>somewhat slight</gloss>
+<gloss>somewhat thin</gloss>
+<gloss>weakish</gloss>
@@ -20,0 +22,2 @@
+<gloss>rather light</gloss>
+<gloss>rather pale</gloss>

@@ -18,2 +18,2 @@
-<gloss>slight</gloss>
-<gloss>thin</gloss>
+<gloss>thinnish</gloss>
+<gloss>somewhat slight</gloss>

Probably don't need two "spirits".

@@ -22,1 +22,0 @@
-<gloss>spirit</gloss>

@@ -20,1 +20,4 @@
-<gloss>determined or unyielding spirit</gloss>
+<gloss>determined spirit</gloss>
+<gloss>unyielding spirit</gloss>
+<gloss>spirit</gloss>
+<gloss>will</gloss>

@@ -32 +32 @@
-<gloss>a type of yarn-dyed silk goods</gloss>
+<gloss>type of yarn-dyed silk goods</gloss>

甲斐絹
先染絹織物の一種。海気，改機，海黄とも書く。
http://kotobank.jp/word/甲斐絹
.
http://www.pref.yamanashi.jp/kaiki/

@@ -32,2 +32 @@
-<gloss>type of thin thread</gloss>
-<gloss>textile type</gloss>
+<gloss>a type of yarn-dyed silk goods</gloss>

not sure these should all be merged

daijr nikk

@@ -12,0 +12,3 @@
+</k_ele>
+<k_ele>
+<keb>甲斐絹</keb>

@@ -13,1 +13,1 @@
-<gloss>unsollicited statement</gloss>
+<gloss>unsolicited statement</gloss>

@@ -12,1 +12,2 @@
-<gloss>unprompted remark or statement</gloss>
+<gloss>unprompted remark</gloss>
+<gloss>unsollicited statement</gloss>

@@ -26 +26 @@
-<gloss>villain (in kabuki, joruri, etc.)</gloss>
+<gloss>villain (in kabuki, jōruri, etc.)</gloss>

Daijr

@@ -23,1 +23,4 @@
-<gloss>kabuki villain</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>villain (in kabuki, joruri, etc.)</gloss>

daijs, nikk

@@ -7,0 +7,3 @@
+<k_ele>
+<keb>赭面</keb>
+</k_ele>
@@ -9,0 +12,7 @@
+</r_ele>
+<r_ele>
+<reb>あかづら</reb>
+</r_ele>
+<r_ele>
+<reb>あかっつら</reb>
+<re_inf>&ok;</re_inf>

I think sense 3 is even wider - on variety shows they usually 
say 男性陣　女性陣 etc.

@@ -29 +28,0 @@
-<xref type="see" seq="1870180">教授陣</xref>
@@ -31 +30,4 @@
-<gloss>group (with a common goal or purpose)</gloss>
+<gloss>group</gloss>
+<gloss>gang</gloss>
+<gloss>party</gloss>
+<gloss>corps</gloss>

prog, gg5, nc

@@ -24,0 +24,1 @@
+<gloss>position</gloss>

daij

@@ -16,0 +16,1 @@
+<xref type="see" seq="2015160">背水の陣</xref>
@@ -17,0 +18,4 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="1886450">陣を張る</xref>
@@ -20,0 +25,14 @@
+<sense>
+<pos>&n;</pos>
+<pos>&n-suf;</pos>
+<xref type="see" seq="1870180">教授陣</xref>
+<xref type="see" seq="1627110">報道陣</xref>
+<gloss>group (with a common goal or purpose)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<xref type="see" seq="2208190">大坂夏の陣</xref>
+<gloss>war</gloss>
+<gloss>battle</gloss>
+<gloss>campaign</gloss>
+</sense>

赤色の帽子	176	11.9%
赤色な帽子	0	0.0%
赤の帽子	1303	88.1%
(we have 赤色 tagged as adj-na,adj-no)

not sure I'm a fan of our sense 2. but I guess it's in daijr. should we maybe gloss it as brown;orange instead...?

@@ -23,0 +24 @@
+<pos>&adj-no;</pos>

@@ -69,0 +70 @@
+<field>&hanaf;</field>
@@ -71 +72 @@
-<gloss>red 5-point card (in hanafuda)</gloss>
+<gloss>red 5-point card</gloss>

aligning hanafuda terminology

@@ -73 +73 @@
-<gloss>red poetry ribbon card (in hanafuda)</gloss>
+<gloss>red 5-point card (in hanafuda)</gloss>

Daijr: 俗に、男らしい男。

Let's make it the common-or-garden "sl" then.

@@ -12 +12,2 @@
-<misc>&m-sl;</misc>
+<xref type="see" seq="2027780">漢・かん・4</xref>
+<misc>&sl;</misc>

https://dictionary.sanseido-publ.co.jp/column/sankok18

「漢」を「おとこ」と読ませる例は昔からありますが、力強い・頼もしいなどの属性を強調して使うようになったのは、比較的最近でしょう。笹原宏之氏は〈近年では「漢」と書いて「おとこ」と読ませる例が流行（はや）っているようで、そこには熱血漢のニュアンスが強く打ち出されている。〉（『訓読みのはなし』光文社新書p.211）と述べています。
...
『三省堂国語辞典 第六版』では、このような例から、「漢＝おとこ」を現代の表記であると認めました。これまで、「おとこ」の項目の4番目に、〈からだや気持ちが強い、〔略〕男らしいとされる性質を特に強く持った人。〉という意味が記されていましたが、ここに新しく［▽漢］の表示を加えたのです。

i don't think this is "manga slang" (although google image hits are almost exclusively comics).

http://dic.nicovideo.jp/a/漢
http://d.hatena.ne.jp/keyword/���ʤ��Ȥ�%A
1%CB

@@ -13,2 +13,2 @@
-<gloss>honourable man (anime, manga usage)</gloss>
-<gloss>honorable man</gloss>
+<gloss>man among men</gloss>
+<gloss>man's man</gloss>

Entry created

Daijr, GG5

Sorting on hits.

@@ -8,0 +8,3 @@
+<keb>見かじめ料</keb>
+</k_ele>
+<k_ele>
@@ -12,3 +15,0 @@
-</k_ele>
-<k_ele>
-<keb>見かじめ料</keb>

@@ -13,0 +13,3 @@
+<k_ele>
+<keb>見かじめ料</keb>
+</k_ele>

Entry created

@@ -14,2 +14 @@
-<gloss>Three Alls Strategy</gloss>
-<gloss g_type="expl">Japanese scorched earth policy during the second Sino-Japanese War</gloss>
+<gloss>Three Alls Strategy (Japanese scorched earth policy during the second Sino-Japanese War)</gloss>

@@ -11,0 +12 @@
+<misc>&hist;</misc>

GG5: "【日本史】 〔日本軍の殺戮･破壊に対する中国側の称〕 the Sanguang campaign. ▲三光は殺光 (kill all), 搶光 (plunder all), 焼光 (burn all)から."

(a) the entry arrived ca. 2000/2001 when my record-keeping was spotty. I don't have the source.
(b) I'm sure your analysis and revised translation is correct. My only ref with it is GG5, and it pretty much agrees. I was wondering about "Sanguang campaign" as a gloss, but it gets 0 hits as a phrase.

@@ -12,1 +12,3 @@
-<gloss>Three Alls Strategy, Japanese scorched earth policy during the second Sino-Japanese War (三光 is a reference to a Chinese phrase meaning "kill all, burn all, loot all")</gloss>
+<s_inf>三光 is a ref. to a Chinese phrase meaning 'kill all, burn all, loot all'</s_inf>
+<gloss>Three Alls Strategy</gloss>
+<gloss g_type="expl">Japanese scorched earth policy during the second Sino-Japanese War</gloss>

http://ja.wikipedia.org/wiki/燼滅作�
%A6

http://en.wikipedia.org/wiki/Three_Alls_Policy

What is the origin of the English translation used here -- 
"Three Lights Strategy"? Googling suggests that it may be 
associated primarily with EDICT, and may not be an accepted 
English equivalent of 三光作戦. Certainly the phrase "Three 
Lights Strategy" doesn't appear in the Wikipedia article 
http://en.wikipedia.org/wiki/Three_Alls_Policy

I believe "Three Lights Strategy" may have originated from 
EDICT, and if that is the case, I suggest that we delete it 
from the definition, as it is a lousy translation! In 三光作
戦, 三光 is a reference to the Chinese phrase 殺光、燒光、搶光 
(kill all, burn completely, loot everything)

三光とは、殺光・焼光・搶光をさし、それぞれ殺し尽くす・焼き尽くす・奪い尽くすことを意
味する漢語である。(北方漢語で「～光」という接尾詞は「～しつくす」という意味にな
る。)
http://ja.wikipedia.org/wiki/燼滅作�%
88%A6

So, in Chinese, 光 (as it's used in 殺光、燒光、搶光) is a verb 
suffix which means "completely; leaving not even a trace" -- 
NOT "light" (the Japanese sense of the character). 

So it seems a bit weird to translate 三光作戦 as the three 
"lights"!

(Of course, 光 can also mean "light" in Chinese, amongst 
other things.)

See also
http://en.wikipedia.org/wiki/Three_Alls_Policy
"The expression "Sankō Sakusen", BASED UPON CHINESE TERMS 
[my emphasis], was not used by the Japanese military. 
Rather, it was first popularized in Japan in 1957 when a 
former Japanese soldier released from the Fushun war crime 
internment center wrote a controversial book called The 
Three Alls: Japanese Confessions of War Crimes in China 
(Japanese: 三光、日本人の中国における戦争犯罪の告白, Sankō, Nihonjin 
no Chūgoku ni okeru sensō hanzai no kokuhaku) (new edition: 
Kanki Haruo, 1979), in which a number of Japanese veterans 
confessed to war crimes committed under the leadership of 
General Yasuji Okamura. The publishers were forced to stop 
the publication of the book after receiving death threats 
from Japanese militarists and ultranationalists."

@@ -12,2 +12,1 @@
-<gloss>Three Alls Strategy</gloss>
-<gloss>Three Lights Strategy (Japanese scorched earth policy during the second Sino-Japanese War)</gloss>
+<gloss>Three Alls Strategy, Japanese scorched earth policy during the second Sino-Japanese War (三光 is a reference to a Chinese phrase meaning "kill all, burn all, loot all")</gloss>

Entry created

nikk

@@ -9,0 +9,4 @@
+</k_ele>
+<k_ele>
+<keb>老女</keb>
+<ke_inf>&oK;</ke_inf>

Entry created

koj, daij, yahoo enc

merged there

daij (just points to からきし)

@@ -4,3 +4,0 @@
-<k_ele>
-<keb>から切り</keb>
-</k_ele>
@@ -12,0 +9,5 @@
+<xref type="see" seq="1928690">からきし</xref>
+<gloss>quite</gloss>
+<gloss>utterly</gloss>
+<gloss>(not) at all</gloss>
+<gloss>completely</gloss>
@@ -14,1 +16,0 @@
-<gloss>completely</gloss>
@@ -16,1 +17,0 @@
-<gloss>all</gloss>
@@ -18,1 +18,0 @@
-<gloss>whole</gloss>

The above, as "からきり", was in the text which I was reading. The meaning fits the context of that text. I guess in simple terms it is simply "cut from (something)", but it gets a fair measure of Google hits and the concept of cutting completely is not necessarily in the mind when thinking of "cut from", but that is often the notion of the addition of "きり"

Perhaps you will take it as a + b, but the existence of the above entry could add that confirmation of totality.

PS.
I have returned after reading your heading comment, namely:-

Please check the entry below carefully. If it is what you wish to submit, click the Submit button. Otherwise, use your brower's Back button to return to the Edit page and make corrections. If you have having a problem entering the information you want, please send email to jimbreen@gmail.com.

I guess that "If you have having a problem" may have been intended to mean "If you are having"

At least you have proof that someone reads the headline notes, but I don't claim to read everything!!

@@ -10,0 +11 @@
+<pos>&exp;</pos>

daijs (タッグ entry)
http://www.practical-japanese.com/2011/02/blog-post_4150.html
http://oshiete.goo.ne.jp/qa/876301.html
http://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1114429551
http://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q1422849299

@@ -8,1 +8,1 @@
-<reb>たっぐをくむ</reb>
+<reb>タッグをくむ</reb>
@@ -14,1 +14,1 @@
-<gloss g_type="lit">to play tag together</gloss>
+<gloss g_type="lit">to form a tag team</gloss>

GG5 (タッグ entry)

@@ -12,1 +12,3 @@
-<gloss>to work or strive together</gloss>
+<gloss>to work together</gloss>
+<gloss>to strive together</gloss>
+<gloss g_type="lit">to play tag together</gloss>

サボり	483750
さぼり	368839

@@ -5,0 +6,3 @@
+</r_ele>
+<r_ele>
+<reb>さぼり</reb>

リーダーズ+プラス

@@ -12,0 +12,1 @@
+<gloss>truancy</gloss>

daijs, nikk, eij

Most of the hits I get for this point to ホラ貝を吹く, etc.

@@ -13,0 +13,3 @@
+<xref type="see" seq="2742450">法螺貝を吹く</xref>
+<gloss>to blow a conch</gloss>
+<gloss>to blow a trumpet shell</gloss>

nikk
"貝を吹く" 175,000

oops

@@ -26 +26 @@
-<reb>ホラガイを吹く</reb>
+<reb>ホラガイをふく</reb>

G n-grams:
 ほら貝を吹く	587
 ホラ貝を吹く	491
 法螺貝を吹く	426
 ホラガイを吹く	24

@@ -12,0 +13,3 @@
+<k_ele>
+<keb>ホラガイを吹く</keb>
+</k_ele>
@@ -20,0 +24,4 @@
+</r_ele>
+<r_ele>
+<reb>ホラガイを吹く</reb>
+<re_restr>ホラガイを吹く</re_restr>

@@ -24,0 +25 @@
+<xref type="see" seq="1603560">ほら貝・ほらがい</xref>

'Twas me.

@@ -7,0 +7,6 @@
+<k_ele>
+<keb>すけべ椅子</keb>
+</k_ele>
+<k_ele>
+<keb>助平椅子</keb>
+</k_ele>
@@ -9,0 +15,6 @@
+<re_restr>スケベ椅子</re_restr>
+</r_ele>
+<r_ele>
+<reb>すけべいす</reb>
+<re_restr>すけべ椅子</re_restr>
+<re_restr>助平椅子</re_restr>
@@ -12,1 +24,1 @@
-<gloss>shower chair with a u-shaped hole in the middle</gloss>
+<gloss>shower stool with a u-shaped hole in the middle</gloss>

http://ja.wikipedia.org/wiki/スケベ椅子#.E7.94.A8.E5.85.B7
418k hits
google images

@@ -12,0 +12,1 @@
+<xref type="see" seq="1034490">オナニー</xref>

1,890,000 results
hatena
http://d.hatena.ne.jp/keyword/���ʶ�
"オナ禁はメリット多過ぎｗｗｗｗｗｗｗｗｗｗｗｗｗ"
http://vipsister23.com/archives/5454097.html

三ツ星	121043
三つ星	38230
三ッ星	22910

みっつぼし	38
みつぼし	4445

みつぼし is correct according to the kokugos but 
my android IME does convert みっつぼし to 三つ星 
so maybe we could include that as an [ik]... 
but I don't know if it's really needed.

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>三ツ星</keb>
+</k_ele>
@@ -11 +14 @@
-<keb>三ツ星</keb>
+<keb>三ッ星</keb>

Aligning.
Shouldn't this be みっつぼし?

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>三ツ星</keb>
@@ -21 +24 @@
-<gloss>three stars (for quality, e.g. Michelin stars)</gloss>
+<gloss>three stars (rating)</gloss>

@@ -21,1 +21,1 @@
-<gloss>three stars (e.g. Michelin stars)</gloss>
+<gloss>three stars (for quality, e.g. Michelin stars)</gloss>

gg5

@@ -16,1 +16,1 @@
-<gloss>three star (Michelin guide)</gloss>
+<gloss>three stars (shape)</gloss>
@@ -21,2 +21,1 @@
-<gloss>three stars</gloss>
-<gloss>in the shape of three stars</gloss>
+<gloss>three stars (e.g. Michelin stars)</gloss>
@@ -27,1 +26,2 @@
-<gloss>Chinese "Three Stars" constellation</gloss>
+<gloss>Orion's belt</gloss>
+<gloss>Chinese "Three Stars" constellation (one of the 28 mansions)</gloss>

GG5, ルミナス

daijs, daijr, nikk, 和英日本標準商品分類, DBCLS, jst, life

daijr, JST, 日英・英日専門用語辞書

gg5, eij

@@ -13,0 +13,1 @@
+<gloss>livestock product</gloss>

daijs, daijr, eij, dbcls, jst

duplicate

daijs, daijr, eij, dbcls, jst

nikk
eij examples from hiragana times
only t 3,790 results

@@ -13,1 +13,1 @@
-<gloss>procedure at Japanese brothels where a prostitute rubs herself and her client in lotion and then rub herself against the client on top of an air mattress</gloss>
+<gloss>sexual activity (at a brothel) involving body lotion and an air mattress</gloss>

For brevity how about "sexual activity involving body lotion and an air mattress".
As ever, the Google images are, er, instructive.

1,860,000 results
http://detail.chiebukuro.yahoo.co.jp/qa/question_detail/q10539
71950

daij, nikk, Luminous

@@ -12,2 +12,2 @@
-<gloss>champagne tower</gloss>
-<gloss>champagne pyramid</gloss>
+<gloss>Champagne tower</gloss>
+<gloss>Champagne pyramid</gloss>

ＫＯＤ追加語彙

@@ -13,0 +13,1 @@
+<gloss>champagne pyramid</gloss>

daijs
393k

daijs,daijr,nikk,国史大辞典

GG5

daijs, daijr, nikk, プログレッシブ和英中辞典, eij

nikk
http://ameblo.jp/mayoichan/entry-10290216534.html
http://onno.jp/lab/kanji?KID=38184

http://www.yomiuri.co.jp/national/news/20120910-
OYT1T00458.htm?from=main6
"エスカレーターで女性が指切断、男の捨てた酒瓶で"

eij
 321k

daijs, nikk

GG5

@@ -13,0 +13,1 @@
+<gloss>mentha water</gloss>

daij, nikk

jst, wiki, life
http://ja.wikipedia.org/wiki/フェネ�
%81%E3%83%AB%E3%82%A2%E3%83%9F%E3%83%B3

JST, life, 日本化学物質辞書Web

GG5, Igaku

eij, nikk, nipponika, jst

GG5

nikk, プログレッシブ和英中辞典, eij, 実用日本語表現辞典, DBCLS, JST, コン
ピューター用語辞典

GG5

@@ -21,0 +21,1 @@
+<gloss>taking multiple medications</gloss>

daijs, eij

daijs, daijr, nikk eij, 和英マシニング用語集, 機械工学英和和英辞典, 和
英河川・水資源用語集, DBCLS, JST

Daijr, ＫＯＤ追加語彙

ja:WP
http://ja.wikipedia.org/wiki/電気柵
325,000

Heard/seen repeatedly (most recently on news).

GG5 daijr
784,000 美酒に酔う
 43,900 勝利の美酒に酔う

GG5 and daijr give
勝利の美酒に酔う
though the simpler
美酒に酔う
gets many more hits (i.e., not just or even primarily used in longer compound).
Cited in class as 美酒に酔う

@@ -11,0 +12 @@
+<gloss>short trip</gloss>

ＫＯＤ追加語彙

daijs

A merge would break 2/3 rule.

@@ -13,0 +13,1 @@
+<xref type="see" seq="2224430">愛おしむ</xref>

daij

possible merge with 愛おしむ

GG5

daij

@@ -13,0 +13,1 @@
+<gloss>female protagonist</gloss>

daij gg5