"The History of Galadriel and Celeborn" in Unfinished Tales.  Celeborn's heritage is continually shifting: in one draft he was a Telerin Prince who came with Galadriel from Valinor; in another he was a Sindar whom she met in Doriath; according to the first version of the suppressed epilogue (now published in Sauron Defeated = History of Middle-earth, vol. IX, Celeborn, it is implied, was originally from Lothlorien: ("He lives in his own land as he has always done").  So, Celeborn moves from being one of the Teleri Calaquendi to one of the Teleri Umanyar (either a Sindar or a Silvan).  Tolkien just never made up his mind on either Celeborn or Galadriel.

__________________________________

All that is gold does not glitter,
Not all those who wander are lost;
The old that is strong does not wither,
Deep roots are not reached by the frost.
From the ashes a fire shall be woken,
A light from the shadows shall spring;
Renewed shall be blade that was broken,
The crownless again shall be king.