I'd seen the 会社・町内会など so I thought the schools mention was plausible. I certainly don't mind dropping it if it's contested.

2 native informers: 学校でつかわんな
daij only mention 町内会
gakkoku has 会社・町内会などで

Is ChatGPT the only surce for the school thing? I wnt to reiterate I don't think we should ever refer to ChatGPT even when what it outputs seems OK because there's just no way of knowing what's based on facts and what's AI hallucinations.

@@ -12 +12 @@
-<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, school community, etc.)</gloss>
+<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, etc.)</gloss>

@@ -12 +12 @@
-<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, school communities, etc.)</gloss>
+<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, school community, etc.)</gloss>

WWW images. 
ChatGPT dug out the following, which seems pretty accurate:
"In Japan, "kairanban" is a type of bulletin board used in neighborhood associations, schools, or other local organizations to distribute information, notices, or announcements among the members. The documents are usually posted on the board, and each member is expected to read and pass them on to the next person in a circular fashion, hence the name "kairan" (circulation). It is a traditional and widely used means of communication in Japanese communities."

I think my 2012 edit was a bit off.

@@ -12 +12 @@
-<gloss>circular notice (esp. in binder form distributed to households within a neighbourhood association)</gloss>
+<gloss>circular notice (esp. in binder form; passed around households within a neighbourhood association, school communities, etc.)</gloss>

Aligning.

@@ -18,2 +18,2 @@
-<gloss>rubble</gloss>
-<gloss>broken stones</gloss>
+<gloss>hardcore</gloss>
+<gloss>macadam</gloss>

@@ -15 +15 @@
-<xref type="see" seq="1207770">割栗石・わりぐりいし</xref>
+<xref type="see" seq="1207770">割栗石</xref>

GG5: rubble; broken stones; 《英》hardcore; 〔マカダム道路用の〕 macadam.
割り栗	72	1.7%
割栗	4193	98.3%
Koj and Nikk have 割栗 for わりぐり.

Drop the "rare". Restoring GG5's glosses.

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>割栗</keb>
+</k_ele>
@@ -12 +14,0 @@
-<xref type="see" seq="1295210">砕石・さいせき・1</xref>
@@ -15 +16,0 @@
-<misc>&rare;</misc>
@@ -16,0 +18,2 @@
+<gloss>rubble</gloss>
+<gloss>broken stones</gloss>

https://syukatsu-life.com/terms/saiseki

砕石
【読み方】さいせき
【別名】割り栗
【英語】crushed stone


割り栗、(砕石)500キロ~
15,500円（税 0 円）
https://page.auctions.yahoo.co.jp/jp/auction/r484400295

砕石	81603	96.1%
割り栗	72	0.1%
割栗石	2781	3.3%
割り栗石	210	0.2%
割ぐり石	154	0.2%
割りぐり石	65	0.1%

daijs
「割り栗石」の略。

日本語例文用例辞書 
weblio entry identifies as building material 
割り栗石という建材


daijs: 割り栗石
読み方：わりぐりいし

砂利より大きく玉石より小さい割り石。土木・建築の基礎工事に用い、地盤を固めるために突き込む。割り栗。

割栗石
https://ja.wikipedia.org/wiki/割栗石
Google translate:Wariguri-ishi is a small block of stone made by splitting rocks, with a diameter of about 200 to 300 mm and a thickness of about 1/3 to 1/2 of the diameter. Crushed chestnut grounding refers to a process in which the crushed stone is cut into small pieces, and the top and bottom are laid alternately in a wedge shape, and then tamped down using cut gravel to close the eyes and level the top edge.

Looked like "crushed stone" from google image search, found what I was looking for after that.

Did not expect it to be this rare though, checked that second...

Note the daijs defn in particular. Identifies a crushed stone of a particular size for use as a building material.  Nothing to do with rubble. The stones didn't break, they were crushed.
砂利より大きく玉石より小さい割り石。土木・建築の基礎工事に用い、地盤を固めるために突き込む。割り栗。

@@ -12,2 +12,5 @@
-<gloss>rubble</gloss>
-<gloss>broken stone</gloss>
+<xref type="see" seq="1295210">砕石・さいせき・1</xref>
+<xref type="see" seq="1207770">割栗石・わりぐりいし</xref>
+<misc>&abbr;</misc>
+<misc>&rare;</misc>
+<gloss>crushed stone</gloss>

@@ -12,0 +13 @@
+<field>&noh;</field>

http://www.the-noh.com/en/world/kyogen.html

@@ -12,2 +12,1 @@
-<xref type="see" seq="1237570">狂言・1</xref>
-<xref type="see" seq="1237570">狂言・1</xref>
+<xref type="see" seq="2662460">本狂言</xref>
@@ -15,1 +14,1 @@
-<gloss>short scene during a noh play, performed by a kyogen actor (usually explaining the play)</gloss>
+<gloss g_type="expl">short scene during a noh play, performed by a kyogen actor (usu. explaining the play)</gloss>

大辞林、広辞苑、新解さん

Previous entry (“comic interlude”, as given in GG5) was misleading, dare I say *wrong*? 大辞林 gives a very clear and detailed definition.

Aikyōgen is not a comic interlude, but is a brief, dramatic, generally *expositionary* section within a noh play.

I didn’t catch this earlier and got confused because kyōgen co-occurs with noh in *2* ways: as a separate (comic) play, *between* noh plays (this is just called “kyōgen”), and as a scene *within* a single noh play (this is what aikyōgen refers to, as the 国語辞書 make clear).

This was clarified to me b/c I went to a noh performance today, and both these occurred, with only the (very serious, not at all comic) scene *within* the noh play being referred to (in the program) as “aikyōgen” (as in the 国語辞書 and as I’ve corrected it here).

I’ve gone into rather more detail over at WP:
http://en.wikipedia.org/wiki/Aikyōgen

@@ -13,1 +13,2 @@
-<gloss>comic interlude (short kyogen play during noh performance)</gloss>
+<gloss>kyogen interlude</gloss>
+<gloss>short scene during a noh play, performed by a kyogen actor (usually explaining the play)</gloss>

@@ -13,1 +13,1 @@
-<gloss>comic interlude (short Kyōgen play during Noh performance)</gloss>
+<gloss>comic interlude (short kyogen play during noh performance)</gloss>

気持ちいい	2,692,102	74.5%	
気持ち良い	583,529	        16.1%	
気持ちよい	334,828	        9.3%	
気持ち好い	2,891	        0.1%	
きもち良い	716	        0.0%

"good feeling" is a noun phrase.
Dropping exp. We don't have it on 気持ち悪い.
I don't think the x-ref is needed.

@@ -15,3 +15 @@
-</k_ele>
-<k_ele>
-<keb>きもち良い</keb>
+<ke_inf>&sK;</ke_inf>
@@ -28,2 +25,0 @@
-<re_restr>気持ち好い</re_restr>
-<re_restr>きもち良い</re_restr>
@@ -32 +27,0 @@
-<pos>&exp;</pos>
@@ -34,3 +28,0 @@
-<xref type="see" seq="2822300">気持ちいい・きもちいい</xref>
-<xref type="ant" seq="1982670">気持ち悪い</xref>
-<gloss>good feeling</gloss>
@@ -37,0 +30,2 @@
+<gloss>feeling nice</gloss>
+<gloss>feeling pleasant</gloss>

気持ちいい	2692102
きもちいい	95753
気持ち良い	583529
気持ちよい	334828
気持ち好い	2891
きもち良い	716
きもちよい	4034

adj-ix/i fixup  - resumed.

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>気持ちいい</keb>
+</k_ele>
@@ -16,0 +20,5 @@
+<reb>きもちいい</reb>
+<re_restr>気持ちいい</re_restr>
+<re_restr>気持ち良い</re_restr>
+</r_ele>
+<r_ele>
@@ -17,0 +26,4 @@
+<re_restr>気持ち良い</re_restr>
+<re_restr>気持ちよい</re_restr>
+<re_restr>気持ち好い</re_restr>
+<re_restr>きもち良い</re_restr>
@@ -21 +33 @@
-<pos>&adj-i;</pos>
+<pos>&adj-ix;</pos>

daijs

気持ち良い	583529
気持ちよい	334828
気持ち好い	2891
きもち良い	716

I don't think this should be an exp.

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>気持ち好い</keb>

Done.

I don't think the x-ref is needed. 参考 is used in a lot of different expressions.

@@ -22 +21,0 @@
-<xref type="see" seq="2266230">参考にする</xref>

The する etc. usage is indeed rather uncommon. It's usually になる/にする.

Daijr/s, sankoku, and iwakoku have this as a する verb (transitive) but it seems to be much more common as 〜にする. 
Not sure if a [vs] tag would be appropriate here.

Google N-gram Corpus Counts
╭─ーーーー─┬────────────┬───────╮
│ 参考　　 │ 57,339,931 │ 99.9% │
│ 參考　　 │      5,509 │  0.0% │ - [oK] to [sK]
│ さんこう │     72,365 │  0.1% │
╰─ーーーー─┴────────────┴───────╯

@@ -12 +12 @@
-<ke_inf>&oK;</ke_inf>
+<ke_inf>&sK;</ke_inf>
@@ -22 +21,0 @@
-<pos>&adj-no;</pos>

Incredible. The *English* wiktionary page notes the historic phonetic spelling, but not the Japanese page (this just how unimportant this is...)
https://en.wiktionary.org/wiki/山葵
Japanese
山葵 わさび Grade: 1	Jinmeiyō  jukujikun
Etymology */wasapi/ → /wasabi/
First attested in the Honzō Wamyō (918 CE) with this kanji compound and phonetic spelling of 和佐比.  

(The kanji form is not otherwise searchable on wiktionary)

No reference on the Japanese わさび page:
https://ja.wiktionary.org/wiki/わさび

Thank you, I appreciate the consideration and effort, this looks good.

Wikipedia doesn't really "have" this form.  It's not listed in the opening section as an accepted orthography. It is only noted as a historical artifact later in the article.
Headword: ワサビ（山葵[6]・山萮菜[7]、学名: Eutrema japonicum）は、...
History(名称): （918年）には、「山葵」の和名を和佐比と記している。同じく平安時代の『和名類聚抄』にも和佐比と記されている。

(山萮菜 was added randomly in 2021, I think that doesn't belong where it is either...)

和佐比 is not in nikk, it's not in daijs, it's obviously not in sankoku. I imagine it is omitted for a reason.

Sorry to repeat some numbers that are already in the notes, but:
わさび	1232009	75.6%
ワサビ	265338	16.3%
山葵	132404	8.1%
和佐比	106	0.0%

That's 106 of 1629857 occurrences, or ~1 in 15,000, or 0.0065%.  

And of those 106 occurrences, almost all are from reference materials(such as the 植物名辞典) that will have 山葵 or わさび right next to it.

The odds of encountering 和佐比 *by itself* as an attempt by an author to communicate the concept of "wasabi" seems infinitesimally small, unless one is literally studying classical Japanese texts.

Just on the numbers, this would ordinarily be an obvious [sK]. I certainly agree that [sK] shouldn't be purely a numbers game - sometimes terminology of historical/at-least-marginally useful significance is helpful to display.  This just doesn't appear to be one of those cases.

The reason that I put effort into this is that there is a cost to listing these forms in jmdict.  "Wasabi" is obviously an extremely common term. Students of Japanese will study it.  Every single person building a hand-made flashcard for わさび (paper or digital) off of this dictionary (or any of the many tools that use jmdict) has to decide for themselves if "和佐比" is worth learning(and if they lazily decide "yes", then they will waste additional time trying to learn a form that has gone mostly unused for hundreds of years).  

[rK], unfortunately, is insufficient to make this kind of choice. 磯巾着　いそぎんちゃく　"sea anemone" is [rK] at a little under 2%. It's still maybe worth learning, but rare enough that you probably should avoid it if you want a random Japanese person to understand your writing.  (This is an example I happened to be studying yesterday. 樹懶　なまけもの "tree sloth" is another fun one)

Put differently, if you write 磯巾着, a Japanese person might think you are overly educated, and/or have an unhealthy fascination with kanji (or sea anemones).

If you write 和佐比 for わさび, they will probably wonder what's the matter with you. (Since it's phonetic, they can probably guess the reading though わ　さ　ひ・び).

The amount of time wasted by thousands of individual learners adds up to something.  In exchange, what benefit does listing 和佐比 provide?  This is what is unclear to me.

Here's a big, colorful, example flashcard/study resource generated straight out of this entry(second page of a "和佐比" search)
https://www.tanoshiijapanese.com/dictionary/entry_details.cfm?entry_id=28918&element_id=201696

I'm not pressing the point beyond leaving these thoughts.  It can stay [rK] if that still feels appropriate to everyone.  But that is my motivation for "disappearing" some of these very, very rare forms.

https://ja.wikipedia.org/wiki/ワサビ#名称
ワサビの名が付く近縁な植物としてセイヨウワサビ（ホースラディッシュ）があるが、加工品の粉ワサビやチューブ入り練りワサビなどでは、原材料にセイヨウワサビのみを使用したり、両方を使っていたりするため、日本原産のワサビを本わさびと呼び、これを使ったものを高級品として区別していることが多い。

I think this is better.

@@ -28,0 +29,2 @@
+<xref type="see" seq="1121660">ホースラディッシュ</xref>
+<xref type="see" seq="2160220">西洋わさび</xref>
@@ -31 +33 @@
-<gloss>(any) blend of wasabi and horseradish</gloss>
+<gloss>horseradish (or any blend of wasabi and horseradish)</gloss>

植物名辞典 (has 和佐比), as does Wikipedia.
GG5, 中辞典, etc. all add Japanese horseradish.

Suggesting a second sense to cover Brian's issue. If this sort of information is appropriate, it shouldn't be in the literal sense.

@@ -24,0 +25,7 @@
+<gloss>Japanese horseradish</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
+<misc>&uk;</misc>
+<misc>&col;</misc>
+<gloss>(any) blend of wasabi and horseradish</gloss>

Don't really need it here. I thought about an arch entry but reindexing the 300+ 時計 sentences would be a pain.

@@ -19,5 +18,0 @@
-</r_ele>
-<r_ele>
-<reb>ときはかり</reb>
-<re_restr>時計</re_restr>
-<re_inf>&ok;</re_inf>

Only koj and nikk have ときはかり. I think it's a distraction on this entry. If we really want it, it could be a separate [arch] entry but I think it's fine to drop it entirely. Even daijr and daijs don't think it's important enough to record.

OK

iwakoku: 古く「土圭」「斗鶏」と書いたことがある。

斗鶏	78

Probably not worth adding. Google/twitter searches don't show anything related. Just wanted to leave a note.

OK. I've amended the indices.

gg5, luminous, wisdom, daij

Looks OK.
GG5 and daijr have a separate "wedding" sense.

@@ -14,0 +15 @@
+<gloss>way</gloss>
@@ -15,0 +17 @@
+<gloss>fashion</gloss>
@@ -17,0 +20,2 @@
+<gloss>form</gloss>
+<gloss>type</gloss>
@@ -21 +24,0 @@
-<pos>&n-suf;</pos>
@@ -29 +32,4 @@
-<pos>&n-suf;</pos>
+<gloss>wedding (ceremony)</gloss>
+</sense>
+<sense>
+<pos>&n;</pos>
@@ -36 +41,0 @@
-<pos>&n-suf;</pos>
@@ -38,2 +43,2 @@
-<misc>&arch;</misc>
-<gloss>enforcement regulations (of the ritsuryō)</gloss>
+<misc>&hist;</misc>
+<gloss>enforcement regulations (of the ritsuryō legal codes)</gloss>

GG5 and other JEs lead with the "ceremony" sense.

I'm comfortable with the order Chris has suggested. Any other views before I adjust the sentence indices?

@@ -15,0 +16,2 @@
+<gloss>method</gloss>
+<gloss>system</gloss>
@@ -20,0 +23,3 @@
+<gloss>rite</gloss>
+<gloss>ritual</gloss>
+<gloss>celebration</gloss>

大辞泉 (https://www.weblio.jp/content/式)

The order of these senses seems wrong to me. It feels like the "style" and "ceremony senses" are more common, and one of them should be the first sense. In 大辞泉 the "style" meaning comes first, "ceremony" second, and "equation" third, so that's what I've emulated here.

@@ -15,3 +15 @@
-<gloss>equation</gloss>
-<gloss>formula</gloss>
-<gloss>expression</gloss>
+<gloss>style</gloss>
@@ -27 +25,3 @@
-<gloss>style</gloss>
+<gloss>equation</gloss>
+<gloss>formula</gloss>
+<gloss>expression</gloss>

ritsuryo conversion
-*- via bulkupd.py -*-

@@ -34 +34 @@
-<gloss>enforcement regulations (of the ritsuryo)</gloss>
+<gloss>enforcement regulations (of the ritsuryō)</gloss>

GG5 and 中辞典: 	the (Tokyo) Metropolitan Government (Office).

@@ -18 +18 @@
-<gloss>Tokyo Metropolitan Government (abbr. for 東京都庁)</gloss>
+<gloss>Tokyo Metropolitan Government (Office)</gloss>

デジタル大辞泉 小学館 https://www.weblio.jp/content/都庁

《「東京都庁」の略》東京都の行政事務を取り扱う役所。平成3年（1991）に千代田区丸の内から新宿区西新宿に移転。
The example sentences are mostly only a building is 舎 or ビル is attached.

In 東京都庁, it links to Wikipedia saying it is 行政機関, that is, a governing body.

@@ -18 +18 @@
-<gloss>Tokyo Government Office</gloss>
+<gloss>Tokyo Metropolitan Government (abbr. for 東京都庁)</gloss>

prog, wisdom

I don't think "garments" is a great fit.
I think "clothes" should be higher up.

@@ -19,3 +18,0 @@
-<gloss>outfit</gloss>
-<gloss>garments</gloss>
-<gloss>costume</gloss>
@@ -23,0 +21,3 @@
+<gloss>clothing</gloss>
+<gloss>costume</gloss>
+<gloss>garb</gloss>

中辞典: 	(a style of) dress; clothes
GG5: 	(the style of) dress; costume; attire; (職服･式服) ceremonial 「dress [attire]; (職業･時代･国柄に特有の) garb; costume.
Daijs: 衣服とその装身具。また、それをつけたときのようす。

I don't see the problem with "style" but it seems it's being taken the wrong way. Maybe this works.

@@ -18 +18,2 @@
-<gloss>(style of) clothes</gloss>
+<gloss>attire</gloss>
+<gloss>outfit</gloss>
@@ -20 +21 @@
-<gloss>attire</gloss>
+<gloss>costume</gloss>
@@ -21,0 +23 @@
+<gloss>clothes</gloss>

I agree (style of) is a little unfortunate

wouldn't something like "the clothes one is currently wearing" be more accurate? I don't think it has anything to do with style, it's much closer to "attire" and "outfit"

The JEs mention style and the examples agree.

@@ -18 +18 @@
-<gloss>clothes</gloss>
+<gloss>(style of) clothes</gloss>

gg5, prog

Done.

@@ -17,11 +16,0 @@
-<r_ele>
-<reb>がんさつ</reb>
-<re_restr>贋札</re_restr>
-</r_ele>
-<r_ele>
-<reb>ぎさつ</reb>
-<re_restr>偽札</re_restr>
-</r_ele>
-<r_ele>
-<reb>にせふだ</reb>
-</r_ele>
@@ -31,5 +20,2 @@
-</sense>
-<sense>
-<stagr>ぎさつ</stagr>
-<pos>&n;</pos>
-<gloss>forged document</gloss>
+<gloss>counterfeit bill</gloss>
+<gloss>counterfeit note</gloss>

Yes please.

This merge is a bit uncomfortable. I think にせさつ, がんさつ and ぎさつ should be separate entries, and I suggest dropping にせふだ as it's only koj. I'll set it up myself if there are no objections.

Google N-gram Corpus Counts
╭─ーー─┬─────────────╮
│ 三　 │  59,735,330 │
│ 参　 │   1,243,501 │
│ 參　 │      11,975 │ - add, oK
│ 弎　 │           0 │ - oK
│ さん │ 520,413,466 │
│ み　 │ 176,120,310 │
╰─ーー─┴─────────────╯

@@ -16,0 +17,4 @@
+<keb>參</keb>
+<ke_inf>&oK;</ke_inf>
+</k_ele>
+<k_ele>
@@ -17,0 +22 @@
+<ke_inf>&oK;</ke_inf>

Agreed.

I don't think the pref sense is needed. 七 is the only other numeral entry that has one.

@@ -34,4 +33,0 @@
-</sense>
-<sense>
-<pos>&pref;</pos>
-<gloss>tri-</gloss>

aligning (see the 九 entry)

@@ -32,0 +33 @@
+<gloss>3</gloss>

開発部	128461
Eijiro

We probably wouldn't add it now.

A+B; might not be needed.

@@ -16 +16 @@
-<gloss>Development Department</gloss>
+<gloss>development department</gloss>

Shinto-tagged

@@ -18 +18 @@
-<gloss>Fūjin (Japanese god of the wind)</gloss>
+<gloss>Fūjin (god of the wind)</gloss>

https://en.wikipedia.org/wiki/Fūjin

We could have a second sense.

@@ -13,0 +14,5 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<field>&Shinto;</field>
+<gloss>Fūjin (Japanese god of the wind)</gloss>

Oft. refers to Fūjin specifically and that name is used sometimes in English too (see Fūjin and Raijin)

gg5, prog, luminous

@@ -11,0 +12 @@
+<gloss>god of the wind</gloss>

Thanks! Bad cut-and-paste when I was reversing the order.

The "テ" seems to have been mistakenly removed.

@@ -11 +11 @@
-<reb>ンジクアオイ</reb>
+<reb>テンジクアオイ</reb>

天竺葵	924	41.7%
テンジクアオイ	943	42.6%
てんじくあおい	349	15.7%
GG5 (also has "stork's bill")

Best not to mix up other forms such as ゼラニウム in the percentages.
Please follow our style for the katakana forms of plant, etc. names.

@@ -8 +8 @@
-<reb>テンジクアオイ</reb>
+<reb>てんじくあおい</reb>
@@ -11 +11,2 @@
-<reb>てんじくあおい</reb>
+<reb>ンジクアオイ</reb>
+<re_nokanji/>
@@ -17 +18 @@
-<gloss>geranium</gloss>
+<gloss>geranium (Pelargonium inquinans)</gloss>

ゼラニウム	147141	98.5%
天竺葵	924	0.6%
テンジクアオイ	943	0.6%
てんじくあおい	349	0.2%

https://www.weblio.jp/content/天竺葵
daijs:
ゼラニウムの別名。

https://ja.wikipedia.org/wiki/テンジクアオイ属

Daijs says "same as geranium". 

wikipedia seems to indicate that this is *technically* a subset of what would be colloquially called geraniums. 
Latin name: Pelargonium
科	:	フウロソウ科 Geraniaceae
属	:	テンジクアオイ属 Pelargonium
学名
Pelargonium L'Hér. ex Aiton

I see the xref is already "usually a cultivated Pelargonium". 

Maybe someone would be interested in entering this name in the appropriate style (I'm not quite sure how to say this is always a Pelargonium, which would be considered a geranium  ).  If no one thinks it's worth it, I am not pushing for the change.  Happy myself with the katakana form + xref.

Thought about [rare], but 3000 ngrams and perfectly common on twitter.  Just uncommon vs. xref.


The English wikipedia page explains that one genus was split into two...
https://en.wikipedia.org/wiki/Geranium

Confusion with Pelargonium:

Confusingly, "geranium" is also the common name of members of the genus Pelargonium, which are also in the family Geraniaceae and are widely grown as horticultural bedding plants. Linnaeus originally included all the species in one genus, Geranium, but they were later separated into two genera by Charles L’Héritier in 1789. Other former members of the genus are now classified in Erodium, including the plants known as filarees in North America.

@@ -7,0 +8,3 @@
+<reb>テンジクアオイ</reb>
+</r_ele>
+<r_ele>
@@ -11,0 +15,2 @@
+<xref type="see" seq="2071570">ゼラニウム</xref>
+<misc>&uk;</misc>

daijr
風師	3,127		
風神	204,702

@@ -11,0 +12,2 @@
+<xref type="see" seq="1664100">風神・1</xref>
+<gloss>god of the wind</gloss>

daijs

I thought that was always 気持ち*が*悪い but I see that daijs has it as a separate sense (plus another that we were missing).

@@ -18 +17,0 @@
-<xref type="see" seq="2833073">気持ちが悪い</xref>
@@ -25,0 +25,11 @@
+</sense>
+<sense>
+<pos>&adj-i;</pos>
+<gloss>feeling sick</gloss>
+<gloss>feeling unwell</gloss>
+</sense>
+<sense>
+<pos>&adj-i;</pos>
+<gloss>uncomfortable</gloss>
+<gloss>annoying</gloss>
+<gloss>frustrating</gloss>

can't this mean 吐き気がする too? if so, then "bad feeling" wasn't all off
the cause of 気持ち悪い is not always external like the current glosses imply

気持ち悪い	1486843	96.0%
気持ちわるい	23671	1.5%
キモチワルイ	34939	2.3%
気もち悪い	543	0.0%
気もちわるい	199	0.0%
気持ちワルイ	2336	0.2%

@@ -6,0 +7,4 @@
+</k_ele>
+<k_ele>
+<keb>気持ちわるい</keb>
+<ke_inf>&sK;</ke_inf>

daijs
https://en.wikipedia.org/wiki/Kanji_Kentei

@@ -13,2 +13,2 @@
-<gloss>test of kanji skills</gloss>
-<gloss>kanji test</gloss>
+<gloss>kanji aptitude test (esp. the Kanji Kentei)</gloss>
+<gloss>The Japan Kanji Aptitude Test</gloss>

Entry created

Duplicate

西洋わさび	5822	88.9%
せいようわさび	30	0.5%
西洋山葵	276	4.2%
せいようワサビ	0	0.0%
セイヨウワサビ	421	6.4%

@@ -11,0 +12,4 @@
+</r_ele>
+<r_ele>
+<reb>セイヨウワサビ</reb>
+<re_nokanji/>

Entry created

ホースラディッシュ	7,294

@@ -19 +19 @@
-<xref type="see" seq="2160230">本わさび</xref>
+<xref type="see" seq="1121660">ホースラディッシュ</xref>

西洋わさび	5822	88.9%
せいようわさび	30	0.5%
西洋山葵	276	4.2%
せいようワサビ	0	0.0%
セイヨウワサビ	421	6.4%

@@ -11,0 +12,4 @@
+</r_ele>
+<r_ele>
+<reb>セイヨウワサビ</reb>
+<re_nokanji/>

Entry created

@@ -18 +17,0 @@
-<xref type="see" seq="1302710">わさび</xref>
@@ -21,2 +20 @@
-<xref type="see" seq="2160220">西洋わさび</xref>
-<gloss>real wasabi (in contrast to Western horseradish)</gloss>
+<gloss>real wasabi (as opposed to Western horseradish)</gloss>

KOD

Trimming a lot. Don't need all the xrefs.

@@ -18,6 +18,3 @@
-<xref type="see" seq="1302710">山葵・わさび</xref>
-<xref type="see" seq="1302710">山葵・わさび</xref>
-<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
-<xref type="see" seq="2857837">山わさび・やまわさび</xref>
-<s_inf>esp. used in marketing to distinguish from western horseradish</s_inf>
-<gloss>(true) wasabi (Wasabia japonica)</gloss>
+<xref type="see" seq="1302710">わさび</xref>
+<xref type="see" seq="2160220">西洋わさび</xref>
+<gloss>real wasabi (in contrast to Western horseradish)</gloss>

本わさび	33278	79.4%
本ワサビ	4953	11.8%
本山葵	3683	8.8%

https://www.chunichi.co.jp/article/68052
本わさびの使用量が５０％以上なら「本わさび使用」、５０％未満なら「本わさび入り」と表示する決まりです。

https://en.wiktionary.org/wiki/山葵
Called 本山葵 (hon wasabi) when needed to distinguish it from the derived terms.

The term "本山葵" does not appear in the Japanese wikipedia page for "山葵". This is not in and of itself, as I understand it, a scientific identifier for a particular species of plant.  Instead, it is more like "true wasabi" (vs. western wasabi).

If your product contains at least 50% 山葵, then it can be marketed as 本わさび使用、if less, than 50%, then 本わさび入り.  (The wasabi in my fridge says 使用, must be the good stuff... 1st ingredient is 本わさび, 3rd ingredient is 西洋わさび related)

According to the article, does *not* have to actually be produced in Japan, technically, as long as it is the correct species of wasabi.

I know we're not fans of lots of xrefs.
For marketing purposes, 本わさび　and 山わさび align directly (google/product search will return similar products)
On an ingredient list,  本わさび and 西洋わさび align
and, of course, 本わさび *is* just 山葵 (to the extent that わさび is used with its originally meaning, and not colloquially as "whatever I'm served to put on my sushi")

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>本ワサビ</keb>
@@ -15,2 +18,7 @@
-<xref type="see" seq="2160220">西洋わさび</xref>
-<gloss>wasabi (Wasabia japonica)</gloss>
+<xref type="see" seq="1302710">山葵・わさび</xref>
+<xref type="see" seq="1302710">山葵・わさび</xref>
+<xref type="see" seq="1302710">山葵・わさび</xref>
+<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
+<xref type="see" seq="2857837">山わさび・やまわさび</xref>
+<s_inf>esp. used in marketing to distinguish from western horseradish</s_inf>
+<gloss>(true) wasabi (Wasabia japonica)</gloss>

Entry created

Let's go with both.

I think we should either have びと only or both びと and じん. I don't mind which. A search-only じん form wouldn't be much help here.

I note that almost always in compounds of nation/race + 人 the reading is じん. The main class of exceptions seems to be biblical references, e.g. ヘブル人/ヘブルびと (GG5) and ナザレ人/ナザレびと. Even then, GG5 has " ペリシテ人 （ペリシテじん［びと］）".
For this entry and the others Dine has edited we could:
- just have びと
- have both the びと and じん forms visible
- have both but make the じん form only searchable.
Which should it be?

See Jim's comment.

@@ -8,0 +9,3 @@
+</r_ele>
+<r_ele>
+<reb>コリントじんへのてがみ</reb>

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

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

@@ -9,0 +10,3 @@
+<r_ele>
+<reb>ガラテヤじんへのてがみ</reb>
+</r_ele>
@@ -11,0 +15 @@
+<field>&Christn;</field>

daijs, etc.: 
https://kotobank.jp/word/ガラテヤ人への手紙-467547

@@ -8 +8 @@
-<reb>ガラテヤじんへのてがみ</reb>
+<reb>ガラテヤびとへのてがみ</reb>

Entry created

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

@@ -9,0 +10,3 @@
+<r_ele>
+<reb>ローマじんへのてがみ</reb>
+</r_ele>
@@ -11,0 +15 @@
+<field>&Christn;</field>

daijs, nikk, etc.:
https://www.weblio.jp/content/ローマ人への手紙
https://kotobank.jp/word/ローマ人への手紙-153395

@@ -8 +8 @@
-<reb>ローマじんへのてがみ</reb>
+<reb>ローマびとへのてがみ</reb>

Entry created

はらわたが煮えくり返る	3752	46.7%
腸が煮えくり返る	1997	24.9%
腸が煮え繰り返る	328	4.1%
腸が煮えくりかえる	304	3.8%
はらわたがにえくりかえる	73	0.9%
はらわたが煮えくりかえる	1578	19.6%

Not sure about [id].

@@ -8,0 +9,3 @@
+</k_ele>
+<k_ele>
+<keb>はらわたが煮えくりかえる</keb>

@@ -11,0 +12 @@
+<ke_inf>&sK;</ke_inf>
@@ -14,0 +16 @@
+<ke_inf>&sK;</ke_inf>
@@ -21,0 +24 @@
+<misc>&id;</misc>

N-grams:
はらわたが煮えくり返る	160
腸が煮えくり返る	62
腸が煮え繰り返る	25
腸が煮えくりかえる	18

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>はらわたが煮えくり返る</keb>
+</k_ele>

OK

I don't think it's needed. 規模 can be used with so many different words.

Reverso
全社規模	6492

Yes, not computing, but it gets reasonable usage, as well as a lot of Reverso matches.

@@ -13,2 +13,2 @@
-<field>&comp;</field>
-<gloss>corporate-wide</gloss>
+<gloss>company-wide scale</gloss>
+<gloss>enterprise scale</gloss>

Not a computing term. A+B.

Entry created

@@ -18 +18 @@
-<gloss>this piece of music</gloss>
+<gloss>this piece (of music)</gloss>

@@ -11,0 +12 @@
+<xref type="see" seq="2857840">外曲</xref>

Oops.

@@ -12 +12 @@
-<gloss>composition written for solo shakuhachi, kyokyū, koto, etc.</gloss>
+<gloss>composition written for solo shakuhachi, kokyū, koto, etc.</gloss>

Better

daij, koj

@@ -12 +12 @@
-<gloss>var. of traditional shakuhachi music</gloss>
+<gloss>composition written for solo shakuhachi, kyokyū, koto, etc.</gloss>

わさび大根	1155	59.1%
山葵大根	61	3.1%
わさびだいこん	148	7.6%
ワサビダイコン	589	30.2%
GG5. ルミナス helpfully adds: (西洋わさび)

@@ -12,0 +13,4 @@
+<r_ele>
+<reb>ワサビダイコン</reb>
+<re_nokanji/>
+</r_ele>
@@ -16 +20 @@
-<gloss>horseradish</gloss>
+<gloss>horseradish (Armoracia rusticana)</gloss>

Entry created

gg5: 暇を見て手紙を書く　find a moment to write a letter; write a letter when one can find the time.
koj (暇を見る): 物事の合間に、空き時間を見つけ出す。暇を見つける。「暇を見て連絡します」

The current gloss looks wrong.

@@ -15,2 +15,2 @@
-<pos>&adv;</pos>
-<gloss>at odd moments</gloss>
+<gloss>when one finds a moment</gloss>
+<gloss>when one can find the time</gloss>

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>暇をみて</keb>

Entry created

@@ -15,2 +15 @@
-<s_inf>where the interlude kyogen actors wait</s_inf>
-<gloss>place on bridge passageway next to the rear of a noh stage</gloss>
+<gloss>place on bridge passageway next to the rear of a noh stage (where the interlude kyogen actors wait)</gloss>

@@ -13,0 +14 @@
+<field>&noh;</field>

@@ -13,1 +13,1 @@
-<s_inf>where the interlude kyōgen actors wait</s_inf>
+<s_inf>where the interlude kyogen actors wait</s_inf>

@@ -13,2 +13,2 @@
-<s_inf>So called because the interlude Kyōgen actors wait here</s_inf>
-<gloss>spot on bridge passageway next to the rear stage of a Noh stage</gloss>
+<s_inf>where the interlude kyōgen actors wait</s_inf>
+<gloss>place on bridge passageway next to the rear of a noh stage</gloss>

@@ -13,0 +14 @@
+<field>&noh;</field>

daijs
http://www.the-noh.com/en/world/kyogen.html (although they used the wrong "discrete")

@@ -13,0 +14 @@
+<field>&noh;</field>

@@ -14,1 +14,1 @@
-<gloss>short scene during a noh play, performed by a kyogen actor (usu. explaining the play)</gloss>
+<gloss g_type="expl">short scene during a noh play, performed by a kyogen actor (usu. explaining the play)</gloss>

koj, daij

@@ -15 +14,0 @@
-<xref type="see" seq="1437020">泥濘</xref>

@@ -14,0 +15 @@
+<xref type="see" seq="1437020">泥濘</xref>

@@ -3,0 +4,3 @@
+<k_ele>
+<keb>ぬかるみ道</keb>
+</k_ele>

@@ -13 +13 @@
-<gloss>Go played by two equally skilled players</gloss>
+<gloss>go played by two equally skilled players</gloss>

@@ -11,0 +12 @@
+<field>&go;</field>

Koj

http://www.weblio.jp/content/相碁
daijr

@@ -14 +14 @@
-<gloss>wind god</gloss>
+<gloss>god of the wind</gloss>

smk:〔古〕

@@ -13 +13 @@
-<misc>&rare;</misc>
+<misc>&arch;</misc>

風伯	1057
風神	204702

@@ -12 +12,3 @@
-<gloss>god of wind</gloss>
+<xref type="see" seq="1664100">風神</xref>
+<misc>&rare;</misc>
+<gloss>wind god</gloss>

研究社　新和英大辞典　第５版

冬まき	506

@@ -5,0 +6,3 @@
+</k_ele>
+<k_ele>
+<keb>冬まき</keb>

冬蒔き	264
冬蒔きの	68
GG5; 冬蒔きの winter-sown; sown during winter.

[rare]?

@@ -11,0 +12 @@
+<pos>&adj-no;</pos>

研究社　新和英大辞典　第５版

@@ -21 +21 @@
-<xref type="see" seq="2160230">本わさび・ほんわさび</xref>
+<xref type="see" seq="2160230">本わさび</xref>

With this entry we have the following forms for "Western" horseradish; in n-gram order:
山わさび
ホースラディッシュ
西洋わさび
わさび大根
That's 4, not 15. I don't think that note is needed.

@@ -19,3 +19,2 @@
-<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
-<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
-<xref type="see" seq="2160220">西洋わさび・せいようわさび</xref>
+<xref type="see" seq="2160220">西洋わさび</xref>
+<xref type="see" seq="2160220">西洋わさび</xref>
@@ -23 +21,0 @@
-<s_inf>esp. used to market western horseradish made in Hokkaido, distinguished from 本わさび</s_inf>

山山葵	165	1.0%
山ワサビ	2149	12.4%
山わさび	15001	86.6%

https://ja.wikipedia.org/wiki/ホースラディッシュ
別名にワサビダイコン（山葵大根）、フランス名由来のレフォール（レホール、raifort）、ウマワサビ、英名の直訳でウマダイコン。商品名で（水場で作られることが多い本わさびに対して）「山わさび」と呼ばれることもある。

https://www.kinjirushi.co.jp/wasabi/type2/
北海道では山わさびと呼ばれます

https://mountain-c.com/media/16400/
山わさびという名前は聞き慣れないですが、これは別名西洋わさび、ホースラディッシュのことなのです。


西洋山葵	276
西洋わさび	5822
西洋ワサビ	1828
ホースラディッシュ	7294

レフォール is another western horseradish we don't have (from French)
レフォール	1472	7.8%

Pretty sure it's a clone of this entry, perhaps with an appropriate tag "from french". 

If you add up the ngrams for 西洋わさび variants, they barely beat out ホースラディッシュ. Given that this is a regional kanji/native-japanese form, I think it makes sense to xref to the common kanji form.

I originally said "Hokkaido dialect" because that's roughly what the refs say.  It is a product *of* hokkaido, so it makes sense they would talk about it there. But seemed off that the ngrams for 山わさび beat every other form of "western horseraddish" combined...

Looking back at wikipedia, it specifically said: 
商品名で（水場で作られることが多い本わさびに対して）「山わさび」と呼ばれることもある。

As far as I see, *this* is actually the most common term for any kind of western horseradish... 西洋わさび shows up on the ingredient list of my Japanese wasabi tube(in my fridge right now), but 山わさび seems more likely to show up on the consumer-facing label... Because my 300 yen wasabi isn't pure Japanese wasabi, it *isn't* 本わさび, instead it says, on the front but in fine print:

本わさび使用、西洋わさびをブレンド　

If you google (or search amazon) from 山わさび, a lot of wasabi or wasabi-flavored products turn up, and the word 北海道 is almost always nearby.  I get the feeling that 山わさび is a clever marketing variant of 本わさび, for western horseraddish grown in the mountains of hokkaido.


https://macaro-ni.jp/90889#heading-1287721
山わさびの旬と主な産地
山わさびの主な産地は北海道。　＜ー The main production area for yamawasabi is hokkaido

If we leave off the [note], we've just got 15 different entries that all mean "horseradish".  Since there is a use-case here, I hope we can give at least leave some clue.


====
Huh, found a big English-language article on the subject...
https://www.asahi.com/special/tsukiji/en/wasabi/kako/
When we see the names of raw materials described on tubes of wasabi, we find western horseradish as well as hon-wasabi (Japanese horseradish) in many cases. 

Western horseradish originated in Europe and is called “horseradish” or “raifort” there. Western horseradish was imported to Japan in the Meiji Era (1868-1912) and is called “yama-wasabi” (mountain wasabi) in Hokkaido where it grows in the wild in wide areas. Much of western horseradish is imported from overseas, but Nagoya-based Kinjirushi Co., which has the largest share of the market of processed wasabi for commercial purposes, sticks to domestically grown western horseradish. The Abashiri region of Hokkaido, whose climate is similar to the land of origin, Europe, has become a big production area. Kinjirushi is also operating a major factory in the region....

Reverso. Eijiro has "workshop 〔国際会議の場などの〕".

RP uses it to gloss the term shiur/shiurim -> 《特に Talmud の》学習(会). (It says it's from Yiddish, but I think it's actually from Hebrew.)

@@ -11,0 +12 @@
+<gloss>study group</gloss>
@@ -12,0 +14 @@
+<gloss>study meeting</gloss>

学習会	330320

I guess so. This is currently an example sentence, and is used for sense 1 of お先に.
There are two other sentences using this so I'll index them.

おさきにどうぞ	368	1.9%
お先にどうぞ	19090	98.1%
dij

Semi-obvious but potentially useful

daij, koj, smk

Two senses in the kokugos.
Daijs has "警察官の―" as as example for sense 1.

@@ -11,0 +12,2 @@
+<gloss>uniform (for a profession)</gloss>
+<gloss>(professional) attire</gloss>
@@ -13,0 +16,6 @@
+</sense>
+<sense>
+<pos>&n;</pos>
+<gloss>work clothes</gloss>
+<gloss>overalls</gloss>
+<gloss>coveralls</gloss>

職服	2509
Koj, Daijr, 新編英和活用大辞典, Eijiro

GG5 uses it in the explanation of 服装.

Done.

@@ -9 +8,0 @@
-<re_pri>spec1</re_pri>

A bit more testing.

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

I don't think it's ever a given name.

@@ -10,0 +11 @@
+<misc>&surname;</misc>
@@ -12,2 +12,0 @@
-<misc>&surname;</misc>
-<misc>&fem;</misc>

Completed.

@@ -9 +8,0 @@
-<re_pri>spec1</re_pri>

Testing the use of spec1 here.

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>

https://ja.wikipedia.org/wiki/五味陸仁

https://ja.wikipedia.org/wiki/田辺真南葉

https://ja.wikipedia.org/wiki/土屋統督

https://ja.wikipedia.org/wiki/二本木美唯貴

I've raised an issue about these. I'll make it "product" pro-tem.

@@ -8,0 +9 @@
+<re_pri>spec1</re_pri>
@@ -11 +12 @@
-<misc>&unclass;</misc>
+<misc>&product;</misc>

https://ja.wikipedia.org/wiki/日本漢字能力検定
https://www.kanken.or.jp/kanken/

Probably worth adding an "exam" name type. We have quite a few tests/exams in jmnedict.