mypedia: 江戸時代，都市に住む商工業者。

daijs: "狭義には家持ち・地主をいい、店(たな)借り・地借りは含まれない" so

@@ -21,0 +22,2 @@
+<misc>&hist;</misc>
+<gloss>chōnin (Edo-period social class of town-dwelling commoners, esp. landowning merchants)</gloss>
@@ -24,5 +25,0 @@
-<gloss>commoner</gloss>
-<gloss>civilian</gloss>
-<gloss>merchant</gloss>
-<gloss>tradesman</gloss>
-<gloss>tradeswoman</gloss>
@@ -30,2 +26,0 @@
-<gloss>artisan</gloss>
-<gloss g_type="expl">members of the lowest Edo-period social class (comprising commoners not involved in farming)</gloss>

if we're adding the [expl] i think the most general terms should go first

@@ -17,0 +18 @@
+<re_inf>&ok;</re_inf>
@@ -20,0 +22,4 @@
+<gloss>townspeople</gloss>
+<gloss>townsfolk</gloss>
+<gloss>commoner</gloss>
+<gloss>civilian</gloss>
@@ -25,3 +30,2 @@
-<gloss>townfolk</gloss>
-<gloss>commoner</gloss>
-<gloss>civilian</gloss>
+<gloss>artisan</gloss>
+<gloss g_type="expl">members of the lowest Edo-period social class (comprising commoners not involved in farming)</gloss>

GG5:
〔商人〕 a tradesman; a tradeswoman; a merchant; 〈集合的に〉 tradespeople; 
〔町の人〕 a townsman; a townswoman; 〈集合的に〉 townspeople; townsfolk
.
ルミナス和英辞典:
〔日本史〕 (貴族や特権階級に対して平民) commoner [C]; (武士でない市民) civilian [C]; (商人) merchant [C]; (総称) townsfolk, townspeople
.
Kodansha:
町人 [ちょうにん] ★ 江戸時代, 都市に住む職人と商人。家屋を所有し町役人の選挙権を有した上層階級と, それらを持たない下層階級とがあった。	
.
Wp:
EN: Chōnin (町人?, "townsman") was a social class that emerged in Japan during the early years of the Tokugawa period. The majority of chōnin were merchants, but some were craftsmen, as well. Nōmin (farmers) were not considered chōnin. The socioeconomic ascendance of chōnin has certain similarities to the roughly contemporary rise of the middle class in the West.
JP: 町人（ちょうにん、まちにん）は、江戸時代に都市に居住していた職人、商人の総称である。
.
Maybe an "expl" needs to be added, along the lines of "social class associated particularly with the Edo Period, whose members were were neither nobility, nor engaged in agricultural labor" or similar?

@@ -15,0 +16,3 @@
+<r_ele>
+<reb>まちにん</reb>
+</r_ele>
@@ -18,0 +22,6 @@
+<gloss>tradesman</gloss>
+<gloss>tradeswoman</gloss>
+<gloss>tradespeople</gloss>
+<gloss>townfolk</gloss>
+<gloss>commoner</gloss>
+<gloss>civilian</gloss>