Rejecting this branch so I can approve the other.

Keeping it as a note without the headword would work for me.  I don't think they should be merged.

My inclination is to drop 笑談 from the entry apart from an "also written". It was added in Sep. 2008 by Scott with the comment about 夏目漱石. I can see comments in WWW pages about it being read じょうだん.
If it's not dropped, perhaps the entries should be merged?

@@ -31,0 +31,2 @@
+<xref type="see" seq="2589580">笑談・しょうだん・2</xref>
+<xref type="see" seq="2589580">笑談・しょうだん・2</xref>

nikk

笑談 is listed as しょうだん in both daij and koj so this might be a mistake.

@@ -12,0 +12,9 @@
+<ke_inf>&ateji;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>戯談</keb>
+<ke_inf>&ateji;</ke_inf>
+</k_ele>
+<k_ele>
+<keb>串戯</keb>
+<ke_inf>&ateji;</ke_inf>

I think the point of putting in a comment is so that they don't get to be a headword. Even with an iK it creates something messy, e.g. for text glossing.

Not that I want to stretch the debate here, but I prefer having Kanji headwords in the proper field and using the iK tag. I'm not a big fan of extra headwords hidden in notes and I think that the iK tag is there for situations like these.

The Soseki reference is nothing special and I see that it's used by others as well. (see http://www.google.co.jp/search?hl=ja&source=hp&q=笑談+じょうだん+site:www.aozora.gr.jp)

@@ -16,0 +16,4 @@
+<k_ele>
+<keb>笑談</keb>
+<ke_inf>&iK;</ke_inf>
+</k_ele>
@@ -26,1 +30,0 @@
-<s_inf>sometimes written 笑談</s_inf>

@@ -25,0 +25,2 @@
+<xref type="see" seq="2589580">笑談・しょうだん・2</xref>
+<s_inf>sometimes written 笑談</s_inf>

yeah, i'm not buying it.  笑談 should have its own entry.  and nikkoku lists its 
earliest usage as the 15th century, so it's not a soseki-ism

those aren't ateji, btw.

@@ -11,4 +11,0 @@
-<keb>笑談</keb>
-<ke_inf>&ateji;</ke_inf>
-</k_ele>
-<k_ele>
@@ -16,1 +12,0 @@
-<ke_inf>&ateji;</ke_inf>
@@ -20,1 +15,0 @@
-<ke_inf>&ateji;</ke_inf>
@@ -31,1 +25,0 @@
-<s_inf>笑談 is an ateji created by 夏目漱石</s_inf>

i think the idea is that most of the time we ==don't want it to show up== 
because the signal-to-noise ratio is so crumby

if it were up to me, i'd toss most of the iK entries anyway.  iK should be used 
for common misrepresentations, not one-off henkan errors or "a handful of 
guys wrote it like this a few hundred years ago but so infrequently that writers 
of real Japanese dictionaries have never even thought of including it".  If 
writers consistently had to give yomigana so their readers could understand 
that they were using the reading じょうだん instead of しょうだん, that's a 
good sign that 笑談[じょうだん] was never in wide enough circulation to be 
relevant.

Replying to: "I think the point of putting in a comment is so that they don't get to be a headword. Even with an iK it creates something messy, e.g. for text glossing."

Would the mess come from the fact that there would be two entries with 笑談 as an headword ? 

I don't care about this that much, but it would make sense to me to include it as an headword since it's used to write じょうだん by a couple of different writers. 

The problem with the note is that if something is just written in a note, it won't show up when doing a search on wwwjdic. Of course, I doubt that many people will be searching for 笑談 on wwjdic, but you never know.

@@ -15,0 +15,4 @@
+</k_ele>
+<k_ele>
+<keb>笑談</keb>
+<ke_inf>&iK;</ke_inf>

nikk

Merging in Scott's suggested entry.

@@ -22,0 +22,10 @@
+<r_ele>
+<reb>ぎだん</reb>
+<re_restr>戯談</re_restr>
+<re_inf>&ok;</re_inf>
+</r_ele>
+<r_ele>
+<reb>げだん</reb>
+<re_restr>戯談</re_restr>
+<re_inf>&ok;</re_inf>
+</r_ele>
@@ -26,1 +36,1 @@
-<s_inf>sometimes written 笑談</s_inf>
+<s_inf>じょうだん is sometimes written 笑談</s_inf>
@@ -29,0 +39,1 @@
+<gloss>funny story</gloss>

@@ -25,0 +25,2 @@
+<xref type="see" seq="2589580">笑談・しょうだん・2</xref>
+<s_inf>sometimes written 笑談</s_inf>

冗談を言って	28720
笑談を言って	No matches

I think we should drop the 笑談 note. It's only in meikyo as "もと「笑談」とも".

@@ -37,2 +37 @@
-<xref type="see" seq="2589580">笑談・しょうだん・2</xref>
-<s_inf>じょうだん is sometimes written 笑談</s_inf>
+<gloss>joke</gloss>
@@ -40 +38,0 @@
-<gloss>joke</gloss>

冗談の	90771	  
冗談のよう	29469	  
冗談のつもり	24113	  
冗談のような	17330	  
冗談のつもりで	13173	  
冗談のように	8222	  
冗談のつもりだっ	5359	  
冗談のつもりだった	5317	  
冗談のつもりで書い	3131	  
冗談の通じ	3041	  
冗談のつもりで書いた	2961

I don't think this is an adjective

@@ -37 +36,0 @@
-<pos>&adj-no;</pos>

I can't see rejected entries (unless I ask for them.)

another variant. And I don't understand why I can see the 3 rejected entries.

@@ -15,0 +15,3 @@
+</k_ele>
+<k_ele>
+<keb>串戲</keb>

Me too.

I agree with deletion

i could go either way (leaning towards deletion), but the current gloss is a command, not an adjective

@@ -16,1 +16,1 @@
-<gloss>speak English well</gloss>
+<gloss>good at English</gloss>

Delete?

@@ -15,0 +15,1 @@
+<pos>&adj-i;</pos>

OK

It shouldn't be tagged as both transitive and intransitive. It's one or the other depending on how you define transitivity in Japanese.
Given that this always takes を (unlike 歩く, for example), I think it's easier to make a case for vt.

@@ -18,4 +18,2 @@
-<pos>&vi;</pos>
-<gloss>walking through (a difficult and long path)</gloss>
-<gloss>travelling (the full distance) on foot</gloss>
-<gloss>travelling (all the way) across</gloss>
+<gloss>travelling (a long and difficult journey) on foot</gloss>
+<gloss>walking (all the way) across</gloss>
@@ -30 +27,0 @@
-<pos>&vi;</pos>

sorry didn't read the old comments
i think the new gloss is definitely useful, not sure about the transitive/intransitive discussion

sankoku, daijr/s, smk, obunsha, senkoku

i don't think the second sense is needed
the majority of kokugos say it's transitive

@@ -16,0 +17 @@
+<pos>&vt;</pos>
@@ -17,0 +19 @@
+<gloss>walking through (a difficult and long path)</gloss>
@@ -26,0 +29 @@
+<pos>&vt;</pos>

@@ -24 +24,2 @@
-<gloss>third (musical interval)</gloss>
+<field>&music;</field>
+<gloss>third (interval)</gloss>

Splitting

@@ -12,3 +11,0 @@
-<k_ele>
-<keb>三たび</keb>
-</k_ele>
@@ -17,2 +13,0 @@
-<re_restr>三度</re_restr>
-<re_restr>３度</re_restr>
@@ -21,5 +15,0 @@
-</r_ele>
-<r_ele>
-<reb>みたび</reb>
-<re_restr>三度</re_restr>
-<re_restr>三たび</re_restr>
@@ -33 +22,0 @@
-<stagr>さんど</stagr>
@@ -36,8 +24,0 @@
-</sense>
-<sense>
-<stagr>みたび</stagr>
-<pos>&adv;</pos>
-<gloss>many times</gloss>
-<gloss>over and over again</gloss>
-<gloss>often</gloss>
-<gloss>frequently</gloss>

I think みたび should be a separate entry. さんど and みたび only share 1/3 senses.

Thanks.
I meant to include 三度 in the みたび restriction. I don't think ３度 would ever be read みたび.

@@ -23,0 +24 @@
+<re_restr>三度</re_restr>

You need to put inverted commas around the３度.
Why the restriction on みたび? Can't all 3 be read that way?

@@ -16,0 +17,2 @@
+<re_restr>三度</re_restr>
+<re_restr>３度</re_restr>

GG5 has "highly destructive earthquake", which I prefer.

@@ -17 +17 @@
-<gloss>highly deadly earthquake</gloss>
+<gloss>highly destructive earthquake</gloss>

@@ -16,0 +17 @@
+<gloss>highly deadly earthquake</gloss>

See 震災 entry. More likely to refer to 2011 today.

@@ -17,6 +16,0 @@
-</sense>
-<sense>
-<pos>&n;</pos>
-<xref type="see" seq="1811760">関東大震災</xref>
-<misc>&abbr;</misc>
-<gloss>Great Kanto earthquake (1923)</gloss>

Already there.

to enamdict

目黒	1728276

I think we should have entries in jmdict for all the 23 wards of Tokyo. (i'm bringing it up on github)

@@ -5,0 +6 @@
+<ke_pri>spec1</ke_pri>
@@ -8,0 +10 @@
+<re_pri>spec1</re_pri>
@@ -13,0 +16,5 @@
+<sense>
+<stagr>めぐろ</stagr>
+<pos>&n;</pos>
+<gloss>Meguro City (special ward of Tokyo)</gloss>
+</sense>

@@ -10,0 +10,4 @@
+<r_ele>
+<reb>メグロ</reb>
+<re_nokanji/>
+</r_ele>

Entry created

Koj, GG5, ルミナス和英辞典

@@ -11,2 +11,3 @@
-<gloss>Ōmetsuke</gloss>
-<gloss>a kind of government inspector in the Edo period</gloss>
+<pos>&n;</pos>
+<gloss>(government) inspector-general (Edo period)</gloss>
+<gloss>upper superintendent officer</gloss>

http://en.wikipedia.org/wiki/Ōmetsuke

Moved to enamdict.

It seems that a Google search lists the hiragana as すいめいそう, with a final long o. However, a kanji search gives a short そ as pronunciation...

I agree, and have done that. This can be rejected when that is approved.

merge into 戯談[じょうだん] as ok readings?

nikk

No

Do we need to explain the Japanese name?

@@ -13 +13,2 @@
-<gloss>the Great Hanshin Earthquake of 1995 (the epicenter was located on Awaji island)</gloss>
+<misc>&hist;</misc>
+<gloss>Great Hanshin Earthquake of 1995</gloss>

@@ -13 +13 @@
-<gloss>Great Kobe earthquake of 1995 (the epicenter was located on Awaji island)</gloss>
+<gloss>the Great Hanshin Earthquake of 1995 (the epicenter was located on Awaji island)</gloss>

typo

@@ -13,1 +13,1 @@
-<gloss>Great Kobe earthquake of 1995 (the epicenter was located on Awayji island)</gloss>
+<gloss>Great Kobe earthquake of 1995 (the epicenter was located on Awaji island)</gloss>

I have suggested merging this with the 三度/さんど entry. Reject this once that has been approved.

http://kotobank.jp/word/三度  (second entry)

@@ -16 +16,2 @@
-<gloss>major third (music)</gloss>
+<field>&music;</field>
+<gloss>major third</gloss>

adding the x-ref back

@@ -15,0 +15,1 @@
+<xref type="see" seq="2589630">短三度</xref>

GG5, 新和英中辞典

@@ -13 +13,2 @@
-<gloss>minor third (music)</gloss>
+<field>&music;</field>
+<gloss>minor third</gloss>

http://ja.wiktionary.org/wiki/短3度